diff --git a/packages/web/components/templates/OnboardingLayout2.tsx b/packages/web/components/templates/OnboardingLayout.tsx
similarity index 92%
rename from packages/web/components/templates/OnboardingLayout2.tsx
rename to packages/web/components/templates/OnboardingLayout.tsx
index baeb0697d..18632210a 100644
--- a/packages/web/components/templates/OnboardingLayout2.tsx
+++ b/packages/web/components/templates/OnboardingLayout.tsx
@@ -1,13 +1,13 @@
 import React, { ReactNode } from 'react'
-import { PageMetaData } from '../../components/patterns/PageMetaData'
-import { VStack, HStack, Box } from '../../components/elements/LayoutPrimitives'
-import { OmnivoreNameLogo } from '../../components/elements/images/OmnivoreNameLogo'
-import { StyledText } from '../../components/elements/StyledText'
-import { Button } from '../../components/elements/Button'
+import { PageMetaData } from '../patterns/PageMetaData'
+import { VStack, HStack, Box } from '../elements/LayoutPrimitives'
+import { OmnivoreNameLogo } from '../elements/images/OmnivoreNameLogo'
+import { StyledText } from '../elements/StyledText'
+import { Button } from '../elements/Button'
 
 const TOTAL_ONBOARDING_PAGES = 6
 
