diff --git a/ghost/admin/app/components/gh-fullscreen-modal.js b/ghost/admin/app/components/gh-fullscreen-modal.js
index db94863f00..d3ed81e61c 100644
--- a/ghost/admin/app/components/gh-fullscreen-modal.js
+++ b/ghost/admin/app/components/gh-fullscreen-modal.js
@@ -15,7 +15,7 @@ const FullScreenModalComponent = Component.extend({
     dropdown: injectService(),
 
     modalPath: computed('modal', function () {
-        return `modals/${this.get('modal') || 'unknown'}`;
+        return `modal-${this.get('modal') || 'unknown'}`;
     }),
 
     modalClasses: computed('modifiers', function () {
diff --git a/ghost/admin/app/components/gh-search-input/trigger.js b/ghost/admin/app/components/gh-search-input-trigger.js
similarity index 100%
rename from ghost/admin/app/components/gh-search-input/trigger.js
rename to ghost/admin/app/components/gh-search-input-trigger.js
diff --git a/ghost/admin/app/components/modals/base.js b/ghost/admin/app/components/modal-base.js
similarity index 100%
rename from ghost/admin/app/components/modals/base.js
rename to ghost/admin/app/components/modal-base.js
diff --git a/ghost/admin/app/components/modals/copy-html.js b/ghost/admin/app/components/modal-copy-html.js
similarity index 65%
rename from ghost/admin/app/components/modals/copy-html.js
rename to ghost/admin/app/components/modal-copy-html.js
index 349945a571..c9b00db747 100644
--- a/ghost/admin/app/components/modals/copy-html.js
+++ b/ghost/admin/app/components/modal-copy-html.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 
 export default ModalComponent.extend({
diff --git a/ghost/admin/app/components/modals/delete-all.js b/ghost/admin/app/components/modal-delete-all.js
similarity index 94%
rename from ghost/admin/app/components/modals/delete-all.js
rename to ghost/admin/app/components/modal-delete-all.js
index 44a0574ed2..d03c9a13fe 100644
--- a/ghost/admin/app/components/modals/delete-all.js
+++ b/ghost/admin/app/components/modal-delete-all.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {inject as injectService} from '@ember/service';
 import {task} from 'ember-concurrency';
 
diff --git a/ghost/admin/app/components/modals/delete-post.js b/ghost/admin/app/components/modal-delete-post.js
similarity index 95%
rename from ghost/admin/app/components/modals/delete-post.js
rename to ghost/admin/app/components/modal-delete-post.js
index 928aa836f4..2e5899b4ef 100644
--- a/ghost/admin/app/components/modals/delete-post.js
+++ b/ghost/admin/app/components/modal-delete-post.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {inject as injectService} from '@ember/service';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/delete-subscriber.js b/ghost/admin/app/components/modal-delete-subscriber.js
similarity index 86%
rename from ghost/admin/app/components/modals/delete-subscriber.js
rename to ghost/admin/app/components/modal-delete-subscriber.js
index 0e0b3c8a0b..42764cf01e 100644
--- a/ghost/admin/app/components/modals/delete-subscriber.js
+++ b/ghost/admin/app/components/modal-delete-subscriber.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/delete-tag.js b/ghost/admin/app/components/modal-delete-tag.js
similarity index 91%
rename from ghost/admin/app/components/modals/delete-tag.js
rename to ghost/admin/app/components/modal-delete-tag.js
index 3639f7a641..c17aabe49b 100644
--- a/ghost/admin/app/components/modals/delete-tag.js
+++ b/ghost/admin/app/components/modal-delete-tag.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {invokeAction} from 'ember-invoke-action';
diff --git a/ghost/admin/app/components/modals/delete-theme.js b/ghost/admin/app/components/modal-delete-theme.js
similarity index 89%
rename from ghost/admin/app/components/modals/delete-theme.js
rename to ghost/admin/app/components/modal-delete-theme.js
index e717fe06ca..8929ec6f18 100644
--- a/ghost/admin/app/components/modals/delete-theme.js
+++ b/ghost/admin/app/components/modal-delete-theme.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/delete-user.js b/ghost/admin/app/components/modal-delete-user.js
similarity index 88%
rename from ghost/admin/app/components/modals/delete-user.js
rename to ghost/admin/app/components/modal-delete-user.js
index 94540ec34a..db115d10e9 100644
--- a/ghost/admin/app/components/modals/delete-user.js
+++ b/ghost/admin/app/components/modal-delete-user.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/import-subscribers.js b/ghost/admin/app/components/modal-import-subscribers.js
similarity index 93%
rename from ghost/admin/app/components/modals/import-subscribers.js
rename to ghost/admin/app/components/modal-import-subscribers.js
index fd22444438..605459445b 100644
--- a/ghost/admin/app/components/modals/import-subscribers.js
+++ b/ghost/admin/app/components/modal-import-subscribers.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {computed} from '@ember/object';
 import {invokeAction} from 'ember-invoke-action';
diff --git a/ghost/admin/app/components/modals/invite-new-user.js b/ghost/admin/app/components/modal-invite-new-user.js
similarity index 98%
rename from ghost/admin/app/components/modals/invite-new-user.js
rename to ghost/admin/app/components/modal-invite-new-user.js
index 73627162e3..dbb0235c1a 100644
--- a/ghost/admin/app/components/modals/invite-new-user.js
+++ b/ghost/admin/app/components/modal-invite-new-user.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import RSVP from 'rsvp';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {A as emberA} from '@ember/array';
diff --git a/ghost/admin/app/components/modals/leave-editor.js b/ghost/admin/app/components/modal-leave-editor.js
similarity index 80%
rename from ghost/admin/app/components/modals/leave-editor.js
rename to ghost/admin/app/components/modal-leave-editor.js
index 8545edfb37..8b8fbcc886 100644
--- a/ghost/admin/app/components/modals/leave-editor.js
+++ b/ghost/admin/app/components/modal-leave-editor.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
diff --git a/ghost/admin/app/components/modal-markdown-help.js b/ghost/admin/app/components/modal-markdown-help.js
new file mode 100644
index 0000000000..e083ba9a3c
--- /dev/null
+++ b/ghost/admin/app/components/modal-markdown-help.js
@@ -0,0 +1,4 @@
+import ModalComponent from 'ghost-admin/components/modal-base';
+
+export default ModalComponent.extend({
+});
diff --git a/ghost/admin/app/components/modals/new-subscriber.js b/ghost/admin/app/components/modal-new-subscriber.js
similarity index 95%
rename from ghost/admin/app/components/modals/new-subscriber.js
rename to ghost/admin/app/components/modal-new-subscriber.js
index 9550d5f13e..b89da8579e 100644
--- a/ghost/admin/app/components/modals/new-subscriber.js
+++ b/ghost/admin/app/components/modal-new-subscriber.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {A as emberA} from '@ember/array';
 import {isInvalidError} from 'ember-ajax/errors';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/re-authenticate.js b/ghost/admin/app/components/modal-re-authenticate.js
similarity index 97%
rename from ghost/admin/app/components/modals/re-authenticate.js
rename to ghost/admin/app/components/modal-re-authenticate.js
index a7fca0f283..d3126dbdf2 100644
--- a/ghost/admin/app/components/modals/re-authenticate.js
+++ b/ghost/admin/app/components/modal-re-authenticate.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
diff --git a/ghost/admin/app/components/modals/suspend-user.js b/ghost/admin/app/components/modal-suspend-user.js
similarity index 88%
rename from ghost/admin/app/components/modals/suspend-user.js
rename to ghost/admin/app/components/modal-suspend-user.js
index c1720e27ff..8c403d90e7 100644
--- a/ghost/admin/app/components/modals/suspend-user.js
+++ b/ghost/admin/app/components/modal-suspend-user.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/theme-warnings.js b/ghost/admin/app/components/modal-theme-warnings.js
similarity index 84%
rename from ghost/admin/app/components/modals/theme-warnings.js
rename to ghost/admin/app/components/modal-theme-warnings.js
index 4bbbd48696..6a37b9ff32 100644
--- a/ghost/admin/app/components/modals/theme-warnings.js
+++ b/ghost/admin/app/components/modal-theme-warnings.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {reads} from '@ember/object/computed';
 
 export default ModalComponent.extend({
diff --git a/ghost/admin/app/components/modals/transfer-owner.js b/ghost/admin/app/components/modal-transfer-owner.js
similarity index 87%
rename from ghost/admin/app/components/modals/transfer-owner.js
rename to ghost/admin/app/components/modal-transfer-owner.js
index a122f27ba9..27e8eee75a 100644
--- a/ghost/admin/app/components/modals/transfer-owner.js
+++ b/ghost/admin/app/components/modal-transfer-owner.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
 
diff --git a/ghost/admin/app/components/modals/unsuspend-user.js b/ghost/admin/app/components/modal-unsuspend-user.js
similarity index 88%
rename from ghost/admin/app/components/modals/unsuspend-user.js
rename to ghost/admin/app/components/modal-unsuspend-user.js
index a0c75e3313..287a1e3fa4 100644
--- a/ghost/admin/app/components/modals/unsuspend-user.js
+++ b/ghost/admin/app/components/modal-unsuspend-user.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
diff --git a/ghost/admin/app/components/modals/upload-image.js b/ghost/admin/app/components/modal-upload-image.js
similarity index 97%
rename from ghost/admin/app/components/modals/upload-image.js
rename to ghost/admin/app/components/modal-upload-image.js
index b331ac96b4..159df5d8fa 100644
--- a/ghost/admin/app/components/modals/upload-image.js
+++ b/ghost/admin/app/components/modal-upload-image.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
 import {computed} from '@ember/object';
 import {inject as injectService} from '@ember/service';
diff --git a/ghost/admin/app/components/modals/upload-theme.js b/ghost/admin/app/components/modal-upload-theme.js
similarity index 97%
rename from ghost/admin/app/components/modals/upload-theme.js
rename to ghost/admin/app/components/modal-upload-theme.js
index 1d8229863e..c8f229799a 100644
--- a/ghost/admin/app/components/modals/upload-theme.js
+++ b/ghost/admin/app/components/modal-upload-theme.js
@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {
     UnsupportedMediaTypeError,
@@ -126,7 +126,7 @@ export default ModalComponent.extend({
 
                 // to have a proper grouping of fatal errors and none fatal, we need to check
                 // our errors for the fatal property
-                if (errors.length > 0) {
+                if (errors && errors.length > 0) {
                     for (let i = 0; i < errors.length; i++) {
                         if (errors[i].fatal) {
                             fatalErrors.push(errors[i]);
diff --git a/ghost/admin/app/components/modals/markdown-help.js b/ghost/admin/app/components/modals/markdown-help.js
deleted file mode 100644
index 450e5b9a6a..0000000000
--- a/ghost/admin/app/components/modals/markdown-help.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
-
-export default ModalComponent.extend({
-});
diff --git a/ghost/admin/app/templates/components/gh-search-input/trigger.hbs b/ghost/admin/app/templates/components/gh-search-input-trigger.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/gh-search-input/trigger.hbs
rename to ghost/admin/app/templates/components/gh-search-input-trigger.hbs
diff --git a/ghost/admin/app/templates/components/gh-search-input.hbs b/ghost/admin/app/templates/components/gh-search-input.hbs
index 477fa9d6da..ab95e2ffa8 100644
--- a/ghost/admin/app/templates/components/gh-search-input.hbs
+++ b/ghost/admin/app/templates/components/gh-search-input.hbs
@@ -5,9 +5,9 @@
     onopen=(action "onFocus")
     onclose=(action "onBlur")
     searchEnabled=false
-    triggerComponent="gh-search-input/trigger"
+    triggerComponent="gh-search-input-trigger"
     renderInPlace=true
     loadingMessage="Loading"
     as |name select|}}
     {{highlighted-text name.title select.searchText}}
-{{/power-select}}
\ No newline at end of file
+{{/power-select}}
diff --git a/ghost/admin/app/templates/components/modals/copy-html.hbs b/ghost/admin/app/templates/components/modal-copy-html.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/copy-html.hbs
rename to ghost/admin/app/templates/components/modal-copy-html.hbs
diff --git a/ghost/admin/app/templates/components/modals/delete-all.hbs b/ghost/admin/app/templates/components/modal-delete-all.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/delete-all.hbs
rename to ghost/admin/app/templates/components/modal-delete-all.hbs
diff --git a/ghost/admin/app/templates/components/modals/delete-post.hbs b/ghost/admin/app/templates/components/modal-delete-post.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/delete-post.hbs
rename to ghost/admin/app/templates/components/modal-delete-post.hbs
diff --git a/ghost/admin/app/templates/components/modals/delete-subscriber.hbs b/ghost/admin/app/templates/components/modal-delete-subscriber.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/delete-subscriber.hbs
rename to ghost/admin/app/templates/components/modal-delete-subscriber.hbs
diff --git a/ghost/admin/app/templates/components/modals/delete-tag.hbs b/ghost/admin/app/templates/components/modal-delete-tag.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/delete-tag.hbs
rename to ghost/admin/app/templates/components/modal-delete-tag.hbs
diff --git a/ghost/admin/app/templates/components/modals/delete-theme.hbs b/ghost/admin/app/templates/components/modal-delete-theme.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/delete-theme.hbs
rename to ghost/admin/app/templates/components/modal-delete-theme.hbs
diff --git a/ghost/admin/app/templates/components/modals/delete-user.hbs b/ghost/admin/app/templates/components/modal-delete-user.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/delete-user.hbs
rename to ghost/admin/app/templates/components/modal-delete-user.hbs
diff --git a/ghost/admin/app/templates/components/modals/import-subscribers.hbs b/ghost/admin/app/templates/components/modal-import-subscribers.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/import-subscribers.hbs
rename to ghost/admin/app/templates/components/modal-import-subscribers.hbs
diff --git a/ghost/admin/app/templates/components/modals/invite-new-user.hbs b/ghost/admin/app/templates/components/modal-invite-new-user.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/invite-new-user.hbs
rename to ghost/admin/app/templates/components/modal-invite-new-user.hbs
diff --git a/ghost/admin/app/templates/components/modals/leave-editor.hbs b/ghost/admin/app/templates/components/modal-leave-editor.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/leave-editor.hbs
rename to ghost/admin/app/templates/components/modal-leave-editor.hbs
diff --git a/ghost/admin/app/templates/components/modals/markdown-help.hbs b/ghost/admin/app/templates/components/modal-markdown-help.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/markdown-help.hbs
rename to ghost/admin/app/templates/components/modal-markdown-help.hbs
diff --git a/ghost/admin/app/templates/components/modals/new-subscriber.hbs b/ghost/admin/app/templates/components/modal-new-subscriber.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/new-subscriber.hbs
rename to ghost/admin/app/templates/components/modal-new-subscriber.hbs
diff --git a/ghost/admin/app/templates/components/modals/re-authenticate.hbs b/ghost/admin/app/templates/components/modal-re-authenticate.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/re-authenticate.hbs
rename to ghost/admin/app/templates/components/modal-re-authenticate.hbs
diff --git a/ghost/admin/app/templates/components/modals/suspend-user.hbs b/ghost/admin/app/templates/components/modal-suspend-user.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/suspend-user.hbs
rename to ghost/admin/app/templates/components/modal-suspend-user.hbs
diff --git a/ghost/admin/app/templates/components/modals/theme-warnings.hbs b/ghost/admin/app/templates/components/modal-theme-warnings.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/theme-warnings.hbs
rename to ghost/admin/app/templates/components/modal-theme-warnings.hbs
diff --git a/ghost/admin/app/templates/components/modals/transfer-owner.hbs b/ghost/admin/app/templates/components/modal-transfer-owner.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/transfer-owner.hbs
rename to ghost/admin/app/templates/components/modal-transfer-owner.hbs
diff --git a/ghost/admin/app/templates/components/modals/unsuspend-user.hbs b/ghost/admin/app/templates/components/modal-unsuspend-user.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/unsuspend-user.hbs
rename to ghost/admin/app/templates/components/modal-unsuspend-user.hbs
diff --git a/ghost/admin/app/templates/components/modals/upload-image.hbs b/ghost/admin/app/templates/components/modal-upload-image.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/upload-image.hbs
rename to ghost/admin/app/templates/components/modal-upload-image.hbs
diff --git a/ghost/admin/app/templates/components/modals/upload-theme.hbs b/ghost/admin/app/templates/components/modal-upload-theme.hbs
similarity index 100%
rename from ghost/admin/app/templates/components/modals/upload-theme.hbs
rename to ghost/admin/app/templates/components/modal-upload-theme.hbs
diff --git a/ghost/admin/tests/integration/components/modals/delete-subscriber-test.js b/ghost/admin/tests/integration/components/modals/delete-subscriber-test.js
index 15f92f7f3f..74408865f5 100644
--- a/ghost/admin/tests/integration/components/modals/delete-subscriber-test.js
+++ b/ghost/admin/tests/integration/components/modals/delete-subscriber-test.js
@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/delete-subscriber', function() {
-    setupComponentTest('modals/delete-subscriber', {
+describe('Integration: Component: modal-delete-subscriber', function() {
+    setupComponentTest('modal-delete-subscriber', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/delete-subscriber', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/delete-subscriber}}
+        //   {{#modal-delete-subscriber}}
         //     template content
-        //   {{/modals/delete-subscriber}}
+        //   {{/modal-delete-subscriber}}
         // `);
 
-        this.render(hbs`{{modals/delete-subscriber}}`);
+        this.render(hbs`{{modal-delete-subscriber}}`);
         expect(this.$()).to.have.length(1);
     });
 });
diff --git a/ghost/admin/tests/integration/components/modals/import-subscribers-test.js b/ghost/admin/tests/integration/components/modals/import-subscribers-test.js
index 3972c1ad2b..b08811c6eb 100644
--- a/ghost/admin/tests/integration/components/modals/import-subscribers-test.js
+++ b/ghost/admin/tests/integration/components/modals/import-subscribers-test.js
@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/import-subscribers', function() {
-    setupComponentTest('modals/import-subscribers', {
+describe('Integration: Component: modal-import-subscribers', function() {
+    setupComponentTest('modal-import-subscribers', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/import-subscribers', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/import-subscribers}}
+        //   {{#modal-import-subscribers}}
         //     template content
-        //   {{/modals/import-subscribers}}
+        //   {{/modal-import-subscribers}}
         // `);
 
-        this.render(hbs`{{modals/import-subscribers}}`);
+        this.render(hbs`{{modal-import-subscribers}}`);
         expect(this.$()).to.have.length(1);
     });
 });
diff --git a/ghost/admin/tests/integration/components/modals/new-subscriber-test.js b/ghost/admin/tests/integration/components/modals/new-subscriber-test.js
index 8921eb40ed..be53e8fa4b 100644
--- a/ghost/admin/tests/integration/components/modals/new-subscriber-test.js
+++ b/ghost/admin/tests/integration/components/modals/new-subscriber-test.js
@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/new-subscriber', function() {
-    setupComponentTest('modals/new-subscriber', {
+describe('Integration: Component: modal-new-subscriber', function() {
+    setupComponentTest('modal-new-subscriber', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/new-subscriber', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/new-subscriber}}
+        //   {{#modal-new-subscriber}}
         //     template content
-        //   {{/modals/new-subscriber}}
+        //   {{/modal-new-subscriber}}
         // `);
 
-        this.render(hbs`{{modals/new-subscriber}}`);
+        this.render(hbs`{{modal-new-subscriber}}`);
         expect(this.$()).to.have.length(1);
     });
 });
diff --git a/ghost/admin/tests/integration/components/modals/upload-theme-test.js b/ghost/admin/tests/integration/components/modals/upload-theme-test.js
index b16551f6ed..e81b25e44e 100644
--- a/ghost/admin/tests/integration/components/modals/upload-theme-test.js
+++ b/ghost/admin/tests/integration/components/modals/upload-theme-test.js
@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/upload-theme', function() {
-    setupComponentTest('modals/upload-theme', {
+describe('Integration: Component: modal-upload-theme', function() {
+    setupComponentTest('modal-upload-theme', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/upload-theme', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/upload-theme}}
+        //   {{#modal-upload-theme}}
         //     template content
-        //   {{/modals/upload-theme}}
+        //   {{/modal-upload-theme}}
         // `);
 
-        this.render(hbs`{{modals/upload-theme}}`);
+        this.render(hbs`{{modal-upload-theme}}`);
         expect(this.$()).to.have.length(1);
     });
 });
diff --git a/ghost/admin/tests/integration/components/transfer-owner-test.js b/ghost/admin/tests/integration/components/transfer-owner-test.js
index 1ebec0908c..d4fe7a2e33 100644
--- a/ghost/admin/tests/integration/components/transfer-owner-test.js
+++ b/ghost/admin/tests/integration/components/transfer-owner-test.js
@@ -7,7 +7,7 @@ import {expect} from 'chai';
 import {run} from '@ember/runloop';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/transfer-owner', function() {
+describe('Integration: Component: modal-transfer-owner', function() {
     setupComponentTest('transfer-owner', {
         integration: true
     });
@@ -21,7 +21,7 @@ describe('Integration: Component: modals/transfer-owner', function() {
         this.on('confirm', confirm);
         this.on('closeModal', closeModal);
 
-        this.render(hbs`{{modals/transfer-owner confirm=(action 'confirm') closeModal=(action 'closeModal')}}`);
+        this.render(hbs`{{modal-transfer-owner confirm=(action 'confirm') closeModal=(action 'closeModal')}}`);
 
         run(() => {
             this.$('.gh-btn.gh-btn-red').click();