diff --git a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
index ac9abc446..9a84bdbe8 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
@@ -4,7 +4,7 @@ import { Button } from 'coral-ui';
 import cn from 'classnames';
 import Slot from 'coral-framework/components/Slot';
 
-// TODO: need to change this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 import { name } from '../containers/CommentBox';
 import styles from './CommentForm.css';
 
diff --git a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
index 877ca7aea..ac50df9af 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-// TODO: move this function.
 import { notifyForNewCommentStatus } from '../helpers';
 import { CommentForm } from './CommentForm';
 import styles from './Comment.css';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
index 6ab4a8d74..bc673ba28 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
@@ -11,7 +11,7 @@ import * as REASONS from 'coral-framework/graphql/flagReasons';
 
 import { getErrorMessages, forEachError } from 'coral-framework/utils';
 
-// TODO: remove this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const name = 'talk-plugin-flags';
 
 export default class FlagButton extends Component {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
index 5e76c9911..7b811b63c 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Markdown from 'coral-framework/components/Markdown';
 
-// TODO: remove this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const packagename = 'talk-plugin-infobox';
 
 const InfoBox = ({ enable, content }) => (
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
index 03b56d990..6c93cb7fe 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import CommentBox from '../containers/CommentBox';
 
-// TODO: remove this..
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const name = 'talk-plugin-replies';
 
 class ReplyBox extends Component {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
index a19799a7c..812811741 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
@@ -6,7 +6,7 @@ import t from 'coral-framework/services/i18n';
 import cn from 'classnames';
 import styles from './ReplyButton.css';
 
-// @TODO: remove this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const name = 'talk-plugin-replies';
 
 const ReplyButton = ({ onClick }) => {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
index bbb324c22..2b2bee48a 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-// TODO: change className.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 
 const TagLabel = ({ children }) => (
   <div className="talk-plugin-tag-label">{children}</div>
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index 745b651e9..a9f9123c5 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { CommentForm } from '../components/CommentForm';
 import { notifyForNewCommentStatus } from '../helpers';
 
-// TODO: change this...
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 export const name = 'talk-plugin-commentbox';
 
 /**