diff --git a/src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java
similarity index 95%
rename from src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java
rename to src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java
index 0ac274c70..95d761e6e 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/AbstractDefaultIndexOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/AbstractIndexTemplate.java
@@ -46,9 +46,9 @@
  * @author Sascha Woo
  * @since 4.0
  */
-abstract class AbstractDefaultIndexOperations implements IndexOperations {
+abstract class AbstractIndexTemplate implements IndexOperations {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDefaultIndexOperations.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractIndexTemplate.class);
 
 	protected final ElasticsearchConverter elasticsearchConverter;
 	protected final RequestFactory requestFactory;
@@ -56,7 +56,7 @@ abstract class AbstractDefaultIndexOperations implements IndexOperations {
 	@Nullable protected final Class<?> boundClass;
 	@Nullable private final IndexCoordinates boundIndex;
 
-	public AbstractDefaultIndexOperations(ElasticsearchConverter elasticsearchConverter, Class<?> boundClass) {
+	public AbstractIndexTemplate(ElasticsearchConverter elasticsearchConverter, Class<?> boundClass) {
 
 		Assert.notNull(boundClass, "boundClass may not be null");
 
@@ -66,7 +66,7 @@ public AbstractDefaultIndexOperations(ElasticsearchConverter elasticsearchConver
 		this.boundIndex = null;
 	}
 
-	public AbstractDefaultIndexOperations(ElasticsearchConverter elasticsearchConverter, IndexCoordinates boundIndex) {
+	public AbstractIndexTemplate(ElasticsearchConverter elasticsearchConverter, IndexCoordinates boundIndex) {
 
 		Assert.notNull(boundIndex, "boundIndex may not be null");
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
index d65cb1045..6e9d2eb78 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
@@ -131,7 +131,7 @@ public IndexOperations indexOps(Class<?> clazz) {
 
 		Assert.notNull(clazz, "clazz must not be null");
 
-		return new DefaultIndexOperations(this, clazz);
+		return new RestIndexTemplate(this, clazz);
 	}
 
 	@Override
@@ -139,7 +139,7 @@ public IndexOperations indexOps(IndexCoordinates index) {
 
 		Assert.notNull(index, "index must not be null");
 
-		return new DefaultIndexOperations(this, index);
+		return new RestIndexTemplate(this, index);
 	}
 	// endregion
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
index c0960ff1d..0ae4b14da 100755
--- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
@@ -134,7 +134,7 @@ public IndexOperations indexOps(Class<?> clazz) {
 
 		Assert.notNull(clazz, "clazz must not be null");
 
-		return new DefaultTransportIndexOperations(client, elasticsearchConverter, clazz);
+		return new TransportIndexTemplate(client, elasticsearchConverter, clazz);
 	}
 
 	@Override
@@ -142,7 +142,7 @@ public IndexOperations indexOps(IndexCoordinates index) {
 
 		Assert.notNull(index, "index must not be null");
 
-		return new DefaultTransportIndexOperations(client, elasticsearchConverter, index);
+		return new TransportIndexTemplate(client, elasticsearchConverter, index);
 	}
 	// endregion
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
index be256ee3e..02516564a 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
@@ -963,12 +963,12 @@ public ElasticsearchConverter getElasticsearchConverter() {
 
 	@Override
 	public ReactiveIndexOperations indexOps(IndexCoordinates index) {
-		return new DefaultReactiveIndexOperations(this, index);
+		return new ReactiveIndexTemplate(this, index);
 	}
 
 	@Override
 	public ReactiveIndexOperations indexOps(Class<?> clazz) {
-		return new DefaultReactiveIndexOperations(this, clazz);
+		return new ReactiveIndexTemplate(this, clazz);
 	}
 
 	@Override
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultReactiveIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java
similarity index 97%
rename from src/main/java/org/springframework/data/elasticsearch/core/DefaultReactiveIndexOperations.java
rename to src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java
index d2558113b..2133ab578 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultReactiveIndexOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveIndexTemplate.java
@@ -63,9 +63,9 @@
  * @author George Popides
  * @since 4.1
  */
-class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
+class ReactiveIndexTemplate implements ReactiveIndexOperations {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultReactiveIndexOperations.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveIndexTemplate.class);
 
 	@Nullable private final Class<?> boundClass;
 	private final IndexCoordinates boundIndex;
@@ -73,7 +73,7 @@ class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	private final ReactiveElasticsearchOperations operations;
 	private final ElasticsearchConverter converter;
 
-	public DefaultReactiveIndexOperations(ReactiveElasticsearchOperations operations, IndexCoordinates index) {
+	public ReactiveIndexTemplate(ReactiveElasticsearchOperations operations, IndexCoordinates index) {
 
 		Assert.notNull(operations, "operations must not be null");
 		Assert.notNull(index, "index must not be null");
@@ -85,7 +85,7 @@ public DefaultReactiveIndexOperations(ReactiveElasticsearchOperations operations
 		this.boundIndex = index;
 	}
 
-	public DefaultReactiveIndexOperations(ReactiveElasticsearchOperations operations, Class<?> clazz) {
+	public ReactiveIndexTemplate(ReactiveElasticsearchOperations operations, Class<?> clazz) {
 
 		Assert.notNull(operations, "operations must not be null");
 		Assert.notNull(clazz, "clazz must not be null");
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java
similarity index 96%
rename from src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java
rename to src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java
index fdc8159ed..04a4382dd 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultIndexOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/RestIndexTemplate.java
@@ -64,18 +64,18 @@
  * @author George Popides
  * @since 4.0
  */
-class DefaultIndexOperations extends AbstractDefaultIndexOperations implements IndexOperations {
+class RestIndexTemplate extends AbstractIndexTemplate implements IndexOperations {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultIndexOperations.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(RestIndexTemplate.class);
 
 	private final ElasticsearchRestTemplate restTemplate;
 
-	public DefaultIndexOperations(ElasticsearchRestTemplate restTemplate, Class<?> boundClass) {
+	public RestIndexTemplate(ElasticsearchRestTemplate restTemplate, Class<?> boundClass) {
 		super(restTemplate.getElasticsearchConverter(), boundClass);
 		this.restTemplate = restTemplate;
 	}
 
-	public DefaultIndexOperations(ElasticsearchRestTemplate restTemplate, IndexCoordinates boundIndex) {
+	public RestIndexTemplate(ElasticsearchRestTemplate restTemplate, IndexCoordinates boundIndex) {
 		super(restTemplate.getElasticsearchConverter(), boundIndex);
 		this.restTemplate = restTemplate;
 	}
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java b/src/main/java/org/springframework/data/elasticsearch/core/TransportIndexTemplate.java
similarity index 96%
rename from src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java
rename to src/main/java/org/springframework/data/elasticsearch/core/TransportIndexTemplate.java
index acb244601..753221bf7 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultTransportIndexOperations.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/TransportIndexTemplate.java
@@ -69,20 +69,20 @@
  * @author George Popides
  * @since 4.0
  */
-class DefaultTransportIndexOperations extends AbstractDefaultIndexOperations implements IndexOperations {
+class TransportIndexTemplate extends AbstractIndexTemplate implements IndexOperations {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTransportIndexOperations.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(TransportIndexTemplate.class);
 
 	private final Client client;
 
-	public DefaultTransportIndexOperations(Client client, ElasticsearchConverter elasticsearchConverter,
-			Class<?> boundClass) {
+	public TransportIndexTemplate(Client client, ElasticsearchConverter elasticsearchConverter,
+								  Class<?> boundClass) {
 		super(elasticsearchConverter, boundClass);
 		this.client = client;
 	}
 
-	public DefaultTransportIndexOperations(Client client, ElasticsearchConverter elasticsearchConverter,
-			IndexCoordinates boundIndex) {
+	public TransportIndexTemplate(Client client, ElasticsearchConverter elasticsearchConverter,
+								  IndexCoordinates boundIndex) {
 		super(elasticsearchConverter, boundIndex);
 		this.client = client;
 	}