diff --git a/src/refactor/masanew.stories.tsx b/src/refactor/masanew.stories.tsx
index f1c62de9..e39bfb99 100644
--- a/src/refactor/masanew.stories.tsx
+++ b/src/refactor/masanew.stories.tsx
@@ -20,10 +20,7 @@ import MasaProvider from './masa-provider';
 import { useSession } from './masa/use-session';
 import { MasaQueryClientContext } from './masa-client/masa-query-client-context';
 
-import {
-  InterfaceAuthenticate,
-  InterfaceCreateIdentity,
-} from './ui/components/modals';
+import { AuthenticateModal, CreateIdentityModal } from './ui/components/modals';
 
 // * nextjs fix
 // * TODO: move this to index.ts file at some point
@@ -475,7 +472,7 @@ const ModalFlow = () => {
         <Button
           type="button"
           disabled={!!hasSession}
-          onClick={() => NiceModal.show(InterfaceAuthenticate)}
+          onClick={() => NiceModal.show(AuthenticateModal)}
         >
           {isDisconnected ? 'Connect' : 'Authenticate'}
         </Button>
@@ -488,7 +485,7 @@ const ModalFlow = () => {
       <li>
         <Button
           type="button"
-          onClick={() => NiceModal.show(InterfaceCreateIdentity)}
+          onClick={() => NiceModal.show(CreateIdentityModal)}
         >
           Create Identity
         </Button>
diff --git a/src/refactor/ui/components/modals/authenticate/authenticate.tsx b/src/refactor/ui/components/modals/authenticate/authenticate.tsx
index 9bbdb71b..3cf09f94 100644
--- a/src/refactor/ui/components/modals/authenticate/authenticate.tsx
+++ b/src/refactor/ui/components/modals/authenticate/authenticate.tsx
@@ -7,7 +7,7 @@ import { useConfig } from '../../../../base-provider';
 import NiceModal, { useModal } from '@ebay/nice-modal-react';
 import { Modal } from '../modal';
 
-export const InterfaceAuthenticate = NiceModal.create((): JSX.Element => {
+export const AuthenticateModal = NiceModal.create((): JSX.Element => {
   const modal = useModal();
 
   const {
diff --git a/src/refactor/ui/components/modals/authenticate/index.tsx b/src/refactor/ui/components/modals/authenticate/index.tsx
index 82843c07..6b883800 100644
--- a/src/refactor/ui/components/modals/authenticate/index.tsx
+++ b/src/refactor/ui/components/modals/authenticate/index.tsx
@@ -1 +1 @@
-export { InterfaceAuthenticate } from './authenticate';
+export { AuthenticateModal } from './authenticate';
diff --git a/src/refactor/ui/components/modals/create-identity/create-identity.tsx b/src/refactor/ui/components/modals/create-identity/create-identity.tsx
index 8099697c..e85be9b6 100644
--- a/src/refactor/ui/components/modals/create-identity/create-identity.tsx
+++ b/src/refactor/ui/components/modals/create-identity/create-identity.tsx
@@ -8,12 +8,12 @@ import { useIdentityPurchase } from '../../../../masa/use-identity-purchase';
 import NiceModal, { useModal } from '@ebay/nice-modal-react';
 import { Modal } from '../modal';
 
-interface InterfaceCreateIdentityProps {
+interface CreateIdentityModalProps {
   handleComplete: () => void;
 }
 
-export const InterfaceCreateIdentity = NiceModal.create(
-  ({ handleComplete }: InterfaceCreateIdentityProps): JSX.Element => {
+export const CreateIdentityModal = NiceModal.create(
+  ({ handleComplete }: CreateIdentityModalProps): JSX.Element => {
     /* const { handlePurchaseIdentity, isLoading, setForcedPage } = useMasa(); */
     const modal = useModal();
     const { company } = useConfig();
diff --git a/src/refactor/ui/components/modals/create-identity/index.tsx b/src/refactor/ui/components/modals/create-identity/index.tsx
index f28b209d..b3da9284 100644
--- a/src/refactor/ui/components/modals/create-identity/index.tsx
+++ b/src/refactor/ui/components/modals/create-identity/index.tsx
@@ -1 +1 @@
-export { InterfaceCreateIdentity } from './create-identity';
+export { CreateIdentityModal } from './create-identity';