diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/app/ReactDevOverlay.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/app/react-dev-overlay.tsx
similarity index 85%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/app/ReactDevOverlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/app/react-dev-overlay.tsx
index bd9b1801088b..f77774307914 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/app/ReactDevOverlay.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/app/react-dev-overlay.tsx
@@ -3,13 +3,13 @@ import type { Dispatcher } from '../../app/hot-reloader-client'
 
 import React from 'react'
 
-import { ShadowPortal } from '../internal/components/ShadowPortal'
-import { BuildError } from '../internal/container/BuildError'
-import { Errors } from '../internal/container/Errors'
-import { Base } from '../internal/styles/Base'
-import { ComponentStyles } from '../internal/styles/ComponentStyles'
-import { CssReset } from '../internal/styles/CssReset'
-import { RootLayoutMissingTagsError } from '../internal/container/RootLayoutMissingTagsError'
+import { ShadowPortal } from '../internal/components/shadow-portal'
+import { BuildError } from '../internal/container/build-error'
+import { Errors } from '../internal/container/errors'
+import { Base } from '../internal/styles/base'
+import { ComponentStyles } from '../internal/styles/component-styles'
+import { CssReset } from '../internal/styles/css-reset'
+import { RootLayoutMissingTagsError } from '../internal/container/root-layout-missing-tags-error'
 import { RuntimeErrorHandler } from '../internal/helpers/runtime-error-handler'
 import { Colors } from '../internal/styles/colors'
 
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/index.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/index.ts
deleted file mode 100644
index 38886ddcaad6..000000000000
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { Dialog } from './Dialog'
-export { DialogBody } from './DialogBody'
-export { DialogContent } from './DialogContent'
-export { DialogHeader } from './DialogHeader'
-export { DialogFooter } from './dialog-footer'
-export { styles } from './styles'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/index.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/index.tsx
deleted file mode 100644
index 9f8311327322..000000000000
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { Overlay } from './Overlay'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/index.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/index.tsx
deleted file mode 100644
index c3867226079a..000000000000
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { Terminal } from './Terminal'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/CodeFrame/CodeFrame.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/code-frame/code-frame.stories.tsx
similarity index 97%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/CodeFrame/CodeFrame.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/code-frame/code-frame.stories.tsx
index f6f71f84b130..2cab24730322 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/CodeFrame/CodeFrame.stories.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/code-frame/code-frame.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { CodeFrame } from './CodeFrame'
+import { CodeFrame } from './code-frame'
 import { withShadowPortal } from '../../storybook/with-shadow-portal'
 
 const meta: Meta<typeof CodeFrame> = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/CodeFrame/CodeFrame.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/code-frame/code-frame.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/CodeFrame/CodeFrame.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/code-frame/code-frame.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/DialogBody.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-body.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/DialogBody.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-body.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/DialogContent.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-content.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/DialogContent.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-content.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/dialog-footer.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-footer.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/dialog-footer.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-footer.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/DialogHeader.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-header.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/DialogHeader.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog-header.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/Dialog.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/Dialog.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/dialog.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/index.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/index.ts
new file mode 100644
index 000000000000..4f8e1be7d846
--- /dev/null
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/index.ts
@@ -0,0 +1,6 @@
+export { Dialog } from './dialog'
+export { DialogBody } from './dialog-body'
+export { DialogContent } from './dialog-content'
+export { DialogHeader } from './dialog-header'
+export { DialogFooter } from './dialog-footer'
+export { styles } from './styles'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/styles.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/styles.ts
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Dialog/styles.ts
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/dialog/styles.ts
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/call-stack/call-stack.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/call-stack/call-stack.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/call-stack/call-stack.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/call-stack/call-stack.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/call-stack/call-stack.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/call-stack/call-stack.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/call-stack/call-stack.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/call-stack/call-stack.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/dev-tools-indicator.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/dev-tools-indicator.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/dev-tools-indicator.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/dev-tools-indicator.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/dev-tools-indicator.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/dev-tools-indicator.tsx
similarity index 99%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/dev-tools-indicator.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/dev-tools-indicator.tsx
index e95dd8cef3ce..3bd781657aec 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/dev-tools-indicator.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/dev-tools-indicator.tsx
@@ -1,6 +1,6 @@
 import type { VersionInfo } from '../../../../../../../../server/dev/parse-version-info'
 import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
