diff --git a/app/(payload)/admin/(dashboard)/account/page.tsx b/app/(payload)/admin/(dashboard)/account/page.tsx
index c17fe0a013..1afdd5c12a 100644
--- a/app/(payload)/admin/(dashboard)/account/page.tsx
+++ b/app/(payload)/admin/(dashboard)/account/page.tsx
@@ -1,8 +1,14 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { Account, generateMetadata as generateMeta } from '@payloadcms/next/pages/Account'
+import { Account, generateMetadata as generateMeta } from '@payloadcms/next/pages/Account/index'
 import config from '@payload-config'
 
 export const generateMetadata = async () => generateMeta({ config })
 
-export default ({ searchParams }) => Account({ config, searchParams })
+type Args = {
+  searchParams: { [key: string]: string | string[] }
+}
+
+const Page: React.FC<Args> = ({ searchParams }) => Account({ config, searchParams })
+
+export default Page
diff --git a/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/layout.tsx b/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/layout.tsx
index 1129ec4e0a..2cf34c1c87 100644
--- a/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/layout.tsx
+++ b/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/layout.tsx
@@ -1,11 +1,20 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { DocumentLayout } from '@payloadcms/next/layouts/Document'
+import { DocumentLayout } from '@payloadcms/next/layouts/Document/index'
 import configPromise from '@payload-config'
 
