diff --git a/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js b/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js
index 2e45cf97c..bd370b3b6 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/DraftArea.js
@@ -14,8 +14,8 @@ import styles from './DraftArea.css';
 export default class DraftArea extends React.Component {
   renderCharCount() {
     const { value, maxCharCount } = this.props;
-    const className = cn(styles.charCount, 'talk-draftarea-char-count', {
-      [`${styles.charMax} talk-draftarea-char-max`]:
+    const className = cn(styles.charCount, 'talk-commentbox-char-count', {
+      [`${styles.charMax} talk-commentbox-char-max`]:
         value.length > maxCharCount,
     });
     const remaining = maxCharCount - value.length;
@@ -53,7 +53,7 @@ export default class DraftArea extends React.Component {
 
     return (
       <div>
-        <div className={cn(styles.container, 'talk-draftarea-container')}>
+        <div className={cn(styles.container, 'talk-commentbox-container')}>
           <label htmlFor={id} className="screen-reader-text" aria-hidden={true}>
             {label}
           </label>
diff --git a/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.js b/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.js
index e23f7b9eb..da538c176 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/DraftAreaContent.js
@@ -12,7 +12,7 @@ const DraftAreaContent = ({
   disabled,
 }) => (
   <textarea
-    className={cn(styles.content, 'talk-draftarea-content')}
+    className={cn(styles.content, 'talk-commentbox-content')}
     value={value}
     placeholder={placeholder}
     id={id}
diff --git a/test/e2e/page_objects/embedStream.js b/test/e2e/page_objects/embedStream.js
index fab864987..ae0240125 100644
--- a/test/e2e/page_objects/embedStream.js
+++ b/test/e2e/page_objects/embedStream.js
@@ -97,8 +97,8 @@ module.exports = {
       elements: {
         logoutButton: '.talk-stream-userbox-logout',
         signInButton: '#coralSignInButton',
-        commentBoxTextarea: '.talk-plugin-commentbox-textarea',
-        commentBoxPostButton: '.talk-plugin-commentbox-button',
+        commentBoxTextarea: '.talk-commentbox-textarea',
+        commentBoxPostButton: '.talk-commentbox-button',
         firstComment: '.talk-stream-comment.talk-stream-comment-level-0',
         firstCommentContent:
           '.talk-stream-comment.talk-stream-comment-level-0 .talk-stream-comment-content',