diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
index d9d715d00..8f508ba7b 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java
@@ -54,10 +54,10 @@ public class BasicMapId implements MapId {
 
 	public BasicMapId() {}
 
-	public BasicMapId(Map<String, Serializable> mapId) {
+	public BasicMapId(Map<String, Serializable> map) {
 
-		Assert.notNull(mapId);
-		map.putAll(mapId);
+		Assert.notNull(map);
+		this.map.putAll(map);
 	}
 
 	@Override
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java
index 7614062a1..47fa2ee55 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/unit/mapid/BasicMapIdTest.java
@@ -10,15 +10,15 @@ import java.util.Map;
 import static org.junit.Assert.assertEquals;
 
 public class BasicMapIdTest {
-    @Test
-    public void testMapConstructor() {
-        Map<String, Serializable> map = new HashMap<String, Serializable>();
-        map.put("field1", "value1");
-        map.put("field2", 2);
+	@Test
+	public void testMapConstructor() {
+		Map<String, Serializable> map = new HashMap<String, Serializable>();
+		map.put("field1", "value1");
+		map.put("field2", 2);
 
-        BasicMapId basicMapId = new BasicMapId(map);
+		BasicMapId basicMapId = new BasicMapId(map);
 
-        assertEquals(basicMapId.get("field1"), map.get("field1"));
-        assertEquals(basicMapId.get("field2"), map.get("field2"));
-    }
+		assertEquals(basicMapId.get("field1"), map.get("field1"));
+		assertEquals(basicMapId.get("field2"), map.get("field2"));
+	}
 }