diff --git a/agents/agentreq.go b/agents/agentreq.go
index e5981bb97..5e57efa53 100644
--- a/agents/agentreq.go
+++ b/agents/agentreq.go
@@ -74,9 +74,9 @@ func (ar *AgentRequest) FieldAsInterface(fldPath []string) (val interface{}, err
 		return ar.Request.FieldAsInterface(fldPath[1:])
 	case utils.MetaVars:
 		return ar.Vars.FieldAsInterface(fldPath[1:])
-	case utils.MetaCGRRequest:
+	case utils.MetaCgreq:
 		return ar.CGRRequest.FieldAsInterface(fldPath[1:])
-	case utils.MetaCGRReply:
+	case utils.MetaCgrep:
 		return ar.CGRReply.FieldAsInterface(fldPath[1:])
 	case utils.MetaRep:
 		return ar.Reply.FieldAsInterface(fldPath[1:])
@@ -92,9 +92,9 @@ func (ar *AgentRequest) FieldAsString(fldPath []string) (val string, err error)
 		return ar.Request.FieldAsString(fldPath[1:])
 	case utils.MetaVars:
 		return ar.Vars.FieldAsString(fldPath[1:])
-	case utils.MetaCGRRequest:
+	case utils.MetaCgreq:
 		return ar.CGRRequest.FieldAsString(fldPath[1:])
-	case utils.MetaCGRReply:
+	case utils.MetaCgrep:
 		return ar.CGRReply.FieldAsString(fldPath[1:])
 	case utils.MetaRep:
 		return ar.Reply.FieldAsString(fldPath[1:])
diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go
index 4e3a7de9e..4484eda79 100644
--- a/agents/agentreq_test.go
+++ b/agents/agentreq_test.go
@@ -61,42 +61,42 @@ func TestAgReqAsNavigableMap(t *testing.T) {
 			Value: utils.ParseRSRFieldsMustCompile("^cgrates.org", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "Account",
 			FieldId: utils.Account, Type: utils.META_COMPOSED,
-			Value: utils.ParseRSRFieldsMustCompile("*cgrRequest.Account", utils.INFIELD_SEP)},
+			Value: utils.ParseRSRFieldsMustCompile("*cgreq.Account", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "Destination",
 			FieldId: utils.Destination, Type: utils.META_COMPOSED,
-			Value: utils.ParseRSRFieldsMustCompile("*cgrRequest.Destination", utils.INFIELD_SEP)},
+			Value: utils.ParseRSRFieldsMustCompile("*cgreq.Destination", utils.INFIELD_SEP)},
 
 		&config.CfgCdrField{Tag: "RequestedUsageVoice",
 			FieldId: "RequestedUsage", Type: utils.META_COMPOSED,
-			Filters: []string{"*string:*cgrRequest.ToR:*voice"},
+			Filters: []string{"*string:*cgreq.ToR:*voice"},
 			Value: utils.ParseRSRFieldsMustCompile(
-				"*cgrRequest.Usage{*duration_seconds}", utils.INFIELD_SEP)},
+				"*cgreq.Usage{*duration_seconds}", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "RequestedUsageData",
 			FieldId: "RequestedUsage", Type: utils.META_COMPOSED,
-			Filters: []string{"*string:*cgrRequest.ToR:*data"},
+			Filters: []string{"*string:*cgreq.ToR:*data"},
 			Value: utils.ParseRSRFieldsMustCompile(
-				"*cgrRequest.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)},
+				"*cgreq.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "RequestedUsageSMS",
 			FieldId: "RequestedUsage", Type: utils.META_COMPOSED,
-			Filters: []string{"*string:*cgrRequest.ToR:*sms"},
+			Filters: []string{"*string:*cgreq.ToR:*sms"},
 			Value: utils.ParseRSRFieldsMustCompile(
-				"*cgrRequest.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)},
+				"*cgreq.Usage{*duration_nanoseconds}", utils.INFIELD_SEP)},
 
 		&config.CfgCdrField{Tag: "AttrPaypalAccount",
 			FieldId: "PaypalAccount", Type: utils.META_COMPOSED,
-			Filters: []string{"*string:*cgrReply.Error:"},
+			Filters: []string{"*string:*cgrep.Error:"},
 			Value: utils.ParseRSRFieldsMustCompile(
-				"*cgrReply.Attributes.PaypalAccount", utils.INFIELD_SEP)},
+				"*cgrep.Attributes.PaypalAccount", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "MaxUsage",
 			FieldId: "MaxUsage", Type: utils.META_COMPOSED,
-			Filters: []string{"*string:*cgrReply.Error:"},
+			Filters: []string{"*string:*cgrep.Error:"},
 			Value: utils.ParseRSRFieldsMustCompile(
-				"*cgrReply.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)},
+				"*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "Error",
 			FieldId: "Error", Type: utils.META_COMPOSED,
-			Filters: []string{"*rsr::*cgrReply.Error(!^$)"},
+			Filters: []string{"*rsr::*cgrep.Error(!^$)"},
 			Value: utils.ParseRSRFieldsMustCompile(
-				"*cgrReply.Error", utils.INFIELD_SEP)},
+				"*cgrep.Error", utils.INFIELD_SEP)},
 	}
 	eMp := engine.NewNavigableMap(nil)
 	eMp.Set([]string{utils.Tenant}, []*engine.NMItem{
diff --git a/agents/librad_test.go b/agents/librad_test.go
index 080aba83b..700d0ce79 100644
--- a/agents/librad_test.go
+++ b/agents/librad_test.go
@@ -136,9 +136,9 @@ func TestRadReplyAppendAttributes(t *testing.T) {
 	rply := radigo.NewPacket(radigo.AccessRequest, 2, dictRad, coder, "CGRateS.org").Reply()
 	rplyFlds := []*config.CfgCdrField{
 		&config.CfgCdrField{Tag: "ReplyCode", FieldId: MetaRadReplyCode, Type: utils.META_COMPOSED,
-			Value: utils.ParseRSRFieldsMustCompile("*cgrReply.Attributes.RadReply", utils.INFIELD_SEP)},
+			Value: utils.ParseRSRFieldsMustCompile("*cgrep.Attributes.RadReply", utils.INFIELD_SEP)},
 		&config.CfgCdrField{Tag: "Acct-Session-Time", FieldId: "Acct-Session-Time", Type: utils.META_COMPOSED,
-			Value: utils.ParseRSRFieldsMustCompile("*cgrReply.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)},
+			Value: utils.ParseRSRFieldsMustCompile("*cgrep.MaxUsage{*duration_seconds}", utils.INFIELD_SEP)},
 	}
 	agReq := newAgentRequest(nil, nil, "cgrates.org", nil)
 	agReq.CGRReply.Set([]string{utils.CapMaxUsage}, time.Duration(time.Hour), false)
diff --git a/data/conf/samples/httpagent/httpagent.json b/data/conf/samples/httpagent/httpagent.json
index e0d847a31..223ddebe2 100644
--- a/data/conf/samples/httpagent/httpagent.json
+++ b/data/conf/samples/httpagent/httpagent.json
@@ -50,7 +50,7 @@
 					{"tag": "Allow", "field_id": "response.Allow", "type": "*constant", 
 						"value": "1", "mandatory": true},
 					{"tag": "MaxDuration", "field_id": "response.MaxDuration", "type": "*composed", 
-						"value": "*cgrReply.MaxUsage{*duration_seconds}", "mandatory": true},
+						"value": "*cgrep.MaxUsage{*duration_seconds}", "mandatory": true},
 				],
 			},
 			{
diff --git a/data/conf/samples/radagent/cgrates.json b/data/conf/samples/radagent/cgrates.json
index 40c95e876..5eea84182 100644
--- a/data/conf/samples/radagent/cgrates.json
+++ b/data/conf/samples/radagent/cgrates.json
@@ -98,7 +98,7 @@
 			],
 			"reply_fields":[
 				{"tag": "MaxUsage", "field_id": "SIP-AVP", "type": "*composed", 
-					"value": "^session_max_time#;*cgrReply.MaxUsage{*duration_seconds}", "mandatory": true},
+					"value": "^session_max_time#;*cgrep.MaxUsage{*duration_seconds}", "mandatory": true},
 			],
 		},
 		{
diff --git a/utils/consts.go b/utils/consts.go
index 77350fba8..9ae76681a 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -478,6 +478,8 @@ const (
 	MetaSessionS                 = "*sessions"
 	MetaDefault                  = "*default"
 	Error                        = "Error"
+	MetaCgreq                    = "*cgreq"
+	MetaCgrep                    = "*cgrep"
 	MetaCGRRequest               = "*cgrRequest"
 	MetaCGRReply                 = "*cgrReply"
 	CGR_ACD                      = "cgr_acd"