diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel/components/review-mode-switcher.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
rename to services/web/frontend/js/features/review-panel/components/review-mode-switcher.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-action-icons.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-action-icons.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-action-icons.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-action-icons.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-add-comment.tsx
similarity index 99%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-add-comment.tsx
index 15710a8e99..bec6d8a04e 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel-add-comment.tsx
@@ -13,7 +13,7 @@ import { ThreadId } from '../../../../../types/review-panel/review-panel'
 import { useModalsContext } from '@/features/ide-react/context/modals-context'
 import { debugConsole } from '@/utils/debugging'
 import OLButton from '@/shared/components/ol/ol-button'
-import { isFormSubmitKeypressEvent } from '@/features/review-panel-new/utils/form-events'
+import { isFormSubmitKeypressEvent } from '@/features/review-panel/utils/form-events'
 
 export const ReviewPanelAddComment = memo<{
   docId: string
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-change-action.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-change-action.tsx
similarity index 90%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-change-action.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-change-action.tsx
index 898a5109c3..e8272d0abb 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-change-action.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel-change-action.tsx
@@ -1,7 +1,7 @@
 import Tooltip from '@/shared/components/tooltip'
 import { ComponentProps, memo, MouseEventHandler } from 'react'
-import { PreventSelectingEntry } from '@/features/review-panel-new/components/review-panel-prevent-selecting'
 import OLTooltip from '@/shared/components/ol/ol-tooltip'
+import { PreventSelectingEntry } from '@/features/review-panel/components/review-panel-prevent-selecting'
 import MaterialIcon from '@/shared/components/material-icon'
 
 const changeActionTooltipProps: Partial<ComponentProps<typeof Tooltip>> = {
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-change-user.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-change-user.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-change-user.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-change-user.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-change.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-change.tsx
similarity index 97%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-change.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-change.tsx
index a153b1e1d4..0a2377b863 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-change.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel-change.tsx
@@ -15,12 +15,12 @@ import { ReviewPanelEntry } from './review-panel-entry'
 import { useModalsContext } from '@/features/ide-react/context/modals-context'
 import { ExpandableContent } from './review-panel-expandable-content'
 import { useUserContext } from '@/shared/context/user-context'
-import { ChangeAction } from '@/features/review-panel-new/components/review-panel-change-action'
+import { ChangeAction } from '@/features/review-panel/components/review-panel-change-action'
 import {
   AddIcon,
   DeleteIcon,
   EditIcon,
-} from '@/features/review-panel-new/components/review-panel-action-icons'
+} from '@/features/review-panel/components/review-panel-action-icons'
 
 export const ReviewPanelChange = memo<{
   change: Change<EditOperation>
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-content.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-comment-content.tsx
similarity index 99%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-comment-content.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-comment-content.tsx
index 7b42422e90..320725261c 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-content.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel-comment-content.tsx
@@ -11,7 +11,7 @@ import {
   ThreadId,
 } from '../../../../../types/review-panel/review-panel'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
-import { isFormSubmitKeypressEvent } from '@/features/review-panel-new/utils/form-events'
+import { isFormSubmitKeypressEvent } from '@/features/review-panel/utils/form-events'
 
 export const ReviewPanelCommentContent = memo<{
   comment: Change<CommentOperation>
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-comment-options.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-comment-options.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-comment-options.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-comment-options.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-comment.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-comment.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-comment.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-comment.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-container.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-container.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-container.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-container.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-current-file.tsx
similarity index 99%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-current-file.tsx
index 8a700f090c..b99872ac61 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-current-file.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel-current-file.tsx
@@ -27,7 +27,7 @@ import { positionItems } from '../utils/position-items'
 import { canAggregate } from '../utils/can-aggregate'
 import ReviewPanelEmptyState from './review-panel-empty-state'
 import useEventListener from '@/shared/hooks/use-event-listener'
-import { hasActiveRange } from '@/features/review-panel-new/utils/has-active-range'
+import { hasActiveRange } from '@/features/review-panel/utils/has-active-range'
 import { reviewTooltipStateField } from '@/features/source-editor/extensions/review-tooltip'
 import ReviewPanelMoreCommentsButton from './review-panel-more-comments-button'
 import useMoreCommments from '../hooks/use-more-comments'
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-delete-comment-modal.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-delete-comment-modal.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-delete-comment-modal.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-delete-comment-modal.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-empty-state.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-empty-state.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-empty-state.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-empty-state.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-indicator.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-entry-indicator.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-entry-indicator.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-entry-indicator.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-entry-user.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-entry-user.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-entry.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-entry.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-entry.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-expandable-content.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-expandable-content.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-expandable-content.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-expandable-content.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-header.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-header.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-header.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-header.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-message.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-message.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-more-comments-button.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-more-comments-button.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-more-comments-button.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-more-comments-button.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-overview-file.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-overview-file.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-overview-file.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-overview-file.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-overview.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-overview.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-overview.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-overview.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-prevent-selecting.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-prevent-selecting.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-prevent-selecting.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-prevent-selecting.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-message.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-resolved-message.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-message.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-resolved-message.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-thread.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-resolved-thread.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-thread.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-resolved-thread.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-button.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-resolved-threads-button.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-button.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-resolved-threads-button.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-menu.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-resolved-threads-menu.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-threads-menu.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-resolved-threads-menu.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-new.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-root.tsx
similarity index 87%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-new.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-root.tsx
index f4a9e37048..856543e92e 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-new.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel-root.tsx
@@ -3,7 +3,7 @@ import LoadingSpinner from '@/shared/components/loading-spinner'
 
 const ReviewPanelContainer = lazy(() => import('./review-panel-container'))
 
-export const ReviewPanelNew: FC = () => {
+export const ReviewPanelRoot: FC = () => {
   return (
     <Suspense fallback={<LoadingSpinner delay={500} />}>
       <ReviewPanelContainer />
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-tabs.tsx b/services/web/frontend/js/features/review-panel/components/review-panel-tabs.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel-tabs.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel-tabs.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx b/services/web/frontend/js/features/review-panel/components/review-panel.tsx
similarity index 94%
rename from services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
rename to services/web/frontend/js/features/review-panel/components/review-panel.tsx
index 74405ba276..33f1c99417 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel.tsx
+++ b/services/web/frontend/js/features/review-panel/components/review-panel.tsx
@@ -4,7 +4,7 @@ import ReviewPanelHeader from './review-panel-header'
 import ReviewPanelCurrentFile from './review-panel-current-file'
 import { ReviewPanelOverview } from './review-panel-overview'
 import classnames from 'classnames'
-import { useReviewPanelStyles } from '@/features/review-panel-new/hooks/use-review-panel-styles'
+import { useReviewPanelStyles } from '@/features/review-panel/hooks/use-review-panel-styles'
 import { useReviewPanelViewContext } from '../context/review-panel-view-context'
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx b/services/web/frontend/js/features/review-panel/components/review-tooltip-menu.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
rename to services/web/frontend/js/features/review-panel/components/review-tooltip-menu.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/track-changes-toggle.tsx b/services/web/frontend/js/features/review-panel/components/track-changes-toggle.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/track-changes-toggle.tsx
rename to services/web/frontend/js/features/review-panel/components/track-changes-toggle.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal.tsx b/services/web/frontend/js/features/review-panel/components/upgrade-track-changes-modal.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal.tsx
rename to services/web/frontend/js/features/review-panel/components/upgrade-track-changes-modal.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/context/changes-users-context.tsx b/services/web/frontend/js/features/review-panel/context/changes-users-context.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/context/changes-users-context.tsx
rename to services/web/frontend/js/features/review-panel/context/changes-users-context.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx b/services/web/frontend/js/features/review-panel/context/ranges-context.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
rename to services/web/frontend/js/features/review-panel/context/ranges-context.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx b/services/web/frontend/js/features/review-panel/context/review-panel-providers.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
rename to services/web/frontend/js/features/review-panel/context/review-panel-providers.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/context/review-panel-view-context.tsx b/services/web/frontend/js/features/review-panel/context/review-panel-view-context.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/context/review-panel-view-context.tsx
rename to services/web/frontend/js/features/review-panel/context/review-panel-view-context.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx b/services/web/frontend/js/features/review-panel/context/threads-context.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
rename to services/web/frontend/js/features/review-panel/context/threads-context.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx b/services/web/frontend/js/features/review-panel/context/track-changes-state-context.tsx
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
rename to services/web/frontend/js/features/review-panel/context/track-changes-state-context.tsx
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-more-comments.ts b/services/web/frontend/js/features/review-panel/hooks/use-more-comments.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/hooks/use-more-comments.ts
rename to services/web/frontend/js/features/review-panel/hooks/use-more-comments.ts
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts b/services/web/frontend/js/features/review-panel/hooks/use-overview-file-collapsed.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
rename to services/web/frontend/js/features/review-panel/hooks/use-overview-file-collapsed.ts
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-project-ranges.ts b/services/web/frontend/js/features/review-panel/hooks/use-project-ranges.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/hooks/use-project-ranges.ts
rename to services/web/frontend/js/features/review-panel/hooks/use-project-ranges.ts
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-layout.ts b/services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts
similarity index 90%
rename from services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-layout.ts
rename to services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts
index 97f3deac16..13b0c2198e 100644
--- a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-layout.ts
+++ b/services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts
@@ -1,7 +1,7 @@
 import { useLayoutContext } from '@/shared/context/layout-context'
 import { useRangesContext } from '../context/ranges-context'
-import { useThreadsContext } from '@/features/review-panel-new/context/threads-context'
-import { hasActiveRange } from '@/features/review-panel-new/utils/has-active-range'
+import { useThreadsContext } from '@/features/review-panel/context/threads-context'
+import { hasActiveRange } from '@/features/review-panel/utils/has-active-range'
 import { useRailContext } from '@/features/ide-redesign/contexts/rail-context'
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 import { useCallback } from 'react'
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts b/services/web/frontend/js/features/review-panel/hooks/use-review-panel-styles.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/hooks/use-review-panel-styles.ts
rename to services/web/frontend/js/features/review-panel/hooks/use-review-panel-styles.ts
diff --git a/services/web/frontend/js/features/review-panel-new/images/teaser-track-changes.gif b/services/web/frontend/js/features/review-panel/images/teaser-track-changes.gif
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/images/teaser-track-changes.gif
rename to services/web/frontend/js/features/review-panel/images/teaser-track-changes.gif
diff --git a/services/web/frontend/js/features/review-panel-new/images/teaser-track-changes.mp4 b/services/web/frontend/js/features/review-panel/images/teaser-track-changes.mp4
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/images/teaser-track-changes.mp4
rename to services/web/frontend/js/features/review-panel/images/teaser-track-changes.mp4
diff --git a/services/web/frontend/js/features/review-panel-new/utils/build-name.ts b/services/web/frontend/js/features/review-panel/utils/build-name.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/utils/build-name.ts
rename to services/web/frontend/js/features/review-panel/utils/build-name.ts
diff --git a/services/web/frontend/js/features/review-panel-new/utils/can-aggregate.ts b/services/web/frontend/js/features/review-panel/utils/can-aggregate.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/utils/can-aggregate.ts
rename to services/web/frontend/js/features/review-panel/utils/can-aggregate.ts
diff --git a/services/web/frontend/js/features/review-panel-new/utils/changes-in-selection.ts b/services/web/frontend/js/features/review-panel/utils/changes-in-selection.ts
similarity index 93%
rename from services/web/frontend/js/features/review-panel-new/utils/changes-in-selection.ts
rename to services/web/frontend/js/features/review-panel/utils/changes-in-selection.ts
index d92bd26802..9239b49b2c 100644
--- a/services/web/frontend/js/features/review-panel-new/utils/changes-in-selection.ts
+++ b/services/web/frontend/js/features/review-panel/utils/changes-in-selection.ts
@@ -1,5 +1,5 @@
 import { SelectionRange } from '@codemirror/state'
-import { Ranges } from '@/features/review-panel-new/context/ranges-context'
+import { Ranges } from '@/features/review-panel/context/ranges-context'
 import { isDeleteChange, isInsertChange } from '@/utils/operations'
 import { canAggregate } from './can-aggregate'
 import { Change, EditOperation } from '../../../../../types/change'
diff --git a/services/web/frontend/js/features/review-panel-new/utils/form-events.ts b/services/web/frontend/js/features/review-panel/utils/form-events.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/utils/form-events.ts
rename to services/web/frontend/js/features/review-panel/utils/form-events.ts
diff --git a/services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts b/services/web/frontend/js/features/review-panel/utils/has-active-range.ts
similarity index 75%
rename from services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts
rename to services/web/frontend/js/features/review-panel/utils/has-active-range.ts
index 7b636c69a3..44b2b99092 100644
--- a/services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts
+++ b/services/web/frontend/js/features/review-panel/utils/has-active-range.ts
@@ -1,5 +1,5 @@
-import { Ranges } from '@/features/review-panel-new/context/ranges-context'
-import { Threads } from '@/features/review-panel-new/context/threads-context'
+import { Ranges } from '@/features/review-panel/context/ranges-context'
+import { Threads } from '@/features/review-panel/context/threads-context'
 
 export const hasActiveRange = (
   ranges: Ranges | undefined,
diff --git a/services/web/frontend/js/features/review-panel-new/utils/is-selection-within-op.ts b/services/web/frontend/js/features/review-panel/utils/is-selection-within-op.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/utils/is-selection-within-op.ts
rename to services/web/frontend/js/features/review-panel/utils/is-selection-within-op.ts
diff --git a/services/web/frontend/js/features/review-panel-new/utils/position-items.ts b/services/web/frontend/js/features/review-panel/utils/position-items.ts
similarity index 100%
rename from services/web/frontend/js/features/review-panel-new/utils/position-items.ts
rename to services/web/frontend/js/features/review-panel/utils/position-items.ts
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
index 4bdfe2682c..da7c808817 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
@@ -9,9 +9,9 @@ import { CodemirrorOutline } from './codemirror-outline'
 import { CodeMirrorCommandTooltip } from './codemirror-command-tooltip'
 import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
 import { FigureModal } from './figure-modal/figure-modal'
-import { ReviewPanelProviders } from '@/features/review-panel-new/context/review-panel-providers'
-import { ReviewPanelNew } from '@/features/review-panel-new/components/review-panel-new'
-import ReviewTooltipMenu from '@/features/review-panel-new/components/review-tooltip-menu'
+import { ReviewPanelProviders } from '@/features/review-panel/context/review-panel-providers'
+import { ReviewPanelRoot } from '@/features/review-panel/components/review-panel-root'
+import ReviewTooltipMenu from '@/features/review-panel/components/review-tooltip-menu'
 import {
   CodeMirrorStateContext,
   CodeMirrorViewContext,
@@ -86,7 +86,7 @@ function CodeMirrorEditorComponents() {
 
       <MathPreviewTooltip />
       {features.trackChangesVisible && <ReviewTooltipMenu />}
-      {features.trackChangesVisible && <ReviewPanelNew />}
+      {features.trackChangesVisible && <ReviewPanelRoot />}
 
       {sourceEditorComponents.map(
         ({ import: { default: Component }, path }) => (
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
index b106968c60..9fe0c0b3e5 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
@@ -20,8 +20,8 @@ import { minimumListDepthForSelection } from '../utils/tree-operations/ancestors
 import { debugConsole } from '@/utils/debugging'
 import { useTranslation } from 'react-i18next'
 import { ToggleSearchButton } from '@/features/source-editor/components/toolbar/toggle-search-button'
-import ReviewPanelHeader from '@/features/review-panel-new/components/review-panel-header'
-import useReviewPanelLayout from '@/features/review-panel-new/hooks/use-review-panel-layout'
+import ReviewPanelHeader from '@/features/review-panel/components/review-panel-header'
+import useReviewPanelLayout from '@/features/review-panel/hooks/use-review-panel-layout'
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 import Breadcrumbs from '@/features/ide-redesign/components/breadcrumbs'
 import classNames from 'classnames'
diff --git a/services/web/frontend/js/features/source-editor/extensions/ranges.ts b/services/web/frontend/js/features/source-editor/extensions/ranges.ts
index 81d6fdbd86..cd6dd966ed 100644
--- a/services/web/frontend/js/features/source-editor/extensions/ranges.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/ranges.ts
@@ -18,9 +18,9 @@ import {
   isDeleteOperation,
   isInsertOperation,
 } from '@/utils/operations'
-import { Ranges } from '@/features/review-panel-new/context/ranges-context'
-import { Threads } from '@/features/review-panel-new/context/threads-context'
-import { isSelectionWithinOp } from '@/features/review-panel-new/utils/is-selection-within-op'
+import { Ranges } from '@/features/review-panel/context/ranges-context'
+import { Threads } from '@/features/review-panel/context/threads-context'
+import { isSelectionWithinOp } from '@/features/review-panel/utils/is-selection-within-op'
 
 type RangesData = {
   ranges: Ranges
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index fb29613f7f..5e8f1d1fd7 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -45,9 +45,9 @@ import { useMetadataContext } from '@/features/ide-react/context/metadata-contex
 import { useUserContext } from '@/shared/context/user-context'
 import { useReferencesContext } from '@/features/ide-react/context/references-context'
 import { setMathPreview } from '@/features/source-editor/extensions/math-preview'
-import { useRangesContext } from '@/features/review-panel-new/context/ranges-context'
+import { useRangesContext } from '@/features/review-panel/context/ranges-context'
 import { updateRanges } from '@/features/source-editor/extensions/ranges'
-import { useThreadsContext } from '@/features/review-panel-new/context/threads-context'
+import { useThreadsContext } from '@/features/review-panel/context/threads-context'
 import { useHunspell } from '@/features/source-editor/hooks/use-hunspell'
 import { Permissions } from '@/features/ide-react/types/permissions'
 import { GotoOffsetOptions } from '@/features/ide-react/context/editor-manager-context'
diff --git a/services/web/frontend/stylesheets/pages/all.scss b/services/web/frontend/stylesheets/pages/all.scss
index 714b714c35..73cd27d06c 100644
--- a/services/web/frontend/stylesheets/pages/all.scss
+++ b/services/web/frontend/stylesheets/pages/all.scss
@@ -32,7 +32,7 @@
 @import 'editor/publish-modal';
 @import 'editor/share';
 @import 'editor/tags-input';
-@import 'editor/review-panel-new';
+@import 'editor/review-panel';
 @import 'editor/table-generator-column-width-modal';
 @import 'editor/math-preview';
 @import 'editor/references-search';
diff --git a/services/web/frontend/stylesheets/pages/editor/review-panel-new.scss b/services/web/frontend/stylesheets/pages/editor/review-panel.scss
similarity index 100%
rename from services/web/frontend/stylesheets/pages/editor/review-panel-new.scss
rename to services/web/frontend/stylesheets/pages/editor/review-panel.scss