diff --git a/AABrowserAPI/UserAuthentication.js b/AABrowserAPI/UserAuthentication.js
index b6fb0e12e..8ff0b2007 100644
--- a/AABrowserAPI/UserAuthentication.js
+++ b/AABrowserAPI/UserAuthentication.js
@@ -80,7 +80,7 @@
                 userProfile.storagePermissions.push([dependecy + "." + "READ", readPermission]);
             }
         }
-
+        
         /* In order to be able to download a bot source code, the user will need READ permissions over the Platform container. */
 
         let container = "aaplatform";
diff --git a/CloudVM/CloudVM.js b/CloudVM/CloudVM.js
index f5cb0c148..fa9c83e24 100644
--- a/CloudVM/CloudVM.js
+++ b/CloudVM/CloudVM.js
@@ -100,7 +100,7 @@ function newCloudVM() {
                             + window.DEV_TEAM + "/"
                             + "members" + "/"
                             + window.USER_LOGGED_IN + "/"
-                            + window.CURRENT_BOT + "/"
+                            + window.CURRENT_BOT_REPO + "/"
                             + window.CURRENT_PROCESS + "/"
                             + "User.Bot.js"
                             ;
diff --git a/TopSpace/CurrentBot.js b/TopSpace/CurrentBot.js
index ed2db0809..237bb0126 100644
--- a/TopSpace/CurrentBot.js
+++ b/TopSpace/CurrentBot.js
@@ -37,8 +37,10 @@ function newCurrentBot() {
 
             if (window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots.length === 0) {
                 window.CURRENT_BOT = NOT_FOUND;
+                window.CURRENT_BOT_REPO = "NO REPO";
             } else {
                 window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].displayName;
+                window.CURRENT_BOT_REPO = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].repo;
             }
         }
 
@@ -52,6 +54,7 @@ function newCurrentBot() {
 
             sharedStatus.currentUserBotIndex = 0;
             window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].displayName;
+            window.CURRENT_BOT_REPO = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].repo;
             sharedStatus.eventHandler.raiseEvent("userBot Changed");
 
         } else {
@@ -67,6 +70,7 @@ function newCurrentBot() {
 
             sharedStatus.currentUserBotIndex = 0;
             window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].displayName;
+            window.CURRENT_BOT_REPO = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].repo;
             sharedStatus.eventHandler.raiseEvent("userBot Changed");
             return;
         }
@@ -75,6 +79,7 @@ function newCurrentBot() {
 
             sharedStatus.currentUserBotIndex++;
             window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].displayName;
+            window.CURRENT_BOT_REPO = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].repo;
             sharedStatus.eventHandler.raiseEvent("userBot Changed");
             return;
         }
diff --git a/TopSpace/DevTeam.js b/TopSpace/DevTeam.js
index 4a6431d3b..fec528132 100644
--- a/TopSpace/DevTeam.js
+++ b/TopSpace/DevTeam.js
@@ -24,6 +24,7 @@ function newDevTeam() {
     const NOT_FOUND = "Not a devTeam Member";
 
     let sharedStatus;
+    let label = ""
 
     return thisObject;
 
@@ -32,9 +33,10 @@ function newDevTeam() {
         sharedStatus = pSharedStatus;
 
         if (window.USER_PROFILE.devTeams.length === 0) {
-            window.DEV_TEAM = NOT_FOUND;
+            label = NOT_FOUND;
         } else {
-            window.DEV_TEAM = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].displayName;
+            window.DEV_TEAM = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].codeName;
+            label = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].displayName;
         }
 
         thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick);
@@ -45,7 +47,8 @@ function newDevTeam() {
         if (sharedStatus.currentDevTeamIndex + 1 === window.USER_PROFILE.devTeams.length) {
 
             sharedStatus.currentDevTeamIndex = 0;
-            window.DEV_TEAM = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].displayName;
+            window.DEV_TEAM = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].codeName;
+            label = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].displayName;
             sharedStatus.eventHandler.raiseEvent("devTeam Changed");
             return;
         }
@@ -53,7 +56,8 @@ function newDevTeam() {
         if (sharedStatus.currentDevTeamIndex + 1 < window.USER_PROFILE.devTeams.length) {
 
             sharedStatus.currentDevTeamIndex++;
-            window.DEV_TEAM = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].displayName;
+            window.DEV_TEAM = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].codeName;
+            label = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].displayName;
             sharedStatus.eventHandler.raiseEvent("devTeam Changed");
             return;
         }
@@ -83,7 +87,6 @@ function newDevTeam() {
         thisObject.container.frame.draw(false, false);
 
         let fontSize = 12;
-        let label = window.DEV_TEAM;
 
         let point = {
             x: thisObject.container.frame.width * 1 / 3,