diff --git a/packages/stack/src/components-page/auth-page.tsx b/packages/stack/src/components-page/auth-page.tsx
index 01757d58f..08f8825b6 100644
--- a/packages/stack/src/components-page/auth-page.tsx
+++ b/packages/stack/src/components-page/auth-page.tsx
@@ -1,13 +1,13 @@
 'use client';
 
-import { CredentialSignInForm } from '../components/credential-sign-in-form';
+import { CredentialSignIn } from '../components/credential-sign-in';
 import { SeparatorWithText } from '../components/elements/separator-with-text';
 import { OAuthButtonGroup } from '../components/oauth-button-group';
 import { MaybeFullPage } from '../components/elements/maybe-full-page';
 import { useUser, useStackApp } from '..';
 import { PredefinedMessageCard } from '../components/message-cards/predefined-message-card';
-import { MagicLinkSignInForm } from '../components/magic-link-sign-in-form';
-import { CredentialSignUpForm } from '../components/credential-sign-up-form';
+import { MagicLinkSignIn } from '../components/magic-link-sign-in';
+import { CredentialSignUp } from '../components/credential-sign-up';
 import { StyledLink, Tabs, TabsContent, TabsList, TabsTrigger, Typography } from '@stackframe/stack-ui';
 import { Project } from '../lib/stack-app';
 
@@ -71,16 +71,16 @@ export function AuthPage({
               <TabsTrigger value='password' className='flex-1'>Password</TabsTrigger>
             </TabsList>
             <TabsContent value='magic-link'>
-              <MagicLinkSignInForm/>
+              <MagicLinkSignIn/>
             </TabsContent>
             <TabsContent value='password'>
-              {type === 'sign-up' ? <CredentialSignUpForm/> : <CredentialSignInForm/>}
+              {type === 'sign-up' ? <CredentialSignUp/> : <CredentialSignIn/>}
             </TabsContent>
           </Tabs>
         ) : project.config.credentialEnabled ? (
-          type === 'sign-up' ? <CredentialSignUpForm/> : <CredentialSignInForm/>
+          type === 'sign-up' ? <CredentialSignUp/> : <CredentialSignIn/>
         ) : project.config.magicLinkEnabled ? (
-          <MagicLinkSignInForm/>
+          <MagicLinkSignIn/>
         ) : null}
       </div>
     </MaybeFullPage>
diff --git a/packages/stack/src/components/credential-sign-in-form.tsx b/packages/stack/src/components/credential-sign-in.tsx
similarity index 98%
rename from packages/stack/src/components/credential-sign-in-form.tsx
rename to packages/stack/src/components/credential-sign-in.tsx
index a87fdc679..79d65764e 100644
--- a/packages/stack/src/components/credential-sign-in-form.tsx
+++ b/packages/stack/src/components/credential-sign-in.tsx
@@ -15,7 +15,7 @@ const schema = yupObject({
   password: yupString().required('Please enter your password')
 });
 
-export function CredentialSignInForm() {
+export function CredentialSignIn() {
   const { register, handleSubmit, setError, formState: { errors } } = useForm({
     resolver: yupResolver(schema)
   });
diff --git a/packages/stack/src/components/credential-sign-up-form.tsx b/packages/stack/src/components/credential-sign-up.tsx
similarity index 98%
rename from packages/stack/src/components/credential-sign-up-form.tsx
rename to packages/stack/src/components/credential-sign-up.tsx
index b1252af31..959bfb464 100644
--- a/packages/stack/src/components/credential-sign-up-form.tsx
+++ b/packages/stack/src/components/credential-sign-up.tsx
@@ -27,7 +27,7 @@ const schema = yupObject({
   passwordRepeat: yupString().nullable().oneOf([yup.ref('password'), "", null], 'Passwords do not match').required('Please repeat your password')
 });
 
-export function CredentialSignUpForm() {
+export function CredentialSignUp() {
   const { register, handleSubmit, setError, formState: { errors }, clearErrors } = useForm({
     resolver: yupResolver(schema)
   });
diff --git a/packages/stack/src/components/magic-link-sign-in-form.tsx b/packages/stack/src/components/magic-link-sign-in.tsx
similarity index 97%
rename from packages/stack/src/components/magic-link-sign-in-form.tsx
rename to packages/stack/src/components/magic-link-sign-in.tsx
index f7ccd4b07..e8a0f93ee 100644
--- a/packages/stack/src/components/magic-link-sign-in-form.tsx
+++ b/packages/stack/src/components/magic-link-sign-in.tsx
@@ -14,7 +14,7 @@ const schema = yupObject({
   email: yupString().email('Please enter a valid email').required('Please enter your email')
 });
 
-export function MagicLinkSignInForm() {
+export function MagicLinkSignIn() {
   const { register, handleSubmit, setError, formState: { errors }, clearErrors } = useForm({
     resolver: yupResolver(schema)
   });
diff --git a/packages/stack/src/index.tsx b/packages/stack/src/index.tsx
index f9cc9a456..b3d289172 100644
--- a/packages/stack/src/index.tsx
+++ b/packages/stack/src/index.tsx
@@ -13,9 +13,9 @@ export { MessageCard } from "./components/message-cards/message-card";
 export { UserButton } from "./components/user-button";
 export { AccountSettings } from "./components-page/account-settings";
 export { AuthPage } from "./components-page/auth-page";
-export { CredentialSignInForm as CredentialSignIn } from "./components/credential-sign-in-form";
-export { CredentialSignUpForm as CredentialSignUp } from "./components/credential-sign-up-form";
-export { MagicLinkSignInForm as MagicLinkSignIn } from "./components/magic-link-sign-in-form";
+export { CredentialSignIn as CredentialSignIn } from "./components/credential-sign-in";
+export { CredentialSignUp as CredentialSignUp } from "./components/credential-sign-up";
+export { MagicLinkSignIn as MagicLinkSignIn } from "./components/magic-link-sign-in";
 export { OAuthButton } from "./components/oauth-button";
 export { OAuthButtonGroup } from "./components/oauth-button-group";