diff --git a/plugins/talk-plugin-featured-comments/client/components/Comment.js b/plugins/talk-plugin-featured-comments/client/components/Comment.js
index 1c2045110..779844177 100644
--- a/plugins/talk-plugin-featured-comments/client/components/Comment.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Comment.js
@@ -5,7 +5,7 @@ import {t, timeago} from 'plugin-api/beta/client/services';
 import {Slot, CommentAuthorName} from 'plugin-api/beta/client/components';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 import {pluginName} from '../../package.json';
-import Button from './Button';
+import FeaturedButton from '../containers/FeaturedButton';
 
 class Comment extends React.Component {
 
@@ -50,7 +50,7 @@ class Comment extends React.Component {
               inline
             />
 
-            <Button
+            <FeaturedButton
               root={root}
               data={data}
               comment={comment}
diff --git a/plugins/talk-plugin-featured-comments/client/components/Button.css b/plugins/talk-plugin-featured-comments/client/components/FeaturedButton.css
similarity index 100%
rename from plugins/talk-plugin-featured-comments/client/components/Button.css
rename to plugins/talk-plugin-featured-comments/client/components/FeaturedButton.css
diff --git a/plugins/talk-plugin-featured-comments/client/components/Button.js b/plugins/talk-plugin-featured-comments/client/components/FeaturedButton.js
similarity index 85%
rename from plugins/talk-plugin-featured-comments/client/components/Button.js
rename to plugins/talk-plugin-featured-comments/client/components/FeaturedButton.js
index 5bb174c30..0555fbf81 100644
--- a/plugins/talk-plugin-featured-comments/client/components/Button.js
+++ b/plugins/talk-plugin-featured-comments/client/components/FeaturedButton.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import cn from 'classnames';
-import styles from './Button.css';
+import styles from './FeaturedButton.css';
 import {pluginName} from '../../package.json';
 import {can} from 'plugin-api/beta/client/services';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 
-const Button = (props) => {
+const FeaturedButton = (props) => {
   const {alreadyTagged, deleteTag, postTag, user} = props;
 
   return can(user, 'MODERATE_COMMENTS') ? (
@@ -22,4 +22,4 @@ const Button = (props) => {
   ) : null ;
 };
 
-export default Button;
+export default FeaturedButton;
diff --git a/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js b/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js
index 5f7abcf06..5eabcdde7 100644
--- a/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js
+++ b/plugins/talk-plugin-featured-comments/client/components/ModActionButton.js
@@ -3,10 +3,9 @@ import cn from 'classnames';
 import styles from './ModActionButton.css';
 import {pluginName} from '../../package.json';
 import {t} from 'plugin-api/beta/client/services';
-import {withTags} from 'plugin-api/beta/client/hocs';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 
-export class Button extends React.Component {
+export class ModActionButton extends React.Component {
   constructor() {
     super();
 
@@ -56,5 +55,5 @@ export class Button extends React.Component {
   }
 }
 
-export default withTags('featured')(Button);
+export default ModActionButton;
 
diff --git a/plugins/talk-plugin-featured-comments/client/containers/Button.js b/plugins/talk-plugin-featured-comments/client/containers/Button.js
deleted file mode 100644
index d927b0125..000000000
--- a/plugins/talk-plugin-featured-comments/client/containers/Button.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Button from '../components/Button';
-import {withTags} from 'plugin-api/beta/client/hocs';
-
-export default withTags('featured')(Button);
diff --git a/plugins/talk-plugin-featured-comments/client/containers/FeaturedButton.js b/plugins/talk-plugin-featured-comments/client/containers/FeaturedButton.js
new file mode 100644
index 000000000..ba6f1587c
--- /dev/null
+++ b/plugins/talk-plugin-featured-comments/client/containers/FeaturedButton.js
@@ -0,0 +1,4 @@
+import FeaturedButton from '../components/FeaturedButton';
+import {withTags} from 'plugin-api/beta/client/hocs';
+
+export default withTags('featured')(FeaturedButton);
diff --git a/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js b/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
index e6ccc0f72..c66c0f4c6 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
@@ -1,10 +1,12 @@
 import {compose} from 'react-apollo';
-import {excludeIf} from 'plugin-api/beta/client/hocs';
-import {can} from 'plugin-api/beta/client/services';
+
 import Button from '../components/Button';
+import {can} from 'plugin-api/beta/client/services';
+import {excludeIf, withTags} from 'plugin-api/beta/client/hocs';
 
 const enhance = compose(
   excludeIf((props) => !can(props.user, 'MODERATE_COMMENTS')),
+  withTags('featured')
 );
 
 export default enhance(Button);