diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/NestedField.java b/src/main/java/org/springframework/data/elasticsearch/annotations/InnerField.java
similarity index 95%
rename from src/main/java/org/springframework/data/elasticsearch/annotations/NestedField.java
rename to src/main/java/org/springframework/data/elasticsearch/annotations/InnerField.java
index 7a7f001f8..cae53e834 100644
--- a/src/main/java/org/springframework/data/elasticsearch/annotations/NestedField.java
+++ b/src/main/java/org/springframework/data/elasticsearch/annotations/InnerField.java
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface NestedField {
+public @interface InnerField {
 
-	String dotSuffix();
+	String suffix();
 
 	FieldType type();
 
diff --git a/src/main/java/org/springframework/data/elasticsearch/annotations/MultiField.java b/src/main/java/org/springframework/data/elasticsearch/annotations/MultiField.java
index 41c781e80..1b5024576 100644
--- a/src/main/java/org/springframework/data/elasticsearch/annotations/MultiField.java
+++ b/src/main/java/org/springframework/data/elasticsearch/annotations/MultiField.java
@@ -30,5 +30,5 @@ public @interface MultiField {
 
 	public Field mainField();
 
-	public NestedField[] otherFields() default {};
+	public InnerField[] otherFields() default {};
 }
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java
index abc4fee2e..581302224 100644
--- a/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java
+++ b/src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java
@@ -268,8 +268,8 @@ class MappingBuilder {
 	 * @throws IOException
 	 */
 	private static void addNestedFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
-											  NestedField annotation) throws IOException {
-		builder.startObject(field.getName() + "." + annotation.dotSuffix());
+											  InnerField annotation) throws IOException {
+		builder.startObject(annotation.suffix());
 		//builder.field(FIELD_STORE, annotation.store());
 		if (FieldType.Auto != annotation.type()) {
 			builder.field(FIELD_TYPE, annotation.type().name().toLowerCase());
@@ -298,8 +298,8 @@ class MappingBuilder {
 		builder.startObject("fields");
 		//add standard field
 		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
-		for (NestedField nestedField : annotation.otherFields()) {
-			addNestedFieldMapping(builder, field, nestedField);
+		for (InnerField innerField : annotation.otherFields()) {
+			addNestedFieldMapping(builder, field, innerField);
 		}
 		builder.endObject();
 		builder.endObject();
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java b/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java
index 6bc273830..d35b43ec9 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/facet/ArticleEntity.java
@@ -26,7 +26,7 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.MultiField;
-import org.springframework.data.elasticsearch.annotations.NestedField;
+import org.springframework.data.elasticsearch.annotations.InnerField;
 
 /**
  * Simple type to test facets
@@ -45,8 +45,8 @@ public class ArticleEntity {
 	@MultiField(
 			mainField = @Field(type = String, index = analyzed),
 			otherFields = {
-					@NestedField(dotSuffix = "untouched", type = String, store = true, index = not_analyzed),
-					@NestedField(dotSuffix = "sort", type = String, store = true, indexAnalyzer = "keyword")
+					@InnerField(suffix = "untouched", type = String, store = true, index = not_analyzed),
+					@InnerField(suffix = "sort", type = String, store = true, indexAnalyzer = "keyword")
 			}
 	)
 	private List<String> authors = new ArrayList<String>();