diff --git a/lib/adapters/cradle.js b/lib/connectors/cradle.js
similarity index 100%
rename from lib/adapters/cradle.js
rename to lib/connectors/cradle.js
diff --git a/lib/adapters/http.js b/lib/connectors/http.js
similarity index 100%
rename from lib/adapters/http.js
rename to lib/connectors/http.js
diff --git a/lib/adapters/memory.js b/lib/connectors/memory.js
similarity index 100%
rename from lib/adapters/memory.js
rename to lib/connectors/memory.js
diff --git a/lib/adapters/neo4j.js b/lib/connectors/neo4j.js
similarity index 100%
rename from lib/adapters/neo4j.js
rename to lib/connectors/neo4j.js
diff --git a/lib/adapters/riak.js b/lib/connectors/riak.js
similarity index 100%
rename from lib/adapters/riak.js
rename to lib/connectors/riak.js
diff --git a/lib/dao.js b/lib/dao.js
index de4ad936..e1c9be3b 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -15,13 +15,13 @@ require('./relations.js');
 var Inclusion = require('./include.js');
 var Relation = require('./relations.js');
 var geo = require('./geo');
-var Memory = require('./adapters/memory').Memory;
+var Memory = require('./connectors/memory').Memory;
 var fieldsToArray = require('./utils').fieldsToArray;
 
 /**
  * DAO class - base class for all persist objects
  * provides **common API** to access any database connector.
- * This class describes only abstract behavior layer, refer to `lib/adapters/*.js`
+ * This class describes only abstract behavior layer, refer to `lib/connectors/*.js`
  * to learn more about specific connector implementations
  *
  * `DataAccessObject` mixes `Inclusion` classes methods
diff --git a/lib/datasource.js b/lib/datasource.js
index d90e6795..e6fcd43e 100644
--- a/lib/datasource.js
+++ b/lib/datasource.js
@@ -184,9 +184,9 @@ DataSource.prototype.setup = function(name, settings) {
         } else if (name.match(/^\//)) {
             // try absolute path
             connector = require(name);
-        } else if (existsSync(__dirname + '/adapters/' + name + '.js')) {
+        } else if (existsSync(__dirname + '/connectors/' + name + '.js')) {
             // try built-in connector
-            connector = require('./adapters/' + name);
+            connector = require('./connectors/' + name);
         } else {
             // try foreign connector
             try {
@@ -402,7 +402,7 @@ DataSource.prototype.defineProperty = function (model, prop, params) {
 
 /**
  * Drop each model table and re-create.
- * This method make sense only for sql adapters.
+ * This method make sense only for sql connectors.
  *
  * @warning All data will be lost! Use autoupdate if you need your data.
  */
@@ -417,7 +417,7 @@ DataSource.prototype.automigrate = function (cb) {
 
 /**
  * Update existing database tables.
- * This method make sense only for sql adapters.
+ * This method make sense only for sql connectors.
  */
 DataSource.prototype.autoupdate = function (cb) {
     this.freeze();
@@ -960,7 +960,7 @@ DataSource.prototype.discoverAndBuildModelsSync = function (modelName, options)
 
 /**
  * Check whether migrations needed
- * This method make sense only for sql adapters.
+ * This method make sense only for sql connectors.
  */
 DataSource.prototype.isActual = function (cb) {
     this.freeze();
@@ -975,7 +975,7 @@ DataSource.prototype.isActual = function (cb) {
  * Log benchmarked message. Do not redefine this method, if you need to grab
  * chema logs, use `dataSource.on('log', ...)` emitter event
  *
- * @private used by adapters
+ * @private used by connectors
  */
 DataSource.prototype.log = function (sql, t) {
     this.emit('log', sql, t);
diff --git a/lib/model.js b/lib/model.js
index 764cf7bf..78a5d9e6 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -18,7 +18,7 @@ var BASE_TYPES = ['String', 'Boolean', 'Number', 'Date', 'Text'];
 /**
  * Model class - base class for all persist objects
  * provides **common API** to access any database connector.
- * This class describes only abstract behavior layer, refer to `lib/adapters/*.js`
+ * This class describes only abstract behavior layer, refer to `lib/connectors/*.js`
  * to learn more about specific connector implementations
  *
  * `ModelBaseClass` mixes `Validatable` and `Hookable` classes methods