diff --git a/.gitignore b/.gitignore
index 9181381ee..12f10d844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ dean*
 data/vagrant/.vagrant
 data/vagrant/vagrant_ansible_inventory_default
 data/tutorials/fs_evsock/freeswitch/etc/freeswitch/
-data/tutorials_test/fs_evsock/freeswitch/etc/freeswitch/
+data/tutorial_tests/fs_evsock/freeswitch/etc/freeswitch/
 vendor
 *.test
 glide.lock
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/README b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/README
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/README
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/README
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/ari.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/ari.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/ari.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/ari.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/asterisk.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/asterisk.conf
similarity index 85%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/asterisk.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/asterisk.conf
index cb2ba8367..2a06e2802 100755
--- a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/asterisk.conf
+++ b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/asterisk.conf
@@ -1,5 +1,5 @@
 [directories]
-astetcdir => /usr/share/cgrates/tutorials_test/asterisk_ari/asterisk/etc/asterisk
+astetcdir => /usr/share/cgrates/tutorial_tests/asterisk_ari/asterisk/etc/asterisk
 astspooldir => /tmp/cgr_asterisk_ari/asterisk/spool
 astlogdir => /tmp/cgr_asterisk_ari/asterisk/log
 astrundir => /tmp/cgr_asterisk_ari/asterisk/run
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/cdr.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/cdr.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/cdr.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/cdr.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/cdr_custom.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/cdr_custom.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/cdr_custom.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/cdr_custom.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/confbridge.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/confbridge.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/confbridge.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/confbridge.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/extensions.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/extensions.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/extensions.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/extensions.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/http.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/http.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/http.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/http.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/indications.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/indications.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/indications.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/indications.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/logger.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/logger.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/logger.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/logger.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/manager.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/manager.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/manager.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/manager.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/modules.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/modules.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/modules.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/modules.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/musiconhold.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/musiconhold.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/musiconhold.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/musiconhold.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/pjsip.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/pjsip.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/pjsip.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/pjsip.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/queues.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/queues.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/queues.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/queues.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/voicemail.conf b/data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/voicemail.conf
similarity index 100%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/asterisk/voicemail.conf
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/asterisk/voicemail.conf
diff --git a/data/tutorials_test/asterisk_ari/asterisk/etc/init.d/asterisk b/data/tutorial_tests/asterisk_ari/asterisk/etc/init.d/asterisk
similarity index 98%
rename from data/tutorials_test/asterisk_ari/asterisk/etc/init.d/asterisk
rename to data/tutorial_tests/asterisk_ari/asterisk/etc/init.d/asterisk
index 611d5ca3e..0ea40339e 100755
--- a/data/tutorials_test/asterisk_ari/asterisk/etc/init.d/asterisk
+++ b/data/tutorial_tests/asterisk_ari/asterisk/etc/init.d/asterisk
@@ -20,7 +20,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=asterisk
 DESC="Asterisk PBX"
-TUTDIR=/usr/share/cgrates/tutorials_test/asterisk_ari/asterisk
+TUTDIR=/usr/share/cgrates/tutorial_tests/asterisk_ari/asterisk
 TMP_DIR=/tmp/cgr_asterisk_ari/asterisk
 # Full path to asterisk binary
 DAEMON=/usr/sbin/asterisk
diff --git a/data/tutorials_test/asterisk_ari/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json
similarity index 100%
rename from data/tutorials_test/asterisk_ari/cgrates/etc/cgrates/cgrates.json
rename to data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json
diff --git a/data/tutorials_test/asterisk_ari/cgrates/etc/init.d/cgrates b/data/tutorial_tests/asterisk_ari/cgrates/etc/init.d/cgrates
similarity index 98%
rename from data/tutorials_test/asterisk_ari/cgrates/etc/init.d/cgrates
rename to data/tutorial_tests/asterisk_ari/cgrates/etc/init.d/cgrates
index 85cc228af..ad75161af 100755
--- a/data/tutorials_test/asterisk_ari/cgrates/etc/init.d/cgrates
+++ b/data/tutorial_tests/asterisk_ari/cgrates/etc/init.d/cgrates
@@ -21,7 +21,7 @@ DAEMON=/usr/bin/cgr-engine
 USER=cgrates
 GROUP=cgrates
 DAEMON_OPTS=""
