diff --git a/models/behaviors/schemaless.php b/models/behaviors/mongodb_schemaless.php
similarity index 90%
rename from models/behaviors/schemaless.php
rename to models/behaviors/mongodb_schemaless.php
index 73ac04d..2da61d2 100644
--- a/models/behaviors/schemaless.php
+++ b/models/behaviors/mongodb_schemaless.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Schemaless behavior.
+ * MongodbSchemaless behavior.
  *
  * Adds functionality specific to MongoDB/schemaless dbs
  * Allow /not/ specifying the model's schema, and derive it (for cake-compatibility) from the data
@@ -25,21 +25,21 @@
  */
 
 /**
- * SchemalessBehavior class
+ * MongodbSchemalessBehavior class
  *
  * @uses          ModelBehavior
  * @package       mongodb
  * @subpackage    mongodb.models.behaviors
  */
-class SchemalessBehavior extends ModelBehavior {
+class MongodbSchemalessBehavior extends ModelBehavior {
 
 /**
  * name property
  *
- * @var string 'Schemaless'
+ * @var string 'MongodbSchemaless'
  * @access public
  */
-	public $name = 'Schemaless';
+	public $name = 'MongodbSchemaless';
 
 /**
  * settings property
diff --git a/models/behaviors/sql_compatible.php b/models/behaviors/mongodb_sql_compatible.php
similarity index 96%
rename from models/behaviors/sql_compatible.php
rename to models/behaviors/mongodb_sql_compatible.php
index 6a0ede8..5d8bfa3 100644
--- a/models/behaviors/sql_compatible.php
+++ b/models/behaviors/mongodb_sql_compatible.php
@@ -22,21 +22,21 @@
  */
 
 /**
- * SqlCompatibleBehavior class
+ * MongodbSqlCompatibleBehavior class
  *
  * @uses          ModelBehavior
  * @package       mongodb
  * @subpackage    mongodb.models.behaviors
  */
-class SqlCompatibleBehavior extends ModelBehavior {
+class MongodbSqlCompatibleBehavior extends ModelBehavior {
 
 /**
  * name property
  *
- * @var string 'SqlCompatible'
+ * @var string 'MongodbSqlCompatible'
  * @access public
  */
-	public $name = 'SqlCompatible';
+	public $name = 'MongodbSqlCompatible';
 
 /**
  * Runtime settings
diff --git a/models/datasources/mongodb_source.php b/models/datasources/mongodb_source.php
index db1ee83..cac486b 100644
--- a/models/datasources/mongodb_source.php
+++ b/models/datasources/mongodb_source.php
@@ -259,7 +259,7 @@ public function describe(&$Model, $field = null) {
 			$schema = $Model->mongoSchema;
 			return $schema + $this->_defaultSchema;
 		} elseif (is_a($Model, 'Model') && !empty($Model->Behaviors)) {
-			$Model->Behaviors->attach('Mongodb.Schemaless');
+			$Model->Behaviors->attach('Mongodb.MongodbSchemaless');
 		}
 		return $this->deriveSchemaFromData($Model);
 	}
diff --git a/tests/cases/datasources/mongodb_source.test.php b/tests/cases/datasources/mongodb_source.test.php
index db46913..f929a89 100644
--- a/tests/cases/datasources/mongodb_source.test.php
+++ b/tests/cases/datasources/mongodb_source.test.php
@@ -489,14 +489,14 @@ public function testSort() {
 	}
 
 /**
- * testSchemaless method
+ * testMongodbSchemaless method
  *
  * Test you can save to a model without specifying mongodb.
  *
  * @return void
  * @access public
  */
-	public function testSchemaless() {
+	public function testMongodbSchemaless() {
 		$toSave = array(
 			'title' => 'A test article',
 			'body' => str_repeat('Lorum ipsum ', 100),
@@ -543,7 +543,7 @@ public function testSchemaless() {
  * @access public
  */
 	public function testSqlComparisonOperators() {
-		$this->Post->Behaviors->attach('Mongodb.SqlCompatible');
+		$this->Post->Behaviors->attach('Mongodb.MongodbSqlCompatible');
 		for ($i = 1; $i <= 20; $i++) {
 			$data = array(
 				'title' => $i,