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 beb4b579f..8a8c0574c 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
@@ -101,7 +101,7 @@ import org.springframework.data.elasticsearch.core.client.support.AliasData;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
-import org.springframework.data.elasticsearch.core.indexmapping.MappingBuilder;
+import org.springframework.data.elasticsearch.core.index.MappingBuilder;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
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 fef44f559..b1d2962ba 100755
--- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
@@ -88,7 +88,7 @@ import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
-import org.springframework.data.elasticsearch.core.indexmapping.MappingBuilder;
+import org.springframework.data.elasticsearch.core.index.MappingBuilder;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java
similarity index 98%
rename from src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilder.java
rename to src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java
index 4a82e8e85..7e3753176 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilder.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingBuilder.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.*;
-import static org.springframework.data.elasticsearch.core.indexmapping.MappingParameters.*;
+import static org.springframework.data.elasticsearch.core.index.MappingParameters.*;
 import static org.springframework.util.StringUtils.*;
 
 import java.io.ByteArrayInputStream;
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingParameters.java b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java
similarity index 99%
rename from src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingParameters.java
rename to src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java
index 04c330986..2028749ae 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/indexmapping/MappingParameters.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java
@@ -12,7 +12,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */package org.springframework.data.elasticsearch.core.indexmapping;
+ */
+package org.springframework.data.elasticsearch.core.index;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/indexmapping/package-info.java b/src/main/java/org/springframework/data/elasticsearch/core/index/package-info.java
similarity index 63%
rename from src/main/java/org/springframework/data/elasticsearch/core/indexmapping/package-info.java
rename to src/main/java/org/springframework/data/elasticsearch/core/index/package-info.java
index 38d3619c0..c3c458a46 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/indexmapping/package-info.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/index/package-info.java
@@ -2,4 +2,4 @@
  * infrastructure to define the Elasticsearch mapping for an index.
  */
 @org.springframework.lang.NonNullApi
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilderTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderTests.java
similarity index 99%
rename from src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilderTests.java
rename to src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderTests.java
index 4f334d8b8..fbfe52f08 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingBuilderTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingContextBaseTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingContextBaseTests.java
similarity index 96%
rename from src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingContextBaseTests.java
rename to src/test/java/org/springframework/data/elasticsearch/core/index/MappingContextBaseTests.java
index 7276b0370..069c5297c 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingContextBaseTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingContextBaseTests.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
 
 import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingParametersTest.java b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingParametersTest.java
similarity index 97%
rename from src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingParametersTest.java
rename to src/test/java/org/springframework/data/elasticsearch/core/index/MappingParametersTest.java
index 06daa5d69..d0816b421 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/MappingParametersTest.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/index/MappingParametersTest.java
@@ -1,4 +1,4 @@
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/SimpleDynamicTemplatesMappingTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleDynamicTemplatesMappingTests.java
similarity index 98%
rename from src/test/java/org/springframework/data/elasticsearch/core/indexmapping/SimpleDynamicTemplatesMappingTests.java
rename to src/test/java/org/springframework/data/elasticsearch/core/index/SimpleDynamicTemplatesMappingTests.java
index 0b5da9aa3..bdebb0ec2 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/SimpleDynamicTemplatesMappingTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleDynamicTemplatesMappingTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
 
 import static org.assertj.core.api.Assertions.*;
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/SimpleElasticsearchDateMappingTests.java b/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java
similarity index 97%
rename from src/test/java/org/springframework/data/elasticsearch/core/indexmapping/SimpleElasticsearchDateMappingTests.java
rename to src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java
index a8701dca4..055312c1f 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/indexmapping/SimpleElasticsearchDateMappingTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/index/SimpleElasticsearchDateMappingTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core.indexmapping;
+package org.springframework.data.elasticsearch.core.index;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.elasticsearch.annotations.FieldType.*;