diff --git a/src/_h5ai/client/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js
index 9f70641c..90b5c35f 100644
--- a/src/_h5ai/client/js/inc/core/resource.js
+++ b/src/_h5ai/client/js/inc/core/resource.js
@@ -3,13 +3,13 @@ modulejs.define('core/resource', ['core/settings'], function (settings) {
 
 	var image = function (id) {
 
-			return settings.appUrl + 'client/images/' + id + '.svg';
+			return settings.appHref + 'client/images/' + id + '.svg';
 		},
 
 		icon = function (id) {
 
-			return settings.appUrl + 'client/themes/faenza/icons/' + id + '.png';
-			// return settings.appUrl + 'client/themes/evolvere/icons/' + id + '.svg';
+			return settings.appHref + 'client/themes/faenza/icons/' + id + '.png';
+			// return settings.appHref + 'client/themes/evolvere/icons/' + id + '.svg';
 		};
 
 	return {
diff --git a/src/_h5ai/client/js/inc/core/settings.js b/src/_h5ai/client/js/inc/core/settings.js
index 7ba35a55..934a41c0 100644
--- a/src/_h5ai/client/js/inc/core/settings.js
+++ b/src/_h5ai/client/js/inc/core/settings.js
@@ -2,7 +2,7 @@
 modulejs.define('core/settings', ['config', '_'], function (config, _) {
 
 	return _.extend({}, config.options, {
-		appUrl: config.setup.APP_URL,
-		rootUrl: config.setup.ROOT_URL
+		appHref: config.setup.APP_URL,
+		rootHref: config.setup.ROOT_URL
 	});
 });
diff --git a/src/_h5ai/client/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js
index abf8c746..ee857a27 100644
--- a/src/_h5ai/client/js/inc/ext/preview-txt.js
+++ b/src/_h5ai/client/js/inc/ext/preview-txt.js
@@ -63,11 +63,11 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'ex
 		},
 		loadSyntaxhighlighter = function (callback) {
 
-			loadScript(allsettings.appUrl + 'client/js/syntaxhighlighter.js', 'SyntaxHighlighter', callback);
+			loadScript(allsettings.appHref + 'client/js/syntaxhighlighter.js', 'SyntaxHighlighter', callback);
 		},
 		loadMarkdown = function (callback) {
 
-			loadScript(allsettings.appUrl + 'client/js/markdown.js', 'markdown', callback);
+			loadScript(allsettings.appHref + 'client/js/markdown.js', 'markdown', callback);
 		},
 
 		preloadText = function (absHref, callback) {
diff --git a/src/_h5ai/client/js/inc/ext/qrcode.js b/src/_h5ai/client/js/inc/ext/qrcode.js
index 25a56fc6..55732805 100644
--- a/src/_h5ai/client/js/inc/ext/qrcode.js
+++ b/src/_h5ai/client/js/inc/ext/qrcode.js
@@ -16,7 +16,7 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve
 				callback();
 			} else {
 				$.ajax({
-					url: allsettings.appUrl + 'client/js/qrcode.js',
+					url: allsettings.appHref + 'client/js/qrcode.js',
 					dataType: 'script',
 					complete: function () {
 
diff --git a/src/_h5ai/client/js/inc/model/item.js b/src/_h5ai/client/js/inc/model/item.js
index 227bfb54..75a564d9 100644
--- a/src/_h5ai/client/js/inc/model/item.js
+++ b/src/_h5ai/client/js/inc/model/item.js
@@ -30,7 +30,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
 			if (match) {
 				var split = { parent: match[1], name: match[2] };
 
-				if (split.parent && !startsWith(split.parent, settings.rootUrl)) {
+				if (split.parent && !startsWith(split.parent, settings.rootHref)) {
 					split.parent = null;
 				}
 				return split;
@@ -45,7 +45,7 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
 
 			absHref = location.forceEncoding(absHref);
 
-			if (!startsWith(absHref, settings.rootUrl)) {
+			if (!startsWith(absHref, settings.rootHref)) {
 				return null;
 			}
 
@@ -164,12 +164,12 @@ modulejs.define('model/item', ['_', 'core/types', 'core/event', 'core/settings',
 
 		isRoot: function () {
 
-			return this.absHref === settings.rootUrl;
+			return this.absHref === settings.rootHref;
 		},
 
 		isH5ai: function () {
 
-			return this.absHref === settings.appUrl;
+			return this.absHref === settings.appHref;
 		},
 
 		isEmpty: function () {