diff --git a/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraTrueFalseType.java b/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraTrueFalseType.java
index 25bf834c70..219c965392 100644
--- a/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraTrueFalseType.java
+++ b/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraTrueFalseType.java
@@ -12,7 +12,7 @@
 import org.hibernate.ogm.type.impl.AbstractGenericBasicType;
 
 /**
- * Maps {@link Boolean} to {@code T} or {@code F} strings.
+ * Maps {@link Boolean} to {@code T} or {@code F} strings, as Cassandra doesn't store {@link Character}s.
  *
  * @author Davide D'Alto
  */
@@ -31,6 +31,6 @@ public int getColumnSpan(Mapping mapping) throws MappingException {
 
 	@Override
 	public String getName() {
-		return "true_false";
+		return "cassandra_true_false";
 	}
 }
diff --git a/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraYesNoType.java b/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraYesNoType.java
index f62426896a..3ae47e3ca3 100644
--- a/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraYesNoType.java
+++ b/cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/type/impl/CassandraYesNoType.java
@@ -12,7 +12,7 @@
 import org.hibernate.ogm.type.impl.AbstractGenericBasicType;
 
 /**
- * Maps {@link Boolean} to {@code Y} or {@code N} strings.
+ * Maps {@link Boolean} to {@code Y} or {@code N} strings, as Cassandra doesn't store {@link Character}s.
  *
  * @author Davide D'Alto
  */
@@ -31,6 +31,6 @@ public int getColumnSpan(Mapping mapping) throws MappingException {
 
 	@Override
 	public String getName() {
-		return "yes_no";
+		return "cassandra_yes_no";
 	}
 }