diff --git a/apps/comments-ui/src/components/content/Comment.js b/apps/comments-ui/src/components/content/Comment.js
index 3bbb96cb7a..cc5f05300a 100644
--- a/apps/comments-ui/src/components/content/Comment.js
+++ b/apps/comments-ui/src/components/content/Comment.js
@@ -1,9 +1,9 @@
 import React, {useContext, useState} from 'react';
 import {Transition} from '@headlessui/react';
 import {BlankAvatar, Avatar} from './Avatar';
-import Like from './buttons/Like';
-import Reply from './buttons/Reply';
-import More from './buttons/More';
+import LikeButton from './buttons/LikeButton';
+import ReplyButton from './buttons/ReplyButton';
+import MoreButton from './buttons/MoreButton';
 import Form from './Form';
 import Replies from './Replies';
 import AppContext from '../../AppContext';
@@ -105,7 +105,7 @@ function UnpublishedComment({comment, openEditMode}) {
                 <div className="flex h-12 flex-row items-center gap-4 pb-[8px] pr-4">
                     <p className="mt-[4px] font-sans text-[16px] italic leading-normal text-neutral-300 dark:text-[rgba(255,255,255,0.5)]">{notPublishedMessage}</p>
                     <div className="mt-[4px]">
-                        <More comment={comment} toggleEdit={openEditMode} />
+                        <MoreButton comment={comment} toggleEdit={openEditMode} />
                     </div>
                 </div> 
             </div>
@@ -223,9 +223,9 @@ function CommentMenu({comment, toggleReplyMode, isInReplyMode, openEditMode, par
 
     return (
         <div className="flex items-center gap-5">
-            {<Like comment={comment} />}
-            {(canReply && <Reply comment={comment} toggleReply={toggleReplyMode} isReplying={isInReplyMode} />)}
-            {<More comment={comment} toggleEdit={openEditMode} />}
+            {<LikeButton comment={comment} />}
+            {(canReply && <ReplyButton comment={comment} toggleReply={toggleReplyMode} isReplying={isInReplyMode} />)}
+            {<MoreButton comment={comment} toggleEdit={openEditMode} />}
         </div>
     );
 }
diff --git a/apps/comments-ui/src/components/content/Form.js b/apps/comments-ui/src/components/content/Form.js
index f94af9f641..64c98d21bd 100644
--- a/apps/comments-ui/src/components/content/Form.js
+++ b/apps/comments-ui/src/components/content/Form.js
@@ -48,7 +48,7 @@ const Form = (props) => {
     let config;
     if (props.isReply) {
         config = {
-            placeholder: 'Reply to comment',
+            placeholder: 'ReplyButton to comment',
             autofocus: true
         };
     } else if (props.isEdit) {
diff --git a/apps/comments-ui/src/components/content/buttons/Like.js b/apps/comments-ui/src/components/content/buttons/LikeButton.js
similarity index 97%
rename from apps/comments-ui/src/components/content/buttons/Like.js
rename to apps/comments-ui/src/components/content/buttons/LikeButton.js
index 468b7215dc..712de323f5 100644
--- a/apps/comments-ui/src/components/content/buttons/Like.js
+++ b/apps/comments-ui/src/components/content/buttons/LikeButton.js
@@ -2,7 +2,7 @@ import {useContext, useState} from 'react';
 import {ReactComponent as LikeIcon} from '../../../images/icons/like.svg';
 import AppContext from '../../../AppContext';
 
-function Like(props) {
+function LikeButton(props) {
     const {dispatchAction, member, commentsEnabled} = useContext(AppContext);
     const [animationClass, setAnimation] = useState('');
 
@@ -42,4 +42,4 @@ function Like(props) {
     );
 }
 
-export default Like;
+export default LikeButton;
diff --git a/apps/comments-ui/src/components/content/buttons/More.js b/apps/comments-ui/src/components/content/buttons/MoreButton.js
similarity index 95%
rename from apps/comments-ui/src/components/content/buttons/More.js
rename to apps/comments-ui/src/components/content/buttons/MoreButton.js
index 187f8043ac..39985cbb3b 100644
--- a/apps/comments-ui/src/components/content/buttons/More.js
+++ b/apps/comments-ui/src/components/content/buttons/MoreButton.js
@@ -3,7 +3,7 @@ import CommentContextMenu from '../context-menus/CommentContextMenu';
 import AppContext from '../../../AppContext';
 import {ReactComponent as MoreIcon} from '../../../images/icons/more.svg';
 
-const More = (props) => {
+const MoreButton = (props) => {
     const [isContextMenuOpen, setIsContextMenuOpen] = useState(false);
     const {member, admin} = useContext(AppContext);
 
@@ -35,4 +35,4 @@ const More = (props) => {
     );
 };
 
-export default More;
+export default MoreButton;
diff --git a/apps/comments-ui/src/components/content/buttons/Reply.js b/apps/comments-ui/src/components/content/buttons/ReplyButton.js
similarity index 91%
rename from apps/comments-ui/src/components/content/buttons/Reply.js
rename to apps/comments-ui/src/components/content/buttons/ReplyButton.js
index d3bc8241b5..f1619f9a74 100644
--- a/apps/comments-ui/src/components/content/buttons/Reply.js
+++ b/apps/comments-ui/src/components/content/buttons/ReplyButton.js
@@ -2,13 +2,13 @@ import React, {useContext} from 'react';
 import AppContext from '../../../AppContext';
 import {ReactComponent as ReplyIcon} from '../../../images/icons/reply.svg';
 
-function Reply(props) {
+function ReplyButton(props) {
     const {member} = useContext(AppContext);
 
     return member ?
         (<button disabled={!!props.disabled} className={`group duration-50 flex items-center font-sans text-sm outline-0 transition-all ease-linear ${props.isReplying ? 'text-neutral-900 dark:text-[rgba(255,255,255,0.9)]' : 'text-neutral-500 hover:text-neutral-600 dark:text-[rgba(255,255,255,0.5)] dark:hover:text-[rgba(255,255,255,0.3)]'}`} onClick={props.toggleReply} data-testid="reply-button">
-            <ReplyIcon className={`mr-[6px] ${props.isReplying ? 'fill-neutral-900 stroke-neutral-900 dark:fill-white dark:stroke-white' : 'stroke-neutral-400 group-hover:stroke-neutral-600 dark:stroke-[rgba(255,255,255,0.5)]'} duration-50 transition ease-linear`} />Reply
+            <ReplyIcon className={`mr-[6px] ${props.isReplying ? 'fill-neutral-900 stroke-neutral-900 dark:fill-white dark:stroke-white' : 'stroke-neutral-400 group-hover:stroke-neutral-600 dark:stroke-[rgba(255,255,255,0.5)]'} duration-50 transition ease-linear`} />ReplyButton
         </button>) : null;
 }
 
-export default Reply;
+export default ReplyButton;