diff --git a/.eslintrc.js b/.eslintrc.js
index f39437a7d143e..4e43b19e7b61d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -490,7 +490,7 @@ module.exports = {
         'packages/react-devtools-extensions/**/*.js',
         'packages/react-devtools-shared/src/hook.js',
         'packages/react-devtools-shared/src/backend/console.js',
-        'packages/react-devtools-shared/src/backend/DevToolsComponentStackFrame.js',
+        'packages/react-devtools-shared/src/backend/shared/DevToolsComponentStackFrame.js',
       ],
       globals: {
         __IS_CHROME__: 'readonly',
diff --git a/packages/react-devtools-extensions/src/contentScripts/renderer.js b/packages/react-devtools-extensions/src/contentScripts/renderer.js
index ab02997bbaab8..361530334177c 100644
--- a/packages/react-devtools-extensions/src/contentScripts/renderer.js
+++ b/packages/react-devtools-extensions/src/contentScripts/renderer.js
@@ -8,7 +8,7 @@
  * @flow
  */
 
-import {attach} from 'react-devtools-shared/src/backend/renderer';
+import {attach} from 'react-devtools-shared/src/backend/fiber/renderer';
 import {SESSION_STORAGE_RELOAD_AND_PROFILE_KEY} from 'react-devtools-shared/src/constants';
 import {sessionStorageGetItem} from 'react-devtools-shared/src/storage';
 
diff --git a/packages/react-devtools-shared/src/backend/agent.js b/packages/react-devtools-shared/src/backend/agent.js
index 54df48bfe87fd..46c7d94093a26 100644
--- a/packages/react-devtools-shared/src/backend/agent.js
+++ b/packages/react-devtools-shared/src/backend/agent.js
@@ -188,8 +188,11 @@ export default class Agent extends EventEmitter<{
     this._bridge = bridge;
 
     bridge.addListener('clearErrorsAndWarnings', this.clearErrorsAndWarnings);
-    bridge.addListener('clearErrorsForFiberID', this.clearErrorsForFiberID);
-    bridge.addListener('clearWarningsForFiberID', this.clearWarningsForFiberID);
+    bridge.addListener('clearErrorsForElementID', this.clearErrorsForElementID);
+    bridge.addListener(
+      'clearWarningsForElementID',
+      this.clearWarningsForElementID,
+    );
     bridge.addListener('copyElementPath', this.copyElementPath);
     bridge.addListener('deletePath', this.deletePath);
     bridge.addListener('getBackendVersion', this.getBackendVersion);
@@ -270,16 +273,19 @@ export default class Agent extends EventEmitter<{
     }
   };
 
-  clearErrorsForFiberID: ElementAndRendererID => void = ({id, rendererID}) => {
+  clearErrorsForElementID: ElementAndRendererID => void = ({
+    id,
+    rendererID,
+  }) => {
     const renderer = this._rendererInterfaces[rendererID];
     if (renderer == null) {
       console.warn(`Invalid renderer id "${rendererID}"`);
     } else {
-      renderer.clearErrorsForFiberID(id);
+      renderer.clearErrorsForElementID(id);
     }
   };
 
-  clearWarningsForFiberID: ElementAndRendererID => void = ({
+  clearWarningsForElementID: ElementAndRendererID => void = ({
     id,
     rendererID,
   }) => {
@@ -287,7 +293,7 @@ export default class Agent extends EventEmitter<{
     if (renderer == null) {
       console.warn(`Invalid renderer id "${rendererID}"`);
     } else {
-      renderer.clearWarningsForFiberID(id);
+      renderer.clearWarningsForElementID(id);
     }
   };
 
@@ -361,7 +367,7 @@ export default class Agent extends EventEmitter<{
     const rendererInterface = this.getBestMatchingRendererInterface(node);
     if (rendererInterface != null) {
       try {
-        return rendererInterface.getFiberIDForNative(node, true);
+        return rendererInterface.getElementIDForNative(node, true);
       } catch (error) {
         // Some old React versions might throw if they can't find a match.
         // If so we should ignore it...
@@ -613,7 +619,7 @@ export default class Agent extends EventEmitter<{
   selectNode(target: Object): void {
     const id = this.getIDForNode(target);
     if (id !== null) {
-      this._bridge.send('selectFiber', id);
+      this._bridge.send('selectElement', id);
     }
   }
 
@@ -820,7 +826,7 @@ export default class Agent extends EventEmitter<{
           if (prevMatchID !== nextMatchID) {
             if (nextMatchID !== null) {
               // We moved forward, unlocking a deeper node.
-              this._bridge.send('selectFiber', nextMatchID);
+              this._bridge.send('selectElement', nextMatchID);
             }
           }
           if (nextMatch !== null && nextMatch.isFullMatch) {
diff --git a/packages/react-devtools-shared/src/backend/console.js b/packages/react-devtools-shared/src/backend/console.js
index dd8e9e9f27e60..0e54fa59a13b8 100644
--- a/packages/react-devtools-shared/src/backend/console.js
+++ b/packages/react-devtools-shared/src/backend/console.js
@@ -25,14 +25,14 @@ import {
   ANSI_STYLE_DIMMING_TEMPLATE,
   ANSI_STYLE_DIMMING_TEMPLATE_WITH_COMPONENT_STACK,
 } from 'react-devtools-shared/src/constants';
-import {getInternalReactConstants, getDispatcherRef} from './renderer';
+import {getInternalReactConstants, getDispatcherRef} from './fiber/renderer';
 import {
   getStackByFiberInDevAndProd,
   getOwnerStackByFiberInDev,
   supportsOwnerStacks,
   supportsNativeConsoleTasks,
-} from './DevToolsFiberComponentStack';
-import {formatOwnerStack} from './DevToolsOwnerStack';
+} from './fiber/DevToolsFiberComponentStack';
+import {formatOwnerStack} from './shared/DevToolsOwnerStack';
 import {castBool, castBrowserTheme} from '../utils';
 
 const OVERRIDE_CONSOLE_METHODS = ['error', 'trace', 'warn'];
diff --git a/packages/react-devtools-shared/src/backend/DevToolsFiberComponentStack.js b/packages/react-devtools-shared/src/backend/fiber/DevToolsFiberComponentStack.js
similarity index 97%
rename from packages/react-devtools-shared/src/backend/DevToolsFiberComponentStack.js
rename to packages/react-devtools-shared/src/backend/fiber/DevToolsFiberComponentStack.js
index 9a457ada7dd20..5b34cfb0bd4fb 100644
--- a/packages/react-devtools-shared/src/backend/DevToolsFiberComponentStack.js
+++ b/packages/react-devtools-shared/src/backend/fiber/DevToolsFiberComponentStack.js
@@ -13,7 +13,7 @@
 // (which use different values for ReactTypeOfWork).
 
 import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
-import type {CurrentDispatcherRef, WorkTagMap} from './types';
+import type {CurrentDispatcherRef, WorkTagMap} from '../types';
 
 import type {ReactComponentInfo} from 'shared/ReactTypes';
 
@@ -22,9 +22,9 @@ import {
   describeFunctionComponentFrame,
   describeClassComponentFrame,
   describeDebugInfoFrame,
-} from './DevToolsComponentStackFrame';
+} from '../shared/DevToolsComponentStackFrame';
 
-import {formatOwnerStack} from './DevToolsOwnerStack';
+import {formatOwnerStack} from '../shared/DevToolsOwnerStack';
 
 export function describeFiber(
   workTagMap: WorkTagMap,
diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/fiber/renderer.js
similarity index 99%
rename from packages/react-devtools-shared/src/backend/renderer.js
rename to packages/react-devtools-shared/src/backend/fiber/renderer.js
index 62bf7fe4a725a..46a8022eace80 100644
--- a/packages/react-devtools-shared/src/backend/renderer.js
+++ b/packages/react-devtools-shared/src/backend/fiber/renderer.js
@@ -52,7 +52,7 @@ import {
   copyWithRename,
   copyWithSet,
   getEffectDurations,
-} from './utils';
+} from '../utils';
 import {
   __DEBUG__,
   PROFILING_FLAG_BASIC_SUPPORT,
@@ -66,14 +66,14 @@ import {
   TREE_OPERATION_SET_SUBTREE_MODE,
   TREE_OPERATION_UPDATE_ERRORS_OR_WARNINGS,
   TREE_OPERATION_UPDATE_TREE_BASE_DURATION,
-} from '../constants';
+} from '../../constants';
 import {inspectHooksOfFiber} from 'react-debug-tools';
 import {
   patchConsoleUsingWindowValues,
   registerRenderer as registerRendererWithConsole,
   patchForStrictMode as patchConsoleForStrictMode,
   unpatchForStrictMode as unpatchConsoleForStrictMode,
-} from './console';
+} from '../console';
 import {
   CONCURRENT_MODE_NUMBER,
   CONCURRENT_MODE_SYMBOL_STRING,
@@ -95,14 +95,14 @@ import {
   MEMO_NUMBER,
   MEMO_SYMBOL_STRING,
   SERVER_CONTEXT_SYMBOL_STRING,
-} from './ReactSymbols';
+} from '../shared/ReactSymbols';
 import {enableStyleXFeatures} from 'react-devtools-feature-flags';
 import is from 'shared/objectIs';
 import hasOwnProperty from 'shared/hasOwnProperty';
-import {getStyleXData} from './StyleX/utils';
-import {createProfilingHooks} from './profilingHooks';
+import {getStyleXData} from '../StyleX/utils';
+import {createProfilingHooks} from '../profilingHooks';
 
-import type {GetTimelineData, ToggleProfilingStatus} from './profilingHooks';
+import type {GetTimelineData, ToggleProfilingStatus} from '../profilingHooks';
 import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
 import type {
   ChangeDescription,
@@ -122,7 +122,7 @@ import type {
   WorkTagMap,
   CurrentDispatcherRef,
   LegacyDispatcherRef,
-} from './types';
+} from '../types';
 import type {
   ComponentFilter,
   ElementType,
@@ -811,7 +811,7 @@ export function attach(
     }
   }
 
-  function clearErrorsForFiberID(fiberID: number) {
+  function clearErrorsForElementID(fiberID: number) {
     clearMessageCountHelper(
       fiberID,
       pendingFiberToErrorsMap,
@@ -819,7 +819,7 @@ export function attach(
     );
   }
 
-  function clearWarningsForFiberID(fiberID: number) {
+  function clearWarningsForElementID(fiberID: number) {
     clearMessageCountHelper(
       fiberID,
       pendingFiberToWarningsMap,
@@ -1311,8 +1311,8 @@ export function attach(
         idToArbitraryFiberMap.delete(fiberID);
 
         // Also clear any errors/warnings associated with this fiber.
-        clearErrorsForFiberID(fiberID);
-        clearWarningsForFiberID(fiberID);
+        clearErrorsForElementID(fiberID);
+        clearWarningsForElementID(fiberID);
       }
 
       fiberToIDMap.delete(fiber);
@@ -2862,7 +2862,7 @@ export function attach(
     return fibers;
   }
 
-  function findNativeNodesForFiberID(id: number) {
+  function findNativeNodesForElementID(id: number) {
     try {
       const fiber = findCurrentFiberUsingSlowPathById(id);
       if (fiber === null) {
@@ -2877,7 +2877,7 @@ export function attach(
     }
   }
 
-  function getDisplayNameForFiberID(id: number): null | string {
+  function getDisplayNameForElementID(id: number): null | string {
     const fiber = idToArbitraryFiberMap.get(id);
     return fiber != null ? getDisplayNameForFiber(fiber) : null;
   }
@@ -2886,7 +2886,7 @@ export function attach(
     return renderer.findFiberByHostInstance(hostInstance);
   }
 
-  function getFiberIDForNative(
+  function getElementIDForNative(
     hostInstance: NativeType,
     findNearestUnfilteredAncestor: boolean = false,
   ) {
@@ -3870,7 +3870,7 @@ export function attach(
     if (result.hooks !== null) {
       console.log('Hooks:', result.hooks);
     }
-    const nativeNodes = findNativeNodesForFiberID(id);
+    const nativeNodes = findNativeNodesForElementID(id);
     if (nativeNodes !== null) {
       console.log('Nodes:', nativeNodes);
     }
@@ -4616,7 +4616,7 @@ export function attach(
     traceUpdatesEnabled = isEnabled;
   }
 
-  function hasFiberWithId(id: number): boolean {
+  function hasElementWithId(id: number): boolean {
     return idToArbitraryFiberMap.has(id);
   }
 
@@ -4651,18 +4651,16 @@ export function attach(
   return {
     cleanup,
     clearErrorsAndWarnings,
-    clearErrorsForFiberID,
-    clearWarningsForFiberID,
+    clearErrorsForElementID,
+    clearWarningsForElementID,
     getSerializedElementValueByPath,
     deletePath,
-    findNativeNodesForFiberID,
+    findNativeNodesForElementID,
     flushInitialOperations,
     getBestMatchForTrackedPath,
-    getComponentStackForFiber,
-    getSourceForFiber,
-    getDisplayNameForFiberID,
+    getDisplayNameForElementID,
     getFiberForNative,
-    getFiberIDForNative,
+    getElementIDForNative,
     getInstanceAndStyle,
     getOwnersList,
     getPathForElement,
@@ -4670,7 +4668,7 @@ export function attach(
     handleCommitFiberRoot,
     handleCommitFiberUnmount,
     handlePostCommitFiberRoot,
-    hasFiberWithId,
+    hasElementWithId,
     inspectElement,
     logElementToConsole,
     patchConsoleForStrictMode,
diff --git a/packages/react-devtools-shared/src/backend/index.js b/packages/react-devtools-shared/src/backend/index.js
index 376a23b369866..5c398ebf75869 100644
--- a/packages/react-devtools-shared/src/backend/index.js
+++ b/packages/react-devtools-shared/src/backend/index.js
@@ -9,7 +9,7 @@
 
 import Agent from './agent';
 
-import {attach} from './renderer';
+import {attach} from './fiber/renderer';
 import {attach as attachLegacy} from './legacy/renderer';
 import {hasAssignedBackend} from './utils';
 
diff --git a/packages/react-devtools-shared/src/backend/legacy/renderer.js b/packages/react-devtools-shared/src/backend/legacy/renderer.js
index e037d45075a80..79b70ad74fba6 100644
--- a/packages/react-devtools-shared/src/backend/legacy/renderer.js
+++ b/packages/react-devtools-shared/src/backend/legacy/renderer.js
@@ -39,7 +39,7 @@ import {decorateMany, forceUpdate, restoreMany} from './utils';
 
 import type {
   DevToolsHook,
-  GetFiberIDForNative,
+  GetElementIDForNative,
   InspectedElementPayload,
   InstanceAndStyle,
   NativeType,
@@ -142,8 +142,8 @@ export function attach(
   const internalInstanceToRootIDMap: WeakMap<InternalInstance, number> =
     new WeakMap();
 
-  let getInternalIDForNative: GetFiberIDForNative =
-    ((null: any): GetFiberIDForNative);
+  let getInternalIDForNative: GetElementIDForNative =
+    ((null: any): GetElementIDForNative);
   let findNativeNodeForInternalID: (id: number) => ?NativeType;
   let getFiberForNative = (node: NativeType) => {
     // Not implemented.
@@ -174,7 +174,7 @@ export function attach(
     };
   }
 
-  function getDisplayNameForFiberID(id: number): string | null {
+  function getDisplayNameForElementID(id: number): string | null {
     const internalInstance = idToInternalInstanceMap.get(id);
     return internalInstance ? getData(internalInstance).displayName : null;
   }
@@ -1085,11 +1085,11 @@ export function attach(
     // Not implemented
   }
 
-  function clearErrorsForFiberID(id: number) {
+  function clearErrorsForElementID(id: number) {
     // Not implemented
   }
 
-  function clearWarningsForFiberID(id: number) {
+  function clearWarningsForElementID(id: number) {
     // Not implemented
   }
 
@@ -1097,24 +1097,24 @@ export function attach(
 
   function unpatchConsoleForStrictMode() {}
 
-  function hasFiberWithId(id: number): boolean {
+  function hasElementWithId(id: number): boolean {
     return idToInternalInstanceMap.has(id);
   }
 
   return {
     clearErrorsAndWarnings,
-    clearErrorsForFiberID,
-    clearWarningsForFiberID,
+    clearErrorsForElementID,
+    clearWarningsForElementID,
     cleanup,
     getSerializedElementValueByPath,
     deletePath,
     flushInitialOperations,
     getBestMatchForTrackedPath,
-    getDisplayNameForFiberID,
+    getDisplayNameForElementID,
     getFiberForNative,
-    getFiberIDForNative: getInternalIDForNative,
+    getElementIDForNative: getInternalIDForNative,
     getInstanceAndStyle,
-    findNativeNodesForFiberID: (id: number) => {
+    findNativeNodesForElementID: (id: number) => {
       const nativeNode = findNativeNodeForInternalID(id);
       return nativeNode == null ? null : [nativeNode];
     },
@@ -1124,7 +1124,7 @@ export function attach(
     handleCommitFiberRoot,
     handleCommitFiberUnmount,
     handlePostCommitFiberRoot,
-    hasFiberWithId,
+    hasElementWithId,
     inspectElement,
     logElementToConsole,
     overrideError,
diff --git a/packages/react-devtools-shared/src/backend/profilingHooks.js b/packages/react-devtools-shared/src/backend/profilingHooks.js
index 17e6181abe97a..71907fc5c4021 100644
--- a/packages/react-devtools-shared/src/backend/profilingHooks.js
+++ b/packages/react-devtools-shared/src/backend/profilingHooks.js
@@ -35,7 +35,7 @@ import {
   REACT_TOTAL_NUM_LANES,
   SCHEDULING_PROFILER_VERSION,
 } from 'react-devtools-timeline/src/constants';
-import {describeFiber} from './DevToolsFiberComponentStack';
+import {describeFiber} from './fiber/DevToolsFiberComponentStack';
 
 // Add padding to the start/stop time of the profile.
 // This makes the UI nicer to use.
diff --git a/packages/react-devtools-shared/src/backend/DevToolsComponentStackFrame.js b/packages/react-devtools-shared/src/backend/shared/DevToolsComponentStackFrame.js
similarity index 99%
rename from packages/react-devtools-shared/src/backend/DevToolsComponentStackFrame.js
rename to packages/react-devtools-shared/src/backend/shared/DevToolsComponentStackFrame.js
index e42073cc02ee5..ea895f201dde9 100644
--- a/packages/react-devtools-shared/src/backend/DevToolsComponentStackFrame.js
+++ b/packages/react-devtools-shared/src/backend/shared/DevToolsComponentStackFrame.js
@@ -12,7 +12,7 @@
 // while still maintaining support for multiple renderer versions
 // (which use different values for ReactTypeOfWork).
 
-import type {CurrentDispatcherRef} from './types';
+import type {CurrentDispatcherRef} from '../types';
 
 // The shared console patching code is DEV-only.
 // We can't use it since DevTools only ships production builds.
diff --git a/packages/react-devtools-shared/src/backend/DevToolsConsolePatching.js b/packages/react-devtools-shared/src/backend/shared/DevToolsConsolePatching.js
similarity index 100%
rename from packages/react-devtools-shared/src/backend/DevToolsConsolePatching.js
rename to packages/react-devtools-shared/src/backend/shared/DevToolsConsolePatching.js
diff --git a/packages/react-devtools-shared/src/backend/DevToolsOwnerStack.js b/packages/react-devtools-shared/src/backend/shared/DevToolsOwnerStack.js
similarity index 100%
rename from packages/react-devtools-shared/src/backend/DevToolsOwnerStack.js
rename to packages/react-devtools-shared/src/backend/shared/DevToolsOwnerStack.js
diff --git a/packages/react-devtools-shared/src/backend/ReactSymbols.js b/packages/react-devtools-shared/src/backend/shared/ReactSymbols.js
similarity index 100%
rename from packages/react-devtools-shared/src/backend/ReactSymbols.js
rename to packages/react-devtools-shared/src/backend/shared/ReactSymbols.js
diff --git a/packages/react-devtools-shared/src/backend/types.js b/packages/react-devtools-shared/src/backend/types.js
index a64d1e5337f34..8f691588b8fc3 100644
--- a/packages/react-devtools-shared/src/backend/types.js
+++ b/packages/react-devtools-shared/src/backend/types.js
@@ -75,15 +75,6 @@ export type WorkTagMap = {
   Throw: WorkTag,
 };
 
-// TODO: If it's useful for the frontend to know which types of data an Element has
-// (e.g. props, state, context, hooks) then we could add a bitmask field for this
-// to keep the number of attributes small.
-export type FiberData = {
-  key: string | null,
-  displayName: string | null,
-  type: ElementType,
-};
-
 export type NativeType = Object;
 export type RendererID = number;
 
@@ -95,12 +86,12 @@ type SharedInternalsSubset = {
 };
 export type CurrentDispatcherRef = SharedInternalsSubset;
 
-export type GetDisplayNameForFiberID = (
+export type GetDisplayNameForElementID = (
   id: number,
   findNearestUnfilteredAncestor?: boolean,
 ) => string | null;
 
-export type GetFiberIDForNative = (
+export type GetElementIDForNative = (
   component: NativeType,
   findNearestUnfilteredAncestor?: boolean,
 ) => number | null;
@@ -359,20 +350,20 @@ type Type = 'props' | 'hooks' | 'state' | 'context';
 export type RendererInterface = {
   cleanup: () => void,
   clearErrorsAndWarnings: () => void,
-  clearErrorsForFiberID: (id: number) => void,
-  clearWarningsForFiberID: (id: number) => void,
+  clearErrorsForElementID: (id: number) => void,
+  clearWarningsForElementID: (id: number) => void,
   deletePath: (
     type: Type,
     id: number,
     hookID: ?number,
     path: Array<string | number>,
   ) => void,
-  findNativeNodesForFiberID: FindNativeNodesForFiberID,
+  findNativeNodesForElementID: FindNativeNodesForFiberID,
   flushInitialOperations: () => void,
   getBestMatchForTrackedPath: () => PathMatch | null,
   getFiberForNative: (component: NativeType) => Fiber | null,
-  getFiberIDForNative: GetFiberIDForNative,
-  getDisplayNameForFiberID: GetDisplayNameForFiberID,
+  getElementIDForNative: GetElementIDForNative,
+  getDisplayNameForElementID: GetDisplayNameForElementID,
   getInstanceAndStyle(id: number): InstanceAndStyle,
   getProfilingData(): ProfilingDataBackend,
   getOwnersList: (id: number) => Array<SerializedElement> | null,
@@ -384,7 +375,7 @@ export type RendererInterface = {
   handleCommitFiberRoot: (fiber: Object, commitPriority?: number) => void,
   handleCommitFiberUnmount: (fiber: Object) => void,
   handlePostCommitFiberRoot: (fiber: Object) => void,
-  hasFiberWithId: (id: number) => boolean,
+  hasElementWithId: (id: number) => boolean,
   inspectElement: (
     requestID: number,
     id: number,
diff --git a/packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js b/packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js
index 29f425cee614b..d461f882d9d02 100644
--- a/packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js
+++ b/packages/react-devtools-shared/src/backend/views/Highlighter/Overlay.js
@@ -236,9 +236,9 @@ export default class Overlay {
       const rendererInterface =
         this.agent.getBestMatchingRendererInterface(node);
       if (rendererInterface) {
-        const id = rendererInterface.getFiberIDForNative(node, true);
+        const id = rendererInterface.getElementIDForNative(node, true);
         if (id) {
-          const ownerName = rendererInterface.getDisplayNameForFiberID(
+          const ownerName = rendererInterface.getDisplayNameForElementID(
             id,
             true,
           );
diff --git a/packages/react-devtools-shared/src/backend/views/Highlighter/index.js b/packages/react-devtools-shared/src/backend/views/Highlighter/index.js
index 3f1ad02dbfcf7..53a53c0009775 100644
--- a/packages/react-devtools-shared/src/backend/views/Highlighter/index.js
+++ b/packages/react-devtools-shared/src/backend/views/Highlighter/index.js
@@ -110,12 +110,12 @@ export default function setupHighlighter(
     }
 
     // In some cases fiber may already be unmounted
-    if (!renderer.hasFiberWithId(id)) {
+    if (!renderer.hasElementWithId(id)) {
       hideOverlay(agent);
       return;
     }
 
-    const nodes: ?Array<HTMLElement> = (renderer.findNativeNodesForFiberID(
+    const nodes: ?Array<HTMLElement> = (renderer.findNativeNodesForElementID(
       id,
     ): any);
 
@@ -157,7 +157,7 @@ export default function setupHighlighter(
     event.preventDefault();
     event.stopPropagation();
 
-    selectFiberForNode(getEventTarget(event));
+    selectElementForNode(getEventTarget(event));
   }
 
   let lastHoveredNode: HTMLElement | null = null;
@@ -186,7 +186,7 @@ export default function setupHighlighter(
     // It will be inferred from DOM tag and Fiber owner.
     showOverlay([target], null, agent, false);
 
-    selectFiberForNode(target);
+    selectElementForNode(target);
   }
 
   function onPointerUp(event: MouseEvent) {
@@ -194,11 +194,11 @@ export default function setupHighlighter(
     event.stopPropagation();
   }
 
-  const selectFiberForNode = throttle(
+  const selectElementForNode = throttle(
     memoize((node: HTMLElement) => {
       const id = agent.getIDForNode(node);
       if (id !== null) {
-        bridge.send('selectFiber', id);
+        bridge.send('selectElement', id);
       }
     }),
     200,
diff --git a/packages/react-devtools-shared/src/backendAPI.js b/packages/react-devtools-shared/src/backendAPI.js
index 718b1cb55bf79..d0d5c7951683a 100644
--- a/packages/react-devtools-shared/src/backendAPI.js
+++ b/packages/react-devtools-shared/src/backendAPI.js
@@ -48,7 +48,7 @@ export function clearErrorsForElement({
   id: number,
   rendererID: number,
 }): void {
-  bridge.send('clearErrorsForFiberID', {
+  bridge.send('clearErrorsForElementID', {
     rendererID,
     id,
   });
@@ -63,7 +63,7 @@ export function clearWarningsForElement({
   id: number,
   rendererID: number,
 }): void {
-  bridge.send('clearWarningsForFiberID', {
+  bridge.send('clearWarningsForElementID', {
     rendererID,
     id,
   });
diff --git a/packages/react-devtools-shared/src/bridge.js b/packages/react-devtools-shared/src/bridge.js
index afbf564988634..5747967c32c8c 100644
--- a/packages/react-devtools-shared/src/bridge.js
+++ b/packages/react-devtools-shared/src/bridge.js
@@ -195,7 +195,7 @@ export type BackendEvents = {
   profilingStatus: [boolean],
   reloadAppForProfiling: [],
   saveToClipboard: [string],
-  selectFiber: [number],
+  selectElement: [number],
   shutdown: [],
   stopInspectingNative: [boolean],
   syncSelectionFromNativeElementsPanel: [],
@@ -211,9 +211,9 @@ export type BackendEvents = {
 
 type FrontendEvents = {
   clearErrorsAndWarnings: [{rendererID: RendererID}],
-  clearErrorsForFiberID: [ElementAndRendererID],
+  clearErrorsForElementID: [ElementAndRendererID],
   clearNativeElementHighlight: [],
-  clearWarningsForFiberID: [ElementAndRendererID],
+  clearWarningsForElementID: [ElementAndRendererID],
   copyElementPath: [CopyElementPathParams],
   deletePath: [DeletePath],
   getBackendVersion: [],
@@ -231,7 +231,6 @@ type FrontendEvents = {
   reloadAndProfile: [boolean],
   renamePath: [RenamePath],
   savedPreferences: [SavedPreferencesParams],
-  selectFiber: [number],
   setTraceUpdatesEnabled: [boolean],
   shutdown: [],
   startInspectingNative: [],
diff --git a/packages/react-devtools-shared/src/devtools/views/Components/TreeContext.js b/packages/react-devtools-shared/src/devtools/views/Components/TreeContext.js
index 6d4dec6472b04..041d122c57d34 100644
--- a/packages/react-devtools-shared/src/devtools/views/Components/TreeContext.js
+++ b/packages/react-devtools-shared/src/devtools/views/Components/TreeContext.js
@@ -929,10 +929,10 @@ function TreeContextController({
 
   // Listen for host element selections.
   useEffect(() => {
-    const handleSelectFiber = (id: number) =>
+    const handleSelectElement = (id: number) =>
       dispatchWrapper({type: 'SELECT_ELEMENT_BY_ID', payload: id});
-    bridge.addListener('selectFiber', handleSelectFiber);
-    return () => bridge.removeListener('selectFiber', handleSelectFiber);
+    bridge.addListener('selectElement', handleSelectElement);
+    return () => bridge.removeListener('selectElement', handleSelectElement);
   }, [bridge, dispatchWrapper]);
 
   // If a newly-selected search result or inspection selection is inside of a collapsed subtree, auto expand it.
diff --git a/packages/react-devtools-shared/src/frontend/types.js b/packages/react-devtools-shared/src/frontend/types.js
index 10c2e62c20cbc..b2e7357970d00 100644
--- a/packages/react-devtools-shared/src/frontend/types.js
+++ b/packages/react-devtools-shared/src/frontend/types.js
@@ -119,7 +119,7 @@ export type Plugins = {
 
 export const StrictMode = 1;
 
-// Each element on the frontend corresponds to a Fiber on the backend.
+// Each element on the frontend corresponds to an ElementID (e.g. a Fiber) on the backend.
 // Some of its information (e.g. id, type, displayName) come from the backend.
 // Other bits (e.g. weight and depth) are computed on the frontend for windowing and display purposes.
 // Elements are updated on a push basis– meaning the backend pushes updates to the frontend when needed.