diff --git a/data/docker/devel/start.sh b/data/docker/devel/start.sh
index 23fd27a1e..564ca7fe4 100755
--- a/data/docker/devel/start.sh
+++ b/data/docker/devel/start.sh
@@ -41,7 +41,7 @@ cd /usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/ && tar xzf freeswitch_
 #cd /root/.oh-my-zsh; git pull
 
 cd /root/cgr
-echo "for cgradmin run: cgr-engine -config_dir data/conf/samples/cgradmin"
+echo "for cgradmin run: cgr-engine -config_path data/conf/samples/cgradmin"
 echo 'export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$GOROOT/bin:$GOPATH/bin:$PATH'>>/root/.zshrc
 
 DISABLE_AUTO_UPDATE="true" zsh
diff --git a/data/docker/osips_training/start.sh b/data/docker/osips_training/start.sh
index 95fcbecb6..c5ffee387 100755
--- a/data/docker/osips_training/start.sh
+++ b/data/docker/osips_training/start.sh
@@ -5,7 +5,7 @@ sed -i 's/127.0.0.1/0.0.0.0/g' /etc/redis/redis.conf /etc/mysql/my.cnf
 service rsyslog start
 service mysql start
 service redis-server start
-/root/code/bin/cgr-engine -config_dir /root/cgr/data/conf/samples/osips_training
+/root/code/bin/cgr-engine -config_path /root/cgr/data/conf/samples/osips_training
 
 # setup mysql
 cd /usr/share/cgrates/storage/mysql && ./setup_cgr_db.sh root CGRateS.org
diff --git a/data/docker/prod/start.sh b/data/docker/prod/start.sh
index bca4c6535..c563e6e91 100755
--- a/data/docker/prod/start.sh
+++ b/data/docker/prod/start.sh
@@ -8,7 +8,7 @@ cd /usr/share/cgrates/storage/postgres && ./setup_cgr_db.sh
 /usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/init.d/freeswitch start
  
 # Docker doesn't have syslog. Let others modify this to send out logs if needed
-sed -i 's/config_dir/config_path/g' /usr/share/cgrates/tutorials/fs_evsock/cgrates/etc/init.d/cgrates
+sed -i 's/config_path/config_path/g' /usr/share/cgrates/tutorials/fs_evsock/cgrates/etc/init.d/cgrates
 sed -i 's/\/etc\/cgrates/\/etc\/cgrates -httprof_path=\/pprof -logger=*stdout/g' /usr/share/cgrates/tutorials/fs_evsock/cgrates/etc/init.d/cgrates
 
 # Get our data ready
diff --git a/docs/architecture.rst b/docs/architecture.rst
index 1602d8252..d3537c9c9 100644
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -53,7 +53,7 @@ it will start on demand **one or more** service(s), outlined below.
  Usage of cgr-engine:
    -cdrs
          Enforce starting of the cdrs daemon overwriting config
-   -config_dir string
+   -config_path string
          Configuration directory path. (default "/etc/cgrates/")
    -cpuprofile string
          write cpu profile to file
@@ -71,7 +71,7 @@ it will start on demand **one or more** service(s), outlined below.
          Prints the application version.
 
 
-.. hint::  # cgr-engine -config_dir=/etc/cgrates
+.. hint::  # cgr-engine -config_path=/etc/cgrates
 
 
 2.1.1. RALs service
diff --git a/general_tests/suretax_it_test.go b/general_tests/suretax_it_test.go
index 64cfbfda9..2523bcc3b 100644
--- a/general_tests/suretax_it_test.go
+++ b/general_tests/suretax_it_test.go
@@ -38,7 +38,7 @@ Integration tests with SureTax platform.
 Configuration file is kept outside of CGRateS repository since it contains sensitive customer information
 */
 
-var configDir = flag.String("config_dir", "", "CGR config dir path here")
+var configDir = flag.String("config_path", "", "CGR config dir path here")
 var tpDir = flag.String("tp_dir", "", "CGR config dir path here")
 
 var stiCfg *config.CGRConfig