diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go
index b89648dd4..3f1e98455 100644
--- a/apier/v1/apier_it_test.go
+++ b/apier/v1/apier_it_test.go
@@ -1673,35 +1673,35 @@ func TestApierLoadTariffPlanFromStorDb(t *testing.T) {
 
 func TestApierStartStopServiceStatus(t *testing.T) {
 	var reply string
-	if err := rater.Call(utils.ServManagerV1ServiceStatus, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
+	if err := rater.Call(utils.ServiceManagerV1ServiceStatus, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.RunningCaps {
 		t.Errorf("Received: <%s>", reply)
 	}
-	if err := rater.Call(utils.ServManagerV1StopService, servmanager.ArgStartService{ServiceID: "INVALID"},
+	if err := rater.Call(utils.ServiceManagerV1StopService, servmanager.ArgStartService{ServiceID: "INVALID"},
 		&reply); err == nil || err.Error() != utils.UnsupportedServiceIDCaps {
 		t.Error(err)
 	}
-	if err := rater.Call(utils.ServManagerV1StopService, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
+	if err := rater.Call(utils.ServiceManagerV1StopService, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
 		t.Errorf("Received: <%s>", reply)
 	}
-	if err := rater.Call(utils.ServManagerV1ServiceStatus, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
+	if err := rater.Call(utils.ServiceManagerV1ServiceStatus, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.StoppedCaps {
 		t.Errorf("Received: <%s>", reply)
 	}
-	if err := rater.Call(utils.ServManagerV1StartService, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
+	if err := rater.Call(utils.ServiceManagerV1StartService, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
 		t.Errorf("Received: <%s>", reply)
 	}
-	if err := rater.Call(utils.ServManagerV1ServiceStatus, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
+	if err := rater.Call(utils.ServiceManagerV1ServiceStatus, servmanager.ArgStartService{ServiceID: utils.MetaScheduler},
 		&reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.RunningCaps {
diff --git a/apier/v1/servmanager.go b/apier/v1/servicemanager.go
similarity index 67%
rename from apier/v1/servmanager.go
rename to apier/v1/servicemanager.go
index b7e5ab3d6..facc80083 100644
--- a/apier/v1/servmanager.go
+++ b/apier/v1/servicemanager.go
@@ -23,34 +23,34 @@ import (
 	"github.com/cgrates/cgrates/utils"
 )
 
-func NewServManagerV1(sm *servmanager.ServiceManager) *ServManagerV1 {
-	return &ServManagerV1{sm: sm}
+func NewServiceManagerV1(sm *servmanager.ServiceManager) *ServiceManagerV1 {
+	return &ServiceManagerV1{sm: sm}
 }
 
-type ServManagerV1 struct {
+type ServiceManagerV1 struct {
 	sm *servmanager.ServiceManager // Need to have them capitalize so we can export in V2
 }
 
-func (servManager *ServManagerV1) StartService(args servmanager.ArgStartService, reply *string) (err error) {
+func (servManager *ServiceManagerV1) StartService(args servmanager.ArgStartService, reply *string) (err error) {
 	return servManager.sm.V1StartService(args, reply)
 }
 
-func (servManager *ServManagerV1) StopService(args servmanager.ArgStartService, reply *string) (err error) {
+func (servManager *ServiceManagerV1) StopService(args servmanager.ArgStartService, reply *string) (err error) {
 	return servManager.sm.V1StopService(args, reply)
 }
 
-func (servManager *ServManagerV1) ServiceStatus(args servmanager.ArgStartService, reply *string) (err error) {
+func (servManager *ServiceManagerV1) ServiceStatus(args servmanager.ArgStartService, reply *string) (err error) {
 	return servManager.sm.V1ServiceStatus(args, reply)
 }
 
 // Ping return pong if the service is active
-func (servManager *ServManagerV1) Ping(ign *utils.CGREventWithArgDispatcher, reply *string) error {
+func (servManager *ServiceManagerV1) Ping(ign *utils.CGREventWithArgDispatcher, reply *string) error {
 	*reply = utils.Pong
 	return nil
 }
 
 // Call implements rpcclient.RpcClientConnection interface for internal RPC
-func (servManager *ServManagerV1) Call(serviceMethod string,
+func (servManager *ServiceManagerV1) Call(serviceMethod string,
 	args interface{}, reply interface{}) error {
 	return utils.APIerRPCCall(servManager, serviceMethod, args, reply)
 }
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index c618db658..e95431362 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -1119,10 +1119,10 @@ func initSchedulerS(internalSchedSChan chan rpcclient.RpcClientConnection,
 	internalSchedSChan <- schdS
 }
 
-func initServManagerV1(internalServiceManagerChan chan rpcclient.RpcClientConnection,
+func initServiceManagerV1(internalServiceManagerChan chan rpcclient.RpcClientConnection,
 	srvMngr *servmanager.ServiceManager, server *utils.Server) {
 	if !cfg.DispatcherSCfg().Enabled {
-		server.RpcRegister(v1.NewServManagerV1(srvMngr))
+		server.RpcRegister(v1.NewServiceManagerV1(srvMngr))
 	}
 	internalServiceManagerChan <- srvMngr
 }
@@ -1474,7 +1474,7 @@ func main() {
 		engine.IntRPC.AddInternalRPCClient(utils.StatSv1, internalStatSChan)
 		engine.IntRPC.AddInternalRPCClient(utils.SupplierSv1, internalSupplierSChan)
 		engine.IntRPC.AddInternalRPCClient(utils.ThresholdSv1, internalThresholdSChan)
-		engine.IntRPC.AddInternalRPCClient(utils.ServManagerV1, internalServeManagerChan)
+		engine.IntRPC.AddInternalRPCClient(utils.ServiceManagerV1, internalServeManagerChan)
 	}
 
 	// init CacheS
@@ -1485,7 +1485,7 @@ func main() {
 
 	// Start ServiceManager
 	srvManager := servmanager.NewServiceManager(cfg, dm, exitChan, cacheS)
-	initServManagerV1(internalServeManagerChan, srvManager, server)
+	initServiceManagerV1(internalServeManagerChan, srvManager, server)
 
 	// init SchedulerS
 	initSchedulerS(internalSchedSChan, srvManager, server)
diff --git a/utils/consts.go b/utils/consts.go
index c9d8daad2..57608862c 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -733,11 +733,11 @@ const (
 )
 
 const (
-	ServManagerV1              = "ServManagerV1"
-	ServManagerV1StartService  = "ServManagerV1.StartService"
-	ServManagerV1StopService   = "ServManagerV1.StopService"
-	ServManagerV1ServiceStatus = "ServManagerV1.ServiceStatus"
-	ServManagerV1Ping          = "ServManagerV1.Ping"
+	ServiceManagerV1              = "ServiceManagerV1"
+	ServiceManagerV1StartService  = "ServiceManagerV1.StartService"
+	ServiceManagerV1StopService   = "ServiceManagerV1.StopService"
+	ServiceManagerV1ServiceStatus = "ServiceManagerV1.ServiceStatus"
+	ServiceManagerV1Ping          = "ServiceManagerV1.Ping"
 )
 
 // SupplierS APIs