diff --git a/core/server/api/canary/config.js b/core/server/api/canary/config.js
index 183e0e7942..171267099f 100644
--- a/core/server/api/canary/config.js
+++ b/core/server/api/canary/config.js
@@ -9,7 +9,7 @@ module.exports = {
     read: {
         permissions: false,
         query() {
-            const billingUrl = config.get('host_settings:billing:enabled') ? config.get('host_settings:billing:url') : '';
+            const billingUrl = config.get('hostSettings:billing:enabled') ? config.get('hostSettings:billing:url') : '';
             const response = {
                 version: ghostVersion.full,
                 environment: config.get('env'),
diff --git a/core/server/api/canary/themes.js b/core/server/api/canary/themes.js
index 6d68678140..ad4533e096 100644
--- a/core/server/api/canary/themes.js
+++ b/core/server/api/canary/themes.js
@@ -76,8 +76,8 @@ module.exports = {
             if (frame.options.source === 'github') {
                 const [org, repo] = frame.options.ref.toLowerCase().split('/');
 
-                if (limitService.isLimited('custom_themes') && org.toLowerCase() !== 'tryghost') {
-                    await limitService.errorIfWouldGoOverLimit('custom_themes');
+                if (limitService.isLimited('customThemes') && org.toLowerCase() !== 'tryghost') {
+                    await limitService.errorIfWouldGoOverLimit('customThemes');
                 }
 
                 // omit /:ref so we fetch the default branch
@@ -139,8 +139,8 @@ module.exports = {
             method: 'add'
         },
         async query(frame) {
-            if (limitService.isLimited('custom_themes')) {
-                return await limitService.errorIfWouldGoOverLimit('custom_themes');
+            if (limitService.isLimited('customThemes')) {
+                await limitService.errorIfWouldGoOverLimit('customThemes');
             }
 
             // @NOTE: consistent filename uploads
diff --git a/core/server/api/v2/themes.js b/core/server/api/v2/themes.js
index c3ff04a23c..0ff1cf20c6 100644
--- a/core/server/api/v2/themes.js
+++ b/core/server/api/v2/themes.js
@@ -53,8 +53,8 @@ module.exports = {
             method: 'add'
         },
         async query(frame) {
-            if (limitService.isLimited('custom_themes')) {
-                return await limitService.errorIfWouldGoOverLimit('custom_themes');
+            if (limitService.isLimited('customThemes')) {
+                await limitService.errorIfWouldGoOverLimit('customThemes');
             }
 
             // @NOTE: consistent filename uploads
diff --git a/core/server/api/v3/themes.js b/core/server/api/v3/themes.js
index a75413f7b8..2185a49b45 100644
--- a/core/server/api/v3/themes.js
+++ b/core/server/api/v3/themes.js
@@ -53,8 +53,8 @@ module.exports = {
             method: 'add'
         },
         async query(frame) {
-            if (limitService.isLimited('custom_themes')) {
-                return await limitService.errorIfWouldGoOverLimit('custom_themes');
+            if (limitService.isLimited('customThemes')) {
+                await limitService.errorIfWouldGoOverLimit('customThemes');
             }
 
             // @NOTE: consistent filename uploads
diff --git a/core/server/models/integration.js b/core/server/models/integration.js
index 1ef5ee1ffc..66232990b5 100644
--- a/core/server/models/integration.js
+++ b/core/server/models/integration.js
@@ -66,10 +66,10 @@ const Integration = ghostBookshelf.Model.extend({
     async permissible(integrationModel, action) {
         const isAdd = (action === 'add');
 
-        if (isAdd && limitService.isLimited('custom_integrations')) {
+        if (isAdd && limitService.isLimited('customIntegrations')) {
             // CASE: if your site is limited to a certain number of custom integrations
             // Inviting a new custom integration requires we check we won't go over the limit
-            await limitService.errorIfWouldGoOverLimit('custom_integrations');
+            await limitService.errorIfWouldGoOverLimit('customIntegrations');
         }
         return true;
     }
diff --git a/core/server/services/limits.js b/core/server/services/limits.js
index e93f9b6ac9..43490602e8 100644
--- a/core/server/services/limits.js
+++ b/core/server/services/limits.js
@@ -6,17 +6,17 @@ let limitService = new LimitService();
 const initFn = () => {
     let helpLink;
 
-    if (!config.get('host_settings') || !config.get('host_settings:limits')) {
+    if (!config.get('hostSettings') || !config.get('hostSettings:limits')) {
         return;
     }
 
-    if (config.get('host_settings:billing:enabled') && config.get('host_settings:billing:enabled') === true && config.get('host_settings:billing:url')) {
-        helpLink = config.get('host_settings:billing:url');
+    if (config.get('hostSettings:billing:enabled') && config.get('hostSettings:billing:enabled') === true && config.get('hostSettings:billing:url')) {
+        helpLink = config.get('hostSettings:billing:url');
     } else {
         helpLink = 'https://ghost.org/help/';
     }
 
-    limitService.loadLimits({limits: config.get('host_settings:limits'), db, helpLink});
+    limitService.loadLimits({limits: config.get('hostSettings:limits'), db, helpLink});
 };
 
 module.exports = limitService;
diff --git a/core/server/services/members/limit.js b/core/server/services/members/limit.js
index 08859a9caf..09d2826772 100644
--- a/core/server/services/members/limit.js
+++ b/core/server/services/members/limit.js
@@ -8,10 +8,10 @@ async function getTotalMembers() {
 }
 
 module.exports = async () => {
-    const membersHostLimit = config.get('host_settings:limits:members');
+    const membersHostLimit = config.get('hostSettings:limits:members');
     if (membersHostLimit) {
         const allowedMembersLimit = membersHostLimit.max;
-        const hostUpgradeLink = config.get('host_settings:limits').upgrade_url;
+        const hostUpgradeLink = config.get('hostSettings:limits').upgrade_url;
 
         const totalMembers = await getTotalMembers();