diff --git a/lib/datasource.js b/lib/datasource.js
index 84adf376..dc03afd9 100644
--- a/lib/datasource.js
+++ b/lib/datasource.js
@@ -234,7 +234,7 @@ DataSource.prototype.setup = function(name, settings) {
                 }
                 connector = require(name);
             } catch (e) {
-                return console.log('\nWARNING: LoopbackData connector "' + name + '" is not installed,\nso your models would not work, to fix run:\n\n    npm install ' + name, '\n');
+                return console.log('\nWARNING: LoopBack connector "' + name + '" is not installed,\nso your models would not work, to fix run:\n\n    npm install ' + name, '\n');
             }
         }
     }
@@ -922,7 +922,7 @@ DataSource.prototype.discoverSchemas = function (modelName, options, cb) {
     }
 
     var self = this;
-    var schemaName = this.name || this.connector.name;
+    var schemaName = this.connector.name || this.name;
 
     var tasks = [
         this.discoverModelProperties.bind(this, modelName, options),
@@ -1029,14 +1029,13 @@ DataSource.prototype.discoverSchemas = function (modelName, options, cb) {
                 console.log('Foreign keys: ', fks);
             }
 
+            schema.options.relations = {};
             foreignKeys.forEach(function (fk) {
                 var propName = fromDBName(fk.pkTableName, true);
-                schema.properties[propName] = {
-                  type: fromDBName(fk.pkTableName, false),
-                  relation: {
-                      type: 'belongsTo',
-                      foreignKey: fromDBName(fk.pkColumnName, true)
-                  }
+                schema.options.relations[propName] = {
+                    model: fromDBName(fk.pkTableName, false),
+                    type: 'belongsTo',
+                    foreignKey: fromDBName(fk.fkColumnName, true)
                 };
 
                 var key = fk.pkOwner + '.' + fk.pkTableName;
@@ -1177,14 +1176,13 @@ DataSource.prototype.discoverSchemasSync = function (modelName, options) {
             console.log('Foreign keys: ', fks);
         }
 
+        schema.options.relations = {};
         foreignKeys.forEach(function (fk) {
             var propName = fromDBName(fk.pkTableName, true);
-            schema.properties[propName] = {
-                type: fromDBName(fk.pkTableName, false),
-                relation: {
-                    type: 'belongsTo',
-                    foreignKey: fromDBName(fk.pkColumnName, true)
-                }
+            schema.options.relations[propName] = {
+                model: fromDBName(fk.pkTableName, false),
+                type: 'belongsTo',
+                foreignKey: fromDBName(fk.fkColumnName, true)
             };
 
             var key = fk.pkOwner + '.' + fk.pkTableName;
@@ -1243,6 +1241,10 @@ DataSource.prototype.discoverAndBuildModels = function (modelName, options, cb)
         }
 
         var models = self.modelBuilder.buildModels(schemaList);
+        // Now attach the models to the data source
+        for(var m in models) {
+            models[m].attachTo(self);
+        }
         cb && cb(err, models);
     });
 };
diff --git a/lib/relations.js b/lib/relations.js
index 7cf2aaa9..a5b043f4 100644
--- a/lib/relations.js
+++ b/lib/relations.js
@@ -195,7 +195,7 @@ Relation.belongsTo = function (anotherClass, params) {
         }
     }
 
-    var idName = this.dataSource.idName(this.modelName) || 'id';
+    var idName = this.dataSource.idName(anotherClass.modelName) || 'id';
     var methodName = params.as || i8n.camelize(anotherClass.modelName, true);
     var fk = params.foreignKey || methodName + 'Id';
 
diff --git a/package.json b/package.json
index 77ee23d5..34712bfc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-datasource-juggler",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "LoopBack DataSoure Juggler",
   "keywords": [
     "StrongLoop",