diff --git a/app/(payload)/admin/[[...segments]]/not-found.tsx b/app/(payload)/admin/[[...segments]]/not-found.tsx
index a7d49cffe..e7723f49a 100644
--- a/app/(payload)/admin/[[...segments]]/not-found.tsx
+++ b/app/(payload)/admin/[[...segments]]/not-found.tsx
@@ -3,7 +3,7 @@ import type { Metadata } from 'next'
 
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views.js'
+import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views'
 
 type Args = {
   params: {
diff --git a/app/(payload)/admin/[[...segments]]/page.tsx b/app/(payload)/admin/[[...segments]]/page.tsx
index cd97ec860..61be15c88 100644
--- a/app/(payload)/admin/[[...segments]]/page.tsx
+++ b/app/(payload)/admin/[[...segments]]/page.tsx
@@ -3,7 +3,7 @@ import type { Metadata } from 'next'
 
 import config from '@payload-config'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
-import { RootPage, generatePageMetadata } from '@payloadcms/next/views.js'
+import { RootPage, generatePageMetadata } from '@payloadcms/next/views'
 
 type Args = {
   params: {
diff --git a/app/(payload)/api/[...slug]/route.ts b/app/(payload)/api/[...slug]/route.ts
index c982aa94d..282e1ad32 100644
--- a/app/(payload)/api/[...slug]/route.ts
+++ b/app/(payload)/api/[...slug]/route.ts
@@ -1,7 +1,7 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { REST_DELETE, REST_GET, REST_PATCH, REST_POST } from '@payloadcms/next/routes.js'
+import { REST_DELETE, REST_GET, REST_PATCH, REST_POST } from '@payloadcms/next/routes'
 
 export const GET = REST_GET(config)
 export const POST = REST_POST(config)
diff --git a/app/(payload)/api/graphql-playground/route.ts b/app/(payload)/api/graphql-playground/route.ts
index 997feb241..7b7f27998 100644
--- a/app/(payload)/api/graphql-playground/route.ts
+++ b/app/(payload)/api/graphql-playground/route.ts
@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes.js'
+import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes'
 
 export const GET = GRAPHQL_PLAYGROUND_GET(config)
diff --git a/app/(payload)/api/graphql/route.ts b/app/(payload)/api/graphql/route.ts
index 2b7c41215..c2723e439 100644
--- a/app/(payload)/api/graphql/route.ts
+++ b/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY it because it could be re-written at any time. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes.js'
+import { GRAPHQL_POST } from '@payloadcms/next/routes'
 
 export const POST = GRAPHQL_POST(config)
diff --git a/app/(payload)/layout.tsx b/app/(payload)/layout.tsx
index 18bdb4de3..78db7265e 100644
--- a/app/(payload)/layout.tsx
+++ b/app/(payload)/layout.tsx
@@ -1,6 +1,6 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 import configPromise from '@payload-config'
-import { RootLayout } from '@payloadcms/next/layouts.js'
+import { RootLayout } from '@payloadcms/next/layouts'
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import React from 'react'
 
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 1c52f71df..a5a128f02 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -41,10 +41,7 @@
       "@payloadcms/ui/scss/app.scss": ["../packages/ui/src/scss/app.scss"],
       "payload/types": ["../packages/payload/src/exports/types/index.ts"],
       "@payloadcms/next/*": [
-        "./packages/next/src/exports/*"
-      ],
-      "@payloadcms/next": [
-        "./packages/next/src/exports/*"
+        "./packages/next/src/exports/*.ts"
       ],
       "@payload-config": ["./_community/config.ts"]
     }
diff --git a/tsconfig.json b/tsconfig.json
index 379414e8b..a7865622d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -82,7 +82,7 @@
         "./packages/ui/src/scss/app.scss"
       ],
       "@payloadcms/next/*": [
-        "./packages/next/src/*"
+        "./packages/next/src/exports/*.ts"
       ],
       "@payloadcms/next": [
         "./packages/next/src/exports/*"