diff --git a/apier/v2/attributes.go b/apier/v2/attributes.go
index f472fdb0e..2499dbbc0 100644
--- a/apier/v2/attributes.go
+++ b/apier/v2/attributes.go
@@ -28,7 +28,7 @@ func (apierV1 *ApierV2) SetExternalAttributeProfile(extAlsPrf *engine.ExternalAt
 	if missing := utils.MissingStructFields(extAlsPrf, []string{"Tenant", "ID"}); len(missing) != 0 {
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
-	alsPrf, err := extAlsPrf.ConvertExtToAttrPrf()
+	alsPrf, err := extAlsPrf.AsAttributeProfile()
 	if err != nil {
 		return utils.APIErrorHandler(err)
 	}
diff --git a/engine/libattributes.go b/engine/libattributes.go
index bdef8c2bd..9cd38bbb0 100644
--- a/engine/libattributes.go
+++ b/engine/libattributes.go
@@ -85,7 +85,7 @@ type ExternalAttributeProfile struct {
 	Weight             float64
 }
 
-func (ext *ExternalAttributeProfile) ConvertExtToAttrPrf() (attr *AttributeProfile, err error) {
+func (ext *ExternalAttributeProfile) AsAttributeProfile() (attr *AttributeProfile, err error) {
 	attr = new(AttributeProfile)
 	if len(ext.Attributes) == 0 {
 		return nil, utils.NewErrMandatoryIeMissing("Attributes")
diff --git a/engine/libattributes_test.go b/engine/libattributes_test.go
index a682e1b89..af6884710 100644
--- a/engine/libattributes_test.go
+++ b/engine/libattributes_test.go
@@ -64,7 +64,7 @@ func TestConvertExternalToProfile(t *testing.T) {
 		Weight: 20,
 	}
 
-	rcv, err := external.ConvertExtToAttrPrf()
+	rcv, err := external.AsAttributeProfile()
 	if err != nil {
 		t.Error(err)
 	}
@@ -89,7 +89,7 @@ func TestConvertExternalToProfileMissing(t *testing.T) {
 		Weight:     20,
 	}
 
-	_, err := external.ConvertExtToAttrPrf()
+	_, err := external.AsAttributeProfile()
 	if err == nil || err.Error() != "MANDATORY_IE_MISSING: [Attributes]" {
 		t.Error(err)
 	}
@@ -114,7 +114,7 @@ func TestConvertExternalToProfileMissing2(t *testing.T) {
 		Weight: 20,
 	}
 
-	_, err := external.ConvertExtToAttrPrf()
+	_, err := external.AsAttributeProfile()
 	if err == nil || err.Error() != "MANDATORY_IE_MISSING: [Substitute]" {
 		t.Error(err)
 	}
diff --git a/engine/ratingprofile.go b/engine/ratingprofile.go
index c018a94f6..6ba07c218 100644
--- a/engine/ratingprofile.go
+++ b/engine/ratingprofile.go
@@ -173,8 +173,8 @@ func (rpf *RatingProfile) GetRatingPlansForPrefix(cd *CallDescriptor) (err error
 			for _, p := range utils.SplitPrefix(cd.Destination, MIN_PREFIX_MATCH) {
 				if destIDs, err := dm.DataDB().GetReverseDestination(p, false, utils.NonTransactional); err == nil {
 					var bestWeight *float64
-					var timeChecker bool
 					for _, dID := range destIDs {
+						var timeChecker bool
 						if _, ok := rpl.DestinationRates[dID]; ok {
 							ril := rpl.RateIntervalList(dID)
 							//check if RateInverval is active for call descriptor time
diff --git a/general_tests/sessions_rpccaching_it_test.go b/general_tests/rpccaching_it_test.go
similarity index 100%
rename from general_tests/sessions_rpccaching_it_test.go
rename to general_tests/rpccaching_it_test.go