diff --git a/js/forum/dist/app.js b/js/forum/dist/app.js
index a35c8a0b5..851bfc012 100644
--- a/js/forum/dist/app.js
+++ b/js/forum/dist/app.js
@@ -22162,108 +22162,6 @@ System.register('flarum/components/DiscussionRenamedPost', ['flarum/components/E
 });;
 'use strict';
 
-System.register('flarum/components/DiscussionRenameModal', ['flarum/components/Modal', 'flarum/components/Button'], function (_export, _context) {
-  "use strict";
-
-  var Modal, Button, DiscussionRenameModal;
-  return {
-    setters: [function (_flarumComponentsModal) {
-      Modal = _flarumComponentsModal.default;
-    }, function (_flarumComponentsButton) {
-      Button = _flarumComponentsButton.default;
-    }],
-    execute: function () {
-      DiscussionRenameModal = function (_Modal) {
-        babelHelpers.inherits(DiscussionRenameModal, _Modal);
-
-        function DiscussionRenameModal() {
-          babelHelpers.classCallCheck(this, DiscussionRenameModal);
-          return babelHelpers.possibleConstructorReturn(this, (DiscussionRenameModal.__proto__ || Object.getPrototypeOf(DiscussionRenameModal)).apply(this, arguments));
-        }
-
-        babelHelpers.createClass(DiscussionRenameModal, [{
-          key: 'init',
-          value: function init() {
-            babelHelpers.get(DiscussionRenameModal.prototype.__proto__ || Object.getPrototypeOf(DiscussionRenameModal.prototype), 'init', this).call(this);
-
-            this.discussion = this.props.discussion;
-            this.currentTitle = this.props.currentTitle;
-            this.newTitle = m.prop(this.currentTitle);
-          }
-        }, {
-          key: 'className',
-          value: function className() {
-            return 'DiscussionRenameModal Modal--small';
-          }
-        }, {
-          key: 'title',
-          value: function title() {
-            return app.translator.trans('core.forum.discussion_controls.rename_modal.title');
-          }
-        }, {
-          key: 'content',
-          value: function content() {
-            return m(
-              'div',
-              { className: 'Modal-body' },
-              m(
-                'div',
-                { className: 'Form' },
-                m(
-                  'div',
-                  { className: 'Form-group' },
-                  m('input', { className: 'FormControl title', placeholder: this.currentTitle, bidi: this.newTitle })
-                ),
-                m(
-                  'div',
-                  { className: 'Form-group' },
-                  Button.component({
-                    className: 'Button Button--primary',
-                    type: 'submit',
-                    loading: this.loading,
-                    children: app.translator.trans('core.forum.discussion_controls.rename_modal.submit_button')
-                  })
-                )
-              )
-            );
-          }
-        }, {
-          key: 'onsubmit',
-          value: function onsubmit(e) {
-            var _this2 = this;
-
-            e.preventDefault();
-
-            this.loading = true;
-
-            var title = this.newTitle;
-            var currentTitle = this.currentTitle;
-
-            // If the title is different to what it was before, then save it. After the
-            // save has completed, update the post stream as there will be a new post
-            // indicating that the discussion was renamed.
-            if (title && title !== currentTitle) {
-              return this.discussion.save({ title: title }).then(function () {
-                if (app.viewingDiscussion(_this2.discussion)) {
-                  app.current.stream.update();
-                }
-                m.redraw();
-                _this2.hide();
-              });
-            } else {
-              this.hide();
-            }
-          }
-        }]);
-        return DiscussionRenameModal;
-      }(Modal);
-
-      _export('default', DiscussionRenameModal);
-    }
-  };
-});;
-'use strict';
-
 System.register('flarum/components/DiscussionsSearchSource', ['flarum/helpers/highlight', 'flarum/components/LinkButton'], function (_export, _context) {
   "use strict";
 
@@ -26914,6 +26812,108 @@ System.register('flarum/components/PostUser', ['flarum/Component', 'flarum/compo
 });;
 'use strict';
 
+System.register('flarum/components/RenameDiscussionModal', ['flarum/components/Modal', 'flarum/components/Button'], function (_export, _context) {
+  "use strict";
+
+  var Modal, Button, RenameDiscussionModal;
+  return {
+    setters: [function (_flarumComponentsModal) {
+      Modal = _flarumComponentsModal.default;
+    }, function (_flarumComponentsButton) {
+      Button = _flarumComponentsButton.default;
+    }],
+    execute: function () {
+      RenameDiscussionModal = function (_Modal) {
+        babelHelpers.inherits(RenameDiscussionModal, _Modal);
+
+        function RenameDiscussionModal() {
+          babelHelpers.classCallCheck(this, RenameDiscussionModal);
+          return babelHelpers.possibleConstructorReturn(this, (RenameDiscussionModal.__proto__ || Object.getPrototypeOf(RenameDiscussionModal)).apply(this, arguments));
+        }
+
+        babelHelpers.createClass(RenameDiscussionModal, [{
+          key: 'init',
+          value: function init() {
+            babelHelpers.get(RenameDiscussionModal.prototype.__proto__ || Object.getPrototypeOf(RenameDiscussionModal.prototype), 'init', this).call(this);
+
+            this.discussion = this.props.discussion;
+            this.currentTitle = this.props.currentTitle;
+            this.newTitle = m.prop(this.currentTitle);
+          }
+        }, {
+          key: 'className',
+          value: function className() {
+            return 'RenameDiscussionModal Modal--small';
+          }
+        }, {
+          key: 'title',
+          value: function title() {
+            return app.translator.trans('core.forum.discussion_controls.rename_modal.title');
+          }
+        }, {
+          key: 'content',
+          value: function content() {
+            return m(
+              'div',
+              { className: 'Modal-body' },
+              m(
+                'div',
+                { className: 'Form' },
+                m(
+                  'div',
+                  { className: 'Form-group' },
+                  m('input', { className: 'FormControl title', placeholder: this.currentTitle, bidi: this.newTitle })
+                ),
+                m(
+                  'div',
+                  { className: 'Form-group' },
+                  Button.component({
+                    className: 'Button Button--primary',
+                    type: 'submit',
+                    loading: this.loading,
+                    children: app.translator.trans('core.forum.discussion_controls.rename_modal.submit_button')
+                  })
+                )
+              )
+            );
+          }
+        }, {
+          key: 'onsubmit',
+          value: function onsubmit(e) {
+            var _this2 = this;
+
+            e.preventDefault();
+
+            this.loading = true;
+
+            var title = this.newTitle;
+            var currentTitle = this.currentTitle;
+
+            // If the title is different to what it was before, then save it. After the
+            // save has completed, update the post stream as there will be a new post
+            // indicating that the discussion was renamed.
+            if (title && title !== currentTitle) {
+              return this.discussion.save({ title: title }).then(function () {
+                if (app.viewingDiscussion(_this2.discussion)) {
+                  app.current.stream.update();
+                }
+                m.redraw();
+                _this2.hide();
+              });
+            } else {
+              this.hide();
+            }
+          }
+        }]);
+        return RenameDiscussionModal;
+      }(Modal);
+
+      _export('default', RenameDiscussionModal);
+    }
+  };
+});;
+'use strict';
+
 System.register('flarum/components/ReplyComposer', ['flarum/components/ComposerBody', 'flarum/components/Alert', 'flarum/components/Button', 'flarum/helpers/icon', 'flarum/utils/extractText'], function (_export, _context) {
   "use strict";
 
@@ -31280,10 +31280,10 @@ System.register('flarum/utils/computed', [], function (_export, _context) {
 });;
 'use strict';
 
-System.register('flarum/utils/DiscussionControls', ['flarum/components/DiscussionPage', 'flarum/components/ReplyComposer', 'flarum/components/LogInModal', 'flarum/components/Button', 'flarum/components/Separator', 'flarum/components/DiscussionRenameModal', 'flarum/utils/ItemList', 'flarum/utils/extractText'], function (_export, _context) {
+System.register('flarum/utils/DiscussionControls', ['flarum/components/DiscussionPage', 'flarum/components/ReplyComposer', 'flarum/components/LogInModal', 'flarum/components/Button', 'flarum/components/Separator', 'flarum/components/RenameDiscussionModal', 'flarum/utils/ItemList', 'flarum/utils/extractText'], function (_export, _context) {
   "use strict";
 
-  var DiscussionPage, ReplyComposer, LogInModal, Button, Separator, DiscussionRenameModal, ItemList, extractText;
+  var DiscussionPage, ReplyComposer, LogInModal, Button, Separator, RenameDiscussionModal, ItemList, extractText;
   return {
     setters: [function (_flarumComponentsDiscussionPage) {
       DiscussionPage = _flarumComponentsDiscussionPage.default;
@@ -31295,8 +31295,8 @@ System.register('flarum/utils/DiscussionControls', ['flarum/components/Discussio
       Button = _flarumComponentsButton.default;
     }, function (_flarumComponentsSeparator) {
       Separator = _flarumComponentsSeparator.default;
-    }, function (_flarumComponentsDiscussionRenameModal) {
-      DiscussionRenameModal = _flarumComponentsDiscussionRenameModal.default;
+    }, function (_flarumComponentsRenameDiscussionModal) {
+      RenameDiscussionModal = _flarumComponentsRenameDiscussionModal.default;
     }, function (_flarumUtilsItemList) {
       ItemList = _flarumUtilsItemList.default;
     }, function (_flarumUtilsExtractText) {
@@ -31445,7 +31445,7 @@ System.register('flarum/utils/DiscussionControls', ['flarum/components/Discussio
           }
         },
         renameAction: function renameAction() {
-          return app.modal.show(new DiscussionRenameModal({
+          return app.modal.show(new RenameDiscussionModal({
             currentTitle: this.title(),
             discussion: this
           }));
diff --git a/js/forum/src/components/DiscussionRenameModal.js b/js/forum/src/components/RenameDiscussionModal.js
similarity index 90%
rename from js/forum/src/components/DiscussionRenameModal.js
rename to js/forum/src/components/RenameDiscussionModal.js
index 4cbd4d0b7..ede14ba87 100644
--- a/js/forum/src/components/DiscussionRenameModal.js
+++ b/js/forum/src/components/RenameDiscussionModal.js
@@ -2,9 +2,9 @@ import Modal from 'flarum/components/Modal';
 import Button from 'flarum/components/Button';
 
 /**
- * The 'DiscussionRenameModal' displays a modal dialog with an input to rename a discussion
+ * The 'RenameDiscussionModal' displays a modal dialog with an input to rename a discussion
  */
-export default class DiscussionRenameModal extends Modal {
+export default class RenameDiscussionModal extends Modal {
   init() {
     super.init();
 
@@ -14,7 +14,7 @@ export default class DiscussionRenameModal extends Modal {
   }
 
   className() {
-    return 'DiscussionRenameModal Modal--small';
+    return 'RenameDiscussionModal Modal--small';
   }
 
   title() {
diff --git a/js/forum/src/utils/DiscussionControls.js b/js/forum/src/utils/DiscussionControls.js
index 8757acce7..02355d43f 100644
--- a/js/forum/src/utils/DiscussionControls.js
+++ b/js/forum/src/utils/DiscussionControls.js
@@ -3,7 +3,7 @@ import ReplyComposer from 'flarum/components/ReplyComposer';
 import LogInModal from 'flarum/components/LogInModal';
 import Button from 'flarum/components/Button';
 import Separator from 'flarum/components/Separator';
-import DiscussionRenameModal from 'flarum/components/DiscussionRenameModal';
+import RenameDiscussionModal from 'flarum/components/RenameDiscussionModal';
 import ItemList from 'flarum/utils/ItemList';
 import extractText from 'flarum/utils/extractText';
 
@@ -228,7 +228,7 @@ export default {
    * @return {Promise}
    */
   renameAction() {
-    return app.modal.show(new DiscussionRenameModal({
+    return app.modal.show(new RenameDiscussionModal({
       currentTitle: this.title(),
       discussion: this
     }));