diff --git a/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx b/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
index 4b0d7ed9af..c23107f921 100644
--- a/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
+++ b/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
@@ -78,7 +78,7 @@ describe("DocumentOptions", () => {
             ),
           );
           dispatch(
-            actions.setActiveDocumentOrFormPreviewElement(initialActiveElement),
+            actions.setActiveBuilderPreviewElement(initialActiveElement),
           );
         },
       },
diff --git a/src/pageEditor/documentBuilder/edit/DocumentOptions.tsx b/src/pageEditor/documentBuilder/edit/DocumentOptions.tsx
index 2c2f30ddeb..6ad63bbda7 100644
--- a/src/pageEditor/documentBuilder/edit/DocumentOptions.tsx
+++ b/src/pageEditor/documentBuilder/edit/DocumentOptions.tsx
@@ -22,7 +22,7 @@ import ConfigErrorBoundary from "@/pageEditor/fields/ConfigErrorBoundary";
 import { joinName } from "@/utils/formUtils";
 import useAsyncEffect from "use-async-effect";
 import { useSelector } from "react-redux";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import ElementEditor from "@/pageEditor/documentBuilder/edit/ElementEditor";
 import ConnectedCollapsibleFieldSection from "@/pageEditor/fields/ConnectedCollapsibleFieldSection";
 import SchemaField from "@/components/fields/schemaFields/SchemaField";