-import { Toast } from '../../Toast'
+import { Toast } from '../../toast'
 import React, { useState, useEffect, useRef } from 'react'
 import { NextLogo } from './internal/next-logo'
 import { useIsDevBuilding } from '../../../../../../../dev/dev-build-indicator/internal/initialize-for-new-overlay'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/dev-render-indicator.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/dev-render-indicator.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/dev-render-indicator.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/dev-render-indicator.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/next-logo.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/next-logo.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/next-logo.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/next-logo.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/next-logo.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/next-logo.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/next-logo.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/next-logo.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/use-sync-dev-render-indicator-internal.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/use-sync-dev-render-indicator-internal.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/internal/use-sync-dev-render-indicator-internal.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/internal/use-sync-dev-render-indicator-internal.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/styles.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/styles.ts
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/styles.ts
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/styles.ts
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/use-sync-dev-render-indicator.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/use-sync-dev-render-indicator.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/use-sync-dev-render-indicator.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/use-sync-dev-render-indicator.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/body.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/body.tsx
similarity index 90%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/body.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/body.tsx
index 2a9e7209ac7d..bfdb569eaf5c 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/body.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/body.tsx
@@ -1,5 +1,5 @@
 import { noop as css } from '../../../helpers/noop-template'
-import { DialogBody } from '../../Dialog'
+import { DialogBody } from '../../dialog'
 
 type ErrorOverlayDialogBodyProps = {
   children?: React.ReactNode
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/dialog.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/dialog.tsx
similarity index 96%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/dialog.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/dialog.tsx
index 08fce3fce5d7..16e9ce79ea59 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/dialog.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/dialog.tsx
@@ -1,4 +1,4 @@
-import { Dialog } from '../../Dialog/Dialog'
+import { Dialog } from '../../dialog/dialog'
 import { noop as css } from '../../../helpers/noop-template'
 
 type ErrorOverlayDialogProps = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/header.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/header.tsx
similarity index 96%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/header.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/header.tsx
index 06aefec1332d..c26b0349a54f 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/dialog/header.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/dialog/header.tsx
@@ -1,4 +1,4 @@
-import { DialogHeader } from '../../Dialog/DialogHeader'
+import { DialogHeader } from '../../dialog/dialog-header'
 import { noop as css } from '../../../helpers/noop-template'
 
 type ErrorOverlayDialogHeaderProps = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-message/error-message.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-message/error-message.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-message/error-message.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-message/error-message.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-message/error-message.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-message/error-message.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-message/error-message.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-message/error-message.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-floating-header/error-overlay-floating-header.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-floating-header/error-overlay-floating-header.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-floating-header/error-overlay-floating-header.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-floating-header/error-overlay-floating-header.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-floating-header/error-overlay-floating-header.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-floating-header/error-overlay-floating-header.tsx
similarity index 94%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-floating-header/error-overlay-floating-header.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-floating-header/error-overlay-floating-header.tsx
index 1344277b95e5..b498f0ccb5d0 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-floating-header/error-overlay-floating-header.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-floating-header/error-overlay-floating-header.tsx
@@ -2,7 +2,7 @@ import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
 import type { VersionInfo } from '../../../../../../../../server/dev/parse-version-info'
 
 import { ErrorOverlayPagination } from '../error-overlay-pagination/error-overlay-pagination'
-import { VersionStalenessInfo } from '../../VersionStalenessInfo/VersionStalenessInfo'
+import { VersionStalenessInfo } from '../../version-staleness-info/version-staleness-info'
 import { noop as css } from '../../../helpers/noop-template'
 
 type ErrorOverlayFloatingHeaderProps = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-feedback/error-feedback.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-footer/error-feedback/error-feedback.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-feedback/error-feedback.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-footer/error-feedback/error-feedback.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-overlay-footer.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-footer/error-overlay-footer.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-footer/error-overlay-footer.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-footer/error-overlay-footer.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.test.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.test.tsx
similarity index 98%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.test.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.test.tsx
index 6d35173ae953..3328d98aa8ae 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.test.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.test.tsx
@@ -7,7 +7,7 @@ import { ErrorOverlayLayout } from './error-overlay-layout'
 import '@testing-library/jest-dom'
 
 // Mock maintain--tab-focus module
-jest.mock('../../../components/Overlay/maintain--tab-focus', () => ({
+jest.mock('../../../components/overlay/maintain--tab-focus', () => ({
   __esModule: true,
   default: jest.fn(() => ({
     disengage: jest.fn(),
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.tsx
similarity index 98%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.tsx
index a7d4aabdfb20..081757496904 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-layout/error-overlay-layout.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-layout/error-overlay-layout.tsx
@@ -4,7 +4,7 @@ import type { VersionInfo } from '../../../../../../../../server/dev/parse-versi
 import type { ErrorMessageType } from '../error-message/error-message'
 import type { ErrorType } from '../error-type-label/error-type-label'
 
-import { DialogContent, DialogFooter } from '../../Dialog'
+import { DialogContent, DialogFooter } from '../../dialog'
 import {
   ErrorOverlayToolbar,
   styles as toolbarStyles,
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-pagination/error-overlay-pagination.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-pagination/error-overlay-pagination.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-pagination/error-overlay-pagination.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx
similarity index 98%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-pagination/error-overlay-pagination.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx
index 1360c6bcc8d2..d5f2dc6f185b 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-pagination/error-overlay-pagination.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-pagination/error-overlay-pagination.tsx
@@ -2,8 +2,8 @@ import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
 
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { noop as css } from '../../../helpers/noop-template'
-import { LeftArrow } from '../../../icons/LeftArrow'
-import { RightArrow } from '../../../icons/RightArrow'
+import { LeftArrow } from '../../../icons/left-arrow'
+import { RightArrow } from '../../../icons/right-arrow'
 
 type ErrorPaginationProps = {
   readyErrors: ReadyRuntimeError[]
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/copy-stack-trace-button.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/copy-stack-trace-button.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/copy-stack-trace-button.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/copy-stack-trace-button.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/copy-stack-trace-button.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/copy-stack-trace-button.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/copy-stack-trace-button.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/copy-stack-trace-button.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/docs-link-button.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/docs-link-button.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/docs-link-button.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/docs-link-button.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/docs-link-button.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/docs-link-button.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/docs-link-button.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/docs-link-button.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/error-overlay-toolbar.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/error-overlay-toolbar.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/error-overlay-toolbar.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/error-overlay-toolbar.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/error-overlay-toolbar.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/error-overlay-toolbar.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/error-overlay-toolbar.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/error-overlay-toolbar.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/nodejs-inspector-button.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/nodejs-inspector-button.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/nodejs-inspector-button.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/nodejs-inspector-button.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/nodejs-inspector-button.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/nodejs-inspector-button.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-overlay-toolbar/nodejs-inspector-button.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-overlay-toolbar/nodejs-inspector-button.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-type-label/error-type-label.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-type-label/error-type-label.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-type-label/error-type-label.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-type-label/error-type-label.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-type-label/error-type-label.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-type-label/error-type-label.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/error-type-label/error-type-label.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/error-type-label/error-type-label.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/overlay/overlay.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/overlay/overlay.tsx
similarity index 82%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/overlay/overlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/overlay/overlay.tsx
index 4df3f15dca01..36ff47aa4281 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Errors/overlay/overlay.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/errors/overlay/overlay.tsx
@@ -1,5 +1,5 @@
 import { noop as css } from '../../../helpers/noop-template'
-import { Overlay, type OverlayProps } from '../../Overlay/Overlay'
+import { Overlay, type OverlayProps } from '../../overlay/overlay'
 
 export function ErrorOverlayOverlay({ children, ...props }: OverlayProps) {
   return <Overlay {...props}>{children}</Overlay>
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/body-locker.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/body-locker.ts
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/body-locker.ts
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/body-locker.ts
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/index.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/index.tsx
new file mode 100644
index 000000000000..73162459e38f
--- /dev/null
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/index.tsx
@@ -0,0 +1 @@
+export { Overlay } from './overlay'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/maintain--tab-focus.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/maintain--tab-focus.ts
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/maintain--tab-focus.ts
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/maintain--tab-focus.ts
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/Overlay.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/overlay.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/Overlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/overlay.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/styles.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/styles.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Overlay/styles.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/overlay/styles.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/ShadowPortal.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/shadow-portal.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/ShadowPortal.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/shadow-portal.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/EditorLink.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/editor-link.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/EditorLink.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/editor-link.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/index.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/index.tsx
new file mode 100644
index 000000000000..5dd47218ab59
--- /dev/null
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/index.tsx
@@ -0,0 +1 @@
+export { Terminal } from './terminal'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/terminal.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/terminal.stories.tsx
similarity index 96%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/terminal.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/terminal.stories.tsx
index b32ec6077ff4..bbc6e9628927 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/terminal.stories.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/terminal.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { Terminal } from './Terminal'
+import { Terminal } from './terminal'
 import { withShadowPortal } from '../../storybook/with-shadow-portal'
 
 const meta: Meta<typeof Terminal> = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/Terminal.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/terminal.tsx
similarity index 99%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/Terminal.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/terminal.tsx
index af2bdb0a31b3..9b9948924e8d 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Terminal/Terminal.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/terminal/terminal.tsx
@@ -1,7 +1,7 @@
 import Anser from 'next/dist/compiled/anser'
 import * as React from 'react'
 import { HotlinkedText } from '../hot-linked-text'
-import { EditorLink } from './EditorLink'
+import { EditorLink } from './editor-link'
 import { ExternalIcon } from '../../icons/external'
 import { noop as css } from '../../helpers/noop-template'
 import { getFrameSource } from '../../helpers/stack-frame'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/index.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/index.tsx
similarity index 51%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/index.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/index.tsx
index c18a7f792c94..5c16163ab9dd 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/index.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/index.tsx
@@ -1,2 +1,2 @@
 export { styles } from './styles'
-export { Toast } from './Toast'
+export { Toast } from './toast'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/styles.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/styles.ts
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/styles.ts
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/styles.ts
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/Toast.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/toast.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/Toast/Toast.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/toast/toast.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/VersionStalenessInfo/version-staleness-info.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/version-staleness-info/version-staleness-info.stories.tsx
similarity index 96%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/VersionStalenessInfo/version-staleness-info.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/version-staleness-info/version-staleness-info.stories.tsx
index 5e2b384a0288..8353d4823025 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/VersionStalenessInfo/version-staleness-info.stories.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/version-staleness-info/version-staleness-info.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { VersionStalenessInfo } from './VersionStalenessInfo'
+import { VersionStalenessInfo } from './version-staleness-info'
 import { withShadowPortal } from '../../storybook/with-shadow-portal'
 
 const meta: Meta<typeof VersionStalenessInfo> = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/VersionStalenessInfo/VersionStalenessInfo.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/version-staleness-info/version-staleness-info.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/VersionStalenessInfo/VersionStalenessInfo.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/components/version-staleness-info/version-staleness-info.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/BuildError.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/build-error.stories.tsx
similarity index 95%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/BuildError.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/build-error.stories.tsx
index 6b60b3b3b0fe..0edfcfd427a9 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/BuildError.stories.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/build-error.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { BuildError } from './BuildError'
+import { BuildError } from './build-error'
 import { withShadowPortal } from '../storybook/with-shadow-portal'
 
 const meta: Meta<typeof BuildError> = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/BuildError.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/build-error.tsx
similarity index 88%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/BuildError.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/build-error.tsx
index f7544818eb56..597ce6a830c7 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/BuildError.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/build-error.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react'
 import type { VersionInfo } from '../../../../../../server/dev/parse-version-info'
-import { Terminal } from '../components/Terminal'
+import { Terminal } from '../components/terminal'
 import { noop as css } from '../helpers/noop-template'
-import { ErrorOverlayLayout } from '../components/Errors/error-overlay-layout/error-overlay-layout'
+import { ErrorOverlayLayout } from '../components/errors/error-overlay-layout/error-overlay-layout'
 
 export type BuildErrorProps = {
   message: string
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.stories.tsx
similarity index 98%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.stories.tsx
index 04490fa81511..1aa85b2329a0 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.stories.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { Errors } from './Errors'
+import { Errors } from './errors'
 import { withShadowPortal } from '../storybook/with-shadow-portal'
 import { ACTION_UNHANDLED_ERROR } from '../../../shared'
 
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.tsx
similarity index 97%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.tsx
index ebfcf0710663..60294c556799 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/Errors.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/errors.tsx
@@ -6,15 +6,15 @@ import {
   type UnhandledRejectionAction,
 } from '../../../shared'
 import type { DebugInfo } from '../../../types'
-import { Overlay } from '../components/Overlay'
+import { Overlay } from '../components/overlay'
 import { getErrorByType } from '../helpers/get-error-by-type'
 import type { ReadyRuntimeError } from '../helpers/get-error-by-type'
 import { noop as css } from '../helpers/noop-template'
-import { RuntimeError } from './RuntimeError'
+import { RuntimeError } from './runtime-error'
 import type { VersionInfo } from '../../../../../../server/dev/parse-version-info'
 import { getErrorSource } from '../../../../../../shared/lib/error-source'
 import { HotlinkedText } from '../components/hot-linked-text'
-import { PseudoHtmlDiff } from './RuntimeError/component-stack-pseudo-html'
+import { PseudoHtmlDiff } from './runtime-error/component-stack-pseudo-html'
 import {
   type HydrationErrorState,
   getHydrationWarningType,
@@ -24,8 +24,8 @@ import {
   isUnhandledConsoleOrRejection,
 } from '../../../../errors/console-error'
 import { extractNextErrorCode } from '../../../../../../lib/error-telemetry-utils'
-import { DevToolsIndicator } from '../components/Errors/dev-tools-indicator/dev-tools-indicator'
-import { ErrorOverlayLayout } from '../components/Errors/error-overlay-layout/error-overlay-layout'
+import { DevToolsIndicator } from '../components/errors/dev-tools-indicator/dev-tools-indicator'
+import { ErrorOverlayLayout } from '../components/errors/error-overlay-layout/error-overlay-layout'
 import { useKeyboardShortcut } from '../hooks/use-keyboard-shortcut'
 import { MODIFIERS } from '../hooks/use-keyboard-shortcut'
 
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RootLayoutMissingTagsError.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/root-layout-missing-tags-error.stories.tsx
similarity index 91%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RootLayoutMissingTagsError.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/root-layout-missing-tags-error.stories.tsx
index 5642d1689453..c9df956e9318 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RootLayoutMissingTagsError.stories.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/root-layout-missing-tags-error.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
-import { RootLayoutMissingTagsError } from './RootLayoutMissingTagsError'
+import { RootLayoutMissingTagsError } from './root-layout-missing-tags-error'
 import { withShadowPortal } from '../storybook/with-shadow-portal'
 
 const meta: Meta<typeof RootLayoutMissingTagsError> = {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RootLayoutMissingTagsError.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/root-layout-missing-tags-error.tsx
similarity index 93%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RootLayoutMissingTagsError.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/root-layout-missing-tags-error.tsx
index bdbba514da22..679740752f67 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RootLayoutMissingTagsError.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/root-layout-missing-tags-error.tsx
@@ -1,7 +1,7 @@
 import type { VersionInfo } from '../../../../../../server/dev/parse-version-info'
 import { useCallback } from 'react'
 import { HotlinkedText } from '../components/hot-linked-text'
-import { ErrorOverlayLayout } from '../components/Errors/error-overlay-layout/error-overlay-layout'
+import { ErrorOverlayLayout } from '../components/errors/error-overlay-layout/error-overlay-layout'
 
 type RootLayoutMissingTagsErrorProps = {
   missingTags: string[]
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/component-stack-pseudo-html.stories.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/component-stack-pseudo-html.stories.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/component-stack-pseudo-html.stories.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/component-stack-pseudo-html.stories.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/component-stack-pseudo-html.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/component-stack-pseudo-html.tsx
similarity index 99%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/component-stack-pseudo-html.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/component-stack-pseudo-html.tsx
index f340fd9c7499..8f9de819d59b 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/component-stack-pseudo-html.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/component-stack-pseudo-html.tsx
@@ -1,6 +1,6 @@
 import { useMemo, Fragment, useState } from 'react'
 import type { ComponentStackFrame } from '../../helpers/parse-component-stack'
-import { CollapseIcon } from '../../icons/CollapseIcon'
+import { CollapseIcon } from '../../icons/collapse-icon'
 import { noop as css } from '../../helpers/noop-template'
 
 function getAdjacentProps(isAdj: boolean) {
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/index.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/index.tsx
similarity index 88%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/index.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/index.tsx
index d03007520ea2..61f5576e4b6f 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/RuntimeError/index.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/container/runtime-error/index.tsx
@@ -1,8 +1,8 @@
 import type { ReadyRuntimeError } from '../../helpers/get-error-by-type'
 
 import { useMemo } from 'react'
-import { CodeFrame } from '../../components/CodeFrame/CodeFrame'
-import { CallStack } from '../../components/Errors/call-stack/call-stack'
+import { CodeFrame } from '../../components/code-frame/code-frame'
+import { CallStack } from '../../components/errors/call-stack/call-stack'
 import { noop as css } from '../../helpers/noop-template'
 import { PSEUDO_HTML_DIFF_STYLES } from './component-stack-pseudo-html'
 
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/get-error-by-type.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/get-error-by-type.ts
index 3521f27d6ece..d3a9d2eb8809 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/get-error-by-type.ts
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/get-error-by-type.ts
@@ -2,7 +2,7 @@ import {
   ACTION_UNHANDLED_ERROR,
   ACTION_UNHANDLED_REJECTION,
 } from '../../../shared'
-import type { SupportedErrorEvent } from '../container/Errors'
+import type { SupportedErrorEvent } from '../container/errors'
 import { getOriginalStackFrames } from './stack-frame'
 import type { OriginalStackFrame } from './stack-frame'
 import type { ComponentStackFrame } from './parse-component-stack'
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/launchEditor.ts b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/launch-editor.ts
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/launchEditor.ts
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/helpers/launch-editor.ts
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/CloseIcon.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/close-icon.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/CloseIcon.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/close-icon.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/CollapseIcon.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/collapse-icon.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/CollapseIcon.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/collapse-icon.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/LeftArrow.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/left-arrow.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/LeftArrow.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/left-arrow.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/LightningBolt.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/lightning-bolt.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/LightningBolt.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/lightning-bolt.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/RightArrow.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/right-arrow.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/RightArrow.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/icons/right-arrow.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/storybook/with-shadow-portal.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/storybook/with-shadow-portal.tsx
index f36c0c363183..096f8bfec4a8 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/storybook/with-shadow-portal.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/storybook/with-shadow-portal.tsx
@@ -1,8 +1,8 @@
-import { Base } from '../styles/Base'
+import { Base } from '../styles/base'
 import { Colors } from '../styles/colors'
-import { CssReset } from '../styles/CssReset'
-import { ComponentStyles } from '../styles/ComponentStyles'
-import { ShadowPortal } from '../components/ShadowPortal'
+import { CssReset } from '../styles/css-reset'
+import { ComponentStyles } from '../styles/component-styles'
+import { ShadowPortal } from '../components/shadow-portal'
 
 export const withShadowPortal = (Story: any) => (
   <ShadowPortal>
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/Base.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/base.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/Base.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/base.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/ComponentStyles.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/component-styles.tsx
similarity index 51%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/ComponentStyles.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/component-styles.tsx
index 9f4198006e24..728cdd9ce756 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/ComponentStyles.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/component-styles.tsx
@@ -1,21 +1,21 @@
-import { CODE_FRAME_STYLES } from '../components/CodeFrame/CodeFrame'
-import { styles as dialog } from '../components/Dialog'
-import { styles as errorLayout } from '../components/Errors/error-overlay-layout/error-overlay-layout'
-import { styles as bottomStacks } from '../components/Errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks'
-import { styles as pagination } from '../components/Errors/error-overlay-pagination/error-overlay-pagination'
-import { styles as overlay } from '../components/Overlay/styles'
-import { styles as footer } from '../components/Errors/error-overlay-footer/error-overlay-footer'
-import { TERMINAL_STYLES } from '../components/Terminal/Terminal'
-import { styles as toast } from '../components/Toast'
-import { styles as versionStaleness } from '../components/VersionStalenessInfo/VersionStalenessInfo'
-import { styles as buildErrorStyles } from '../container/BuildError'
-import { styles as containerErrorStyles } from '../container/Errors'
-import { styles as containerRuntimeErrorStyles } from '../container/RuntimeError'
+import { CODE_FRAME_STYLES } from '../components/code-frame/code-frame'
+import { styles as dialog } from '../components/dialog'
+import { styles as errorLayout } from '../components/errors/error-overlay-layout/error-overlay-layout'
+import { styles as bottomStacks } from '../components/errors/error-overlay-bottom-stacks/error-overlay-bottom-stacks'
+import { styles as pagination } from '../components/errors/error-overlay-pagination/error-overlay-pagination'
+import { styles as overlay } from '../components/overlay/styles'
+import { styles as footer } from '../components/errors/error-overlay-footer/error-overlay-footer'
+import { TERMINAL_STYLES } from '../components/terminal/terminal'
+import { styles as toast } from '../components/toast'
+import { styles as versionStaleness } from '../components/version-staleness-info/version-staleness-info'
+import { styles as buildErrorStyles } from '../container/build-error'
+import { styles as containerErrorStyles } from '../container/errors'
+import { styles as containerRuntimeErrorStyles } from '../container/runtime-error'
 import { COPY_BUTTON_STYLES } from '../components/copy-button'
 import { CALL_STACK_FRAME_STYLES } from '../components/call-stack-frame/call-stack-frame'
-import { styles as devToolsIndicator } from '../components/Errors/dev-tools-indicator/styles'
+import { styles as devToolsIndicator } from '../components/errors/dev-tools-indicator/styles'
 import { noop as css } from '../helpers/noop-template'
-import { EDITOR_LINK_STYLES } from '../components/Terminal/EditorLink'
+import { EDITOR_LINK_STYLES } from '../components/terminal/editor-link'
 
 export function ComponentStyles() {
   return (
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/CssReset.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/css-reset.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/CssReset.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/internal/styles/css-reset.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/_experimental/pages/ReactDevOverlay.tsx b/packages/next/src/client/components/react-dev-overlay/_experimental/pages/react-dev-overlay.tsx
similarity index 78%
rename from packages/next/src/client/components/react-dev-overlay/_experimental/pages/ReactDevOverlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/_experimental/pages/react-dev-overlay.tsx
index b6f3a08d3977..9f0cd44097e0 100644
--- a/packages/next/src/client/components/react-dev-overlay/_experimental/pages/ReactDevOverlay.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/_experimental/pages/react-dev-overlay.tsx
@@ -1,13 +1,13 @@
 import * as React from 'react'
 
-import { ShadowPortal } from '../internal/components/ShadowPortal'
-import { BuildError } from '../internal/container/BuildError'
-import { Errors } from '../internal/container/Errors'
-import { Base } from '../internal/styles/Base'
-import { ComponentStyles } from '../internal/styles/ComponentStyles'
-import { CssReset } from '../internal/styles/CssReset'
+import { ShadowPortal } from '../internal/components/shadow-portal'
+import { BuildError } from '../internal/container/build-error'
+import { Errors } from '../internal/container/errors'
+import { Base } from '../internal/styles/base'
+import { ComponentStyles } from '../internal/styles/component-styles'
+import { CssReset } from '../internal/styles/css-reset'
 
-import { ErrorBoundary } from '../../pages/ErrorBoundary'
+import { ErrorBoundary } from '../../pages/error-boundary'
 import { usePagesReactDevOverlay } from '../../pages/hooks'
 import { Colors } from '../internal/styles/colors'
 
diff --git a/packages/next/src/client/components/react-dev-overlay/app/ReactDevOverlay.tsx b/packages/next/src/client/components/react-dev-overlay/app/ReactDevOverlay.tsx
deleted file mode 100644
index 9bc320c9f2fb..000000000000
--- a/packages/next/src/client/components/react-dev-overlay/app/ReactDevOverlay.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import OldReactDevOverlay from './OldReactDevOverlay'
-import NewReactDevOverlay from '../_experimental/app/ReactDevOverlay'
-
-export default Boolean(process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY)
-  ? NewReactDevOverlay
-  : OldReactDevOverlay
diff --git a/packages/next/src/client/components/react-dev-overlay/app/client-entry.tsx b/packages/next/src/client/components/react-dev-overlay/app/client-entry.tsx
index f728756be05e..d34fff0888f1 100644
--- a/packages/next/src/client/components/react-dev-overlay/app/client-entry.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/app/client-entry.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import ReactDevOverlay from './ReactDevOverlay'
+import ReactDevOverlay from './react-dev-overlay'
 import { getSocketUrl } from '../internal/helpers/get-socket-url'
 import { INITIAL_OVERLAY_STATE } from '../shared'
 import { HMR_ACTIONS_SENT_TO_BROWSER } from '../../../../server/dev/hot-reloader-types'
diff --git a/packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx b/packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx
index 63b78bc518b6..765976f9f5a1 100644
--- a/packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx
@@ -23,7 +23,7 @@ import {
   useErrorOverlayReducer,
 } from '../shared'
 import { parseStack } from '../internal/helpers/parse-stack'
-import ReactDevOverlay from './ReactDevOverlay'
+import ReactDevOverlay from './react-dev-overlay'
 import { useErrorHandler } from '../../errors/use-error-handler'
 import { RuntimeErrorHandler } from '../../errors/runtime-error-handler'
 import {
diff --git a/packages/next/src/client/components/react-dev-overlay/app/OldReactDevOverlay.tsx b/packages/next/src/client/components/react-dev-overlay/app/old-react-dev-overlay.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/app/OldReactDevOverlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/app/old-react-dev-overlay.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/app/react-dev-overlay.tsx b/packages/next/src/client/components/react-dev-overlay/app/react-dev-overlay.tsx
new file mode 100644
index 000000000000..da446b5ba3ba
--- /dev/null
+++ b/packages/next/src/client/components/react-dev-overlay/app/react-dev-overlay.tsx
@@ -0,0 +1,6 @@
+import OldReactDevOverlay from './old-react-dev-overlay'
+import NewReactDevOverlay from '../_experimental/app/react-dev-overlay'
+
+export default Boolean(process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY)
+  ? NewReactDevOverlay
+  : OldReactDevOverlay
diff --git a/packages/next/src/client/components/react-dev-overlay/pages/client.ts b/packages/next/src/client/components/react-dev-overlay/pages/client.ts
index c549a796a7d2..96b33a6df11d 100644
--- a/packages/next/src/client/components/react-dev-overlay/pages/client.ts
+++ b/packages/next/src/client/components/react-dev-overlay/pages/client.ts
@@ -140,4 +140,4 @@ export function onVersionInfo(versionInfo: VersionInfo) {
 
 export { getErrorByType } from '../internal/helpers/get-error-by-type'
 export { getServerError } from '../internal/helpers/node-stack-frames'
-export { default as ReactDevOverlay } from './ReactDevOverlay'
+export { default as ReactDevOverlay } from './react-dev-overlay'
diff --git a/packages/next/src/client/components/react-dev-overlay/pages/ErrorBoundary.tsx b/packages/next/src/client/components/react-dev-overlay/pages/error-boundary.tsx
similarity index 100%
rename from packages/next/src/client/components/react-dev-overlay/pages/ErrorBoundary.tsx
rename to packages/next/src/client/components/react-dev-overlay/pages/error-boundary.tsx
diff --git a/packages/next/src/client/components/react-dev-overlay/pages/OldReactDevOverlay.tsx b/packages/next/src/client/components/react-dev-overlay/pages/old-react-dev-overlay.tsx
similarity index 96%
rename from packages/next/src/client/components/react-dev-overlay/pages/OldReactDevOverlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/pages/old-react-dev-overlay.tsx
index 4007902e830e..eac4170da8eb 100644
--- a/packages/next/src/client/components/react-dev-overlay/pages/OldReactDevOverlay.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/pages/old-react-dev-overlay.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import { ShadowPortal } from '../internal/components/ShadowPortal'
 import { BuildError } from '../internal/container/BuildError'
 import { Errors } from '../internal/container/Errors'
-import { ErrorBoundary } from './ErrorBoundary'
+import { ErrorBoundary } from './error-boundary'
 import { Base } from '../internal/styles/Base'
 import { ComponentStyles } from '../internal/styles/ComponentStyles'
 import { CssReset } from '../internal/styles/CssReset'
diff --git a/packages/next/src/client/components/react-dev-overlay/pages/ReactDevOverlay.tsx b/packages/next/src/client/components/react-dev-overlay/pages/react-dev-overlay.tsx
similarity index 62%
rename from packages/next/src/client/components/react-dev-overlay/pages/ReactDevOverlay.tsx
rename to packages/next/src/client/components/react-dev-overlay/pages/react-dev-overlay.tsx
index d29e2aee6af2..8aa26b2ae1a3 100644
--- a/packages/next/src/client/components/react-dev-overlay/pages/ReactDevOverlay.tsx
+++ b/packages/next/src/client/components/react-dev-overlay/pages/react-dev-overlay.tsx
@@ -1,5 +1,5 @@
-import OldReactDevOverlay from './OldReactDevOverlay'
-import NewReactDevOverlay from '../_experimental/pages/ReactDevOverlay'
+import OldReactDevOverlay from './old-react-dev-overlay'
+import NewReactDevOverlay from '../_experimental/pages/react-dev-overlay'
 
 const ReactDevOverlay = Boolean(process.env.__NEXT_EXPERIMENTAL_NEW_DEV_OVERLAY)
   ? NewReactDevOverlay
diff --git a/packages/next/src/client/components/use-reducer.ts b/packages/next/src/client/components/use-reducer.ts
index 3da5ab0a42e9..d8824c8fbf14 100644
--- a/packages/next/src/client/components/use-reducer.ts
+++ b/packages/next/src/client/components/use-reducer.ts
@@ -7,7 +7,7 @@ import type {
   ReducerActions,
   ReducerState,
 } from './router-reducer/router-reducer-types'
-import { useSyncDevRenderIndicator } from './react-dev-overlay/_experimental/internal/components/Errors/dev-tools-indicator/use-sync-dev-render-indicator'
+import { useSyncDevRenderIndicator } from './react-dev-overlay/_experimental/internal/components/errors/dev-tools-indicator/use-sync-dev-render-indicator'
 
 export function useUnwrapState(state: ReducerState): AppRouterState {
   // reducer actions can be async, so sometimes we need to suspend until the state is resolved
diff --git a/packages/next/src/server/dev/next-dev-server.ts b/packages/next/src/server/dev/next-dev-server.ts
index 91c6687976b9..9b0e54326151 100644
--- a/packages/next/src/server/dev/next-dev-server.ts
+++ b/packages/next/src/server/dev/next-dev-server.ts
@@ -69,7 +69,7 @@ import type { ServerOnInstrumentationRequestError } from '../app-render/types'
 import type { ServerComponentsHmrCache } from '../response-cache'
 import { logRequests } from './log-requests'
 import { FallbackMode } from '../../lib/fallback'
-import type { ReactDevOverlayType } from '../../client/components/react-dev-overlay/pages/ReactDevOverlay'
+import type { ReactDevOverlayType } from '../../client/components/react-dev-overlay/pages/react-dev-overlay'
 
 // Load ReactDevOverlay only when needed
 let ReactDevOverlayImpl: ReactDevOverlayType
diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx
index 1d5f776f2e91..658139db7ae7 100644
--- a/packages/next/src/server/render.tsx
+++ b/packages/next/src/server/render.tsx
@@ -103,7 +103,7 @@ import { ReflectAdapter } from './web/spec-extension/adapters/reflect'
 import { formatRevalidate } from './lib/revalidate'
 import { getErrorSource } from '../shared/lib/error-source'
 import type { DeepReadonly } from '../shared/lib/deep-readonly'
-import type { ReactDevOverlayType } from '../client/components/react-dev-overlay/pages/ReactDevOverlay'
+import type { ReactDevOverlayType } from '../client/components/react-dev-overlay/pages/react-dev-overlay'
 
 let tryGetPreviewData: typeof import('./api-utils/node/try-get-preview-data').tryGetPreviewData
 let warn: typeof import('../build/output/log').warn