diff --git a/extensions/tags/js/bootstrap.js b/extensions/tags/js/bootstrap.js
index 4641b17fc..43705571d 100644
--- a/extensions/tags/js/bootstrap.js
+++ b/extensions/tags/js/bootstrap.js
@@ -8,9 +8,9 @@ import DiscussionHero from 'flarum/components/discussion-hero';
 import Separator from 'flarum/components/separator';
 import ActionButton from 'flarum/components/action-button';
 import NavItem from 'flarum/components/nav-item';
-import ComposerDiscussion from 'flarum/components/composer-discussion';
+import DiscussionComposer from 'flarum/components/discussion-composer';
 import SettingsPage from 'flarum/components/settings-page';
-import ActivityPost from 'flarum/components/activity-post';
+import PostActivity from 'flarum/components/post-activity';
 import icon from 'flarum/helpers/icon';
 import app from 'flarum/app';
 
@@ -19,8 +19,8 @@ import CategoriesPage from 'categories/components/categories-page';
 import CategoryHero from 'categories/components/category-hero';
 import CategoryNavItem from 'categories/components/category-nav-item';
 import MoveDiscussionModal from 'categories/components/move-discussion-modal';
-import NotificationDiscussionMoved from 'categories/components/notification-discussion-moved';
-import PostDiscussionMoved from 'categories/components/post-discussion-moved';
+import DiscussionMovedNotification from 'categories/components/discussion-moved-notification';
+import DiscussionMovedPost from 'categories/components/discussion-moved-post';
 import categoryLabel from 'categories/helpers/category-label';
 import categoryIcon from 'categories/helpers/category-icon';
 
@@ -38,8 +38,8 @@ app.initializers.add('categories', function() {
   Discussion.prototype.canMove = Model.prop('canMove');
 
   // Register components.
-  app.postComponentRegistry['discussionMoved'] = PostDiscussionMoved;
-  app.notificationComponentRegistry['discussionMoved'] = NotificationDiscussionMoved;
+  app.postComponentRegistry['discussionMoved'] = DiscussionMovedPost;
+  app.notificationComponentRegistry['discussionMoved'] = DiscussionMovedNotification;
 
   // ---------------------------------------------------------------------------
   // INDEX PAGE
@@ -182,8 +182,8 @@ app.initializers.add('categories', function() {
   });
 
   // Add category-selection abilities to the discussion composer.
-  ComposerDiscussion.prototype.category = m.prop();
-  ComposerDiscussion.prototype.chooseCategory = function() {
+  DiscussionComposer.prototype.category = m.prop();
+  DiscussionComposer.prototype.chooseCategory = function() {
     var modal = new MoveDiscussionModal({
       onchange: category => {
         this.category(category);
@@ -195,7 +195,7 @@ app.initializers.add('categories', function() {
 
   // Add a category-selection menu to the discussion composer's header, after
   // the title.
-  extend(ComposerDiscussion.prototype, 'headerItems', function(items) {
+  extend(DiscussionComposer.prototype, 'headerItems', function(items) {
     var category = this.category();
 
     items.add('category', m('a[href=javascript:;][tabindex=-1].btn.btn-link.control-change-category', {onclick: this.chooseCategory.bind(this)}, [
@@ -206,7 +206,7 @@ app.initializers.add('categories', function() {
   });
 
   // Add the selected category as data to submit to the server.
-  extend(ComposerDiscussion.prototype, 'data', function(data) {
+  extend(DiscussionComposer.prototype, 'data', function(data) {
     data.links = data.links || {};
     data.links.category = this.category();
   });
@@ -216,7 +216,7 @@ app.initializers.add('categories', function() {
   // ---------------------------------------------------------------------------
 
   // Add a category label next to the discussion title in post activity items.
-  extend(ActivityPost.prototype, 'headerItems', function(items) {
+  extend(PostActivity.prototype, 'headerItems', function(items) {
     var category = this.props.activity.post().discussion().category();
     if (category) {
       items.add('category', categoryLabel(category));
diff --git a/extensions/tags/js/src/components/notification-discussion-moved.js b/extensions/tags/js/src/components/discussion-moved-notification.js
similarity index 89%
rename from extensions/tags/js/src/components/notification-discussion-moved.js
rename to extensions/tags/js/src/components/discussion-moved-notification.js
index 90ac47ca4..4e622a4eb 100644
--- a/extensions/tags/js/src/components/notification-discussion-moved.js
+++ b/extensions/tags/js/src/components/discussion-moved-notification.js
@@ -2,7 +2,7 @@ import Notification from 'flarum/components/notification';
 import username from 'flarum/helpers/username';
 import categoryLabel from 'categories/helpers/category-label';
 
-export default class NotificationDiscussionMoved extends Notification {
+export default class DiscussionMovedNotification extends Notification {
   view() {
     var notification = this.props.notification;
     var discussion = notification.subject();
diff --git a/extensions/tags/js/src/components/post-discussion-moved.js b/extensions/tags/js/src/components/discussion-moved-post.js
similarity index 76%
rename from extensions/tags/js/src/components/post-discussion-moved.js
rename to extensions/tags/js/src/components/discussion-moved-post.js
index de0b3380b..72373b8ff 100644
--- a/extensions/tags/js/src/components/post-discussion-moved.js
+++ b/extensions/tags/js/src/components/discussion-moved-post.js
@@ -1,7 +1,7 @@
-import PostActivity from 'flarum/components/post-activity';
+import EventPost from 'flarum/components/event-post';
 import categoryLabel from 'categories/helpers/category-label';
 
-export default class PostDiscussionMoved extends PostActivity {
+export default class DiscussionMovedPost extends EventPost {
   view() {
     var post = this.props.post;
     var oldCategory = app.store.getById('categories', post.content()[0]);
diff --git a/extensions/tags/less/categories.less b/extensions/tags/less/categories.less
index 6b0a97edd..9ca4c60d3 100644
--- a/extensions/tags/less/categories.less
+++ b/extensions/tags/less/categories.less
@@ -23,7 +23,7 @@
     padding: 2px 6px;
   }
 
-  .post-discussion-moved & {
+  .discussion-moved-post & {
     margin: 0 2px;
   }
 }