-TUTFOLDER=/usr/share/cgrates/tutorials_test/asterisk_ari/cgrates
+TUTFOLDER=/usr/share/cgrates/tutorial_tests/asterisk_ari/cgrates
 TMP_DIR=/tmp/cgr_astevents/cgrates
 SCRIPTNAME=$TUTFOLDER/etc/init.d/$NAME
 RUNDIR=$TMP_DIR/run
diff --git a/data/tutorials_test/fs_evsock/README.md b/data/tutorial_tests/fs_evsock/README.md
similarity index 100%
rename from data/tutorials_test/fs_evsock/README.md
rename to data/tutorial_tests/fs_evsock/README.md
diff --git a/data/tutorials_test/fs_evsock/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json
similarity index 100%
rename from data/tutorials_test/fs_evsock/cgrates/etc/cgrates/cgrates.json
rename to data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json
diff --git a/data/tutorials_test/fs_evsock/cgrates/etc/init.d/cgrates b/data/tutorial_tests/fs_evsock/cgrates/etc/init.d/cgrates
similarity index 98%
rename from data/tutorials_test/fs_evsock/cgrates/etc/init.d/cgrates
rename to data/tutorial_tests/fs_evsock/cgrates/etc/init.d/cgrates
index 94c7e9c36..f4715b24f 100755
--- a/data/tutorials_test/fs_evsock/cgrates/etc/init.d/cgrates
+++ b/data/tutorial_tests/fs_evsock/cgrates/etc/init.d/cgrates
@@ -21,7 +21,7 @@ DAEMON=/usr/bin/cgr-engine
 USER=cgrates
 GROUP=cgrates
 DAEMON_OPTS=""
-TUTFOLDER=/usr/share/cgrates/tutorials_test/fs_evsock/cgrates
+TUTFOLDER=/usr/share/cgrates/tutorial_tests/fs_evsock/cgrates
 TMP_DIR=/tmp/cgr_fsevsock/cgrates
 SCRIPTNAME=$TUTFOLDER/etc/init.d/$NAME
 RUNDIR=$TMP_DIR/run
diff --git a/data/tutorials_test/fs_evsock/freeswitch/etc/freeswitch_conf.tar.gz b/data/tutorial_tests/fs_evsock/freeswitch/etc/freeswitch_conf.tar.gz
similarity index 100%
rename from data/tutorials_test/fs_evsock/freeswitch/etc/freeswitch_conf.tar.gz
rename to data/tutorial_tests/fs_evsock/freeswitch/etc/freeswitch_conf.tar.gz
diff --git a/data/tutorials_test/fs_evsock/freeswitch/etc/init.d/freeswitch b/data/tutorial_tests/fs_evsock/freeswitch/etc/init.d/freeswitch
similarity index 98%
rename from data/tutorials_test/fs_evsock/freeswitch/etc/init.d/freeswitch
rename to data/tutorial_tests/fs_evsock/freeswitch/etc/init.d/freeswitch
index b7f958e97..5b3fb81b8 100755
--- a/data/tutorials_test/fs_evsock/freeswitch/etc/init.d/freeswitch
+++ b/data/tutorial_tests/fs_evsock/freeswitch/etc/init.d/freeswitch
@@ -18,7 +18,7 @@ NAME=freeswitch
 DAEMON=/usr/bin/freeswitch
 USER=freeswitch
 GROUP=freeswitch
-TUTDIR=/usr/share/cgrates/tutorials_test/fs_evsock/freeswitch
+TUTDIR=/usr/share/cgrates/tutorial_tests/fs_evsock/freeswitch
 SCRIPTNAME=$TUTDIR/etc/init.d/$NAME
 TMP_DIR=/tmp/cgr_fsevsock/freeswitch
 CONFDIR=$TUTDIR/etc/$NAME
