diff --git a/analyzer/analyzer.go b/analyzers/analyzers.go
similarity index 95%
rename from analyzer/analyzer.go
rename to analyzers/analyzers.go
index 8403f1dfb..6348ab5fa 100755
--- a/analyzer/analyzer.go
+++ b/analyzers/analyzers.go
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-package analyzer
+package analyzers
 
 import (
 	"fmt"
diff --git a/apier/v1/analyzer.go b/apier/v1/analyzer.go
index 9f26e6ad1..05fae1b90 100755
--- a/apier/v1/analyzer.go
+++ b/apier/v1/analyzer.go
@@ -19,18 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package v1
 
 import (
-	"github.com/cgrates/cgrates/analyzer"
+	"github.com/cgrates/cgrates/analyzers"
 	"github.com/cgrates/cgrates/utils"
 )
 
 // NewAnalyzerSv1 initializes AnalyzerSv1
-func NewAnalyzerSv1(aS *analyzer.AnalyzerService) *AnalyzerSv1 {
+func NewAnalyzerSv1(aS *analyzers.AnalyzerService) *AnalyzerSv1 {
 	return &AnalyzerSv1{aS: aS}
 }
 
 // Exports RPC from RLs
 type AnalyzerSv1 struct {
-	aS *analyzer.AnalyzerService
+	aS *analyzers.AnalyzerService
 }
 
 // Call implements rpcclient.RpcClientConnection interface for internal RPC
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index 53a63a230..a35ee1237 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"github.com/cgrates/cgrates/agents"
-	"github.com/cgrates/cgrates/analyzer"
+	"github.com/cgrates/cgrates/analyzers"
 	"github.com/cgrates/cgrates/apier/v1"
 	"github.com/cgrates/cgrates/apier/v2"
 	"github.com/cgrates/cgrates/cdrc"
@@ -1133,7 +1133,7 @@ func startAnalyzerService(internalAnalyzerSChan chan rpcclient.RpcClientConnecti
 	server *utils.Server, exitChan chan bool) {
 	utils.Logger.Info("Starting CGRateS Analyzer service.")
 	var err error
-	aS, err := analyzer.NewAnalyzerService()
+	aS, err := analyzers.NewAnalyzerService()
 	if err != nil {
 		utils.Logger.Crit(fmt.Sprintf("<%s> Could not init, error: %s", utils.AnalyzerS, err.Error()))
 		exitChan <- true
diff --git a/config/analyzercfg.go b/config/analyzerscfg.go
similarity index 100%
rename from config/analyzercfg.go
rename to config/analyzerscfg.go
diff --git a/config/config_defaults.go b/config/config_defaults.go
index 62d1566a8..1fd836086 100755
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -711,7 +711,7 @@ const CGRATES_CFG_JSON = `
 },
 
 
-"analyzer":{
+"analyzers":{
 	"enabled":false							// starts AnalyzerS service: <true|false>.
 },
 
diff --git a/config/config_json.go b/config/config_json.go
index de87249f9..b0608239f 100644
--- a/config/config_json.go
+++ b/config/config_json.go
@@ -67,7 +67,7 @@ const (
 	CgrMigratorCfgJson = "migrator"
 	ChargerSCfgJson    = "chargers"
 	TlsCfgJson         = "tls"
-	AnalyzerCfgJson    = "analyzer"
+	AnalyzerCfgJson    = "analyzers"
 )
 
 // Loads the json config out of io.Reader, eg other sources than file, maybe over http
diff --git a/console/ping.go b/console/ping.go
index 621d46b6b..b8b328507 100644
--- a/console/ping.go
+++ b/console/ping.go
@@ -63,11 +63,11 @@ func (self *CmdApierPing) RpcMethod() string {
 		return utils.ThresholdSv1Ping
 	case utils.SessionsLow:
 		return utils.SessionSv1Ping
-	case utils.LoaderLow:
+	case utils.LoaderSLow:
 		return utils.LoaderSv1Ping
-	case utils.DispatcherLow:
+	case utils.DispatcherSLow:
 		return utils.DispatcherSv1Ping
-	case utils.AnalyzerLow:
+	case utils.AnalyzerSLow:
 		return utils.AnalyzerSv1Ping
 	default:
 	}
diff --git a/utils/consts.go b/utils/consts.go
index cb13f8790..c401cd41b 100755
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -575,9 +575,9 @@ const (
 	ResourcesLow   = "resources"
 	StatServiceLow = "stats"
 	ThresholdsLow  = "thresholds"
-	DispatcherLow  = "dispatcher"
-	AnalyzerLow    = "analyzer"
-	LoaderLow      = "loader"
+	DispatcherSLow = "dispatchers"
+	AnalyzerSLow   = "analyzers"
+	LoaderSLow     = "loaders"
 )
 
 // Migrator Metas