-type OnboardingLayout2Props = {
+type OnboardingLayoutProps = {
   pageNumber: number
   title: string
   subTitle: string
@@ -18,7 +18,7 @@ type OnboardingLayout2Props = {
   reduceSpace?: boolean,
 }
 
-const OnboardingLayout2 = ({
+export const OnboardingLayout = ({
   pageNumber,
   title,
   subTitle,
@@ -27,7 +27,7 @@ const OnboardingLayout2 = ({
   children,
   nextPage,
   reduceSpace
-}: OnboardingLayout2Props) => {
+}: OnboardingLayoutProps) => {
   const NextButton = () => (
     <Button
       style="ctaDarkYellow"
@@ -244,4 +244,3 @@ const OnboardingLayout2 = ({
   )
 }
 
-export default OnboardingLayout2
diff --git a/packages/web/components/templates/onboarding/01.tsx b/packages/web/components/templates/onboarding/01.tsx
index e78c504eb..62e5ba531 100644
--- a/packages/web/components/templates/onboarding/01.tsx
+++ b/packages/web/components/templates/onboarding/01.tsx
@@ -1,5 +1,5 @@
 import { SelectionOptionCard } from './SelectOption'
-import OnboardingLayout2 from '../OnboardingLayout2'
+import { OnboardingLayout } from '../OnboardingLayout'
 import { Box, HStack, VStack } from '../../elements/LayoutPrimitives'
 
 const articleDetails = [
@@ -39,7 +39,7 @@ const articleDetails = [
 
 const OnboardingPage1 = () => {
   return (
-    <OnboardingLayout2
+    <OnboardingLayout
       pageNumber={1}
       title="Read Distraction Free"
       subTitle="Omnivore's distraction free reader gives you an uncluttered reading experience"
@@ -74,7 +74,7 @@ const OnboardingPage1 = () => {
           </Box>
         </HStack>
       </VStack>
-    </OnboardingLayout2>
+    </OnboardingLayout>
   )
 }
 
diff --git a/packages/web/components/templates/onboarding/02.tsx b/packages/web/components/templates/onboarding/02.tsx
index f089a4639..1772092ef 100644
--- a/packages/web/components/templates/onboarding/02.tsx
+++ b/packages/web/components/templates/onboarding/02.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import Link from 'next/link'
-import OnboardingLayout2 from '../OnboardingLayout2'
+import { OnboardingLayout } from '../OnboardingLayout'
 import MobileInstallHelp from '../../elements/MobileInstallHelp'
 import ExtensionsInstallHelp from '../../elements/ExtensionsInstallHelp'
 import { StyledAnchor } from '../../elements/StyledText'
@@ -8,7 +8,7 @@ import { Box } from '../../elements/LayoutPrimitives'
 
 const OnboardingPage2 = () => {
   return (
-    <OnboardingLayout2
+    <OnboardingLayout
       pageNumber={2}
       title="Save links to read later"
       subTitle="Save any link to your library using our apps and browser extensions"
@@ -79,7 +79,7 @@ const OnboardingPage2 = () => {
           </Link>
         </Box>
       </Box>
-    </OnboardingLayout2>
+    </OnboardingLayout>
   )
 }
 
diff --git a/packages/web/components/templates/onboarding/03.tsx b/packages/web/components/templates/onboarding/03.tsx
index dd410e3a3..6d5d9074a 100644
--- a/packages/web/components/templates/onboarding/03.tsx
+++ b/packages/web/components/templates/onboarding/03.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { VStack } from '../../elements/LayoutPrimitives'
-import OnboardingLayout2 from '../OnboardingLayout2'
+import { OnboardingLayout } from '../OnboardingLayout'
 import { SelectOption } from './SelectOption'
 
 const optionDetails = [
@@ -32,7 +32,7 @@ const optionDetails = [
 
 const OnboardingPage3 = () => {
   return (
-    <OnboardingLayout2
+    <OnboardingLayout
       subTitle="Omnivore creates an email address for you to subscribe to newsletters with."
       description="Subscribe to some newsletters now"
       title="Read all your Newsletters in Omnivore"
@@ -47,7 +47,7 @@ const OnboardingPage3 = () => {
           <SelectOption key={idx} {...{ icon, label }} />
         ))}
       </VStack>
-    </OnboardingLayout2>
+    </OnboardingLayout>
   )
 }
 
diff --git a/packages/web/components/templates/onboarding/04.tsx b/packages/web/components/templates/onboarding/04.tsx
index 4e038fb89..c35537a59 100644
--- a/packages/web/components/templates/onboarding/04.tsx
+++ b/packages/web/components/templates/onboarding/04.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import OnboardingLayout2 from '../OnboardingLayout2'
+import { OnboardingLayout } from '../OnboardingLayout'
 import { Box } from '../../elements/LayoutPrimitives'
 import { styled } from '../../tokens/stitches.config'
 
@@ -9,7 +9,7 @@ const StyledImage = styled('img', {
 
 const OnboardingPage4 = () => {
   return (
-    <OnboardingLayout2
+    <OnboardingLayout
       pageNumber={4}
       title="Organize all your content"
       subTitle="Information about archiving and tagging
@@ -48,7 +48,7 @@ const OnboardingPage4 = () => {
           }}
         />
       </Box>
-    </OnboardingLayout2>
+    </OnboardingLayout>
   )
 }
 
diff --git a/packages/web/components/templates/onboarding/05.tsx b/packages/web/components/templates/onboarding/05.tsx
index bc7a910ac..a8d0998ce 100644
--- a/packages/web/components/templates/onboarding/05.tsx
+++ b/packages/web/components/templates/onboarding/05.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import OnboardingLayout2 from '../OnboardingLayout2'
+import { OnboardingLayout } from '../OnboardingLayout'
 import { Box } from '../../elements/LayoutPrimitives'
 import { styled } from '../../tokens/stitches.config'
 
@@ -15,7 +15,7 @@ const StyledImage = styled('img', {
 
 const OnboardingPage5 = () => {
   return (
-    <OnboardingLayout2
+    <OnboardingLayout
       pageNumber={5}
       title="Highlight and share"
       subTitle="Information about creating and sharing highlights Amet minim mollit non deserunt ullamco est sit aliqua dolor do amet sint. Velit officia consequat duis enim velit mollit. Exercitation veniam consequat sunt nostrud amet."
@@ -34,7 +34,7 @@ const OnboardingPage5 = () => {
           alt="Highlight And Share"
         />
       </Box>
-    </OnboardingLayout2>
+    </OnboardingLayout>
   )
 }
 
diff --git a/packages/web/components/templates/onboarding/06.tsx b/packages/web/components/templates/onboarding/06.tsx
index 6ec216614..154fafef2 100644
--- a/packages/web/components/templates/onboarding/06.tsx
+++ b/packages/web/components/templates/onboarding/06.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import OnboardingLayout2 from '../OnboardingLayout2'
+import { OnboardingLayout } from '../OnboardingLayout'
 import { Box, HStack, VStack } from '../../elements/LayoutPrimitives'
 import { styled } from '../../tokens/stitches.config'
 
@@ -36,7 +36,7 @@ const Container = styled(Box, {
 
 const OnboardingPage6 = () => {
   return (
-    <OnboardingLayout2
+    <OnboardingLayout
       pageNumber={6}
       title="Join our Community"
       subTitle='Omnivore is open source and open community, join us.'
@@ -67,7 +67,7 @@ const OnboardingPage6 = () => {
           </VStack>
         </Container>
       </HStack>
-    </OnboardingLayout2>
+    </OnboardingLayout>
   )
 }