diff --git a/data/tutorials_test/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json
similarity index 100%
rename from data/tutorials_test/kamevapi/cgrates/etc/cgrates/cgrates.json
rename to data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json
diff --git a/data/tutorials_test/kamevapi/cgrates/etc/init.d/cgrates b/data/tutorial_tests/kamevapi/cgrates/etc/init.d/cgrates
similarity index 98%
rename from data/tutorials_test/kamevapi/cgrates/etc/init.d/cgrates
rename to data/tutorial_tests/kamevapi/cgrates/etc/init.d/cgrates
index dc8c52376..b9bca8d66 100755
--- a/data/tutorials_test/kamevapi/cgrates/etc/init.d/cgrates
+++ b/data/tutorial_tests/kamevapi/cgrates/etc/init.d/cgrates
@@ -21,7 +21,7 @@ DAEMON=/usr/bin/cgr-engine
 USER=cgrates
 GROUP=cgrates
 DAEMON_OPTS=""
-TUTFOLDER=/usr/share/cgrates/tutorials_test/kamevapi/cgrates
+TUTFOLDER=/usr/share/cgrates/tutorial_tests/kamevapi/cgrates
 TMP_DIR=/tmp/cgr_kamevapi/cgrates
 SCRIPTNAME=$TUTFOLDER/etc/init.d/$NAME
 RUNDIR=$TMP_DIR/run
diff --git a/data/tutorials_test/kamevapi/kamailio/etc/init.d/kamailio b/data/tutorial_tests/kamevapi/kamailio/etc/init.d/kamailio
similarity index 98%
rename from data/tutorials_test/kamevapi/kamailio/etc/init.d/kamailio
rename to data/tutorial_tests/kamevapi/kamailio/etc/init.d/kamailio
index e5e3bf7d4..e1737aa49 100755
--- a/data/tutorials_test/kamevapi/kamailio/etc/init.d/kamailio
+++ b/data/tutorial_tests/kamevapi/kamailio/etc/init.d/kamailio
@@ -18,7 +18,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
 NAME=kamailio
 DESC="Kamailio SIP Server"
-TUTDIR=/usr/share/cgrates/tutorials_test/kamevapi/
+TUTDIR=/usr/share/cgrates/tutorial_tests/kamevapi/
 TMP_DIR=/tmp/cgr_kamevapi/kamailio
 HOMEDIR=$TMP_DIR/run/
 PIDFILE=$HOMEDIR/$NAME.pid
diff --git a/data/tutorials_test/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg b/data/tutorial_tests/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg
similarity index 100%
rename from data/tutorials_test/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg
rename to data/tutorial_tests/kamevapi/kamailio/etc/kamailio/kamailio-cgrates.cfg
diff --git a/data/tutorials_test/kamevapi/kamailio/etc/kamailio/kamailio.cfg b/data/tutorial_tests/kamevapi/kamailio/etc/kamailio/kamailio.cfg
similarity index 100%
rename from data/tutorials_test/kamevapi/kamailio/etc/kamailio/kamailio.cfg
rename to data/tutorial_tests/kamevapi/kamailio/etc/kamailio/kamailio.cfg
diff --git a/data/tutorials_test/osips/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json
similarity index 100%
rename from data/tutorials_test/osips/cgrates/etc/cgrates/cgrates.json
rename to data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json
diff --git a/data/tutorials_test/osips/cgrates/etc/init.d/cgrates b/data/tutorial_tests/osips/cgrates/etc/init.d/cgrates
similarity index 98%
rename from data/tutorials_test/osips/cgrates/etc/init.d/cgrates
rename to data/tutorial_tests/osips/cgrates/etc/init.d/cgrates
index 0e0833e12..5e4069d0c 100755
--- a/data/tutorials_test/osips/cgrates/etc/init.d/cgrates
+++ b/data/tutorial_tests/osips/cgrates/etc/init.d/cgrates
@@ -21,7 +21,7 @@ DAEMON=/usr/bin/cgr-engine
 USER=cgrates
 GROUP=cgrates
 DAEMON_OPTS=""
