diff --git a/src/components/SocialAuth/GitHubButton.tsx b/src/components/AuthenticationFlow/GitHubButton.tsx
similarity index 100%
rename from src/components/SocialAuth/GitHubButton.tsx
rename to src/components/AuthenticationFlow/GitHubButton.tsx
diff --git a/src/components/SocialAuth/GoogleButton.tsx b/src/components/AuthenticationFlow/GoogleButton.tsx
similarity index 100%
rename from src/components/SocialAuth/GoogleButton.tsx
rename to src/components/AuthenticationFlow/GoogleButton.tsx
diff --git a/src/components/RegistrationFlow/TriggerVerifyAccount.tsx b/src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
similarity index 100%
rename from src/components/RegistrationFlow/TriggerVerifyAccount.tsx
rename to src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
diff --git a/src/components/RegistrationFlow/VerificationEmailMessage.tsx b/src/components/AuthenticationFlow/VerificationEmailMessage.tsx
similarity index 100%
rename from src/components/RegistrationFlow/VerificationEmailMessage.tsx
rename to src/components/AuthenticationFlow/VerificationEmailMessage.tsx
diff --git a/src/components/Navigation/Navigation.astro b/src/components/Navigation/Navigation.astro
index a1052d495..bfae19909 100644
--- a/src/components/Navigation/Navigation.astro
+++ b/src/components/Navigation/Navigation.astro
@@ -34,7 +34,7 @@ import AccountDropdown from './AccountDropdown.astro';
           class='flex h-8 w-28 cursor-pointer items-center justify-center rounded-full bg-gradient-to-r from-blue-500 to-blue-700 py-2 px-4 text-sm font-medium text-white hover:from-blue-500 hover:to-blue-600'
           href='/signup'
         >
-          <span>Register</span>
+          <span>Sign Up</span>
         </a>
       </li>
     </ul>
@@ -113,7 +113,7 @@ import AccountDropdown from './AccountDropdown.astro';
             href='/signup'
             class='text-xl text-red-300 hover:text-red-400 md:text-lg'
           >
-            Register
+            Sign Up
           </a>
         </li>
       </ul>
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index 24a2932fb..8e666d370 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -4,13 +4,13 @@ import Divider from '../components/Login/Divider.astro';
 import GoogleLogin from '../components/Login/GoogleLogin.astro';
 import EmailSignupForm from '../components/Login/EmailSignupForm';
 import BaseLayout from '../layouts/BaseLayout.astro';
-import { GitHubButton } from '../components/SocialAuth/GitHubButton';
-import { GoogleButton } from '../components/SocialAuth/GoogleButton';
+import { GitHubButton } from '../components/AuthenticationFlow/GitHubButton';
+import { GoogleButton } from '../components/AuthenticationFlow/GoogleButton';
 ---
 
 <BaseLayout
   title='Signup - roadmap.sh'
-  description='Register yourself to receive occasional emails about new roadmaps, updates, guides and videos'
+  description='Create an account to track your progress, showcase your skillset'
   permalink={'/signup'}
   noIndex={true}
 >
@@ -19,13 +19,12 @@ import { GoogleButton } from '../components/SocialAuth/GoogleButton';
       class='mx-auto flex flex-col items-start justify-start py-12 sm:max-w-[400px] sm:items-center sm:justify-center'
     >
       <div class='mb-2 text-left sm:mb-5 sm:text-center'>
-        <h1 class='mb-2 text-3xl font-semibold sm:mb-4 sm:text-5xl'>Signup</h1>
+        <h1 class='mb-2 text-3xl font-semibold sm:mb-4 sm:text-5xl'>Sign Up</h1>
         <p class='text-md hidden text-gray-600 sm:block'>
-          Register yourself to receive occasional emails about new roadmaps,
-          updates, guides and videos
+          Create an account to track your progress, showcase your skill-set and be a part of the community.
         </p>
-        <p class='block text-sm text-gray-600 sm:hidden'>
-          Register yourself for occasional updates about roadmaps, guides and
+        <p class='block text-sm text-gray-600 mb-3 sm:hidden'>
+          Create an account to track your progress, showcase your skill-set and be a part of the community.
           videos.
         </p>
       </div>
diff --git a/src/pages/verification-pending.astro b/src/pages/verification-pending.astro
index 0a2a9308c..cbce9b146 100644
--- a/src/pages/verification-pending.astro
+++ b/src/pages/verification-pending.astro
@@ -1,6 +1,6 @@
 ---
 import SettingLayout from '../layouts/SettingLayout.astro';
-import { VerificationEmailMessage } from '../components/RegistrationFlow/VerificationEmailMessage';
+import { VerificationEmailMessage } from '../components/AuthenticationFlow/VerificationEmailMessage';
 ---
 
 <SettingLayout title='Verify Email'>
diff --git a/src/pages/verify-account.astro b/src/pages/verify-account.astro
index bd474099f..7bfb581c4 100644
--- a/src/pages/verify-account.astro
+++ b/src/pages/verify-account.astro
@@ -1,5 +1,5 @@
 ---
-import { TriggerVerifyAccount } from '../components/RegistrationFlow/TriggerVerifyAccount';
+import { TriggerVerifyAccount } from '../components/AuthenticationFlow/TriggerVerifyAccount';
 import SettingLayout from '../layouts/SettingLayout.astro';
 ---