diff --git a/.changeset/early-sheep-crash.md b/.changeset/early-sheep-crash.md
new file mode 100644
index 00000000000..ed23049994c
--- /dev/null
+++ b/.changeset/early-sheep-crash.md
@@ -0,0 +1,9 @@
+---
+"@aws-amplify/ui-react-native": patch
+"@aws-amplify/ui-react": patch
+"@aws-amplify/ui": patch
+"@aws-amplify/ui-vue": patch
+"@aws-amplify/ui-angular": patch
+---
+
+fix(authenticator): forgot password clean up
diff --git a/packages/angular/projects/ui-angular/src/lib/components/authenticator/components/forgot-password/forgot-password.component.ts b/packages/angular/projects/ui-angular/src/lib/components/authenticator/components/forgot-password/forgot-password.component.ts
index 95b4a9091a0..93ab7650441 100644
--- a/packages/angular/projects/ui-angular/src/lib/components/authenticator/components/forgot-password/forgot-password.component.ts
+++ b/packages/angular/projects/ui-angular/src/lib/components/authenticator/components/forgot-password/forgot-password.component.ts
@@ -14,7 +14,7 @@ const { getResetYourPasswordText, getSendCodeText, getBackToSignInText } =
   templateUrl: './forgot-password.component.html',
 })
 export class ForgotPasswordComponent {
-  @HostBinding('attr.data-amplify-authenticator-forgotPassword') dataAttr = '';
+  @HostBinding('attr.data-amplify-authenticator-forgotpassword') dataAttr = '';
   @Input() public headerText = getResetYourPasswordText();
 
   // translated texts
diff --git a/packages/react-native/src/Authenticator/Defaults/types.ts b/packages/react-native/src/Authenticator/Defaults/types.ts
index 6779a6d1f28..c6c9fddf9dc 100644
--- a/packages/react-native/src/Authenticator/Defaults/types.ts
+++ b/packages/react-native/src/Authenticator/Defaults/types.ts
@@ -10,7 +10,7 @@ export interface ConfirmSignInStyle {}
 export interface ConfirmSignUpStyle {}
 export interface ConfirmVerifyUserStyle {}
 export interface ForceNewPasswordStyle {}
-export interface ResetPasswordStyle {}
+export interface ForgotPasswordStyle {}
 export interface SetupTotpStyle {}
 export interface SignInStyle {}
 export interface SignUpStyle {}
@@ -59,7 +59,7 @@ export type DefaultForceNewPasswordProps = React.ComponentPropsWithoutRef<
 export type DefaultForgotPasswordProps = React.ComponentPropsWithoutRef<
   DefaultComponents<
     TextFieldOptionsType,
-    { style?: ResetPasswordStyle }
+    { style?: ForgotPasswordStyle }
   >['ForgotPassword']
 >;
 
@@ -120,7 +120,7 @@ type ForceNewPasswordComponent<P = {}> = OverrideComponents<
 
 type ForgotPasswordComponent<P = {}> = OverrideComponents<
   TextFieldOptionsType,
-  { style?: ResetPasswordStyle } & P
+  { style?: ForgotPasswordStyle } & P
 >['ForgotPassword'];
 
 type SetupTotpComponent<P = {}> = OverrideComponents<
diff --git a/packages/react/src/components/Authenticator/ForgotPassword/ForgotPassword.tsx b/packages/react/src/components/Authenticator/ForgotPassword/ForgotPassword.tsx
index fdc62d983e1..a792dcd8542 100644
--- a/packages/react/src/components/Authenticator/ForgotPassword/ForgotPassword.tsx
+++ b/packages/react/src/components/Authenticator/ForgotPassword/ForgotPassword.tsx
@@ -39,7 +39,7 @@ export const ForgotPassword = ({
     <RouteContainer className={className} variation={variation}>
       <form
         data-amplify-form=""
-        data-amplify-authenticator-Forgotpassword=""
+        data-amplify-authenticator-forgotpassword=""
         method="post"
         onChange={handleChange}
         onSubmit={handleSubmit}
diff --git a/packages/ui/src/helpers/authenticator/textUtil.ts b/packages/ui/src/helpers/authenticator/textUtil.ts
index fa82cd36e0f..351cae6d069 100644
--- a/packages/ui/src/helpers/authenticator/textUtil.ts
+++ b/packages/ui/src/helpers/authenticator/textUtil.ts
@@ -126,7 +126,7 @@ export const authenticatorTextUtil = {
   /** ConfirmSignIn */
   getChallengeText,
 
-  /** ResetPassword */
+  /** ForgotPassword */
   getResetYourPasswordText: () => translate(DefaultTexts.RESET_PASSWORD),
 
   /** SetupTotp */
diff --git a/packages/vue/src/components/__tests__/__snapshots__/authenticator.spec.ts.snap b/packages/vue/src/components/__tests__/__snapshots__/authenticator.spec.ts.snap
index dc1688791f0..55e6940f93e 100644
--- a/packages/vue/src/components/__tests__/__snapshots__/authenticator.spec.ts.snap
+++ b/packages/vue/src/components/__tests__/__snapshots__/authenticator.spec.ts.snap
@@ -635,7 +635,7 @@ exports[`authenticator renders forgotPassword subcomponent 1`] = `
         
         
         <form
-          data-amplify-authenticator-resetpassword=""
+          data-amplify-authenticator-forgotpassword=""
           data-amplify-form=""
         >
           
diff --git a/packages/vue/src/components/__tests__/__snapshots__/forgot-password.spec.ts.snap b/packages/vue/src/components/__tests__/__snapshots__/forgot-password.spec.ts.snap
index ed0b3ef337a..9986e4336a1 100644
--- a/packages/vue/src/components/__tests__/__snapshots__/forgot-password.spec.ts.snap
+++ b/packages/vue/src/components/__tests__/__snapshots__/forgot-password.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`ForgotPassword renders as expected 1`] = `
   
   
   <form
-    data-amplify-authenticator-resetpassword=""
+    data-amplify-authenticator-forgotpassword=""
     data-amplify-form=""
   >
     
diff --git a/packages/vue/src/components/authenticator.vue b/packages/vue/src/components/authenticator.vue
index dd90c648da9..2b95eea8412 100644
--- a/packages/vue/src/components/authenticator.vue
+++ b/packages/vue/src/components/authenticator.vue
@@ -251,7 +251,7 @@ const hasRouteComponent = computed(() => {
           v-if="route === 'forgotPassword'"
           ref="ForgotPasswordComponent"
         >
-          <template #resetPasswordSlotI>
+          <template #forgotPasswordSlotI>
             <slot name="forgot-password"></slot>
           </template>
           <template #header>
diff --git a/packages/vue/src/components/forgot-password.vue b/packages/vue/src/components/forgot-password.vue
index 32c3443de27..932e209b1db 100644
--- a/packages/vue/src/components/forgot-password.vue
+++ b/packages/vue/src/components/forgot-password.vue
@@ -40,10 +40,10 @@ const onBackToSignInClicked = (): void => {
 </script>
 
 <template>
-  <slot v-bind="$attrs" name="resetPasswordSlotI">
+  <slot v-bind="$attrs" name="forgotPasswordSlotI">
     <base-form
       v-bind="$attrs"
-      data-amplify-authenticator-resetpassword
+      data-amplify-authenticator-forgotpassword
       @input="onInput"
       @submit.prevent="onResetPasswordSubmit"
     >