-TUTFOLDER=/usr/share/cgrates/tutorials_test/osips/$NAME
+TUTFOLDER=/usr/share/cgrates/tutorial_tests/osips/$NAME
 TMP_DIR=/tmp/cgr_osipsnative/$NAME
 SCRIPTNAME=$TUTFOLDER/etc/init.d/$NAME
 RUNDIR=$TMP_DIR/run
diff --git a/data/tutorials_test/osips/opensips/etc/default/opensips b/data/tutorial_tests/osips/opensips/etc/default/opensips
similarity index 100%
rename from data/tutorials_test/osips/opensips/etc/default/opensips
rename to data/tutorial_tests/osips/opensips/etc/default/opensips
diff --git a/data/tutorials_test/osips/opensips/etc/init.d/opensips b/data/tutorial_tests/osips/opensips/etc/init.d/opensips
similarity index 98%
rename from data/tutorials_test/osips/opensips/etc/init.d/opensips
rename to data/tutorial_tests/osips/opensips/etc/init.d/opensips
index 6e2ad2d1f..6f3a97ee3 100755
--- a/data/tutorials_test/osips/opensips/etc/init.d/opensips
+++ b/data/tutorial_tests/osips/opensips/etc/init.d/opensips
@@ -19,7 +19,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/opensips
 NAME=opensips
 DESC=opensips
-TUTDIR=/usr/share/cgrates/tutorials_test/osips/$NAME
+TUTDIR=/usr/share/cgrates/tutorial_tests/osips/$NAME
 SCRIPTNAME=$TUTDIR/etc/init.d/$NAME
 TMP_DIR=/tmp/cgr_osipsnative/$NAME
 CFGFILE=$TUTDIR/etc/$NAME/opensips.cfg
diff --git a/data/tutorials_test/osips/opensips/etc/opensips/opensips.cfg b/data/tutorial_tests/osips/opensips/etc/opensips/opensips.cfg
similarity index 100%
rename from data/tutorials_test/osips/opensips/etc/opensips/opensips.cfg
rename to data/tutorial_tests/osips/opensips/etc/opensips/opensips.cfg
diff --git a/general_tests/tutorial_calls_test.go b/general_tests/tutorial_calls_test.go
index edcc9b757..03a19ee9a 100755
--- a/general_tests/tutorial_calls_test.go
+++ b/general_tests/tutorial_calls_test.go
@@ -42,10 +42,10 @@ var tutorialCallsRpc *rpc.Client
 var tutorialCallsPjSuaListener *os.File
 var waitRater = flag.Int("wait_rater", 1000, "Number of miliseconds to wait for rater to start and cache")
 var dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
-var fsConfig = flag.String("fsConfig", "/usr/share/cgrates/tutorials_test/fs_evsock", "FreeSwitch tutorial folder")
-var kamConfig = flag.String("kamConfig", "/usr/share/cgrates/tutorials_test/kamevapi", "Kamailio tutorial folder")
-var oSipsConfig = flag.String("osConfig", "/usr/share/cgrates/tutorials_test/osips", "OpenSips tutorial folder")
-var ariConf = flag.String("ariConf", "/usr/share/cgrates/tutorials_test/asterisk_ari", "Asterisk tutorial folder")
+var fsConfig = flag.String("fsConfig", "/usr/share/cgrates/tutorial_tests/fs_evsock", "FreeSwitch tutorial folder")
+var kamConfig = flag.String("kamConfig", "/usr/share/cgrates/tutorial_tests/kamevapi", "Kamailio tutorial folder")
+var oSipsConfig = flag.String("osConfig", "/usr/share/cgrates/tutorial_tests/osips", "OpenSips tutorial folder")
+var ariConf = flag.String("ariConf", "/usr/share/cgrates/tutorial_tests/asterisk_ari", "Asterisk tutorial folder")
 var optConf string
 
 var sTestsCalls = []func(t *testing.T){