diff --git a/apis/account.go b/apis/account.go
index b73694805..9c52e58b3 100644
--- a/apis/account.go
+++ b/apis/account.go
@@ -68,9 +68,9 @@ func (admS *AdminSv1) GetAccountIDs(ctx *context.Context, args *utils.PaginatorW
 	return nil
 }
 
-// GetAccountIDsCount sets in reply var the total number of AccountIDs registered for a tenant
+// GetAccountsCount sets in reply var the total number of AccountIDs registered for a tenant
 // returns ErrNotFound in case of 0 AccountIDs
-func (admS *AdminSv1) GetAccountIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+func (admS *AdminSv1) GetAccountsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = admS.cfg.GeneralCfg().DefaultTenant
diff --git a/apis/actions.go b/apis/actions.go
index defaf3de7..218932dd4 100644
--- a/apis/actions.go
+++ b/apis/actions.go
@@ -69,9 +69,9 @@ func (admS *AdminSv1) GetActionProfileIDs(ctx *context.Context, args *utils.Pagi
 	return nil
 }
 
-// GetActionProfileIDsCount sets in reply var the total number of ActionProfileIDs registered for a tenant
+// GetActionProfilesCount sets in reply var the total number of ActionProfileIDs registered for a tenant
 // returns ErrNotFound in case of 0 ActionProfileIDs
-func (admS *AdminSv1) GetActionProfileIDsCount(ctx *context.Context, args *utils.TenantIDWithAPIOpts, reply *int) (err error) {
+func (admS *AdminSv1) GetActionProfilesCount(ctx *context.Context, args *utils.TenantIDWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = admS.cfg.GeneralCfg().DefaultTenant
diff --git a/apis/attributes.go b/apis/attributes.go
index d81a45a33..8b0fded7c 100644
--- a/apis/attributes.go
+++ b/apis/attributes.go
@@ -69,9 +69,9 @@ func (admS *AdminSv1) GetAttributeProfileIDs(ctx *context.Context, args *utils.P
 	return nil
 }
 
-// GetAttributeProfileIDsCount returns the total number of AttributeProfileIDs registered for a tenant
+// GetAttributeProfilesCount returns the total number of AttributeProfileIDs registered for a tenant
 // returns ErrNotFound in case of 0 AttributeProfileIDs
-func (admS *AdminSv1) GetAttributeProfileIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+func (admS *AdminSv1) GetAttributeProfilesCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = admS.cfg.GeneralCfg().DefaultTenant
diff --git a/apis/filters.go b/apis/filters.go
index 099250e3a..00c0d9346 100644
--- a/apis/filters.go
+++ b/apis/filters.go
@@ -128,7 +128,9 @@ func (adms *AdminSv1) RemoveFilter(ctx *context.Context, arg *utils.TenantIDWith
 	return nil
 }
 
-func (admS *AdminSv1) GetFilterIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+// GetFiltersCount returns the total number of FilterIDs registered for a tenant
+// returns ErrNotFound in case of 0 FilterIDs
+func (admS *AdminSv1) GetFiltersCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = admS.cfg.GeneralCfg().DefaultTenant
diff --git a/apis/rates.go b/apis/rates.go
index 73d06dc9f..3e3c849d4 100644
--- a/apis/rates.go
+++ b/apis/rates.go
@@ -69,9 +69,9 @@ func (admS *AdminSv1) GetRateProfileIDs(ctx *context.Context, args *utils.Pagina
 	return nil
 }
 
-// GetRateProfileIDsCount returns the total number of RateProfileIDs registered for a tenant
+// GetRateProfilesCount returns the total number of RateProfileIDs registered for a tenant
 // returns ErrNotFound in case of 0 RateProfileIDs
-func (admS *AdminSv1) GetRateProfileIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+func (admS *AdminSv1) GetRateProfilesCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = admS.cfg.GeneralCfg().DefaultTenant
diff --git a/apis/resources.go b/apis/resources.go
index bb353f040..a1e746b47 100644
--- a/apis/resources.go
+++ b/apis/resources.go
@@ -64,7 +64,7 @@ func (adms *AdminSv1) GetResourceProfileIDs(ctx *context.Context, args *utils.Pa
 
 // GetResourceProfileIDsCount returns the total number of ResourceProfileIDs registered for a tenant
 // returns ErrNotFound in case of 0 ResourceProfileIDs
-func (admS *AdminSv1) GetResourceProfileIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+func (admS *AdminSv1) GetResourceProfilesCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = admS.cfg.GeneralCfg().DefaultTenant
diff --git a/apis/thresholds.go b/apis/thresholds.go
index 423710ccb..6411d10d4 100644
--- a/apis/thresholds.go
+++ b/apis/thresholds.go
@@ -62,9 +62,9 @@ func (adms *AdminSv1) GetThresholdProfileIDs(ctx *context.Context, args *utils.P
 	return nil
 }
 
-// GetThresholdProfileIDsCount sets in reply var the total number of ThresholdProfileIDs registered for the received tenant
+// GetThresholdProfilesCount sets in reply var the total number of ThresholdProfileIDs registered for the received tenant
 // returns ErrNotFound in case of 0 ThresholdProfileIDs
-func (adms *AdminSv1) GetThresholdProfileIDsCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
+func (adms *AdminSv1) GetThresholdProfilesCount(ctx *context.Context, args *utils.TenantWithAPIOpts, reply *int) (err error) {
 	tnt := args.Tenant
 	if tnt == utils.EmptyString {
 		tnt = adms.cfg.GeneralCfg().DefaultTenant