diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go
index 6d7931fb5..c11d5106f 100644
--- a/apier/v1/apier_it_test.go
+++ b/apier/v1/apier_it_test.go
@@ -1363,7 +1363,7 @@ func TestApierCdrServer(t *testing.T) {
 		utils.SetupTime:  []string{"2013-11-07T08:42:23Z"},
 		utils.AnswerTime: []string{"2013-11-07T08:42:26Z"}, utils.Usage: []string{"10"}, "field_extr1": []string{"val_extr1"}, "fieldextr2": []string{"valextr2"}}
 	for _, cdrForm := range []url.Values{cdrForm1, cdrForm2} {
-		cdrForm.Set(utils.CDRSOURCE, utils.TEST_SQL)
+		cdrForm.Set(utils.Source, utils.TEST_SQL)
 		if _, err := httpClient.PostForm(fmt.Sprintf("http://%s/cdr_http", "127.0.0.1:2080"), cdrForm); err != nil {
 			t.Error(err.Error())
 		}
diff --git a/apier/v1/thresholds_it_test.go b/apier/v1/thresholds_it_test.go
index e72fa202c..30bdfb318 100644
--- a/apier/v1/thresholds_it_test.go
+++ b/apier/v1/thresholds_it_test.go
@@ -130,7 +130,7 @@ var tEvs = []*utils.CGREvent{
 			utils.MEDI_RUNID:  utils.MetaRaw,
 			utils.ORDERID:     123,
 			utils.OriginHost:  "192.168.1.1",
-			utils.CDRSOURCE:   utils.UNIT_TEST,
+			utils.Source:      utils.UNIT_TEST,
 			utils.ACCID:       "dsafdsaf",
 			utils.TOR:         utils.VOICE,
 			utils.REQTYPE:     utils.META_RATED,
diff --git a/engine/cdr.go b/engine/cdr.go
index 0ca8cb981..bc9ff8b29 100644
--- a/engine/cdr.go
+++ b/engine/cdr.go
@@ -156,7 +156,7 @@ func (cdr *CDR) FieldAsString(rsrFld *utils.RSRField) string {
 		return rsrFld.ParseValue(cdr.OriginID)
 	case utils.OriginHost:
 		return rsrFld.ParseValue(cdr.OriginHost)
-	case utils.CDRSOURCE:
+	case utils.Source:
 		return rsrFld.ParseValue(cdr.Source)
 	case utils.REQTYPE:
 		return rsrFld.ParseValue(cdr.RequestType)
@@ -704,7 +704,7 @@ func (cdr *CDR) AsMapStringIface() (mp map[string]interface{}, err error) {
 	mp[utils.MEDI_RUNID] = cdr.RunID
 	mp[utils.ORDERID] = cdr.OrderID
 	mp[utils.OriginHost] = cdr.OriginHost
-	mp[utils.CDRSOURCE] = cdr.Source
+	mp[utils.Source] = cdr.Source
 	mp[utils.ACCID] = cdr.OriginID
 	mp[utils.TOR] = cdr.ToR
 	mp[utils.REQTYPE] = cdr.RequestType
@@ -809,7 +809,7 @@ func (cdr *CDR) UpdateFromCGREvent(cgrEv *utils.CGREvent, fields []string) (err
 			if cdr.OriginHost, err = cgrEv.FieldAsString(fldName); err != nil {
 				return
 			}
-		case utils.CDRSOURCE:
+		case utils.Source:
 			if cdr.Source, err = cgrEv.FieldAsString(fldName); err != nil {
 				return
 			}
diff --git a/engine/cdr_test.go b/engine/cdr_test.go
index c457d5442..3d2190610 100644
--- a/engine/cdr_test.go
+++ b/engine/cdr_test.go
@@ -90,7 +90,7 @@ func TestFieldAsString(t *testing.T) {
 		cdr.FieldAsString(&utils.RSRField{Id: utils.TOR}) != utils.VOICE ||
 		cdr.FieldAsString(&utils.RSRField{Id: utils.ACCID}) != cdr.OriginID ||
 		cdr.FieldAsString(&utils.RSRField{Id: utils.OriginHost}) != cdr.OriginHost ||
-		cdr.FieldAsString(&utils.RSRField{Id: utils.CDRSOURCE}) != cdr.Source ||
+		cdr.FieldAsString(&utils.RSRField{Id: utils.Source}) != cdr.Source ||
 		cdr.FieldAsString(&utils.RSRField{Id: utils.REQTYPE}) != cdr.RequestType ||
 		cdr.FieldAsString(&utils.RSRField{Id: utils.CATEGORY}) != cdr.Category ||
 		cdr.FieldAsString(&utils.RSRField{Id: utils.Account}) != cdr.Account ||
@@ -110,7 +110,7 @@ func TestFieldAsString(t *testing.T) {
 			cdr.FieldAsString(&utils.RSRField{Id: utils.TOR}) != utils.VOICE,
 			cdr.FieldAsString(&utils.RSRField{Id: utils.ACCID}) != cdr.OriginID,
 			cdr.FieldAsString(&utils.RSRField{Id: utils.OriginHost}) != cdr.OriginHost,
-			cdr.FieldAsString(&utils.RSRField{Id: utils.CDRSOURCE}) != cdr.Source,
+			cdr.FieldAsString(&utils.RSRField{Id: utils.Source}) != cdr.Source,
 			cdr.FieldAsString(&utils.RSRField{Id: utils.REQTYPE}) != cdr.RequestType,
 			cdr.FieldAsString(&utils.RSRField{Id: utils.CATEGORY}) != cdr.Category,
 			cdr.FieldAsString(&utils.RSRField{Id: utils.Account}) != cdr.Account,
@@ -228,8 +228,8 @@ func TestCDRAsHttpForm(t *testing.T) {
 	if cdrForm.Get(utils.OriginHost) != "192.168.1.1" {
 		t.Errorf("Expected: %s, received: %s", "192.168.1.1", cdrForm.Get(utils.OriginHost))
 	}
-	if cdrForm.Get(utils.CDRSOURCE) != utils.UNIT_TEST {
-		t.Errorf("Expected: %s, received: %s", utils.UNIT_TEST, cdrForm.Get(utils.CDRSOURCE))
+	if cdrForm.Get(utils.Source) != utils.UNIT_TEST {
+		t.Errorf("Expected: %s, received: %s", utils.UNIT_TEST, cdrForm.Get(utils.Source))
 	}
 	if cdrForm.Get(utils.REQTYPE) != utils.META_RATED {
 		t.Errorf("Expected: %s, received: %s", utils.META_RATED, cdrForm.Get(utils.REQTYPE))
@@ -561,7 +561,7 @@ func TestCDRAsMapStringIface(t *testing.T) {
 		utils.MEDI_RUNID:   utils.DEFAULT_RUNID,
 		utils.ORDERID:      cdr.OrderID,
 		utils.OriginHost:   "192.168.1.1",
-		utils.CDRSOURCE:    utils.UNIT_TEST,
+		utils.Source:       utils.UNIT_TEST,
 		utils.ACCID:        "dsafdsaf",
 		utils.TOR:          utils.VOICE,
 		utils.REQTYPE:      utils.META_RATED,
diff --git a/engine/cgrcdr.go b/engine/cgrcdr.go
index da948a574..d44f5c462 100644
--- a/engine/cgrcdr.go
+++ b/engine/cgrcdr.go
@@ -31,7 +31,7 @@ func NewCgrCdrFromHttpReq(req *http.Request, timezone string) (CgrCdr, error) {
 		}
 	}
 	cgrCdr := make(CgrCdr)
-	cgrCdr[utils.CDRSOURCE] = req.RemoteAddr
+	cgrCdr[utils.Source] = req.RemoteAddr
 	for k, vals := range req.Form {
 		cgrCdr[k] = vals[0] // We only support the first value for now, if more are provided it is considered remote's fault
 	}
@@ -64,7 +64,7 @@ func (cgrCdr CgrCdr) AsCDR(timezone string) *CDR {
 	storCdr.ToR = cgrCdr[utils.TOR]
 	storCdr.OriginID = cgrCdr[utils.ACCID]
 	storCdr.OriginHost = cgrCdr[utils.OriginHost]
-	storCdr.Source = cgrCdr[utils.CDRSOURCE]
+	storCdr.Source = cgrCdr[utils.Source]
 	storCdr.RequestType = cgrCdr[utils.REQTYPE]
 	storCdr.Tenant = cgrCdr[utils.Tenant]
 	storCdr.Category = cgrCdr[utils.CATEGORY]
diff --git a/engine/cgrcdr_test.go b/engine/cgrcdr_test.go
index f05def80b..8f863b532 100644
--- a/engine/cgrcdr_test.go
+++ b/engine/cgrcdr_test.go
@@ -34,7 +34,7 @@ func TestCgrCdrInterfaces(t *testing.T) {
 
 func TestCgrCdrAsCDR(t *testing.T) {
 	cgrCdr := CgrCdr{utils.TOR: utils.VOICE, utils.ACCID: "dsafdsaf", utils.OriginHost: "192.168.1.1",
-		utils.CDRSOURCE: "internal_test", utils.REQTYPE: utils.META_RATED,
+		utils.Source: "internal_test", utils.REQTYPE: utils.META_RATED,
 		utils.Tenant: "cgrates.org", utils.CATEGORY: "call",
 		utils.Account: "1001", utils.SUBJECT: "1001", utils.Destination: "1002",
 		utils.SetupTime: "2013-11-07T08:42:20Z", utils.AnswerTime: "2013-11-07T08:42:26Z",
@@ -43,7 +43,7 @@ func TestCgrCdrAsCDR(t *testing.T) {
 	expctRtCdr := &CDR{CGRID: utils.Sha1(cgrCdr[utils.ACCID], setupTime.String()),
 		ToR: utils.VOICE, OriginID: cgrCdr[utils.ACCID],
 		OriginHost:  cgrCdr[utils.OriginHost],
-		Source:      cgrCdr[utils.CDRSOURCE],
+		Source:      cgrCdr[utils.Source],
 		RequestType: cgrCdr[utils.REQTYPE],
 		Tenant:      cgrCdr[utils.Tenant], Category: cgrCdr[utils.CATEGORY],
 		Account: cgrCdr[utils.Account], Subject: cgrCdr[utils.SUBJECT],
@@ -60,7 +60,7 @@ func TestCgrCdrAsCDR(t *testing.T) {
 // Make sure the replicated CDR matches the expected CDR
 func TestReplicatedCgrCdrAsCDR(t *testing.T) {
 	cgrCdr := CgrCdr{utils.CGRID: "164b0422fdc6a5117031b427439482c6a4f90e41", utils.TOR: utils.VOICE, utils.ACCID: "dsafdsaf", utils.OriginHost: "192.168.1.1",
-		utils.CDRSOURCE: "internal_test", utils.REQTYPE: utils.META_RATED,
+		utils.Source: "internal_test", utils.REQTYPE: utils.META_RATED,
 		utils.DIRECTION: utils.OUT, utils.Tenant: "cgrates.org", utils.CATEGORY: "call",
 		utils.Account: "1001", utils.SUBJECT: "1001", utils.Destination: "1002", utils.SetupTime: "2013-11-07T08:42:20Z", utils.PDD: "0.200", utils.AnswerTime: "2013-11-07T08:42:26Z",
 		utils.Usage: "10s", utils.SUPPLIER: "SUPPL1", utils.DISCONNECT_CAUSE: "NORMAL_CLEARING", utils.COST: "0.12", utils.RATED: "true", "field_extr1": "val_extr1", "fieldextr2": "valextr2"}
@@ -68,7 +68,7 @@ func TestReplicatedCgrCdrAsCDR(t *testing.T) {
 		ToR:         cgrCdr[utils.TOR],
 		OriginID:    cgrCdr[utils.ACCID],
 		OriginHost:  cgrCdr[utils.OriginHost],
-		Source:      cgrCdr[utils.CDRSOURCE],
+		Source:      cgrCdr[utils.Source],
 		RequestType: cgrCdr[utils.REQTYPE],
 		Tenant:      cgrCdr[utils.Tenant],
 		Category:    cgrCdr[utils.CATEGORY],
diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go
index 542fcee4c..2ac553835 100755
--- a/engine/storage_mongo_datadb.go
+++ b/engine/storage_mongo_datadb.go
@@ -76,7 +76,7 @@ var (
 	OriginIDLow        = strings.ToLower(utils.ACCID)
 	ToRLow             = strings.ToLower(utils.TOR)
 	CDRHostLow         = strings.ToLower(utils.OriginHost)
-	CDRSourceLow       = strings.ToLower(utils.CDRSOURCE)
+	CDRSourceLow       = strings.ToLower(utils.Source)
 	RequestTypeLow     = strings.ToLower(utils.REQTYPE)
 	DirectionLow       = strings.ToLower(utils.DIRECTION)
 	TenantLow          = strings.ToLower(utils.Tenant)
diff --git a/sessionmanager/fsevent.go b/sessionmanager/fsevent.go
index 7831f3490..f740aa8e6 100644
--- a/sessionmanager/fsevent.go
+++ b/sessionmanager/fsevent.go
@@ -271,7 +271,7 @@ func (fsev FSEvent) ParseEventValue(rsrFld *utils.RSRField, timezone string) str
 		return rsrFld.ParseValue(fsev.GetUUID())
 	case utils.OriginHost:
 		return rsrFld.ParseValue(fsev["FreeSWITCH-IPv4"])
-	case utils.CDRSOURCE:
+	case utils.Source:
 		return rsrFld.ParseValue("FS_EVENT")
 	case utils.REQTYPE:
 		return rsrFld.ParseValue(fsev.GetReqType(""))
@@ -375,7 +375,7 @@ func (fsev FSEvent) AsMapStringInterface(timezone string) map[string]interface{}
 	mp[utils.TOR] = utils.VOICE
 	mp[utils.ACCID] = fsev.GetUUID()
 	mp[utils.OriginHost] = fsev.GetOriginatorIP(utils.META_DEFAULT)
-	mp[utils.CDRSOURCE] = "FS_" + fsev.GetName()
+	mp[utils.Source] = "FS_" + fsev.GetName()
 	mp[utils.REQTYPE] = fsev.GetReqType(utils.META_DEFAULT)
 	mp[utils.DIRECTION] = fsev.GetDirection(utils.META_DEFAULT)
 	mp[utils.Tenant] = fsev.GetTenant(utils.META_DEFAULT)
diff --git a/sessionmanager/fsevent_test.go b/sessionmanager/fsevent_test.go
index 363db5707..3d9988218 100644
--- a/sessionmanager/fsevent_test.go
+++ b/sessionmanager/fsevent_test.go
@@ -507,7 +507,7 @@ func TestParseEventValue(t *testing.T) {
 	if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.OriginHost}, ""); parsed != "10.0.3.15" {
 		t.Error("Unexpected result parsed", parsed)
 	}
-	if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.CDRSOURCE}, ""); parsed != "FS_EVENT" {
+	if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.Source}, ""); parsed != "FS_EVENT" {
 		t.Error("Unexpected result parsed", parsed)
 	}
 	if parsed := ev.ParseEventValue(&utils.RSRField{Id: utils.REQTYPE}, ""); parsed != utils.META_PREPAID {
diff --git a/sessionmanager/kamevent.go b/sessionmanager/kamevent.go
index 8587cbfb7..05cdadbf8 100644
--- a/sessionmanager/kamevent.go
+++ b/sessionmanager/kamevent.go
@@ -280,7 +280,7 @@ func (kev KamEvent) ParseEventValue(rsrFld *utils.RSRField, timezone string) str
 		return rsrFld.ParseValue(kev.GetUUID())
 	case utils.OriginHost:
 		return rsrFld.ParseValue(kev.GetOriginatorIP(utils.META_DEFAULT))
-	case utils.CDRSOURCE:
+	case utils.Source:
 		return rsrFld.ParseValue(kev.GetCdrSource())
 	case utils.REQTYPE:
 		return rsrFld.ParseValue(kev.GetReqType(utils.META_DEFAULT))
diff --git a/sessionmanager/smg_event.go b/sessionmanager/smg_event.go
index 2f977821e..b0ef9bdc1 100644
--- a/sessionmanager/smg_event.go
+++ b/sessionmanager/smg_event.go
@@ -371,7 +371,7 @@ func (self SMGenericEvent) ParseEventValue(rsrFld *utils.RSRField, timezone stri
 		return rsrFld.ParseValue(self.GetOriginID(utils.META_DEFAULT))
 	case utils.OriginHost:
 		return rsrFld.ParseValue(self.GetOriginatorIP(utils.META_DEFAULT))
-	case utils.CDRSOURCE:
+	case utils.Source:
 		return rsrFld.ParseValue(self.GetName())
 	case utils.REQTYPE:
 		return rsrFld.ParseValue(self.GetReqType(utils.META_DEFAULT))
diff --git a/utils/consts.go b/utils/consts.go
index bac9067d8..a82283fc6 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -20,7 +20,7 @@ package utils
 
 var (
 	CDRExportFormats = []string{DRYRUN, MetaFileCSV, MetaFileFWV, MetaHTTPjsonCDR, MetaHTTPjsonMap, MetaHTTPjson, META_HTTP_POST, MetaAMQPjsonCDR, MetaAMQPjsonMap}
-	PrimaryCdrFields = []string{CGRID, CDRSOURCE, OriginHost, ACCID, TOR, REQTYPE, DIRECTION, Tenant, CATEGORY, Account, SUBJECT, Destination, SetupTime, PDD, AnswerTime, Usage,
+	PrimaryCdrFields = []string{CGRID, Source, OriginHost, ACCID, TOR, REQTYPE, DIRECTION, Tenant, CATEGORY, Account, SUBJECT, Destination, SetupTime, PDD, AnswerTime, Usage,
 		SUPPLIER, DISCONNECT_CAUSE, COST, RATED, PartialField, MEDI_RUNID}
 	GitLastLog                  string // If set, it will be processed as part of versioning
 	PosterTransportContentTypes = map[string]string{
@@ -123,7 +123,7 @@ const (
 	ACCID                           = "OriginID"
 	InitialOriginID                 = "InitialOriginID"
 	OriginIDPrefix                  = "OriginIDPrefix"
-	CDRSOURCE                       = "Source"
+	Source                          = "Source"
 	OriginHost                      = "OriginHost"
 	REQTYPE                         = "RequestType"
 	DIRECTION                       = "Direction"