diff --git a/pom.xml b/pom.xml
index fa6ccf315..b0fb8a902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<packaging>pom</packaging>
 
 	<name>Spring Data Cassandra</name>
-	<description>Cassandra support for Spring Data</description>
+	<description>Spring Data Cassandra</description>
 	<url>http://www.springsource.org/spring-data/cassandra</url>
 
 	<parent>
@@ -21,7 +21,7 @@
 	</parent>
 
 	<modules>
-		<module>spring-cassandra</module>
+		<module>spring-cql</module>
 		<module>spring-data-cassandra</module>
 		<module>spring-data-cassandra-distribution</module>
 	</modules>
diff --git a/spring-cassandra/src/main/resources/META-INF/spring.handlers b/spring-cassandra/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index f5bd3781b..000000000
--- a/spring-cassandra/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1 +0,0 @@
-http\://www.springframework.org/schema/cassandra=org.springframework.cassandra.config.xml.CassandraNamespaceHandler
diff --git a/spring-cassandra/src/main/resources/META-INF/spring.schemas b/spring-cassandra/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 9a41e8fcd..000000000
--- a/spring-cassandra/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1,2 +0,0 @@
-http\://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd=org/springframework/cassandra/config/spring-cassandra-1.0.xsd
-http\://www.springframework.org/schema/cassandra/spring-cassandra.xsd=org/springframework/cassandra/config/spring-cassandra-1.0.xsd
\ No newline at end of file
diff --git a/spring-cassandra/src/main/resources/META-INF/spring.tooling b/spring-cassandra/src/main/resources/META-INF/spring.tooling
deleted file mode 100644
index a339bc54e..000000000
--- a/spring-cassandra/src/main/resources/META-INF/spring.tooling
+++ /dev/null
@@ -1,4 +0,0 @@
-# Tooling related information for the cassandra namespace
-http\://www.springframework.org/schema/cassandra@name=Spring Cassandra Namespace
-http\://www.springframework.org/schema/cassandra@prefix=cassandra
-http\://www.springframework.org/schema/cassandra@icon=org/springframework/data/cassandra/config/spring-cassandra.gif
diff --git a/spring-cassandra/pom.xml b/spring-cql/pom.xml
similarity index 94%
rename from spring-cassandra/pom.xml
rename to spring-cql/pom.xml
index 8c8fc619c..921f51490 100644
--- a/spring-cassandra/pom.xml
+++ b/spring-cql/pom.xml
@@ -4,10 +4,10 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cassandra</artifactId>
+	<artifactId>spring-cql</artifactId>
 
-	<name>Spring Cassandra - Core</name>
-	<description>Cassandra support for Spring</description>
+	<name>Spring CQL</name>
+	<description>Raw Cassandra CQL Support for Spring Core</description>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java
similarity index 98%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java
index 1e7494b16..57f5ce1ba 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraClusterFactoryBean.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java
@@ -57,7 +57,7 @@ import com.datastax.driver.core.policies.RetryPolicy;
  * @author Matthew T. Adams
  * @author David Webb
  */