@@ -37,7 +37,7 @@ const DocumentOptions: React.FC<{
   const documentConfigName = joinName(name, configKey);
   const documentBodyName = joinName(documentConfigName, "body");
 
-  const activeElement = useSelector(selectActiveDocumentOrFormPreviewElement);
+  const activeElement = useSelector(selectActiveBuilderPreviewElement);
 
   const [{ value: bodyValue }, , { setValue: setBodyValue }] =
     useField<DocumentBuilderElement[]>(documentBodyName);
diff --git a/src/pageEditor/documentBuilder/edit/ElementEditor.tsx b/src/pageEditor/documentBuilder/edit/ElementEditor.tsx
index fb2fb7ba3b..cd287c9db9 100644
--- a/src/pageEditor/documentBuilder/edit/ElementEditor.tsx
+++ b/src/pageEditor/documentBuilder/edit/ElementEditor.tsx
@@ -23,7 +23,7 @@ import MoveElement from "./MoveElement";
 import documentBuilderElementTypeLabels from "@/pageEditor/documentBuilder/elementTypeLabels";
 import useElementOptions from "@/pageEditor/documentBuilder/edit/useElementOptions";
 import { useSelector } from "react-redux";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import { getProperty } from "@/utils/objectUtils";
 import ConnectedCollapsibleFieldSection from "@/pageEditor/fields/ConnectedCollapsibleFieldSection";
 import { joinName } from "@/utils/formUtils";
@@ -34,7 +34,7 @@ type ElementEditorProps = {
 };
 
 const ElementEditor: React.FC<ElementEditorProps> = ({ documentBodyName }) => {
-  const activeElement = useSelector(selectActiveDocumentOrFormPreviewElement);
+  const activeElement = useSelector(selectActiveBuilderPreviewElement);
   const elementName = `${documentBodyName}.${activeElement}`;
   const [{ value: documentBuilderElement }] =
     useField<DocumentBuilderElement>(elementName);
diff --git a/src/pageEditor/documentBuilder/edit/RemoveElement.tsx b/src/pageEditor/documentBuilder/edit/RemoveElement.tsx
index 3a80d5419b..d5c06a2ad6 100644
--- a/src/pageEditor/documentBuilder/edit/RemoveElement.tsx
+++ b/src/pageEditor/documentBuilder/edit/RemoveElement.tsx
@@ -20,7 +20,7 @@ import { Button } from "react-bootstrap";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faTrash } from "@fortawesome/free-solid-svg-icons";
 import useDeleteElement from "@/pageEditor/documentBuilder/hooks/useDeleteElement";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import { useSelector } from "react-redux";
 
 type RemoveElementProps = {
@@ -28,7 +28,7 @@ type RemoveElementProps = {
 };
 
 const RemoveElement: React.FC<RemoveElementProps> = ({ documentBodyName }) => {
-  const activeElement = useSelector(selectActiveDocumentOrFormPreviewElement);
+  const activeElement = useSelector(selectActiveBuilderPreviewElement);
   const deleteElement = useDeleteElement(documentBodyName);
   const onDelete = async () => {
     await deleteElement(activeElement);
diff --git a/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts b/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
index 25a2a4f6f3..e0d40c5d11 100644
--- a/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
+++ b/src/pageEditor/documentBuilder/hooks/useDeleteElement.ts
@@ -32,7 +32,7 @@ function useDeleteElement(documentBodyName: string) {
 
   return useCallback(
     async (elementName: string) => {
-      dispatch(editorActions.setActiveDocumentOrFormPreviewElement(null));
+      dispatch(editorActions.setActiveBuilderPreviewElement(null));
 
       const { collectionName, elementIndex } = getElementCollectionName(
         [documentBodyName, elementName].join("."),
diff --git a/src/pageEditor/documentBuilder/hooks/useMoveElement.ts b/src/pageEditor/documentBuilder/hooks/useMoveElement.ts
index feb3120143..703de4cfd9 100644
--- a/src/pageEditor/documentBuilder/hooks/useMoveElement.ts
+++ b/src/pageEditor/documentBuilder/hooks/useMoveElement.ts
@@ -25,7 +25,7 @@ import { getIn, useField } from "formik";
 import { getAllowedChildTypes } from "@/pageEditor/documentBuilder/allowedElementTypes";
 import { useCallback } from "react";
 import useReduxState from "@/hooks/useReduxState";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
 
 // https://stackoverflow.com/a/6470794/402560
@@ -114,8 +114,8 @@ function useMoveElement(documentBodyName: string) {
     useField<DocumentBuilderElement[]>(documentBodyName);
 
   const [, setActiveElement] = useReduxState(
-    selectActiveDocumentOrFormPreviewElement,
-    editorActions.setActiveDocumentOrFormPreviewElement,
+    selectActiveBuilderPreviewElement,
+    editorActions.setActiveBuilderPreviewElement,
   );
 
   return useCallback(
diff --git a/src/pageEditor/documentBuilder/hooks/useMoveWithinParent.ts b/src/pageEditor/documentBuilder/hooks/useMoveWithinParent.ts
index 25a45d3018..1fb24adb74 100644
--- a/src/pageEditor/documentBuilder/hooks/useMoveWithinParent.ts
+++ b/src/pageEditor/documentBuilder/hooks/useMoveWithinParent.ts
@@ -16,7 +16,7 @@
  */
 
 import useReduxState from "@/hooks/useReduxState";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import { actions } from "@/pageEditor/slices/editorSlice";
 import { useField } from "formik";
 import { type DocumentBuilderElement } from "@/pageEditor/documentBuilder/documentBuilderTypes";
@@ -33,8 +33,8 @@ type MoveWithinParent = {
 
 function useMoveWithinParent(documentBodyName: string): MoveWithinParent {
   const [activeElement, setActiveElement] = useReduxState(
-    selectActiveDocumentOrFormPreviewElement,
-    actions.setActiveDocumentOrFormPreviewElement,
+    selectActiveBuilderPreviewElement,
+    actions.setActiveBuilderPreviewElement,
   );
 
   assertNotNullish(activeElement, "No active element found");
diff --git a/src/pageEditor/documentBuilder/hooks/useSelectParentElement.ts b/src/pageEditor/documentBuilder/hooks/useSelectParentElement.ts
index 1157b21823..43545b9a1f 100644
--- a/src/pageEditor/documentBuilder/hooks/useSelectParentElement.ts
+++ b/src/pageEditor/documentBuilder/hooks/useSelectParentElement.ts
@@ -36,9 +36,7 @@ function useSelectParentElement() {
   const dispatch = useDispatch();
   return (elementName: string) => {
     const parentElementName = getParentElementName(elementName);
-    dispatch(
-      editorActions.setActiveDocumentOrFormPreviewElement(parentElementName),
-    );
+    dispatch(editorActions.setActiveBuilderPreviewElement(parentElementName));
   };
 }
 
diff --git a/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx b/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx
index 8ac42ab6aa..11b976f5bb 100644
--- a/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx
+++ b/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx
@@ -78,7 +78,7 @@ const renderElementPreview = (
           formState.extension.blockPipeline[0].instanceId,
         ),
       );
-      dispatch(actions.setActiveDocumentOrFormPreviewElement("0"));
+      dispatch(actions.setActiveBuilderPreviewElement("0"));
     },
   });
 };
diff --git a/src/pageEditor/fields/FormModalOptions.tsx b/src/pageEditor/fields/FormModalOptions.tsx
index 4623c40955..02156020be 100644
--- a/src/pageEditor/fields/FormModalOptions.tsx
+++ b/src/pageEditor/fields/FormModalOptions.tsx
@@ -23,7 +23,7 @@ import FormEditor from "@/components/formBuilder/edit/FormEditor";
 import FormIntroFields from "@/components/formBuilder/edit/FormIntroFields";
 import useReduxState from "@/hooks/useReduxState";
 import ConfigErrorBoundary from "@/pageEditor/fields/ConfigErrorBoundary";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
 import FORM_FIELD_TYPE_OPTIONS from "@/pageEditor/fields/formFieldTypeOptions";
 import ConnectedCollapsibleFieldSection from "@/pageEditor/fields/ConnectedCollapsibleFieldSection";
@@ -63,8 +63,8 @@ const FormModalOptions: React.FC<{
   const configName = partial(joinName, baseName);
 
   const [activeElement, setActiveElement] = useReduxState(
-    selectActiveDocumentOrFormPreviewElement,
-    editorActions.setActiveDocumentOrFormPreviewElement,
+    selectActiveBuilderPreviewElement,
+    editorActions.setActiveBuilderPreviewElement,
   );
 
   return (
diff --git a/src/pageEditor/fields/FormRendererOptions.tsx b/src/pageEditor/fields/FormRendererOptions.tsx
index 1c1b6fb461..d2d21034cb 100644
--- a/src/pageEditor/fields/FormRendererOptions.tsx
+++ b/src/pageEditor/fields/FormRendererOptions.tsx
@@ -22,7 +22,7 @@ import FormEditor from "@/components/formBuilder/edit/FormEditor";
 import FormIntroFields from "@/components/formBuilder/edit/FormIntroFields";
 import useReduxState from "@/hooks/useReduxState";
 import ConfigErrorBoundary from "@/pageEditor/fields/ConfigErrorBoundary";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
 import { useField, useFormikContext } from "formik";
 import { partial } from "lodash";
@@ -273,8 +273,8 @@ const FormRendererOptions: React.FC<{
   const configName = makeName();
 
   const [activeElement, setActiveElement] = useReduxState(
-    selectActiveDocumentOrFormPreviewElement,
-    editorActions.setActiveDocumentOrFormPreviewElement,
+    selectActiveBuilderPreviewElement,
+    editorActions.setActiveBuilderPreviewElement,
   );
 
   return (
diff --git a/src/pageEditor/slices/editorSelectors.ts b/src/pageEditor/slices/editorSelectors.ts
index ad917c6071..efe6e7fa67 100644
--- a/src/pageEditor/slices/editorSelectors.ts
+++ b/src/pageEditor/slices/editorSelectors.ts
@@ -389,7 +389,7 @@ export function selectNodeDataPanelTabState(
 /**
  * Selects the active element of the Document or Form builder on the Preview tab
  */
-export function selectActiveDocumentOrFormPreviewElement(
+export function selectActiveBuilderPreviewElement(
   state: EditorRootState,
 ): Nullishable<string> {
   return selectNodeDataPanelTabState(state, DataPanelTabKey.Preview)
diff --git a/src/pageEditor/slices/editorSlice.test.ts b/src/pageEditor/slices/editorSlice.test.ts
index 98909009eb..4975df2a08 100644
--- a/src/pageEditor/slices/editorSlice.test.ts
+++ b/src/pageEditor/slices/editorSlice.test.ts
@@ -115,7 +115,7 @@ describe("DataPanel state", () => {
   test("should set the active element", () => {
     const editorState = editorSlice.reducer(
       state,
-      actions.setActiveDocumentOrFormPreviewElement("test-field"),
+      actions.setActiveBuilderPreviewElement("test-field"),
     );
 
     expect(
diff --git a/src/pageEditor/slices/editorSlice.ts b/src/pageEditor/slices/editorSlice.ts
index 60e1183cb9..8438368bbe 100644
--- a/src/pageEditor/slices/editorSlice.ts
+++ b/src/pageEditor/slices/editorSlice.ts
@@ -511,7 +511,7 @@ export const editorSlice = createSlice({
       const nodeUIState = validateNodeUIState(state);
       nodeUIState.dataPanel[tabKey].treeExpandedState = expandedState;
     },
-    setActiveDocumentOrFormPreviewElement(
+    setActiveBuilderPreviewElement(
       state,
       action: PayloadAction<string | null>,
     ) {
diff --git a/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx b/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx
index 132e25d54e..06c9a2a213 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx
@@ -42,7 +42,7 @@ import {
   selectActiveModComponentFormState,
   selectActiveNodeId,
   selectActiveNodeInfo,
-  selectActiveDocumentOrFormPreviewElement,
+  selectActiveBuilderPreviewElement,
 } from "@/pageEditor/slices/editorSelectors";
 import { actions as editorActions } from "@/pageEditor/slices/editorSlice";
 import Alert from "@/components/Alert";
@@ -173,13 +173,11 @@ const DataPanel: React.FC = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps -- We only want to report when `activeTabKey` changes
   }, [activeTabKey]);
 
-  const [
-    activeDocumentOrFormPreviewElement,
-    setActiveDocumentOrFormPreviewElement,
-  ] = useReduxState(
-    selectActiveDocumentOrFormPreviewElement,
-    editorActions.setActiveDocumentOrFormPreviewElement,
-  );
+  const [activeBuilderPreviewElement, setActiveBuilderPreviewElement] =
+    useReduxState(
+      selectActiveBuilderPreviewElement,
+      editorActions.setActiveBuilderPreviewElement,
+    );
 
   const popupBoundary = showDocumentPreview
     ? document.querySelector(`.${dataPanelStyles.tabContent}`)
@@ -372,14 +370,14 @@ const DataPanel: React.FC = () => {
                 {showFormPreview ? (
                   <FormPreview
                     rjsfSchema={brickConfig?.config as RJSFSchema}
-                    activeField={activeDocumentOrFormPreviewElement}
-                    setActiveField={setActiveDocumentOrFormPreviewElement}
+                    activeField={activeBuilderPreviewElement}
+                    setActiveField={setActiveBuilderPreviewElement}
                   />
                 ) : (
                   <DocumentPreview
                     documentBodyName={documentBodyFieldName}
-                    activeElement={activeDocumentOrFormPreviewElement}
-                    setActiveElement={setActiveDocumentOrFormPreviewElement}
+                    activeElement={activeBuilderPreviewElement}
+                    setActiveElement={setActiveBuilderPreviewElement}
                     menuBoundary={popupBoundary}
                   />
                 )}
@@ -412,8 +410,8 @@ const DataPanel: React.FC = () => {
               )}
               <DocumentOutline
                 documentBodyName={documentBodyFieldName}
-                activeElement={activeDocumentOrFormPreviewElement}
-                setActiveElement={setActiveDocumentOrFormPreviewElement}
+                activeElement={activeBuilderPreviewElement}
+                setActiveElement={setActiveBuilderPreviewElement}
               />
             </ErrorBoundary>
           </DataTab>
diff --git a/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx b/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx
index 946bbfe89a..0186f903bd 100644
--- a/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx
+++ b/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx
@@ -64,7 +64,7 @@ import {
   selectActiveModComponentFormState,
   selectActiveNodeId,
   selectCollapsedNodes,
-  selectActiveDocumentOrFormPreviewElement,
+  selectActiveBuilderPreviewElement,
   selectPipelineMap,
 } from "@/pageEditor/slices/editorSelectors";
 import { getRootPipelineFlavor } from "@/bricks/brickFilterHelpers";
@@ -212,7 +212,7 @@ const usePipelineNodes = (): {
     selectExtensionAnnotations(activeModComponentFormState.uuid),
   );
   const activeNodePreviewElementId = useSelector(
-    selectActiveDocumentOrFormPreviewElement,
+    selectActiveBuilderPreviewElement,
   );
 
   const isApiAtLeastV2 = useApiVersionAtLeast("v2");
@@ -319,7 +319,7 @@ const usePipelineNodes = (): {
 
     const onClick = () => {
       if (activeNodePreviewElementId) {
-        dispatch(actions.setActiveDocumentOrFormPreviewElement(null));
+        dispatch(actions.setActiveBuilderPreviewElement(null));
 
         if (isNodeActive) {
           return;
@@ -521,7 +521,7 @@ const usePipelineNodes = (): {
                 focus() {
                   setActiveNodeId(blockConfig.instanceId);
                   dispatch(
-                    editorActions.setActiveDocumentOrFormPreviewElement(
+                    editorActions.setActiveBuilderPreviewElement(
                       nodePreviewElementId,
                     ),
                   );
diff --git a/src/pageEditor/tabs/editTab/editorNodes/brickNode/BrickNode.tsx b/src/pageEditor/tabs/editTab/editorNodes/brickNode/BrickNode.tsx
index ff2cd29162..900de0a992 100644
--- a/src/pageEditor/tabs/editTab/editorNodes/brickNode/BrickNode.tsx
+++ b/src/pageEditor/tabs/editTab/editorNodes/brickNode/BrickNode.tsx
@@ -30,7 +30,7 @@ import {
   RunStatus,
 } from "@/pageEditor/tabs/editTab/editTabTypes";
 import { useSelector } from "react-redux";
-import { selectActiveDocumentOrFormPreviewElement } from "@/pageEditor/slices/editorSelectors";
+import { selectActiveBuilderPreviewElement } from "@/pageEditor/slices/editorSelectors";
 
 const useScrollIntoViewEffect = (
   active = false,
@@ -38,7 +38,7 @@ const useScrollIntoViewEffect = (
 ) => {
   const nodeRef = useRef<HTMLDivElement>(null);
   const activeNodePreviewElementId = useSelector(
-    selectActiveDocumentOrFormPreviewElement,
+    selectActiveBuilderPreviewElement,
   );
 
   useEffect(() => {