diff --git a/lib/core/Manager.js b/lib/core/Manager.js
index 837868e8..785f11a3 100644
--- a/lib/core/Manager.js
+++ b/lib/core/Manager.js
@@ -403,7 +403,7 @@ Manager.prototype._extendNotification = function (notification, decEndpoint) {
     };
 
     // Add from
-    notification.from = decEndpoint.name || decEndpoint.registryName;
+    notification.from = decEndpoint.name || (decEndpoint.registry && decEndpoint.source);
     if (!notification.from && notification.data.resolver) {
         notification.from = notification.data.resolver.getName();
     }
diff --git a/lib/core/Project.js b/lib/core/Project.js
index 58f3ab99..259aaf40 100644
--- a/lib/core/Project.js
+++ b/lib/core/Project.js
@@ -81,7 +81,7 @@ Project.prototype.install = function (endpoints, options) {
             that._json[key] = that._json[key] || {};
 
             mout.object.forOwn(targets, function (decEndpoint) {
-                var source = decEndpoint.source === decEndpoint.registryName ? '' : decEndpoint.source;
+                var source = decEndpoint.registry ? '' : decEndpoint.source;
                 var target = decEndpoint.pkgMeta.version ? '~' + decEndpoint.pkgMeta.version : decEndpoint.target;
                 that._json[key][decEndpoint.name] = mout.string.ltrim(source + '#' + target, ['#']);
             });
diff --git a/lib/core/resolverFactory.js b/lib/core/resolverFactory.js
index 800d1a89..c3eb3ca9 100644
--- a/lib/core/resolverFactory.js
+++ b/lib/core/resolverFactory.js
@@ -90,7 +90,7 @@ function createResolver(decEndpoint, registryClient, config) {
         return function () {
             return Q.nfcall(registryClient.lookup.bind(registryClient), source)
             .then(function (entry) {
-                decEndpoint.registryName = source;
+                decEndpoint.registry = true;
                 // TODO: Handle entry.type.. for now it's only 'alias'
                 //       When we got published packages, this needs to be adjusted
                 return new resolvers.GitRemote(entry.url, resOptions);