diff --git a/packages/edit-post/src/components/header/mode-switcher/index.js b/packages/edit-post/src/components/header/mode-switcher/index.js
index 75f482dbdbab8..21ae30a8e8884 100644
--- a/packages/edit-post/src/components/header/mode-switcher/index.js
+++ b/packages/edit-post/src/components/header/mode-switcher/index.js
@@ -2,7 +2,10 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { editorPrivateApis, store as editorStore } from '@wordpress/editor';
+import {
+	privateApis as editorPrivateApis,
+	store as editorStore,
+} from '@wordpress/editor';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
 
 /**
@@ -10,7 +13,7 @@ import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
  */
 import { unlock } from '../../../lock-unlock';
 
-const { DocumentTools: EditorModeSwitcher } = unlock( editorPrivateApis );
+const { ModeSwitcher: EditorModeSwitcher } = unlock( editorPrivateApis );
 
 function ModeSwitcher() {
 	const { shortcut, isRichEditingEnabled, isCodeEditingEnabled } = useSelect(
diff --git a/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js b/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js
index ba56fa93908d4..68614a38e50db 100644
--- a/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js
+++ b/packages/edit-site/src/components/header-edit-mode/mode-switcher/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { editorPrivateApis } from '@wordpress/editor';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
 
 /**
@@ -10,7 +10,7 @@ import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
  */
 import { unlock } from '../../../lock-unlock';
 
-const { DocumentTools: EditorModeSwitcher } = unlock( editorPrivateApis );
+const { ModeSwitcher: EditorModeSwitcher } = unlock( editorPrivateApis );
 
 function ModeSwitcher() {
 	const shortcut = useSelect(