-export default async ({ children, params }: { children: React.ReactNode; params }) => (
+type Args = {
+  children: React.ReactNode
+  params: {
+    collection: string
+  }
+}
+
+const Layout: React.FC<Args> = async ({ children, params }: Args) => (
   <DocumentLayout config={configPromise} collectionSlug={params.collection}>
     {children}
   </DocumentLayout>
 )
+
+export default Layout
diff --git a/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/page.tsx b/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/page.tsx
index e11a1fcd02..9bf326f57f 100644
--- a/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/page.tsx
+++ b/app/(payload)/admin/(dashboard)/collections/[collection]/[...segments]/page.tsx
@@ -1,13 +1,24 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { Document, generateMetadata as generateMeta } from '@payloadcms/next/pages/Document'
+import { Document, generateMetadata as generateMeta } from '@payloadcms/next/pages/Document/index'
 import config from '@payload-config'
 
-export const generateMetadata = async ({ params }) => generateMeta({ config, params })
+type Args = {
+  params: {
+    collection: string
+    global: string
+    segments: string[]
+  }
+  searchParams: { [key: string]: string | string[] }
+}
 
-export default ({ params, searchParams }) =>
+export const generateMetadata = async ({ params }: Args) => generateMeta({ config, params })
+
+const Page: React.FC<Args> = ({ params, searchParams }) =>
   Document({
     params,
     searchParams,
     config,
   })
+
+export default Page
diff --git a/app/(payload)/admin/(dashboard)/collections/[collection]/page.tsx b/app/(payload)/admin/(dashboard)/collections/[collection]/page.tsx
index 0fa74fed4e..60ee4d07ac 100644
--- a/app/(payload)/admin/(dashboard)/collections/[collection]/page.tsx
+++ b/app/(payload)/admin/(dashboard)/collections/[collection]/page.tsx
@@ -1,14 +1,24 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { ListView, generateMetadata as generateMeta } from '@payloadcms/next/pages/List'
+import { ListView, generateMetadata as generateMeta } from '@payloadcms/next/pages/List/index'
 import config from '@payload-config'
 
-export const generateMetadata = async ({ params }) => generateMeta({ config, params })
+type Args = {
+  params: {
+    collection: string
+    [key: string]: string | string[]
+  }
+  searchParams: { [key: string]: string | string[] }
+}
 
-export default ({ params, searchParams }) =>
+export const generateMetadata = async ({ params }: Args) => generateMeta({ config, params })
+
+const Page: React.FC<Args> = ({ params, searchParams }) =>
   ListView({
     collectionSlug: params.collection,
     searchParams,
     config,
-    route: `/collections/${params.collection + (params.segments?.length ? `/${params.segments.join('/')}` : '')}`,
+    route: `/collections/${params.collection + (Array.isArray(params.segments) && params.segments?.length ? `/${params.segments.join('/')}` : '')}`,
   })
+
+export default Page
diff --git a/app/(payload)/admin/(dashboard)/globals/[global]/[[...segments]]/page.tsx b/app/(payload)/admin/(dashboard)/globals/[global]/[[...segments]]/page.tsx
index 29ad7d580c..aee43d7a17 100644
--- a/app/(payload)/admin/(dashboard)/globals/[global]/[[...segments]]/page.tsx
+++ b/app/(payload)/admin/(dashboard)/globals/[global]/[[...segments]]/page.tsx
@@ -1,13 +1,26 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { Document, generateMetadata as generateMeta } from '@payloadcms/next/pages/Document'
+import { Document, generateMetadata as generateMeta } from '@payloadcms/next/pages/Document/index'
 import config from '@payload-config'
 
-export const generateMetadata = async ({ params }) => generateMeta({ config, params })
+type Args = {
+  params: {
+    global?: string
+    collection?: string
+    segments: string[]
+  }
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
 
-export default ({ params, searchParams }) =>
+export const generateMetadata = async ({ params }: Args) => generateMeta({ config, params })
+
+const Page: React.FC<Args> = ({ params, searchParams }) =>
   Document({
     config,
     params,
     searchParams,
   })
+
+export default Page
diff --git a/app/(payload)/admin/(dashboard)/globals/[global]/layout.tsx b/app/(payload)/admin/(dashboard)/globals/[global]/layout.tsx
index e8d9a9441f..bf6ba558b3 100644
--- a/app/(payload)/admin/(dashboard)/globals/[global]/layout.tsx
+++ b/app/(payload)/admin/(dashboard)/globals/[global]/layout.tsx
@@ -1,11 +1,20 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { DocumentLayout } from '@payloadcms/next/layouts/Document'
+import { DocumentLayout } from '@payloadcms/next/layouts/Document/index'
 import configPromise from '@payload-config'
 
-export default async ({ children, params }: { children: React.ReactNode; params }) => (
+type Args = {
+  children: React.ReactNode
+  params: {
+    global: string
+  }
+}
+
+const Layout: React.FC<Args> = async ({ children, params }) => (
   <DocumentLayout config={configPromise} globalSlug={params.global}>
     {children}
   </DocumentLayout>
 )
+
+export default Layout
diff --git a/app/(payload)/admin/(dashboard)/layout.tsx b/app/(payload)/admin/(dashboard)/layout.tsx
index f68b4da4e2..29084e198a 100644
--- a/app/(payload)/admin/(dashboard)/layout.tsx
+++ b/app/(payload)/admin/(dashboard)/layout.tsx
@@ -1,9 +1,11 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { AdminLayout } from '@payloadcms/next/layouts/Admin'
+import { AdminLayout } from '@payloadcms/next/layouts/Admin/index'
 import configPromise from '@payload-config'
 
-export default async ({ children }: { children: React.ReactNode }) => (
+const Layout = async ({ children }: { children: React.ReactNode }) => (
   <AdminLayout config={configPromise}>{children}</AdminLayout>
 )
+
+export default Layout
diff --git a/app/(payload)/admin/(dashboard)/page.tsx b/app/(payload)/admin/(dashboard)/page.tsx
index f316270ca5..9f7e18b6e6 100644
--- a/app/(payload)/admin/(dashboard)/page.tsx
+++ b/app/(payload)/admin/(dashboard)/page.tsx
@@ -1,9 +1,17 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { Dashboard, generateMetadata as generateMeta } from '@payloadcms/next/pages/Dashboard'
+import { Dashboard, generateMetadata as generateMeta } from '@payloadcms/next/pages/Dashboard/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
+type Args = {
+  searchParams: {
+    [key: string]: string | string[]
+  }
+}
+
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async ({ searchParams }) => Dashboard({ config, searchParams })
+const Page: React.FC<Args> = async ({ searchParams }) => Dashboard({ config, searchParams })
+
+export default Page
diff --git a/app/(payload)/admin/create-first-user/page.tsx b/app/(payload)/admin/create-first-user/page.tsx
index 4d2afb2840..71d1cd3f8e 100644
--- a/app/(payload)/admin/create-first-user/page.tsx
+++ b/app/(payload)/admin/create-first-user/page.tsx
@@ -4,10 +4,12 @@ import React from 'react'
 import {
   CreateFirstUser,
   generateMetadata as generateMeta,
-} from '@payloadcms/next/pages/CreateFirstUser'
+} from '@payloadcms/next/pages/CreateFirstUser/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async () => <CreateFirstUser config={config} />
+const Page = async () => <CreateFirstUser config={config} />
+
+export default Page
diff --git a/app/(payload)/admin/forgot/page.tsx b/app/(payload)/admin/forgot/page.tsx
index 036f58ab2f..b1d9e09c4a 100644
--- a/app/(payload)/admin/forgot/page.tsx
+++ b/app/(payload)/admin/forgot/page.tsx
@@ -4,10 +4,12 @@ import React from 'react'
 import {
   ForgotPassword,
   generateMetadata as generateMeta,
-} from '@payloadcms/next/pages/ForgotPassword'
+} from '@payloadcms/next/pages/ForgotPassword/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async () => <ForgotPassword config={config} />
+const Page = async () => <ForgotPassword config={config} />
+
+export default Page
diff --git a/app/(payload)/admin/login/page.tsx b/app/(payload)/admin/login/page.tsx
index 0c1a4f92f3..abf029df6e 100644
--- a/app/(payload)/admin/login/page.tsx
+++ b/app/(payload)/admin/login/page.tsx
@@ -1,10 +1,16 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { Login, generateMetadata as generateMeta } from '@payloadcms/next/pages/Login'
+import { Login, generateMetadata as generateMeta } from '@payloadcms/next/pages/Login/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
+type Args = {
+  searchParams: { [key: string]: string | string[] }
+}
+
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async ({ searchParams }) => <Login config={config} searchParams={searchParams} />
+const Page = async ({ searchParams }: Args) => <Login config={config} searchParams={searchParams} />
+
+export default Page
diff --git a/app/(payload)/admin/logout-inactivity/page.tsx b/app/(payload)/admin/logout-inactivity/page.tsx
index 1edb8e41a0..383722c4e7 100644
--- a/app/(payload)/admin/logout-inactivity/page.tsx
+++ b/app/(payload)/admin/logout-inactivity/page.tsx
@@ -1,12 +1,18 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { Logout, generateMetadata as generateMeta } from '@payloadcms/next/pages/Logout'
+import { Logout, generateMetadata as generateMeta } from '@payloadcms/next/pages/Logout/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
+type Args = {
+  searchParams: { [key: string]: string | string[] }
+}
+
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async ({ searchParams }) => (
+const Page = async ({ searchParams }: Args) => (
   <Logout config={config} searchParams={searchParams} inactivity />
 )
+
+export default Page
diff --git a/app/(payload)/admin/logout/page.tsx b/app/(payload)/admin/logout/page.tsx
index e0b81ec2b3..de4822a15a 100644
--- a/app/(payload)/admin/logout/page.tsx
+++ b/app/(payload)/admin/logout/page.tsx
@@ -1,10 +1,18 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { Logout, generateMetadata as generateMeta } from '@payloadcms/next/pages/Logout'
+import { Logout, generateMetadata as generateMeta } from '@payloadcms/next/pages/Logout/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
+type Args = {
+  searchParams: { [key: string]: string | string[] }
+}
+
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async ({ searchParams }) => <Logout config={config} searchParams={searchParams} />
+const Page = async ({ searchParams }: Args) => (
+  <Logout config={config} searchParams={searchParams} />
+)
+
+export default Page
diff --git a/app/(payload)/admin/reset/[token]/page.tsx b/app/(payload)/admin/reset/[token]/page.tsx
index dede4ba214..5986d09572 100644
--- a/app/(payload)/admin/reset/[token]/page.tsx
+++ b/app/(payload)/admin/reset/[token]/page.tsx
@@ -4,10 +4,16 @@ import React from 'react'
 import {
   ResetPassword,
   generateMetadata as generateMeta,
-} from '@payloadcms/next/pages/ResetPassword'
+} from '@payloadcms/next/pages/ResetPassword/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
+type Args = {
+  params: { [key: string]: string }
+}
+
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async ({ params }) => <ResetPassword config={config} token={params.token} />
+const Page = async ({ params }: Args) => <ResetPassword config={config} token={params.token} />
+
+export default Page
diff --git a/app/(payload)/admin/unauthorized/page.tsx b/app/(payload)/admin/unauthorized/page.tsx
index 3f53a2a9bd..f1cb214c34 100644
--- a/app/(payload)/admin/unauthorized/page.tsx
+++ b/app/(payload)/admin/unauthorized/page.tsx
@@ -1,10 +1,15 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { Unauthorized, generateMetadata as generateMeta } from '@payloadcms/next/pages/Unauthorized'
+import {
+  Unauthorized,
+  generateMetadata as generateMeta,
+} from '@payloadcms/next/pages/Unauthorized/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async () => <Unauthorized config={config} />
+const Page = async () => <Unauthorized config={config} />
+
+export default Page
diff --git a/app/(payload)/admin/verify/[token]/page.tsx b/app/(payload)/admin/verify/[token]/page.tsx
index 03b35a35e1..40ae72dfd8 100644
--- a/app/(payload)/admin/verify/[token]/page.tsx
+++ b/app/(payload)/admin/verify/[token]/page.tsx
@@ -1,10 +1,16 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { Verify, generateMetadata as generateMeta } from '@payloadcms/next/pages/Verify'
+import { Verify, generateMetadata as generateMeta } from '@payloadcms/next/pages/Verify/index'
 import { Metadata } from 'next'
 import config from '@payload-config'
 
+type Args = {
+  params: { [key: string]: string }
+}
+
 export const generateMetadata = async (): Promise<Metadata> => generateMeta({ config })
 
-export default async ({ params }) => <Verify config={config} token={params.token} />
+const Page = async ({ params }: Args) => <Verify config={config} token={params.token} />
+
+export default Page
diff --git a/app/(payload)/layout.tsx b/app/(payload)/layout.tsx
index e957ffafb2..1cc0981e20 100644
--- a/app/(payload)/layout.tsx
+++ b/app/(payload)/layout.tsx
@@ -1,9 +1,11 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
-import { RootLayout } from '@payloadcms/next/layouts/Root'
+import { RootLayout } from '@payloadcms/next/layouts/Root/index'
 import configPromise from '@payload-config'
 
-export default async ({ children }: { children: React.ReactNode }) => (
+const Layout = async ({ children }: { children: React.ReactNode }) => (
   <RootLayout config={configPromise}>{children}</RootLayout>
 )
+
+export default Layout
diff --git a/app/(payload)/page.tsx b/app/(payload)/page.tsx
index bf29bc29f2..21306b5638 100644
--- a/app/(payload)/page.tsx
+++ b/app/(payload)/page.tsx
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { RootPage } from '@payloadcms/next/pages/Root'
+import { RootPage } from '@payloadcms/next/pages/Root/index'
 import config from '@payload-config'
 
-export default () => RootPage({ config })
+const Page = () => RootPage({ config })
+
+export default Page