diff --git a/config/config_defaults.go b/config/config_defaults.go
index f96d18714..202ba43e5 100644
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -461,16 +461,16 @@ const CGRATES_CFG_JSON = `
 
 
 				// Elasticsearch options
-				// "index": "",									// ElsIndex               	
-				// "if_primary_term": 0,						// ElsIfPrimaryTerm
- 				// "if_seq_no": 0,								// ElsIfSeqNo
-				// "op_type": "",								// ElsOpType
-				// "pipeline": "",								// ElsPipeline
-				// "routing": "",								// ElsRouting
-				// "timeout": "",								// ElsTimeout
-				// "version": 0,								// ElsVersionLow
-				// "version_type": "",							// ElsVersionType
-				// "wait_for_active_shards": "",				// ElsWaitForActiveShards
+				// "elsIndex": "",								// ElsIndex               	
+				// "elsIfPrimaryTerm": 0,						// ElsIfPrimaryTerm
+ 				// "elsIfSeqNo": 0,								// ElsIfSeqNo
+				// "elsOpType": "",								// ElsOpType
+				// "elsPipeline": "",							// ElsPipeline
+				// "elsRouting": "",							// ElsRouting
+				// "elsTimeout": "",							// ElsTimeout
+				// "elsVersion": 0,								// ElsVersionLow
+				// "elsVersionType": "",						// ElsVersionType
+				// "elsWaitForActiveShards": "",				// ElsWaitForActiveShards
 				
 				
 				// SQL
@@ -499,7 +499,7 @@ const CGRATES_CFG_JSON = `
 				// "awsKey": "",								// AWSKey        
 				// "awsSecret": "",								// AWSSecret
 				// "awsToken": "",								// AWSToken      
-				// "awsFolderPath": "",							// AWSFolderPath 
+				// "s3FolderPath": "",							// AWSFolderPath 
 
 			},													// extra options for exporter
 			"tenant": "",										// tenant used in filterS.Pass
diff --git a/data/conf/samples/ees/cgrates.json b/data/conf/samples/ees/cgrates.json
index c07a7a9e0..6023c2fa7 100644
--- a/data/conf/samples/ees/cgrates.json
+++ b/data/conf/samples/ees/cgrates.json
@@ -333,17 +333,19 @@
 			"tenant": "cgrates.org",
 			"attempts": 1,
 			"opts": {
-				"index": "cdrs",
-				//"if_primary_term": 0,
-				//"if_seq_no": 0,
-				"op_type": "",
-				"pipeline": "",
-				"require_alias": "",
-				"routing": "",
-				"timeout": 0,
-				//"version": 0,
-				"version_type": "",
-				"wait_for_active_shards": "",
+				"opts": {
+					"elsIndex": "cdrs",
+					//"elsIfPrimaryTerm": 0,
+					//"elsIfSeqNo": 0,
+					"elsOpType": "",
+					"elsPipeline": "",
+					"require_alias": "",
+					"elsRouting": "",
+					"elsTimeout": 0,
+					//"elsVersion": 0,
+					"elsVersionType": "",
+					"elsWaitForActiveShards": "",
+				}
 			},
 			"fields":[
 				{"tag": "CGRID", "path": "*exp.CGRID", "type": "*variable", "value": "~*req.CGRID"},
diff --git a/utils/consts.go b/utils/consts.go
index 32c00afc5..6873bad97 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -2455,16 +2455,16 @@ const (
 	// EEs
 	OptsEEsVerbose = "*eesVerbose"
 	// EEs Elasticsearch options
-	ElsIndex               = "index"
-	ElsIfPrimaryTerm       = "if_primary_term"
-	ElsIfSeqNo             = "if_seq_no"
-	ElsOpType              = "op_type"
-	ElsPipeline            = "pipeline"
-	ElsRouting             = "routing"
-	ElsTimeout             = "timeout"
-	ElsVersionLow          = "version"
-	ElsVersionType         = "version_type"
-	ElsWaitForActiveShards = "wait_for_active_shards"
+	ElsIndex               = "elsIndex"
+	ElsIfPrimaryTerm       = "elsIfPrimaryTerm"
+	ElsIfSeqNo             = "elsIfSeqNo"
+	ElsOpType              = "elsOpType"
+	ElsPipeline            = "elsPipeline"
+	ElsRouting             = "elsRouting"
+	ElsTimeout             = "elsTimeout"
+	ElsVersionLow          = "elsVersion"
+	ElsVersionType         = "elsVersionType"
+	ElsWaitForActiveShards = "elsWaitForActiveShards"
 	// SQLEe options
 	SQLMaxIdleConns    = "maxIdleConns"
 	SQLMaxOpenConns    = "maxOpenConns"
@@ -2536,7 +2536,7 @@ const (
 	AWSKey        = "awsKey"
 	AWSSecret     = "awsSecret"
 	AWSToken      = "awsToken"
-	AWSFolderPath = "awsFolderPath"
+	AWSFolderPath = "s3FolderPath"
 	KafkaTopic    = "topic"
 	KafkaGroupID  = "groupID"
 	KafkaMaxWait  = "maxWait"