diff --git a/index.js b/index.js
index 8594093e..5db6b786 100644
--- a/index.js
+++ b/index.js
@@ -15,4 +15,4 @@ loopback.Memory = require('./lib/connectors/memory');
  * Types
  */
 
-loopback.GeoPoint = require('loopback-data/lib/geo').GeoPoint;
\ No newline at end of file
+loopback.GeoPoint = require('loopback-datasource-juggler/lib/geo').GeoPoint;
\ No newline at end of file
diff --git a/lib/application.js b/lib/application.js
index 56ead479..d96d1d59 100644
--- a/lib/application.js
+++ b/lib/application.js
@@ -2,8 +2,8 @@
  * Module dependencies.
  */
 
-var DataSource = require('loopback-data').DataSource
-  , ModelBuilder = require('loopback-data').ModelBuilder
+var DataSource = require('loopback-datasource-juggler').DataSource
+  , ModelBuilder = require('loopback-datasource-juggler').ModelBuilder
   , assert = require('assert')
   , RemoteObjects = require('strong-remoting')
   , swagger = require('strong-remoting/ext/swagger');
diff --git a/lib/connectors/memory.js b/lib/connectors/memory.js
index 1f46cde3..0b92e0c6 100644
--- a/lib/connectors/memory.js
+++ b/lib/connectors/memory.js
@@ -13,7 +13,7 @@ var Connector = require('./base-connector')
   , util = require('util')
   , inherits = util.inherits
   , assert = require('assert')
-  , JdbMemory = require('loopback-data/lib/connectors/memory');
+  , JdbMemory = require('loopback-datasource-juggler/lib/connectors/memory');
   
 /**
  * Create a new `Memory` connector with the given `options`.
diff --git a/lib/loopback.js b/lib/loopback.js
index 639eeddf..e424a358 100644
--- a/lib/loopback.js
+++ b/lib/loopback.js
@@ -9,8 +9,8 @@ var express = require('express')
   , path = require('path')
   , proto = require('./application')
   , utils = require('express/node_modules/connect').utils
-  , DataSource = require('loopback-data').DataSource
-  , ModelBuilder = require('loopback-data').ModelBuilder
+  , DataSource = require('loopback-datasource-juggler').DataSource
+  , ModelBuilder = require('loopback-datasource-juggler').ModelBuilder
   , assert = require('assert')
   , i8n = require('inflection');
 
diff --git a/lib/models/acl.js b/lib/models/acl.js
index 7c70af43..c304e362 100644
--- a/lib/models/acl.js
+++ b/lib/models/acl.js
@@ -45,7 +45,7 @@ var ACLSchema = {
 // readAccess, writeAccess --> public, userId, role
 
 module.exports = function(dataSource) {
-    dataSource = dataSource || new require('loopback-data').ModelBuilder();
+    dataSource = dataSource || new require('loopback-datasource-juggler').ModelBuilder();
     var ACL = dataSource.define('ACL', ACLSchema);
     return ACL;
 }
\ No newline at end of file
diff --git a/lib/models/application.js b/lib/models/application.js
index 29e05c6f..2d2bf598 100644
--- a/lib/models/application.js
+++ b/lib/models/application.js
@@ -91,7 +91,7 @@ function generateKey(hmacKey, algorithm, encoding) {
 }
 
 module.exports = function (dataSource) {
-    dataSource = dataSource || new require('loopback-data').ModelBuilder();
+    dataSource = dataSource || new require('loopback-datasource-juggler').ModelBuilder();
 
     // var AuthenticationScheme = dataSource.define('AuthenticationScheme', AuthenticationSchemeSchema);
     // ApplicationSchema.authenticationSchemes = [AuthenticationScheme];
diff --git a/lib/models/installation.js b/lib/models/installation.js
index 841383a1..b6231998 100644
--- a/lib/models/installation.js
+++ b/lib/models/installation.js
@@ -20,7 +20,7 @@ var InstallationSchema = {
 };
 
 module.exports = function(dataSource) {
-    dataSource = dataSource || new require('loopback-data').ModelBuilder();
+    dataSource = dataSource || new require('loopback-datasource-juggler').ModelBuilder();
     var Installation = dataSource.define('Installation', InstallationSchema);
     return Installation;
 }
diff --git a/lib/models/model.js b/lib/models/model.js
index 0f38c902..b9b8467c 100644
--- a/lib/models/model.js
+++ b/lib/models/model.js
@@ -2,7 +2,7 @@
  * Module Dependencies.
  */
 
-var ModelBuilder = require('loopback-data').ModelBuilder;
+var ModelBuilder = require('loopback-datasource-juggler').ModelBuilder;
 var modeler = new ModelBuilder();
 
 /**
diff --git a/lib/models/role.js b/lib/models/role.js
index 810897e2..a8af2645 100644
--- a/lib/models/role.js
+++ b/lib/models/role.js
@@ -12,7 +12,7 @@ var RoleSchema = {
 }
 
 module.exports = function(dataSource) {
-    dataSource = dataSource || new require('loopback-data').ModelBuilder();
+    dataSource = dataSource || new require('loopback-datasource-juggler').ModelBuilder();
     var Role = dataSource.define('Role', RoleSchema);
     return Role;
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 658466da..2a994ef9 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "debug": "latest",
     "express": "~3.1.1",
-    "loopback-data": "git+ssh://git@github.com:strongloop/loopback-data.git",
+    "loopback-datasource-juggler": "git+ssh://git@github.com:strongloop/loopback-datasource-juggler.git",
     "strong-remoting": "git+ssh://git@github.com:strongloop/strong-remoting.git",
     "inflection": "~1.2.5",
     "bcrypt": "~0.7.6",