diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index eb43dcfe8..ed9409c31 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -660,8 +660,8 @@ define([
                     });
                 });*/
             }
-            if (store.profile) {
-                store.profile.setName(value);
+            if (store.modules['profile']) {
+                store.modules['profile'].setName(value);
             }
             store.proxy[Constants.displayNameKey] = value;
             broadcast([clientId], "UPDATE_METADATA");
diff --git a/www/common/outer/profile.js b/www/common/outer/profile.js
index ff57917d8..f914cc77c 100644
--- a/www/common/outer/profile.js
+++ b/www/common/outer/profile.js
@@ -69,7 +69,7 @@ define([
 
     var setName = function (ctx, value, cb) {
         cb = cb || function () {};
-        ctx.profile.name = value;
+        ctx.listmap.proxy.name = value;
         Realtime.whenRealtimeSyncs(ctx.listmap.realtime, function () {
             if (!ctx.listmap) { return; }
             ctx.emit('UPDATE', ctx.listmap.proxy, ctx.clients);
@@ -123,8 +123,6 @@ define([
 
         ctx.profile = store.proxy.profile = store.proxy.profile || {};
 
-        console.log(ctx.profile);
-
         initializeProfile(ctx, waitFor(function (err) {
             if (err) { return; }
             openChannel(ctx);
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index a028ec17f..6eb8d0596 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -930,7 +930,7 @@ MessengerUI, Messages) {
         $userButton.click(function (e) {
             e.preventDefault();
             e.stopPropagation();
-            var myData = metadataMgr.getMetadata().users[metadataMgr.getNetfluxId()];
+            var myData = metadataMgr.getUserData();
             var lastName = myData.name;
             UI.prompt(Messages.changeNamePrompt, lastName || '', function (newName) {
                 if (newName === null && typeof(lastName) === "string") { return; }