diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
index e37b474ba..b5c036167 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
@@ -106,7 +106,7 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 						Indexed index = field.getAnnotation(Indexed.class);
 						String name = index.name();
 						if (!StringUtils.hasText(name)) {
-							name = field.getName();
+							name = persistentProperty.getFieldName();
 						} else {
 							if (!name.equals(field.getName()) && index.unique() && !index.sparse()) {
 								// Names don't match, and sparse is not true. This situation will generate an error on the server.
@@ -159,7 +159,7 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 			defObj.put(name, (direction == IndexDirection.ASCENDING ? 1 : -1));
 		}
 		DBObject opts = new BasicDBObject();
-		// opts.put("name", name + "_idx");
+		opts.put("name", name);
 		opts.put("dropDups", dropDups);
 		opts.put("sparse", sparse);
 		opts.put("unique", unique);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
new file mode 100644
index 000000000..e49200419
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2011 by the original author(s).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.mongodb.core.index;
+
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+import com.mongodb.MongoException;
+
+/**
+ * Integration tests for index handling.
+ *
+ * @author Oliver Gierke
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:infrastructure.xml")
+public class IndexingIntegrationTests {
+	
+	@Autowired
+	MongoOperations operations;
+
+	@After
+	public void tearDown() {
+		operations.dropCollection(IndexedPerson.class);
+	}
+	
+	
+	/**
+	 * @see DATADOC-237
+	 */
+	@Test
+	public void createsIndexWithFieldName() {
+		
+		operations.save(new IndexedPerson());
+		assertThat(hasIndex("_firstname", IndexedPerson.class), is(true));
+	}
+	
+	class IndexedPerson {
+		
+		@Field("_firstname")
+		@Indexed
+		String firstname;
+	}
+	
+	/**
+	 * Returns whether an index with the given name exists for the given entity type.
+	 * 
+	 * @param indexName
+	 * @param entityType
+	 * @return
+	 */
+	private boolean hasIndex(final String indexName, Class<?> entityType) {
+		
+		return operations.execute(entityType, new CollectionCallback<Boolean>() {
+			public Boolean doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+				for (DBObject indexInfo : collection.getIndexInfo()) {
+					if (indexName.equals(indexInfo.get("name"))) {
+						return true;
+					}
+				}
+				return false;
+			}
+		});
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
index 234e06a3d..51c752342 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
@@ -251,7 +251,7 @@ public class MappingTests {
 			public Boolean doInCollection(DBCollection collection) throws MongoException, DataAccessException {
 				List<DBObject> indexes = collection.getIndexInfo();
 				for (DBObject dbo : indexes) {
-					if ("name_1".equals(dbo.get("name"))) {
+					if ("name".equals(dbo.get("name"))) {
 						return true;
 					}
 				}