diff --git a/src/features/ui/components/modal-root.tsx b/src/features/ui/components/modal-root.tsx
index 2f000ef2d..36b099216 100644
--- a/src/features/ui/components/modal-root.tsx
+++ b/src/features/ui/components/modal-root.tsx
@@ -31,7 +31,7 @@ import {
   MissingDescriptionModal,
   MuteModal,
   NostrLoginModal,
-  NostrSigninModal,
+  NostrSignupModal,
   ReactionsModal,
   ReblogsModal,
   ReplyMentionsModal,
@@ -73,7 +73,7 @@ const MODAL_COMPONENTS: Record<string, React.LazyExoticComponent<any>> = {
   'MISSING_DESCRIPTION': MissingDescriptionModal,
   'MUTE': MuteModal,
   'NOSTR_LOGIN': NostrLoginModal,
-  'NOSTR_SIGNIN': NostrSigninModal,
+  'NOSTR_SIGNUP': NostrSignupModal,
   'REACTIONS': ReactionsModal,
   'REBLOGS': ReblogsModal,
   'REPLY_MENTIONS': ReplyMentionsModal,
diff --git a/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx b/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx
index 78dddd33d..38493efe6 100644
--- a/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx
+++ b/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx
@@ -12,7 +12,7 @@ const NostrExtensionIndicator: React.FC = () => {
 
   const onClick = () => {
     dispatch(nostrExtensionLogIn());
-    dispatch(closeModal('NOSTR_SIGNIN'));
+    dispatch(closeModal('NOSTR_SIGNUP'));
   };
 
   return (
diff --git a/src/features/ui/components/modals/nostr-login-modal/nostr-login-modal.tsx b/src/features/ui/components/modals/nostr-login-modal/nostr-login-modal.tsx
index d3aae0a8a..5101cec1c 100644
--- a/src/features/ui/components/modals/nostr-login-modal/nostr-login-modal.tsx
+++ b/src/features/ui/components/modals/nostr-login-modal/nostr-login-modal.tsx
@@ -12,7 +12,7 @@ interface INostrLoginModal {
 const NostrLoginModal: React.FC<INostrLoginModal> = ({ onClose }) => {
   const [step, setStep] = useState<Step>(window.nostr ? 'extension' : 'key-add');
 
-  const handleClose = () => onClose('NOSTR_SIGNIN');
+  const handleClose = () => onClose('NOSTR_SIGNUP');
 
   switch (step) {
     case 'extension':
diff --git a/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx b/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx
index e155ab06b..8144a47cd 100644
--- a/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx
+++ b/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx
@@ -24,17 +24,17 @@ const ExtensionStep: React.FC<IExtensionStep> = ({ setStep, onClose }) => {
   const onClickAlt = () => setStep('key-add');
 
   return (
-    <Modal title={<FormattedMessage id='nostr_signin.siwe.title' defaultMessage='Sign in' />} onClose={onClose}>
+    <Modal title={<FormattedMessage id='NOSTR_SIGNUP.siwe.title' defaultMessage='Sign in' />} onClose={onClose}>
       <Stack space={6}>
         <EmojiGraphic emoji='🔐' />
 
         <Stack space={3}>
           <Button theme='accent' size='lg' onClick={onClick}>
-            <FormattedMessage id='nostr_signin.siwe.action' defaultMessage='Sign in with extension' />
+            <FormattedMessage id='NOSTR_SIGNUP.siwe.action' defaultMessage='Sign in with extension' />
           </Button>
 
           <Button theme='transparent' onClick={onClickAlt}>
-            <FormattedMessage id='nostr_signin.siwe.alt' defaultMessage='Sign in with key' />
+            <FormattedMessage id='NOSTR_SIGNUP.siwe.alt' defaultMessage='Sign in with key' />
           </Button>
         </Stack>
       </Stack>
diff --git a/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx b/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx
index 06ab0c2c5..d1a8c2ac3 100644
--- a/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx
+++ b/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx
@@ -35,7 +35,7 @@ const KeyAddStep: React.FC<IKeyAddStep> = ({ onClose }) => {
   };
 
   return (
-    <Modal title={<FormattedMessage id='nostr_signin.key-add.title' defaultMessage='Import Key' />} onClose={onClose}>
+    <Modal title={<FormattedMessage id='NOSTR_SIGNUP.key-add.title' defaultMessage='Import Key' />} onClose={onClose}>
       <Stack className='my-3' space={6}>
         <NostrExtensionIndicator />
 
diff --git a/src/features/ui/components/modals/nostr-signin-modal/components/emoji-graphic.tsx b/src/features/ui/components/modals/nostr-signup-modal/components/emoji-graphic.tsx
similarity index 100%
rename from src/features/ui/components/modals/nostr-signin-modal/components/emoji-graphic.tsx
rename to src/features/ui/components/modals/nostr-signup-modal/components/emoji-graphic.tsx
diff --git a/src/features/ui/components/modals/nostr-signin-modal/components/nostr-extension-indicator.tsx b/src/features/ui/components/modals/nostr-signup-modal/components/nostr-extension-indicator.tsx
similarity index 96%
rename from src/features/ui/components/modals/nostr-signin-modal/components/nostr-extension-indicator.tsx
rename to src/features/ui/components/modals/nostr-signup-modal/components/nostr-extension-indicator.tsx
index 78dddd33d..38493efe6 100644
--- a/src/features/ui/components/modals/nostr-signin-modal/components/nostr-extension-indicator.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/components/nostr-extension-indicator.tsx
@@ -12,7 +12,7 @@ const NostrExtensionIndicator: React.FC = () => {
 
   const onClick = () => {
     dispatch(nostrExtensionLogIn());
-    dispatch(closeModal('NOSTR_SIGNIN'));
+    dispatch(closeModal('NOSTR_SIGNUP'));
   };
 
   return (
diff --git a/src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx b/src/features/ui/components/modals/nostr-signup-modal/nostr-signup-modal.tsx
similarity index 82%
rename from src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx
rename to src/features/ui/components/modals/nostr-signup-modal/nostr-signup-modal.tsx
index 6865e56ec..18f63ba10 100644
--- a/src/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/nostr-signup-modal.tsx
@@ -6,14 +6,14 @@ import KeygenStep from './steps/keygen-step';
 
 type Step = 'extension' | 'key' | 'keygen';
 
-interface INostrSigninModal {
+interface INostrSignupModal {
   onClose: (type?: string) => void;
 }
 
-const NostrSigninModal: React.FC<INostrSigninModal> = ({ onClose }) => {
+const NostrSigninModal: React.FC<INostrSignupModal> = ({ onClose }) => {
   const [step, setStep] = useState<Step>(window.nostr ? 'extension' : 'key');
 
-  const handleClose = () => onClose('NOSTR_SIGNIN');
+  const handleClose = () => onClose('NOSTR_SIGNUP');
 
   switch (step) {
     case 'extension':
diff --git a/src/features/ui/components/modals/nostr-signin-modal/steps/extension-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/extension-step.tsx
similarity index 82%
rename from src/features/ui/components/modals/nostr-signin-modal/steps/extension-step.tsx
rename to src/features/ui/components/modals/nostr-signup-modal/steps/extension-step.tsx
index 42bfb4d04..d1f7e9ab8 100644
--- a/src/features/ui/components/modals/nostr-signin-modal/steps/extension-step.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/steps/extension-step.tsx
@@ -6,7 +6,7 @@ import { Button, Stack, Modal } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
 
 import EmojiGraphic from '../components/emoji-graphic';
-import { Step } from '../nostr-signin-modal';
+import { Step } from '../nostr-signup-modal';
 
 interface IExtensionStep {
   setStep: (step: Step) => void;
@@ -24,17 +24,17 @@ const ExtensionStep: React.FC<IExtensionStep> = ({ setStep, onClose }) => {
   const onClickAlt = () => setStep('key');
 
   return (
-    <Modal title={<FormattedMessage id='nostr_signin.siwe.title' defaultMessage='Sign in' />} onClose={onClose}>
+    <Modal title={<FormattedMessage id='NOSTR_SIGNUP.siwe.title' defaultMessage='Sign in' />} onClose={onClose}>
       <Stack space={6}>
         <EmojiGraphic emoji='🔐' />
 
         <Stack space={3}>
           <Button theme='accent' size='lg' onClick={onClick}>
-            <FormattedMessage id='nostr_signin.siwe.action' defaultMessage='Sign in with extension' />
+            <FormattedMessage id='NOSTR_SIGNUP.siwe.action' defaultMessage='Sign in with extension' />
           </Button>
 
           <Button theme='transparent' onClick={onClickAlt}>
-            <FormattedMessage id='nostr_signin.siwe.alt' defaultMessage='Sign in with key' />
+            <FormattedMessage id='NOSTR_SIGNUP.siwe.alt' defaultMessage='Sign in with key' />
           </Button>
         </Stack>
       </Stack>
diff --git a/src/features/ui/components/modals/nostr-signin-modal/steps/key-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx
similarity index 91%
rename from src/features/ui/components/modals/nostr-signin-modal/steps/key-step.tsx
rename to src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx
index 73a71e501..f4631adb7 100644
--- a/src/features/ui/components/modals/nostr-signin-modal/steps/key-step.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx
@@ -7,7 +7,7 @@ import { useAppDispatch } from 'soapbox/hooks';
 
 import EmojiGraphic from '../components/emoji-graphic';
 import NostrExtensionIndicator from '../components/nostr-extension-indicator';
-import { Step } from '../nostr-signin-modal';
+import { Step } from '../nostr-signup-modal';
 
 interface IKeyStep {
   setStep(step: Step): void;
@@ -23,7 +23,7 @@ const KeyStep: React.FC<IKeyStep> = ({ setStep, onClose }) => {
   };
 
   return (
-    <Modal title={<FormattedMessage id='nostr_signin.key.title' defaultMessage='You need a key to continue' />} onClose={onClose}>
+    <Modal title={<FormattedMessage id='NOSTR_SIGNUP.key.title' defaultMessage='You need a key to continue' />} onClose={onClose}>
       <Stack className='my-3' space={6}>
         <NostrExtensionIndicator />
 
diff --git a/src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
similarity index 97%
rename from src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx
rename to src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
index b024b2356..8c472aea8 100644
--- a/src/features/ui/components/modals/nostr-signin-modal/steps/keygen-step.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
@@ -46,7 +46,7 @@ const KeygenStep: React.FC<IKeygenStep> = ({ onClose }) => {
   };
 
   return (
-    <Modal title={<FormattedMessage id='nostr_signin.keygen.title' defaultMessage='Your new key' />} onClose={onClose}>
+    <Modal title={<FormattedMessage id='NOSTR_SIGNUP.keygen.title' defaultMessage='Your new key' />} onClose={onClose}>
       <Stack className='my-3' space={9}>
         <EmojiGraphic emoji='🔑' />
 
diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx
index 059fa9d19..203c84987 100644
--- a/src/features/ui/components/panels/sign-up-panel.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.tsx
@@ -25,7 +25,7 @@ const SignUpPanel = () => {
         </Text>
       </Stack>
 
-      <Button theme='primary' block onClick={() => dispatch(openModal('NOSTR_SIGNIN'))}>
+      <Button theme='primary' block onClick={() => dispatch(openModal('NOSTR_SIGNUP'))}>
         <FormattedMessage id='account.register' defaultMessage='Sign up' />
       </Button>
     </Stack>
diff --git a/src/features/ui/util/async-components.ts b/src/features/ui/util/async-components.ts
index 26e86a1ce..1364a89f2 100644
--- a/src/features/ui/util/async-components.ts
+++ b/src/features/ui/util/async-components.ts
@@ -162,5 +162,5 @@ export const EditAnnouncementModal = lazy(() => import('soapbox/features/ui/comp
 export const FollowedTags = lazy(() => import('soapbox/features/followed-tags'));
 export const AccountNotePanel = lazy(() => import('soapbox/features/ui/components/panels/account-note-panel'));
 export const ComposeEditor = lazy(() => import('soapbox/features/compose/editor'));
-export const NostrSigninModal = lazy(() => import('soapbox/features/ui/components/modals/nostr-signin-modal/nostr-signin-modal'));
+export const NostrSignupModal = lazy(() => import('soapbox/features/ui/components/modals/nostr-signup-modal/nostr-signup-modal'));
 export const NostrLoginModal = lazy(() => import('soapbox/features/ui/components/modals/nostr-login-modal/nostr-login-modal'));