diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index e5272f2db..9d3cb0218 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import TagLabel from 'talk-plugin-tag-label/TagLabel';
-import PubDate from 'coral-framework/components/PubDate';
+import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
 import {ReplyBox, ReplyButton} from 'talk-plugin-replies';
 import {FlagComment} from 'talk-plugin-flags';
 import {can} from 'coral-framework/services/perms';
@@ -467,7 +467,7 @@ export default class Comment extends React.Component {
               <span className={`${styles.bylineSecondary} talk-stream-comment-user-byline`} >
                 <Slot
                   fill="commentTimestamp"
-                  defaultComponent={PubDate}
+                  defaultComponent={CommentTimestamp}
                   className={'talk-stream-comment-published-date'}
                   created_at={comment.created_at}
                   queryData={queryData}
diff --git a/client/coral-framework/components/PubDate.css b/client/coral-framework/components/CommentTimestamp.css
similarity index 83%
rename from client/coral-framework/components/PubDate.css
rename to client/coral-framework/components/CommentTimestamp.css
index 4ea0061c4..a4620902c 100644
--- a/client/coral-framework/components/PubDate.css
+++ b/client/coral-framework/components/CommentTimestamp.css
@@ -1,4 +1,4 @@
-.pubdate {
+.timestamp {
   display: inline-block;
   color: #696969;
   font-size: 12px;
diff --git a/client/coral-framework/components/PubDate.js b/client/coral-framework/components/CommentTimestamp.js
similarity index 51%
rename from client/coral-framework/components/PubDate.js
rename to client/coral-framework/components/CommentTimestamp.js
index 03f84a777..0d1c72f2b 100644
--- a/client/coral-framework/components/PubDate.js
+++ b/client/coral-framework/components/CommentTimestamp.js
@@ -2,17 +2,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {timeago} from 'coral-framework/services/i18n';
 import cn from 'classnames';
-import styles from './PubDate.css';
+import styles from './CommentTimestamp.css';
 
-const PubDate = ({className, created_at}) => (
-  <div className={cn(className, styles.pubdate, 'talk-comment-pubdate')}>
+const CommentTimestamp = ({className, created_at}) => (
+  <div className={cn(className, styles.timestamp, 'talk-comment-timestamp')}>
     {timeago(created_at)}
   </div>
 );
 
-PubDate.propTypes = {
+CommentTimestamp.propTypes = {
   className: PropTypes.string,
   created_at: PropTypes.string,
 };
 
-export default PubDate;
+export default CommentTimestamp;
diff --git a/client/talk-plugin-history/Comment.js b/client/talk-plugin-history/Comment.js
index 1f7979018..7532548cf 100644
--- a/client/talk-plugin-history/Comment.js
+++ b/client/talk-plugin-history/Comment.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {Icon} from '../coral-ui';
 import styles from './Comment.css';
 import Slot from 'coral-framework/components/Slot';
-import PubDate from 'coral-framework/components/PubDate';
+import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
 import CommentContent from '../coral-embed-stream/src/components/CommentContent';
 import cn from 'classnames';
 import {getTotalReactionsCount} from 'coral-framework/utils';
@@ -62,7 +62,7 @@ class Comment extends React.Component {
               <Icon name="schedule" className={styles.iconDate} />
               <Slot
                 fill="historyCommentTimestamp"
-                defaultComponent={PubDate}
+                defaultComponent={CommentTimestamp}
                 className={'talk-history-comment-published-date'}
                 created_at={comment.created_at}
                 data={data}
diff --git a/plugin-api/beta/client/components/index.js b/plugin-api/beta/client/components/index.js
index 634859e06..a0ae0f3da 100644
--- a/plugin-api/beta/client/components/index.js
+++ b/plugin-api/beta/client/components/index.js
@@ -3,4 +3,4 @@ export {default as ClickOutside} from 'coral-framework/components/ClickOutside';
 export {default as IfSlotIsEmpty} from 'coral-framework/components/IfSlotIsEmpty';
 export {default as IfSlotIsNotEmpty} from 'coral-framework/components/IfSlotIsNotEmpty';
 export {default as CommentAuthorName} from 'coral-framework/components/CommentAuthorName';
-export {default as PubDate} from 'coral-framework/components/PubDate';
+export {default as CommentTimestamp} from 'coral-framework/components/CommentTimestamp';
diff --git a/plugins/talk-plugin-auth/client/components/FakeComment.js b/plugins/talk-plugin-auth/client/components/FakeComment.js
index 9d195b0ec..e843a0cbf 100644
--- a/plugins/talk-plugin-auth/client/components/FakeComment.js
+++ b/plugins/talk-plugin-auth/client/components/FakeComment.js
@@ -3,14 +3,14 @@ import t from 'coral-framework/services/i18n';
 import {ReplyButton} from 'talk-plugin-replies';
 import styles from './FakeComment.css';
 import {Icon} from 'plugin-api/beta/client/components/ui';
-import {PubDate} from 'plugin-api/beta/client/components';
+import {CommentTimestamp} from 'plugin-api/beta/client/components';
 
 export const FakeComment = ({username, created_at, body}) => (
   <div className={styles.root}>
     <span className={styles.authorName}>
       {username}
     </span>
-    <PubDate created_at={created_at} />
+    <CommentTimestamp created_at={created_at} />
     <div className={styles.body}>
       {body}
     </div>
diff --git a/plugins/talk-plugin-featured-comments/client/components/Comment.js b/plugins/talk-plugin-featured-comments/client/components/Comment.js
index 8c355192f..a8c7cb6f1 100644
--- a/plugins/talk-plugin-featured-comments/client/components/Comment.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Comment.js
@@ -2,7 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import styles from './Comment.css';
 import {t} from 'plugin-api/beta/client/services';
-import {Slot, CommentAuthorName, PubDate} from 'plugin-api/beta/client/components';
+import {Slot, CommentAuthorName, CommentTimestamp} from 'plugin-api/beta/client/components';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 import {pluginName} from '../../package.json';
 import FeaturedButton from '../containers/FeaturedButton';
@@ -36,8 +36,8 @@ class Comment extends React.Component {
 
           <Slot
             fill="commentTimestamp"
-            defaultComponent={PubDate}
-            className={cn(styles.timestamp, `${pluginName}-comment-timeago`)}
+            defaultComponent={CommentTimestamp}
+            className={cn(styles.timestamp, `${pluginName}-comment-timestamp`)}
             created_at={comment.created_at}
             data={data}
             queryData={queryData}