diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go
index 6eb115fb8..07a6e98ed 100755
--- a/cmd/cgr-loader/cgr-loader.go
+++ b/cmd/cgr-loader/cgr-loader.go
@@ -65,7 +65,7 @@ var (
 		"The delay before executing the commands if the redis cluster is in the CLUSTERDOWN state")
 	dbQueryTimeout = cgrLoaderFlags.String("query_timeout", utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.QueryTimeoutCfg]),
 		"The timeout for queries")
-	dbRedisTls               = cgrLoaderFlags.Bool(utils.RedisTLS, false, "Use a tls connection when connecting to redis")
+	dbRedisTls               = cgrLoaderFlags.Bool(utils.RedisTLS, false, "Enable TLS when connecting to Redis")
 	dbRedisClientCertificate = cgrLoaderFlags.String(utils.RedisClientCertificate, utils.EmptyString, "Path to the client certificate")
 	dbRedisClientKey         = cgrLoaderFlags.String(utils.RedisClientKey, utils.EmptyString, "Path to the client key")
 	dbRedisCACertificate     = cgrLoaderFlags.String(utils.RedisCACertificate, utils.EmptyString, "Path to the CA certificate")
diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go
index 000bdd704..8f1a1e090 100755
--- a/cmd/cgr-migrator/cgr-migrator.go
+++ b/cmd/cgr-migrator/cgr-migrator.go
@@ -73,7 +73,7 @@ var (
 		"The delay before executing the commands if the redis cluster is in the CLUSTERDOWN state")
 	dbQueryTimeout = cgrMigratorFlags.String("query_timeout", utils.IfaceAsString(dfltCfg.DataDbCfg().Opts[utils.QueryTimeoutCfg]),
 		"The timeout for queries")
-	dbRedisTls               = cgrMigratorFlags.Bool(utils.RedisTLS, false, "Use a tls connection when connecting to redis")
+	dbRedisTls               = cgrMigratorFlags.Bool(utils.RedisTLS, false, "Enable TLS when connecting to Redis")
 	dbRedisClientCertificate = cgrMigratorFlags.String(utils.RedisClientCertificate, utils.EmptyString, "Path to the client certificate")
 	dbRedisClientKey         = cgrMigratorFlags.String(utils.RedisClientKey, utils.EmptyString, "Path to the client key")
 	dbRedisCACertificate     = cgrMigratorFlags.String(utils.RedisCACertificate, utils.EmptyString, "Path to the CA certificate")
diff --git a/config/config_defaults.go b/config/config_defaults.go
index 433e699bf..885588a7c 100755
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -877,7 +877,7 @@ const CGRATES_CFG_JSON = `
 		"redis_cluster": false,					
 		"redis_cluster_sync": "5s",					
 		"redis_cluster_ondown_delay": "0",
-		"redis_tls": false,					// if true it will use a tls connection and use the redis_client_certificate, redis_client_key and redis_ca_certificate for tls connection
+		"redis_tls": false,					// enable TLS when connecting to Redis and use the redis_client_certificate, redis_client_key and redis_ca_certificate for TLS connection
 		"redis_client_certificate":"",		// path to client certificate
 		"redis_client_key":"",				// path to client key
 		"redis_ca_certificate":"",			// path to CA certificate (populate for self-signed certificate otherwise let it empty)
diff --git a/data/conf/samples/tutredis_cluster/cgrates.json b/data/conf/samples/redis_cluster/cgrates.json
similarity index 100%
rename from data/conf/samples/tutredis_cluster/cgrates.json
rename to data/conf/samples/redis_cluster/cgrates.json
diff --git a/data/conf/samples/tutsentinel/cgrates.json b/data/conf/samples/redis_sentinel/cgrates.json
similarity index 100%
rename from data/conf/samples/tutsentinel/cgrates.json
rename to data/conf/samples/redis_sentinel/cgrates.json
diff --git a/general_tests/redis_cluster_it_test.go b/general_tests/redis_cluster_it_test.go
index 0b1fdb16d..435332074 100644
--- a/general_tests/redis_cluster_it_test.go
+++ b/general_tests/redis_cluster_it_test.go
@@ -67,7 +67,7 @@ var (
 	clsrRPC    *rpc.Client
 
 	clsrNodeCfgPath   = path.Join(*dataDir, "redis_cluster", "node%v.conf")
-	clsrEngineCfgPath = path.Join(*dataDir, "conf", "samples", "tutredis_cluster")
+	clsrEngineCfgPath = path.Join(*dataDir, "conf", "samples", "redis_cluster")
 	clsrNodes         = make(map[string]*exec.Cmd)
 	clsrOutput        = make(map[string]*bytes.Buffer) // in order to debug if something is not working
 	clsrNoNodes       = 6                              // this is the minimum number of nodes for a cluster with 1 replica for each master
diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go
index 227e9a7e2..dd86e6a63 100755
--- a/general_tests/sentinel_it_test.go
+++ b/general_tests/sentinel_it_test.go
@@ -40,7 +40,7 @@ var (
 	node2ConfigPath     = path.Join(*dataDir, "redis_sentinel", "node2.conf")
 	sentinel1ConfigPath = path.Join(*dataDir, "redis_sentinel", "sentinel1.conf")
 	sentinel2ConfigPath = path.Join(*dataDir, "redis_sentinel", "sentinel2.conf")
-	engineConfigPath    = path.Join(*dataDir, "conf", "samples", "tutsentinel")
+	engineConfigPath    = path.Join(*dataDir, "conf", "samples", "redis_sentinel")
 	sentinelConfig      *config.CGRConfig
 	sentinelRPC         *rpc.Client
 	node1Exec           *exec.Cmd