diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataNamespaceHandler.java
index 8dc3ac7b2..d432cd458 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataNamespaceHandler.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataNamespaceHandler.java
@@ -36,7 +36,7 @@ public class CassandraDataNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("cluster", new CassandraDataClusterParser());
 		registerBeanDefinitionParser("session", new CassandraDataSessionParser());
 		registerBeanDefinitionParser("template", new CassandraDataTemplateParser());
-		registerBeanDefinitionParser("mapping-converter", new CassandraMappingConverterParser());
+		registerBeanDefinitionParser("converter", new CassandraMappingConverterParser());
 		registerBeanDefinitionParser("mapping", new CassandraMappingContextParser());
 	}
 }
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java
index 6a830f119..2ee61c67b 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingConverterParser.java
@@ -11,7 +11,7 @@ import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
- * Spring Data Cassandra XML namespace parser for the <mapping-converter> element.
+ * Spring Data Cassandra XML namespace parser for the <converter> element.
  * 
  * @author Matthew T. Adams
  */
diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
index 40e8a3b54..ee2d195ee 100644
--- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
+++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd
@@ -713,7 +713,7 @@ The comma-delimited base packages in which to scan for entities and their mappin
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="mapping-converter">
+	<xsd:element name="converter">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
 Defines a CassandraConverter for getting rich mapping functionality.
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml
index 5b0e5d619..b434f4221 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/test/integration/config/CassandraNamespaceTests-context.xml
@@ -28,7 +28,7 @@
 
 	<!-- TODO: not require that these beans be defined -->
 	<cass:mapping />
-	<cass:mapping-converter />
+	<cass:converter />
 
 	<cass:session keyspace-name="${cassandra.keyspace}"
 		schema-action="NONE" />
diff --git a/spring-data-cassandra/src/test/resources/spring-data-cassandra-basic.xml b/spring-data-cassandra/src/test/resources/spring-data-cassandra-basic.xml
index 15653c53d..3d736d478 100644
--- a/spring-data-cassandra/src/test/resources/spring-data-cassandra-basic.xml
+++ b/spring-data-cassandra/src/test/resources/spring-data-cassandra-basic.xml
@@ -10,7 +10,7 @@
 	<context:property-placeholder
 		location="classpath:/spring-data-cassandra-build.properties" />
 
-	<cass:mapping-converter />
+	<cass:converter />
 
 	<cass:template />