diff --git a/analyzers/Elasticsearch/ElasticSearch.json b/analyzers/Elasticsearch/Elasticsearch_Analysis.json
similarity index 96%
rename from analyzers/Elasticsearch/ElasticSearch.json
rename to analyzers/Elasticsearch/Elasticsearch_Analysis.json
index 90f1f0ad4..2cd92909a 100644
--- a/analyzers/Elasticsearch/ElasticSearch.json
+++ b/analyzers/Elasticsearch/Elasticsearch_Analysis.json
@@ -92,4 +92,4 @@
         "required": false
       }
     ]
-  }
\ No newline at end of file
+  }
diff --git a/thehive-templates/Elasticsearch/long.html b/thehive-templates/Elasticsearch_Analysis_1_0/long.html
similarity index 97%
rename from thehive-templates/Elasticsearch/long.html
rename to thehive-templates/Elasticsearch_Analysis_1_0/long.html
index 82f3bab2a..ccf291bf6 100644
--- a/thehive-templates/Elasticsearch/long.html
+++ b/thehive-templates/Elasticsearch_Analysis_1_0/long.html
@@ -185,4 +185,4 @@ <h3>{{content.info.hitcount}} Hit(s)</h3>
     <div class="panel-body">
         {{content.errorMessage}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/thehive-templates/Elasticsearch/short.html b/thehive-templates/Elasticsearch_Analysis_1_0/short.html
similarity index 95%
rename from thehive-templates/Elasticsearch/short.html
rename to thehive-templates/Elasticsearch_Analysis_1_0/short.html
index 1484efab9..6e842baad 100644
--- a/thehive-templates/Elasticsearch/short.html
+++ b/thehive-templates/Elasticsearch_Analysis_1_0/short.html
@@ -1,3 +1,3 @@
 <span class="label" ng-repeat="t in content.taxonomies" ng-class="{'info': 'label-info', 'safe': 'label-success', 'suspicious': 'label-warning', 'malicious':'label-danger'}[t.level]">
     {{t.namespace}}:{{t.predicate}}="{{t.value}}"
-</span>
\ No newline at end of file
+</span>