diff --git a/apier/v1/tpattributes_it_test.go b/apier/v1/tpattributes_it_test.go
index ae38adfcd..b7ec8179a 100644
--- a/apier/v1/tpattributes_it_test.go
+++ b/apier/v1/tpattributes_it_test.go
@@ -130,8 +130,8 @@ func testTPAlsPrfSetTPAlsPrf(t *testing.T) {
 			ExpiryTime:     "",
 		},
 		Context: "con1",
-		Substitutes: []*utils.TPRequestSubstitute{
-			&utils.TPRequestSubstitute{
+		Substitutes: []*utils.TPAttributeSubstitute{
+			&utils.TPAttributeSubstitute{
 				FieldName: "FL1",
 				Initial:   "In1",
 				Alias:     "Al1",
@@ -168,14 +168,14 @@ func testTPAlsPrfGetTPAlsPrfIDs(t *testing.T) {
 }
 
 func testTPAlsPrfUpdateTPAlsPrf(t *testing.T) {
-	tpAlsPrf.Substitutes = []*utils.TPRequestSubstitute{
-		&utils.TPRequestSubstitute{
+	tpAlsPrf.Substitutes = []*utils.TPAttributeSubstitute{
+		&utils.TPAttributeSubstitute{
 			FieldName: "FL1",
 			Initial:   "In1",
 			Alias:     "Al1",
 			Append:    true,
 		},
-		&utils.TPRequestSubstitute{
+		&utils.TPAttributeSubstitute{
 			FieldName: "FL2",
 			Initial:   "In2",
 			Alias:     "Al2",
diff --git a/engine/datamanager_it_test.go b/engine/datamanager_it_test.go
index 07c06e19b..71116ea4d 100644
--- a/engine/datamanager_it_test.go
+++ b/engine/datamanager_it_test.go
@@ -62,11 +62,11 @@ func TestDMitMongo(t *testing.T) {
 		mgoITCfg.StorDBName, mgoITCfg.StorDBUser, mgoITCfg.StorDBPass,
 		utils.StorDB, nil, mgoITCfg.CacheCfg(), mgoITCfg.LoadHistorySize)
 	if err != nil {
-		t.Fatal("Could not connect to Redis", err.Error())
+		t.Fatal("Could not connect to Mongo", err.Error())
 	}
 	dm2 = NewDataManager(dataDB)
 	for _, stest := range sTestsDMit {
-		t.Run("TestDMitRedis", stest)
+		t.Run("TestDMitMongo", stest)
 	}
 }
 
diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go
index 92d70f526..aad3fb734 100755
--- a/engine/loader_csv_test.go
+++ b/engine/loader_csv_test.go
@@ -1676,14 +1676,14 @@ func TestLoadAttributeProfiles(t *testing.T) {
 				ActivationTime: "2014-07-29T15:00:00Z",
 			},
 			Context: "con1",
-			Substitutes: []*utils.TPRequestSubstitute{
-				&utils.TPRequestSubstitute{
+			Substitutes: []*utils.TPAttributeSubstitute{
+				&utils.TPAttributeSubstitute{
 					FieldName: "Field1",
 					Initial:   "Initial1",
 					Alias:     "Alias1",
 					Append:    true,
 				},
-				&utils.TPRequestSubstitute{
+				&utils.TPAttributeSubstitute{
 					FieldName: "Field2",
 					Initial:   "Initial2",
 					Alias:     "Alias2",
diff --git a/engine/model_helpers.go b/engine/model_helpers.go
index 8b46f3dc5..9818d21c8 100755
--- a/engine/model_helpers.go
+++ b/engine/model_helpers.go
@@ -2670,7 +2670,7 @@ func (tps TPAttributes) AsTPAttributes() (result []*utils.TPAttribute) {
 			th.Context = tp.Context
 		}
 		if tp.FieldName != "" {
-			th.Substitutes = append(th.Substitutes, &utils.TPRequestSubstitute{
+			th.Substitutes = append(th.Substitutes, &utils.TPAttributeSubstitute{
 				FieldName: tp.FieldName,
 				Initial:   tp.Initial,
 				Alias:     tp.Alias,
diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go
index 6e70595e1..2067b577e 100755
--- a/engine/model_helpers_test.go
+++ b/engine/model_helpers_test.go
@@ -1071,8 +1071,8 @@ func TestAPItoAttributeProfile(t *testing.T) {
 			ActivationTime: "2014-07-14T14:35:00Z",
 			ExpiryTime:     "",
 		},
-		Substitutes: []*utils.TPRequestSubstitute{
-			&utils.TPRequestSubstitute{
+		Substitutes: []*utils.TPAttributeSubstitute{
+			&utils.TPAttributeSubstitute{
 				FieldName: "FL1",
 				Initial:   "In1",
 				Alias:     "Al1",
@@ -1118,8 +1118,8 @@ func TestAPItoModelTPAttribute(t *testing.T) {
 			ActivationTime: "2014-07-14T14:35:00Z",
 			ExpiryTime:     "",
 		},
-		Substitutes: []*utils.TPRequestSubstitute{
-			&utils.TPRequestSubstitute{
+		Substitutes: []*utils.TPAttributeSubstitute{
+			&utils.TPAttributeSubstitute{
 				FieldName: "FL1",
 				Initial:   "In1",
 				Alias:     "Al1",
@@ -1175,8 +1175,8 @@ func TestModelAsTPAttribute(t *testing.T) {
 			ActivationTime: "2014-07-14T14:35:00Z",
 			ExpiryTime:     "",
 		},
-		Substitutes: []*utils.TPRequestSubstitute{
-			&utils.TPRequestSubstitute{
+		Substitutes: []*utils.TPAttributeSubstitute{
+			&utils.TPAttributeSubstitute{
 				FieldName: "FL1",
 				Initial:   "In1",
 				Alias:     "Al1",
diff --git a/utils/apitpdata.go b/utils/apitpdata.go
index 91665727c..4abe92d88 100755
--- a/utils/apitpdata.go
+++ b/utils/apitpdata.go
@@ -1382,7 +1382,7 @@ type TPSupplier struct {
 	Weight             float64
 }
 
-type TPRequestSubstitute struct {
+type TPAttributeSubstitute struct {
 	FieldName string
 	Initial   string
 	Alias     string
@@ -1396,6 +1396,6 @@ type TPAttribute struct {
 	FilterIDs          []string
 	ActivationInterval *TPActivationInterval // Time when this limit becomes active and expires
 	Context            string                // bind this TPAttribute to specific context
-	Substitutes        []*TPRequestSubstitute
+	Substitutes        []*TPAttributeSubstitute
 	Weight             float64
 }