diff --git a/src/js/client.js b/src/js/client.js
index bf8135402..0ab2e62ee 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -637,7 +637,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         var that = this;
         var data = {
             appStoreId: id + '@' + manifest.version,
-            location: config.location,
+            subdomain: config.subdomain,
             domain: config.domain,
             portBindings: config.portBindings,
             accessRestriction: config.accessRestriction,
@@ -657,7 +657,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
 
     Client.prototype.cloneApp = function (appId, config, callback) {
         var data = {
-            location: config.location,
+            subdomain: config.subdomain,
             domain: config.domain,
             portBindings: config.portBindings,
             backupId: config.backupId
@@ -2083,7 +2083,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         if (app.manifest.postInstallMessage) {
             var text= app.manifest.postInstallMessage;
             // we chose - because underscore has special meaning in markdown
-            text = text.replace(/\$CLOUDRON-APP-LOCATION/g, app.location);
+            text = text.replace(/\$CLOUDRON-APP-LOCATION/g, app.subdomain);
             text = text.replace(/\$CLOUDRON-APP-DOMAIN/g, app.domain);
             text = text.replace(/\$CLOUDRON-APP-FQDN/g, app.fqdn);
             text = text.replace(/\$CLOUDRON-APP-ORIGIN/g, 'https://' + app.fqdn);
@@ -3261,7 +3261,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
 
             pre = pre ? (pre + ' ') : '';
 
-            return pre + (app.label || app.fqdn || app.location) + ' (' + app.manifest.title + ') ';
+            return pre + (app.label || app.fqdn || app.subdomain) + ' (' + app.manifest.title + ') ';
         }
 
         switch (eventLog.action) {
@@ -3316,7 +3316,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
                 } else {
                     return 'Certificate ' + appName('of', app) + ' was reset';
                 }
-            } else if (data.location) {
+            } else if (data.subdomain) {
                 if (data.fqdn !== data.app.fqdn) {
                     return 'Location ' + appName('of', app) + ' was changed to ' + data.fqdn;
                 } else if (!angular.equals(data.redirectDomains, data.app.redirectDomains)) {
diff --git a/src/views/app.html b/src/views/app.html
index dbcf41ed8..0522f676c 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -139,15 +139,15 @@
           <p ng-bind-html="'app.repairDialog.taskError' | tr:{ task: (app.error.installationState | taskName) }"></p>
           <p class="text-danger">{{ app.error.reason + ': ' + app.error.message }}</p>
         </div>
-        <div class="form-group" ng-show="repair.location && repair.domain">
+        <div class="form-group" ng-show="repair.subdomain && repair.domain">
           <p>{{ 'app.repairDialog.domainDescription' | tr }}</p>
           <label class="control-label">{{ 'app.repairDialog.location' | tr }}</label>
           <div class="input-group form-inline">
-            <input type="text" class="form-control" ng-model="repair.location" name="location" placeholder="{{ 'Leave empty to use bare domain' }}" autofocus>
+            <input type="text" class="form-control" ng-model="repair.subdomain" name="location" placeholder="{{ 'Leave empty to use bare domain' }}" autofocus>
 
             <div class="input-group-btn">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                <span>{{ (!repair.location ? '' : '.') + repair.domain.domain }}</span>
+                <span>{{ '.' + repair.domain.domain }}</span>
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -445,10 +445,10 @@
               <label class="control-label" for="cloneLocationInput">{{ 'app.cloneDialog.location' | tr }}</label>
               <div ng-show="clone.error.location"><small>{{ clone.error.location }}</small></div>
               <div class="input-group form-inline">
-                <input type="text" class="form-control" ng-model="clone.location" id="cloneLocationInput" name="location" placeholder="{{ 'appstore.installDialog.locationPlaceholder' | tr }}" autofocus>
+                <input type="text" class="form-control" ng-model="clone.subdomain" id="cloneLocationInput" name="location" placeholder="{{ 'appstore.installDialog.locationPlaceholder' | tr }}" autofocus>
                 <div class="input-group-btn">
                   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                    <span>{{ (!clone.location ? '' : '.') + clone.domain.domain }}</span>
+                    <span>{{ '.' + clone.domain.domain }}</span>
                     <span class="caret"></span>
                   </button>
                   <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -460,7 +460,7 @@
               </div>
             </div>
 
-            <p class="text-small text-warning" ng-show="clone.domain.provider === 'noop' || clone.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((clone.location ? clone.location + '.' : '') + clone.domain.domain) }"></p>
+            <p class="text-small text-warning" ng-show="clone.domain.provider === 'noop' || clone.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((clone.subdomain ? clone.subdomain + '.' : '') + clone.domain.domain) }"></p>
 
             <div class="has-error text-center" ng-show="clone.error.port">{{ clone.error.port }}</div>
             <div ng-repeat="(env, info) in clone.portBindingsInfo">
@@ -620,11 +620,11 @@
                 <div class="has-error" ng-show="location.error.location">{{ location.error.location }}</div>
 
                 <div class="input-group form-inline">
-                  <input type="text" class="form-control" ng-model="location.location" name="location" placeholder="{{ 'app.location.locationPlaceholder' | tr }}" autofocus>
+                  <input type="text" class="form-control" ng-model="location.subdomain" name="location" placeholder="{{ 'app.location.locationPlaceholder' | tr }}" autofocus>
 
                   <div class="input-group-btn">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                      <span>{{ (!location.location ? '' : '.') + location.domain.domain }}</span>
+                      <span>{{ '.' + location.domain.domain }}</span>
                       <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -636,7 +636,7 @@
                 </div>
               </div>
 
-              <p class="text-small text-bold text-warning" ng-show="location.domain.provider === 'noop' || location.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((location.location ? location.location + '.' : '') + location.domain.domain) }"></p>
+              <p class="text-small text-bold text-warning" ng-show="location.domain.provider === 'noop' || location.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((location.subdomain ? location.subdomain + '.' : '') + location.domain.domain) }"></p>
 
               <!-- hidden submit has to be prior to other button elements, otherwise firefox will treat them as the "enter" key action, in this case the alternate domain delete button! -->
               <input class="ng-hide" type="submit" ng-disabled="locationForm.$invalid || location.busy"/>
diff --git a/src/views/app.js b/src/views/app.js
index 944ca3502..dd0488c6c 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -288,7 +288,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         domainCollisions: [],
 
         domain: null,
-        location: '',
+        subdomain: '',
         redirectDomains: [],
         aliasDomains: [],
         portBindings: {},
@@ -334,7 +334,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             $scope.location.error = {};
             $scope.location.domainCollisions = [];
-            $scope.location.location = app.location;
+            $scope.location.subdomain = app.subdomain;
             $scope.location.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
             $scope.location.portBindingsInfo = angular.extend({}, app.manifest.tcpPorts, app.manifest.udpPorts); // Portbinding map only for information
             $scope.location.redirectDomains = app.redirectDomains.map(function (a) { return { subdomain: a.subdomain, domain: $scope.domains.filter(function (d) { return d.domain === a.domain; })[0] };});
@@ -369,7 +369,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             var data = {
                 overwriteDns: !!overwriteDns,
-                location: $scope.location.location,
+                subdomain: $scope.location.subdomain,
                 domain: $scope.location.domain.domain,
                 portBindings: portBindings,
                 redirectDomains: $scope.location.redirectDomains.map(function (a) { return { subdomain: a.subdomain, domain: a.domain.domain };}),
@@ -378,7 +378,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             // pre-flight only for changed domains
             var domains = [];
-            if ($scope.app.domain !== data.domain || $scope.app.location !== data.location) domains.push({ subdomain: data.location, domain: data.domain, type: 'main' });
+            if ($scope.app.domain !== data.domain || $scope.app.subdomain !== data.subdomain) domains.push({ subdomain: data.subdomain, domain: data.domain, type: 'main' });
             data.redirectDomains.forEach(function (a) {
                 if ($scope.app.redirectDomains.some(function (d) { return d.domain === a.domain && d.subdomain === a.subdomain; })) return;
                 domains.push({ subdomain: a.subdomain, domain: a.domain, type: 'redirect' });
@@ -1473,7 +1473,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         error: {},
 
         backup: null,
-        location: '',
+        subdomain: '',
         domain: null,
         portBindings: {},
         portBindingsInfo: {},
@@ -1507,13 +1507,13 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             }
 
             var data = {
-                location: $scope.clone.location,
+                subdomain: $scope.clone.subdomain,
                 domain: $scope.clone.domain.domain,
                 portBindings: finalPortBindings,
                 backupId: $scope.clone.backup.id
             };
 
-            Client.checkDNSRecords(data.domain, data.location, function (error, result) {
+            Client.checkDNSRecords(data.domain, data.subdomain, function (error, result) {
                 if (error) {
                     Client.error(error);
                     $scope.clone.busy = false;
@@ -1567,7 +1567,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         retryBusy: false,
         error: {},
 
-        location: null,
+        subdomain: null,
         domain: null,
         redirectDomains: [],
         aliasDomains: [],
@@ -1581,7 +1581,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         confirm: function () {
             $scope.repair.error = {};
             $scope.repair.retryBusy = false;
-            $scope.repair.location = null;
+            $scope.repair.subdomain = null;
             $scope.repair.domain = null;
             $scope.repair.redirectDomains = [];
             $scope.repair.aliasDomains = [];
@@ -1592,7 +1592,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             var errorState = ($scope.app.error && $scope.app.error.installationState) || ISTATES.PENDING_CONFIGURE;
 
             if (errorState === ISTATES.PENDING_LOCATION_CHANGE) {
-                $scope.repair.location = app.location;
+                $scope.repair.subdomain = app.subdomain;
                 $scope.repair.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
 
                 $scope.repair.aliasDomains = $scope.app.aliasDomains;
@@ -1644,7 +1644,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 break;
 
             case ISTATES.PENDING_LOCATION_CHANGE:
-                data.location = $scope.repair.location;
+                data.subdomain = $scope.repair.subdomain;
                 data.domain = $scope.repair.domain.domain;
                 data.aliasDomains = $scope.repair.aliasDomains.filter(function (a) { return a.enabled; })
                     .map(function (d) { return { subdomain: d.subdomain, domain: d.domain.domain }; });
diff --git a/src/views/apps.html b/src/views/apps.html
index ac9ae51a4..f5add5fd6 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -84,7 +84,7 @@
                 <br/>
                 <div class="row">
                   <div class="col-xs-12 text-center">
-                    <div class="grid-item-top-title" data-fittext>{{ app.label || app.location || app.fqdn }}</div>
+                    <div class="grid-item-top-title" data-fittext>{{ app.label || app.subdomain || app.fqdn }}</div>
                     <div class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden" uib-tooltip="{{ app | appProgressMessage }}">
                       {{ app | installationStateLabel }}
                     </div>
diff --git a/src/views/appstore.html b/src/views/appstore.html
index fc9e66328..f6dbdcab9 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -20,10 +20,10 @@
             <div class="form-group" ng-class="{ 'has-error': (appInstallForm.location.$dirty && appInstallForm.location.$invalid) || (!appInstallForm.location.$dirty && appInstall.error.location) }">
               <label class="control-label" for="appInstallLocationInput">{{ 'appstore.installDialog.location' | tr }}</label>
               <div class="input-group form-inline">
-                <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="{{ 'appstore.installDialog.locationPlaceholder' | tr }}" autofocus>
+                <input type="text" class="form-control" ng-model="appInstall.subdomain" id="appInstallLocationInput" name="location" placeholder="{{ 'appstore.installDialog.locationPlaceholder' | tr }}" autofocus>
                 <div class="input-group-btn">
                   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                    <span>{{ (appInstall.location ? '.' : '') + appInstall.domain.domain }}</span>
+                    <span>{{ '.' + appInstall.domain.domain }}</span>
                     <span class="caret"></span>
                   </button>
                   <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -36,7 +36,7 @@
               <div ng-show="appInstall.error.location" class="text-small">{{ appInstall.error.location }}</div>
             </div>
 
-            <p class="text-small text-warning" ng-show="appInstall.domain.provider === 'noop' || appInstall.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((appInstall.location ? appInstall.location + '.' : '') + appInstall.domain.domain) }"></p>
+            <p class="text-small text-warning" ng-show="appInstall.domain.provider === 'noop' || appInstall.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: ((appInstall.subdomain ? appInstall.subdomain + '.' : '') + appInstall.domain.domain) }"></p>
 
             <div class="has-error text-center" ng-show="appInstall.error.port">{{ appInstall.error.port }}</div>
             <div ng-repeat="(env, info) in appInstall.portBindingsInfo">
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 91f29b906..6fbe1d222 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -93,7 +93,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
         error: {},
         app: {},
         needsOverwrite: false,
-        location: '',
+        subdomain: '',
         domain: null,
         portBindings: {},
         mediaLinks: [],
@@ -116,7 +116,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
             $scope.appInstall.app = {};
             $scope.appInstall.error = {};
             $scope.appInstall.needsOverwrite = false;
-            $scope.appInstall.location = '';
+            $scope.appInstall.subdomain = '';
             $scope.appInstall.domain = null;
             $scope.appInstall.portBindings = {};
             $scope.appInstall.state = 'appInfo';
@@ -222,7 +222,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
 
             var data = {
                 overwriteDns: $scope.appInstall.needsOverwrite,
-                location: $scope.appInstall.location || '',
+                subdomain: $scope.appInstall.subdomain || '',
                 domain: $scope.appInstall.domain.domain,
                 portBindings: finalPortBindings,
                 accessRestriction: finalAccessRestriction,
@@ -231,7 +231,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
                 sso: !$scope.appInstall.optionalSso ? undefined : ($scope.appInstall.accessRestrictionOption !== 'nosso')
             };
 
-            Client.checkDNSRecords(data.domain, data.location, function (error, result) {
+            Client.checkDNSRecords(data.domain, data.subdomain, function (error, result) {
                 if (error) return Client.error(error);
 
                 if (!data.overwriteDns) {
@@ -405,7 +405,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$tran
                 if (app.manifest.tags.join().toUpperCase().indexOf(token) !== -1) return true;
                 if (app.manifest.description.toUpperCase().indexOf(token) !== -1) return true;
                 return false;
-                });
+            });
         });
     };
 
diff --git a/src/views/settings.html b/src/views/settings.html
index 09bbed794..019ee2d5d 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -10,7 +10,7 @@
         <div ng-hide="installedApps | readyToUpdate">
           <p>{{ 'settings.updateDialog.blockingApps' | tr }}</p>
           <ul>
-            <li ng-repeat="app in installedApps | inProgressApps">{{app.location}}</li>
+            <li ng-repeat="app in installedApps | inProgressApps">{{app.fqdn}}</li>
           </ul>
           <span>{{ 'settings.updateDialog.blockingAppsInfo' | tr }}</span>
           <br/>