diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index 227cb954af..911b561ff3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -147,7 +147,7 @@
 
             // only create the save/publish/preview buttons if the 
             // content app is "Conent"
-            if(app && app.alias !== "content") {
+            if(app && app.alias !== "umbContent" && app.alias !== "umbInfo") {
                 $scope.defaultButton = null;
                 $scope.subButtons = null;
                 $scope.page.showPreviewButton = false;
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
index 54db6308cf..8545854992 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
@@ -40,7 +40,7 @@
             // disable the name field if the active content app is not "Content"
             vm.nameDisabled = false;
             angular.forEach(vm.editor.content.apps, function(app){
-                if(app.active && app.alias !== "content") {
+                if(app.active && app.alias !== "umbContent" && app.alias !== "umbInfo") {
                     vm.nameDisabled = true;
                 }
             });
@@ -78,9 +78,9 @@
          * @param {any} item
          */
         function selectApp(item) {
-            // disable the name field if the active content app is not "Content"
+            // disable the name field if the active content app is not "Content" or "Info"
             vm.nameDisabled = false;
-            if(item && item.alias !== "content") {
+            if(item && item.alias !== "umbContent" && item.alias !== "umbInfo") {
                 vm.nameDisabled = true;
             }
             // call the callback if any is registered
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index ce03a025a3..46d0a1c5c1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -191,7 +191,7 @@
 
             //then assign the variant to a view model to the content app
             var contentApp = _.find(variant.apps, function (a) {
-                return a.alias === "content";
+                return a.alias === "umbContent";
             });
             contentApp.viewModel = variant;
 
@@ -221,7 +221,7 @@
                 var editor = vm.editors[e];
                 for (var i = 0; i < editor.content.apps.length; i++) {
                     var app = editor.content.apps[i];
-                    if (app.alias === "content") {
+                    if (app.alias === "umbContent") {
                         app.active = true;
                     }
                     else {