diff --git a/manifests/site.pp b/manifests/site.pp
index fd0ce44ee1..fb0205bbdb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -296,7 +296,7 @@ node /^logstash-worker\d+\.openstack\.org$/ {
 }
 
 node /^elasticsearch\d*\.openstack\.org$/ {
-  class { 'openstack_project::elasticsearch':
+  class { 'openstack_project::elasticsearch_node':
     sysadmins             => hiera('sysadmins'),
     elasticsearch_nodes   => $elasticsearch_nodes,
     elasticsearch_clients => [
diff --git a/modules/openstack_project/manifests/elasticsearch.pp b/modules/openstack_project/manifests/elasticsearch_node.pp
similarity index 97%
rename from modules/openstack_project/manifests/elasticsearch.pp
rename to modules/openstack_project/manifests/elasticsearch_node.pp
index 24fc4fbf70..cc2895a9a4 100644
--- a/modules/openstack_project/manifests/elasticsearch.pp
+++ b/modules/openstack_project/manifests/elasticsearch_node.pp
@@ -14,7 +14,7 @@
 #
 # Elasticsearch server glue class.
 #
-class openstack_project::elasticsearch (
+class openstack_project::elasticsearch_node (
   $elasticsearch_nodes = [],
   $elasticsearch_clients = [],
   $discover_nodes = ['localhost'],