diff --git a/src/analysis/analysisVisitors/baseAnalysisVisitors.ts b/src/analysis/analysisVisitors/baseAnalysisVisitors.ts
index f7157c1424..c8ff2fe0e8 100644
--- a/src/analysis/analysisVisitors/baseAnalysisVisitors.ts
+++ b/src/analysis/analysisVisitors/baseAnalysisVisitors.ts
@@ -32,7 +32,7 @@ export abstract class AnalysisVisitorABC
 {
   abstract readonly id: string;
 
-  protected extension!: ModComponentFormState;
+  protected formState!: ModComponentFormState;
 
   protected readonly annotations: AnalysisAnnotation[] = [];
   getAnnotations(): AnalysisAnnotation[] {
@@ -40,21 +40,19 @@ export abstract class AnalysisVisitorABC
   }
 
   /**
-   * Visit the extension point definition.
+   * Visit the starter brick definition.
    */
-  visitExtensionPoint(
-    extensionPoint: ModComponentFormState["extensionPoint"],
-  ): void {
+  visitStarterBrick(starterBrick: ModComponentFormState["starterBrick"]): void {
     // NOP
   }
 
-  run(extension: ModComponentFormState): void {
-    this.extension = extension;
+  run(formState: ModComponentFormState): void {
+    this.formState = formState;
 
-    this.visitExtensionPoint(extension.extensionPoint);
+    this.visitStarterBrick(formState.starterBrick);
 
-    this.visitRootPipeline(extension.extension.blockPipeline, {
-      extensionPointType: extension.type,
+    this.visitRootPipeline(formState.modComponent.brickPipeline, {
+      starterBrickType: formState.type,
     });
   }
 }
@@ -62,9 +60,9 @@ export abstract class AnalysisVisitorABC
 export abstract class AnalysisVisitorWithResolvedBricksABC extends AnalysisVisitorABC {
   protected allBlocks!: TypedBrickMap;
 
-  override async run(extension: ModComponentFormState): Promise<void> {
+  override async run(formState: ModComponentFormState): Promise<void> {
     this.allBlocks = await blockRegistry.allTyped();
 
-    super.run(extension);
+    super.run(formState);
   }
 }
diff --git a/src/analysis/analysisVisitors/brickTypeAnalysis.test.ts b/src/analysis/analysisVisitors/brickTypeAnalysis.test.ts
index f85eed6d7c..a3981be8a9 100644
--- a/src/analysis/analysisVisitors/brickTypeAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/brickTypeAnalysis.test.ts
@@ -36,16 +36,16 @@ beforeAll(() => {
 
 describe("BrickTypeAnalysis", () => {
   test("disallow effect in renderer", async () => {
-    const modComponent = sidebarPanelFormStateFactory();
+    const formState = sidebarPanelFormStateFactory();
 
-    modComponent.extension.blockPipeline = [
+    formState.modComponent.brickPipeline = [
       createNewConfiguredBrick(ALERT_EFFECT_ID),
       createNewConfiguredBrick(DocumentRenderer.BRICK_ID),
     ];
 
     const analysis = new BrickTypeAnalysis();
 
-    await analysis.run(modComponent);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toHaveLength(1);
   });
@@ -55,16 +55,16 @@ describe("BrickTypeAnalysis", () => {
     CancelEffect.BRICK_ID,
     ErrorEffect.BRICK_ID,
   ])("allow %s in renderer", async (brickId) => {
-    const modComponent = sidebarPanelFormStateFactory();
+    const formState = sidebarPanelFormStateFactory();
 
-    modComponent.extension.blockPipeline = [
+    formState.modComponent.brickPipeline = [
       createNewConfiguredBrick(brickId),
       createNewConfiguredBrick(DocumentRenderer.BRICK_ID),
     ];
 
     const analysis = new BrickTypeAnalysis();
 
-    await analysis.run(modComponent);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toHaveLength(0);
   });
diff --git a/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.test.ts b/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.test.ts
index 73a17402be..5b31500ed4 100644
--- a/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.test.ts
@@ -28,7 +28,7 @@ import { toExpression } from "@/utils/expressionUtils";
 describe("checkEventNamesAnalysis", () => {
   it("error on missing custom event", async () => {
     const formState = triggerFormStateFactory();
-    formState.extensionPoint.definition.trigger = "custom";
+    formState.starterBrick.definition.trigger = "custom";
 
     const analysis = new CheckEventNamesAnalysis([formState]);
     await analysis.run(formState);
@@ -42,8 +42,8 @@ describe("checkEventNamesAnalysis", () => {
 
   it.each(["click"])("allow dom event: %s", async (eventName) => {
     const formState = triggerFormStateFactory();
-    formState.extensionPoint.definition.trigger = "custom";
-    formState.extensionPoint.definition.customEvent = { eventName };
+    formState.starterBrick.definition.trigger = "custom";
+    formState.starterBrick.definition.customEvent = { eventName };
 
     const analysis = new CheckEventNamesAnalysis([formState]);
     await analysis.run(formState);
@@ -53,8 +53,8 @@ describe("checkEventNamesAnalysis", () => {
 
   it("warn on unknown event", async () => {
     const formState = triggerFormStateFactory();
-    formState.extensionPoint.definition.trigger = "custom";
-    formState.extensionPoint.definition.customEvent = { eventName: "unknown" };
+    formState.starterBrick.definition.trigger = "custom";
+    formState.starterBrick.definition.customEvent = { eventName: "unknown" };
 
     const analysis = new CheckEventNamesAnalysis([formState]);
     await analysis.run(formState);
@@ -68,8 +68,8 @@ describe("checkEventNamesAnalysis", () => {
 
   it("allow known event", async () => {
     const triggerFormState = triggerFormStateFactory();
-    triggerFormState.extensionPoint.definition.trigger = "custom";
-    triggerFormState.extensionPoint.definition.customEvent = {
+    triggerFormState.starterBrick.definition.trigger = "custom";
+    triggerFormState.starterBrick.definition.customEvent = {
       eventName: "myevent",
     };
 
@@ -88,8 +88,8 @@ describe("checkEventNamesAnalysis", () => {
 
   it("info on unknown event with dynamic expressions", async () => {
     const triggerFormState = triggerFormStateFactory();
-    triggerFormState.extensionPoint.definition.trigger = "custom";
-    triggerFormState.extensionPoint.definition.customEvent = {
+    triggerFormState.starterBrick.definition.trigger = "custom";
+    triggerFormState.starterBrick.definition.customEvent = {
       eventName: "myevent",
     };
 
@@ -117,8 +117,8 @@ describe("checkEventNamesAnalysis", () => {
 
   it("get knownEventNames() combines known and trigger names", async () => {
     const triggerFormState = triggerFormStateFactory();
-    triggerFormState.extensionPoint.definition.trigger = "custom";
-    triggerFormState.extensionPoint.definition.customEvent = {
+    triggerFormState.starterBrick.definition.trigger = "custom";
+    triggerFormState.starterBrick.definition.customEvent = {
       eventName: "myevent",
     };
 
diff --git a/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.ts b/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.ts
index ae6c1d905e..a653cc970d 100644
--- a/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.ts
+++ b/src/analysis/analysisVisitors/eventNameAnalysis/checkEventNamesAnalysis.ts
@@ -49,23 +49,23 @@ class CheckEventNamesAnalysis extends AnalysisVisitorABC {
     ];
   }
 
-  override visitExtensionPoint(
-    extensionPoint: ModComponentFormState["extensionPoint"],
+  override visitStarterBrick(
+    starterBrick: ModComponentFormState["starterBrick"],
   ) {
-    super.visitExtensionPoint(extensionPoint);
+    super.visitStarterBrick(starterBrick);
 
     if (
-      isTriggerStarterBrick(extensionPoint) &&
-      extensionPoint.definition.trigger === "custom"
+      isTriggerStarterBrick(starterBrick) &&
+      starterBrick.definition.trigger === "custom"
     ) {
-      const eventName = extensionPoint.definition.customEvent?.eventName;
+      const eventName = starterBrick.definition.customEvent?.eventName;
 
       if (!eventName) {
         this.annotations.push({
           analysisId: this.id,
           type: AnnotationType.Error,
           message: "Custom event name is required",
-          position: { path: "extensionPoint.definition.customEvent.eventName" },
+          position: { path: "starterBrick.definition.customEvent.eventName" },
         });
       } else if (
         !DOM_EVENTS.includes(eventName) &&
@@ -79,7 +79,7 @@ class CheckEventNamesAnalysis extends AnalysisVisitorABC {
             type: AnnotationType.Info,
             message: `Custom event ${eventName} does not match a known emitted event in this Mod`,
             position: {
-              path: "extensionPoint.definition.customEvent.eventName",
+              path: "starterBrick.definition.customEvent.eventName",
             },
           });
         } else {
@@ -88,7 +88,7 @@ class CheckEventNamesAnalysis extends AnalysisVisitorABC {
             type: AnnotationType.Warning,
             message: `Custom event ${eventName} is not emitted in this Mod`,
             position: {
-              path: "extensionPoint.definition.customEvent.eventName",
+              path: "starterBrick.definition.customEvent.eventName",
             },
           });
         }
@@ -96,7 +96,7 @@ class CheckEventNamesAnalysis extends AnalysisVisitorABC {
     }
   }
 
-  override async run(extension: ModComponentFormState) {
+  override async run(formState: ModComponentFormState) {
     const results = this.formStates.map((x) =>
       CollectEventNamesVisitor.collectNames(x),
     );
@@ -111,7 +111,7 @@ class CheckEventNamesAnalysis extends AnalysisVisitorABC {
       hasDynamicEventName: results.some((result) => result.hasDynamicEventName),
     };
 
-    super.run(extension);
+    super.run(formState);
   }
 }
 
diff --git a/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.test.ts b/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.test.ts
index 88fb9b6c2a..671072eff3 100644
--- a/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.test.ts
+++ b/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.test.ts
@@ -27,7 +27,7 @@ import { toExpression } from "@/utils/expressionUtils";
 describe("collectEventNamesAnalysis", () => {
   it("collects event name from literal", () => {
     const formState = formStateFactory();
-    formState.extension.blockPipeline[0] = {
+    formState.modComponent.brickPipeline[0] = {
       id: CustomEventEffect.BRICK_ID,
       config: {
         eventName: "foo",
@@ -45,7 +45,7 @@ describe("collectEventNamesAnalysis", () => {
 
   it("collects event name from template literal", () => {
     const formState = formStateFactory();
-    formState.extension.blockPipeline[0] = {
+    formState.modComponent.brickPipeline[0] = {
       id: CustomEventEffect.BRICK_ID,
       config: {
         eventName: toExpression("nunjucks", "foo"),
@@ -63,7 +63,7 @@ describe("collectEventNamesAnalysis", () => {
 
   it("sets dynamic event flag", () => {
     const formState = formStateFactory();
-    formState.extension.blockPipeline[0] = {
+    formState.modComponent.brickPipeline[0] = {
       id: CustomEventEffect.BRICK_ID,
       config: {
         eventName: toExpression("nunjucks", "{{ @foo }}"),
@@ -81,8 +81,8 @@ describe("collectEventNamesAnalysis", () => {
 
   it("collects custom trigger names from trigger starter bricks", () => {
     const formState = triggerFormStateFactory();
-    formState.extensionPoint.definition.trigger = "custom";
-    formState.extensionPoint.definition.customEvent = {
+    formState.starterBrick.definition.trigger = "custom";
+    formState.starterBrick.definition.customEvent = {
       eventName: "foo",
     };
 
diff --git a/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.ts b/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.ts
index 292047f8d7..38f37ffa8e 100644
--- a/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.ts
+++ b/src/analysis/analysisVisitors/eventNameAnalysis/collectEventNamesVisitor.ts
@@ -62,10 +62,10 @@ class CollectEventNamesVisitor extends PipelineVisitor {
   }
 
   private visitStarterBrick(
-    extensionPoint: ModComponentFormState["extensionPoint"],
+    starterBrick: ModComponentFormState["starterBrick"],
   ) {
-    if (isTriggerStarterBrick(extensionPoint)) {
-      const eventName = extensionPoint.definition.customEvent?.eventName;
+    if (isTriggerStarterBrick(starterBrick)) {
+      const eventName = starterBrick.definition.customEvent?.eventName;
 
       if (eventName) {
         this._triggerNames.add(eventName);
@@ -98,8 +98,8 @@ class CollectEventNamesVisitor extends PipelineVisitor {
   ): EventNameAnalysisResult {
     const visitor = new CollectEventNamesVisitor();
 
-    visitor.visitRootPipeline(formState.extension.blockPipeline);
-    visitor.visitStarterBrick(formState.extensionPoint);
+    visitor.visitRootPipeline(formState.modComponent.brickPipeline);
+    visitor.visitStarterBrick(formState.starterBrick);
 
     return visitor.result;
   }
diff --git a/src/analysis/analysisVisitors/modComponentUrlPatternAnalysis.ts b/src/analysis/analysisVisitors/modComponentUrlPatternAnalysis.ts
index 64492c99e2..8676a5e081 100644
--- a/src/analysis/analysisVisitors/modComponentUrlPatternAnalysis.ts
+++ b/src/analysis/analysisVisitors/modComponentUrlPatternAnalysis.ts
@@ -31,11 +31,11 @@ const hostRegexp = /^(\*|(^(\*\.)?[^*/]+))$/;
 // All URLs is required for certain interactions, e.g., taking screenshots without activeTab
 const allUrls = "<all_urls>";
 
-const urlPatternFields = ["extensionPoint.definition.isAvailable.urlPatterns"];
+const urlPatternFields = ["starterBrick.definition.isAvailable.urlPatterns"];
 
 const stringUrlFields = [
-  "extensionPoint.definition.documentUrlPatterns",
-  "extensionPoint.definition.isAvailable.matchPatterns",
+  "starterBrick.definition.documentUrlPatterns",
+  "starterBrick.definition.isAvailable.matchPatterns",
   "permissions.origins",
 ];
 
diff --git a/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.test.ts b/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.test.ts
index 407ba8a359..6cd0499591 100644
--- a/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.test.ts
+++ b/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.test.ts
@@ -28,7 +28,7 @@ beforeAll(() => {
 describe("ModVariableSchemasVisitor", () => {
   it("collects event schema from a template literal", async () => {
     const formState = formStateFactory();
-    formState.extension.blockPipeline[0] = {
+    formState.modComponent.brickPipeline[0] = {
       id: AssignModVariable.BRICK_ID,
       config: {
         variableName: toExpression("nunjucks", "foo"),
@@ -44,7 +44,7 @@ describe("ModVariableSchemasVisitor", () => {
 
   it("unions known schemas", async () => {
     const formState = formStateFactory();
-    formState.extension.blockPipeline[0] = {
+    formState.modComponent.brickPipeline[0] = {
       id: AssignModVariable.BRICK_ID,
       config: {
         variableName: "foo",
@@ -52,7 +52,7 @@ describe("ModVariableSchemasVisitor", () => {
     };
 
     const otherFormState = formStateFactory();
-    otherFormState.extension.blockPipeline[0] = {
+    otherFormState.modComponent.brickPipeline[0] = {
       id: AssignModVariable.BRICK_ID,
       config: {
         variableName: "bar",
@@ -71,7 +71,7 @@ describe("ModVariableSchemasVisitor", () => {
 
   it("does not duplicate schemas", async () => {
     const formState = formStateFactory();
-    formState.extension.blockPipeline[0] = {
+    formState.modComponent.brickPipeline[0] = {
       id: AssignModVariable.BRICK_ID,
       config: {
         variableName: "foo",
@@ -79,7 +79,7 @@ describe("ModVariableSchemasVisitor", () => {
     };
 
     const otherFormState = formStateFactory();
-    otherFormState.extension.blockPipeline[0] = {
+    otherFormState.modComponent.brickPipeline[0] = {
       id: AssignModVariable.BRICK_ID,
       config: {
         variableName: "foo",
diff --git a/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.ts b/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.ts
index 2fcfb692dc..022f3bf889 100644
--- a/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.ts
+++ b/src/analysis/analysisVisitors/pageStateAnalysis/modVariableSchemasVisitor.ts
@@ -63,7 +63,7 @@ class ModVariableSchemasVisitor extends PipelineVisitor {
     const visitor = new ModVariableSchemasVisitor(allBlocks);
 
     for (const formState of formStates) {
-      visitor.visitRootPipeline(formState.extension.blockPipeline);
+      visitor.visitRootPipeline(formState.modComponent.brickPipeline);
     }
 
     // Schema promises return undefined if not page state
diff --git a/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.test.ts b/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.test.ts
index 1105ef41b2..2289a3682c 100644
--- a/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.test.ts
@@ -129,7 +129,9 @@ describe("PageStateAnalysis", () => {
         },
       ]);
 
-      state.recipe = { id: registryIdFactory() } as BaseFormState["recipe"];
+      state.modMetadata = {
+        id: registryIdFactory(),
+      } as BaseFormState["modMetadata"];
 
       const analysis = new PageStateAnalysis();
       await analysis.run(state);
diff --git a/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.ts b/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.ts
index 1bc4862ee5..339aad6923 100644
--- a/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.ts
+++ b/src/analysis/analysisVisitors/pageStateAnalysis/pageStateAnalysis.ts
@@ -97,9 +97,9 @@ class PageStateVisitor extends AnalysisVisitorWithResolvedBricksABC {
     }
   }
 
-  override async run(extension: ModComponentFormState): Promise<void> {
-    this.isInMod = Boolean(extension.recipe);
-    await super.run(extension);
+  override async run(formState: ModComponentFormState): Promise<void> {
+    this.isInMod = Boolean(formState.modMetadata);
+    await super.run(formState);
   }
 }
 
diff --git a/src/analysis/analysisVisitors/requestPermissionAnalysis.test.ts b/src/analysis/analysisVisitors/requestPermissionAnalysis.test.ts
index 985a6b11da..15ea49957f 100644
--- a/src/analysis/analysisVisitors/requestPermissionAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/requestPermissionAnalysis.test.ts
@@ -25,9 +25,9 @@ import { toExpression } from "@/utils/expressionUtils";
 browser.permissions.contains = jest.fn().mockResolvedValue(true);
 const containsMock = jest.mocked(browser.permissions.contains);
 
-function blockExtensionFactory(url: string) {
-  const extension = triggerFormStateFactory();
-  extension.extension.blockPipeline = [
+function brickModComponentFactory(url: string) {
+  const formState = triggerFormStateFactory();
+  formState.modComponent.brickPipeline = [
     brickConfigFactory({
       id: RemoteMethod.BLOCK_ID,
       config: {
@@ -36,7 +36,7 @@ function blockExtensionFactory(url: string) {
     }),
   ];
 
-  return extension;
+  return formState;
 }
 
 describe("requestPermissionAnalysis", () => {
@@ -47,9 +47,9 @@ describe("requestPermissionAnalysis", () => {
 
   test("it annotates http: url", async () => {
     const visitor = new RequestPermissionAnalysis();
-    const extension = blockExtensionFactory("http://example.com");
+    const formState = brickModComponentFactory("http://example.com");
 
-    await visitor.run(extension);
+    await visitor.run(formState);
     expect(visitor.getAnnotations()).toStrictEqual([
       {
         analysisId: "requestPermission",
@@ -57,7 +57,7 @@ describe("requestPermissionAnalysis", () => {
         message:
           "PixieBrix does not support calls using http: because they are insecure. Please use https: instead.",
         position: {
-          path: "extension.blockPipeline.0.config.url",
+          path: "modComponent.brickPipeline.0.config.url",
         },
       },
     ]);
@@ -65,16 +65,18 @@ describe("requestPermissionAnalysis", () => {
 
   test("it annotates invalid url", async () => {
     const visitor = new RequestPermissionAnalysis();
-    const extension = blockExtensionFactory("https://there is a space in here");
+    const formState = brickModComponentFactory(
+      "https://there is a space in here",
+    );
 
-    await visitor.run(extension);
+    await visitor.run(formState);
     expect(visitor.getAnnotations()).toStrictEqual([
       {
         analysisId: "requestPermission",
         type: "error",
         message: "Invalid URL: https://there is a space in here",
         position: {
-          path: "extension.blockPipeline.0.config.url",
+          path: "modComponent.brickPipeline.0.config.url",
         },
       },
     ]);
@@ -82,11 +84,11 @@ describe("requestPermissionAnalysis", () => {
 
   test("it annotates insufficient permissions", async () => {
     const visitor = new RequestPermissionAnalysis();
-    const extension = blockExtensionFactory("https://example.com");
+    const formState = brickModComponentFactory("https://example.com");
 
     containsMock.mockResolvedValue(false);
 
-    await visitor.run(extension);
+    await visitor.run(formState);
 
     expect(containsMock).toHaveBeenCalledWith({
       // Checking that the visitor applies a trailing slash. `contains` requires a path on the URL
@@ -105,7 +107,7 @@ describe("requestPermissionAnalysis", () => {
         message:
           "Insufficient browser permissions to make request. Specify an Integration to access the API, or add an Extra Permissions rule to the starter brick.",
         position: {
-          path: "extension.blockPipeline.0.config.url",
+          path: "modComponent.brickPipeline.0.config.url",
         },
       },
     ]);
@@ -113,9 +115,9 @@ describe("requestPermissionAnalysis", () => {
 
   test("skip relative URLs", async () => {
     const visitor = new RequestPermissionAnalysis();
-    const extension = blockExtensionFactory("/relative/url");
+    const formState = brickModComponentFactory("/relative/url");
 
-    await visitor.run(extension);
+    await visitor.run(formState);
 
     expect(visitor.getAnnotations()).toHaveLength(0);
   });
@@ -123,9 +125,9 @@ describe("requestPermissionAnalysis", () => {
   test("skips valid URLs", async () => {
     const visitor = new RequestPermissionAnalysis();
     containsMock.mockResolvedValue(true);
-    const extension = blockExtensionFactory("https://example.com");
+    const formState = brickModComponentFactory("https://example.com");
 
-    await visitor.run(extension);
+    await visitor.run(formState);
 
     expect(visitor.getAnnotations()).toHaveLength(0);
   });
diff --git a/src/analysis/analysisVisitors/selectorAnalysis.test.ts b/src/analysis/analysisVisitors/selectorAnalysis.test.ts
index 897f3e3391..3b4b7e9618 100644
--- a/src/analysis/analysisVisitors/selectorAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/selectorAnalysis.test.ts
@@ -73,19 +73,19 @@ describe("SelectorAnalysis", () => {
     async (attachMode: AttachMode) => {
       const analysis = new SelectorAnalysis();
 
-      const component = triggerFormStateFactory();
+      const formState = triggerFormStateFactory();
 
-      component.extensionPoint.definition.rootSelector = 'div:contains("foo")';
-      component.extensionPoint.definition.attachMode = attachMode;
+      formState.starterBrick.definition.rootSelector = 'div:contains("foo")';
+      formState.starterBrick.definition.attachMode = attachMode;
 
-      await analysis.run(component);
+      await analysis.run(formState);
 
       expect(analysis.getAnnotations()).toStrictEqual([
         {
           analysisId: "selector",
           message: expect.any(String),
           position: {
-            path: "extensionPoint.definition.rootSelector",
+            path: "starterBrick.definition.rootSelector",
           },
           type: expect.toBeOneOf(["warning", "info"]),
         },
@@ -96,18 +96,18 @@ describe("SelectorAnalysis", () => {
   it("detects invalid trigger selector", async () => {
     const analysis = new SelectorAnalysis();
 
-    const component = triggerFormStateFactory();
+    const formState = triggerFormStateFactory();
 
-    component.extensionPoint.definition.rootSelector = '!div:contains("foo")';
+    formState.starterBrick.definition.rootSelector = '!div:contains("foo")';
 
-    await analysis.run(component);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toStrictEqual([
       {
         analysisId: "selector",
         message: expect.any(String),
         position: {
-          path: "extensionPoint.definition.rootSelector",
+          path: "starterBrick.definition.rootSelector",
         },
         type: "error",
       },
@@ -119,20 +119,20 @@ describe("SelectorAnalysis", () => {
     async (attachMode: AttachMode) => {
       const analysis = new SelectorAnalysis();
 
-      const component = menuItemFormStateFactory();
+      const formState = menuItemFormStateFactory();
 
-      component.extensionPoint.definition.containerSelector =
+      formState.starterBrick.definition.containerSelector =
         'div:contains("foo")';
-      component.extensionPoint.definition.attachMode = attachMode;
+      formState.starterBrick.definition.attachMode = attachMode;
 
-      await analysis.run(component);
+      await analysis.run(formState);
 
       expect(analysis.getAnnotations()).toStrictEqual([
         {
           analysisId: "selector",
           message: expect.any(String),
           position: {
-            path: "extensionPoint.definition.containerSelector",
+            path: "starterBrick.definition.containerSelector",
           },
           type: expect.toBeOneOf(["warning", "info"]),
         },
@@ -143,18 +143,18 @@ describe("SelectorAnalysis", () => {
   it("detects invalid action location selector", async () => {
     const analysis = new SelectorAnalysis();
 
-    const component = menuItemFormStateFactory();
+    const formState = menuItemFormStateFactory();
 
-    component.extensionPoint.definition.containerSelector = "!div";
+    formState.starterBrick.definition.containerSelector = "!div";
 
-    await analysis.run(component);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toStrictEqual([
       {
         analysisId: "selector",
         message: "Invalid selector.",
         position: {
-          path: "extensionPoint.definition.containerSelector",
+          path: "starterBrick.definition.containerSelector",
         },
         type: "error",
       },
@@ -164,9 +164,9 @@ describe("SelectorAnalysis", () => {
   it("detects selectors passed to highlight brick", async () => {
     const analysis = new SelectorAnalysis();
 
-    const component = triggerFormStateFactory();
+    const formState = triggerFormStateFactory();
 
-    component.extension.blockPipeline = [
+    formState.modComponent.brickPipeline = [
       {
         id: highlight.id,
         config: {
@@ -180,14 +180,14 @@ describe("SelectorAnalysis", () => {
       },
     ];
 
-    await analysis.run(component);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toStrictEqual([
       {
         analysisId: "selector",
         message: expect.stringMatching(/Selector appears to contain generated/),
         position: {
-          path: "extension.blockPipeline.0.config.rootSelector",
+          path: "modComponent.brickPipeline.0.config.rootSelector",
         },
         type: "warning",
       },
@@ -195,7 +195,7 @@ describe("SelectorAnalysis", () => {
         analysisId: "selector",
         message: expect.stringMatching(/Selector appears to contain generated/),
         position: {
-          path: "extension.blockPipeline.0.config.elements.0.selector",
+          path: "modComponent.brickPipeline.0.config.elements.0.selector",
         },
         type: "warning",
       },
@@ -205,9 +205,9 @@ describe("SelectorAnalysis", () => {
   it("detects selectors passed to jquery brick", async () => {
     const analysis = new SelectorAnalysis();
 
-    const component = triggerFormStateFactory();
+    const formState = triggerFormStateFactory();
 
-    component.extension.blockPipeline = [
+    formState.modComponent.brickPipeline = [
       {
         id: reader.id,
         config: {
@@ -221,14 +221,14 @@ describe("SelectorAnalysis", () => {
       },
     ];
 
-    await analysis.run(component);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toStrictEqual([
       {
         analysisId: "selector",
         message: expect.stringMatching(/Selector appears to contain generated/),
         position: {
-          path: "extension.blockPipeline.0.config.selectors.simple",
+          path: "modComponent.brickPipeline.0.config.selectors.simple",
         },
         type: "warning",
       },
@@ -236,7 +236,7 @@ describe("SelectorAnalysis", () => {
         analysisId: "selector",
         message: expect.stringMatching(/Selector appears to contain generated/),
         position: {
-          path: "extension.blockPipeline.0.config.selectors.complex.selector",
+          path: "modComponent.brickPipeline.0.config.selectors.complex.selector",
         },
         type: "warning",
       },
diff --git a/src/analysis/analysisVisitors/selectorAnalysis.ts b/src/analysis/analysisVisitors/selectorAnalysis.ts
index 2f2d9eccac..859155013a 100644
--- a/src/analysis/analysisVisitors/selectorAnalysis.ts
+++ b/src/analysis/analysisVisitors/selectorAnalysis.ts
@@ -107,11 +107,11 @@ class SelectorAnalysis extends AnalysisVisitorWithResolvedBricksABC {
     await super.run(component);
   }
 
-  checkAction(component: ButtonFormState): void {
-    const selector = component.extensionPoint.definition.containerSelector;
+  checkAction(formState: ButtonFormState): void {
+    const selector = formState.starterBrick.definition.containerSelector;
 
     const position = {
-      path: "extensionPoint.definition.containerSelector",
+      path: "starterBrick.definition.containerSelector",
     };
 
     if (!isEmpty(selector)) {
@@ -127,7 +127,7 @@ class SelectorAnalysis extends AnalysisVisitorWithResolvedBricksABC {
       if (!isNativeCssSelector(selector)) {
         const matches = findJQueryExtensions(selector);
         const isWatch =
-          component.extensionPoint.definition.attachMode === "watch";
+          formState.starterBrick.definition.attachMode === "watch";
 
         let message = isWatch
           ? "Using a non-native CSS selector for location in watch mode. Button location selectors that use jQuery extensions may slow down the page."
@@ -150,11 +150,11 @@ class SelectorAnalysis extends AnalysisVisitorWithResolvedBricksABC {
     }
   }
 
-  checkTrigger(component: TriggerFormState): void {
-    const selector = component.extensionPoint.definition.rootSelector;
+  checkTrigger(formState: TriggerFormState): void {
+    const selector = formState.starterBrick.definition.rootSelector;
 
     const position = {
-      path: "extensionPoint.definition.rootSelector",
+      path: "starterBrick.definition.rootSelector",
     };
 
     if (selector) {
@@ -170,7 +170,7 @@ class SelectorAnalysis extends AnalysisVisitorWithResolvedBricksABC {
       if (!isNativeCssSelector(selector)) {
         const matches = findJQueryExtensions(selector);
         const isWatch =
-          component.extensionPoint.definition.attachMode === "watch";
+          formState.starterBrick.definition.attachMode === "watch";
 
         let message = isWatch
           ? "Using a non-native CSS selector in watch mode. Watching selectors that use jQuery extensions may slow down the page."
diff --git a/src/analysis/analysisVisitors/templateAnalysis.test.ts b/src/analysis/analysisVisitors/templateAnalysis.test.ts
index b80429810c..805119d276 100644
--- a/src/analysis/analysisVisitors/templateAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/templateAnalysis.test.ts
@@ -27,9 +27,9 @@ const position: BrickPosition = {
   path: "test.path.property",
 };
 
-function blockExtensionFactory(expression: Expression<unknown>) {
-  const extension = triggerFormStateFactory();
-  extension.extension.blockPipeline = [
+function httpBrickModComponentFactory(expression: Expression<unknown>) {
+  const formState = triggerFormStateFactory();
+  formState.modComponent.brickPipeline = [
     brickConfigFactory({
       id: RemoteMethod.BLOCK_ID,
       config: {
@@ -38,7 +38,7 @@ function blockExtensionFactory(expression: Expression<unknown>) {
     }),
   ];
 
-  return extension;
+  return formState;
 }
 
 describe("TemplateAnalysis", () => {
@@ -66,11 +66,11 @@ describe("TemplateAnalysis", () => {
     "accepts valid mustache [%s]",
     async (template) => {
       const analysis = new TemplateAnalysis();
-      const extension = blockExtensionFactory(
+      const formState = httpBrickModComponentFactory(
         toExpression("mustache", template),
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       expect(analysis.getAnnotations()).toHaveLength(0);
     },
@@ -80,11 +80,11 @@ describe("TemplateAnalysis", () => {
     "rejects mustache template in non-mustache expression [%s]",
     async (template) => {
       const analysis = new TemplateAnalysis();
-      const extension = blockExtensionFactory(
+      const formState = httpBrickModComponentFactory(
         toExpression("nunjucks", template),
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       expect(analysis.getAnnotations()).toHaveLength(1);
     },
@@ -96,11 +96,11 @@ describe("TemplateAnalysis", () => {
     "rejects invalid nunjucks [%s]",
     async (template) => {
       const analysis = new TemplateAnalysis();
-      const extension = blockExtensionFactory(
+      const formState = httpBrickModComponentFactory(
         toExpression("nunjucks", template),
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       expect(analysis.getAnnotations()).toHaveLength(1);
     },
diff --git a/src/analysis/analysisVisitors/templateAnalysis.ts b/src/analysis/analysisVisitors/templateAnalysis.ts
index f895cce9df..27c682d633 100644
--- a/src/analysis/analysisVisitors/templateAnalysis.ts
+++ b/src/analysis/analysisVisitors/templateAnalysis.ts
@@ -55,9 +55,9 @@ class TemplateAnalysis extends PipelineExpressionVisitor implements Analysis {
     return this.annotations;
   }
 
-  async run(extension: ModComponentFormState): Promise<void> {
-    this.visitRootPipeline(extension.extension.blockPipeline, {
-      extensionPointType: extension.type,
+  async run(formState: ModComponentFormState): Promise<void> {
+    this.visitRootPipeline(formState.modComponent.brickPipeline, {
+      starterBrickType: formState.type,
     });
 
     await Promise.all(this.nunjucksValidationPromises);
diff --git a/src/analysis/analysisVisitors/varAnalysis/varAnalysis.test.ts b/src/analysis/analysisVisitors/varAnalysis/varAnalysis.test.ts
index 8960a3d340..4e1cb94e0c 100644
--- a/src/analysis/analysisVisitors/varAnalysis/varAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/varAnalysis/varAnalysis.test.ts
@@ -26,7 +26,7 @@ import IfElse from "@/bricks/transformers/controlFlow/IfElse";
 import ForEach from "@/bricks/transformers/controlFlow/ForEach";
 import { EchoBrick } from "@/runtime/pipelineTests/pipelineTestHelpers";
 import { type ModComponentFormState } from "@/pageEditor/starterBricks/formStateTypes";
-import recipeRegistry from "@/modDefinitions/registry";
+import modRegistry from "@/modDefinitions/registry";
 import blockRegistry from "@/bricks/registry";
 import { SELF_EXISTENCE, VarExistence } from "./varMap";
 import TryExcept from "@/bricks/transformers/controlFlow/TryExcept";
@@ -104,8 +104,8 @@ jest.mock("@/bricks/registry", () => ({
 jest.mock("@/modDefinitions/registry");
 
 describe("Collecting available vars", () => {
-  function mockBlueprintWithOptions(optionsSchema: any) {
-    jest.mocked(recipeRegistry.lookup).mockResolvedValue(
+  function mockModWithOptions(optionsSchema: any) {
+    jest.mocked(modRegistry.lookup).mockResolvedValue(
       defaultModDefinitionFactory({
         options: {
           schema: optionsSchema,
@@ -125,7 +125,7 @@ describe("Collecting available vars", () => {
     });
 
     test("collects the context vars", async () => {
-      mockBlueprintWithOptions({
+      mockModWithOptions({
         properties: {
           foo: {
             type: "string",
@@ -133,7 +133,7 @@ describe("Collecting available vars", () => {
         },
       });
 
-      const extension = formStateFactory(
+      const formState = formStateFactory(
         {
           // Test both the PixieBrix api integration and a sample third-party service
           integrationDependencies: [
@@ -147,19 +147,19 @@ describe("Collecting available vars", () => {
           optionsArgs: {
             foo: "bar",
           },
-          recipe: modMetadataFactory({
-            id: validateRegistryId("test/recipe"),
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("test/mod"),
           }),
         },
         [brickConfigFactory()],
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const knownVars = analysis.getKnownVars();
       expect(knownVars.size).toBe(1);
 
-      const foundationKnownVars = knownVars.get("extension.blockPipeline.0");
+      const foundationKnownVars = knownVars.get("modComponent.brickPipeline.0");
       expect(foundationKnownVars.isVariableDefined("@input.title")).toBeTrue();
       expect(foundationKnownVars.isVariableDefined("@input.url")).toBeTrue();
       expect(foundationKnownVars.isVariableDefined("@input.lang")).toBeTrue();
@@ -177,24 +177,24 @@ describe("Collecting available vars", () => {
     });
 
     test("collects the output key", async () => {
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         brickConfigFactory({
           outputKey: validateOutputKey("foo"),
         }),
         brickConfigFactory(),
       ]);
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const block0Vars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
       expect(block0Vars.isVariableDefined("@foo")).toBeFalse();
 
       const block1Vars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.1");
+        .get("modComponent.brickPipeline.1");
 
       expect(block1Vars.isVariableDefined("@foo")).toBeTrue();
 
@@ -203,7 +203,7 @@ describe("Collecting available vars", () => {
     });
 
     test("collects the output key of a conditional block", async () => {
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         brickConfigFactory({
           if: true,
           outputKey: validateOutputKey("foo"),
@@ -211,17 +211,17 @@ describe("Collecting available vars", () => {
         brickConfigFactory(),
       ]);
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const block0Vars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
       expect(block0Vars.isVariableDefined("@foo")).toBeFalse();
 
       const block1Vars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.1");
+        .get("modComponent.brickPipeline.1");
 
       expect(block1Vars.isVariableDefined("@foo")).toBeTrue();
 
@@ -234,13 +234,13 @@ describe("Collecting available vars", () => {
     it("collects actual mod variables", async () => {
       const analysis = new VarAnalysis({ modState: { foo: 42 } });
 
-      const extension = formStateFactory({}, [brickConfigFactory()]);
+      const formState = formStateFactory({}, [brickConfigFactory()]);
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const foundationKnownVars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
       expect(foundationKnownVars.isVariableDefined("@mod")).toBeTrue();
       expect(foundationKnownVars.isVariableDefined("@mod.foo")).toBeTrue();
@@ -254,13 +254,13 @@ describe("Collecting available vars", () => {
         },
       });
 
-      const extension = formStateFactory({}, [brickConfigFactory()]);
+      const formState = formStateFactory({}, [brickConfigFactory()]);
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const foundationKnownVars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
       console.log(JSON.stringify(foundationKnownVars));
 
@@ -284,13 +284,13 @@ describe("Collecting available vars", () => {
     it("handles inferred mod variables", async () => {
       const analysis = new VarAnalysis({ modVariables: [{ foo: {} }] });
 
-      const extension = formStateFactory({}, [brickConfigFactory()]);
+      const formState = formStateFactory({}, [brickConfigFactory()]);
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const foundationKnownVars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
       expect(foundationKnownVars.isVariableDefined("@mod")).toBeTrue();
       expect(foundationKnownVars.isVariableDefined("@mod.foo")).toBeTrue();
@@ -298,34 +298,34 @@ describe("Collecting available vars", () => {
     });
   });
 
-  describe("blueprint @options", () => {
+  describe("mod @options", () => {
     beforeEach(() => {
       analysis = new VarAnalysis();
     });
 
     test.each([{}, null, undefined])("no options", async (optionsSchema) => {
-      mockBlueprintWithOptions(optionsSchema);
+      mockModWithOptions(optionsSchema);
 
-      const extension = formStateFactory(
+      const formState = formStateFactory(
         {
-          recipe: modMetadataFactory({
-            id: validateRegistryId("test/recipe"),
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("test/mod"),
           }),
         },
         [brickConfigFactory()],
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const foundationKnownVars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
       expect(foundationKnownVars.isVariableDefined("@options")).toBeFalse();
     });
 
-    test("read values from blueprint and extension", async () => {
-      mockBlueprintWithOptions({
+    test("read values from mod and mod component", async () => {
+      mockModWithOptions({
         properties: {
           foo: {
             type: "string",
@@ -336,36 +336,36 @@ describe("Collecting available vars", () => {
         },
       });
 
-      const extension = formStateFactory(
+      const formState = formStateFactory(
         {
-          // Let this extension to have a service reference
+          // Let this mod component have an integration reference
           optionsArgs: {
             bar: "qux",
             baz: "quux",
           },
-          recipe: modMetadataFactory({
-            id: validateRegistryId("test/recipe"),
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("test/mod"),
           }),
         },
         [brickConfigFactory()],
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const foundationKnownVars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0");
+        .get("modComponent.brickPipeline.0");
 
-      // A variable defined in the blueprint
+      // A variable defined in the mod
       expect(foundationKnownVars.isVariableDefined("@options.foo")).toBeTrue();
-      // A variable defined in the blueprint and extension options
+      // A variable defined in the mod and mod component options
       expect(foundationKnownVars.isVariableDefined("@options.bar")).toBeTrue();
-      // A variable defined in the extension options but not in the blueprint
+      // A variable defined in the mod component options but not in the mod
       expect(foundationKnownVars.isVariableDefined("@options.baz")).toBeTrue();
     });
 
     test("sets DEFINITELY for required options", async () => {
-      mockBlueprintWithOptions({
+      mockModWithOptions({
         properties: {
           foo: {
             type: "string",
@@ -377,29 +377,29 @@ describe("Collecting available vars", () => {
         required: ["foo"],
       });
 
-      const extension = formStateFactory(
+      const formState = formStateFactory(
         {
-          recipe: modMetadataFactory({
-            id: validateRegistryId("test/recipe"),
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("test/mod"),
           }),
         },
         [brickConfigFactory()],
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const knownVars = analysis.getKnownVars();
 
-      const optionsVars = knownVars.get("extension.blockPipeline.0").getMap()[
-        "options:test/recipe"
-      ]["@options"];
+      const optionsVars = knownVars
+        .get("modComponent.brickPipeline.0")
+        .getMap()["options:test/mod"]["@options"];
 
       expect(optionsVars.foo[SELF_EXISTENCE]).toBe(VarExistence.DEFINITELY);
       expect(optionsVars.bar[SELF_EXISTENCE]).toBe(VarExistence.MAYBE);
     });
 
     test("sets DEFINITELY for the actually set values", async () => {
-      mockBlueprintWithOptions({
+      mockModWithOptions({
         properties: {
           foo: {
             type: "string",
@@ -407,10 +407,10 @@ describe("Collecting available vars", () => {
         },
       });
 
-      const extension = formStateFactory(
+      const formState = formStateFactory(
         {
-          recipe: modMetadataFactory({
-            id: validateRegistryId("test/recipe"),
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("test/mod"),
           }),
           optionsArgs: {
             foo: "bar",
@@ -419,13 +419,13 @@ describe("Collecting available vars", () => {
         [brickConfigFactory()],
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const knownVars = analysis.getKnownVars();
 
-      const optionsVars = knownVars.get("extension.blockPipeline.0").getMap()[
-        "options:test/recipe"
-      ]["@options"];
+      const optionsVars = knownVars
+        .get("modComponent.brickPipeline.0")
+        .getMap()["options:test/mod"]["@options"];
 
       expect(optionsVars.foo[SELF_EXISTENCE]).toBe(VarExistence.DEFINITELY);
     });
@@ -435,7 +435,7 @@ describe("Collecting available vars", () => {
     const outputKey = validateOutputKey("foo");
 
     async function runAnalysisWithOutputSchema(outputSchema: Schema) {
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         brickConfigFactory({
           outputKey,
         }),
@@ -444,7 +444,7 @@ describe("Collecting available vars", () => {
       jest.mocked(blockRegistry.allTyped).mockResolvedValue(
         new Map([
           [
-            extension.extension.blockPipeline[0].id,
+            formState.modComponent.brickPipeline[0].id,
             {
               block: {
                 // HtmlReader's output schema, see @/bricks/readers/HtmlReader.ts
@@ -455,9 +455,9 @@ describe("Collecting available vars", () => {
         ]) as any,
       );
 
-      await analysis.run(extension);
+      await analysis.run(formState);
 
-      return analysis.getKnownVars().get("extension.blockPipeline.1");
+      return analysis.getKnownVars().get("modComponent.brickPipeline.1");
     }
 
     test("reads output schema of a block when defined", async () => {
@@ -729,28 +729,28 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         ifElseBlock,
         brickConfigFactory(),
       ]);
 
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds if-else output after the brick", async () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.1")
+          .get("modComponent.brickPipeline.1")
           .isVariableDefined("@ifOutput"),
       ).toBeTrue();
     });
 
     test.each([
-      "extension.blockPipeline.0.config.if.__value__.0",
-      "extension.blockPipeline.0.config.if.__value__.1",
-      "extension.blockPipeline.0.config.else.__value__.0",
-      "extension.blockPipeline.0.config.else.__value__.1",
+      "modComponent.brickPipeline.0.config.if.__value__.0",
+      "modComponent.brickPipeline.0.config.if.__value__.1",
+      "modComponent.brickPipeline.0.config.else.__value__.0",
+      "modComponent.brickPipeline.0.config.else.__value__.1",
     ])(
       "doesn't add if-else output to sub pipelines (%s)",
       async (blockPath) => {
@@ -763,7 +763,7 @@ describe("Collecting available vars", () => {
     test("doesn't leak sub pipeline outputs", async () => {
       const block1Vars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.1");
+        .get("modComponent.brickPipeline.1");
       expect(block1Vars.isVariableDefined("@foo")).toBeFalse();
       expect(block1Vars.isVariableDefined("@bar")).toBeFalse();
     });
@@ -793,16 +793,16 @@ describe("Collecting available vars", () => {
         ]),
       );
 
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         brickConfiguration,
         brickConfiguration,
       ]);
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
 
       const knownVars = analysis.getKnownVars();
-      const varMap = knownVars.get("extension.blockPipeline.1");
+      const varMap = knownVars.get("modComponent.brickPipeline.1");
 
       // Check optional chaining handled for first variable
       expect(varMap.isVariableDefined("@input")).toBeTrue();
@@ -840,16 +840,16 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [documentRendererBrick]);
+      const formState = formStateFactory(undefined, [documentRendererBrick]);
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds the list element key list body", () => {
       const knownVars = analysis.getKnownVars();
       const listElementVarMap = knownVars.get(
-        "extension.blockPipeline.0.config.body.0.config.element.__value__",
+        "modComponent.brickPipeline.0.config.body.0.config.element.__value__",
       );
 
       expect(listElementVarMap.isVariableDefined("@element")).toBeTrue();
@@ -865,7 +865,7 @@ describe("Collecting available vars", () => {
         'Variable "@foo" might not be defined',
       );
       expect(annotations[0].position.path).toBe(
-        "extension.blockPipeline.0.config.body.0.config.element.__value__.config.text",
+        "modComponent.brickPipeline.0.config.body.0.config.element.__value__.config.text",
       );
 
       // Not available in to the peer element to the list
@@ -873,7 +873,7 @@ describe("Collecting available vars", () => {
         'Variable "@element" might not be defined',
       );
       expect(annotations[1].position.path).toBe(
-        "extension.blockPipeline.0.config.body.1.config.text",
+        "modComponent.brickPipeline.0.config.body.1.config.text",
       );
     });
   });
@@ -908,16 +908,16 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [documentRendererBrick]);
+      const formState = formStateFactory(undefined, [documentRendererBrick]);
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds the list element key list body", () => {
       const knownVars = analysis.getKnownVars();
       const buttonPipelineVarMap = knownVars.get(
-        "extension.blockPipeline.0.config.body.0.config.element.__value__.children.0.children.0.config.onClick.__value__.0",
+        "modComponent.brickPipeline.0.config.body.0.config.element.__value__.children.0.children.0.config.onClick.__value__.0",
       );
 
       expect(buttonPipelineVarMap.isVariableDefined("@input")).toBeTrue();
@@ -934,7 +934,7 @@ describe("Collecting available vars", () => {
         message: 'Variable "@foo" might not be defined',
         type: "warning",
         position: {
-          path: "extension.blockPipeline.0.config.body.0.config.element.__value__.children.0.children.0.config.onClick.__value__.0.config.text",
+          path: "modComponent.brickPipeline.0.config.body.0.config.element.__value__.children.0.children.0.config.onClick.__value__.0.config.text",
         },
         detail: {
           expression: expect.toBeObject(),
@@ -955,20 +955,20 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         tryExceptBlock,
         brickConfigFactory(),
       ]);
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds the error key to the except branch", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.0.config.except.__value__.0")
+          .get("modComponent.brickPipeline.0.config.except.__value__.0")
           .isVariableDefined("@error"),
       ).toBeTrue();
     });
@@ -977,7 +977,7 @@ describe("Collecting available vars", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.0.config.try.__value__.0")
+          .get("modComponent.brickPipeline.0.config.try.__value__.0")
           .isVariableDefined("@error"),
       ).toBeFalse();
     });
@@ -995,20 +995,20 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         forEachBlock,
         brickConfigFactory(),
       ]);
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds the element key to the sub pipeline", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.0.config.body.__value__.0")
+          .get("modComponent.brickPipeline.0.config.body.__value__.0")
           .isVariableDefined("@element"),
       ).toBeTrue();
     });
@@ -1031,27 +1031,27 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         forEachBlock,
         brickConfigFactory(),
       ]);
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds for-each output after the brick", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.1")
+          .get("modComponent.brickPipeline.1")
           .isVariableDefined("@forEachOutput"),
       ).toBeTrue();
     });
 
     test.each([
-      "extension.blockPipeline.0.config.body.__value__.0",
-      "extension.blockPipeline.0.config.body.__value__.1",
+      "modComponent.brickPipeline.0.config.body.__value__.0",
+      "modComponent.brickPipeline.0.config.body.__value__.1",
     ])("doesn't add for-each output to sub pipelines (%s)", (blockPath) => {
       expect(
         analysis
@@ -1065,7 +1065,7 @@ describe("Collecting available vars", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.1")
+          .get("modComponent.brickPipeline.1")
           .isVariableDefined("@foo"),
       ).toBeFalse();
     });
@@ -1074,7 +1074,7 @@ describe("Collecting available vars", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.0.config.body.__value__.0")
+          .get("modComponent.brickPipeline.0.config.body.__value__.0")
           .isVariableDefined("@element"),
       ).toBeTrue();
     });
@@ -1083,18 +1083,18 @@ describe("Collecting available vars", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.1")
+          .get("modComponent.brickPipeline.1")
           .isVariableDefined("@element"),
       ).toBeFalse();
     });
 
     test.each([
-      "extension.blockPipeline.0.config.body.__value__.0",
-      "extension.blockPipeline.0.config.body.__value__.1",
+      "modComponent.brickPipeline.0.config.body.__value__.0",
+      "modComponent.brickPipeline.0.config.body.__value__.1",
     ])("source of the @element key if the For-Each block (%s)", (blockPath) => {
       const blockVars = analysis.getKnownVars().get(blockPath).getMap();
 
-      const expectedForEachBlockPath = "extension.blockPipeline.0";
+      const expectedForEachBlockPath = "modComponent.brickPipeline.0";
 
       // Find the source that provided the @element variable
       const actualForEachBlockPath = Object.entries(blockVars).find(
@@ -1122,7 +1122,7 @@ describe("Collecting available vars", () => {
         },
       };
 
-      const extension = formStateFactory(undefined, [
+      const formState = formStateFactory(undefined, [
         customFormBlock,
         brickConfigFactory(),
       ]);
@@ -1140,14 +1140,14 @@ describe("Collecting available vars", () => {
       );
 
       analysis = new VarAnalysis();
-      await analysis.run(extension);
+      await analysis.run(formState);
     });
 
     test("adds the `values` to the onsubmit handler", () => {
       expect(
         analysis
           .getKnownVars()
-          .get("extension.blockPipeline.0.config.onSubmit.__value__.0")
+          .get("modComponent.brickPipeline.0.config.onSubmit.__value__.0")
           .isVariableDefined("@values"),
       ).toBeTrue();
     });
@@ -1155,7 +1155,7 @@ describe("Collecting available vars", () => {
     test("adds the form fields to the onsubmit handler", () => {
       const blockVars = analysis
         .getKnownVars()
-        .get("extension.blockPipeline.0.config.onSubmit.__value__.0");
+        .get("modComponent.brickPipeline.0.config.onSubmit.__value__.0");
 
       expect(blockVars.isVariableDefined("@values.foo")).toBeTrue();
       expect(blockVars.isVariableDefined("@values.bar")).toBeFalse();
@@ -1164,7 +1164,7 @@ describe("Collecting available vars", () => {
 });
 
 describe("Invalid template", () => {
-  let extension: ModComponentFormState;
+  let formState: ModComponentFormState;
   let analysis: VarAnalysis;
 
   beforeEach(() => {
@@ -1187,30 +1187,30 @@ describe("Invalid template", () => {
       },
     };
 
-    extension = formStateFactory(undefined, [invalidEchoBlock, validEchoBlock]);
+    formState = formStateFactory(undefined, [invalidEchoBlock, validEchoBlock]);
 
     analysis = new VarAnalysis();
   });
 
   test("analysis doesn't throw", async () => {
-    await expect(analysis.run(extension)).toResolve();
+    await expect(analysis.run(formState)).toResolve();
   });
 
   test("analysis doesn't annotate invalid template", async () => {
-    await analysis.run(extension);
+    await analysis.run(formState);
     const annotations = analysis.getAnnotations();
 
     // Only the second (index = 1) block should be annotated
     expect(annotations).toHaveLength(1);
     expect(annotations[0].position.path).toBe(
-      "extension.blockPipeline.1.config.message",
+      "modComponent.brickPipeline.1.config.message",
     );
   });
 });
 
 describe("var expression annotations", () => {
   test("doesn't annotate valid expressions", async () => {
-    const extension = formStateFactory(undefined, [
+    const formState = formStateFactory(undefined, [
       brickConfigFactory({
         outputKey: validateOutputKey("foo"),
       }),
@@ -1223,13 +1223,13 @@ describe("var expression annotations", () => {
     ]);
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toHaveLength(0);
   });
 
   test("doesn't annotate empty variable", async () => {
-    const extension = formStateFactory(undefined, [
+    const formState = formStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1239,13 +1239,13 @@ describe("var expression annotations", () => {
     ]);
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     expect(analysis.getAnnotations()).toHaveLength(0);
   });
 
   test("annotates variable which doesn't start with @", async () => {
-    const extension = formStateFactory(undefined, [
+    const formState = formStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1255,7 +1255,7 @@ describe("var expression annotations", () => {
     ]);
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     const annotations = analysis.getAnnotations();
     expect(annotations).toHaveLength(1);
@@ -1265,7 +1265,7 @@ describe("var expression annotations", () => {
   });
 
   test("annotates variable which is just whitespace", async () => {
-    const extension = formStateFactory(undefined, [
+    const formState = formStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1275,7 +1275,7 @@ describe("var expression annotations", () => {
     ]);
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     const annotations = analysis.getAnnotations();
     expect(annotations).toHaveLength(1);
@@ -1283,7 +1283,7 @@ describe("var expression annotations", () => {
   });
 
   test("return a generic error message for a single @ character", async () => {
-    const extension = formStateFactory(undefined, [
+    const formState = formStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1293,7 +1293,7 @@ describe("var expression annotations", () => {
     ]);
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     const annotations = analysis.getAnnotations();
     expect(annotations).toHaveLength(1);
@@ -1303,7 +1303,7 @@ describe("var expression annotations", () => {
 
 describe("var analysis integration tests", () => {
   it("should handle trigger event", async () => {
-    const extension = triggerFormStateFactory(undefined, [
+    const formState = triggerFormStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1315,17 +1315,17 @@ describe("var analysis integration tests", () => {
       },
     ]);
 
-    extension.extensionPoint.definition.trigger = "keypress";
+    formState.starterBrick.definition.trigger = "keypress";
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     const annotations = analysis.getAnnotations();
     expect(annotations).toHaveLength(0);
   });
 
   it("should handle trigger custom event", async () => {
-    const extension = triggerFormStateFactory(undefined, [
+    const formState = triggerFormStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1337,17 +1337,17 @@ describe("var analysis integration tests", () => {
       },
     ]);
 
-    extension.extensionPoint.definition.trigger = "custom";
+    formState.starterBrick.definition.trigger = "custom";
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     const annotations = analysis.getAnnotations();
     expect(annotations).toHaveLength(0);
   });
 
   it("should handle trigger selectionchange event", async () => {
-    const extension = triggerFormStateFactory(undefined, [
+    const formState = triggerFormStateFactory(undefined, [
       {
         id: EchoBrick.BLOCK_ID,
         config: {
@@ -1360,10 +1360,10 @@ describe("var analysis integration tests", () => {
       },
     ]);
 
-    extension.extensionPoint.definition.trigger = "selectionchange";
+    formState.starterBrick.definition.trigger = "selectionchange";
 
     const analysis = new VarAnalysis();
-    await analysis.run(extension);
+    await analysis.run(formState);
 
     const annotations = analysis.getAnnotations();
     expect(annotations).toHaveLength(1);
diff --git a/src/analysis/analysisVisitors/varAnalysis/varAnalysis.ts b/src/analysis/analysisVisitors/varAnalysis/varAnalysis.ts
index 90c030868c..08e2b4ccdb 100644
--- a/src/analysis/analysisVisitors/varAnalysis/varAnalysis.ts
+++ b/src/analysis/analysisVisitors/varAnalysis/varAnalysis.ts
@@ -34,7 +34,7 @@ import {
 import VarMap, { VarExistence } from "./varMap";
 import { type TraceRecord } from "@/telemetry/trace";
 import parseTemplateVariables from "./parseTemplateVariables";
-import recipesRegistry from "@/modDefinitions/registry";
+import modRegistry from "@/modDefinitions/registry";
 import blockRegistry, { type TypedBrickMap } from "@/bricks/registry";
 import {
   isDocumentBuilderElementArray,
@@ -133,22 +133,22 @@ async function setIntegrationDependencyVars(
 }
 
 /**
- * Set the input variables from the ExtensionPoint definition (aka starter brick).
+ * Set the input variables from the starter brick definition.
  */
 async function setInputVars(
-  extension: ModComponentFormState,
+  formState: ModComponentFormState,
   contextVars: VarMap,
 ): Promise<void> {
-  const adapter = ADAPTERS.get(extension.extensionPoint.definition.type);
+  const adapter = ADAPTERS.get(formState.starterBrick.definition.type);
   assertNotNullish(
     adapter,
-    `Adapter not found for ${extension.extensionPoint.definition.type}`,
+    `Adapter not found for ${formState.starterBrick.definition.type}`,
   );
-  const config = adapter.selectStarterBrickDefinition(extension);
+  const config = adapter.selectStarterBrickDefinition(formState);
 
-  const extensionPoint = fromJS(config);
+  const starterBrick = fromJS(config);
 
-  const reader = await extensionPoint.defaultReader();
+  const reader = await starterBrick.defaultReader();
 
   setVarsFromSchema({
     schema: reader?.outputSchema ?? {
@@ -193,7 +193,7 @@ type SetVarsFromSchemaArgs = {
  * Helper method to set variables based on a JSON Schema.
  *
  * Examples:
- * - Blueprint input schema
+ * - Mod input schema
  * - Brick output schema
  * - Integration configuration schema
  */
@@ -304,24 +304,24 @@ function setVarsFromSchema({
 }
 
 /**
- * Set the options variables from the blueprint option definitions.
+ * Set the options variables from the mod option definitions.
  */
 async function setOptionsVars(
-  extension: ModComponentFormState,
+  formState: ModComponentFormState,
   contextVars: VarMap,
 ): Promise<void> {
-  if (extension.recipe == null) {
+  if (formState.modMetadata == null) {
     return;
   }
 
-  const recipeId = extension.recipe.id;
-  const recipe = await recipesRegistry.lookup(recipeId);
-  const optionsSchema = recipe?.options?.schema;
+  const modId = formState.modMetadata.id;
+  const mod = await modRegistry.lookup(modId);
+  const optionsSchema = mod?.options?.schema;
   if (isEmpty(optionsSchema)) {
     return;
   }
 
-  const source = `${KnownSources.OPTIONS}:${recipeId}`;
+  const source = `${KnownSources.OPTIONS}:${modId}`;
   const optionsOutputKey = "@options";
 
   setVarsFromSchema({
@@ -332,7 +332,7 @@ async function setOptionsVars(
   });
 
   // Options currently only supports primitives, so don't need to recurse
-  for (const optionName of Object.keys(extension.optionsArgs ?? {})) {
+  for (const optionName of Object.keys(formState.optionsArgs ?? {})) {
     contextVars.setExistence({
       source,
       path: [optionsOutputKey, optionName],
@@ -452,7 +452,7 @@ class VarAnalysis extends PipelineExpressionVisitor implements Analysis {
   }
 
   /**
-   * @param trace the trace for the latest run of the extension
+   * @param trace the trace for the latest run of the mod component
    * @param modState the current mod page state
    * @param modVariables statically-inferred mod variable names
    * @see CollectNamesVisitor
@@ -682,23 +682,23 @@ class VarAnalysis extends PipelineExpressionVisitor implements Analysis {
     this.contextStack.pop();
   }
 
-  async run(extension: ModComponentFormState): Promise<void> {
+  async run(formState: ModComponentFormState): Promise<void> {
     this.allBlocks = await blockRegistry.allTyped();
 
     // Order of the following calls will determine the order of the sources in the UI
     const contextVars = new VarMap();
-    await setOptionsVars(extension, contextVars);
+    await setOptionsVars(formState, contextVars);
     await setModVariables(this.modVariables, this.modState, contextVars);
-    await setIntegrationDependencyVars(extension, contextVars);
-    await setInputVars(extension, contextVars);
+    await setIntegrationDependencyVars(formState, contextVars);
+    await setInputVars(formState, contextVars);
 
     this.contextStack.push({
       vars: contextVars,
       blockOutputVars: new VarMap(),
     });
 
-    this.visitRootPipeline(extension.extension.blockPipeline, {
-      extensionPointType: extension.type,
+    this.visitRootPipeline(formState.modComponent.brickPipeline, {
+      starterBrickType: formState.type,
     });
   }
 
diff --git a/src/bricks/PipelineExpressionVisitor.test.ts b/src/bricks/PipelineExpressionVisitor.test.ts
index 6399f17463..144db7acc2 100644
--- a/src/bricks/PipelineExpressionVisitor.test.ts
+++ b/src/bricks/PipelineExpressionVisitor.test.ts
@@ -19,7 +19,7 @@ import { DocumentRenderer } from "@/bricks/renderers/document";
 import { type BrickPosition, type BrickPipeline } from "@/bricks/types";
 import { createNewDocumentBuilderElement } from "@/pageEditor/documentBuilder/createNewDocumentBuilderElement";
 import { type Expression } from "@/types/runtimeTypes";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import PipelineExpressionVisitor from "./PipelineExpressionVisitor";
 import { brickConfigFactory } from "@/testUtils/factories/brickFactories";
 import { toExpression } from "@/utils/expressionUtils";
@@ -52,13 +52,13 @@ test("should invoke the callback for a brick expression", () => {
   expect(visitExpression).toHaveBeenCalledTimes(2);
   expect(visitExpression).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.text`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.text`,
     },
     toExpression("nunjucks", "test"),
   );
   expect(visitExpression).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.if`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.if`,
     },
     toExpression("var", "@foo"),
   );
@@ -96,7 +96,7 @@ test("should invoke the callback for a Document expression", () => {
 
   expect(visitExpression).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.text`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.text`,
     },
     toExpression("nunjucks", "test"),
   );
diff --git a/src/bricks/PipelineVisitor.test.ts b/src/bricks/PipelineVisitor.test.ts
index 2010382a51..fd1a3d58ac 100644
--- a/src/bricks/PipelineVisitor.test.ts
+++ b/src/bricks/PipelineVisitor.test.ts
@@ -19,7 +19,7 @@ import { DocumentRenderer } from "@/bricks/renderers/document";
 import ForEach from "@/bricks/transformers/controlFlow/ForEach";
 import { type BrickPosition, type BrickConfig } from "@/bricks/types";
 import { createNewDocumentBuilderElement } from "@/pageEditor/documentBuilder/createNewDocumentBuilderElement";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import { type PipelineExpression } from "@/types/runtimeTypes";
 import PipelineVisitor, { type VisitBlockExtra } from "./PipelineVisitor";
 import {
@@ -46,13 +46,13 @@ test("should invoke the callback for the pipeline bricks", () => {
 
   const visitor = new Visitor();
   visitor.visitRootPipeline(pipeline, {
-    extensionPointType: StarterBrickTypes.BUTTON,
+    starterBrickType: StarterBrickTypes.BUTTON,
   });
 
   expect(visitBlock).toHaveBeenCalledTimes(pipeline.length);
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0`,
     },
     pipeline[0],
     {
@@ -60,12 +60,12 @@ test("should invoke the callback for the pipeline bricks", () => {
       pipelineFlavor: "noRenderer",
       parentNodeId: undefined,
       pipeline,
-      pipelinePosition: { path: PIPELINE_BLOCKS_FIELD_NAME },
+      pipelinePosition: { path: PIPELINE_BRICKS_FIELD_NAME },
     },
   );
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.1`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.1`,
     },
     pipeline[1],
     {
@@ -73,7 +73,7 @@ test("should invoke the callback for the pipeline bricks", () => {
       pipelineFlavor: "noRenderer",
       parentNodeId: undefined,
       pipeline,
-      pipelinePosition: { path: PIPELINE_BLOCKS_FIELD_NAME },
+      pipelinePosition: { path: PIPELINE_BRICKS_FIELD_NAME },
     },
   );
 });
@@ -104,7 +104,7 @@ test("should invoke the callback for the sub pipeline bricks", () => {
   }
   const visitor = new Visitor();
   visitor.visitRootPipeline(pipeline, {
-    extensionPointType: StarterBrickTypes.BUTTON,
+    starterBrickType: StarterBrickTypes.BUTTON,
   });
 
   expect(visitBlock).toHaveBeenCalledTimes(
@@ -113,7 +113,7 @@ test("should invoke the callback for the sub pipeline bricks", () => {
 
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__.0`,
     },
     subPipeline[0],
     {
@@ -122,13 +122,13 @@ test("should invoke the callback for the sub pipeline bricks", () => {
       parentNodeId: forEachBrick.instanceId,
       pipeline: subPipeline,
       pipelinePosition: {
-        path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__`,
+        path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__`,
       },
     },
   );
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__.1`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__.1`,
     },
     subPipeline[1],
     {
@@ -137,13 +137,13 @@ test("should invoke the callback for the sub pipeline bricks", () => {
       parentNodeId: forEachBrick.instanceId,
       pipeline: subPipeline,
       pipelinePosition: {
-        path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__`,
+        path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__`,
       },
     },
   );
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0`,
     },
     pipeline[0],
     {
@@ -151,7 +151,7 @@ test("should invoke the callback for the sub pipeline bricks", () => {
       pipelineFlavor: "noRenderer",
       parentNodeId: undefined,
       pipeline,
-      pipelinePosition: { path: PIPELINE_BLOCKS_FIELD_NAME },
+      pipelinePosition: { path: PIPELINE_BRICKS_FIELD_NAME },
     },
   );
 });
@@ -186,13 +186,13 @@ test("should invoke the callback for the Document button pipeline", () => {
   }
   const visitor = new Visitor();
   visitor.visitRootPipeline(pipeline, {
-    extensionPointType: StarterBrickTypes.SIDEBAR_PANEL,
+    starterBrickType: StarterBrickTypes.SIDEBAR_PANEL,
   });
 
   expect(visitBlock).toHaveBeenCalledTimes(2); // One Document brick and one brick in the pipeline
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__.0`,
     },
     subPipeline[0],
     {
@@ -201,13 +201,13 @@ test("should invoke the callback for the Document button pipeline", () => {
       parentNodeId: documentBrick.instanceId,
       pipeline: subPipeline,
       pipelinePosition: {
-        path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__`,
+        path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__`,
       },
     },
   );
   expect(visitBlock).toHaveBeenCalledWith(
     {
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0`,
     },
     documentBrick,
     {
@@ -216,7 +216,7 @@ test("should invoke the callback for the Document button pipeline", () => {
       parentNodeId: undefined,
       pipeline,
       pipelinePosition: {
-        path: PIPELINE_BLOCKS_FIELD_NAME,
+        path: PIPELINE_BRICKS_FIELD_NAME,
       },
     },
   );
diff --git a/src/bricks/PipelineVisitor.ts b/src/bricks/PipelineVisitor.ts
index 9c9c410086..dc0bab9d70 100644
--- a/src/bricks/PipelineVisitor.ts
+++ b/src/bricks/PipelineVisitor.ts
@@ -30,12 +30,12 @@ import {
   getSubPipelineFlavor,
 } from "@/bricks/brickFilterHelpers";
 import { type StarterBrickType } from "@/types/starterBrickTypes";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import { isPipelineExpression } from "@/utils/expressionUtils";
 import { joinPathParts } from "@/utils/formUtils";
 
 export const ROOT_POSITION = Object.freeze({
-  path: PIPELINE_BLOCKS_FIELD_NAME,
+  path: PIPELINE_BRICKS_FIELD_NAME,
 }) as BrickPosition;
 
 export function nestedPosition(
@@ -79,7 +79,7 @@ export type VisitPipelineExtra = {
   pipelinePropName?: string | undefined;
 };
 type VisitRootPipelineExtra = {
-  extensionPointType: StarterBrickType;
+  starterBrickType: StarterBrickType;
 };
 
 /**
@@ -88,7 +88,7 @@ type VisitRootPipelineExtra = {
 class PipelineVisitor {
   /**
    * Visit a configured block.
-   * @param position the position in the extension
+   * @param position the position in the mod component
    * @param blockConfig the block configuration
    */
   public visitBrick(
@@ -152,7 +152,7 @@ class PipelineVisitor {
 
   /**
    * Run the visitor on a pipeline; loop over the blocks
-   * @param position Position of the pipeline in the extension
+   * @param position Position of the pipeline in the modComponent
    * @param pipeline The pipeline to analyze
    * @param extra Extra information about the pipeline
    */
@@ -176,8 +176,8 @@ class PipelineVisitor {
     pipeline: BrickConfig[],
     extra?: VisitRootPipelineExtra,
   ): void {
-    const flavor = extra?.extensionPointType
-      ? getRootPipelineFlavor(extra.extensionPointType)
+    const flavor = extra?.starterBrickType
+      ? getRootPipelineFlavor(extra.starterBrickType)
       : PipelineFlavor.AllBricks;
     this.visitPipeline(ROOT_POSITION, pipeline, { flavor });
   }
diff --git a/src/bricks/transformers/jquery/JQueryReaderOptions.test.tsx b/src/bricks/transformers/jquery/JQueryReaderOptions.test.tsx
index 2d12425779..4ca6e64fe8 100644
--- a/src/bricks/transformers/jquery/JQueryReaderOptions.test.tsx
+++ b/src/bricks/transformers/jquery/JQueryReaderOptions.test.tsx
@@ -41,7 +41,7 @@ const getAttributeExamplesMock = jest.mocked(getAttributeExamples);
 
 function baseStateFactory() {
   const baseFormState = menuItemFormStateFactory();
-  baseFormState.extension.blockPipeline = [
+  baseFormState.modComponent.brickPipeline = [
     {
       id: JQueryReader.BRICK_ID,
       config: {
@@ -57,7 +57,7 @@ function renderOptions(formState: ModComponentFormState = baseStateFactory()) {
     <SchemaFieldContext.Provider value={devtoolFieldOverrides}>
       <Formik onSubmit={jest.fn()} initialValues={formState}>
         <JQueryReaderOptions
-          name="extension.blockPipeline.0"
+          name="modComponent.brickPipeline.0"
           configKey="config"
         />
       </Formik>
@@ -82,7 +82,7 @@ describe("JQueryReaderOptions", () => {
 
   it("shows workshop message on variable selector", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = {
+    state.modComponent.brickPipeline[0].config.selectors = {
       property: toExpression("var", "@foo"),
     };
 
@@ -96,7 +96,7 @@ describe("JQueryReaderOptions", () => {
 
   it("shows workshop message variable selectors", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = toExpression(
+    state.modComponent.brickPipeline[0].config.selectors = toExpression(
       "var",
       "@foo",
     );
@@ -111,7 +111,7 @@ describe("JQueryReaderOptions", () => {
 
   it("normalizes primitive selectors", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = { property: "h1" };
+    state.modComponent.brickPipeline[0].config.selectors = { property: "h1" };
 
     renderOptions(state);
 
@@ -123,7 +123,7 @@ describe("JQueryReaderOptions", () => {
 
     expect(
       screen.getByTestId(
-        "toggle-extension.blockPipeline.0.config.selectors.property.selector",
+        "toggle-modComponent.brickPipeline.0.config.selectors.property.selector",
       ).dataset.testSelected,
     ).toBe("Selector");
 
@@ -132,7 +132,7 @@ describe("JQueryReaderOptions", () => {
 
   it("normalizes nested selectors", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = {
+    state.modComponent.brickPipeline[0].config.selectors = {
       outer: {
         selector: "div",
         find: {
@@ -147,12 +147,12 @@ describe("JQueryReaderOptions", () => {
 
     expect(
       screen.getByTestId(
-        "toggle-extension.blockPipeline.0.config.selectors.outer.selector",
+        "toggle-modComponent.brickPipeline.0.config.selectors.outer.selector",
       ).dataset.testSelected,
     ).toBe("Selector");
     expect(
       screen.getByTestId(
-        "toggle-extension.blockPipeline.0.config.selectors.outer.find.inner.selector",
+        "toggle-modComponent.brickPipeline.0.config.selectors.outer.find.inner.selector",
       ).dataset.testSelected,
     ).toBe("Selector");
 
@@ -161,7 +161,7 @@ describe("JQueryReaderOptions", () => {
 
   it("normalizes nunjucks literal selectors", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = {
+    state.modComponent.brickPipeline[0].config.selectors = {
       outer: {
         selector: toExpression("nunjucks", "div"),
         find: {
@@ -176,12 +176,12 @@ describe("JQueryReaderOptions", () => {
 
     expect(
       screen.getByTestId(
-        "toggle-extension.blockPipeline.0.config.selectors.outer.selector",
+        "toggle-modComponent.brickPipeline.0.config.selectors.outer.selector",
       ).dataset.testSelected,
     ).toBe("Selector");
     expect(
       screen.getByTestId(
-        "toggle-extension.blockPipeline.0.config.selectors.outer.find.inner.selector",
+        "toggle-modComponent.brickPipeline.0.config.selectors.outer.find.inner.selector",
       ).dataset.testSelected,
     ).toBe("Selector");
 
@@ -190,7 +190,7 @@ describe("JQueryReaderOptions", () => {
 
   it("allows rename of property", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = {
+    state.modComponent.brickPipeline[0].config.selectors = {
       outer: {
         selector: toExpression("nunjucks", "div"),
         find: {
@@ -219,7 +219,7 @@ describe("JQueryReaderOptions", () => {
 
   it("clearing a property name reverts the value to the initial value on blur", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = {
+    state.modComponent.brickPipeline[0].config.selectors = {
       outer: {
         selector: toExpression("nunjucks", "div"),
         find: {
@@ -247,7 +247,7 @@ describe("JQueryReaderOptions", () => {
 
   it("generates example attributes for nested selectors", async () => {
     const state = baseStateFactory();
-    state.extension.blockPipeline[0].config.selectors = {
+    state.modComponent.brickPipeline[0].config.selectors = {
       outer: {
         selector: "div",
         find: {
diff --git a/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.test.tsx b/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.test.tsx
index 0086098045..6b4e1f5819 100644
--- a/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.test.tsx
+++ b/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.test.tsx
@@ -77,14 +77,14 @@ const renderWidget = (
         // Default empty, let initialValues override if needed
         integrationDependencies: [],
         ...initialValues,
-        extension: { blockPipeline: [{ config: { service: null } }] },
+        modComponent: { brickPipeline: [{ config: { service: null } }] },
       }}
       onSubmit={jest.fn()}
     >
       {({ values }) => (
         <>
           <IntegrationDependencyWidget
-            name="extension.blockPipeline.0.config.service"
+            name="modComponent.brickPipeline.0.config.service"
             schema={schema}
             {...props}
           />
@@ -214,8 +214,8 @@ describe("ServiceWidget", () => {
     const state = JSON.parse(screen.getByTestId("values").textContent);
 
     expect(state).toEqual({
-      extension: {
-        blockPipeline: [
+      modComponent: {
+        brickPipeline: [
           {
             config: {
               service: toExpression("var", "@jest2"),
diff --git a/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.tsx b/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.tsx
index f1f6beade7..dccafaab18 100644
--- a/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.tsx
+++ b/src/components/fields/schemaFields/integrations/IntegrationDependencyWidget.tsx
@@ -316,13 +316,13 @@ const IntegrationDependencyWidget: React.FC<
           isEqual(makeVariableExpression(dependency.outputKey), value),
         )
       ) {
-        // This currently happens when a brick is copy-pasted into a separate extension
+        // This currently happens when a brick is copy-pasted into a separate mod component
         // that does not yet have root.integrationDependencies configured, but already
         // has the integration dependency key set up in the (copied) BrickConfig.
         // Clearing the value here allows the preceding if-branch to execute again, which
         // runs the "detectDefault" logic and then calls the integration-dependency-select
         // change handler, which in turn will configure root.integrationDependencies
-        // properly for the extension.
+        // properly for the mod component.
         await helpers.setValue(null);
       }
     },
diff --git a/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.test.ts b/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.test.ts
index 98d684902c..8d3fd3dd9e 100644
--- a/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.test.ts
+++ b/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.test.ts
@@ -210,9 +210,9 @@ describe("selectVariables", () => {
       permissions: emptyPermissionsFactory(),
       optionsArgs: {},
       type: "actionPanel",
-      recipe: null,
-      extension: {
-        blockPipeline: [
+      modMetadata: null,
+      modComponent: {
+        brickPipeline: [
           {
             id: validateRegistryId("@pixiebrix/document"),
             config: {
@@ -262,7 +262,7 @@ describe("selectVariables", () => {
         ],
         heading: "Document",
       },
-      extensionPoint: {
+      starterBrick: {
         metadata: {
           id: validateRegistryId(
             "@internal/52d42d87-4382-4c78-b00e-bbdd21d75000",
diff --git a/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.ts b/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.ts
index 6544051794..db0936d9b8 100644
--- a/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.ts
+++ b/src/components/fields/schemaFields/integrations/integrationDependencyFieldUtils.ts
@@ -28,7 +28,7 @@ import { makeVariableExpression } from "@/utils/variableUtils";
 
 export type IntegrationsFormSlice = Pick<
   ModComponentFormState,
-  "integrationDependencies" | "extension"
+  "integrationDependencies" | "modComponent"
 >;
 
 /**
@@ -68,15 +68,15 @@ function deepFindIntegrationDependencyVariables(
 }
 
 /**
- * Return set of integration dependency variables referenced by the extension,
+ * Return set of integration dependency variables referenced by the mod component,
  * including the `@`-prefixes
  */
 export function selectIntegrationDependencyVariables(
-  state: Pick<ModComponentFormState, "extension">,
+  state: Pick<ModComponentFormState, "modComponent">,
 ): Set<string> {
   const variables = new Set<string>();
   deepFindIntegrationDependencyVariables(
-    state.extension.blockPipeline,
+    state.modComponent.brickPipeline,
     variables,
   );
   return variables;
diff --git a/src/components/fields/schemaFields/widgets/varPopup/VarMenu.test.tsx b/src/components/fields/schemaFields/widgets/varPopup/VarMenu.test.tsx
index 6f0bb6878d..5e82130c14 100644
--- a/src/components/fields/schemaFields/widgets/varPopup/VarMenu.test.tsx
+++ b/src/components/fields/schemaFields/widgets/varPopup/VarMenu.test.tsx
@@ -75,7 +75,7 @@ describe("VarMenu", () => {
           dispatch(editorActions.setActiveModComponentId(formState.uuid));
           dispatch(
             editorActions.setActiveNodeId(
-              formState.extension.blockPipeline[0].instanceId,
+              formState.modComponent.brickPipeline[0].instanceId,
             ),
           );
         },
@@ -110,7 +110,7 @@ describe("VarMenu", () => {
           dispatch(editorActions.setActiveModComponentId(formState.uuid));
           dispatch(
             editorActions.setActiveNodeId(
-              formState.extension.blockPipeline[0].instanceId,
+              formState.modComponent.brickPipeline[0].instanceId,
             ),
           );
 
@@ -155,7 +155,7 @@ describe("VarMenu", () => {
           dispatch(editorActions.setActiveModComponentId(formState.uuid));
           dispatch(
             editorActions.setActiveNodeId(
-              formState.extension.blockPipeline[0].instanceId,
+              formState.modComponent.brickPipeline[0].instanceId,
             ),
           );
 
diff --git a/src/components/fields/schemaFields/widgets/varPopup/VarMenu.tsx b/src/components/fields/schemaFields/widgets/varPopup/VarMenu.tsx
index 2dab172130..dc1c33996d 100644
--- a/src/components/fields/schemaFields/widgets/varPopup/VarMenu.tsx
+++ b/src/components/fields/schemaFields/widgets/varPopup/VarMenu.tsx
@@ -175,7 +175,7 @@ const VarMenu: React.FunctionComponent<VarMenuProps> = ({
       getPageState(inspectedTab, {
         namespace: StateNamespaces.MOD,
         modComponentId: null,
-        modId: activeModComponentFormState.recipe?.id,
+        modId: activeModComponentFormState.modMetadata?.id,
       }),
     [],
   );
diff --git a/src/components/fields/schemaFields/widgets/varPopup/VariablesTree.stories.tsx b/src/components/fields/schemaFields/widgets/varPopup/VariablesTree.stories.tsx
index 417d2ea07e..7b30c1edf1 100644
--- a/src/components/fields/schemaFields/widgets/varPopup/VariablesTree.stories.tsx
+++ b/src/components/fields/schemaFields/widgets/varPopup/VariablesTree.stories.tsx
@@ -59,13 +59,13 @@ const knownVars = {
       },
     },
   },
-  "extension.blockPipeline.0": {
+  "modComponent.brickPipeline.0": {
     "@data": {},
   },
-  "extension.blockPipeline.1": {
+  "modComponent.brickPipeline.1": {
     "@ifElseOutput": {},
   },
-  "extension.blockPipeline.2": {
+  "modComponent.brickPipeline.2": {
     "@forEachOutput": {},
   },
 };
diff --git a/src/components/fields/schemaFields/widgets/varPopup/getMenuOptions.test.ts b/src/components/fields/schemaFields/widgets/varPopup/getMenuOptions.test.ts
index 2c2c3e451b..67b1d88b57 100644
--- a/src/components/fields/schemaFields/widgets/varPopup/getMenuOptions.test.ts
+++ b/src/components/fields/schemaFields/widgets/varPopup/getMenuOptions.test.ts
@@ -50,7 +50,7 @@ describe("setting values", () => {
     });
 
     knownVars.setVariableExistence({
-      source: "extension.blockPipeline.0",
+      source: "modComponent.brickPipeline.0",
       variableName: "@jq",
       existence: VarExistence.DEFINITELY,
       allowAnyChild: true,
@@ -73,7 +73,7 @@ describe("setting values", () => {
     // Validate the order of the options
     expect(actual.map(([key]) => key)).toEqual([
       "input:Array Composite Reader",
-      "extension.blockPipeline.0",
+      "modComponent.brickPipeline.0",
     ]);
   });
 
@@ -94,7 +94,7 @@ describe("setting values", () => {
     // Validate the order of the options
     expect(actual.map(([key]) => key)).toEqual([
       "input:Array Composite Reader",
-      "extension.blockPipeline.0",
+      "modComponent.brickPipeline.0",
     ]);
 
     // Function getMenuOptions produces a mix of VarMap nodes and plain values from the trace
@@ -182,7 +182,9 @@ describe("mod variables", () => {
     const extension = formStateFactory({}, [brickConfigFactory()]);
     await analysis.run(extension);
 
-    const knownVars = analysis.getKnownVars().get("extension.blockPipeline.0");
+    const knownVars = analysis
+      .getKnownVars()
+      .get("modComponent.brickPipeline.0");
 
     const actual = getMenuOptions(knownVars, null);
     expect(actual).toEqual([
diff --git a/src/components/form/ConnectedFieldTemplate.test.tsx b/src/components/form/ConnectedFieldTemplate.test.tsx
index db2b5abfe2..f08ac2457e 100644
--- a/src/components/form/ConnectedFieldTemplate.test.tsx
+++ b/src/components/form/ConnectedFieldTemplate.test.tsx
@@ -98,7 +98,7 @@ describe("ConnectedFieldTemplate", () => {
         ),
       );
 
-      const path = "extension.blockPipeline[0].config.testField";
+      const path = "modComponent.brickPipeline[0].config.testField";
 
       const analysisAnnotation: AnalysisAnnotation = {
         analysisId: "test",
@@ -147,7 +147,7 @@ describe("ConnectedFieldTemplate", () => {
         ),
       );
 
-      const path = "extension.blockPipeline[0].config.testField";
+      const path = "modComponent.brickPipeline[0].config.testField";
 
       const analysisAnnotation: AnalysisAnnotation = {
         analysisId: "test",
@@ -168,8 +168,8 @@ describe("ConnectedFieldTemplate", () => {
         {
           initialValues: formState,
           initialErrors: {
-            extension: {
-              blockPipeline: [
+            modComponent: {
+              brickPipeline: [
                 {
                   config: {
                     testField: "test formik error",
@@ -212,7 +212,7 @@ describe("ConnectedFieldTemplate", () => {
         ),
       );
 
-      const path = "extension.blockPipeline[0].config.testField";
+      const path = "modComponent.brickPipeline[0].config.testField";
 
       const analysisAnnotation1: AnalysisAnnotation = {
         analysisId: "test1",
@@ -281,7 +281,7 @@ describe("ConnectedFieldTemplate", () => {
         ),
       );
 
-      const path = "extension.blockPipeline[0].config.testField";
+      const path = "modComponent.brickPipeline[0].config.testField";
 
       const annotations: AnalysisAnnotation[] = [
         // The annotation appears normally when detail matches the field value
diff --git a/src/components/form/lockedLabel/LockedStarterBrickLabel.tsx b/src/components/form/lockedLabel/LockedStarterBrickLabel.tsx
index 2e50d032fd..68fd891404 100644
--- a/src/components/form/lockedLabel/LockedStarterBrickLabel.tsx
+++ b/src/components/form/lockedLabel/LockedStarterBrickLabel.tsx
@@ -32,7 +32,7 @@ const LockedStarterBrickLabel: React.FC<{
   label: string;
   message?: string;
 }> = ({ label, message }) => {
-  const [{ value: name }] = useField<string>("extensionPoint.metadata.name");
+  const [{ value: name }] = useField<string>("starterBrick.metadata.name");
   const defaultMessage = (
     <p>
       Provided by Starter Brick <span className={styles.name}>{name}</span>.
diff --git a/src/contentScript/pageEditor/runBrickPreview.ts b/src/contentScript/pageEditor/runBrickPreview.ts
index 88d8b40509..0536bd54c8 100644
--- a/src/contentScript/pageEditor/runBrickPreview.ts
+++ b/src/contentScript/pageEditor/runBrickPreview.ts
@@ -73,7 +73,7 @@ export async function runBrickPreview({
     // Handle non-document contexts. If the selector is unique, this gives the root that would be available at runtime.
     // Differences in behavior:
     // - For triggers, the PixieBrix looks for the closest ancestor to the DOM event target matching the selector
-    //   See TriggerExtensionPoint.eventHandler for reference
+    //   See TriggerStarterBrick.eventHandler for reference
     // - For multi-menus (not currently available in the Page Editor), the below logic returns an arbitrary menu
     const rootElement = $safeFind(rootSelector);
     if (rootElement.length > 0) {
diff --git a/src/contrib/automationanywhere/BotOptions.test.tsx b/src/contrib/automationanywhere/BotOptions.test.tsx
index ba05396bf1..d4653c9752 100644
--- a/src/contrib/automationanywhere/BotOptions.test.tsx
+++ b/src/contrib/automationanywhere/BotOptions.test.tsx
@@ -70,7 +70,7 @@ function makeBaseState() {
 function renderOptions(formState: ModComponentFormState = makeBaseState()) {
   return render(
     <Formik onSubmit={jest.fn()} initialValues={formState}>
-      <BotOptions name="extension.blockPipeline.0" configKey="config" />
+      <BotOptions name="modComponent.brickPipeline.0" configKey="config" />
     </Formik>,
   );
 }
@@ -105,7 +105,7 @@ describe("BotOptions", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.service = toExpression(
+    base.modComponent.brickPipeline[0].config.service = toExpression(
       "var",
       "@automationAnywhere",
     );
@@ -136,7 +136,7 @@ describe("BotOptions", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.service = toExpression(
+    base.modComponent.brickPipeline[0].config.service = toExpression(
       "var",
       "@automationAnywhere",
     );
@@ -168,8 +168,8 @@ describe("BotOptions", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.workspaceType = "public";
-    base.extension.blockPipeline[0].config.service = toExpression(
+    base.modComponent.brickPipeline[0].config.workspaceType = "public";
+    base.modComponent.brickPipeline[0].config.service = toExpression(
       "var",
       "@automationAnywhere",
     );
@@ -201,9 +201,9 @@ describe("BotOptions", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.workspaceType = "public";
-    base.extension.blockPipeline[0].config.isAttended = true;
-    base.extension.blockPipeline[0].config.service = toExpression(
+    base.modComponent.brickPipeline[0].config.workspaceType = "public";
+    base.modComponent.brickPipeline[0].config.isAttended = true;
+    base.modComponent.brickPipeline[0].config.service = toExpression(
       "var",
       "@automationAnywhere",
     );
@@ -235,8 +235,8 @@ describe("BotOptions", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.awaitResult = true;
-    base.extension.blockPipeline[0].config.service = toExpression(
+    base.modComponent.brickPipeline[0].config.awaitResult = true;
+    base.modComponent.brickPipeline[0].config.service = toExpression(
       "var",
       "@automationAnywhere",
     );
diff --git a/src/contrib/automationanywhere/__snapshots__/BotOptions.test.tsx.snap b/src/contrib/automationanywhere/__snapshots__/BotOptions.test.tsx.snap
index 906da13bdd..c5ba32b4b2 100644
--- a/src/contrib/automationanywhere/__snapshots__/BotOptions.test.tsx.snap
+++ b/src/contrib/automationanywhere/__snapshots__/BotOptions.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`BotOptions should require selected integration 1`] = `
     </div>
     <label
       class="label form-label"
-      for="extension.blockPipeline.0.config.service"
+      for="modComponent.brickPipeline.0.config.service"
     >
       Integration
     </label>
@@ -67,7 +67,7 @@ exports[`BotOptions should require selected integration 1`] = `
                     autocomplete="off"
                     autocorrect="off"
                     class=""
-                    id="extension.blockPipeline.0.config.service"
+                    id="modComponent.brickPipeline.0.config.service"
                     role="combobox"
                     spellcheck="false"
                     style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -103,7 +103,7 @@ exports[`BotOptions should require selected integration 1`] = `
               </div>
             </div>
             <input
-              name="extension.blockPipeline.0.config.service"
+              name="modComponent.brickPipeline.0.config.service"
               type="hidden"
               value=""
             />
diff --git a/src/contrib/uipath/LocalProcessOptions.test.tsx b/src/contrib/uipath/LocalProcessOptions.test.tsx
index bab4d20297..516284abff 100644
--- a/src/contrib/uipath/LocalProcessOptions.test.tsx
+++ b/src/contrib/uipath/LocalProcessOptions.test.tsx
@@ -86,7 +86,10 @@ function makeBaseState() {
 
 function renderOptions(initialValues: ModComponentFormState = makeBaseState()) {
   return render(
-    <LocalProcessOptions name="extension.blockPipeline.0" configKey="config" />,
+    <LocalProcessOptions
+      name="modComponent.brickPipeline.0"
+      configKey="config"
+    />,
     { initialValues },
   );
 }
@@ -188,7 +191,7 @@ describe("UiPath LocalProcess Options", () => {
 
     const formState = makeBaseState();
     formState.integrationDependencies[0].configId = configId;
-    formState.extension.blockPipeline[0].config.service = "@uipath";
+    formState.modComponent.brickPipeline[0].config.service = "@uipath";
 
     renderOptions();
 
diff --git a/src/contrib/uipath/ProcessOptions.test.tsx b/src/contrib/uipath/ProcessOptions.test.tsx
index 84bed71977..b6af31e14d 100644
--- a/src/contrib/uipath/ProcessOptions.test.tsx
+++ b/src/contrib/uipath/ProcessOptions.test.tsx
@@ -90,7 +90,7 @@ function makeBaseState() {
 function renderOptions(formState: ModComponentFormState = makeBaseState()) {
   return render(
     <Formik onSubmit={jest.fn()} initialValues={formState}>
-      <ProcessOptions name="extension.blockPipeline.0" configKey="config" />
+      <ProcessOptions name="modComponent.brickPipeline.0" configKey="config" />
     </Formik>,
   );
 }
@@ -125,7 +125,7 @@ describe("UiPath Options", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.uipath = toExpression(
+    base.modComponent.brickPipeline[0].config.uipath = toExpression(
       "var",
       "@uipath",
     );
@@ -173,11 +173,11 @@ describe("UiPath Options", () => {
     );
 
     const base = makeBaseState();
-    base.extension.blockPipeline[0].config.uipath = toExpression(
+    base.modComponent.brickPipeline[0].config.uipath = toExpression(
       "var",
       "@uipath",
     );
-    base.extension.blockPipeline[0].config.awaitResult = true;
+    base.modComponent.brickPipeline[0].config.awaitResult = true;
 
     renderOptions(base);
 
diff --git a/src/contrib/uipath/__snapshots__/ProcessOptions.test.tsx.snap b/src/contrib/uipath/__snapshots__/ProcessOptions.test.tsx.snap
index 1a36f2304c..e612fbb179 100644
--- a/src/contrib/uipath/__snapshots__/ProcessOptions.test.tsx.snap
+++ b/src/contrib/uipath/__snapshots__/ProcessOptions.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`UiPath Options Render integration selector 1`] = `
     </div>
     <label
       class="label form-label"
-      for="extension.blockPipeline.0.config.uipath"
+      for="modComponent.brickPipeline.0.config.uipath"
     >
       Integration
     </label>
@@ -67,7 +67,7 @@ exports[`UiPath Options Render integration selector 1`] = `
                     autocomplete="off"
                     autocorrect="off"
                     class=""
-                    id="extension.blockPipeline.0.config.uipath"
+                    id="modComponent.brickPipeline.0.config.uipath"
                     role="combobox"
                     spellcheck="false"
                     style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -103,7 +103,7 @@ exports[`UiPath Options Render integration selector 1`] = `
               </div>
             </div>
             <input
-              name="extension.blockPipeline.0.config.uipath"
+              name="modComponent.brickPipeline.0.config.uipath"
               type="hidden"
               value=""
             />
diff --git a/src/integrations/components/RequireIntegrationConfig.test.tsx b/src/integrations/components/RequireIntegrationConfig.test.tsx
index c0690f16f7..635ba9863d 100644
--- a/src/integrations/components/RequireIntegrationConfig.test.tsx
+++ b/src/integrations/components/RequireIntegrationConfig.test.tsx
@@ -120,7 +120,7 @@ describe("RequireIntegrationConfig", () => {
     render(
       <RequireIntegrationConfig
         integrationFieldSchema={integrationFieldSchema}
-        integrationFieldName="extension.blockPipeline[0].config.integration"
+        integrationFieldName="modComponent.brickPipeline[0].config.integration"
       >
         {({ sanitizedConfig }) => (
           <ChildComponent sanitizedConfig={sanitizedConfig} />
@@ -178,7 +178,7 @@ describe("RequireIntegrationConfig", () => {
     render(
       <RequireIntegrationConfig
         integrationFieldSchema={integrationFieldSchema}
-        integrationFieldName="extension.blockPipeline[0].config.integration"
+        integrationFieldName="modComponent.brickPipeline[0].config.integration"
       >
         {({ sanitizedConfig }) => (
           <ChildComponent sanitizedConfig={sanitizedConfig} />
@@ -253,7 +253,7 @@ describe("RequireIntegrationConfig", () => {
     render(
       <RequireIntegrationConfig
         integrationFieldSchema={integrationFieldSchema}
-        integrationFieldName="extension.blockPipeline[0].config.integration"
+        integrationFieldName="modComponent.brickPipeline[0].config.integration"
       >
         {({ sanitizedConfig }) => (
           <ChildComponent sanitizedConfig={sanitizedConfig} />
@@ -306,7 +306,7 @@ describe("RequireIntegrationConfig", () => {
     render(
       <RequireIntegrationConfig
         integrationFieldSchema={integrationFieldSchema}
-        integrationFieldName="extension.blockPipeline[0].config.integration"
+        integrationFieldName="modComponent.brickPipeline[0].config.integration"
       >
         {({ sanitizedConfig }) => (
           <ChildComponent sanitizedConfig={sanitizedConfig} />
diff --git a/src/pageEditor/analysisManager.ts b/src/pageEditor/analysisManager.ts
index 7f6b6e86d4..709ead0532 100644
--- a/src/pageEditor/analysisManager.ts
+++ b/src/pageEditor/analysisManager.ts
@@ -61,17 +61,17 @@ async function selectActiveModFormStates(
 ): Promise<ModComponentFormState[]> {
   const activeModComponentFormState = selectActiveModComponentFormState(state);
 
-  if (activeModComponentFormState?.recipe) {
+  if (activeModComponentFormState?.modMetadata) {
     const dirtyModComponentFormStates =
       state.editor.modComponentFormStates.filter(
-        (x) => x.recipe?.id === activeModComponentFormState.recipe.id,
+        (x) => x.modMetadata?.id === activeModComponentFormState.modMetadata.id,
       );
     const dirtyIds = new Set(dirtyModComponentFormStates.map((x) => x.uuid));
 
     const activatedModComponents = selectActivatedModComponents(state);
     const otherModComponents = activatedModComponents.filter(
       (x) =>
-        x._recipe?.id === activeModComponentFormState.recipe.id &&
+        x._recipe?.id === activeModComponentFormState.modMetadata.id &&
         !dirtyIds.has(x.id),
     );
     const otherModComponentFormStates = await Promise.all(
@@ -215,7 +215,7 @@ async function varAnalysisFactory(
   const modState = await getPageState(inspectedTab, {
     namespace: StateNamespaces.MOD,
     modComponentId: activeModComponentFormState.uuid,
-    modId: activeModComponentFormState.recipe?.id,
+    modId: activeModComponentFormState.modMetadata?.id,
   });
 
   return new VarAnalysis({
diff --git a/src/pageEditor/baseFormStateTypes.ts b/src/pageEditor/baseFormStateTypes.ts
index 58d03b0dc3..999acbec14 100644
--- a/src/pageEditor/baseFormStateTypes.ts
+++ b/src/pageEditor/baseFormStateTypes.ts
@@ -50,15 +50,30 @@ export type BaseStarterBrickState = {
   };
 };
 
-export interface BaseModComponentState {
+/**
+ * @deprecated - Do not use versioned state types directly
+ */
+export type BaseModComponentStateV1 = {
   blockPipeline: BrickPipeline;
-}
+};
+
+/**
+ * @deprecated - Do not use versioned state types directly
+ */
+export type BaseModComponentStateV2 = Except<
+  BaseModComponentStateV1,
+  "blockPipeline"
+> & {
+  brickPipeline: BrickPipeline;
+};
+
+export type BaseModComponentState = BaseModComponentStateV2;
 
 /**
  * @deprecated - Do not use versioned state types directly
  */
 export interface BaseFormStateV1<
-  TModComponent extends BaseModComponentState = BaseModComponentState,
+  TModComponent extends BaseModComponentStateV1 = BaseModComponentStateV1,
   TStarterBrick extends BaseStarterBrickState = BaseStarterBrickState,
 > {
   /**
@@ -130,7 +145,7 @@ export interface BaseFormStateV1<
  * @deprecated - Do not use versioned state types directly
  */
 export type BaseFormStateV2<
-  TModComponent extends BaseModComponentState = BaseModComponentState,
+  TModComponent extends BaseModComponentStateV1 = BaseModComponentStateV1,
   TStarterBrick extends BaseStarterBrickState = BaseStarterBrickState,
 > = Except<BaseFormStateV1<TModComponent, TStarterBrick>, "services"> & {
   /**
@@ -142,11 +157,46 @@ export type BaseFormStateV2<
   integrationDependencies: IntegrationDependencyV2[];
 };
 
+/**
+ * @deprecated - Do not use versioned state types directly
+ */
+export type BaseFormStateV3<
+  TModComponent extends BaseModComponentStateV2 = BaseModComponentStateV2,
+  TStarterBrick extends BaseStarterBrickState = BaseStarterBrickState,
+> = Except<
+  BaseFormStateV2<BaseModComponentStateV1, TStarterBrick>,
+  "recipe" | "extension" | "extensionPoint"
+> & {
+  /**
+   * @since 2.0.5
+   * Part of the Page Editor renaming effort
+   * `extensionPoint` to `starterBrick`
+   */
+  starterBrick: TStarterBrick;
+
+  /**
+   * @since 2.0.5
+   * Part of the Page Editor renaming effort
+   * `extension` to `modComponent`
+   */
+  modComponent: TModComponent;
+
+  /**
+   * @since 2.0.5
+   * Part of the Page Editor renaming effort
+   * `recipe` to `modMetadata`
+   * Information about the mod used to install the mod component, or `undefined`
+   * if the mod component is not part of a mod.
+   * @see ModComponentBase._recipe
+   */
+  modMetadata: ModComponentBase["_recipe"] | undefined;
+};
+
 export type BaseFormState<
   TModComponent extends BaseModComponentState = BaseModComponentState,
   TStarterBrick extends BaseStarterBrickState = BaseStarterBrickState,
 > = Except<
-  BaseFormStateV2<TModComponent, TStarterBrick>,
+  BaseFormStateV3<TModComponent, TStarterBrick>,
   "integrationDependencies"
 > & {
   /**
diff --git a/src/pageEditor/consts.ts b/src/pageEditor/consts.ts
index 0de7abeeba..8470f1cd81 100644
--- a/src/pageEditor/consts.ts
+++ b/src/pageEditor/consts.ts
@@ -15,4 +15,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-export const PIPELINE_BLOCKS_FIELD_NAME = "extension.blockPipeline";
+export const PIPELINE_BRICKS_FIELD_NAME = "modComponent.brickPipeline";
diff --git a/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx b/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
index 50a89fb6d0..e0cf652eab 100644
--- a/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
+++ b/src/pageEditor/documentBuilder/edit/DocumentOptions.test.tsx
@@ -48,8 +48,8 @@ describe("DocumentOptions", () => {
     stylesheets: string[] = [],
   ): ModComponentFormState {
     return formStateFactory({
-      extension: baseModComponentStateFactory({
-        blockPipeline: [
+      modComponent: baseModComponentStateFactory({
+        brickPipeline: [
           brickConfigFactory({
             config: {
               body: documentElements,
@@ -66,7 +66,10 @@ describe("DocumentOptions", () => {
     initialActiveElement: string = null,
   ) {
     return render(
-      <DocumentOptions name="extension.blockPipeline.0" configKey="config" />,
+      <DocumentOptions
+        name="modComponent.brickPipeline.0"
+        configKey="config"
+      />,
       {
         initialValues: formState,
         setupRedux(dispatch) {
@@ -74,7 +77,7 @@ describe("DocumentOptions", () => {
           dispatch(actions.setActiveModComponentId(formState.uuid));
           dispatch(
             actions.setActiveNodeId(
-              formState.extension.blockPipeline[0].instanceId,
+              formState.modComponent.brickPipeline[0].instanceId,
             ),
           );
           dispatch(
@@ -182,8 +185,8 @@ describe("DocumentOptions", () => {
       // Form state for the test
       const formState = formStateFactory({
         integrationDependencies,
-        extension: baseModComponentStateFactory({
-          blockPipeline: [
+        modComponent: baseModComponentStateFactory({
+          brickPipeline: [
             brickConfigFactory({ config: documentWithButtonConfig }),
           ],
         }),
@@ -229,7 +232,7 @@ describe("DocumentOptions", () => {
 
       // The form state should be updated
       expect(
-        getFormState().extension.blockPipeline[0].config.stylesheets,
+        getFormState().modComponent.brickPipeline[0].config.stylesheets,
       ).toStrictEqual([
         toExpression("nunjucks", "https://example.com/stylesheet.css"),
       ]);
diff --git a/src/pageEditor/documentBuilder/preview/DocumentPreview.test.tsx b/src/pageEditor/documentBuilder/preview/DocumentPreview.test.tsx
index 6896298792..8943389539 100644
--- a/src/pageEditor/documentBuilder/preview/DocumentPreview.test.tsx
+++ b/src/pageEditor/documentBuilder/preview/DocumentPreview.test.tsx
@@ -52,7 +52,7 @@ function renderDocumentPreview(documentBuilderElement: DocumentBuilderElement) {
     const [activeElement, setActiveElement] = useState<string | null>(null);
     return (
       <DocumentPreview
-        documentBodyName="extension.blockPipeline[0].config.body"
+        documentBodyName="modComponent.brickPipeline[0].config.body"
         activeElement={activeElement}
         setActiveElement={setActiveElement}
       />
@@ -66,7 +66,7 @@ function renderDocumentPreview(documentBuilderElement: DocumentBuilderElement) {
       dispatch(actions.setActiveModComponentId(formState.uuid));
       dispatch(
         actions.setActiveNodeId(
-          formState.extension.blockPipeline[0].instanceId,
+          formState.modComponent.brickPipeline[0].instanceId,
         ),
       );
     },
@@ -176,14 +176,14 @@ describe("Show live preview", () => {
       const [activeElement, setActiveElement] = useState<string | null>(null);
       return (
         <DocumentPreview
-          documentBodyName="extension.blockPipeline[0].config.body.__value__[0].config.body"
+          documentBodyName="modComponent.brickPipeline[0].config.body.__value__[0].config.body"
           activeElement={activeElement}
           setActiveElement={setActiveElement}
         />
       );
     };
 
-    const pipelineField = formState.extension.blockPipeline[0].config
+    const pipelineField = formState.modComponent.brickPipeline[0].config
       .body as PipelineExpression;
 
     return render(<PreviewContainer />, {
diff --git a/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx b/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx
index 4376cef02f..b5d1254355 100644
--- a/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx
+++ b/src/pageEditor/documentBuilder/preview/ElementPreview.test.tsx
@@ -57,8 +57,8 @@ const renderElementPreview = (
   };
 
   const formState = formStateFactory({
-    extension: baseModComponentStateFactory({
-      blockPipeline: [
+    modComponent: baseModComponentStateFactory({
+      brickPipeline: [
         brickConfigFactory({
           config: {
             body: [element],
@@ -75,7 +75,7 @@ const renderElementPreview = (
       dispatch(actions.setActiveModComponentId(formState.uuid));
       dispatch(
         actions.setActiveNodeId(
-          formState.extension.blockPipeline[0].instanceId,
+          formState.modComponent.brickPipeline[0].instanceId,
         ),
       );
       dispatch(actions.setActiveBuilderPreviewElement("0"));
diff --git a/src/pageEditor/fields/FormModalOptions.test.tsx b/src/pageEditor/fields/FormModalOptions.test.tsx
index a4efe18b4e..10b709331c 100644
--- a/src/pageEditor/fields/FormModalOptions.test.tsx
+++ b/src/pageEditor/fields/FormModalOptions.test.tsx
@@ -37,13 +37,16 @@ describe("FormModalOptions", () => {
     const brick = createNewConfiguredBrick(FormTransformer.BRICK_ID);
 
     const initialValues = formStateFactory({
-      extension: baseModComponentStateFactory({
-        blockPipeline: [brick],
+      modComponent: baseModComponentStateFactory({
+        brickPipeline: [brick],
       }),
     });
 
     render(
-      <FormModalOptions name="extension.blockPipeline.0" configKey="config" />,
+      <FormModalOptions
+        name="modComponent.brickPipeline.0"
+        configKey="config"
+      />,
       {
         initialValues,
         setupRedux(dispatch) {
diff --git a/src/pageEditor/fields/FormRendererOptions.test.tsx b/src/pageEditor/fields/FormRendererOptions.test.tsx
index 7f2df0d73c..670cbe0f8e 100644
--- a/src/pageEditor/fields/FormRendererOptions.test.tsx
+++ b/src/pageEditor/fields/FormRendererOptions.test.tsx
@@ -40,7 +40,7 @@ describe("FormRendererOptions", () => {
 
     render(
       <FormRendererOptions
-        name="extension.blockPipeline.0"
+        name="modComponent.brickPipeline.0"
         configKey="config"
       />,
       {
@@ -65,7 +65,7 @@ describe("FormRendererOptions", () => {
 
     render(
       <FormRendererOptions
-        name="extension.blockPipeline.0"
+        name="modComponent.brickPipeline.0"
         configKey="config"
       />,
       {
@@ -98,7 +98,7 @@ describe("FormRendererOptions", () => {
 
     render(
       <FormRendererOptions
-        name="extension.blockPipeline.0"
+        name="modComponent.brickPipeline.0"
         configKey="config"
       />,
       {
diff --git a/src/pageEditor/hooks/useBuildAndValidateMod.test.ts b/src/pageEditor/hooks/useBuildAndValidateMod.test.ts
index 6b550ca73b..c39685e655 100644
--- a/src/pageEditor/hooks/useBuildAndValidateMod.test.ts
+++ b/src/pageEditor/hooks/useBuildAndValidateMod.test.ts
@@ -180,7 +180,7 @@ describe("useBuildAndValidateMod", () => {
     });
 
     const dirtyFormState1 = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result, getReduxStore } = renderHook(
diff --git a/src/pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts b/src/pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts
index 53c4fceeab..c7f91cd519 100644
--- a/src/pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts
+++ b/src/pageEditor/hooks/useCheckModStarterBrickInvariants.test.ts
@@ -301,7 +301,7 @@ describe("useCheckModStarterBrickInvariants", () => {
       integrationDependencies: [],
     });
     const formState = await modComponentToFormState(activatedModComponent);
-    delete formState.recipe;
+    delete formState.modMetadata;
 
     const { result } = renderHook(() => useCheckModStarterBrickInvariants(), {
       setupRedux(dispatch) {
diff --git a/src/pageEditor/hooks/useCheckModStarterBrickInvariants.ts b/src/pageEditor/hooks/useCheckModStarterBrickInvariants.ts
index 28ef42c6e9..3c4d0530c7 100644
--- a/src/pageEditor/hooks/useCheckModStarterBrickInvariants.ts
+++ b/src/pageEditor/hooks/useCheckModStarterBrickInvariants.ts
@@ -53,7 +53,7 @@ function useCheckModStarterBrickInvariants(): (
    *  - For each clean mod component, every entry in definitions should exist
    *    in the {modDefinition.definitions} object
    *  - For each dirty mod component with @internal starter brick definition,
-   *    formState.extensionPoint.definition should exist in the
+   *    formState.starterBrick.definition should exist in the
    *    {modDefinition.definitions} object, but the key may be different,
    *    e.g. "extensionPoint" vs. "extensionPoint3" in the modDefinition,
    *    also need to run it through the adapter because of some cleanup logic
@@ -80,9 +80,7 @@ function useCheckModStarterBrickInvariants(): (
       }
 
       for (const formState of dirtyModComponentFormStates) {
-        if (
-          !isInnerDefinitionRegistryId(formState.extensionPoint.metadata.id)
-        ) {
+        if (!isInnerDefinitionRegistryId(formState.starterBrick.metadata.id)) {
           continue;
         }
 
diff --git a/src/pageEditor/hooks/useCompareModComponentCounts.test.ts b/src/pageEditor/hooks/useCompareModComponentCounts.test.ts
index 2b9b505e1d..4db7e8af58 100644
--- a/src/pageEditor/hooks/useCompareModComponentCounts.test.ts
+++ b/src/pageEditor/hooks/useCompareModComponentCounts.test.ts
@@ -51,7 +51,7 @@ describe("useCompareModComponentCounts", () => {
       metadata: modMetadata,
     });
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -95,7 +95,7 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const dirtyFormState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -130,10 +130,10 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const dirtyFormState1 = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
     const dirtyFormState2 = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -163,7 +163,7 @@ describe("useCompareModComponentCounts", () => {
       metadata: modMetadata,
     });
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -193,7 +193,7 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -282,7 +282,7 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -313,7 +313,7 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -344,7 +344,7 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
@@ -375,7 +375,7 @@ describe("useCompareModComponentCounts", () => {
     });
 
     const formState = formStateFactory({
-      recipe: modMetadata,
+      modMetadata,
     });
 
     const { result } = renderHook(() => useCompareModComponentCounts(), {
diff --git a/src/pageEditor/hooks/useCreateModFromModComponent.test.ts b/src/pageEditor/hooks/useCreateModFromModComponent.test.ts
index ba8c67fd27..19e2b97e69 100644
--- a/src/pageEditor/hooks/useCreateModFromModComponent.test.ts
+++ b/src/pageEditor/hooks/useCreateModFromModComponent.test.ts
@@ -48,7 +48,9 @@ describe("useCreateModFromModComponent", () => {
 
   it("saves with no dirty changes", async () => {
     const metadata = modMetadataFactory();
-    const menuItemFormState = menuItemFormStateFactory({ recipe: metadata });
+    const menuItemFormState = menuItemFormStateFactory({
+      modMetadata: metadata,
+    });
 
     appApiMock
       .onPost("/api/bricks/")
@@ -75,7 +77,9 @@ describe("useCreateModFromModComponent", () => {
   it("does not throw an error if the mod fails the compareModComponentCounts check", async () => {
     compareModComponentCountsMock.mockReturnValue(() => false);
     const metadata = modMetadataFactory();
-    const menuItemFormState = menuItemFormStateFactory({ recipe: metadata });
+    const menuItemFormState = menuItemFormStateFactory({
+      modMetadata: metadata,
+    });
 
     appApiMock
       .onPost("/api/bricks/")
@@ -95,7 +99,9 @@ describe("useCreateModFromModComponent", () => {
   it("does not throw an error if the mod fails the checkModStarterBrickInvariants check", async () => {
     checkModStarterBrickInvariantsMock.mockReturnValue(async () => false);
     const metadata = modMetadataFactory();
-    const menuItemFormState = menuItemFormStateFactory({ recipe: metadata });
+    const menuItemFormState = menuItemFormStateFactory({
+      modMetadata: metadata,
+    });
 
     appApiMock
       .onPost("/api/bricks/")
diff --git a/src/pageEditor/hooks/useCreateModFromModComponent.ts b/src/pageEditor/hooks/useCreateModFromModComponent.ts
index 42ebfc8f11..3604dfce8a 100644
--- a/src/pageEditor/hooks/useCreateModFromModComponent.ts
+++ b/src/pageEditor/hooks/useCreateModFromModComponent.ts
@@ -84,7 +84,10 @@ function useCreateModFromModComponent(
           }).unwrap();
 
           const newModComponent = produce(newModComponentFormState, (draft) => {
-            draft.recipe = selectModMetadata(newModDefinition, upsertResponse);
+            draft.modMetadata = selectModMetadata(
+              newModDefinition,
+              upsertResponse,
+            );
           });
 
           dispatch(editorActions.addModComponentFormState(newModComponent));
diff --git a/src/pageEditor/hooks/useResetMod.ts b/src/pageEditor/hooks/useResetMod.ts
index 9eb7e3976b..4f15db8ae4 100644
--- a/src/pageEditor/hooks/useResetMod.ts
+++ b/src/pageEditor/hooks/useResetMod.ts
@@ -45,7 +45,7 @@ function useResetMod(): (modId: RegistryId) => Promise<void> {
         modComponentFormStates
           .filter(
             (modComponentFormState) =>
-              modComponentFormState.recipe?.id === modId,
+              modComponentFormState.modMetadata?.id === modId,
           )
           .map(async (modComponentFormState) =>
             resetModComponent({
diff --git a/src/pageEditor/hooks/useUpsertModComponentFormState.test.ts b/src/pageEditor/hooks/useUpsertModComponentFormState.test.ts
index 63d9fd90df..f20aa07369 100644
--- a/src/pageEditor/hooks/useUpsertModComponentFormState.test.ts
+++ b/src/pageEditor/hooks/useUpsertModComponentFormState.test.ts
@@ -69,7 +69,7 @@ describe("useUpsertModComponentFormState", () => {
     expect(modComponents[0]).toEqual(
       expect.objectContaining({
         id: modComponentFormState.uuid,
-        extensionPointId: modComponentFormState.extensionPoint.metadata.id,
+        extensionPointId: modComponentFormState.starterBrick.metadata.id,
         updateTimestamp: expectedUpdateDate.toISOString(),
       }),
     );
@@ -95,7 +95,7 @@ describe("useUpsertModComponentFormState", () => {
 
     const expectedFields = {
       id: modComponentFormState.uuid,
-      extensionPointId: modComponentFormState.extensionPoint.metadata.id,
+      extensionPointId: modComponentFormState.starterBrick.metadata.id,
       updateTimestamp: expectedUpdateDate.toISOString(),
     };
 
diff --git a/src/pageEditor/hooks/useUpsertModComponentFormState.ts b/src/pageEditor/hooks/useUpsertModComponentFormState.ts
index d011874c4d..a6ad9db16a 100644
--- a/src/pageEditor/hooks/useUpsertModComponentFormState.ts
+++ b/src/pageEditor/hooks/useUpsertModComponentFormState.ts
@@ -148,7 +148,7 @@ function useUpsertModComponentFormState(): SaveCallback {
         `No adapter found for ${modComponentFormState.type}`,
       );
 
-      const starterBrickId = modComponentFormState.extensionPoint.metadata.id;
+      const starterBrickId = modComponentFormState.starterBrick.metadata.id;
       const hasInnerStarterBrick = isInnerDefinitionRegistryId(starterBrickId);
 
       let isEditable = false;
diff --git a/src/pageEditor/modals/addBrickModal/AddBrickModal.test.tsx b/src/pageEditor/modals/addBrickModal/AddBrickModal.test.tsx
index 58b0f91f6c..5977061fcc 100644
--- a/src/pageEditor/modals/addBrickModal/AddBrickModal.test.tsx
+++ b/src/pageEditor/modals/addBrickModal/AddBrickModal.test.tsx
@@ -20,7 +20,7 @@ import { render, screen } from "@/pageEditor/testHelpers";
 import AddBrickModal from "@/pageEditor/modals/addBrickModal/AddBrickModal";
 import { actions } from "@/pageEditor/slices/editorSlice";
 import userEvent from "@testing-library/user-event";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import { array } from "cooky-cutter";
 import { waitForEffect } from "@/testUtils/testHelpers";
 import bricksRegistry from "@/bricks/registry";
@@ -80,7 +80,7 @@ describe("AddBrickModal", () => {
         dispatch(actions.setActiveModComponentId(formState.uuid));
         dispatch(
           actions.showAddBlockModal({
-            path: PIPELINE_BLOCKS_FIELD_NAME,
+            path: PIPELINE_BRICKS_FIELD_NAME,
             flavor: PipelineFlavor.AllBricks,
             index: 0,
           }),
diff --git a/src/pageEditor/pageEditorTypes.ts b/src/pageEditor/pageEditorTypes.ts
index f049b6fec9..43138009ac 100644
--- a/src/pageEditor/pageEditorTypes.ts
+++ b/src/pageEditor/pageEditorTypes.ts
@@ -36,6 +36,7 @@ import { type SessionRootState } from "@/pageEditor/slices/sessionSliceTypes";
 import { type ModOptionsDefinition } from "@/types/modDefinitionTypes";
 import { type Except } from "type-fest";
 import {
+  type BaseFormStateV3,
   type BaseFormStateV1,
   type BaseFormStateV2,
 } from "@/pageEditor/baseFormStateTypes";
@@ -271,7 +272,7 @@ export type EditorStateV3 = Except<
    * When a mod component is selected in the Page Editor, a mod component form state is created for it and stored here;
    * that is, "touched" mod component form states.
    */
-  readonly modComponentFormStates: ModComponentFormState[];
+  readonly modComponentFormStates: BaseFormStateV2[];
 
   /**
    * Brick ids (not UUIDs) that the user has access to edit
@@ -317,10 +318,7 @@ export type EditorStateV3 = Except<
   /**
    * Unsaved mod components that have been deleted from a mod
    */
-  deletedModComponentFormStatesByModId: Record<
-    RegistryId,
-    ModComponentFormState[]
-  >;
+  deletedModComponentFormStatesByModId: Record<RegistryId, BaseFormStateV2[]>;
 
   /**
    * The available activated mod components for the current tab
@@ -343,7 +341,24 @@ export type EditorStateV3 = Except<
   isPendingDraftModComponents: boolean;
 };
 
-export type EditorState = EditorStateV3;
+/**
+ * @deprecated - Do not use versioned state types directly, exported for testing
+ */
+export type EditorStateV4 = Except<
+  EditorStateV3,
+  "modComponentFormStates" | "deletedModComponentFormStatesByModId"
+> & {
+  modComponentFormStates: BaseFormStateV3[];
+  deletedModComponentFormStatesByModId: Record<string, BaseFormStateV3[]>;
+};
+
+export type EditorState = Except<
+  EditorStateV4,
+  "modComponentFormStates" | "deletedModComponentFormStatesByModId"
+> & {
+  modComponentFormStates: ModComponentFormState[];
+  deletedModComponentFormStatesByModId: Record<string, ModComponentFormState[]>;
+};
 
 export type EditorRootState = {
   editor: EditorState;
diff --git a/src/pageEditor/panes/EditorPane.test.tsx b/src/pageEditor/panes/EditorPane.test.tsx
index 1d47f0af89..a610fde03a 100644
--- a/src/pageEditor/panes/EditorPane.test.tsx
+++ b/src/pageEditor/panes/EditorPane.test.tsx
@@ -38,7 +38,7 @@ import AddBrickModal from "@/pageEditor/modals/addBrickModal/AddBrickModal";
 import { type EditablePackageMetadata } from "@/types/contract";
 import { fireTextInput } from "@/testUtils/formHelpers";
 import MarkdownRenderer from "@/bricks/renderers/MarkdownRenderer";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import getType from "@/runtime/getType";
 import { type ModComponentFormState } from "@/pageEditor/starterBricks/formStateTypes";
 import { MULTIPLE_RENDERERS_ERROR_MESSAGE } from "@/analysis/analysisVisitors/renderersAnalysis";
@@ -205,7 +205,7 @@ describe("renders", () => {
 
   test("the first selected node", async () => {
     const formState = getPlainFormState();
-    const { instanceId } = formState.extension.blockPipeline[0];
+    const { instanceId } = formState.modComponent.brickPipeline[0];
     const { asFragment } = render(<EditorPane />, {
       setupRedux(dispatch) {
         dispatch(editorActions.addModComponentFormState(formState));
@@ -343,7 +343,7 @@ describe("can add a node", () => {
     const activeModComponentFormState =
       selectActiveModComponentFormState(reduxState);
     const jqNodeId = (
-      activeModComponentFormState.extension.blockPipeline[1].config
+      activeModComponentFormState.modComponent.brickPipeline[1].config
         .body as PipelineExpression
     ).__value__[0].instanceId;
     const addButtonInSubPipeline = screen.getByTestId(
@@ -366,7 +366,7 @@ describe("can add a node", () => {
 async function renderEditorPaneWithBasicFormState() {
   const modComponentFormState = getFormStateWithSubPipelines();
   const activeNodeId =
-    modComponentFormState.extension.blockPipeline[0].instanceId;
+    modComponentFormState.modComponent.brickPipeline[0].instanceId;
   const utils = render(
     <div>
       <EditorPane />
@@ -620,7 +620,7 @@ describe("validation", () => {
   test("validates string templates", async () => {
     const formState = getFormStateWithSubPipelines();
     const subEchoNode = (
-      formState.extension.blockPipeline[1].config.body as PipelineExpression
+      formState.modComponent.brickPipeline[1].config.body as PipelineExpression
     ).__value__[0];
     const { container } = render(<EditorPane />, {
       setupRedux(dispatch) {
@@ -658,7 +658,7 @@ describe("validation", () => {
 
     // Selecting the Echo brick in the first mod component
     const { instanceId: echoBlockInstanceId } =
-      modComponent1.extension.blockPipeline[0];
+      modComponent1.modComponent.brickPipeline[0];
     const { container, getReduxStore } = render(
       <>
         <EditorPane />
@@ -744,7 +744,7 @@ describe("validation", () => {
 
   test("validates multiple renderers on add", async () => {
     const formState = getPlainFormState();
-    formState.extension.blockPipeline.push(
+    formState.modComponent.brickPipeline.push(
       brickConfigFactory({
         id: MarkdownRenderer.BRICK_ID,
         config: {
@@ -781,7 +781,7 @@ describe("validation", () => {
 
   test("validates that renderer is the last node on move", async () => {
     const formState = getPlainFormState();
-    formState.extension.blockPipeline.push(
+    formState.modComponent.brickPipeline.push(
       brickConfigFactory({
         id: MarkdownRenderer.BRICK_ID,
         config: {
@@ -791,7 +791,7 @@ describe("validation", () => {
     );
 
     // Selecting the last node (renderer)
-    const { instanceId } = formState.extension.blockPipeline[2];
+    const { instanceId } = formState.modComponent.brickPipeline[2];
     const { container } = render(<EditorPane />, {
       setupRedux(dispatch) {
         dispatch(editorActions.addModComponentFormState(formState));
@@ -843,7 +843,7 @@ describe("validation", () => {
           dispatch(
             editorActions.addNode({
               block: disallowedBlockConfig,
-              pipelinePath: PIPELINE_BLOCKS_FIELD_NAME,
+              pipelinePath: PIPELINE_BRICKS_FIELD_NAME,
               pipelineIndex: 0,
             }),
           );
diff --git a/src/pageEditor/panes/EditorPane.tsx b/src/pageEditor/panes/EditorPane.tsx
index dc3289ea94..e9485e02a3 100644
--- a/src/pageEditor/panes/EditorPane.tsx
+++ b/src/pageEditor/panes/EditorPane.tsx
@@ -58,12 +58,12 @@ const EditorPaneContent: React.VoidFunctionComponent<{
   useEffect(() => {
     const messageContext = {
       extensionId: modComponentFormState.uuid,
-      blueprintId: modComponentFormState.recipe
-        ? modComponentFormState.recipe.id
+      blueprintId: modComponentFormState.modMetadata
+        ? modComponentFormState.modMetadata.id
         : undefined,
     };
     dispatch(logActions.setContext(messageContext));
-  }, [modComponentFormState.uuid, modComponentFormState.recipe, dispatch]);
+  }, [modComponentFormState.uuid, modComponentFormState.modMetadata, dispatch]);
 
   return (
     <IntegrationsSliceModIntegrationsContextAdapter>
diff --git a/src/pageEditor/panes/__snapshots__/EditorPane.test.tsx.snap b/src/pageEditor/panes/__snapshots__/EditorPane.test.tsx.snap
index ba63fd2378..92baea7069 100644
--- a/src/pageEditor/panes/__snapshots__/EditorPane.test.tsx.snap
+++ b/src/pageEditor/panes/__snapshots__/EditorPane.test.tsx.snap
@@ -607,7 +607,7 @@ exports[`renders a mod component with sub pipeline 1`] = `
               </div>
               <label
                 class="label form-label"
-                for="extension.heading"
+                for="modComponent.heading"
               >
                 Tab Title
               </label>
@@ -616,8 +616,8 @@ exports[`renders a mod component with sub pipeline 1`] = `
               >
                 <input
                   class="form-control"
-                  id="extension.heading"
-                  name="extension.heading"
+                  id="modComponent.heading"
+                  name="modComponent.heading"
                   value=""
                 />
                 <small
@@ -641,7 +641,7 @@ exports[`renders a mod component with sub pipeline 1`] = `
               </div>
               <label
                 class="label form-label"
-                for="extensionPoint.definition.isAvailable.matchPatterns"
+                for="starterBrick.definition.isAvailable.matchPatterns"
               >
                 <span>
                   Sites 
@@ -692,8 +692,8 @@ exports[`renders a mod component with sub pipeline 1`] = `
                           >
                             <textarea
                               class="form-control"
-                              id="extensionPoint.definition.isAvailable.matchPatterns.0"
-                              name="extensionPoint.definition.isAvailable.matchPatterns.0"
+                              id="starterBrick.definition.isAvailable.matchPatterns.0"
+                              name="starterBrick.definition.isAvailable.matchPatterns.0"
                               rows="1"
                             >
                               https://www.mySite1.com/*
@@ -702,7 +702,7 @@ exports[`renders a mod component with sub pipeline 1`] = `
                           <div
                             class="dropdown dropdown"
                             data-test-selected="Text"
-                            data-testid="toggle-extensionPoint.definition.isAvailable.matchPatterns.0"
+                            data-testid="toggle-starterBrick.definition.isAvailable.matchPatterns.0"
                           >
                             <button
                               aria-expanded="false"
@@ -762,7 +762,7 @@ exports[`renders a mod component with sub pipeline 1`] = `
               </div>
               <label
                 class="label form-label"
-                for="extensionPoint.definition.trigger"
+                for="starterBrick.definition.trigger"
               >
                 <span>
                   Trigger 
@@ -789,8 +789,8 @@ exports[`renders a mod component with sub pipeline 1`] = `
                 <select
                   class="form-control"
                   disabled=""
-                  id="extensionPoint.definition.trigger"
-                  name="extensionPoint.definition.trigger"
+                  id="starterBrick.definition.trigger"
+                  name="starterBrick.definition.trigger"
                 >
                   <option
                     value="load"
@@ -938,7 +938,7 @@ exports[`renders a mod component with sub pipeline 1`] = `
                   </div>
                   <label
                     class="label form-label"
-                    for="extensionPoint.definition.isAvailable.urlPatterns"
+                    for="starterBrick.definition.isAvailable.urlPatterns"
                   >
                     <span>
                       URL Patterns 
@@ -1000,7 +1000,7 @@ exports[`renders a mod component with sub pipeline 1`] = `
                   </div>
                   <label
                     class="label form-label"
-                    for="extensionPoint.definition.isAvailable.selectors"
+                    for="starterBrick.definition.isAvailable.selectors"
                   >
                     <span>
                       Selectors 
@@ -1845,7 +1845,7 @@ exports[`renders the first selected node 1`] = `
                   </div>
                   <label
                     class="label form-label"
-                    for="extension.blockPipeline.0.label"
+                    for="modComponent.brickPipeline.0.label"
                   >
                     Step Name
                   </label>
@@ -1854,8 +1854,8 @@ exports[`renders the first selected node 1`] = `
                   >
                     <input
                       class="form-control"
-                      id="extension.blockPipeline.0.label"
-                      name="extension.blockPipeline.0.label"
+                      id="modComponent.brickPipeline.0.label"
+                      name="modComponent.brickPipeline.0.label"
                       placeholder="Echo Brick"
                       value=""
                     />
@@ -1873,7 +1873,7 @@ exports[`renders the first selected node 1`] = `
                   </div>
                   <label
                     class="label form-label"
-                    for="extension.blockPipeline.0.outputKey"
+                    for="modComponent.brickPipeline.0.outputKey"
                   >
                     <span
                       class="span"
@@ -1918,8 +1918,8 @@ exports[`renders the first selected node 1`] = `
                       </div>
                       <input
                         class="form-control"
-                        id="extension.blockPipeline.0.outputKey"
-                        name="extension.blockPipeline.0.outputKey"
+                        id="modComponent.brickPipeline.0.outputKey"
+                        name="modComponent.brickPipeline.0.outputKey"
                         value="echoOutput"
                       />
                     </div>
@@ -1939,7 +1939,7 @@ exports[`renders the first selected node 1`] = `
               </div>
               <label
                 class="label form-label"
-                for="extension.blockPipeline.0.config.message"
+                for="modComponent.brickPipeline.0.config.message"
               >
                 Message
               </label>
@@ -1954,15 +1954,15 @@ exports[`renders the first selected node 1`] = `
                   >
                     <textarea
                       class="form-control"
-                      id="extension.blockPipeline.0.config.message"
-                      name="extension.blockPipeline.0.config.message"
+                      id="modComponent.brickPipeline.0.config.message"
+                      name="modComponent.brickPipeline.0.config.message"
                       rows="1"
                     />
                   </div>
                   <div
                     class="dropdown dropdown"
                     data-test-selected="Text"
-                    data-testid="toggle-extension.blockPipeline.0.config.message"
+                    data-testid="toggle-modComponent.brickPipeline.0.config.message"
                   >
                     <button
                       aria-expanded="false"
@@ -2140,7 +2140,7 @@ exports[`renders the first selected node 1`] = `
                     >
                       <textarea
                         class="form-control"
-                        name="extension.blockPipeline.0.comments"
+                        name="modComponent.brickPipeline.0.comments"
                         rows="1"
                       />
                     </div>
diff --git a/src/pageEditor/panes/insert/useAutoInsert.ts b/src/pageEditor/panes/insert/useAutoInsert.ts
index dc4c6ba1ce..084ce0de58 100644
--- a/src/pageEditor/panes/insert/useAutoInsert.ts
+++ b/src/pageEditor/panes/insert/useAutoInsert.ts
@@ -45,7 +45,7 @@ function useAutoInsert(type: StarterBrickType): void {
         undefined,
       ) as ModComponentFormState;
 
-      formState.extension.blockPipeline = getExampleBrickPipeline(
+      formState.modComponent.brickPipeline = getExampleBrickPipeline(
         formState.type,
       );
 
diff --git a/src/pageEditor/panes/save/saveHelpers.test.ts b/src/pageEditor/panes/save/saveHelpers.test.ts
index 4e6e83d8f2..b0b3143744 100644
--- a/src/pageEditor/panes/save/saveHelpers.test.ts
+++ b/src/pageEditor/panes/save/saveHelpers.test.ts
@@ -291,7 +291,7 @@ describe("replaceModComponent round trip", () => {
 
     modComponentFormState.label = "New Label";
     const newTemplate = '<input value="Click Me!"/>';
-    modComponentFormState.extensionPoint.definition.template = newTemplate;
+    modComponentFormState.starterBrick.definition.template = newTemplate;
 
     const newId = generateScopeBrickId("@test", modDefinition.metadata.id);
 
diff --git a/src/pageEditor/panes/save/saveHelpers.ts b/src/pageEditor/panes/save/saveHelpers.ts
index 36edd9837c..9d4c72392a 100644
--- a/src/pageEditor/panes/save/saveHelpers.ts
+++ b/src/pageEditor/panes/save/saveHelpers.ts
@@ -275,7 +275,7 @@ export function replaceModComponent(
     assertNotNullish(adapter, `No adapter found for ${newModComponent.type}`);
     const { selectModComponent, selectStarterBrickDefinition } = adapter;
     const rawModComponent = selectModComponent(newModComponent);
-    const starterBrickId = newModComponent.extensionPoint.metadata.id;
+    const starterBrickId = newModComponent.starterBrick.metadata.id;
     const hasInnerDefinition = isInnerDefinitionRegistryId(starterBrickId);
 
     const commonModComponentDefinition: Except<ModComponentDefinition, "id"> = {
diff --git a/src/pageEditor/sidebar/ActivatedModComponentListItem.tsx b/src/pageEditor/sidebar/ActivatedModComponentListItem.tsx
index 946365f6e7..a6b208a936 100644
--- a/src/pageEditor/sidebar/ActivatedModComponentListItem.tsx
+++ b/src/pageEditor/sidebar/ActivatedModComponentListItem.tsx
@@ -77,7 +77,7 @@ const ActivatedModComponentListItem: React.FunctionComponent<{
   );
   const isActive = activeModComponentFormState?.uuid === modComponent.id;
   // Get the selected mod id, or the mod id of the selected mod component
-  const modId = activeModId ?? activeModComponentFormState?.recipe?.id;
+  const modId = activeModId ?? activeModComponentFormState?.modMetadata?.id;
   // Set the alternate background if this item isn't active, but either its mod or another item in its mod is active
   const hasActiveModBackground =
     !isActive && modId && modComponent._recipe?.id === modId;
diff --git a/src/pageEditor/sidebar/DraftModComponentListItem.tsx b/src/pageEditor/sidebar/DraftModComponentListItem.tsx
index 98a2b03101..8dd2056ae1 100644
--- a/src/pageEditor/sidebar/DraftModComponentListItem.tsx
+++ b/src/pageEditor/sidebar/DraftModComponentListItem.tsx
@@ -80,9 +80,9 @@ const DraftModComponentListItem: React.FunctionComponent<
 
   const isActive =
     activeModComponentFormState?.uuid === modComponentFormState.uuid;
-  const modId = modComponentFormState.recipe?.id;
-  const isSiblingOfActiveListItem = activeModComponentFormState?.recipe?.id
-    ? modId === activeModComponentFormState?.recipe?.id
+  const modId = modComponentFormState.modMetadata?.id;
+  const isSiblingOfActiveListItem = activeModComponentFormState?.modMetadata?.id
+    ? modId === activeModComponentFormState?.modMetadata?.id
     : false;
   const isChildOfActiveListItem = modId === activeModId;
   const isRelativeOfActiveListItem =
@@ -125,14 +125,14 @@ const DraftModComponentListItem: React.FunctionComponent<
     });
 
   const onSave = async () => {
-    if (modComponentFormState.recipe) {
-      await saveMod(modComponentFormState.recipe?.id);
+    if (modComponentFormState.modMetadata) {
+      await saveMod(modComponentFormState.modMetadata?.id);
     } else {
       await saveStandaloneModComponent(modComponentFormState);
     }
   };
 
-  const isSaving = modComponentFormState.recipe
+  const isSaving = modComponentFormState.modMetadata
     ? isSavingMod
     : isSavingStandaloneModComponent;
 
@@ -209,14 +209,14 @@ const DraftModComponentListItem: React.FunctionComponent<
           onReset={modComponentFormState.installed ? onReset : undefined}
           isDirty={isDirty}
           onAddToMod={
-            modComponentFormState.recipe
+            modComponentFormState.modMetadata
               ? undefined
               : async () => {
                   dispatch(actions.showAddToModModal());
                 }
           }
           onRemoveFromMod={
-            modComponentFormState.recipe
+            modComponentFormState.modMetadata
               ? async () => {
                   dispatch(actions.showRemoveFromModModal());
                 }
diff --git a/src/pageEditor/sidebar/ModListItem.tsx b/src/pageEditor/sidebar/ModListItem.tsx
index 0e34ca2661..8052fb761d 100644
--- a/src/pageEditor/sidebar/ModListItem.tsx
+++ b/src/pageEditor/sidebar/ModListItem.tsx
@@ -76,7 +76,8 @@ const ModListItem: React.FC<ModListItemProps> = ({
   const latestModVersion = modDefinition?.metadata?.version;
 
   // Set the alternate background if a mod component in this mod is active
-  const hasModBackground = activeModComponentFormState?.recipe?.id === modId;
+  const hasModBackground =
+    activeModComponentFormState?.modMetadata?.id === modId;
 
   const dirtyName = useSelector(selectDirtyMetadataForModId(modId))?.name;
   const name = dirtyName ?? savedName ?? "Loading...";
diff --git a/src/pageEditor/sidebar/arrangeSidebarItems.test.ts b/src/pageEditor/sidebar/arrangeSidebarItems.test.ts
index 9d98654773..ab2aa1f11c 100644
--- a/src/pageEditor/sidebar/arrangeSidebarItems.test.ts
+++ b/src/pageEditor/sidebar/arrangeSidebarItems.test.ts
@@ -50,7 +50,7 @@ const ID_FOO_B = uuidv4();
 const formStateModComponentFooB: ButtonFormState = menuItemFormStateFactory({
   uuid: ID_FOO_B,
   label: "B",
-  recipe: modMetadataFoo,
+  modMetadata: modMetadataFoo,
 });
 
 const ID_ORPHAN_C = uuidv4();
@@ -70,7 +70,7 @@ const ID_BAR_E = uuidv4();
 const formStateModComponentBarE: ButtonFormState = menuItemFormStateFactory({
   uuid: ID_BAR_E,
   label: "E",
-  recipe: modMetadataBar,
+  modMetadata: modMetadataBar,
 });
 
 const ID_BAR_F = uuidv4();
diff --git a/src/pageEditor/sidebar/arrangeSidebarItems.ts b/src/pageEditor/sidebar/arrangeSidebarItems.ts
index dc8b76ca42..8605b9af92 100644
--- a/src/pageEditor/sidebar/arrangeSidebarItems.ts
+++ b/src/pageEditor/sidebar/arrangeSidebarItems.ts
@@ -44,15 +44,15 @@ function arrangeSidebarItems({
   for (const formState of modComponentFormStates) {
     formStateModComponentIds.add(formState.uuid);
 
-    if (formState.recipe == null) {
+    if (formState.modMetadata == null) {
       orphanSidebarItems.push(formState);
     } else {
-      const modSidebarItem = modSidebarItems[formState.recipe.id] ?? {
-        modMetadata: formState.recipe,
+      const modSidebarItem = modSidebarItems[formState.modMetadata.id] ?? {
+        modMetadata: formState.modMetadata,
         modComponents: [],
       };
       modSidebarItem.modComponents.push(formState);
-      modSidebarItems[formState.recipe.id] = modSidebarItem;
+      modSidebarItems[formState.modMetadata.id] = modSidebarItem;
     }
   }
 
diff --git a/src/pageEditor/sidebar/common.ts b/src/pageEditor/sidebar/common.ts
index 7c12c20ccc..83458fcbdc 100644
--- a/src/pageEditor/sidebar/common.ts
+++ b/src/pageEditor/sidebar/common.ts
@@ -30,7 +30,7 @@ export type ModSidebarItem = {
 export type SidebarItem = ModSidebarItem | ModComponentSidebarItem;
 
 export function getLabel(modComponent: ModComponentFormState): string {
-  return modComponent.label ?? modComponent.extensionPoint.metadata.name;
+  return modComponent.label ?? modComponent.starterBrick.metadata.name;
 }
 
 export function isModComponentBase(
@@ -44,5 +44,5 @@ export function getModComponentItemId(item: ModComponentSidebarItem): UUID {
 }
 
 export function isModSidebarItem(item: SidebarItem): item is ModSidebarItem {
-  return "modMetadata" in item;
+  return "modComponents" in item;
 }
diff --git a/src/pageEditor/sidebar/modals/CreateModModal.tsx b/src/pageEditor/sidebar/modals/CreateModModal.tsx
index 7d59e2496c..2ec0c7f114 100644
--- a/src/pageEditor/sidebar/modals/CreateModModal.tsx
+++ b/src/pageEditor/sidebar/modals/CreateModModal.tsx
@@ -72,7 +72,7 @@ function useInitialFormState({
   const scope = useSelector(selectScope);
 
   const activeModId =
-    activeModComponentFormState?.recipe?.id ?? activeMod?.metadata?.id;
+    activeModComponentFormState?.modMetadata?.id ?? activeMod?.metadata?.id;
   const dirtyModMetadata = useSelector(
     selectDirtyMetadataForModId(activeModId),
   );
@@ -150,7 +150,7 @@ const CreateModModalBody: React.FC = () => {
   // is open, and a mod is active, then we're performing a "Save as New" on that mod.
   const directlyActiveModId = useSelector(selectActiveModId);
   const activeModId =
-    directlyActiveModId ?? activeModComponentFormState?.recipe?.id;
+    directlyActiveModId ?? activeModComponentFormState?.modMetadata?.id;
   const { data: activeMod, isFetching: isModFetching } =
     useOptionalModDefinition(activeModId);
 
diff --git a/src/pageEditor/sidebar/modals/MoveFromModModal.tsx b/src/pageEditor/sidebar/modals/MoveFromModModal.tsx
index 85b4aa0068..3b362ade91 100644
--- a/src/pageEditor/sidebar/modals/MoveFromModModal.tsx
+++ b/src/pageEditor/sidebar/modals/MoveFromModModal.tsx
@@ -145,7 +145,7 @@ const MoveFromModModal: React.FC = () => {
       <Modal.Header closeButton>
         <Modal.Title>
           Remove <em>{modComponentFormState?.label}</em> from mod{" "}
-          <em>{modComponentFormState?.recipe?.name}</em>?
+          <em>{modComponentFormState?.modMetadata?.name}</em>?
         </Modal.Title>
       </Modal.Header>
       <Form
diff --git a/src/pageEditor/slices/editorSelectors.ts b/src/pageEditor/slices/editorSelectors.ts
index 27efb98913..6ec0069128 100644
--- a/src/pageEditor/slices/editorSelectors.ts
+++ b/src/pageEditor/slices/editorSelectors.ts
@@ -151,7 +151,8 @@ const dirtyOptionValuesForModIdSelector = createSelector(
   selectNotDeletedModComponentFormStates,
   (_state: EditorRootState, modId: RegistryId) => modId,
   (formStates, modId) =>
-    formStates.find((formState) => formState.recipe?.id === modId)?.optionsArgs,
+    formStates.find((formState) => formState.modMetadata?.id === modId)
+      ?.optionsArgs,
 );
 
 export const selectDirtyOptionValuesForModId =
@@ -194,7 +195,7 @@ const modIsDirtySelector = createSelector(
     selectDeletedComponentFormStatesByModId(state)[modId],
   ({ editor }: EditorRootState, modId: RegistryId) =>
     editor.modComponentFormStates
-      .filter((formState) => formState.recipe?.id === modId)
+      .filter((formState) => formState.modMetadata?.id === modId)
       .map((formState) => formState.uuid),
   (
     isModComponentDirtyById,
@@ -238,8 +239,8 @@ export const selectInstalledModMetadatas = createSelector(
   selectActivatedModComponents,
   (formStates, activatedModComponents) => {
     const formStateModMetadatas: Array<ModComponentBase["_recipe"]> = formStates
-      .filter((formState) => Boolean(formState.recipe))
-      .map((formState) => formState.recipe);
+      .filter((formState) => Boolean(formState.modMetadata))
+      .map((formState) => formState.modMetadata);
     const activatedModComponentModMetadatas: Array<
       ModComponentBase["_recipe"]
     > = activatedModComponents
diff --git a/src/pageEditor/slices/editorSlice.test.ts b/src/pageEditor/slices/editorSlice.test.ts
index bf81210899..6e76d7353c 100644
--- a/src/pageEditor/slices/editorSlice.test.ts
+++ b/src/pageEditor/slices/editorSlice.test.ts
@@ -151,28 +151,28 @@ describe("Add/Remove Bricks", () => {
   test("Add Brick", async () => {
     // Get initial bricks
     const initialBricks =
-      editor.modComponentFormStates[0].extension.blockPipeline;
+      editor.modComponentFormStates[0].modComponent.brickPipeline;
 
     // Add a Brick
     editor = editorSlice.reducer(
       editor,
       actions.addNode({
         block: standardBrick,
-        pipelinePath: "extension.blockPipeline",
+        pipelinePath: "modComponent.brickPipeline",
         pipelineIndex: 0,
       }),
     );
 
     // Ensure we have one more brick than we started with
     expect(
-      editor.modComponentFormStates[0].extension.blockPipeline,
+      editor.modComponentFormStates[0].modComponent.brickPipeline,
     ).toBeArrayOfSize(initialBricks.length + 1);
   });
 
   test("Remove Brick with Integration Dependency", async () => {
     // Get initial bricks and integration dependencies
     const initialBricks =
-      editor.modComponentFormStates[0].extension.blockPipeline;
+      editor.modComponentFormStates[0].modComponent.brickPipeline;
     const initialIntegrationDependencies =
       editor.modComponentFormStates[0].integrationDependencies;
 
@@ -184,7 +184,7 @@ describe("Add/Remove Bricks", () => {
 
     // Ensure Integration Dependency was removed
     expect(
-      editor.modComponentFormStates[0].extension.blockPipeline,
+      editor.modComponentFormStates[0].modComponent.brickPipeline,
     ).toBeArrayOfSize(initialBricks.length - 1);
     expect(
       editor.modComponentFormStates[0].integrationDependencies,
@@ -194,7 +194,7 @@ describe("Add/Remove Bricks", () => {
   test("Remove Brick without Integration Dependency", async () => {
     // Get initial bricks and services
     const initialBricks =
-      editor.modComponentFormStates[0].extension.blockPipeline;
+      editor.modComponentFormStates[0].modComponent.brickPipeline;
     const initialIntegrationDependencies =
       editor.modComponentFormStates[0].integrationDependencies;
 
@@ -206,7 +206,7 @@ describe("Add/Remove Bricks", () => {
 
     // Ensure Service was NOT removed
     expect(
-      editor.modComponentFormStates[0].extension.blockPipeline,
+      editor.modComponentFormStates[0].modComponent.brickPipeline,
     ).toBeArrayOfSize(initialBricks.length - 1);
     expect(
       editor.modComponentFormStates[0].integrationDependencies,
diff --git a/src/pageEditor/slices/editorSlice.ts b/src/pageEditor/slices/editorSlice.ts
index af736a7c6e..328a62ad7e 100644
--- a/src/pageEditor/slices/editorSlice.ts
+++ b/src/pageEditor/slices/editorSlice.ts
@@ -133,10 +133,10 @@ const cloneActiveModComponent = createAsyncThunk<
       draft.uuid = uuidv4();
       draft.label += " (Copy)";
       // Remove from its mod, if any (the user can add it to any mod after creation)
-      delete draft.recipe;
+      delete draft.modMetadata;
       // Re-generate instance IDs for all the bricks in the mod component
-      draft.extension.blockPipeline = await normalizePipelineForEditor(
-        draft.extension.blockPipeline,
+      draft.modComponent.brickPipeline = await normalizePipelineForEditor(
+        draft.modComponent.brickPipeline,
       );
     },
   );
@@ -249,7 +249,7 @@ const checkAvailableDraftModComponents = createAsyncThunk<
   const tabUrl = await getCurrentInspectedURL();
   const availableFormStateIds = await Promise.all(
     notDeletedFormStates.map(
-      async ({ uuid, extensionPoint: formStateStarterBrick }) => {
+      async ({ uuid, starterBrick: formStateStarterBrick }) => {
         const isAvailable = await isStarterBrickFormStateAvailable(
           tabUrl,
           formStateStarterBrick,
@@ -283,7 +283,7 @@ const checkActiveModComponentAvailability = createAsyncThunk<
   // Calculate new availability for the active mod component
   const isAvailable = await isStarterBrickFormStateAvailable(
     tabUrl,
-    activeModComponentFormState.extensionPoint,
+    activeModComponentFormState.starterBrick,
   );
   // Calculate the new draft mod component availability, depending on the
   // new availability of the active mod component -- should be a unique list of ids,
@@ -411,7 +411,7 @@ export const editorSlice = createSlice({
 
       if (!modComponentFormState.installed) {
         state.knownEditableBrickIds.push(
-          modComponentFormState.extensionPoint.metadata.id,
+          modComponentFormState.starterBrick.metadata.id,
         );
       }
 
@@ -556,10 +556,10 @@ export const editorSlice = createSlice({
       const modMetadata = action.payload;
       const modComponentFormStates = state.modComponentFormStates.filter(
         (modComponentFormState) =>
-          modComponentFormState.recipe?.id === modMetadata?.id,
+          modComponentFormState.modMetadata?.id === modMetadata?.id,
       );
       for (const formState of modComponentFormStates) {
-        formState.recipe = modMetadata;
+        formState.modMetadata = modMetadata;
       }
     },
     showAddToModModal(state) {
@@ -593,7 +593,7 @@ export const editorSlice = createSlice({
       state.modComponentFormStates.push({
         ...modComponentFormState,
         uuid: newId,
-        recipe: modMetadata,
+        modMetadata,
         installed: false, // Can't "reset" this, only remove or save
       });
       state.dirty[newId] = true;
@@ -634,10 +634,10 @@ export const editorSlice = createSlice({
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-type-assertion -- length check above
         state.modComponentFormStates[modComponentFormStateIndex]!;
       assertNotNullish(
-        modComponentFormState.recipe,
+        modComponentFormState.modMetadata,
         "Mod component form state has no mod definition",
       );
-      const modId = modComponentFormState.recipe.id;
+      const modId = modComponentFormState.modMetadata.id;
       state.deletedModComponentFormStatesByModId[modId] ??= [];
 
       state.deletedModComponentFormStatesByModId[modId].push(
@@ -653,7 +653,7 @@ export const editorSlice = createSlice({
         state.modComponentFormStates.push({
           ...modComponentFormState,
           uuid: newId,
-          recipe: undefined,
+          modMetadata: undefined,
         });
         state.dirty[newId] = true;
         ensureBrickPipelineUIState(state, newId);
@@ -869,7 +869,7 @@ export const editorSlice = createSlice({
         editor: state,
       });
       const modFormStates = notDeletedFormStates.filter(
-        (formState) => formState.recipe?.id === modId,
+        (formState) => formState.modMetadata?.id === modId,
       );
       for (const formState of modFormStates) {
         formState.optionsArgs = action.payload;
@@ -1007,7 +1007,7 @@ export const persistEditorConfig = {
   // Change the type of localStorage to our overridden version so that it can be exported
   // See: @/store/StorageInterface.ts
   storage: localStorage as StorageInterface,
-  version: 3,
+  version: 4,
   migrate: createMigrate(migrations, { debug: Boolean(process.env.DEBUG) }),
   blacklist: [
     "inserting",
diff --git a/src/pageEditor/slices/editorSliceHelpers.test.ts b/src/pageEditor/slices/editorSliceHelpers.test.ts
index a744d2a408..0ea598ba02 100644
--- a/src/pageEditor/slices/editorSliceHelpers.test.ts
+++ b/src/pageEditor/slices/editorSliceHelpers.test.ts
@@ -51,47 +51,47 @@ import {
 import { modMetadataFactory } from "@/testUtils/factories/modComponentFactories";
 import { formStateFactory } from "@/testUtils/factories/pageEditorFactories";
 
-describe("ensureElementUIState", () => {
+describe("ensureBrickPipelineUIState", () => {
   test("does not affect existing ui state", () => {
-    const element = formStateFactory();
+    const formState = formStateFactory();
     const state: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
+      modComponentFormStates: [formState],
       brickPipelineUIStateById: {
-        [element.uuid]: {
+        [formState.uuid]: {
           ...makeInitialBrickPipelineUIState(),
-          pipelineMap: getPipelineMap(element.extension.blockPipeline),
-          activeNodeId: element.extension.blockPipeline[0].instanceId,
+          pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
+          activeNodeId: formState.modComponent.brickPipeline[0].instanceId,
         },
       },
     };
     const newState = produce(state, (draft) => {
-      ensureBrickPipelineUIState(draft, element.uuid);
+      ensureBrickPipelineUIState(draft, formState.uuid);
     });
     expect(newState).toEqual(state);
   });
 
   test("adds ui state when not present", () => {
-    const element = formStateFactory();
+    const formState = formStateFactory();
     const state: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
+      modComponentFormStates: [formState],
     };
     const newState = produce(state, (draft) => {
-      ensureBrickPipelineUIState(draft, element.uuid);
+      ensureBrickPipelineUIState(draft, formState.uuid);
     });
 
-    expect(newState.brickPipelineUIStateById).toContainKey(element.uuid);
+    expect(newState.brickPipelineUIStateById).toContainKey(formState.uuid);
   });
 });
 
 describe("ensureNodeUIState", () => {
   test("does not affect existing node state", () => {
-    const element = formStateFactory();
-    const nodeId = element.extension.blockPipeline[0].instanceId;
+    const formState = formStateFactory();
+    const nodeId = formState.modComponent.brickPipeline[0].instanceId;
     const uiState: BrickPipelineUIState = {
       ...makeInitialBrickPipelineUIState(),
-      pipelineMap: getPipelineMap(element.extension.blockPipeline),
+      pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
       activeNodeId: nodeId,
     };
     const nodeState: NodeUIState = makeInitialNodeUIState(nodeId);
@@ -113,12 +113,12 @@ describe("ensureNodeUIState", () => {
   });
 
   test("adds node states when not present", () => {
-    const element = formStateFactory();
-    const node1Id = element.extension.blockPipeline[0].instanceId;
-    const node2Id = element.extension.blockPipeline[1].instanceId;
+    const formState = formStateFactory();
+    const node1Id = formState.modComponent.brickPipeline[0].instanceId;
+    const node2Id = formState.modComponent.brickPipeline[1].instanceId;
     const uiState: BrickPipelineUIState = {
       ...makeInitialBrickPipelineUIState(),
-      pipelineMap: getPipelineMap(element.extension.blockPipeline),
+      pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
       activeNodeId: node1Id,
     };
     const newUiState = produce(uiState, (draft) => {
@@ -130,14 +130,14 @@ describe("ensureNodeUIState", () => {
   });
 });
 
-describe("syncElementUIStates", () => {
+describe("syncNodeUIStates", () => {
   test("reset active node to foundation when node ids change, and removes invalid node states", () => {
-    const element = formStateFactory();
-    const nodeId = element.extension.blockPipeline[0].instanceId;
+    const formState = formStateFactory();
+    const nodeId = formState.modComponent.brickPipeline[0].instanceId;
     const invalidNodeId = uuidv4();
     const uiState: BrickPipelineUIState = {
       ...makeInitialBrickPipelineUIState(),
-      pipelineMap: getPipelineMap(element.extension.blockPipeline),
+      pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
       activeNodeId: invalidNodeId,
     };
     const nodeState = makeInitialNodeUIState(nodeId);
@@ -154,72 +154,72 @@ describe("syncElementUIStates", () => {
     };
     const editorState: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
+      modComponentFormStates: [formState],
       brickPipelineUIStateById: {
-        [element.uuid]: uiState,
+        [formState.uuid]: uiState,
       },
-      activeModComponentId: element.uuid,
+      activeModComponentId: formState.uuid,
     };
     const newEditorState = produce(editorState, (draft) => {
-      syncNodeUIStates(draft, element);
+      syncNodeUIStates(draft, formState);
     });
 
     expect(selectActiveNodeId({ editor: newEditorState })).toEqual(
       FOUNDATION_NODE_ID,
     );
     expect(
-      newEditorState.brickPipelineUIStateById[element.uuid].nodeUIStates,
+      newEditorState.brickPipelineUIStateById[formState.uuid].nodeUIStates,
     ).not.toContainKey(invalidNodeId);
   });
 
   test("adds missing node states", () => {
-    const element = formStateFactory();
-    const node1Id = element.extension.blockPipeline[0].instanceId;
+    const formState = formStateFactory();
+    const node1Id = formState.modComponent.brickPipeline[0].instanceId;
     const uiState: BrickPipelineUIState = {
       ...makeInitialBrickPipelineUIState(),
-      pipelineMap: getPipelineMap(element.extension.blockPipeline),
+      pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
       activeNodeId: node1Id,
     };
     const editorState: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
+      modComponentFormStates: [formState],
       brickPipelineUIStateById: {
-        [element.uuid]: uiState,
+        [formState.uuid]: uiState,
       },
     };
     const newEditorState = produce(editorState, (draft) => {
-      syncNodeUIStates(draft, element);
+      syncNodeUIStates(draft, formState);
     });
 
     // Maintains the foundation node state and adds the block node state for both blocks in the pipeline
     expect(
-      newEditorState.brickPipelineUIStateById[element.uuid].nodeUIStates,
+      newEditorState.brickPipelineUIStateById[formState.uuid].nodeUIStates,
     ).toContainKey(FOUNDATION_NODE_ID);
     expect(
-      newEditorState.brickPipelineUIStateById[element.uuid].nodeUIStates,
+      newEditorState.brickPipelineUIStateById[formState.uuid].nodeUIStates,
     ).toContainKey(node1Id);
-    const node2Id = element.extension.blockPipeline[1].instanceId;
+    const node2Id = formState.modComponent.brickPipeline[1].instanceId;
     expect(
-      newEditorState.brickPipelineUIStateById[element.uuid].nodeUIStates,
+      newEditorState.brickPipelineUIStateById[formState.uuid].nodeUIStates,
     ).toContainKey(node2Id);
   });
 });
 
 describe("setActiveNodeId", () => {
   test("sets active node when node state is missing", () => {
-    const element = formStateFactory();
-    const nodeId = element.extension.blockPipeline[0].instanceId;
+    const formState = formStateFactory();
+    const nodeId = formState.modComponent.brickPipeline[0].instanceId;
     const uiState: BrickPipelineUIState = {
       ...makeInitialBrickPipelineUIState(),
-      pipelineMap: getPipelineMap(element.extension.blockPipeline),
+      pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
     };
     const editorState: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
+      modComponentFormStates: [formState],
       brickPipelineUIStateById: {
-        [element.uuid]: uiState,
+        [formState.uuid]: uiState,
       },
-      activeModComponentId: element.uuid,
+      activeModComponentId: formState.uuid,
     };
     const newEditorState = produce(editorState, (draft) => {
       setActiveNodeId(draft, nodeId);
@@ -229,11 +229,11 @@ describe("setActiveNodeId", () => {
   });
 
   test("sets active node when node state is already present", () => {
-    const element = formStateFactory();
-    const nodeId = element.extension.blockPipeline[0].instanceId;
+    const formState = formStateFactory();
+    const nodeId = formState.modComponent.brickPipeline[0].instanceId;
     const uiState: BrickPipelineUIState = {
       ...makeInitialBrickPipelineUIState(),
-      pipelineMap: getPipelineMap(element.extension.blockPipeline),
+      pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
     };
     const nodeState = makeInitialNodeUIState(nodeId);
     uiState.nodeUIStates = {
@@ -248,11 +248,11 @@ describe("setActiveNodeId", () => {
     };
     const editorState: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
+      modComponentFormStates: [formState],
       brickPipelineUIStateById: {
-        [element.uuid]: uiState,
+        [formState.uuid]: uiState,
       },
-      activeModComponentId: element.uuid,
+      activeModComponentId: formState.uuid,
     };
     const newEditorState = produce(editorState, (draft) => {
       setActiveNodeId(draft, nodeId);
@@ -264,35 +264,35 @@ describe("setActiveNodeId", () => {
 
 jest.mock("@/telemetry/trace");
 
-describe("removeElement", () => {
-  test("removes active element and clears all associated data", () => {
-    const element = formStateFactory();
+describe("removeModComponentFormState", () => {
+  test("removes active formState and clears all associated data", () => {
+    const formState = formStateFactory();
     const state: EditorState = {
       ...initialState,
-      modComponentFormStates: [element],
-      activeModComponentId: element.uuid,
+      modComponentFormStates: [formState],
+      activeModComponentId: formState.uuid,
       dirty: {
-        [element.uuid]: true,
+        [formState.uuid]: true,
       },
       brickPipelineUIStateById: {
-        [element.uuid]: {
+        [formState.uuid]: {
           ...makeInitialBrickPipelineUIState(),
-          pipelineMap: getPipelineMap(element.extension.blockPipeline),
-          activeNodeId: element.extension.blockPipeline[0].instanceId,
+          pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
+          activeNodeId: formState.modComponent.brickPipeline[0].instanceId,
         },
       },
-      availableDraftModComponentIds: [element.uuid],
+      availableDraftModComponentIds: [formState.uuid],
     };
 
     const newState = produce(state, (draft) => {
-      removeModComponentFormState(draft, element.uuid);
+      removeModComponentFormState(draft, formState.uuid);
     });
     expect(selectActiveModComponentId({ editor: newState })).toBeNull();
     expect(selectModComponentFormStates({ editor: newState })).not.toContain(
-      element,
+      formState,
     );
-    expect(newState.dirty).not.toContainKey(element.uuid);
-    expect(newState.brickPipelineUIStateById).not.toContainKey(element.uuid);
+    expect(newState.dirty).not.toContainKey(formState.uuid);
+    expect(newState.brickPipelineUIStateById).not.toContainKey(formState.uuid);
   });
 
   test("removes inactive and unavailable mod component form state", () => {
@@ -313,19 +313,19 @@ describe("removeElement", () => {
         [availableModComponentFormState.uuid]: {
           ...makeInitialBrickPipelineUIState(),
           pipelineMap: getPipelineMap(
-            availableModComponentFormState.extension.blockPipeline,
+            availableModComponentFormState.modComponent.brickPipeline,
           ),
           activeNodeId:
-            availableModComponentFormState.extension.blockPipeline[0]
+            availableModComponentFormState.modComponent.brickPipeline[0]
               .instanceId,
         },
         [unavailableModComponentFormState.uuid]: {
           ...makeInitialBrickPipelineUIState(),
           pipelineMap: getPipelineMap(
-            unavailableModComponentFormState.extension.blockPipeline,
+            unavailableModComponentFormState.modComponent.brickPipeline,
           ),
           activeNodeId:
-            unavailableModComponentFormState.extension.blockPipeline[0]
+            unavailableModComponentFormState.modComponent.brickPipeline[0]
               .instanceId,
         },
       },
@@ -353,8 +353,12 @@ describe("removeElement", () => {
 describe("removeModData", () => {
   test("removes expanded active mod", () => {
     const modMetadata = modMetadataFactory();
-    const modComponentFormState1 = formStateFactory({ recipe: modMetadata });
-    const modComponentFormState2 = formStateFactory({ recipe: modMetadata });
+    const modComponentFormState1 = formStateFactory({
+      modMetadata,
+    });
+    const modComponentFormState2 = formStateFactory({
+      modMetadata,
+    });
     const orphanModComponentFormState = formStateFactory();
     const state: EditorState = {
       ...initialState,
@@ -373,26 +377,27 @@ describe("removeModData", () => {
         [modComponentFormState1.uuid]: {
           ...makeInitialBrickPipelineUIState(),
           pipelineMap: getPipelineMap(
-            modComponentFormState1.extension.blockPipeline,
+            modComponentFormState1.modComponent.brickPipeline,
           ),
           activeNodeId:
-            modComponentFormState1.extension.blockPipeline[0].instanceId,
+            modComponentFormState1.modComponent.brickPipeline[0].instanceId,
         },
         [modComponentFormState2.uuid]: {
           ...makeInitialBrickPipelineUIState(),
           pipelineMap: getPipelineMap(
-            modComponentFormState2.extension.blockPipeline,
+            modComponentFormState2.modComponent.brickPipeline,
           ),
           activeNodeId:
-            modComponentFormState2.extension.blockPipeline[0].instanceId,
+            modComponentFormState2.modComponent.brickPipeline[0].instanceId,
         },
         [orphanModComponentFormState.uuid]: {
           ...makeInitialBrickPipelineUIState(),
           pipelineMap: getPipelineMap(
-            orphanModComponentFormState.extension.blockPipeline,
+            orphanModComponentFormState.modComponent.brickPipeline,
           ),
           activeNodeId:
-            orphanModComponentFormState.extension.blockPipeline[0].instanceId,
+            orphanModComponentFormState.modComponent.brickPipeline[0]
+              .instanceId,
         },
       },
       availableDraftModComponentIds: [
diff --git a/src/pageEditor/slices/editorSliceHelpers.ts b/src/pageEditor/slices/editorSliceHelpers.ts
index 2e289b6703..89070fbfa9 100644
--- a/src/pageEditor/slices/editorSliceHelpers.ts
+++ b/src/pageEditor/slices/editorSliceHelpers.ts
@@ -45,7 +45,7 @@ export function ensureBrickPipelineUIState(
       makeInitialBrickPipelineUIState();
     const pipeline = state.modComponentFormStates.find(
       (x) => x.uuid === modComponentId,
-    )?.extension.blockPipeline;
+    )?.modComponent.brickPipeline;
 
     assertNotNullish(
       pipeline,
@@ -77,7 +77,7 @@ export function syncNodeUIStates(
   );
 
   const pipelineMap = getPipelineMap(
-    modComponentFormState.extension.blockPipeline,
+    modComponentFormState.modComponent.brickPipeline,
   );
 
   brickPipelineUIState.pipelineMap = pipelineMap;
@@ -221,7 +221,8 @@ export function setActiveModComponentId(
   state.beta = false;
   state.activeModComponentId = modComponentFormState.uuid;
   state.activeModId = null;
-  state.expandedModId = modComponentFormState.recipe?.id ?? state.expandedModId;
+  state.expandedModId =
+    modComponentFormState.modMetadata?.id ?? state.expandedModId;
   state.selectionSeq++;
 
   ensureBrickPipelineUIState(state, modComponentFormState.uuid);
diff --git a/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.test.ts b/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.test.ts
index 192041ac6f..fbc59d9d6a 100644
--- a/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.test.ts
+++ b/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.test.ts
@@ -178,7 +178,7 @@ describe("selectGetCleanComponentsAndDirtyFormStatesForMod", () => {
       const newFormStates: ModComponentFormState[] = [];
       for (let i = 0; i < newCount; i++) {
         const formState = formStateFactory({
-          recipe: primaryModMetadata,
+          modMetadata: primaryModMetadata,
         });
         newFormStates.push(formState);
       }
@@ -216,7 +216,7 @@ describe("selectGetCleanComponentsAndDirtyFormStatesForMod", () => {
       const extraNewFormStates: ModComponentFormState[] = [];
       for (let i = 0; i < extraNew; i++) {
         const formState = formStateFactory({
-          recipe: otherModMetadata,
+          modMetadata: otherModMetadata,
         });
         extraNewFormStates.push(formState);
       }
diff --git a/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.ts b/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.ts
index 89a7cb612c..6b408d11a6 100644
--- a/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.ts
+++ b/src/pageEditor/slices/selectors/selectGetCleanComponentsAndDirtyFormStatesForMod.ts
@@ -31,7 +31,7 @@ export const selectGetCleanComponentsAndDirtyFormStatesForMod = createSelector(
     (modId: RegistryId) => {
       const dirtyModComponentFormStates = formStates.filter(
         (formState) =>
-          formState.recipe?.id === modId &&
+          formState.modMetadata?.id === modId &&
           isDirtyByComponentId[formState.uuid],
       );
 
diff --git a/src/pageEditor/starterBricks/base.ts b/src/pageEditor/starterBricks/base.ts
index 521c1395ff..672c6b18c9 100644
--- a/src/pageEditor/starterBricks/base.ts
+++ b/src/pageEditor/starterBricks/base.ts
@@ -123,7 +123,7 @@ export function baseFromModComponent<T extends StarterBrickType>(
   | "integrationDependencies"
   | "permissions"
   | "optionsArgs"
-  | "recipe"
+  | "modMetadata"
 > & { type: T } {
   return {
     uuid: config.id,
@@ -135,7 +135,7 @@ export function baseFromModComponent<T extends StarterBrickType>(
     permissions: config.permissions ?? {},
     optionsArgs: config.optionsArgs ?? {},
     type,
-    recipe: config._recipe,
+    modMetadata: config._recipe,
   };
 }
 
@@ -146,9 +146,9 @@ export function initModOptionsIfNeeded<TFormState extends BaseFormState>(
   modComponentFormState: TFormState,
   modDefinitions: ModDefinition[],
 ) {
-  if (modComponentFormState.recipe?.id) {
+  if (modComponentFormState.modMetadata?.id) {
     const mod = modDefinitions?.find(
-      (x) => x.metadata.id === modComponentFormState.recipe?.id,
+      (x) => x.metadata.id === modComponentFormState.modMetadata?.id,
     );
 
     if (mod?.options == null) {
@@ -175,8 +175,8 @@ export function baseSelectModComponent({
   optionsArgs,
   integrationDependencies,
   permissions,
-  extensionPoint,
-  recipe,
+  starterBrick,
+  modMetadata: mod,
 }: BaseFormState): Pick<
   ModComponentBase,
   | "id"
@@ -191,8 +191,8 @@ export function baseSelectModComponent({
   return {
     id: uuid,
     apiVersion,
-    extensionPointId: extensionPoint.metadata.id,
-    _recipe: recipe,
+    extensionPointId: starterBrick.metadata.id,
+    _recipe: mod,
     label,
     integrationDependencies,
     permissions,
@@ -202,17 +202,17 @@ export function baseSelectModComponent({
 
 export function makeInitialBaseState(
   uuid: UUID = uuidv4(),
-): Except<BaseFormState, "type" | "label" | "extensionPoint"> {
+): Except<BaseFormState, "type" | "label" | "starterBrick"> {
   return {
     uuid,
     apiVersion: PAGE_EDITOR_DEFAULT_BRICK_API_VERSION,
     integrationDependencies: [],
     permissions: emptyPermissionsFactory(),
     optionsArgs: {},
-    extension: {
-      blockPipeline: [],
+    modComponent: {
+      brickPipeline: [],
     },
-    recipe: undefined,
+    modMetadata: undefined,
   };
 }
 
@@ -321,7 +321,7 @@ export async function lookupStarterBrick<
 export function baseSelectStarterBrick(
   formState: BaseFormState,
 ): Except<StarterBrickDefinitionLike, "definition"> {
-  const { metadata } = formState.extensionPoint;
+  const { metadata } = formState.starterBrick;
 
   return {
     apiVersion: formState.apiVersion,
@@ -451,7 +451,7 @@ export async function modComponentWithNormalizedPipeline<
 ): Promise<BaseModComponentState & Omit<T, Prop>> {
   const { [pipelineProp]: pipeline, ...rest } = { ...config };
   return {
-    blockPipeline: await normalizePipelineForEditor(
+    brickPipeline: await normalizePipelineForEditor(
       castArray(pipeline) as BrickPipeline,
     ),
     ...defaults,
diff --git a/src/pageEditor/starterBricks/button.ts b/src/pageEditor/starterBricks/button.ts
index 9b1966a548..18cea80d3c 100644
--- a/src/pageEditor/starterBricks/button.ts
+++ b/src/pageEditor/starterBricks/button.ts
@@ -61,7 +61,7 @@ function fromNativeElement(
     label: `My ${getDomain(url)} button`,
     ...makeInitialBaseState(button.uuid),
     containerInfo: button.containerInfo,
-    extensionPoint: {
+    starterBrick: {
       metadata,
       definition: {
         ...button.menu,
@@ -77,9 +77,9 @@ function fromNativeElement(
         },
       },
     },
-    extension: {
+    modComponent: {
       caption: button.item.caption,
-      blockPipeline: [],
+      brickPipeline: [],
       dynamicCaption: false,
       onSuccess: true,
       synchronous: false,
@@ -90,7 +90,7 @@ function fromNativeElement(
 function selectStarterBrickDefinition(
   formState: ButtonFormState,
 ): StarterBrickDefinitionLike<ButtonDefinition> {
-  const { extensionPoint: starterBrick } = formState;
+  const { starterBrick } = formState;
   const {
     definition: {
       isAvailable,
@@ -121,13 +121,13 @@ function selectModComponent(
   state: ButtonFormState,
   options: { includeInstanceIds?: boolean } = {},
 ): ModComponentBase<ButtonStarterBrickConfig> {
-  const { extension: modComponent } = state;
+  const { modComponent } = state;
   const config: ButtonStarterBrickConfig = {
     caption: modComponent.caption,
     icon: modComponent.icon,
     action: options.includeInstanceIds
-      ? modComponent.blockPipeline
-      : omitEditorMetadata(modComponent.blockPipeline),
+      ? modComponent.brickPipeline
+      : omitEditorMetadata(modComponent.brickPipeline),
     dynamicCaption: modComponent.dynamicCaption,
     onSuccess: modComponent.onSuccess,
     synchronous: modComponent.synchronous,
@@ -157,10 +157,10 @@ async function fromModComponent(
 
   return {
     ...base,
-    extension: modComponent,
+    modComponent,
     // `containerInfo` only populated on initial creation session
     containerInfo: null,
-    extensionPoint: {
+    starterBrick: {
       metadata: starterBrick.metadata,
       definition: {
         ...starterBrick.definition,
diff --git a/src/pageEditor/starterBricks/contextMenu.ts b/src/pageEditor/starterBricks/contextMenu.ts
index 64af789a48..4426ec66c0 100644
--- a/src/pageEditor/starterBricks/contextMenu.ts
+++ b/src/pageEditor/starterBricks/contextMenu.ts
@@ -60,7 +60,7 @@ function fromNativeElement(
     // To simplify the interface, this is kept in sync with the caption
     label: title,
     ...base,
-    extensionPoint: {
+    starterBrick: {
       metadata,
       definition: {
         type: "contextMenu",
@@ -72,10 +72,10 @@ function fromNativeElement(
         isAvailable,
       },
     },
-    extension: {
+    modComponent: {
       title,
       onSuccess: true,
-      blockPipeline: [],
+      brickPipeline: [],
     },
   };
 }
@@ -83,7 +83,7 @@ function fromNativeElement(
 function selectStarterBrickDefinition(
   formState: ContextMenuFormState,
 ): StarterBrickDefinitionLike<ContextMenuDefinition> {
-  const { extensionPoint: starterBrick } = formState;
+  const { starterBrick } = formState;
   const {
     definition: {
       isAvailable,
@@ -110,13 +110,13 @@ function selectModComponent(
   state: ContextMenuFormState,
   options: { includeInstanceIds?: boolean } = {},
 ): ModComponentBase<ContextMenuConfig> {
-  const { extension: modComponent } = state;
+  const { modComponent } = state;
   const config: ContextMenuConfig = {
     title: modComponent.title,
     onSuccess: modComponent.onSuccess,
     action: options.includeInstanceIds
-      ? modComponent.blockPipeline
-      : omitEditorMetadata(modComponent.blockPipeline),
+      ? modComponent.brickPipeline
+      : omitEditorMetadata(modComponent.brickPipeline),
   };
   return removeEmptyValues({
     ...baseSelectModComponent(state),
@@ -150,8 +150,8 @@ async function fromModComponent(
 
   return {
     ...base,
-    extension: modComponent,
-    extensionPoint: {
+    modComponent,
+    starterBrick: {
       metadata: starterBrick.metadata,
       definition: {
         type: "contextMenu",
diff --git a/src/pageEditor/starterBricks/quickBar.ts b/src/pageEditor/starterBricks/quickBar.ts
index de08b6ba03..e3e9e497f8 100644
--- a/src/pageEditor/starterBricks/quickBar.ts
+++ b/src/pageEditor/starterBricks/quickBar.ts
@@ -57,7 +57,7 @@ function fromNativeElement(url: string, metadata: Metadata): QuickBarFormState {
     // To simplify the interface, this is kept in sync with the caption
     label: title,
     ...base,
-    extensionPoint: {
+    starterBrick: {
       metadata,
       definition: {
         type: "quickBar",
@@ -69,9 +69,9 @@ function fromNativeElement(url: string, metadata: Metadata): QuickBarFormState {
         isAvailable,
       },
     },
-    extension: {
+    modComponent: {
       title,
-      blockPipeline: [],
+      brickPipeline: [],
     },
   };
 }
@@ -79,7 +79,7 @@ function fromNativeElement(url: string, metadata: Metadata): QuickBarFormState {
 function selectStarterBrickDefinition(
   formState: QuickBarFormState,
 ): StarterBrickDefinitionLike<QuickBarDefinition> {
-  const { extensionPoint: starterBrick } = formState;
+  const { starterBrick } = formState;
   const {
     definition: {
       isAvailable,
@@ -106,13 +106,13 @@ function selectModComponent(
   state: QuickBarFormState,
   options: { includeInstanceIds?: boolean } = {},
 ): ModComponentBase<QuickBarConfig> {
-  const { extension: modComponent } = state;
+  const { modComponent } = state;
   const config: QuickBarConfig = {
     title: modComponent.title,
     icon: modComponent.icon,
     action: options.includeInstanceIds
-      ? modComponent.blockPipeline
-      : omitEditorMetadata(modComponent.blockPipeline),
+      ? modComponent.brickPipeline
+      : omitEditorMetadata(modComponent.brickPipeline),
   };
   return removeEmptyValues({
     ...baseSelectModComponent(state),
@@ -147,8 +147,8 @@ async function fromModComponent(
 
   return {
     ...base,
-    extension: modComponent,
-    extensionPoint: {
+    modComponent,
+    starterBrick: {
       metadata: starterBrick.metadata,
       definition: {
         type: "quickBar",
diff --git a/src/pageEditor/starterBricks/quickBarProvider.ts b/src/pageEditor/starterBricks/quickBarProvider.ts
index 808ffedc4d..888cd68d2b 100644
--- a/src/pageEditor/starterBricks/quickBarProvider.ts
+++ b/src/pageEditor/starterBricks/quickBarProvider.ts
@@ -60,7 +60,7 @@ function fromNativeElement(
     // To simplify the interface, this is kept in sync with the caption
     label: title,
     ...base,
-    extensionPoint: {
+    starterBrick: {
       metadata,
       definition: {
         type: "quickBarProvider",
@@ -70,9 +70,9 @@ function fromNativeElement(
         isAvailable,
       },
     },
-    extension: {
+    modComponent: {
       rootAction: undefined,
-      blockPipeline: [],
+      brickPipeline: [],
     },
   };
 }
@@ -80,7 +80,7 @@ function fromNativeElement(
 function selectStarterBrickDefinition(
   formState: QuickBarProviderFormState,
 ): StarterBrickDefinitionLike<QuickBarProviderDefinition> {
-  const { extensionPoint: starterBrick } = formState;
+  const { starterBrick } = formState;
   const {
     definition: { isAvailable, documentUrlPatterns, reader },
   } = starterBrick;
@@ -99,12 +99,12 @@ function selectModComponent(
   state: QuickBarProviderFormState,
   options: { includeInstanceIds?: boolean } = {},
 ): ModComponentBase<QuickBarProviderConfig> {
-  const { extension: modComponent } = state;
+  const { modComponent } = state;
   const config: QuickBarProviderConfig = {
     rootAction: modComponent.rootAction,
     generator: options.includeInstanceIds
-      ? modComponent.blockPipeline
-      : omitEditorMetadata(modComponent.blockPipeline),
+      ? modComponent.brickPipeline
+      : omitEditorMetadata(modComponent.brickPipeline),
   };
   return removeEmptyValues({
     ...baseSelectModComponent(state),
@@ -137,8 +137,8 @@ async function fromModComponent(
 
   return {
     ...base,
-    extension: modComponent,
-    extensionPoint: {
+    modComponent,
+    starterBrick: {
       metadata: starterBrick.metadata,
       definition: {
         type: "quickBarProvider",
diff --git a/src/pageEditor/starterBricks/sidebar.ts b/src/pageEditor/starterBricks/sidebar.ts
index 29414ae565..ed05db2f5e 100644
--- a/src/pageEditor/starterBricks/sidebar.ts
+++ b/src/pageEditor/starterBricks/sidebar.ts
@@ -53,7 +53,7 @@ function fromNativeElement(url: string, metadata: Metadata): SidebarFormState {
     type: "actionPanel",
     label: heading,
     ...base,
-    extensionPoint: {
+    starterBrick: {
       metadata,
 
       definition: {
@@ -72,9 +72,9 @@ function fromNativeElement(url: string, metadata: Metadata): SidebarFormState {
         customEvent: null,
       },
     },
-    extension: {
+    modComponent: {
       heading,
-      blockPipeline: [],
+      brickPipeline: [],
     },
   };
 }
@@ -82,7 +82,7 @@ function fromNativeElement(url: string, metadata: Metadata): SidebarFormState {
 function selectStarterBrickDefinition(
   formState: SidebarFormState,
 ): StarterBrickDefinitionLike {
-  const { extensionPoint: starterBrick } = formState;
+  const { starterBrick } = formState;
   const {
     definition: { isAvailable, reader, trigger, debounce, customEvent },
   } = starterBrick;
@@ -103,12 +103,12 @@ function selectModComponent(
   state: SidebarFormState,
   options: { includeInstanceIds?: boolean } = {},
 ): ModComponentBase<SidebarConfig> {
-  const { extension: modComponent } = state;
+  const { modComponent } = state;
   const config: SidebarConfig = {
     heading: modComponent.heading,
     body: options.includeInstanceIds
-      ? modComponent.blockPipeline
-      : omitEditorMetadata(modComponent.blockPipeline),
+      ? modComponent.brickPipeline
+      : omitEditorMetadata(modComponent.brickPipeline),
   };
   return removeEmptyValues({
     ...baseSelectModComponent(state),
@@ -154,8 +154,8 @@ async function fromModComponent(
 
   return {
     ...base,
-    extension: modComponent,
-    extensionPoint: {
+    modComponent,
+    starterBrick: {
       metadata: starterBrick.metadata,
       definition: {
         ...starterBrick.definition,
diff --git a/src/pageEditor/starterBricks/trigger.ts b/src/pageEditor/starterBricks/trigger.ts
index e1b0e4f0e2..aaab0a26a0 100644
--- a/src/pageEditor/starterBricks/trigger.ts
+++ b/src/pageEditor/starterBricks/trigger.ts
@@ -56,7 +56,7 @@ function fromNativeElement(
     type: "trigger",
     label: `My ${getDomain(url)} trigger`,
     ...makeInitialBaseState(),
-    extensionPoint: {
+    starterBrick: {
       metadata,
       definition: {
         type: "trigger",
@@ -78,8 +78,8 @@ function fromNativeElement(
         isAvailable: getDefaultAvailabilityForUrl(url),
       },
     },
-    extension: {
-      blockPipeline: [],
+    modComponent: {
+      brickPipeline: [],
     },
   };
 }
@@ -87,7 +87,7 @@ function fromNativeElement(
 function selectStarterBrickDefinition(
   formState: TriggerFormState,
 ): StarterBrickDefinitionLike<TriggerDefinition> {
-  const { extensionPoint: starterBrick } = formState;
+  const { starterBrick } = formState;
   const {
     definition: {
       isAvailable,
@@ -129,11 +129,11 @@ function selectModComponent(
   state: TriggerFormState,
   options: { includeInstanceIds?: boolean } = {},
 ): ModComponentBase<TriggerConfig> {
-  const { extension: modComponent } = state;
+  const { modComponent } = state;
   const config: TriggerConfig = {
     action: options.includeInstanceIds
-      ? modComponent.blockPipeline
-      : omitEditorMetadata(modComponent.blockPipeline),
+      ? modComponent.brickPipeline
+      : omitEditorMetadata(modComponent.brickPipeline),
   };
   return removeEmptyValues({
     ...baseSelectModComponent(state),
@@ -186,8 +186,8 @@ async function fromModComponent(
 
   return {
     ...base,
-    extension: modComponent,
-    extensionPoint: {
+    modComponent,
+    starterBrick: {
       metadata: starterBrick.metadata,
       definition: {
         type: starterBrick.definition.type,
diff --git a/src/pageEditor/tabs/MatchRulesSection.test.tsx b/src/pageEditor/tabs/MatchRulesSection.test.tsx
index 95b365e38f..939ee0d844 100644
--- a/src/pageEditor/tabs/MatchRulesSection.test.tsx
+++ b/src/pageEditor/tabs/MatchRulesSection.test.tsx
@@ -29,7 +29,7 @@ describe("MatchRulesSection", () => {
   test("render empty section", () => {
     expect(
       render(<MatchRulesSection isLocked={false} />, {
-        initialValues: set({}, "extensionPoint.definition.isAvailable", {
+        initialValues: set({}, "starterBrick.definition.isAvailable", {
           matchPatterns: [],
           urlPatterns: [],
           selectors: [],
@@ -41,7 +41,7 @@ describe("MatchRulesSection", () => {
   test("render populated section", () => {
     expect(
       render(<MatchRulesSection isLocked={false} />, {
-        initialValues: set({}, "extensionPoint.definition.isAvailable", {
+        initialValues: set({}, "starterBrick.definition.isAvailable", {
           matchPatterns: [],
           urlPatterns: [
             {
diff --git a/src/pageEditor/tabs/MatchRulesSection.tsx b/src/pageEditor/tabs/MatchRulesSection.tsx
index 643688e29b..b0a2cc9029 100644
--- a/src/pageEditor/tabs/MatchRulesSection.tsx
+++ b/src/pageEditor/tabs/MatchRulesSection.tsx
@@ -26,12 +26,12 @@ const MatchRulesSection: React.FunctionComponent<{
 }> = ({ isLocked }) => (
   <ConnectedCollapsibleFieldSection title="Advanced: Match Rules">
     <UrlPatternField
-      name="extensionPoint.definition.isAvailable.urlPatterns"
+      name="starterBrick.definition.isAvailable.urlPatterns"
       {...makeLockableFieldProps("URL Patterns", isLocked)}
     />
 
     <SelectorMatchField
-      name="extensionPoint.definition.isAvailable.selectors"
+      name="starterBrick.definition.isAvailable.selectors"
       {...makeLockableFieldProps("Selectors", isLocked)}
     />
   </ConnectedCollapsibleFieldSection>
diff --git a/src/pageEditor/tabs/__snapshots__/MatchRulesSection.test.tsx.snap b/src/pageEditor/tabs/__snapshots__/MatchRulesSection.test.tsx.snap
index ee6f551d47..720dd67417 100644
--- a/src/pageEditor/tabs/__snapshots__/MatchRulesSection.test.tsx.snap
+++ b/src/pageEditor/tabs/__snapshots__/MatchRulesSection.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`MatchRulesSection render empty section 1`] = `
           </div>
           <label
             class="label form-label"
-            for="extensionPoint.definition.isAvailable.urlPatterns"
+            for="starterBrick.definition.isAvailable.urlPatterns"
           >
             URL Patterns
           </label>
@@ -91,7 +91,7 @@ exports[`MatchRulesSection render empty section 1`] = `
           </div>
           <label
             class="label form-label"
-            for="extensionPoint.definition.isAvailable.selectors"
+            for="starterBrick.definition.isAvailable.selectors"
           >
             Selectors
           </label>
@@ -177,7 +177,7 @@ exports[`MatchRulesSection render populated section 1`] = `
           </div>
           <label
             class="label form-label"
-            for="extensionPoint.definition.isAvailable.urlPatterns"
+            for="starterBrick.definition.isAvailable.urlPatterns"
           >
             URL Patterns
           </label>
@@ -232,7 +232,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                 <td>
                                   <input
                                     class="form-control"
-                                    data-testid="extensionPoint.definition.isAvailable.urlPatterns.0.hostname-name"
+                                    data-testid="starterBrick.definition.isAvailable.urlPatterns.0.hostname-name"
                                     readonly=""
                                     type="text"
                                     value="hostname"
@@ -260,8 +260,8 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         >
                                           <input
                                             class="form-control"
-                                            id="extensionPoint.definition.isAvailable.urlPatterns.0.hostname"
-                                            name="extensionPoint.definition.isAvailable.urlPatterns.0.hostname"
+                                            id="starterBrick.definition.isAvailable.urlPatterns.0.hostname"
+                                            name="starterBrick.definition.isAvailable.urlPatterns.0.hostname"
                                             readonly=""
                                             value=""
                                           />
@@ -269,7 +269,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         <div
                                           class="dropdown dropdown"
                                           data-test-selected="Exclude"
-                                          data-testid="toggle-extensionPoint.definition.isAvailable.urlPatterns.0.hostname"
+                                          data-testid="toggle-starterBrick.definition.isAvailable.urlPatterns.0.hostname"
                                         >
                                           <button
                                             aria-expanded="false"
@@ -302,7 +302,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                 <td>
                                   <input
                                     class="form-control"
-                                    data-testid="extensionPoint.definition.isAvailable.urlPatterns.0.pathname-name"
+                                    data-testid="starterBrick.definition.isAvailable.urlPatterns.0.pathname-name"
                                     readonly=""
                                     type="text"
                                     value="pathname"
@@ -330,8 +330,8 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         >
                                           <input
                                             class="form-control"
-                                            id="extensionPoint.definition.isAvailable.urlPatterns.0.pathname"
-                                            name="extensionPoint.definition.isAvailable.urlPatterns.0.pathname"
+                                            id="starterBrick.definition.isAvailable.urlPatterns.0.pathname"
+                                            name="starterBrick.definition.isAvailable.urlPatterns.0.pathname"
                                             readonly=""
                                             value=""
                                           />
@@ -339,7 +339,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         <div
                                           class="dropdown dropdown"
                                           data-test-selected="Exclude"
-                                          data-testid="toggle-extensionPoint.definition.isAvailable.urlPatterns.0.pathname"
+                                          data-testid="toggle-starterBrick.definition.isAvailable.urlPatterns.0.pathname"
                                         >
                                           <button
                                             aria-expanded="false"
@@ -372,7 +372,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                 <td>
                                   <input
                                     class="form-control"
-                                    data-testid="extensionPoint.definition.isAvailable.urlPatterns.0.hash-name"
+                                    data-testid="starterBrick.definition.isAvailable.urlPatterns.0.hash-name"
                                     readonly=""
                                     type="text"
                                     value="hash"
@@ -400,8 +400,8 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         >
                                           <textarea
                                             class="form-control"
-                                            id="extensionPoint.definition.isAvailable.urlPatterns.0.hash"
-                                            name="extensionPoint.definition.isAvailable.urlPatterns.0.hash"
+                                            id="starterBrick.definition.isAvailable.urlPatterns.0.hash"
+                                            name="starterBrick.definition.isAvailable.urlPatterns.0.hash"
                                             rows="1"
                                           >
                                             /foo/
@@ -410,7 +410,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         <div
                                           class="dropdown dropdown"
                                           data-test-selected="Text"
-                                          data-testid="toggle-extensionPoint.definition.isAvailable.urlPatterns.0.hash"
+                                          data-testid="toggle-starterBrick.definition.isAvailable.urlPatterns.0.hash"
                                         >
                                           <button
                                             aria-expanded="false"
@@ -443,7 +443,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                 <td>
                                   <input
                                     class="form-control"
-                                    data-testid="extensionPoint.definition.isAvailable.urlPatterns.0.search-name"
+                                    data-testid="starterBrick.definition.isAvailable.urlPatterns.0.search-name"
                                     readonly=""
                                     type="text"
                                     value="search"
@@ -471,8 +471,8 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         >
                                           <input
                                             class="form-control"
-                                            id="extensionPoint.definition.isAvailable.urlPatterns.0.search"
-                                            name="extensionPoint.definition.isAvailable.urlPatterns.0.search"
+                                            id="starterBrick.definition.isAvailable.urlPatterns.0.search"
+                                            name="starterBrick.definition.isAvailable.urlPatterns.0.search"
                                             readonly=""
                                             value=""
                                           />
@@ -480,7 +480,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                                         <div
                                           class="dropdown dropdown"
                                           data-test-selected="Exclude"
-                                          data-testid="toggle-extensionPoint.definition.isAvailable.urlPatterns.0.search"
+                                          data-testid="toggle-starterBrick.definition.isAvailable.urlPatterns.0.search"
                                         >
                                           <button
                                             aria-expanded="false"
@@ -522,7 +522,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                       <div
                         class="dropdown dropdown"
                         data-test-selected="Object properties"
-                        data-testid="toggle-extensionPoint.definition.isAvailable.urlPatterns.0"
+                        data-testid="toggle-starterBrick.definition.isAvailable.urlPatterns.0"
                       >
                         <button
                           aria-expanded="false"
@@ -579,7 +579,7 @@ exports[`MatchRulesSection render populated section 1`] = `
           </div>
           <label
             class="label form-label"
-            for="extensionPoint.definition.isAvailable.selectors"
+            for="starterBrick.definition.isAvailable.selectors"
           >
             Selectors
           </label>
@@ -613,8 +613,8 @@ exports[`MatchRulesSection render populated section 1`] = `
                       >
                         <textarea
                           class="form-control"
-                          id="extensionPoint.definition.isAvailable.selectors.0"
-                          name="extensionPoint.definition.isAvailable.selectors.0"
+                          id="starterBrick.definition.isAvailable.selectors.0"
+                          name="starterBrick.definition.isAvailable.selectors.0"
                           rows="1"
                         >
                           #foo
@@ -623,7 +623,7 @@ exports[`MatchRulesSection render populated section 1`] = `
                       <div
                         class="dropdown dropdown"
                         data-test-selected="Text"
-                        data-testid="toggle-extensionPoint.definition.isAvailable.selectors.0"
+                        data-testid="toggle-starterBrick.definition.isAvailable.selectors.0"
                       >
                         <button
                           aria-expanded="false"
diff --git a/src/pageEditor/tabs/button/ButtonConfiguration.tsx b/src/pageEditor/tabs/button/ButtonConfiguration.tsx
index a3001510b6..4def067596 100644
--- a/src/pageEditor/tabs/button/ButtonConfiguration.tsx
+++ b/src/pageEditor/tabs/button/ButtonConfiguration.tsx
@@ -48,29 +48,29 @@ const positionOptions: Option[] = [
 const ButtonConfiguration: React.FC<{
   isLocked: boolean;
 }> = ({ isLocked = false }) => {
-  const [{ value: onSuccess }] = useField("extension.onSuccess");
+  const [{ value: onSuccess }] = useField("modComponent.onSuccess");
 
   return (
     <>
       <ConnectedFieldTemplate
-        name="extension.caption"
+        name="modComponent.caption"
         label="Button text"
         description="This is the text that appears on the button"
       />
 
       <ConnectedFieldTemplate
-        name="extensionPoint.definition.containerSelector"
+        name="starterBrick.definition.containerSelector"
         as={LocationWidget}
         {...makeLockableFieldProps("Location", isLocked)}
       />
 
       <UrlMatchPatternField
-        name="extensionPoint.definition.isAvailable.matchPatterns"
+        name="starterBrick.definition.isAvailable.matchPatterns"
         {...makeLockableFieldProps("Sites", isLocked)}
       />
 
       <ConnectedFieldTemplate
-        name="extensionPoint.definition.isAvailable.allFrames"
+        name="starterBrick.definition.isAvailable.allFrames"
         title="Show in All Frames"
         as={BooleanWidget}
         description="Show button in all matching frames. If toggled off, the button will only be added in the top-level frame."
@@ -79,14 +79,14 @@ const ButtonConfiguration: React.FC<{
 
       <ConnectedCollapsibleFieldSection title="Advanced: Item Options">
         <ConnectedFieldTemplate
-          name="extension.icon"
+          name="modComponent.icon"
           label="Icon"
           as={IconWidget}
           description="Icon to place in the icon placeholder of the template"
         />
 
         <ConnectedFieldTemplate
-          name="extensionPoint.definition.position"
+          name="starterBrick.definition.position"
           description="Position relative to other buttons"
           as={SelectWidget}
           blankValue={null}
@@ -95,7 +95,7 @@ const ButtonConfiguration: React.FC<{
         />
 
         <ConnectedFieldTemplate
-          name="extensionPoint.definition.template"
+          name="starterBrick.definition.template"
           as={TemplateWidget}
           description="A template for the item, with a placeholder for the caption and/or icon"
           snippets={buttonSnippets}
@@ -103,7 +103,7 @@ const ButtonConfiguration: React.FC<{
         />
 
         <ConnectedFieldTemplate
-          name="extensionPoint.definition.attachMode"
+          name="starterBrick.definition.attachMode"
           as="select"
           title="Attach Mode"
           description={
@@ -121,7 +121,7 @@ const ButtonConfiguration: React.FC<{
         </ConnectedFieldTemplate>
 
         <ConnectedFieldTemplate
-          name="extensionPoint.definition.targetMode"
+          name="starterBrick.definition.targetMode"
           as="select"
           title="Target Mode"
           blankValue="document"
@@ -139,7 +139,7 @@ const ButtonConfiguration: React.FC<{
         </ConnectedFieldTemplate>
 
         <ConnectedFieldTemplate
-          name="extension.synchronous"
+          name="modComponent.synchronous"
           label="Synchronous"
           as={SwitchButtonWidget}
           description="Prevent button to be clicked again while action is in progress"
@@ -150,7 +150,7 @@ const ButtonConfiguration: React.FC<{
           // Punt on object-based configuration for now. Enterprise customers are just asking to turn off the message.
           // If they want a custom message they can add an alert brick.
           <ConnectedFieldTemplate
-            name="extension.onSuccess"
+            name="modComponent.onSuccess"
             label="Show Success Message"
             as={SwitchButtonWidget}
             description="Show the default success message when run"
diff --git a/src/pageEditor/tabs/contextMenu/ContextMenuConfiguration.tsx b/src/pageEditor/tabs/contextMenu/ContextMenuConfiguration.tsx
index 7bf2d76784..9013959533 100644
--- a/src/pageEditor/tabs/contextMenu/ContextMenuConfiguration.tsx
+++ b/src/pageEditor/tabs/contextMenu/ContextMenuConfiguration.tsx
@@ -48,12 +48,12 @@ export const contextOptions = [
 const ContextMenuConfiguration: React.FC<{
   isLocked: boolean;
 }> = ({ isLocked = false }) => {
-  const [{ value: onSuccess }] = useField("extension.onSuccess");
+  const [{ value: onSuccess }] = useField("modComponent.onSuccess");
 
   return (
     <>
       <ConnectedFieldTemplate
-        name="extension.title"
+        name="modComponent.title"
         label="Title"
         as={TemplateWidget}
         rows={1}
@@ -68,7 +68,7 @@ const ContextMenuConfiguration: React.FC<{
       />
 
       <ConnectedFieldTemplate
-        name="extensionPoint.definition.contexts"
+        name="starterBrick.definition.contexts"
         as={MultiSelectWidget}
         options={contextOptions}
         description={
@@ -82,7 +82,7 @@ const ContextMenuConfiguration: React.FC<{
       />
 
       <UrlMatchPatternField
-        name="extensionPoint.definition.documentUrlPatterns"
+        name="starterBrick.definition.documentUrlPatterns"
         {...makeLockableFieldProps("Sites", isLocked)}
         description={
           <span>
@@ -100,7 +100,7 @@ const ContextMenuConfiguration: React.FC<{
       />
       <ConnectedCollapsibleFieldSection title="Advanced">
         <ConnectedFieldTemplate
-          name="extensionPoint.definition.targetMode"
+          name="starterBrick.definition.targetMode"
           as="select"
           title="Target Mode"
           blankValue="legacy"
@@ -122,7 +122,7 @@ const ContextMenuConfiguration: React.FC<{
           // Punt on object-based configuration for now. Enterprise customers are just asking to turn off the message.
           // If they want a custom message they can add an alert brick.
           <ConnectedFieldTemplate
-            name="extension.onSuccess"
+            name="modComponent.onSuccess"
             label="Show Success Message"
             as={SwitchButtonWidget}
             description="Show the default success message when run"
@@ -131,7 +131,7 @@ const ContextMenuConfiguration: React.FC<{
         )}
 
         <UrlMatchPatternField
-          name="extensionPoint.definition.isAvailable.matchPatterns"
+          name="starterBrick.definition.isAvailable.matchPatterns"
           description={
             <span>
               URL match patterns give PixieBrix access to a page without you
diff --git a/src/pageEditor/tabs/editTab/FoundationNodeConfigPanel.tsx b/src/pageEditor/tabs/editTab/FoundationNodeConfigPanel.tsx
index 3f431f1578..3fcd73500c 100644
--- a/src/pageEditor/tabs/editTab/FoundationNodeConfigPanel.tsx
+++ b/src/pageEditor/tabs/editTab/FoundationNodeConfigPanel.tsx
@@ -65,8 +65,7 @@ const UnconfiguredQuickBarAlert: React.FunctionComponent = () => {
 const FoundationNodeConfigPanel: React.FC = () => {
   const { flagOn } = useFlags();
   const showVersionField = flagOn("page-editor-developer");
-  const { extensionPoint: starterBrick } =
-    useSelector(selectActiveModComponentFormState) ?? {};
+  const { starterBrick } = useSelector(selectActiveModComponentFormState) ?? {};
   assertNotNullish(
     starterBrick,
     "starterBrick not found in active mod component form state",
diff --git a/src/pageEditor/tabs/editTab/dataPanel/DataPanel.test.tsx b/src/pageEditor/tabs/editTab/dataPanel/DataPanel.test.tsx
index 2584ee42d9..2aea88aafa 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/DataPanel.test.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/DataPanel.test.tsx
@@ -34,7 +34,7 @@ bricksRegistry.register([echoBrick]);
 const { formState, records } = formStateWithTraceDataFactory();
 const renderDataPanel = () => {
   const modComponentId = formState.uuid;
-  const { instanceId } = formState.extension.blockPipeline[1];
+  const { instanceId } = formState.modComponent.brickPipeline[1];
 
   return render(<DataPanel />, {
     initialValues: formState,
@@ -76,7 +76,7 @@ describe("DataPanel", () => {
     expect(reportEventMock).toHaveBeenCalledOnce();
     expect(reportEventMock).toHaveBeenCalledWith(Events.DATA_PANEL_TAB_VIEW, {
       tabName: DataPanelTabKey.Context,
-      brickId: formState.extension.blockPipeline[1].id,
+      brickId: formState.modComponent.brickPipeline[1].id,
       modId: undefined,
     });
 
@@ -95,7 +95,7 @@ describe("DataPanel", () => {
     expect(reportEventMock).toHaveBeenCalledOnce();
     expect(reportEventMock).toHaveBeenCalledWith(Events.DATA_PANEL_TAB_VIEW, {
       tabName: DataPanelTabKey.Comments,
-      brickId: formState.extension.blockPipeline[1].id,
+      brickId: formState.modComponent.brickPipeline[1].id,
       modId: undefined,
     });
   });
diff --git a/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx b/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx
index f294887f4f..0fe99c5121 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/DataPanel.tsx
@@ -167,7 +167,7 @@ const DataPanel: React.FC = () => {
 
   useEffect(() => {
     reportEvent(Events.DATA_PANEL_TAB_VIEW, {
-      modId: activeModComponentFormState.recipe?.id,
+      modId: activeModComponentFormState.modMetadata?.id,
       brickId,
       tabName: activeTabKey,
     });
@@ -381,7 +381,7 @@ const DataPanel: React.FC = () => {
                 <BrickPreview
                   traceRecord={record}
                   brickConfig={brickConfig}
-                  starterBrick={activeModComponentFormState.extensionPoint}
+                  starterBrick={activeModComponentFormState.starterBrick}
                 />
               </ErrorBoundary>
             ) : (
@@ -407,7 +407,7 @@ const DataPanel: React.FC = () => {
           </DataTab>
           <CommentsTab
             brickId={brickConfig.id}
-            modId={activeModComponentFormState.recipe?.id}
+            modId={activeModComponentFormState.modMetadata?.id}
             brickCommentsFieldName={brickCommentsFieldName}
           />
         </Tab.Content>
diff --git a/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.test.tsx b/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.test.tsx
index 5ed0c885f8..7026ae558e 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.test.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.test.tsx
@@ -28,7 +28,7 @@ describe("FoundationDataPanel", () => {
   test("it renders with form state and trace data", async () => {
     const { formState, records } = formStateWithTraceDataFactory();
     const modComponentId = formState.uuid;
-    const { instanceId } = formState.extension.blockPipeline[0];
+    const { instanceId } = formState.modComponent.brickPipeline[0];
     const { asFragment } = render(<FoundationDataPanel />, {
       initialValues: formState,
       setupRedux(dispatch) {
diff --git a/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.tsx b/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.tsx
index 630e3ad93b..20f0a620b2 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/FoundationDataPanel.tsx
@@ -38,10 +38,10 @@ const FoundationDataPanel: React.FC = () => {
     selectActiveModComponentFormState,
   );
   const {
-    extension: { blockPipeline },
-    extensionPoint: starterBrick,
+    modComponent: { brickPipeline },
+    starterBrick,
   } = activeModComponentFormState;
-  const firstBlockInstanceId = blockPipeline[0]?.instanceId;
+  const firstBlockInstanceId = brickPipeline[0]?.instanceId;
 
   const { record: firstBlockTraceRecord } = useSelector(
     makeSelectBrickTrace(firstBlockInstanceId),
diff --git a/src/pageEditor/tabs/editTab/dataPanel/__snapshots__/DataPanel.test.tsx.snap b/src/pageEditor/tabs/editTab/dataPanel/__snapshots__/DataPanel.test.tsx.snap
index 32c384b2ad..9668c80468 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/__snapshots__/DataPanel.test.tsx.snap
+++ b/src/pageEditor/tabs/editTab/dataPanel/__snapshots__/DataPanel.test.tsx.snap
@@ -367,7 +367,7 @@ exports[`DataPanel it renders with form state and trace data 1`] = `
         >
           <textarea
             class="form-control"
-            name="extension.blockPipeline.1.comments"
+            name="modComponent.brickPipeline.1.comments"
             rows="1"
           />
         </div>
diff --git a/src/pageEditor/tabs/editTab/dataPanel/tabs/CommentsTab.test.tsx b/src/pageEditor/tabs/editTab/dataPanel/tabs/CommentsTab.test.tsx
index 8823d234be..bac9033183 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/tabs/CommentsTab.test.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/tabs/CommentsTab.test.tsx
@@ -31,11 +31,11 @@ import { DataPanelTabKey } from "@/pageEditor/tabs/editTab/dataPanel/dataPanelTy
 
 const reportEventMock = jest.mocked(reportEvent);
 
-const commentsFieldName = "extension.blockPipeline.0.comments";
+const commentsFieldName = "modComponent.brickPipeline.0.comments";
 const initialComments = "Hello world!";
 const formStateWithComments = menuItemFormStateFactory(
   {
-    recipe: modMetadataFactory(),
+    modMetadata: modMetadataFactory(),
   },
   [
     brickConfigFactory({
@@ -48,14 +48,14 @@ const formStateWithNoComments = menuItemFormStateFactory({}, [
   brickConfigFactory(),
 ]);
 const renderCommentsTab = (formState = formStateWithComments) => {
-  const brickId = formState.extension.blockPipeline[0].id;
+  const brickId = formState.modComponent.brickPipeline[0].id;
   render(
     <Tab.Container defaultActiveKey={DataPanelTabKey.Comments}>
       <Formik onSubmit={jest.fn()} initialValues={formState}>
         <CommentsTab
           brickId={brickId}
           brickCommentsFieldName={commentsFieldName}
-          modId={formState.recipe?.id}
+          modId={formState.modMetadata?.id}
         />
       </Formik>
     </Tab.Container>,
@@ -83,7 +83,7 @@ describe("CommentsTab", () => {
     // Trigger onBlur event for the textarea
     await userEvent.keyboard("{tab}");
     const expectedBrickId =
-      formStateWithNoComments.extension.blockPipeline[0].id;
+      formStateWithNoComments.modComponent.brickPipeline[0].id;
 
     expect(reportEventMock).toHaveBeenCalledWith(Events.BRICK_COMMENTS_UPDATE, {
       commentsLength: newComments.length,
@@ -104,12 +104,13 @@ describe("CommentsTab", () => {
 
     // Trigger onBlur event for the textarea
     await userEvent.keyboard("{tab}");
-    const expectedBrickId = formStateWithComments.extension.blockPipeline[0].id;
+    const expectedBrickId =
+      formStateWithComments.modComponent.brickPipeline[0].id;
 
     expect(reportEventMock).toHaveBeenCalledWith(Events.BRICK_COMMENTS_UPDATE, {
       commentsLength: expectedComments.length,
       brickId: expectedBrickId,
-      modId: formStateWithComments.recipe.id,
+      modId: formStateWithComments.modMetadata.id,
     });
   });
 });
diff --git a/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.test.tsx b/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.test.tsx
index 9273b00781..49737dfdb2 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.test.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.test.tsx
@@ -61,7 +61,7 @@ describe("PageStateTab", () => {
 
   test("it renders with mod's mod component", async () => {
     const formState = formStateFactory({
-      recipe: modMetadataFactory(),
+      modMetadata: modMetadataFactory(),
     });
     const { asFragment } = await renderPageStateTab(formState);
     expect(asFragment()).toMatchSnapshot();
diff --git a/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.tsx b/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.tsx
index a6106816ef..3d5ca89aeb 100644
--- a/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.tsx
+++ b/src/pageEditor/tabs/editTab/dataPanel/tabs/PageStateTab.tsx
@@ -49,7 +49,7 @@ const PageStateTab: React.VFC = () => {
     async () => {
       const context = {
         modComponentId: activeModComponentFormState?.uuid,
-        modId: activeModComponentFormState?.recipe?.id,
+        modId: activeModComponentFormState?.modMetadata?.id,
       };
 
       const [shared, mod, local] = await Promise.all([
@@ -57,7 +57,7 @@ const PageStateTab: React.VFC = () => {
           namespace: StateNamespaces.PUBLIC,
           ...context,
         }),
-        activeModComponentFormState?.recipe
+        activeModComponentFormState?.modMetadata
           ? getPageState(inspectedTab, {
               namespace: StateNamespaces.MOD,
               ...context,
diff --git a/src/pageEditor/tabs/editTab/editHelpers.test.ts b/src/pageEditor/tabs/editTab/editHelpers.test.ts
index b2952289da..82188cf4fd 100644
--- a/src/pageEditor/tabs/editTab/editHelpers.test.ts
+++ b/src/pageEditor/tabs/editTab/editHelpers.test.ts
@@ -18,7 +18,7 @@
 import { DocumentRenderer } from "@/bricks/renderers/document";
 import ForEach from "@/bricks/transformers/controlFlow/ForEach";
 import { createNewDocumentBuilderElement } from "@/pageEditor/documentBuilder/createNewDocumentBuilderElement";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import { type PipelineExpression } from "@/types/runtimeTypes";
 import { generateFreshOutputKey, getPipelineMap } from "./editHelpers";
 import {
@@ -41,22 +41,22 @@ describe("getPipelineMap", () => {
     const firstBlock = pipeline[0];
     expect(pipelineMap[firstBlock.instanceId]).toEqual({
       blockId: firstBlock.id,
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0`,
       blockConfig: firstBlock,
       index: 0,
       pipeline,
-      pipelinePath: PIPELINE_BLOCKS_FIELD_NAME,
+      pipelinePath: PIPELINE_BRICKS_FIELD_NAME,
       parentNodeId: undefined,
     });
 
     const secondBlock = pipeline[1];
     expect(pipelineMap[secondBlock.instanceId]).toEqual({
       blockId: secondBlock.id,
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.1`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.1`,
       blockConfig: secondBlock,
       index: 1,
       pipeline,
-      pipelinePath: PIPELINE_BLOCKS_FIELD_NAME,
+      pipelinePath: PIPELINE_BRICKS_FIELD_NAME,
       parentNodeId: undefined,
     });
   });
@@ -80,22 +80,22 @@ describe("getPipelineMap", () => {
 
     expect(pipelineMap[subPipelineFirstBlock.instanceId]).toEqual({
       blockId: subPipelineFirstBlock.id,
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__.0`,
       blockConfig: subPipelineFirstBlock,
       index: 0,
       pipeline: subPipeline,
-      pipelinePath: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__`,
+      pipelinePath: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__`,
       parentNodeId: forEachBrick.instanceId,
     });
 
     const subPipelineSecondBlock = subPipeline[1];
     expect(pipelineMap[subPipelineSecondBlock.instanceId]).toEqual({
       blockId: subPipelineSecondBlock.id,
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__.1`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__.1`,
       blockConfig: subPipelineSecondBlock,
       index: 1,
       pipeline: subPipeline,
-      pipelinePath: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.__value__`,
+      pipelinePath: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.__value__`,
       parentNodeId: forEachBrick.instanceId,
     });
   });
@@ -122,22 +122,22 @@ describe("getPipelineMap", () => {
     const subPipelineFirstBlock = subPipeline[0];
     expect(pipelineMap[subPipelineFirstBlock.instanceId]).toEqual({
       blockId: subPipelineFirstBlock.id,
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__.0`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__.0`,
       blockConfig: subPipelineFirstBlock,
       index: 0,
       pipeline: subPipeline,
-      pipelinePath: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__`,
+      pipelinePath: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__`,
       parentNodeId: documentBrick.instanceId,
     });
 
     const subPipelineSecondBlock = subPipeline[1];
     expect(pipelineMap[subPipelineSecondBlock.instanceId]).toEqual({
       blockId: subPipelineSecondBlock.id,
-      path: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__.1`,
+      path: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__.1`,
       blockConfig: subPipelineSecondBlock,
       index: 1,
       pipeline: subPipeline,
-      pipelinePath: `${PIPELINE_BLOCKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__`,
+      pipelinePath: `${PIPELINE_BRICKS_FIELD_NAME}.0.config.body.0.children.0.children.0.children.0.config.onClick.__value__`,
       parentNodeId: documentBrick.instanceId,
     });
   });
diff --git a/src/pageEditor/tabs/editTab/editorNodeConfigPanel/CommentsPreview.test.tsx b/src/pageEditor/tabs/editTab/editorNodeConfigPanel/CommentsPreview.test.tsx
index 880e1c4a27..92cfe7b496 100644
--- a/src/pageEditor/tabs/editTab/editorNodeConfigPanel/CommentsPreview.test.tsx
+++ b/src/pageEditor/tabs/editTab/editorNodeConfigPanel/CommentsPreview.test.tsx
@@ -32,7 +32,7 @@ const renderCommentsPreview = (comments: string) => {
       dispatch(actions.setActiveModComponentId(formState.uuid));
       dispatch(
         actions.setActiveNodeId(
-          formState.extension.blockPipeline[0].instanceId,
+          formState.modComponent.brickPipeline[0].instanceId,
         ),
       );
       dispatch(actions.setNodeDataPanelTabSelected(DataPanelTabKey.Context));
diff --git a/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx b/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx
index 8cd72278b5..600dd4579d 100644
--- a/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx
+++ b/src/pageEditor/tabs/editTab/editorNodeLayout/usePipelineNodes.tsx
@@ -22,7 +22,7 @@ import {
 } from "@/pageEditor/tabs/editTab/editTabTypes";
 import { type PipelineHeaderNodeProps } from "@/pageEditor/tabs/editTab/editorNodes/PipelineHeaderNode";
 import { type PipelineFooterNodeProps } from "@/pageEditor/tabs/editTab/editorNodes/PipelineFooterNode";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "@/pageEditor/consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "@/pageEditor/consts";
 import {
   type BrickConfig,
   type BrickPipeline,
@@ -226,7 +226,7 @@ const usePipelineNodes = (): {
   const starterBrickType = activeModComponentFormState.type;
   const { label: starterBrickLabel, icon: starterBrickIcon } =
     ADAPTERS.get(starterBrickType);
-  const rootPipeline = activeModComponentFormState.extension.blockPipeline;
+  const rootPipeline = activeModComponentFormState.modComponent.brickPipeline;
   const rootPipelineFlavor = getRootPipelineFlavor(starterBrickType);
   const [hoveredState, setHoveredState] = useState<Record<UUID, boolean>>({});
 
@@ -602,7 +602,7 @@ const usePipelineNodes = (): {
   function mapPipelineToNodes({
     pipeline,
     flavor,
-    pipelinePath = PIPELINE_BLOCKS_FIELD_NAME,
+    pipelinePath = PIPELINE_BRICKS_FIELD_NAME,
     nestingLevel = 0,
     isParentActive = false,
     isAncestorActive = false,
@@ -622,7 +622,7 @@ const usePipelineNodes = (): {
      */
     latestParentCall?: Branch[];
   }): MapOutput {
-    const isRootPipeline = pipelinePath === PIPELINE_BLOCKS_FIELD_NAME;
+    const isRootPipeline = pipelinePath === PIPELINE_BRICKS_FIELD_NAME;
     const lastIndex = pipeline.length - 1;
     const lastBlockId = pipeline.at(lastIndex)?.id;
     const lastBlock = lastBlockId ? allBricks.get(lastBlockId) : undefined;
@@ -693,7 +693,7 @@ const usePipelineNodes = (): {
         onClick() {
           dispatch(
             actions.showAddBlockModal({
-              path: PIPELINE_BLOCKS_FIELD_NAME,
+              path: PIPELINE_BRICKS_FIELD_NAME,
               flavor: pipelineFlavor,
               index: 0,
             }),
@@ -708,7 +708,7 @@ const usePipelineNodes = (): {
         icon: faPaste,
         tooltipText: "Paste copied brick",
         async onClick() {
-          await pasteBlock(PIPELINE_BLOCKS_FIELD_NAME, 0);
+          await pasteBlock(PIPELINE_BRICKS_FIELD_NAME, 0);
         },
       });
     }
diff --git a/src/pageEditor/tabs/effect/BrickConfiguration.test.tsx b/src/pageEditor/tabs/effect/BrickConfiguration.test.tsx
index 5f5b9baa66..c99164219b 100644
--- a/src/pageEditor/tabs/effect/BrickConfiguration.test.tsx
+++ b/src/pageEditor/tabs/effect/BrickConfiguration.test.tsx
@@ -63,7 +63,7 @@ function renderBrickConfiguration(
       dispatch(actions.setActiveModComponentId(initialValues.uuid));
       dispatch(
         actions.setActiveNodeId(
-          initialValues.extension.blockPipeline[0].instanceId,
+          initialValues.modComponent.brickPipeline[0].instanceId,
         ),
       );
     },
@@ -77,7 +77,10 @@ test("renders", async () => {
     brickConfigFactory({ id: brick.id }),
   ]);
   const { asFragment } = renderBrickConfiguration(
-    <BrickConfiguration name="extension.blockPipeline[0]" brickId={brick.id} />,
+    <BrickConfiguration
+      name="modComponent.brickPipeline[0]"
+      brickId={brick.id}
+    />,
     initialState,
   );
 
@@ -101,7 +104,7 @@ describe("shows root mode", () => {
     ]);
     renderBrickConfiguration(
       <BrickConfiguration
-        name="extension.blockPipeline[0]"
+        name="modComponent.brickPipeline[0]"
         brickId={brick.id}
       />,
       initialState,
@@ -122,7 +125,7 @@ describe("shows root mode", () => {
     ]);
     renderBrickConfiguration(
       <BrickConfiguration
-        name="extension.blockPipeline[0]"
+        name="modComponent.brickPipeline[0]"
         brickId={brick.id}
       />,
       initialState,
@@ -143,7 +146,7 @@ describe("shows root mode", () => {
     ]);
     renderBrickConfiguration(
       <BrickConfiguration
-        name="extension.blockPipeline[0]"
+        name="modComponent.brickPipeline[0]"
         brickId={brick.id}
       />,
       initialState,
@@ -182,7 +185,7 @@ test.each`
     ]);
     renderBrickConfiguration(
       <BrickConfiguration
-        name="extension.blockPipeline[0]"
+        name="modComponent.brickPipeline[0]"
         brickId={brick.id}
       />,
       initialState,
diff --git a/src/pageEditor/tabs/effect/BrickPreview.tsx b/src/pageEditor/tabs/effect/BrickPreview.tsx
index 16d96d634e..1033f26beb 100644
--- a/src/pageEditor/tabs/effect/BrickPreview.tsx
+++ b/src/pageEditor/tabs/effect/BrickPreview.tsx
@@ -185,7 +185,7 @@ const BrickPreview: React.FunctionComponent<{
             )),
           },
           rootSelector: undefined,
-          modId: values.recipe?.id,
+          modId: values.modMetadata?.id,
         });
         dispatch(previewSlice.actions.setSuccess({ output, outputKey }));
       } catch (error) {
diff --git a/src/pageEditor/tabs/effect/StarterBrickPreview.tsx b/src/pageEditor/tabs/effect/StarterBrickPreview.tsx
index 119b5ea11c..4a233cd823 100644
--- a/src/pageEditor/tabs/effect/StarterBrickPreview.tsx
+++ b/src/pageEditor/tabs/effect/StarterBrickPreview.tsx
@@ -47,7 +47,7 @@ const initialState: PreviewState = {
 };
 
 const previewSlice = createSlice({
-  name: "extensionPointPreview",
+  name: "starterBrickPreview",
   initialState,
   reducers: {
     startRun(state) {
@@ -90,11 +90,11 @@ const StarterBrickPreview: React.FunctionComponent<{
         // data about the element that caused the trigger
         let rootSelector: Nullishable<string> = null;
         if (
-          (modComponentFormState as TriggerFormState).extensionPoint.definition
+          (modComponentFormState as TriggerFormState).starterBrick.definition
             .rootSelector
         ) {
           rootSelector = (modComponentFormState as TriggerFormState)
-            .extensionPoint.definition.rootSelector;
+            .starterBrick.definition.rootSelector;
         }
 
         const data = await runStarterBrickReaderPreview(
@@ -120,7 +120,7 @@ const StarterBrickPreview: React.FunctionComponent<{
   useEffect(() => {
     void debouncedRun(modComponentFormState);
     // eslint-disable-next-line react-hooks/exhaustive-deps -- using objectHash for context
-  }, [debouncedRun, modComponentFormState.extensionPoint]);
+  }, [debouncedRun, modComponentFormState.starterBrick]);
 
   if (isRunning) {
     return (
@@ -132,7 +132,7 @@ const StarterBrickPreview: React.FunctionComponent<{
 
   const reloadTrigger =
     modComponentFormState.type === "trigger" &&
-    modComponentFormState.extensionPoint.definition.trigger !== "load" ? (
+    modComponentFormState.starterBrick.definition.trigger !== "load" ? (
       <div className="text-info">
         <AsyncButton
           variant="info"
diff --git a/src/pageEditor/tabs/effect/__snapshots__/BrickConfiguration.test.tsx.snap b/src/pageEditor/tabs/effect/__snapshots__/BrickConfiguration.test.tsx.snap
index 648720fcfc..1b6d0bfd44 100644
--- a/src/pageEditor/tabs/effect/__snapshots__/BrickConfiguration.test.tsx.snap
+++ b/src/pageEditor/tabs/effect/__snapshots__/BrickConfiguration.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`renders 1`] = `
       </div>
       <label
         class="label form-label"
-        for="extension.blockPipeline[0].config.message"
+        for="modComponent.brickPipeline[0].config.message"
       >
         Message
       </label>
@@ -32,15 +32,15 @@ exports[`renders 1`] = `
           >
             <textarea
               class="form-control"
-              id="extension.blockPipeline[0].config.message"
-              name="extension.blockPipeline[0].config.message"
+              id="modComponent.brickPipeline[0].config.message"
+              name="modComponent.brickPipeline[0].config.message"
               rows="1"
             />
           </div>
           <div
             class="dropdown dropdown"
             data-test-selected="Text"
-            data-testid="toggle-extension.blockPipeline[0].config.message"
+            data-testid="toggle-modComponent.brickPipeline[0].config.message"
           >
             <button
               aria-expanded="false"
diff --git a/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts b/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
index 9710ed3cbc..d934c0ac8a 100644
--- a/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
+++ b/src/pageEditor/tabs/effect/useDocumentPreviewRunBlock.ts
@@ -105,10 +105,10 @@ export default function useDocumentPreviewRunBlock(
 
   const {
     uuid: modComponentId,
-    recipe: mod,
+    modMetadata: mod,
     apiVersion,
     integrationDependencies,
-    extensionPoint: starterBrick,
+    starterBrick,
   } = useSelector(selectActiveModComponentFormState);
 
   const { blockConfig } = useSelector(
diff --git a/src/pageEditor/tabs/quickBar/QuickBarConfiguration.tsx b/src/pageEditor/tabs/quickBar/QuickBarConfiguration.tsx
index 457cc1909b..584d3ec7bf 100644
--- a/src/pageEditor/tabs/quickBar/QuickBarConfiguration.tsx
+++ b/src/pageEditor/tabs/quickBar/QuickBarConfiguration.tsx
@@ -30,20 +30,20 @@ import ConnectedCollapsibleFieldSection from "@/pageEditor/fields/ConnectedColla
 const QuickBarConfiguration: React.FC<{
   isLocked: boolean;
 }> = ({ isLocked = false }) => {
-  const [{ value: actionTitle }] = useField<string>("extension.title");
+  const [{ value: actionTitle }] = useField<string>("modComponent.title");
   const emojiFirstCharacter =
     splitStartingEmoji(actionTitle).startingEmoji !== undefined;
 
   return (
     <>
       <ConnectedFieldTemplate
-        name="extension.title"
+        name="modComponent.title"
         label="Action Title"
         description="Quick Bar action title"
       />
 
       <ConnectedFieldTemplate
-        name="extensionPoint.definition.contexts"
+        name="starterBrick.definition.contexts"
         as={MultiSelectWidget}
         options={contextOptions}
         description={
@@ -57,7 +57,7 @@ const QuickBarConfiguration: React.FC<{
       />
 
       <UrlMatchPatternField
-        name="extensionPoint.definition.documentUrlPatterns"
+        name="starterBrick.definition.documentUrlPatterns"
         {...makeLockableFieldProps("Sites", isLocked)}
         description={
           <span>
@@ -75,7 +75,7 @@ const QuickBarConfiguration: React.FC<{
       />
       <ConnectedCollapsibleFieldSection title="Advanced">
         <ConnectedFieldTemplate
-          name="extension.icon"
+          name="modComponent.icon"
           as={IconWidget}
           description="Icon to show in the menu"
           {...makeLockableFieldProps(
@@ -85,7 +85,7 @@ const QuickBarConfiguration: React.FC<{
           )}
         />
         <ConnectedFieldTemplate
-          name="extensionPoint.definition.targetMode"
+          name="starterBrick.definition.targetMode"
           as="select"
           title="Target Mode"
           blankValue="eventTarget"
@@ -102,7 +102,7 @@ const QuickBarConfiguration: React.FC<{
           <option value="document">document</option>
         </ConnectedFieldTemplate>
         <UrlMatchPatternField
-          name="extensionPoint.definition.isAvailable.matchPatterns"
+          name="starterBrick.definition.isAvailable.matchPatterns"
           description={
             <span>
               URL match patterns give PixieBrix access to a page without you
diff --git a/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx b/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx
index c2d09458c0..c6a77e2c45 100644
--- a/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx
+++ b/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx
@@ -37,12 +37,12 @@ const QuickBarProviderConfiguration: React.FC<{
 
   const [rootActionField] = useField<
     QuickBarProviderConfig["rootAction"] | null
-  >("extension.rootAction");
+  >("modComponent.rootAction");
 
   return (
     <>
       <UrlMatchPatternField
-        name="extensionPoint.definition.documentUrlPatterns"
+        name="starterBrick.definition.documentUrlPatterns"
         {...makeLockableFieldProps("Sites", isLocked)}
         description={
           <span>
@@ -60,20 +60,20 @@ const QuickBarProviderConfiguration: React.FC<{
       />
 
       <FieldTemplate
-        name="extension.rootAction"
+        name="modComponent.rootAction"
         label="Parent Action"
         as={SwitchButtonWidget}
         value={Boolean(rootActionField.value)}
         description="Toggle on to show a parent action that contains child actions when selected"
         onChange={async ({ target }: ChangeEvent<CheckBoxLike>) => {
           if (target.value) {
-            await setFieldValue("extension.rootAction", {
+            await setFieldValue("modComponent.rootAction", {
               title: null,
               icon: null,
               requireActiveRoot: false,
             });
           } else {
-            await setFieldValue("extension.rootAction", null);
+            await setFieldValue("modComponent.rootAction", null);
           }
         }}
       />
@@ -81,20 +81,20 @@ const QuickBarProviderConfiguration: React.FC<{
       {rootActionField.value && (
         <>
           <ConnectedFieldTemplate
-            name="extension.rootAction.title"
+            name="modComponent.rootAction.title"
             label="Action Title"
             description="Quick Bar action title"
           />
 
           <ConnectedFieldTemplate
-            name="extension.rootAction.icon"
+            name="modComponent.rootAction.icon"
             label="Action Icon"
             as={IconWidget}
             description="Icon to show in the Quick Bar for the action"
           />
 
           <ConnectedFieldTemplate
-            name="extension.rootAction.requireActiveRoot"
+            name="modComponent.rootAction.requireActiveRoot"
             label="Require Active Root"
             as={SwitchButtonWidget}
             description="Toggle on to only generate actions when the parent action is selected"
@@ -103,7 +103,7 @@ const QuickBarProviderConfiguration: React.FC<{
       )}
       <ConnectedCollapsibleFieldSection title="Advanced">
         <UrlMatchPatternField
-          name="extensionPoint.definition.isAvailable.matchPatterns"
+          name="starterBrick.definition.isAvailable.matchPatterns"
           description={
             <span>
               URL match patterns give PixieBrix access to a page without you
diff --git a/src/pageEditor/tabs/sidebar/SidebarConfiguration.tsx b/src/pageEditor/tabs/sidebar/SidebarConfiguration.tsx
index 37c0e78d49..ab7428d212 100644
--- a/src/pageEditor/tabs/sidebar/SidebarConfiguration.tsx
+++ b/src/pageEditor/tabs/sidebar/SidebarConfiguration.tsx
@@ -32,7 +32,7 @@ import { joinName } from "@/utils/formUtils";
 const SidebarConfiguration: React.FC<{
   isLocked: boolean;
 }> = ({ isLocked = false }) => {
-  const fieldName = partial(joinName, "extensionPoint.definition");
+  const fieldName = partial(joinName, "starterBrick.definition");
 
   const [{ value: trigger }] = useField<Trigger>(fieldName("trigger"));
 
@@ -70,14 +70,14 @@ const SidebarConfiguration: React.FC<{
   return (
     <>
       <ConnectedFieldTemplate
-        name="extension.heading"
+        name="modComponent.heading"
         // If you change this label, update the field title in ShowSidebar
         label="Tab Title"
         description="The text that will appear in the tab along the top of the Sidebar Panel"
       />
 
       <UrlMatchPatternField
-        name="extensionPoint.definition.isAvailable.matchPatterns"
+        name="starterBrick.definition.isAvailable.matchPatterns"
         {...makeLockableFieldProps("Sites", isLocked)}
       />
 
diff --git a/src/pageEditor/tabs/trigger/DebounceFieldSet.tsx b/src/pageEditor/tabs/trigger/DebounceFieldSet.tsx
index bbf03e0a7e..047efe4b77 100644
--- a/src/pageEditor/tabs/trigger/DebounceFieldSet.tsx
+++ b/src/pageEditor/tabs/trigger/DebounceFieldSet.tsx
@@ -18,7 +18,7 @@ const DebounceFieldSet: React.FC<{
 }> = ({ isLocked }) => {
   const { setFieldValue } = useFormikContext<TriggerFormState>();
 
-  const fieldName = partial(joinName, "extensionPoint.definition");
+  const fieldName = partial(joinName, "starterBrick.definition");
 
   const [{ value: debounce }] = useField<DebounceOptions | null>(
     fieldName("debounce"),
diff --git a/src/pageEditor/tabs/trigger/TriggerConfiguration.test.tsx b/src/pageEditor/tabs/trigger/TriggerConfiguration.test.tsx
index d6c45471b8..6040c2d698 100644
--- a/src/pageEditor/tabs/trigger/TriggerConfiguration.test.tsx
+++ b/src/pageEditor/tabs/trigger/TriggerConfiguration.test.tsx
@@ -25,8 +25,8 @@ describe("TriggerConfiguration", () => {
         instanceId: uuidv4(),
       },
     ]);
-    formState.extensionPoint.definition.trigger = "custom";
-    formState.extensionPoint.definition.customEvent = { eventName: null };
+    formState.starterBrick.definition.trigger = "custom";
+    formState.starterBrick.definition.customEvent = { eventName: null };
 
     const { asFragment } = render(<TriggerConfiguration isLocked={false} />, {
       initialValues: formState,
diff --git a/src/pageEditor/tabs/trigger/TriggerConfiguration.tsx b/src/pageEditor/tabs/trigger/TriggerConfiguration.tsx
index 26dd79645a..809827602a 100644
--- a/src/pageEditor/tabs/trigger/TriggerConfiguration.tsx
+++ b/src/pageEditor/tabs/trigger/TriggerConfiguration.tsx
@@ -49,7 +49,7 @@ function supportsTargetMode(trigger: Trigger) {
 const TriggerConfiguration: React.FC<{
   isLocked: boolean;
 }> = ({ isLocked = false }) => {
-  const fieldName = partial(joinName, "extensionPoint.definition");
+  const fieldName = partial(joinName, "starterBrick.definition");
 
   const [{ value: trigger }] = useField<Trigger>(fieldName("trigger"));
 
diff --git a/src/pageEditor/tabs/trigger/__snapshots__/TriggerConfiguration.test.tsx.snap b/src/pageEditor/tabs/trigger/__snapshots__/TriggerConfiguration.test.tsx.snap
index 9a66043355..15acb03920 100644
--- a/src/pageEditor/tabs/trigger/__snapshots__/TriggerConfiguration.test.tsx.snap
+++ b/src/pageEditor/tabs/trigger/__snapshots__/TriggerConfiguration.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.trigger"
+        for="starterBrick.definition.trigger"
       >
         Trigger Event
       </label>
@@ -26,8 +26,8 @@ exports[`TriggerConfiguration renders custom event field with known event names
       >
         <select
           class="form-control"
-          id="extensionPoint.definition.trigger"
-          name="extensionPoint.definition.trigger"
+          id="starterBrick.definition.trigger"
+          name="starterBrick.definition.trigger"
         >
           <option
             value="load"
@@ -131,7 +131,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.customEvent.eventName"
+        for="starterBrick.definition.customEvent.eventName"
       >
         Custom Event
       </label>
@@ -192,7 +192,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
                   autocomplete="off"
                   autocorrect="off"
                   class=""
-                  id="extensionPoint.definition.customEvent.eventName"
+                  id="starterBrick.definition.customEvent.eventName"
                   role="combobox"
                   spellcheck="false"
                   style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -297,7 +297,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.background"
+        for="starterBrick.definition.background"
       >
         Run in Background
       </label>
@@ -346,7 +346,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.isAvailable.allFrames"
+        for="starterBrick.definition.isAvailable.allFrames"
       >
         Run in All Frames
       </label>
@@ -395,7 +395,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.rootSelector"
+        for="starterBrick.definition.rootSelector"
       >
         Element Selector
       </label>
@@ -469,7 +469,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.attachMode"
+        for="starterBrick.definition.attachMode"
       >
         Attach Mode
       </label>
@@ -478,8 +478,8 @@ exports[`TriggerConfiguration renders custom event field with known event names
       >
         <select
           class="form-control"
-          id="extensionPoint.definition.attachMode"
-          name="extensionPoint.definition.attachMode"
+          id="starterBrick.definition.attachMode"
+          name="starterBrick.definition.attachMode"
           title="Attach Mode"
         >
           <option
@@ -522,7 +522,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.targetMode"
+        for="starterBrick.definition.targetMode"
       >
         Target Mode
       </label>
@@ -531,8 +531,8 @@ exports[`TriggerConfiguration renders custom event field with known event names
       >
         <select
           class="form-control"
-          id="extensionPoint.definition.targetMode"
-          name="extensionPoint.definition.targetMode"
+          id="starterBrick.definition.targetMode"
+          name="starterBrick.definition.targetMode"
           title="Target Mode"
         >
           <option
@@ -628,7 +628,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.isAvailable.matchPatterns"
+        for="starterBrick.definition.isAvailable.matchPatterns"
       >
         Sites
       </label>
@@ -693,8 +693,8 @@ exports[`TriggerConfiguration renders custom event field with known event names
                   >
                     <textarea
                       class="form-control"
-                      id="extensionPoint.definition.isAvailable.matchPatterns.0"
-                      name="extensionPoint.definition.isAvailable.matchPatterns.0"
+                      id="starterBrick.definition.isAvailable.matchPatterns.0"
+                      name="starterBrick.definition.isAvailable.matchPatterns.0"
                       rows="1"
                     >
                       https://test.com/*
@@ -703,7 +703,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
                   <div
                     class="dropdown dropdown"
                     data-test-selected="Text"
-                    data-testid="toggle-extensionPoint.definition.isAvailable.matchPatterns.0"
+                    data-testid="toggle-starterBrick.definition.isAvailable.matchPatterns.0"
                   >
                     <button
                       aria-expanded="false"
@@ -763,7 +763,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.showErrors"
+        for="starterBrick.definition.showErrors"
       >
         Show Error Notifications
       </label>
@@ -812,7 +812,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
       </div>
       <label
         class="label form-label"
-        for="extensionPoint.definition.reportMode"
+        for="starterBrick.definition.reportMode"
       >
         Telemetry Mode
       </label>
@@ -821,8 +821,8 @@ exports[`TriggerConfiguration renders custom event field with known event names
       >
         <select
           class="form-control"
-          id="extensionPoint.definition.reportMode"
-          name="extensionPoint.definition.reportMode"
+          id="starterBrick.definition.reportMode"
+          name="starterBrick.definition.reportMode"
           title="Telemetry Mode"
         >
           <option
@@ -896,7 +896,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
           </div>
           <label
             class="label form-label"
-            for="extensionPoint.definition.isAvailable.urlPatterns"
+            for="starterBrick.definition.isAvailable.urlPatterns"
           >
             URL Patterns
           </label>
@@ -941,7 +941,7 @@ exports[`TriggerConfiguration renders custom event field with known event names
           </div>
           <label
             class="label form-label"
-            for="extensionPoint.definition.isAvailable.selectors"
+            for="starterBrick.definition.isAvailable.selectors"
           >
             Selectors
           </label>
diff --git a/src/pageEditor/toolbar/ReloadToolbar.tsx b/src/pageEditor/toolbar/ReloadToolbar.tsx
index 267b173404..289789b029 100644
--- a/src/pageEditor/toolbar/ReloadToolbar.tsx
+++ b/src/pageEditor/toolbar/ReloadToolbar.tsx
@@ -49,7 +49,7 @@ function isAutomaticTrigger(
   return (
     modComponentFormState?.type === "trigger" &&
     automatic.includes(
-      modComponentFormState?.extensionPoint.definition.trigger ?? "",
+      modComponentFormState?.starterBrick.definition.trigger ?? "",
     )
   );
 }
diff --git a/src/pageEditor/utils.ts b/src/pageEditor/utils.ts
index 6c5c7dd54b..22289be4a0 100644
--- a/src/pageEditor/utils.ts
+++ b/src/pageEditor/utils.ts
@@ -29,7 +29,7 @@ import {
 import ForEachElement from "@/bricks/transformers/controlFlow/ForEachElement";
 import { castArray, pick, pickBy } from "lodash";
 import { type AnalysisAnnotation } from "@/analysis/analysisTypes";
-import { PIPELINE_BLOCKS_FIELD_NAME } from "./consts";
+import { PIPELINE_BRICKS_FIELD_NAME } from "./consts";
 import { type ModComponentBase } from "@/types/modComponentTypes";
 import { type UUID } from "@/types/stringTypes";
 import { type RegistryId } from "@/types/registryTypes";
@@ -57,7 +57,7 @@ export function getModId(
 ): RegistryId | undefined {
   return isModComponentBase(modComponentOrFormState)
     ? modComponentOrFormState._recipe?.id
-    : modComponentOrFormState.recipe?.id;
+    : modComponentOrFormState.modMetadata?.id;
 }
 
 /**
@@ -220,7 +220,7 @@ export function getFoundationNodeAnnotations(
 ): AnalysisAnnotation[] {
   return annotations.filter(
     (annotation) =>
-      !annotation.position.path.startsWith(PIPELINE_BLOCKS_FIELD_NAME),
+      !annotation.position.path.startsWith(PIPELINE_BRICKS_FIELD_NAME),
   );
 }
 
diff --git a/src/store/checkActiveModComponentAvailability.test.ts b/src/store/checkActiveModComponentAvailability.test.ts
index 1026af0d45..9ec3037147 100644
--- a/src/store/checkActiveModComponentAvailability.test.ts
+++ b/src/store/checkActiveModComponentAvailability.test.ts
@@ -19,7 +19,7 @@ import { configureStore } from "@reduxjs/toolkit";
 import { type EditorRootState } from "@/pageEditor/pageEditorTypes";
 import { type ModComponentsRootState } from "@/store/extensionsTypes";
 import { actions, editorSlice } from "@/pageEditor/slices/editorSlice";
-import extensionsSlice from "@/store/extensionsSlice";
+import modComponentsSlice from "@/store/extensionsSlice";
 import { validateRegistryId } from "@/types/helpers";
 import { type RegistryId } from "@/types/registryTypes";
 import { checkAvailable } from "@/contentScript/messenger/api";
@@ -39,7 +39,7 @@ import { StarterBrickTypes } from "@/types/starterBrickTypes";
 jest.mock("@/contentScript/messenger/api");
 jest.mock("@/pageEditor/context/connection");
 
-const { reducer: extensionsReducer } = extensionsSlice;
+const { reducer: modComponentsReducer } = modComponentsSlice;
 
 describe("checkActiveModComponentAvailability", () => {
   test("it checks the active element correctly", async () => {
@@ -49,12 +49,12 @@ describe("checkActiveModComponentAvailability", () => {
     const store = configureStore<EditorRootState & ModComponentsRootState>({
       reducer: {
         editor: editorSlice.reducer,
-        options: extensionsReducer,
+        options: modComponentsReducer,
       },
     });
 
     const availableDraftModComponent = menuItemFormStateFactory({
-      extensionPoint: {
+      starterBrick: {
         metadata: {
           id: validateRegistryId("test/available-button"),
           name: "Test Starter Brick 1",
@@ -72,7 +72,7 @@ describe("checkActiveModComponentAvailability", () => {
     });
 
     const unavailableDraftModComponent = menuItemFormStateFactory({
-      extensionPoint: {
+      starterBrick: {
         metadata: {
           id: validateRegistryId("test/unavailable-button"),
           name: "Test Starter Brick 2",
@@ -116,7 +116,7 @@ describe("checkActiveModComponentAvailability", () => {
 
     // Make mod component form state available
     const available = produce(availableDraftModComponent, (draft) => {
-      draft.extensionPoint.definition.isAvailable.matchPatterns = [testUrl];
+      draft.starterBrick.definition.isAvailable.matchPatterns = [testUrl];
     });
     store.dispatch(actions.syncModComponentFormState(available));
 
diff --git a/src/store/checkAvailableDraftModComponents.test.ts b/src/store/checkAvailableDraftModComponents.test.ts
index a9fad4725b..aad1ad1adc 100644
--- a/src/store/checkAvailableDraftModComponents.test.ts
+++ b/src/store/checkAvailableDraftModComponents.test.ts
@@ -29,7 +29,7 @@ import {
 import { type Target } from "@/types/messengerTypes";
 import { type PageTarget } from "webext-messenger";
 import { type ModComponentsRootState } from "@/store/extensionsTypes";
-import extensionsSlice from "@/store/extensionsSlice";
+import modComponentsSlice from "@/store/extensionsSlice";
 import { menuItemFormStateFactory } from "@/testUtils/factories/pageEditorFactories";
 import { getCurrentInspectedURL } from "@/pageEditor/context/connection";
 import { type Availability } from "@/types/availabilityTypes";
@@ -39,7 +39,7 @@ jest.mock("@/contentScript/messenger/api");
 
 jest.mock("@/pageEditor/context/connection");
 
-const { reducer: extensionsReducer } = extensionsSlice;
+const { reducer: modComponentsReducer } = modComponentsSlice;
 
 describe("checkAvailableDraftModComponents", () => {
   test("it checks draft mod components correctly", async () => {
@@ -49,12 +49,12 @@ describe("checkAvailableDraftModComponents", () => {
     const store = configureStore<EditorRootState & ModComponentsRootState>({
       reducer: {
         editor: editorSlice.reducer,
-        options: extensionsReducer,
+        options: modComponentsReducer,
       },
     });
 
     const availableDraftModComponent = menuItemFormStateFactory({
-      extensionPoint: {
+      starterBrick: {
         metadata: {
           id: validateRegistryId("test/available-button"),
           name: "Test Starter Brick 1",
@@ -72,7 +72,7 @@ describe("checkAvailableDraftModComponents", () => {
     });
 
     const unavailableDraftModComponent = menuItemFormStateFactory({
-      extensionPoint: {
+      starterBrick: {
         metadata: {
           id: validateRegistryId("test/unavailable-button"),
           name: "Test Starter Brick 2",
diff --git a/src/store/editorMigrations.test.ts b/src/store/editorMigrations.test.ts
index 70605da33e..1a00a6bb4f 100644
--- a/src/store/editorMigrations.test.ts
+++ b/src/store/editorMigrations.test.ts
@@ -19,6 +19,7 @@ import {
   type EditorStateV3,
   type EditorStateV1,
   type EditorStateV2,
+  type EditorStateV4,
 } from "@/pageEditor/pageEditorTypes";
 import { mapValues, omit } from "lodash";
 import { formStateFactory } from "@/testUtils/factories/pageEditorFactories";
@@ -31,13 +32,17 @@ import { uuidSequence } from "@/testUtils/factories/stringFactories";
 import { modMetadataFactory } from "@/testUtils/factories/modComponentFactories";
 import { validateRegistryId } from "@/types/helpers";
 import {
+  type BaseFormStateV3,
   type BaseFormStateV1,
   type BaseFormStateV2,
+  type BaseModComponentStateV2,
+  type BaseModComponentStateV1,
 } from "@/pageEditor/baseFormStateTypes";
 import { type PersistedState } from "redux-persist";
 import {
   migrateEditorStateV1,
   migrateEditorStateV2,
+  migrateEditorStateV3,
 } from "@/store/editorMigrations";
 
 const initialStateV1: EditorStateV1 & PersistedState = {
@@ -118,11 +123,42 @@ const initialStateV3: EditorStateV3 & PersistedState = {
   },
 };
 
-describe("migrateEditorStateV1", () => {
-  it("migrates empty state", () => {
-    expect(migrateEditorStateV1(initialStateV1)).toStrictEqual(initialStateV2);
-  });
+const initialStateV4: EditorStateV4 & PersistedState = {
+  selectionSeq: 0,
+  activeModComponentId: null,
+  activeModId: null,
+  expandedModId: null,
+  error: null,
+  beta: false,
+  modComponentFormStates: [],
+  knownEditableBrickIds: [],
+  dirty: {},
+  isBetaUI: false,
+  copiedBrick: undefined,
+  brickPipelineUIStateById: {},
+  dirtyModOptionsById: {},
+  dirtyModMetadataById: {},
+  visibleModalKey: null,
+  addBrickLocation: undefined,
+  keepLocalCopyOnCreateMod: false,
+  deletedModComponentFormStatesByModId: {},
+  availableActivatedModComponentIds: [],
+  isPendingAvailableActivatedModComponents: false,
+  availableDraftModComponentIds: [],
+  isPendingDraftModComponents: false,
+  isModListExpanded: true,
+  isDataPanelExpanded: true,
+  isDimensionsWarningDismissed: false,
+  inserting: null,
+  isVariablePopoverVisible: false,
+  // Function under test does not handle updating the persistence, this is handled by redux-persist
+  _persist: {
+    version: 1,
+    rehydrated: false,
+  },
+};
 
+describe("editor state migrations", () => {
   function unmigrateServices(
     integrationDependencies: IntegrationDependencyV2[] = [],
   ): IntegrationDependencyV1[] {
@@ -164,81 +200,157 @@ describe("migrateEditorStateV1", () => {
     };
   }
 
-  it("migrates state with elements with no services", () => {
-    const expectedState = {
-      ...initialStateV2,
-      elements: [formStateFactory(), formStateFactory()],
+  function unmigrateModComponentStateV1(
+    state: BaseModComponentStateV2,
+  ): BaseModComponentStateV1 {
+    return {
+      blockPipeline: state.brickPipeline,
     };
-    const unmigrated = unmigrateEditorStateV2(expectedState);
-    expect(migrateEditorStateV1(unmigrated)).toStrictEqual(expectedState);
-  });
+  }
 
-  it("migrates state with elements with services and deleted elements", () => {
-    const fooElement1 = formStateFactory({
-      recipe: modMetadataFactory({
-        id: validateRegistryId("foo"),
-      }),
-      integrationDependencies: [
-        integrationDependencyFactory({
-          configId: uuidSequence,
-        }),
-        integrationDependencyFactory({
-          configId: uuidSequence,
-        }),
-      ],
+  function unmigrateFormStateV2(formState: BaseFormStateV3): BaseFormStateV2 {
+    return {
+      ...omit(formState, ["modMetadata", "modComponent", "starterBrick"]),
+      recipe: formState.modMetadata,
+      extension: unmigrateModComponentStateV1(formState.modComponent),
+      extensionPoint: formState.starterBrick,
+    };
+  }
+
+  function unmigrateEditorStateV3(
+    state: EditorStateV4 & PersistedState,
+  ): EditorStateV3 & PersistedState {
+    return {
+      ...omit(
+        state,
+        "modComponentFormStates",
+        "deletedModComponentFormStatesByModId",
+      ),
+      modComponentFormStates: state.modComponentFormStates.map((formState) =>
+        unmigrateFormStateV2(formState),
+      ),
+      deletedModComponentFormStatesByModId: mapValues(
+        state.deletedModComponentFormStatesByModId,
+        (formStates) =>
+          formStates.map((formState) => unmigrateFormStateV2(formState)),
+      ),
+    };
+  }
+
+  describe("migrateEditorStateV1", () => {
+    it("migrates empty state", () => {
+      expect(migrateEditorStateV1(initialStateV1)).toStrictEqual(
+        initialStateV2,
+      );
     });
-    const fooElement2 = formStateFactory({
-      recipe: modMetadataFactory({
-        id: validateRegistryId("foo"),
-      }),
-      integrationDependencies: [
-        integrationDependencyFactory({
-          configId: uuidSequence,
-        }),
-        integrationDependencyFactory({
-          configId: uuidSequence,
-        }),
-      ],
+
+    it("migrates state with elements with no services", () => {
+      const expectedState = {
+        ...initialStateV2,
+        elements: [
+          unmigrateFormStateV2(formStateFactory()),
+          unmigrateFormStateV2(formStateFactory()),
+        ],
+      };
+      const unmigrated = unmigrateEditorStateV2(expectedState);
+      expect(migrateEditorStateV1(unmigrated)).toStrictEqual(expectedState);
     });
-    const barElement = formStateFactory({
-      recipe: modMetadataFactory({
-        id: validateRegistryId("bar"),
-      }),
-      integrationDependencies: [
-        integrationDependencyFactory({
-          configId: uuidSequence,
+
+    it("migrates state with elements with services and deleted elements", () => {
+      const fooElement1 = unmigrateFormStateV2(
+        formStateFactory({
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("foo"),
+          }),
+          integrationDependencies: [
+            integrationDependencyFactory({
+              configId: uuidSequence,
+            }),
+            integrationDependencyFactory({
+              configId: uuidSequence,
+            }),
+          ],
         }),
-        integrationDependencyFactory({
-          configId: uuidSequence,
+      );
+      const fooElement2 = unmigrateFormStateV2(
+        formStateFactory({
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("foo"),
+          }),
+          integrationDependencies: [
+            integrationDependencyFactory({
+              configId: uuidSequence,
+            }),
+            integrationDependencyFactory({
+              configId: uuidSequence,
+            }),
+          ],
         }),
-      ],
-    });
-    const expectedState = {
-      ...initialStateV2,
-      elements: [
+      );
+      const barElement = unmigrateFormStateV2(
         formStateFactory({
+          modMetadata: modMetadataFactory({
+            id: validateRegistryId("bar"),
+          }),
           integrationDependencies: [
             integrationDependencyFactory({
               configId: uuidSequence,
             }),
+            integrationDependencyFactory({
+              configId: uuidSequence,
+            }),
           ],
         }),
-        fooElement1,
-        fooElement2,
-        barElement,
-      ],
-      deletedElementsByRecipeId: {
-        foo: [fooElement1, fooElement2],
-        bar: [barElement],
-      },
-    };
-    const unmigrated = unmigrateEditorStateV2(expectedState);
-    expect(migrateEditorStateV1(unmigrated)).toStrictEqual(expectedState);
+      );
+      const expectedState = {
+        ...initialStateV2,
+        elements: [
+          unmigrateFormStateV2(
+            formStateFactory({
+              integrationDependencies: [
+                integrationDependencyFactory({
+                  configId: uuidSequence,
+                }),
+              ],
+            }),
+          ),
+          fooElement1,
+          fooElement2,
+          barElement,
+        ],
+        deletedElementsByRecipeId: {
+          foo: [fooElement1, fooElement2],
+          bar: [barElement],
+        },
+      };
+      const unmigrated = unmigrateEditorStateV2(expectedState);
+      expect(migrateEditorStateV1(unmigrated)).toStrictEqual(expectedState);
+    });
   });
-});
 
-describe("migrateEditorStateV2", () => {
-  it("migrates empty state", () => {
-    expect(migrateEditorStateV2(initialStateV2)).toStrictEqual(initialStateV3);
+  describe("migrateEditorStateV2", () => {
+    it("migrates empty state", () => {
+      expect(migrateEditorStateV2(initialStateV2)).toStrictEqual(
+        initialStateV3,
+      );
+    });
+  });
+
+  describe("migrateEditorStateV3", () => {
+    it("migrates empty state", () => {
+      expect(migrateEditorStateV3(initialStateV3)).toStrictEqual(
+        initialStateV4,
+      );
+    });
+
+    it("migrates the form states", () => {
+      const formState = formStateFactory();
+      const expectedState = {
+        ...initialStateV4,
+        modComponentFormStates: [formState],
+      };
+      const unmigrated = unmigrateEditorStateV3(expectedState);
+      expect(migrateEditorStateV3(unmigrated)).toStrictEqual(expectedState);
+    });
   });
 });
diff --git a/src/store/editorMigrations.ts b/src/store/editorMigrations.ts
index c0cecca926..ca1716a8fd 100644
--- a/src/store/editorMigrations.ts
+++ b/src/store/editorMigrations.ts
@@ -18,8 +18,11 @@
 import { type PersistedState, type MigrationManifest } from "redux-persist";
 import { mapValues, omit } from "lodash";
 import {
+  type BaseFormStateV3,
   type BaseFormStateV1,
   type BaseFormStateV2,
+  type BaseModComponentStateV1,
+  type BaseModComponentStateV2,
 } from "@/pageEditor/baseFormStateTypes";
 import {
   type IntegrationDependencyV1,
@@ -29,6 +32,7 @@ import {
   type EditorStateV2,
   type EditorStateV1,
   type EditorStateV3,
+  type EditorStateV4,
 } from "@/pageEditor/pageEditorTypes";
 import { type ModComponentFormState } from "@/pageEditor/starterBricks/formStateTypes";
 
@@ -39,6 +43,7 @@ export const migrations: MigrationManifest = {
   1: (state) => state,
   2: (state: EditorStateV1 & PersistedState) => migrateEditorStateV1(state),
   3: (state: EditorStateV2 & PersistedState) => migrateEditorStateV2(state),
+  4: (state: EditorStateV3 & PersistedState) => migrateEditorStateV3(state),
 };
 
 export function migrateIntegrationDependenciesV1toV2(
@@ -104,7 +109,7 @@ export function migrateEditorStateV2({
     activeModComponentId: activeElementId,
     activeModId: activeRecipeId,
     expandedModId: expandedRecipeId,
-    modComponentFormStates: elements as ModComponentFormState[],
+    modComponentFormStates: elements,
     knownEditableBrickIds: knownEditable,
     brickPipelineUIStateById: elementUIStates,
     copiedBrick: copiedBlock,
@@ -112,13 +117,44 @@ export function migrateEditorStateV2({
     dirtyModMetadataById: dirtyRecipeMetadataById,
     addBrickLocation: addBlockLocation,
     keepLocalCopyOnCreateMod: keepLocalCopyOnCreateRecipe,
-    deletedModComponentFormStatesByModId: deletedElementsByRecipeId as Record<
-      string,
-      ModComponentFormState[]
-    >,
+    deletedModComponentFormStatesByModId: deletedElementsByRecipeId,
     availableActivatedModComponentIds: availableInstalledIds,
     isPendingAvailableActivatedModComponents: isPendingInstalledExtensions,
     availableDraftModComponentIds: availableDynamicIds,
     isPendingDraftModComponents: isPendingDynamicExtensions,
   };
 }
+
+function migrateModComponentStateV1(
+  state: BaseModComponentStateV1,
+): BaseModComponentStateV2 {
+  return {
+    brickPipeline: state.blockPipeline,
+  };
+}
+
+function migrateFormStateV2(state: BaseFormStateV2): BaseFormStateV3 {
+  return {
+    ...omit(state, "recipe", "extension", "extensionPoint"),
+    modComponent: migrateModComponentStateV1(state.extension),
+    starterBrick: state.extensionPoint,
+    modMetadata: state.recipe,
+  };
+}
+
+export function migrateEditorStateV3({
+  modComponentFormStates,
+  deletedModComponentFormStatesByModId,
+  ...rest
+}: EditorStateV3 & PersistedState): EditorStateV4 & PersistedState {
+  return {
+    ...rest,
+    modComponentFormStates: modComponentFormStates.map((element) =>
+      migrateFormStateV2(element),
+    ) as ModComponentFormState[],
+    deletedModComponentFormStatesByModId: mapValues(
+      deletedModComponentFormStatesByModId,
+      (formStates) => formStates.map((element) => migrateFormStateV2(element)),
+    ) as Record<string, ModComponentFormState[]>,
+  };
+}
diff --git a/src/store/editorStorage.test.ts b/src/store/editorStorage.test.ts
index b3ac045cae..2926ce06a6 100644
--- a/src/store/editorStorage.test.ts
+++ b/src/store/editorStorage.test.ts
@@ -51,11 +51,11 @@ const setReduxStorageMock = jest.mocked(setReduxStorage);
 const currentPersistenceVersion = getMaxMigrationsVersion(migrations);
 
 describe("draftModComponentStorage", () => {
-  test("removes one active element", async () => {
-    const element = formStateFactory();
+  test("removes one active form state", async () => {
+    const formState = formStateFactory();
     const nodeUIStates: Record<UUID, NodeUIState> = {
-      [element.uuid]: {
-        nodeId: element.extension.blockPipeline[0].instanceId,
+      [formState.uuid]: {
+        nodeId: formState.modComponent.brickPipeline[0].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
@@ -63,23 +63,23 @@ describe("draftModComponentStorage", () => {
     };
     const state: EditorState = {
       ...initialState,
-      activeModComponentId: element.uuid,
-      modComponentFormStates: [element],
+      activeModComponentId: formState.uuid,
+      modComponentFormStates: [formState],
       dirty: {
-        [element.uuid]: true,
+        [formState.uuid]: true,
       },
       brickPipelineUIStateById: {
-        [element.uuid]: {
-          pipelineMap: getPipelineMap(element.extension.blockPipeline),
-          activeNodeId: element.extension.blockPipeline[0].instanceId,
+        [formState.uuid]: {
+          pipelineMap: getPipelineMap(formState.modComponent.brickPipeline),
+          activeNodeId: formState.modComponent.brickPipeline[0].instanceId,
           nodeUIStates,
         },
       },
-      availableDraftModComponentIds: [element.uuid],
+      availableDraftModComponentIds: [formState.uuid],
     };
     readReduxStorageMock.mockResolvedValue(state);
 
-    await removeDraftModComponents([element.uuid]);
+    await removeDraftModComponents([formState.uuid]);
 
     expect(setReduxStorage).toHaveBeenCalledWith(
       "persist:editor",
@@ -88,20 +88,20 @@ describe("draftModComponentStorage", () => {
     );
   });
 
-  test("removes inactive element", async () => {
-    const inactiveElement = formStateFactory();
+  test("removes inactive formState", async () => {
+    const inactiveFormState = formStateFactory();
     const inactiveNodeUIStates: Record<UUID, NodeUIState> = {
-      [inactiveElement.uuid]: {
-        nodeId: inactiveElement.extension.blockPipeline[1].instanceId,
+      [inactiveFormState.uuid]: {
+        nodeId: inactiveFormState.modComponent.brickPipeline[1].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
       } as NodeUIState,
     };
-    const activeElement = formStateFactory();
+    const activeFormState = formStateFactory();
     const activeNodeUIStates: Record<UUID, NodeUIState> = {
-      [activeElement.uuid]: {
-        nodeId: activeElement.extension.blockPipeline[0].instanceId,
+      [activeFormState.uuid]: {
+        nodeId: activeFormState.modComponent.brickPipeline[0].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
@@ -109,42 +109,48 @@ describe("draftModComponentStorage", () => {
     };
     const baseState: EditorState = {
       ...initialState,
-      activeModComponentId: activeElement.uuid,
-      modComponentFormStates: [activeElement],
+      activeModComponentId: activeFormState.uuid,
+      modComponentFormStates: [activeFormState],
       dirty: {
-        [activeElement.uuid]: true,
+        [activeFormState.uuid]: true,
       },
       brickPipelineUIStateById: {
-        [activeElement.uuid]: {
-          pipelineMap: getPipelineMap(activeElement.extension.blockPipeline),
-          activeNodeId: activeElement.extension.blockPipeline[0].instanceId,
+        [activeFormState.uuid]: {
+          pipelineMap: getPipelineMap(
+            activeFormState.modComponent.brickPipeline,
+          ),
+          activeNodeId:
+            activeFormState.modComponent.brickPipeline[0].instanceId,
           nodeUIStates: activeNodeUIStates,
         },
       },
-      availableDraftModComponentIds: [activeElement.uuid],
+      availableDraftModComponentIds: [activeFormState.uuid],
     };
     const stateWithInactive: EditorState = {
       ...baseState,
       modComponentFormStates: [
         ...baseState.modComponentFormStates,
-        inactiveElement,
+        inactiveFormState,
       ],
       brickPipelineUIStateById: {
         ...baseState.brickPipelineUIStateById,
-        [inactiveElement.uuid]: {
-          pipelineMap: getPipelineMap(inactiveElement.extension.blockPipeline),
-          activeNodeId: inactiveElement.extension.blockPipeline[0].instanceId,
+        [inactiveFormState.uuid]: {
+          pipelineMap: getPipelineMap(
+            inactiveFormState.modComponent.brickPipeline,
+          ),
+          activeNodeId:
+            inactiveFormState.modComponent.brickPipeline[0].instanceId,
           nodeUIStates: inactiveNodeUIStates,
         },
       },
       availableDraftModComponentIds: [
         ...baseState.availableDraftModComponentIds,
-        inactiveElement.uuid,
+        inactiveFormState.uuid,
       ],
     };
     readReduxStorageMock.mockResolvedValue(stateWithInactive);
 
-    await removeDraftModComponents([inactiveElement.uuid]);
+    await removeDraftModComponents([inactiveFormState.uuid]);
 
     expect(setReduxStorage).toHaveBeenCalledWith(
       "persist:editor",
@@ -154,33 +160,33 @@ describe("draftModComponentStorage", () => {
   });
 
   test("removes active recipe", async () => {
-    const recipe = modMetadataFactory();
-    const element1 = formStateFactory({
-      recipe,
+    const mod = modMetadataFactory();
+    const formState1 = formStateFactory({
+      modMetadata: mod,
     });
-    const element1NodeUIStates: Record<UUID, NodeUIState> = {
-      [element1.uuid]: {
-        nodeId: element1.extension.blockPipeline[0].instanceId,
+    const formState1NodeUIStates: Record<UUID, NodeUIState> = {
+      [formState1.uuid]: {
+        nodeId: formState1.modComponent.brickPipeline[0].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
       } as NodeUIState,
     };
-    const element2 = formStateFactory({
-      recipe,
+    const formState2 = formStateFactory({
+      modMetadata: mod,
     });
-    const element2NodeUIStates: Record<UUID, NodeUIState> = {
-      [element2.uuid]: {
-        nodeId: element2.extension.blockPipeline[0].instanceId,
+    const formState2NodeUIStates: Record<UUID, NodeUIState> = {
+      [formState2.uuid]: {
+        nodeId: formState2.modComponent.brickPipeline[0].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
       } as NodeUIState,
     };
-    const element3 = formStateFactory();
-    const element3NodeUIStates: Record<UUID, NodeUIState> = {
-      [element3.uuid]: {
-        nodeId: element3.extension.blockPipeline[1].instanceId,
+    const formState3 = formStateFactory();
+    const formState3NodeUIStates: Record<UUID, NodeUIState> = {
+      [formState3.uuid]: {
+        nodeId: formState3.modComponent.brickPipeline[1].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
@@ -188,55 +194,55 @@ describe("draftModComponentStorage", () => {
     };
     const baseState: EditorState = {
       ...initialState,
-      modComponentFormStates: [element3],
+      modComponentFormStates: [formState3],
       brickPipelineUIStateById: {
-        [element3.uuid]: {
-          pipelineMap: getPipelineMap(element3.extension.blockPipeline),
-          activeNodeId: element3.extension.blockPipeline[0].instanceId,
-          nodeUIStates: element3NodeUIStates,
+        [formState3.uuid]: {
+          pipelineMap: getPipelineMap(formState3.modComponent.brickPipeline),
+          activeNodeId: formState3.modComponent.brickPipeline[0].instanceId,
+          nodeUIStates: formState3NodeUIStates,
         },
       },
-      availableDraftModComponentIds: [element3.uuid],
+      availableDraftModComponentIds: [formState3.uuid],
     };
     const stateWithRecipe: EditorState = {
       ...baseState,
-      activeModId: recipe.id,
+      activeModId: mod.id,
       modComponentFormStates: [
         ...baseState.modComponentFormStates,
-        element1,
-        element2,
+        formState1,
+        formState2,
       ],
       dirty: {
-        [element1.uuid]: true,
+        [formState1.uuid]: true,
       },
       dirtyModMetadataById: {
-        [recipe.id]: {
-          ...recipe,
+        [mod.id]: {
+          ...mod,
           description: "new description",
         },
       },
       brickPipelineUIStateById: {
         ...baseState.brickPipelineUIStateById,
-        [element1.uuid]: {
-          pipelineMap: getPipelineMap(element1.extension.blockPipeline),
-          activeNodeId: element1.extension.blockPipeline[1].instanceId,
-          nodeUIStates: element1NodeUIStates,
+        [formState1.uuid]: {
+          pipelineMap: getPipelineMap(formState1.modComponent.brickPipeline),
+          activeNodeId: formState1.modComponent.brickPipeline[1].instanceId,
+          nodeUIStates: formState1NodeUIStates,
         },
-        [element2.uuid]: {
-          pipelineMap: getPipelineMap(element2.extension.blockPipeline),
-          activeNodeId: element2.extension.blockPipeline[0].instanceId,
-          nodeUIStates: element2NodeUIStates,
+        [formState2.uuid]: {
+          pipelineMap: getPipelineMap(formState2.modComponent.brickPipeline),
+          activeNodeId: formState2.modComponent.brickPipeline[0].instanceId,
+          nodeUIStates: formState2NodeUIStates,
         },
       },
       availableDraftModComponentIds: [
         ...baseState.availableDraftModComponentIds,
-        element1.uuid,
-        element2.uuid,
+        formState1.uuid,
+        formState2.uuid,
       ],
     };
     readReduxStorageMock.mockResolvedValue(stateWithRecipe);
 
-    await removeDraftModComponentsForMod(recipe.id);
+    await removeDraftModComponentsForMod(mod.id);
 
     expect(setReduxStorage).toHaveBeenCalledWith(
       "persist:editor",
@@ -246,33 +252,33 @@ describe("draftModComponentStorage", () => {
   });
 
   test("removes inactive recipe", async () => {
-    const recipe = modMetadataFactory();
-    const element1 = formStateFactory({
-      recipe,
+    const mod = modMetadataFactory();
+    const formState1 = formStateFactory({
+      modMetadata: mod,
     });
-    const element1NodeUIStates: Record<UUID, NodeUIState> = {
-      [element1.uuid]: {
-        nodeId: element1.extension.blockPipeline[0].instanceId,
+    const formState1NodeUIStates: Record<UUID, NodeUIState> = {
+      [formState1.uuid]: {
+        nodeId: formState1.modComponent.brickPipeline[0].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
       } as NodeUIState,
     };
-    const element2 = formStateFactory({
-      recipe,
+    const formState2 = formStateFactory({
+      modMetadata: mod,
     });
-    const element2NodeUIStates: Record<UUID, NodeUIState> = {
-      [element2.uuid]: {
-        nodeId: element2.extension.blockPipeline[0].instanceId,
+    const formState2NodeUIStates: Record<UUID, NodeUIState> = {
+      [formState2.uuid]: {
+        nodeId: formState2.modComponent.brickPipeline[0].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
       } as NodeUIState,
     };
-    const element3 = formStateFactory();
-    const element3NodeUIStates: Record<UUID, NodeUIState> = {
-      [element3.uuid]: {
-        nodeId: element3.extension.blockPipeline[1].instanceId,
+    const formState3 = formStateFactory();
+    const formState3NodeUIStates: Record<UUID, NodeUIState> = {
+      [formState3.uuid]: {
+        nodeId: formState3.modComponent.brickPipeline[1].instanceId,
         dataPanel: {
           activeTabKey: null,
         },
@@ -280,55 +286,55 @@ describe("draftModComponentStorage", () => {
     };
     const baseState: EditorState = {
       ...initialState,
-      activeModComponentId: element3.uuid,
-      modComponentFormStates: [element3],
+      activeModComponentId: formState3.uuid,
+      modComponentFormStates: [formState3],
       brickPipelineUIStateById: {
-        [element3.uuid]: {
-          pipelineMap: getPipelineMap(element3.extension.blockPipeline),
-          activeNodeId: element3.extension.blockPipeline[0].instanceId,
-          nodeUIStates: element3NodeUIStates,
+        [formState3.uuid]: {
+          pipelineMap: getPipelineMap(formState3.modComponent.brickPipeline),
+          activeNodeId: formState3.modComponent.brickPipeline[0].instanceId,
+          nodeUIStates: formState3NodeUIStates,
         },
       },
-      availableDraftModComponentIds: [element3.uuid],
+      availableDraftModComponentIds: [formState3.uuid],
     };
     const stateWithRecipe: EditorState = {
       ...baseState,
       modComponentFormStates: [
         ...baseState.modComponentFormStates,
-        element1,
-        element2,
+        formState1,
+        formState2,
       ],
       dirty: {
-        [element1.uuid]: true,
+        [formState1.uuid]: true,
       },
       dirtyModMetadataById: {
-        [recipe.id]: {
-          ...recipe,
+        [mod.id]: {
+          ...mod,
           description: "new description",
         },
       },
       brickPipelineUIStateById: {
         ...baseState.brickPipelineUIStateById,
-        [element1.uuid]: {
-          pipelineMap: getPipelineMap(element1.extension.blockPipeline),
-          activeNodeId: element1.extension.blockPipeline[1].instanceId,
-          nodeUIStates: element1NodeUIStates,
+        [formState1.uuid]: {
+          pipelineMap: getPipelineMap(formState1.modComponent.brickPipeline),
+          activeNodeId: formState1.modComponent.brickPipeline[1].instanceId,
+          nodeUIStates: formState1NodeUIStates,
         },
-        [element2.uuid]: {
-          pipelineMap: getPipelineMap(element2.extension.blockPipeline),
-          activeNodeId: element2.extension.blockPipeline[0].instanceId,
-          nodeUIStates: element2NodeUIStates,
+        [formState2.uuid]: {
+          pipelineMap: getPipelineMap(formState2.modComponent.brickPipeline),
+          activeNodeId: formState2.modComponent.brickPipeline[0].instanceId,
+          nodeUIStates: formState2NodeUIStates,
         },
       },
       availableDraftModComponentIds: [
         ...baseState.availableDraftModComponentIds,
-        element1.uuid,
-        element2.uuid,
+        formState1.uuid,
+        formState2.uuid,
       ],
     };
     readReduxStorageMock.mockResolvedValue(stateWithRecipe);
 
-    await removeDraftModComponentsForMod(recipe.id);
+    await removeDraftModComponentsForMod(mod.id);
 
     expect(setReduxStorage).toHaveBeenCalledWith(
       "persist:editor",
diff --git a/src/store/editorStorage.ts b/src/store/editorStorage.ts
index 040565d770..3429222c4b 100644
--- a/src/store/editorStorage.ts
+++ b/src/store/editorStorage.ts
@@ -114,7 +114,7 @@ export async function removeDraftModComponentsForMod(
     removeModData(draft, modId);
 
     for (const modComponentFormState of state.modComponentFormStates) {
-      if (modComponentFormState.recipe?.id === modId) {
+      if (modComponentFormState.modMetadata?.id === modId) {
         removedDraftModComponents.push(modComponentFormState.uuid);
         removeModComponentFormState(draft, modComponentFormState.uuid);
       }
diff --git a/src/testUtils/factories/pageEditorFactories.ts b/src/testUtils/factories/pageEditorFactories.ts
index b0211edbf6..7ac4497207 100644
--- a/src/testUtils/factories/pageEditorFactories.ts
+++ b/src/testUtils/factories/pageEditorFactories.ts
@@ -55,7 +55,7 @@ import { type BaseModComponentState } from "@/pageEditor/baseFormStateTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 export const baseModComponentStateFactory = define<BaseModComponentState>({
-  blockPipeline: () => pipelineFactory(),
+  brickPipeline: () => pipelineFactory(),
 });
 
 type InternalFormStateOverride = ModComponentFormState & {
@@ -73,12 +73,12 @@ const internalFormStateFactory = define<InternalFormStateOverride>({
   integrationDependencies(): IntegrationDependency[] {
     return [];
   },
-  recipe: undefined,
+  modMetadata: undefined,
   type: StarterBrickTypes.SIDEBAR_PANEL,
   label: (i: number) => `Element ${i}`,
-  extension: baseModComponentStateFactory,
+  modComponent: baseModComponentStateFactory,
   // @ts-expect-error -- TODO: verify typings
-  extensionPoint: derive<ModComponentFormState, StarterBrickDefinitionLike>(
+  starterBrick: derive<ModComponentFormState, StarterBrickDefinitionLike>(
     ({ type }) => {
       // FIXME: the starter brick type produced is not based on the type provided
       const starterBrick = starterBrickDefinitionFactory();
@@ -99,8 +99,8 @@ export const formStateFactory = (
   if (pipelineOverride) {
     return internalFormStateFactory({
       ...override,
-      extension: baseModComponentStateFactory({
-        blockPipeline: pipelineOverride,
+      modComponent: baseModComponentStateFactory({
+        brickPipeline: pipelineOverride,
       }),
     } as InternalFormStateOverride);
   }
@@ -261,11 +261,11 @@ export const formStateWithTraceDataFactory = define<{
     TraceRecord[]
   >(({ formState }) => {
     assertNotNullish(formState, "formState is required");
-    const { uuid: extensionId, extension } = formState;
+    const { uuid: modComponentId, modComponent } = formState;
 
     let outputKey = "" as OutputKey;
     let output: JsonObject = foundationOutputFactory();
-    return extension.blockPipeline.map((block, index) => {
+    return modComponent.brickPipeline.map((block, index) => {
       const context = output;
       outputKey = `output${index}` as OutputKey;
       output = {
@@ -278,7 +278,7 @@ export const formStateWithTraceDataFactory = define<{
       };
 
       return traceRecordFactory({
-        extensionId,
+        extensionId: modComponentId,
         blockInstanceId: block.instanceId,
         blockId: block.id,
         templateContext: context,