diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/config/ElasticsearchRepositoryConfigExtension.java b/src/main/java/org/springframework/data/elasticsearch/repository/config/ElasticsearchRepositoryConfigExtension.java
index e905332fa..99d4ab453 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/config/ElasticsearchRepositoryConfigExtension.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/config/ElasticsearchRepositoryConfigExtension.java
@@ -19,6 +19,7 @@ import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Locale;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -43,6 +44,8 @@ import org.w3c.dom.Element;
  */
 public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport {
 
+	private static final String MODULE_NAME = "Elasticsearch";
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryBeanClassName()
@@ -58,7 +61,12 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 	 */
 	@Override
 	protected String getModulePrefix() {
-		return "elasticsearch";
+		return getModuleIdentifier();
+	}
+
+	@Override
+	public String getModuleName() {
+		return MODULE_NAME;
 	}
 
 	/*
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/config/ReactiveElasticsearchRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/elasticsearch/repository/config/ReactiveElasticsearchRepositoryConfigurationExtension.java
index 1a6e26eb9..430fa1a26 100644
--- a/src/main/java/org/springframework/data/elasticsearch/repository/config/ReactiveElasticsearchRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/config/ReactiveElasticsearchRepositoryConfigurationExtension.java
@@ -35,6 +35,7 @@ import org.w3c.dom.Element;
 public class ReactiveElasticsearchRepositoryConfigurationExtension extends ElasticsearchRepositoryConfigExtension {
 
 	private static final String ELASTICSEARCH_TEMPLATE_REF = "reactive-elasticsearch-template-ref";
+	private static final String MODULE_NAME = "Reactive Elasticsearch";
 
 	/*
 	 * (non-Javadoc)
@@ -42,7 +43,7 @@ public class ReactiveElasticsearchRepositoryConfigurationExtension extends Elast
 	 */
 	@Override
 	public String getModuleName() {
-		return "Reactive Elasticsearch";
+		return MODULE_NAME;
 	}
 
 	/*