diff --git a/frontend/src/components/InputChatContent.stories.tsx b/frontend/src/components/InputChatContent.stories.tsx
index 03f9c6714..b9eda49cf 100644
--- a/frontend/src/components/InputChatContent.stories.tsx
+++ b/frontend/src/components/InputChatContent.stories.tsx
@@ -3,8 +3,8 @@ import InputChatContent from './InputChatContent';
 
 export const Ideal = () => (
   <InputChatContent
-    hasRegenerate={false}
-    hasContinue={false}
+    canRegenerate={false}
+    canContinue={false}
     isLoading={false}
     onSend={() => {}}
     onRegenerate={() => {}}
@@ -17,8 +17,8 @@ export const IdealLoading = () => (
     disabledSend={true}
     disabledRegenerate={true}
     disabledContinue={true}
-    hasRegenerate={false}
-    hasContinue={false}
+    canRegenerate={false}
+    canContinue={false}
     isLoading={true}
     onSend={() => {}}
     onRegenerate={() => {}}
@@ -30,8 +30,8 @@ export const IdealDisabled = () => {
   const { t } = useTranslation();
   return (
     <InputChatContent
-      hasRegenerate={false}
-      hasContinue={false}
+      canRegenerate={false}
+      canContinue={false}
       isLoading={false}
       disabled={true}
       placeholder={t('bot.label.notAvailableBotInputMessage')}
@@ -42,10 +42,10 @@ export const IdealDisabled = () => {
   );
 };
 
-export const HasRegenerate = () => (
+export const WithRegenerate = () => (
   <InputChatContent
-    hasRegenerate={true}
-    hasContinue={false}
+    canRegenerate={true}
+    canContinue={false}
     isLoading={false}
     onSend={() => {}}
     onRegenerate={() => {}}
@@ -53,10 +53,10 @@ export const HasRegenerate = () => (
   />
 );
 
-export const HasContinue = () => (
+export const WithContinue = () => (
   <InputChatContent
-    hasRegenerate={true}
-    hasContinue={true}
+    canRegenerate={true}
+    canContinue={true}
     isLoading={false}
     onSend={() => {}}
     onRegenerate={() => {}}
diff --git a/frontend/src/components/InputChatContent.tsx b/frontend/src/components/InputChatContent.tsx
index b64c61f36..57683d817 100644
--- a/frontend/src/components/InputChatContent.tsx
+++ b/frontend/src/components/InputChatContent.tsx
@@ -41,8 +41,8 @@ type Props = BaseProps & {
   disabled?: boolean;
   placeholder?: string;
   dndMode?: boolean;
-  hasRegenerate: boolean;
-  hasContinue: boolean;
+  canRegenerate: boolean;
+  canContinue: boolean;
   isLoading: boolean;
   onSend: (
     content: string,
@@ -535,9 +535,9 @@ const InputChatContent = forwardRef<HTMLElement, Props>((props, focusInputRef) =
             ))}
           </div>
         )}
-        {props.hasRegenerate && (
+        {props.canRegenerate && (
           <div className="absolute -top-14 right-0 flex space-x-2">
-            {props.hasContinue && !props.disabledContinue && !props.disabled && (
+            {props.canContinue && !props.disabledContinue && !props.disabled && (
               <Button
                 className="bg-aws-paper p-2 text-sm"
                 outlined
diff --git a/frontend/src/features/agent/components/Agent.stories.tsx b/frontend/src/features/agent/components/Agent.stories.tsx
index 8a950df3f..bd5f40871 100644
--- a/frontend/src/features/agent/components/Agent.stories.tsx
+++ b/frontend/src/features/agent/components/Agent.stories.tsx
@@ -7,7 +7,7 @@ import { AgentTool } from '../types';
 
 export const InputChatContent = () => (
   <TextInputChatContent
-    hasRegenerate={false}
+    canRegenerate={false}
     isLoading={false}
     onSend={() => {}}
     onRegenerate={() => {}}
@@ -18,7 +18,7 @@ export const InputChatContentLoading = () => (
   <TextInputChatContent
     disabledSend={true}
     disabledRegenerate={true}
-    hasRegenerate={false}
+    canRegenerate={false}
     isLoading={true}
     onSend={() => {}}
     onRegenerate={() => {}}
@@ -29,7 +29,7 @@ export const InputChatContentDisabled = () => {
   const { t } = useTranslation();
   return (
     <TextInputChatContent
-      hasRegenerate={false}
+      canRegenerate={false}
       isLoading={false}
       disabled={true}
       placeholder={t('bot.label.notAvailableBotInputMessage')}
@@ -39,9 +39,9 @@ export const InputChatContentDisabled = () => {
   );
 };
 
-export const InputChatContentHasRegenerate = () => (
+export const InputChatContentWithRegenerate = () => (
   <TextInputChatContent
-    hasRegenerate={true}
+    canRegenerate={true}
     isLoading={false}
     onSend={() => {}}
     onRegenerate={() => {}}
diff --git a/frontend/src/features/agent/components/TextInputChatContent.tsx b/frontend/src/features/agent/components/TextInputChatContent.tsx
index 648d86dac..4a6fbced3 100644
--- a/frontend/src/features/agent/components/TextInputChatContent.tsx
+++ b/frontend/src/features/agent/components/TextInputChatContent.tsx
@@ -19,7 +19,7 @@ type Props = BaseProps & {
   disabledRegenerate?: boolean;
   disabled?: boolean;
   placeholder?: string;
-  hasRegenerate: boolean;
+  canRegenerate: boolean;
   isLoading: boolean;
   onSend: (content: string, base64EncodedImages?: string[]) => void;
   onRegenerate: () => void;
@@ -97,7 +97,7 @@ export const TextInputChatContent = forwardRef<HTMLElement, Props>((props, focus
           />
         </div>
 
-        {props.hasRegenerate && (
+        {props.canRegenerate && (
           <Button
             className="absolute -top-14 right-0 bg-aws-paper p-2 text-sm"
             outlined
diff --git a/frontend/src/pages/ChatPage.tsx b/frontend/src/pages/ChatPage.tsx
index 2c8547550..cc9adc19e 100644
--- a/frontend/src/pages/ChatPage.tsx
+++ b/frontend/src/pages/ChatPage.tsx
@@ -509,7 +509,7 @@ const ChatPage: React.FC = () => {
                 ? t('bot.label.notAvailableBotInputMessage')
                 : undefined
             }
-            hasRegenerate={messages.length > 1}
+            canRegenerate={messages.length > 1}
             isLoading={postingMessage}
             onSend={onSend}
             onRegenerate={onRegenerate}
@@ -527,8 +527,8 @@ const ChatPage: React.FC = () => {
                 ? t('bot.label.notAvailableBotInputMessage')
                 : undefined
             }
-            hasRegenerate={messages.length > 1}
-            hasContinue={getShouldContinue()}
+            canRegenerate={messages.length > 1}
+            canContinue={getShouldContinue()}
             isLoading={postingMessage}
             onSend={onSend}
             onRegenerate={onRegenerate}