diff --git a/main.go b/main.go
index 7d7fc7c..4053fdb 100644
--- a/main.go
+++ b/main.go
@@ -46,7 +46,7 @@ func main() {
 				if data, err := models.ExtractCertFromStream(jq); err == nil {
 
 					rawNode := models.WrapCertStreamData(*data)
-					models.SaveCertStreamWrapper("raw_certstream.json", rawNode)
+					models.SaveCertStreamRaw("raw_certstream.json", rawNode)
 
 					certNode := models.BuildCertNode(rawNode)
 					models.SaveCertNode("cert_nodes.json", certNode)
diff --git a/models/main.go b/models/main.go
index d5cea6f..8aa8fbc 100644
--- a/models/main.go
+++ b/models/main.go
@@ -124,9 +124,9 @@ func SaveEdge(edge *Edge) {
 	}
 }
 
-// CertStreamWrapper is a wrapper around the stream function to unmarshall the
+// CertStreamRaw is a wrapper around the stream function to unmarshall the
 // data receive in a Go structure.
-type CertStreamWrapper struct {
+type CertStreamRaw struct {
 	ID       string           `json:"id"`
 	Type     string           `json:"type"`
 	Data     CertStreamStruct `json:"data"`
@@ -149,10 +149,10 @@ type CertNode struct {
 }
 
 // WrapCertStreamData is a wrapper around CertStreamStruct.
-func WrapCertStreamData(data CertStreamStruct) *CertStreamWrapper {
+func WrapCertStreamData(data CertStreamStruct) *CertStreamRaw {
 	t := time.Now()
 	rfc3339time := t.Format(time.RFC3339)
-	return &CertStreamWrapper{
+	return &CertStreamRaw{
 		ID:       "certstream--" + uuid.New().String(),
 		Type:     "certstream_raw",
 		Data:     data,
@@ -162,7 +162,7 @@ func WrapCertStreamData(data CertStreamStruct) *CertStreamWrapper {
 }
 
 // BuildCertNode builds a custom node based on CertStream.
-func BuildCertNode(rawNode *CertStreamWrapper) *CertNode {
+func BuildCertNode(rawNode *CertStreamRaw) *CertNode {
 	main := &CertNode{
 		ID:               "certstream--" + uuid.New().String(),
 		Fingerprint:      rawNode.Data.Data.LeafCert.Fingerprint,
@@ -193,8 +193,8 @@ func BuildCertNode(rawNode *CertStreamWrapper) *CertNode {
 	return main
 }
 
-// SaveCertStreamWrapper save the raw CertStream data.
-func SaveCertStreamWrapper(filename string, data *CertStreamWrapper) {
+// SaveCertStreamRaw save the raw CertStream data.
+func SaveCertStreamRaw(filename string, data *CertStreamRaw) {
 	err := utils.FileExists(filename)
 	if err != nil {
 		logrus.Error(err)
@@ -203,7 +203,7 @@ func SaveCertStreamWrapper(filename string, data *CertStreamWrapper) {
 	if err != nil {
 		logrus.Error(err)
 	}
-	rawDatas := []CertStreamWrapper{}
+	rawDatas := []CertStreamRaw{}
 
 	if err := json.Unmarshal(nodeFile, &rawDatas); err != nil {
 		logrus.Error(err)