diff --git a/apps/nextjs-website/src/app/auth/change-password/page.tsx b/apps/nextjs-website/src/app/auth/change-password/page.tsx
index 7827a6f2e9..73093f1ebe 100644
--- a/apps/nextjs-website/src/app/auth/change-password/page.tsx
+++ b/apps/nextjs-website/src/app/auth/change-password/page.tsx
@@ -33,7 +33,7 @@ const ChangePassword = () => {
     ResetPasswordSteps.CHANGE_PASSWORD
   );
 
-  const onChangePassword = useCallback(
+  const onPasswordChanged = useCallback(
     (password: string) => {
       setSubmitting(true);
       Auth.forgotPasswordSubmit(username, code, password)
@@ -80,7 +80,7 @@ const ChangePassword = () => {
             {resetPasswordSteps === ResetPasswordSteps.CHANGE_PASSWORD ? (
               <ChangePasswordForm
                 submitting={submitting}
-                onSubmit={onChangePassword}
+                onSubmit={onPasswordChanged}
               />
             ) : (
               <PasswordChangedCard />
diff --git a/apps/nextjs-website/src/components/organisms/Auth/ChangePasswordForm.tsx b/apps/nextjs-website/src/components/organisms/Auth/ChangePasswordForm.tsx
index adeccb1da1..ac50c5f3be 100644
--- a/apps/nextjs-website/src/components/organisms/Auth/ChangePasswordForm.tsx
+++ b/apps/nextjs-website/src/components/organisms/Auth/ChangePasswordForm.tsx
@@ -46,7 +46,7 @@ const ChangePasswordForm = ({
     confirmPasswordError: false,
   });
 
-  const handleChange = (ev: ChangeEvent<HTMLInputElement>) => {
+  const handlePasswordChanged = (ev: ChangeEvent<HTMLInputElement>) => {
     setFieldErrors({
       passwordError: false,
       confirmPasswordError: false,
@@ -102,7 +102,7 @@ const ChangePasswordForm = ({
                 }
                 label={shared('password')}
                 value={passwords.password}
-                onChange={handleChange}
+                onChange={handlePasswordChanged}
               />
               <PasswordTextField
                 id='confirmPassword'
@@ -114,7 +114,7 @@ const ChangePasswordForm = ({
                 }
                 label={shared('confirmPassword')}
                 value={passwords.confirmPassword}
-                onChange={handleChange}
+                onChange={handlePasswordChanged}
               />
             </Stack>
             <Stack