-public class CassandraClusterFactoryBean implements FactoryBean<Cluster>, InitializingBean, DisposableBean,
+public class CassandraCqlClusterFactoryBean implements FactoryBean<Cluster>, InitializingBean, DisposableBean,
 		PersistenceExceptionTranslator {
 
 	public static final String DEFAULT_CONTACT_POINTS = "localhost";
@@ -67,7 +67,7 @@ public class CassandraClusterFactoryBean implements FactoryBean<Cluster>, Initia
 	public static final boolean DEFAULT_SSL_ENABLED = false;
 	public static final int DEFAULT_PORT = 9042;
 
-	protected static final Logger log = LoggerFactory.getLogger(CassandraClusterFactoryBean.class);
+	protected static final Logger log = LoggerFactory.getLogger(CassandraCqlClusterFactoryBean.class);
 
 	private Cluster cluster;
 
@@ -75,7 +75,7 @@ public class CassandraClusterFactoryBean implements FactoryBean<Cluster>, Initia
 	 * Attributes needed for cluster builder
 	 */
 	private String contactPoints = DEFAULT_CONTACT_POINTS;
-	private int port = CassandraClusterFactoryBean.DEFAULT_PORT;
+	private int port = CassandraCqlClusterFactoryBean.DEFAULT_PORT;
 	private CompressionType compressionType;
 	private PoolingOptions poolingOptions;
 	private SocketOptions socketOptions;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java
similarity index 96%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java
index 59de8a2f6..af06451fc 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraSessionFactoryBean.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java
@@ -42,10 +42,10 @@ import com.datastax.driver.core.Session;
  * @author Matthew T. Adams
  */
 
-public class CassandraSessionFactoryBean implements FactoryBean<Session>, InitializingBean, DisposableBean,
+public class CassandraCqlSessionFactoryBean implements FactoryBean<Session>, InitializingBean, DisposableBean,
 		PersistenceExceptionTranslator {
 
-	private static final Logger log = LoggerFactory.getLogger(CassandraSessionFactoryBean.class);
+	private static final Logger log = LoggerFactory.getLogger(CassandraCqlSessionFactoryBean.class);
 
 	protected Cluster cluster;
 	protected Session session;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java
similarity index 93%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java
index 45adce2bb..0308c5b36 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java
@@ -27,7 +27,7 @@ import com.datastax.driver.core.Session;
  * 
  * @author Matthew T. Adams
  */
-public class CassandraTemplateFactoryBean implements FactoryBean<CqlOperations>, InitializingBean {
+public class CassandraCqlTemplateFactoryBean implements FactoryBean<CqlOperations>, InitializingBean {
 
 	private CqlTemplate template;
 	private Session session;
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java b/spring-cql/src/main/java/org/springframework/cassandra/config/CompressionType.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/CompressionType.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java b/spring-cql/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java b/spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java b/spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelListFlattenerFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelListFlattenerFactoryBean.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelListFlattenerFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelListFlattenerFactoryBean.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java b/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java
similarity index 89%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java
index 7b84040c0..ae99cd977 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.cassandra.config.java;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.cassandra.config.CassandraClusterFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean;
 import org.springframework.cassandra.config.CompressionType;
 import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification;
 import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification;
@@ -42,9 +42,9 @@ import com.datastax.driver.core.policies.RetryPolicy;
 public abstract class AbstractClusterConfiguration {
 
 	@Bean
-	public CassandraClusterFactoryBean cluster() {
+	public CassandraCqlClusterFactoryBean cluster() {
 
-		CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean();
+		CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean();
 		bean.setAuthProvider(getAuthProvider());
 		bean.setCompressionType(getCompressionType());
 		bean.setContactPoints(getContactPoints());
@@ -88,11 +88,11 @@ public abstract class AbstractClusterConfiguration {
 	}
 
 	protected int getPort() {
-		return CassandraClusterFactoryBean.DEFAULT_PORT;
+		return CassandraCqlClusterFactoryBean.DEFAULT_PORT;
 	}
 
 	protected boolean getMetricsEnabled() {
-		return CassandraClusterFactoryBean.DEFAULT_METRICS_ENABLED;
+		return CassandraCqlClusterFactoryBean.DEFAULT_METRICS_ENABLED;
 	}
 
 	protected LoadBalancingPolicy getLoadBalancingPolicy() {
@@ -108,7 +108,7 @@ public abstract class AbstractClusterConfiguration {
 	}
 
 	protected String getContactPoints() {
-		return CassandraClusterFactoryBean.DEFAULT_CONTACT_POINTS;
+		return CassandraCqlClusterFactoryBean.DEFAULT_CONTACT_POINTS;
 	}
 
 	protected CompressionType getCompressionType() {
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java b/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java b/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java
similarity index 85%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java
index 8f795abb2..f1e65672b 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.cassandra.config.java;
 
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,11 +33,11 @@ public abstract class AbstractSessionConfiguration extends AbstractClusterConfig
 	protected abstract String getKeyspaceName();
 
 	@Bean
-	public CassandraSessionFactoryBean session() throws Exception {
+	public CassandraCqlSessionFactoryBean session() throws Exception {
 
 		Cluster cluster = cluster().getObject();
 
-		CassandraSessionFactoryBean bean = new CassandraSessionFactoryBean();
+		CassandraCqlSessionFactoryBean bean = new CassandraCqlSessionFactoryBean();
 		bean.setCluster(cluster);
 		bean.setKeyspaceName(getKeyspaceName());
 
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java
similarity index 97%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java
index 101e5c0aa..e0e2ff4ee 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.CassandraClusterFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean;
 import org.springframework.cassandra.config.KeyspaceActionSpecificationFactoryBean;
 import org.springframework.cassandra.config.KeyspaceAttributes;
 import org.springframework.cassandra.config.MultiLevelSetFlattenerFactoryBean;
@@ -52,20 +52,20 @@ import com.datastax.driver.core.SocketOptions;
  * @author Matthew T. Adams
  * @author David Webb
  */
-public class CassandraClusterParser extends AbstractBeanDefinitionParser {
+public class CassandraCqlClusterParser extends AbstractBeanDefinitionParser {
 
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultBeanNames.CLUSTER;
+		return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.CLUSTER;
 	}
 
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CassandraClusterFactoryBean.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CassandraCqlClusterFactoryBean.class);
 		builder.getRawBeanDefinition().setSource(parserContext.extractSource(element));
 		builder.getRawBeanDefinition().setDestroyMethodName("destroy");
 		if (parserContext.isNested()) {
@@ -114,7 +114,7 @@ public class CassandraClusterParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Parse the Child Element of {@link DefaultBeanNames.CLUSTER}
+	 * Parse the Child Element of {@link DefaultCqlBeanNames.CLUSTER}
 	 * 
 	 * @param element The Element being parsed
 	 * @param context The Parser Context
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java
similarity index 92%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java
index e08c610f4..ab219c23c 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Attr;
@@ -37,11 +37,11 @@ import org.w3c.dom.NamedNodeMap;
  * @author David Webb
  * @author Matthew T. Adams
  */
-public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
+public class CassandraCqlSessionParser extends AbstractSingleBeanDefinitionParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return CassandraSessionFactoryBean.class;
+		return CassandraCqlSessionFactoryBean.class;
 	}
 
 	@Override
@@ -49,7 +49,7 @@ public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultBeanNames.SESSION;
+		return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.SESSION;
 	}
 
 	/**
@@ -81,7 +81,7 @@ public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
 	}
 
 	protected void setDefaultProperties(BeanDefinitionBuilder builder) {
-		addRequiredPropertyReference(builder, "cluster", DefaultBeanNames.CLUSTER);
+		addRequiredPropertyReference(builder, "cluster", DefaultCqlBeanNames.CLUSTER);
 	}
 
 	protected void parseSessionAttributes(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
@@ -101,7 +101,7 @@ public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
 			if ("keyspace-name".equals(name)) {
 				addRequiredPropertyValue(builder, "keyspaceName", attribute);
 			} else if ("cluster-ref".equals(name)) {
-				addOptionalPropertyReference(builder, "cluster", attribute, DefaultBeanNames.CLUSTER);
+				addOptionalPropertyReference(builder, "cluster", attribute, DefaultCqlBeanNames.CLUSTER);
 			} else {
 				parseUnhandledSessionElementAttribute(attribute, parserContext, builder);
 			}
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java
similarity index 84%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java
index bc32ca79e..bb1e0e0ba 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraTemplateParser.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.CassandraTemplateFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlTemplateFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
@@ -32,11 +32,11 @@ import org.w3c.dom.Element;
  * @author David Webb
  * @author Matthew T. Adams
  */
-public class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser {
+public class CassandraCqlTemplateParser extends AbstractSingleBeanDefinitionParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return CassandraTemplateFactoryBean.class;
+		return CassandraCqlTemplateFactoryBean.class;
 	}
 
 	@Override
@@ -44,11 +44,11 @@ public class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultBeanNames.TEMPLATE;
+		return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.TEMPLATE;
 	}
 
 	@Override
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		addOptionalPropertyReference(builder, "session", element, "session-ref", DefaultBeanNames.SESSION);
+		addOptionalPropertyReference(builder, "session", element, "session-ref", DefaultCqlBeanNames.SESSION);
 	}
 }
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java
similarity index 80%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java
index 841c9598b..06963e074 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java
@@ -28,8 +28,8 @@ public class CassandraNamespaceHandler extends NamespaceHandlerSupport {
 	@Override
 	public void init() {
 
-		registerBeanDefinitionParser("cluster", new CassandraClusterParser());
-		registerBeanDefinitionParser("session", new CassandraSessionParser());
-		registerBeanDefinitionParser("template", new CassandraTemplateParser());
+		registerBeanDefinitionParser("cluster", new CassandraCqlClusterParser());
+		registerBeanDefinitionParser("session", new CassandraCqlSessionParser());
+		registerBeanDefinitionParser("template", new CassandraCqlTemplateParser());
 	}
 }
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultBeanNames.java b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java
similarity index 95%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultBeanNames.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java
index 1c5f25dd4..ddf4c4b14 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultBeanNames.java
+++ b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java
@@ -20,7 +20,7 @@ package org.springframework.cassandra.config.xml;
  * @author David Webb
  * @author Matthew T. Adams
  */
-public interface DefaultBeanNames {
+public interface DefaultCqlBeanNames {
 
 	public static final String CLUSTER = "cassandraCluster";
 	public static final String SESSION = "cassandraSession";
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java b/spring-cql/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java
rename to spring-cql/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java b/spring-cql/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java b/spring-cql/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java b/spring-cql/src/main/java/org/springframework/cassandra/core/CqlOperations.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/CqlOperations.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java b/spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java b/spring-cql/src/main/java/org/springframework/cassandra/core/HostMapper.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/HostMapper.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java b/spring-cql/src/main/java/org/springframework/cassandra/core/Ordering.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/Ordering.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java b/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java b/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreatorImpl.java b/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCreatorImpl.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreatorImpl.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCreatorImpl.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java b/spring-cql/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java b/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetFutureExtractor.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ResultSetFutureExtractor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetFutureExtractor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/ResultSetFutureExtractor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RetryPolicy.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicy.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RetryPolicy.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicy.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RetryPolicyResolver.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicyResolver.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RetryPolicyResolver.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicyResolver.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RingMember.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RingMember.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RowCallback.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RowCallback.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RowCallback.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RowCallback.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RowIterator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RowIterator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RowIterator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RowIterator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RowMapper.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/RowMapper.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java b/spring-cql/src/main/java/org/springframework/cassandra/core/SessionCallback.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/SessionCallback.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java b/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/Option.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/Option.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java b/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/util/CollectionUtils.java b/spring-cql/src/main/java/org/springframework/cassandra/core/util/CollectionUtils.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/util/CollectionUtils.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/util/CollectionUtils.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java b/spring-cql/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java
rename to spring-cql/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java b/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java b/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java
diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java b/spring-cql/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java
similarity index 100%
rename from spring-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java
rename to spring-cql/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java
diff --git a/spring-cql/src/main/resources/META-INF/spring.handlers b/spring-cql/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 000000000..0f88a8df8
--- /dev/null
+++ b/spring-cql/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/cql=org.springframework.cassandra.config.xml.CassandraNamespaceHandler
diff --git a/spring-cql/src/main/resources/META-INF/spring.schemas b/spring-cql/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 000000000..b002ec859
--- /dev/null
+++ b/spring-cql/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1,2 @@
+http\://www.springframework.org/schema/cql/spring-cql-1.0.xsd=org/springframework/cassandra/config/spring-cql-1.0.xsd
+http\://www.springframework.org/schema/cql/spring-cql.xsd=org/springframework/cassandra/config/spring-cql-1.0.xsd
\ No newline at end of file
diff --git a/spring-cql/src/main/resources/META-INF/spring.tooling b/spring-cql/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 000000000..f81f92584
--- /dev/null
+++ b/spring-cql/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the cql namespace
+http\://www.springframework.org/schema/cql@name=Spring Cassandra CQL Namespace
+http\://www.springframework.org/schema/cql@prefix=cassandra
+http\://www.springframework.org/schema/cql@icon=org/springframework/data/cassandra/config/spring-cql.gif
diff --git a/spring-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cassandra-1.0.xsd b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd
similarity index 97%
rename from spring-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cassandra-1.0.xsd
rename to spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd
index 25de1e5a0..54341d733 100644
--- a/spring-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cassandra-1.0.xsd
+++ b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsd:schema xmlns="http://www.springframework.org/schema/cassandra"
+<xsd:schema xmlns="http://www.springframework.org/schema/cql"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:tool="http://www.springframework.org/schema/tool"
-	targetNamespace="http://www.springframework.org/schema/cassandra"
+	targetNamespace="http://www.springframework.org/schema/cql"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 	<xsd:import namespace="http://www.springframework.org/schema/tool"
@@ -448,14 +448,14 @@ Arbitrary CQL script to be executed against the session's keyspace during bean d
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The name of the session definition; default is "cassandra-session".
+The name of the session definition; default is "cassandraSession".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="cluster-ref" type="clusterRef" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The reference to a Cassandra cluster; default is "cassandra-cluster".
+The reference to a Cassandra cluster; default is "cassandraCluster".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -473,14 +473,14 @@ The name of a Cassandra Keyspace.  No default; for the system keyspace, use the
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The name of the template; default is "cql-template".
+The name of the template; default is "cqlTemplate".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="session-ref" type="sessionRef" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The reference to a Cassandra session; default is "cassandra-session".
+The reference to a Cassandra session; default is "cassandraSession".
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
diff --git a/spring-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cassandra.gif b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql.gif
similarity index 100%
rename from spring-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cassandra.gif
rename to spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql.gif
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
similarity index 95%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
index 40ea19a6c..b6dd1b026 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
@@ -24,7 +24,7 @@ import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties;
+import org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties;
 import org.springframework.cassandra.test.unit.support.Utils;
 
 import com.datastax.driver.core.Cluster;
@@ -46,7 +46,7 @@ public class AbstractEmbeddedCassandraIntegrationTest {
 	protected static String CASSANDRA_CONFIG = "spring-cassandra.yaml";
 	protected static String CASSANDRA_HOST = "localhost";
 
-	protected static SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties();
+	protected static SpringCqlBuildProperties PROPS = new SpringCqlBuildProperties();
 	protected static int CASSANDRA_NATIVE_PORT = PROPS.getCassandraPort();
 
 	/**
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java
similarity index 92%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java
index 0c54db89f..5aef05664 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractKeyspaceCreatingConfiguration.java
@@ -18,7 +18,7 @@ package org.springframework.cassandra.test.integration.config.java;
 import static org.springframework.cassandra.core.cql.generator.CreateKeyspaceCqlGenerator.toCql;
 import static org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification.createKeyspace;
 
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean;
 import org.springframework.cassandra.config.java.AbstractSessionConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.StringUtils;
@@ -30,7 +30,7 @@ import com.datastax.driver.core.Session;
 public abstract class AbstractKeyspaceCreatingConfiguration extends AbstractSessionConfiguration {
 
 	@Override
-	public CassandraSessionFactoryBean session() throws Exception {
+	public CassandraCqlSessionFactoryBean session() throws Exception {
 
 		createKeyspaceIfNecessary();
 
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/FunkyIdentifierIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/FunkyIdentifierIntegrationTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/FunkyIdentifierIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/FunkyIdentifierIntegrationTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/Book.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/Book.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/Book.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/Book.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
similarity index 91%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
index cf4ecbcdd..9b9bdf419 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java
@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public abstract class AbstractTestJavaConfig extends AbstractSessionConfiguration {
 
-	public static SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties();
+	public static SpringCqlBuildProperties PROPS = new SpringCqlBuildProperties();
 	public static final int PORT = PROPS.getCassandraPort();
 
 	@Override
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/SpringCqlBuildProperties.java
similarity index 88%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/SpringCqlBuildProperties.java
index 3edfb68c6..792e9e461 100644
--- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/SpringCassandraBuildProperties.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/SpringCqlBuildProperties.java
@@ -19,15 +19,15 @@ import java.io.InputStream;
 import java.util.Properties;
 
 @SuppressWarnings("serial")
-public class SpringCassandraBuildProperties extends Properties {
+public class SpringCqlBuildProperties extends Properties {
 
 	protected String resourceName = null;
 
-	public SpringCassandraBuildProperties() {
-		this("/" + SpringCassandraBuildProperties.class.getName() + ".properties");
+	public SpringCqlBuildProperties() {
+		this("/" + SpringCqlBuildProperties.class.getName() + ".properties");
 	}
 
-	protected SpringCassandraBuildProperties(String resourceName) {
+	protected SpringCqlBuildProperties(String resourceName) {
 		this.resourceName = resourceName;
 
 		loadProperties();
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlIdentifierTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlIdentifierTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlIdentifierTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlIdentifierTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/CqlStringUtilsTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterKeyspaceCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterKeyspaceCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterKeyspaceCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterKeyspaceCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/AlterTableCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateIndexCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateTableCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropIndexCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropKeyspaceCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropKeyspaceCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropKeyspaceCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropKeyspaceCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTests.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTests.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/DropTableCqlGeneratorTests.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/IndexOperationCqlGeneratorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/IndexOperationCqlGeneratorTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/IndexOperationCqlGeneratorTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/IndexOperationCqlGeneratorTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/KeyspaceOperationCqlGeneratorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/KeyspaceOperationCqlGeneratorTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/KeyspaceOperationCqlGeneratorTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/KeyspaceOperationCqlGeneratorTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/TableOperationCqlGeneratorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/TableOperationCqlGeneratorTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/TableOperationCqlGeneratorTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/TableOperationCqlGeneratorTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/support/CassandraExceptionTranslatorTest.java
diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/support/Utils.java b/spring-cql/src/test/java/org/springframework/cassandra/test/unit/support/Utils.java
similarity index 100%
rename from spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/support/Utils.java
rename to spring-cql/src/test/java/org/springframework/cassandra/test/unit/support/Utils.java
diff --git a/spring-cassandra/src/test/resources/cassandraOperationsTest-cql-dataload.cql b/spring-cql/src/test/resources/cassandraOperationsTest-cql-dataload.cql
similarity index 100%
rename from spring-cassandra/src/test/resources/cassandraOperationsTest-cql-dataload.cql
rename to spring-cql/src/test/resources/cassandraOperationsTest-cql-dataload.cql
diff --git a/spring-cassandra/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql b/spring-cql/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql
similarity index 100%
rename from spring-cassandra/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql
rename to spring-cql/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql
diff --git a/spring-cassandra/src/test/resources/logback-test.xml b/spring-cql/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-cassandra/src/test/resources/logback-test.xml
rename to spring-cql/src/test/resources/logback-test.xml
diff --git a/spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties b/spring-cql/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties.properties
similarity index 100%
rename from spring-cassandra/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties
rename to spring-cql/src/test/resources/org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties.properties
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
similarity index 82%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
index ff1dd0201..ce94f1a7c 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
+++ b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest-context.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cassandra"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cql"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-	http://www.springframework.org/schema/cassandra http://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd
+	http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql-1.0.xsd
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties.properties,classpath:/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties" />
 
 	<cass:cluster port="${build.cassandra.native_transport_port}">
 		<cass:keyspace action="CREATE_DROP" durable-writes="true"
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties
similarity index 100%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigTest.properties
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
similarity index 76%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
index c2d5abbe5..2ab887bbc 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
+++ b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigTest-context.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cassandra"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cql"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-	http://www.springframework.org/schema/cassandra http://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd
+	http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql-1.0.xsd
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties.properties" />
 
 	<cass:cluster port="${build.cassandra.native_transport_port}">
 		<cass:keyspace action="CREATE_DROP" name="minimal" />
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
similarity index 59%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
index 8be74d6a8..44196aef5 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
+++ b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigTest-context.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cassandra="http://www.springframework.org/schema/cassandra"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cql"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/cassandra http://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql-1.0.xsd
                          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
                          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties.properties" />
 
-	<cassandra:cluster port="${build.cassandra.native_transport_port}" />
+	<cass:cluster port="${build.cassandra.native_transport_port}" />
 
-	<cassandra:session keyspace-name="minimalxmlconfigtest" />
+	<cass:session keyspace-name="minimalxmlconfigtest" />
 
-	<cassandra:template />
+	<cass:template />
 </beans>
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
similarity index 94%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
index 8259eb66c..7184e41ba 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
+++ b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cassandra="http://www.springframework.org/schema/cassandra"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cassandra="http://www.springframework.org/schema/cql"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/cassandra http://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql-1.0.xsd
                          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
                          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
similarity index 84%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
index c779fde4b..7893eb4db 100644
--- a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
+++ b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigTest-context.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cassandra="http://www.springframework.org/schema/cassandra"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cassandra="http://www.springframework.org/schema/cql"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/cassandra http://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/cql http://www.springframework.org/schema/cql/spring-cql-1.0.xsd
                          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
                          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<context:property-placeholder
-		location="classpath:org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties.properties" />
+		location="classpath:org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties.properties" />
 
 	<cassandra:cluster contact-points="localhost"
 		port="${build.cassandra.native_transport_port}">
diff --git a/spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties b/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties
similarity index 100%
rename from spring-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties
rename to spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties
diff --git a/spring-cassandra/src/test/resources/spring-cassandra.yaml b/spring-cql/src/test/resources/spring-cassandra.yaml
similarity index 100%
rename from spring-cassandra/src/test/resources/spring-cassandra.yaml
rename to spring-cql/src/test/resources/spring-cassandra.yaml
diff --git a/spring-cassandra/template.mf b/spring-cql/template.mf
similarity index 100%
rename from spring-cassandra/template.mf
rename to spring-cql/template.mf
diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 389d94e2b..b1f12efe5 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -7,7 +7,7 @@
 	<artifactId>spring-data-cassandra</artifactId>
 
 	<name>Spring Data Cassandra - Core</name>
-	<description>Cassandra support for Spring Data</description>
+	<description>Cassandra Support for Spring Data</description>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
@@ -24,13 +24,13 @@
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cassandra</artifactId>
+			<artifactId>spring-cql</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cassandra</artifactId>
+			<artifactId>spring-cql</artifactId>
 			<version>${project.version}</version>
 			<type>test-jar</type>
 			<!-- <classifier>tests</classifier> -->
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataClusterFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java
similarity index 73%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataClusterFactoryBean.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java
index 0f76418d0..4766e6513 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataClusterFactoryBean.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraClusterFactoryBean.java
@@ -15,13 +15,13 @@
  */
 package org.springframework.data.cassandra.config;
 
-import org.springframework.cassandra.config.CassandraClusterFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean;
 
 /**
- * Spring Data Cassandra extension of CassandraClusterFactoryBean. This class exists only in the name of symmetry, based
+ * Spring Data Cassandra extension of CassandraCqlClusterFactoryBean. This class exists only in the name of symmetry, based
  * on the other CassandraData*FactoryBean classes.
  * 
  * @author Matthew T. Adams
  */
-public class CassandraDataClusterFactoryBean extends CassandraClusterFactoryBean {
+public class CassandraClusterFactoryBean extends CassandraCqlClusterFactoryBean {
 }
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java
index 682e65e11..656402f70 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraMappingBeanFactoryPostProcessor.java
@@ -54,9 +54,9 @@ import com.datastax.driver.core.Session;
  * {@link CassandraMappingContext} definition present, then it will be used in the
  * {@link BasicCassandraMappingContext} bean definition.
  * <p/>
- * It requires that a single {@link Session} or {@link CassandraDataSessionFactoryBean} definition be present. As
- * described above, multiple {@link Session} definitions, multiple {@link CassandraDataSessionFactoryBean} definitions,
- * or both a {@link Session} and {@link CassandraDataSessionFactoryBean} will cause an {@link IllegalStateException} to
+ * It requires that a single {@link Session} or {@link CassandraSessionFactoryBean} definition be present. As
+ * described above, multiple {@link Session} definitions, multiple {@link CassandraSessionFactoryBean} definitions,
+ * or both a {@link Session} and {@link CassandraSessionFactoryBean} will cause an {@link IllegalStateException} to
  * be thrown.
  * 
  * @author Matthew T. Adams
@@ -141,14 +141,14 @@ public class CassandraMappingBeanFactoryPostProcessor implements BeanDefinitionR
 		// first, search for any session and session factory beans
 		BeanDefinitionHolder[] sessionBeans = getBeanDefinitionsOfType(registry, factory, Session.class, true, false);
 		BeanDefinitionHolder[] sessionFactoryBeans = getBeanDefinitionsOfType(registry, factory,
-				CassandraDataSessionFactoryBean.class, true, false);
+				CassandraSessionFactoryBean.class, true, false);
 
 		int sessionCount = sessionBeans.length;
 		int sessionFactoryCount = sessionFactoryBeans.length;
 		int totalCount = sessionCount + sessionFactoryCount;
 
 		if (totalCount == 0 || totalCount > 1) { // can't create default template -- none or multiple
-			throw createSessionException(totalCount, Session.class, CassandraDataSessionFactoryBean.class);
+			throw createSessionException(totalCount, Session.class, CassandraSessionFactoryBean.class);
 		}
 
 		if (sessionCount == 1) {
@@ -168,7 +168,7 @@ public class CassandraMappingBeanFactoryPostProcessor implements BeanDefinitionR
 	protected BeanDefinitionHolder regsiterDefaultContext(BeanDefinitionRegistry registry) {
 
 		BeanDefinitionHolder contextBean = new BeanDefinitionHolder(BeanDefinitionBuilder.genericBeanDefinition(
-				BasicCassandraMappingContext.class).getBeanDefinition(), DefaultDataBeanNames.CONTEXT);
+				BasicCassandraMappingContext.class).getBeanDefinition(), DefaultBeanNames.CONTEXT);
 
 		registry.registerBeanDefinition(contextBean.getBeanName(), contextBean.getBeanDefinition());
 
@@ -180,7 +180,7 @@ public class CassandraMappingBeanFactoryPostProcessor implements BeanDefinitionR
 		BeanDefinitionBuilder converterBeanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(
 				MappingCassandraConverter.class).addConstructorArgReference(contextBeanName);
 		BeanDefinitionHolder beanDefinition = new BeanDefinitionHolder(converterBeanDefinitionBuilder.getBeanDefinition(),
-				DefaultDataBeanNames.CONVERTER);
+				DefaultBeanNames.CONVERTER);
 
 		registry.registerBeanDefinition(beanDefinition.getBeanName(), beanDefinition.getBeanDefinition());
 
@@ -195,7 +195,7 @@ public class CassandraMappingBeanFactoryPostProcessor implements BeanDefinitionR
 				.addConstructorArgReference(converterBeanName);
 		BeanDefinition beanDefinition = templateBeanDefinitionBuilder.getBeanDefinition();
 
-		BeanDefinitionHolder template = new BeanDefinitionHolder(beanDefinition, DefaultDataBeanNames.TEMPLATE);
+		BeanDefinitionHolder template = new BeanDefinitionHolder(beanDefinition, DefaultBeanNames.TEMPLATE);
 		registry.registerBeanDefinition(template.getBeanName(), template.getBeanDefinition());
 
 		return template;
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java
similarity index 95%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataSessionFactoryBean.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java
index 9b64e1402..d5e78805d 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataSessionFactoryBean.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraSessionFactoryBean.java
@@ -19,7 +19,7 @@ import static org.springframework.cassandra.core.cql.CqlIdentifier.cqlId;
 
 import java.util.Collection;
 
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean;
 import org.springframework.data.cassandra.convert.CassandraConverter;
 import org.springframework.data.cassandra.core.CassandraAdminTemplate;
 import org.springframework.data.cassandra.mapping.CassandraMappingContext;
@@ -30,7 +30,7 @@ import com.datastax.driver.core.KeyspaceMetadata;
 import com.datastax.driver.core.Metadata;
 import com.datastax.driver.core.TableMetadata;
 
-public class CassandraDataSessionFactoryBean extends CassandraSessionFactoryBean {
+public class CassandraSessionFactoryBean extends CassandraCqlSessionFactoryBean {
 
 	protected SchemaAction schemaAction;
 	protected CassandraAdminTemplate admin;
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java
similarity index 94%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataTemplateFactoryBean.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java
index d64ce715f..c46bb619c 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraDataTemplateFactoryBean.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraTemplateFactoryBean.java
@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
 
 import com.datastax.driver.core.Session;
 
-public class CassandraDataTemplateFactoryBean implements FactoryBean<CassandraOperations>, InitializingBean {
+public class CassandraTemplateFactoryBean implements FactoryBean<CassandraOperations>, InitializingBean {
 
 	protected Session session;
 	protected CassandraConverter converter;
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/DefaultDataBeanNames.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/DefaultBeanNames.java
similarity index 86%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/DefaultDataBeanNames.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/DefaultBeanNames.java
index 7736c4262..286eaeebb 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/DefaultDataBeanNames.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/DefaultBeanNames.java
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.cassandra.config;
 
-import org.springframework.cassandra.config.xml.DefaultBeanNames;
+import org.springframework.cassandra.config.xml.DefaultCqlBeanNames;
 
-public interface DefaultDataBeanNames extends DefaultBeanNames {
+public interface DefaultBeanNames extends DefaultCqlBeanNames {
 
 	public static final String DATA_TEMPLATE = "cassandraTemplate";
 	public static final String CONVERTER = "cassandraConverter";
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractCassandraConfiguration.java
similarity index 91%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractCassandraConfiguration.java
index e88d0e27e..c971fe6e9 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractSpringDataCassandraConfiguration.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/java/AbstractCassandraConfiguration.java
@@ -19,7 +19,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.cassandra.config.java.AbstractClusterConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.cassandra.config.CassandraDataSessionFactoryBean;
+import org.springframework.data.cassandra.config.CassandraSessionFactoryBean;
 import org.springframework.data.cassandra.config.CassandraEntityClassScanner;
 import org.springframework.data.cassandra.config.SchemaAction;
 import org.springframework.data.cassandra.convert.CassandraConverter;
@@ -38,7 +38,7 @@ import org.springframework.data.mapping.context.MappingContext;
  * @author Matthew T. Adams
  */
 @Configuration
-public abstract class AbstractSpringDataCassandraConfiguration extends AbstractClusterConfiguration implements
+public abstract class AbstractCassandraConfiguration extends AbstractClusterConfiguration implements
 		BeanClassLoaderAware {
 
 	protected abstract String getKeyspaceName();
@@ -61,9 +61,9 @@ public abstract class AbstractSpringDataCassandraConfiguration extends AbstractC
 	}
 
 	@Bean
-	public CassandraDataSessionFactoryBean session() throws Exception {
+	public CassandraSessionFactoryBean session() throws Exception {
 
-		CassandraDataSessionFactoryBean bean = new CassandraDataSessionFactoryBean();
+		CassandraSessionFactoryBean bean = new CassandraSessionFactoryBean();
 
 		bean.setCluster(cluster().getObject());
 		bean.setConverter(cassandraConverter());
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataClusterParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraClusterParser.java
similarity index 89%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataClusterParser.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraClusterParser.java
index 161604850..8a987ae28 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataClusterParser.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraClusterParser.java
@@ -17,7 +17,7 @@ package org.springframework.data.cassandra.config.xml;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.xml.CassandraClusterParser;
+import org.springframework.cassandra.config.xml.CassandraCqlClusterParser;
 import org.w3c.dom.Element;
 
 /**
@@ -25,7 +25,7 @@ import org.w3c.dom.Element;
  * 
  * @author Matthew T. Adams
  */
-public class CassandraDataClusterParser extends CassandraClusterParser {
+public class CassandraClusterParser extends CassandraCqlClusterParser {
 
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java
index 6fd252ec2..8cba96d6f 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraMappingContextParser.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.cassandra.config.DefaultDataBeanNames;
+import org.springframework.data.cassandra.config.DefaultBeanNames;
 import org.springframework.data.cassandra.mapping.BasicCassandraMappingContext;
 import org.springframework.data.cassandra.mapping.EntityMapping;
 import org.springframework.data.cassandra.mapping.Mapping;
@@ -51,7 +51,7 @@ public class CassandraMappingContextParser extends AbstractSingleBeanDefinitionP
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultDataBeanNames.CONTEXT;
+		return StringUtils.hasText(id) ? id : DefaultBeanNames.CONTEXT;
 	}
 
 	@Override
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 fccf1f625..2fcd3f46b 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
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.cassandra.config.DefaultDataBeanNames;
+import org.springframework.data.cassandra.config.DefaultBeanNames;
 import org.springframework.data.cassandra.convert.MappingCassandraConverter;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
@@ -42,7 +42,7 @@ public class CassandraMappingConverterParser extends AbstractSingleBeanDefinitio
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultDataBeanNames.CONVERTER;
+		return StringUtils.hasText(id) ? id : DefaultBeanNames.CONVERTER;
 	}
 
 	@Override
@@ -52,7 +52,7 @@ public class CassandraMappingConverterParser extends AbstractSingleBeanDefinitio
 
 		String mappingRef = element.getAttribute("mapping-ref");
 		if (!StringUtils.hasText(mappingRef)) {
-			mappingRef = DefaultDataBeanNames.CONTEXT;
+			mappingRef = DefaultBeanNames.CONTEXT;
 		}
 
 		builder.addConstructorArgReference(mappingRef);
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/CassandraNamespaceHandler.java
similarity index 81%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataNamespaceHandler.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraNamespaceHandler.java
index 405dbc664..5e3d39860 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/CassandraNamespaceHandler.java
@@ -25,7 +25,7 @@ import org.springframework.data.repository.config.RepositoryBeanDefinitionParser
  * @author Alex Shvid
  * @author Matthew T. Adams
  */
-public class CassandraDataNamespaceHandler extends NamespaceHandlerSupport {
+public class CassandraNamespaceHandler extends NamespaceHandlerSupport {
 
 	@Override
 	public void init() {
@@ -33,9 +33,9 @@ public class CassandraDataNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("repositories", new RepositoryBeanDefinitionParser(
 				new CassandraRepositoryConfigurationExtension()));
 
-		registerBeanDefinitionParser("cluster", new CassandraDataClusterParser());
-		registerBeanDefinitionParser("session", new CassandraDataSessionParser());
-		registerBeanDefinitionParser("template", new CassandraDataTemplateParser());
+		registerBeanDefinitionParser("cluster", new CassandraClusterParser());
+		registerBeanDefinitionParser("session", new CassandraSessionParser());
+		registerBeanDefinitionParser("template", new CassandraTemplateParser());
 		registerBeanDefinitionParser("converter", new CassandraMappingConverterParser());
 		registerBeanDefinitionParser("mapping", new CassandraMappingContextParser());
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraSessionParser.java
similarity index 84%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataSessionParser.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraSessionParser.java
index 255fa7132..22da0bd76 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataSessionParser.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraSessionParser.java
@@ -22,9 +22,9 @@ import static org.springframework.cassandra.config.xml.ParsingUtils.addRequiredP
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.xml.CassandraSessionParser;
-import org.springframework.data.cassandra.config.CassandraDataSessionFactoryBean;
-import org.springframework.data.cassandra.config.DefaultDataBeanNames;
+import org.springframework.cassandra.config.xml.CassandraCqlSessionParser;
+import org.springframework.data.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.data.cassandra.config.DefaultBeanNames;
 import org.springframework.data.cassandra.config.SchemaAction;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
@@ -34,11 +34,11 @@ import org.w3c.dom.Element;
  * 
  * @author Matthew T. Adams
  */
-public class CassandraDataSessionParser extends CassandraSessionParser {
+public class CassandraSessionParser extends CassandraCqlSessionParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return CassandraDataSessionFactoryBean.class;
+		return CassandraSessionFactoryBean.class;
 	}
 
 	@Override
@@ -56,7 +56,7 @@ public class CassandraDataSessionParser extends CassandraSessionParser {
 		String name = attribute.getName();
 
 		if ("cassandra-converter-ref".equals(name)) {
-			addOptionalPropertyReference(builder, "converter", attribute, DefaultDataBeanNames.CONVERTER);
+			addOptionalPropertyReference(builder, "converter", attribute, DefaultBeanNames.CONVERTER);
 		} else if ("schema-action".equals(name)) {
 			addOptionalPropertyValue(builder, "schemaAction", attribute, SchemaAction.NONE.name());
 		} else {
@@ -70,6 +70,6 @@ public class CassandraDataSessionParser extends CassandraSessionParser {
 		super.setDefaultProperties(builder);
 
 		addRequiredPropertyValue(builder, "schemaAction", SchemaAction.NONE.name());
-		addRequiredPropertyReference(builder, "converter", DefaultDataBeanNames.CONVERTER);
+		addRequiredPropertyReference(builder, "converter", DefaultBeanNames.CONVERTER);
 	}
 }
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraTemplateParser.java
similarity index 81%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataTemplateParser.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraTemplateParser.java
index da2eda65c..002f11719 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraDataTemplateParser.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/xml/CassandraTemplateParser.java
@@ -19,9 +19,9 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.xml.CassandraTemplateParser;
-import org.springframework.data.cassandra.config.DefaultDataBeanNames;
-import org.springframework.data.cassandra.config.CassandraDataTemplateFactoryBean;
+import org.springframework.cassandra.config.xml.CassandraCqlTemplateParser;
+import org.springframework.data.cassandra.config.DefaultBeanNames;
+import org.springframework.data.cassandra.config.CassandraTemplateFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
@@ -30,11 +30,11 @@ import org.w3c.dom.Element;
  * 
  * @author Matthew T. Adams
  */
-public class CassandraDataTemplateParser extends CassandraTemplateParser {
+public class CassandraTemplateParser extends CassandraCqlTemplateParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return CassandraDataTemplateFactoryBean.class;
+		return CassandraTemplateFactoryBean.class;
 	}
 
 	@Override
@@ -42,7 +42,7 @@ public class CassandraDataTemplateParser extends CassandraTemplateParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultDataBeanNames.DATA_TEMPLATE;
+		return StringUtils.hasText(id) ? id : DefaultBeanNames.DATA_TEMPLATE;
 	}
 
 	@Override
@@ -58,7 +58,7 @@ public class CassandraDataTemplateParser extends CassandraTemplateParser {
 	protected void parseConverterAttribute(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 		String converterRef = element.getAttribute("cassandra-converter-ref");
 		if (!StringUtils.hasText(converterRef)) {
-			converterRef = DefaultDataBeanNames.CONVERTER;
+			converterRef = DefaultBeanNames.CONVERTER;
 		}
 		builder.addPropertyReference("converter", converterRef);
 	}
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/DefaultCassandraRowValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/BasicCassandraRowValueProvider.java
similarity index 92%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/DefaultCassandraRowValueProvider.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/BasicCassandraRowValueProvider.java
index 051745621..5f76d6598 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/DefaultCassandraRowValueProvider.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/BasicCassandraRowValueProvider.java
@@ -35,21 +35,21 @@ import com.datastax.driver.core.Row;
  * @author Matthew T. Adams
  * @author David Webb
  */
-public class DefaultCassandraRowValueProvider implements CassandraRowValueProvider {
+public class BasicCassandraRowValueProvider implements CassandraRowValueProvider {
 
-	private static Logger log = LoggerFactory.getLogger(DefaultCassandraRowValueProvider.class);
+	private static Logger log = LoggerFactory.getLogger(BasicCassandraRowValueProvider.class);
 
 	private final Row source;
 	private final SpELExpressionEvaluator evaluator;
 
 	/**
-	 * Creates a new {@link DefaultCassandraRowValueProvider} with the given {@link Row} and
+	 * Creates a new {@link BasicCassandraRowValueProvider} with the given {@link Row} and
 	 * {@link DefaultSpELExpressionEvaluator}.
 	 * 
 	 * @param source must not be {@literal null}.
 	 * @param evaluator must not be {@literal null}.
 	 */
-	public DefaultCassandraRowValueProvider(Row source, DefaultSpELExpressionEvaluator evaluator) {
+	public BasicCassandraRowValueProvider(Row source, DefaultSpELExpressionEvaluator evaluator) {
 		Assert.notNull(source);
 		Assert.notNull(evaluator);
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
index 682d66f8c..b80158f5d 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
@@ -116,7 +116,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
 
 		DefaultSpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(row, spELContext);
 
-		DefaultCassandraRowValueProvider rowValueProvider = new DefaultCassandraRowValueProvider(row, evaluator);
+		BasicCassandraRowValueProvider rowValueProvider = new BasicCassandraRowValueProvider(row, evaluator);
 
 		CassandraPersistentEntityParameterValueProvider parameterProvider = new CassandraPersistentEntityParameterValueProvider(
 				entity, rowValueProvider, null);
@@ -132,7 +132,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
 	}
 
 	protected void readPropertiesFromRow(final CassandraPersistentEntity<?> entity,
-			final DefaultCassandraRowValueProvider row, final BeanWrapper<?, ?> wrapper) {
+			final BasicCassandraRowValueProvider row, final BeanWrapper<?, ?> wrapper) {
 
 		entity.doWithProperties(new PropertyHandler<CassandraPersistentProperty>() {
 
@@ -145,7 +145,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
 	}
 
 	protected void readPropertyFromRow(final CassandraPersistentEntity<?> entity, final CassandraPersistentProperty prop,
-			final DefaultCassandraRowValueProvider row, final BeanWrapper<?, ?> wrapper) {
+			final BasicCassandraRowValueProvider row, final BeanWrapper<?, ?> wrapper) {
 
 		if (entity.isConstructorArgument(prop)) { // skip 'cause prop was set in ctor
 			return;
@@ -181,7 +181,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
 	}
 
 	protected Object instantiatePrimaryKey(CassandraPersistentEntity<?> entity, CassandraPersistentProperty keyProperty,
-			DefaultCassandraRowValueProvider propertyProvider) {
+			BasicCassandraRowValueProvider propertyProvider) {
 
 		EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity);
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java
index 1ad8734ad..0e6579637 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/config/CassandraRepositoryConfigurationExtension.java
@@ -18,7 +18,7 @@ package org.springframework.data.cassandra.repository.config;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.cassandra.config.xml.ParsingUtils;
 import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.data.cassandra.config.DefaultDataBeanNames;
+import org.springframework.data.cassandra.config.DefaultBeanNames;
 import org.springframework.data.cassandra.repository.support.CassandraRepositoryFactoryBean;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
@@ -53,7 +53,7 @@ public class CassandraRepositoryConfigurationExtension extends RepositoryConfigu
 		Element element = config.getElement();
 
 		ParsingUtils.addOptionalPropertyReference(builder, "cassandraTemplate", element, CASSANDRA_TEMPLATE_REF,
-				DefaultDataBeanNames.TEMPLATE);
+				DefaultBeanNames.TEMPLATE);
 	}
 
 	@Override
diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers
index fd4c64a5d..35ee66654 100644
--- a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers
+++ b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/data/cassandra=org.springframework.data.cassandra.config.xml.CassandraDataNamespaceHandler
+http\://www.springframework.org/schema/data/cassandra=org.springframework.data.cassandra.config.xml.CassandraNamespaceHandler
diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0-trying-to-use-xml-extension.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0-trying-to-use-xml-extension.xsd
deleted file mode 100644
index 46577c250..000000000
--- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0-trying-to-use-xml-extension.xsd
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.springframework.org/schema/data/cassandra"
-	xmlns:base="http://www.springframework.org/schema/cassandra" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tool="http://www.springframework.org/schema/tool"
-	targetNamespace="http://www.springframework.org/schema/data/cassandra"
-	elementFormDefault="qualified" attributeFormDefault="unqualified">
-
-	<xsd:import namespace="http://www.springframework.org/schema/tool"
-		schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd" />
-
-	<xsd:import namespace="http://www.springframework.org/schema/cassandra"
-		schemaLocation="http://www.springframework.org/schema/cassandra/spring-cassandra.xsd" />
-
-	<xsd:annotation>
-		<xsd:documentation><![CDATA[
-Defines the configuration elements for Spring Data Cassandra support.
-    ]]></xsd:documentation>
-	</xsd:annotation>
-
-	<xsd:element name="session" type="sessionType" />
-
-	<xsd:element name="cluster" type="clusterType"/>
-
-	<xsd:element name="keyspace" type="keyspaceType" />
-
-	<xsd:complexType name="clusterType">
-		<xsd:complexContent>
-			<xsd:extension base="base:clusterType">
-				<xsd:sequence>
-					<xsd:element name="tables" minOccurs="0" maxOccurs="unbounded" type="tablesType"></xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="datacenterType">
-		<xsd:complexContent>
-			<xsd:extension base="base:datacenterType"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="keyspaceType">
-		<xsd:complexContent>
-			<xsd:extension base="base:keyspaceType">
-				<xsd:sequence>
-					<xsd:element name="table" type="tableType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
-				</xsd:sequence>
-				<xsd:attribute name="cassandra-converter-ref" type="cassandraConverterRefType" use="optional"></xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:simpleType name="cassandraConverterRefType" final="union">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to type="org.springframework.data.cassandra.convert.CassandraConverter" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string" />
-	</xsd:simpleType>
-
-	<xsd:complexType name="poolingOptionsType">
-		<xsd:complexContent>
-			<xsd:extension base="base:poolingOptionsType"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="socketOptionsType">
-		<xsd:complexContent>
-			<xsd:extension base="base:socketOptionsType"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="replicationType">
-		<xsd:complexContent>
-			<xsd:extension base="base:replicationType"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="sessionType">
-		<xsd:complexContent>
-			<xsd:extension base="base:sessionType"/>
-		</xsd:complexContent>
-	</xsd:complexType>
-	
-	<xsd:simpleType name="converterRef">
-		<xsd:annotation>
-			<xsd:appinfo>
-				<tool:annotation kind="ref">
-					<tool:assignable-to
-						type="org.springframework.data.cassandra.convert.CassandraConverter" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-		<xsd:union memberTypes="xsd:string" />
-	</xsd:simpleType>
-<!--
-	<xsd:element name="data-template" type="templateType">
-		<xsd:annotation>
-			<xsd:documentation
-				source="org.springframework.cassandra.config.xml.TemplateFactoryBean"><![CDATA[
-Defines a CassandraTemplate.
-			]]></xsd:documentation>
-			<xsd:appinfo>
-				<tool:annotation>
-					<tool:exports type="org.springframework.data.cassandra.CassandraDataTemplate" />
-				</tool:annotation>
-			</xsd:appinfo>
-		</xsd:annotation>
-	</xsd:element>
- 
-	<xsd:complexType name="dataTemplateType">
-		<xsd:attribute name="id" type="xsd:ID" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The name of the template; default is "cassandra-data-template".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="session-ref" type="base:sessionRef" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-The reference to a Cassandra session; default is "cassandra-session".
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-
--->
-
-	<xsd:complexType name="tablesType">
-		<xsd:sequence>
-			<xsd:element name="table" type="tableType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="keyspace-name" type="xsd:string" use="optional"></xsd:attribute>
-	</xsd:complexType>
-
-	<xsd:complexType name="tableType">
-		<xsd:attribute name="entity" type="xsd:string">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Entity class name.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-		<xsd:attribute name="table-name" type="xsd:string" use="optional">
-			<xsd:annotation>
-				<xsd:documentation><![CDATA[
-Table name override.
-				]]></xsd:documentation>
-			</xsd:annotation>
-		</xsd:attribute>
-	</xsd:complexType>
-<!-- 
-	<xsd:simpleType name="clusterRef" final="union">
-		<xsd:union memberTypes="base:clusterRef" />
-	</xsd:simpleType>
-
-	<xsd:simpleType name="sessionRef" final="union">
-		<xsd:union memberTypes="base:sessionRef" />
-	</xsd:simpleType>
- -->
-</xsd:schema>
\ No newline at end of file
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
index ce6816d6b..2a19b4cff 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/AbstractSpringDataEmbeddedCassandraIntegrationTest.java
@@ -25,7 +25,7 @@ import org.springframework.data.cassandra.mapping.CassandraPersistentEntity;
 public class AbstractSpringDataEmbeddedCassandraIntegrationTest extends AbstractEmbeddedCassandraIntegrationTest {
 
 	static {
-		SpringDataCassandraBuildProperties props = new SpringDataCassandraBuildProperties();
+		SpringCassandraBuildProperties props = new SpringCassandraBuildProperties();
 		CASSANDRA_NATIVE_PORT = props.getCassandraPort();
 	}
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/IntegrationTestConfig.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/IntegrationTestConfig.java
index 5c13d75a6..409c5acb7 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/IntegrationTestConfig.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/IntegrationTestConfig.java
@@ -24,7 +24,7 @@ import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification;
 import org.springframework.cassandra.test.unit.support.Utils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.cassandra.config.SchemaAction;
-import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandraConfiguration;
+import org.springframework.data.cassandra.config.java.AbstractCassandraConfiguration;
 
 /**
  * Setup any spring configuration for unit tests
@@ -33,9 +33,9 @@ import org.springframework.data.cassandra.config.java.AbstractSpringDataCassandr
  * @author Matthew T. Adams
  */
 @Configuration
-public class IntegrationTestConfig extends AbstractSpringDataCassandraConfiguration {
+public class IntegrationTestConfig extends AbstractCassandraConfiguration {
 
-	public static final SpringDataCassandraBuildProperties PROPS = new SpringDataCassandraBuildProperties();
+	public static final SpringCassandraBuildProperties PROPS = new SpringCassandraBuildProperties();
 	public static final int PORT = PROPS.getCassandraPort();
 	public static final int RPC_PORT = PROPS.getCassandraRpcPort();
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringCassandraBuildProperties.java
similarity index 76%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringCassandraBuildProperties.java
index 5d8c87747..d6eeb1789 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringDataCassandraBuildProperties.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/support/SpringCassandraBuildProperties.java
@@ -15,12 +15,12 @@
  */
 package org.springframework.data.cassandra.test.integration.support;
 
-import org.springframework.cassandra.test.integration.support.SpringCassandraBuildProperties;
+import org.springframework.cassandra.test.integration.support.SpringCqlBuildProperties;
 
 @SuppressWarnings("serial")
-public class SpringDataCassandraBuildProperties extends SpringCassandraBuildProperties {
+public class SpringCassandraBuildProperties extends SpringCqlBuildProperties {
 
-	public SpringDataCassandraBuildProperties() {
-		super("/" + SpringDataCassandraBuildProperties.class.getName() + ".properties");
+	public SpringCassandraBuildProperties() {
+		super("/" + SpringCassandraBuildProperties.class.getName() + ".properties");
 	}
 }
diff --git a/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties b/spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringCassandraBuildProperties.properties
similarity index 100%
rename from spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringDataCassandraBuildProperties.properties
rename to spring-data-cassandra/src/test/resources/org.springframework.data.cassandra.test.integration.support.SpringCassandraBuildProperties.properties