diff --git a/plugins/talk-plugin-featured-comments/client/components/FeaturedButton.css b/plugins/talk-plugin-featured-comments/client/components/Button.css
similarity index 100%
rename from plugins/talk-plugin-featured-comments/client/components/FeaturedButton.css
rename to plugins/talk-plugin-featured-comments/client/components/Button.css
diff --git a/plugins/talk-plugin-featured-comments/client/components/FeaturedButton.js b/plugins/talk-plugin-featured-comments/client/components/Button.js
similarity index 79%
rename from plugins/talk-plugin-featured-comments/client/components/FeaturedButton.js
rename to plugins/talk-plugin-featured-comments/client/components/Button.js
index a9da1ecbf..82b17018e 100644
--- a/plugins/talk-plugin-featured-comments/client/components/FeaturedButton.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Button.js
@@ -1,20 +1,20 @@
 import React from 'react';
 import cn from 'classnames';
-import styles from './FeaturedButton.css';
+import styles from './Button.css';
 import {name} from '../../package.json';
 import {can} from 'plugin-api/beta/client/services';
 import {withTags} from 'plugin-api/beta/client/hocs';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 
-const FeaturedButton = (props) => {
+const Button = (props) => {
   const {alreadyTagged, deleteTag, postTag, user} = props;
 
   return can(user, 'MODERATE_COMMENTS') ? (
-    <button 
+    <button
       className={cn([name, styles.button, {[styles.featured] : alreadyTagged}])}
       onClick={alreadyTagged ? deleteTag : postTag} >
 
-      {alreadyTagged ? 
+      {alreadyTagged ?
         <Icon name="star" className={styles.icon} /> :
         <Icon name="star_border" className={styles.icon} />
       }
@@ -23,5 +23,5 @@ const FeaturedButton = (props) => {
   ) : null ;
 };
 
-export default withTags('featured')(FeaturedButton); 
+export default withTags('featured')(Button);
 
diff --git a/plugins/talk-plugin-featured-comments/client/components/FeaturedComment.css b/plugins/talk-plugin-featured-comments/client/components/Comment.css
similarity index 100%
rename from plugins/talk-plugin-featured-comments/client/components/FeaturedComment.css
rename to plugins/talk-plugin-featured-comments/client/components/Comment.css
diff --git a/plugins/talk-plugin-featured-comments/client/components/FeaturedComment.js b/plugins/talk-plugin-featured-comments/client/components/Comment.js
similarity index 93%
rename from plugins/talk-plugin-featured-comments/client/components/FeaturedComment.js
rename to plugins/talk-plugin-featured-comments/client/components/Comment.js
index 85d674e45..cce9d000d 100644
--- a/plugins/talk-plugin-featured-comments/client/components/FeaturedComment.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Comment.js
@@ -1,12 +1,12 @@
 import React from 'react';
 import cn from 'classnames';
-import styles from './FeaturedComment.css';
+import styles from './Comment.css';
 import {name} from '../../package.json';
 import {timeago} from 'coral-framework/services/i18n';
 import {Slot} from 'plugin-api/beta/client/components';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 
-class FeaturedComment extends React.Component {
+class Comment extends React.Component {
 
   viewComment = () => {
     this.props.viewComment(this.props.comment.id);
@@ -55,4 +55,4 @@ class FeaturedComment extends React.Component {
   }
 }
 
-export default FeaturedComment;
+export default Comment;
diff --git a/plugins/talk-plugin-featured-comments/client/components/TabPane.js b/plugins/talk-plugin-featured-comments/client/components/TabPane.js
index 3eecfad70..25d43aa7d 100644
--- a/plugins/talk-plugin-featured-comments/client/components/TabPane.js
+++ b/plugins/talk-plugin-featured-comments/client/components/TabPane.js
@@ -1,10 +1,10 @@
 import React from 'react';
-import FeaturedComment from '../containers/FeaturedComment';
+import Comment from '../containers/Comment';
 
 export default ({root, data, asset: {featuredComments, ...asset}, viewComment}) => (
   <div>
     {featuredComments.nodes.map((comment) =>
-      <FeaturedComment
+      <Comment
         key={comment.id}
         root={root}
         data={data}
diff --git a/plugins/talk-plugin-featured-comments/client/components/FeaturedTag.css b/plugins/talk-plugin-featured-comments/client/components/Tag.css
similarity index 100%
rename from plugins/talk-plugin-featured-comments/client/components/FeaturedTag.css
rename to plugins/talk-plugin-featured-comments/client/components/Tag.css
diff --git a/plugins/talk-plugin-featured-comments/client/components/FeaturedTag.js b/plugins/talk-plugin-featured-comments/client/components/Tag.js
similarity index 90%
rename from plugins/talk-plugin-featured-comments/client/components/FeaturedTag.js
rename to plugins/talk-plugin-featured-comments/client/components/Tag.js
index 6cd236370..06603faab 100644
--- a/plugins/talk-plugin-featured-comments/client/components/FeaturedTag.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Tag.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import styles from './FeaturedTag.css';
+import styles from './Tag.css';
 import {t} from 'plugin-api/beta/client/services';
 import {isTagged} from 'plugin-api/beta/client/utils';
 
diff --git a/plugins/talk-plugin-featured-comments/client/containers/FeaturedComment.js b/plugins/talk-plugin-featured-comments/client/containers/Comment.js
similarity index 91%
rename from plugins/talk-plugin-featured-comments/client/containers/FeaturedComment.js
rename to plugins/talk-plugin-featured-comments/client/containers/Comment.js
index 6a2013269..bba764a1d 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/FeaturedComment.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/Comment.js
@@ -1,5 +1,5 @@
 import {gql} from 'react-apollo';
-import FeaturedComment from '../components/FeaturedComment';
+import Comment from '../components/Comment';
 import {withFragments} from 'plugin-api/beta/client/hocs';
 import {getSlotFragmentSpreads} from 'plugin-api/beta/client/utils';
 
@@ -38,4 +38,4 @@ export default withFragments({
       ${getSlotFragmentSpreads(slots, 'comment')}
     }
   `
-})(FeaturedComment);
+})(Comment);
diff --git a/plugins/talk-plugin-featured-comments/client/containers/TabPane.js b/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
index 2b4894c7d..0dd83c92d 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
@@ -3,7 +3,7 @@ import {bindActionCreators} from 'redux';
 import {compose, gql} from 'react-apollo';
 import TabPane from '../components/TabPane';
 import {withFragments} from 'plugin-api/beta/client/hocs';
-import FeaturedComment from '../containers/FeaturedComment';
+import Comment from '../containers/Comment';
 import {getDefinitionName} from 'coral-framework/utils';
 
 import {viewComment} from 'coral-embed-stream/src/actions/stream';
@@ -19,25 +19,25 @@ const enhance = compose(
     root: gql`
       fragment TalkFeaturedComments_TabPane_root on RootQuery {
         __typename
-        ...${getDefinitionName(FeaturedComment.fragments.root)}
+        ...${getDefinitionName(Comment.fragments.root)}
       }
-      ${FeaturedComment.fragments.root}
+      ${Comment.fragments.root}
     `,
     asset: gql`
       fragment TalkFeaturedComments_TabPane_asset on Asset {
         id
         featuredComments: comments(tags: ["FEATURED"], excludeIgnored: $excludeIgnored, deep: true) {
           nodes {
-            ...${getDefinitionName(FeaturedComment.fragments.comment)}
+            ...${getDefinitionName(Comment.fragments.comment)}
           }
           hasNextPage
           startCursor
           endCursor
         }
-        ...${getDefinitionName(FeaturedComment.fragments.asset)}
+        ...${getDefinitionName(Comment.fragments.asset)}
       }
-      ${FeaturedComment.fragments.comment}
-      ${FeaturedComment.fragments.asset}
+      ${Comment.fragments.comment}
+      ${Comment.fragments.asset}
     `,
   }),
 );
diff --git a/plugins/talk-plugin-featured-comments/client/index.js b/plugins/talk-plugin-featured-comments/client/index.js
index 6d3191374..f8460c04c 100644
--- a/plugins/talk-plugin-featured-comments/client/index.js
+++ b/plugins/talk-plugin-featured-comments/client/index.js
@@ -1,7 +1,7 @@
 import Tab from './containers/Tab';
 import TabPane from './containers/TabPane';
-import FeaturedTag from './components/FeaturedTag';
-import FeaturedButton from './components/FeaturedButton';
+import Tag from './components/Tag';
+import Button from './components/Button';
 import translations from './translations.json';
 import update from 'immutability-helper';
 
@@ -13,8 +13,8 @@ export default {
   slots: {
     streamTabs: [Tab],
     streamTabPanes: [TabPane],
-    commentInfoBar: [FeaturedTag],
-    commentReactions: [FeaturedButton]
+    commentInfoBar: [Tag],
+    commentReactions: [Button]
   },
   mutations: {
     IgnoreUser: ({variables}) => ({