From a785f4a0925158a0f59847c20539a273ad8451c2 Mon Sep 17 00:00:00 2001
From: Todd Schiller <todd.schiller@gmail.com>
Date: Thu, 20 Jun 2024 14:35:54 -0400
Subject: [PATCH] Update menu item starter brick names (#8653)

---
 .../analysisVisitors/selectorAnalysis.test.ts |   2 +-
 src/components/BrickIcon.tsx                  |   2 +-
 src/contentScript/pageEditor/types.ts         |   2 +-
 src/pageEditor/panes/save/saveHelpers.test.ts |   2 +-
 .../starterBricks/formStateTypes.ts           |   2 +-
 src/pageEditor/starterBricks/menuItem.ts      |   4 +-
 src/starterBricks/factory.ts                  |   2 +-
 ...n.test.ts => menuItemStarterBrick.test.ts} | 118 +++++++--------
 ...emExtension.ts => menuItemStarterBrick.ts} | 141 +++++++++---------
 .../menuItem/{types.ts => menuItemTypes.ts}   |  12 +-
 .../checkAvailableInstalledExtensions.test.ts |   6 +-
 src/tsconfig.strictNullChecks.json            |   6 +-
 12 files changed, 152 insertions(+), 147 deletions(-)
 rename src/starterBricks/menuItem/{menuItemExtension.test.ts => menuItemStarterBrick.test.ts} (77%)
 rename src/starterBricks/menuItem/{menuItemExtension.ts => menuItemStarterBrick.ts} (86%)
 rename src/starterBricks/menuItem/{types.ts => menuItemTypes.ts} (89%)

diff --git a/src/analysis/analysisVisitors/selectorAnalysis.test.ts b/src/analysis/analysisVisitors/selectorAnalysis.test.ts
index 26214e33d2..c9021de418 100644
--- a/src/analysis/analysisVisitors/selectorAnalysis.test.ts
+++ b/src/analysis/analysisVisitors/selectorAnalysis.test.ts
@@ -22,7 +22,7 @@ import {
   menuItemFormStateFactory,
   triggerFormStateFactory,
 } from "@/testUtils/factories/pageEditorFactories";
-import type { AttachMode } from "@/starterBricks/menuItem/types";
+import type { AttachMode } from "@/starterBricks/menuItem/menuItemTypes";
 import { HighlightEffect } from "@/bricks/effects/highlight";
 import brickRegistry from "@/bricks/registry";
 import { JQueryReader } from "@/bricks/transformers/jquery/JQueryReader";
diff --git a/src/components/BrickIcon.tsx b/src/components/BrickIcon.tsx
index aefff097b2..8069522fe2 100644
--- a/src/components/BrickIcon.tsx
+++ b/src/components/BrickIcon.tsx
@@ -30,7 +30,7 @@ import {
   faWindowMaximize,
 } from "@fortawesome/free-solid-svg-icons";
 import { TriggerStarterBrickABC } from "@/starterBricks/trigger/triggerStarterBrick";
-import { MenuItemStarterBrickABC } from "@/starterBricks/menuItem/menuItemExtension";
+import { MenuItemStarterBrickABC } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { ContextMenuStarterBrickABC } from "@/starterBricks/contextMenu/contextMenu";
 import { PanelStarterBrickABC } from "@/starterBricks/panel/panelExtension";
 import { SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarExtension";
diff --git a/src/contentScript/pageEditor/types.ts b/src/contentScript/pageEditor/types.ts
index e0d751d15c..c5e388b314 100644
--- a/src/contentScript/pageEditor/types.ts
+++ b/src/contentScript/pageEditor/types.ts
@@ -28,7 +28,7 @@ import {
 import {
   type MenuItemDefinition,
   type MenuItemStarterBrickConfig,
-} from "@/starterBricks/menuItem/types";
+} from "@/starterBricks/menuItem/menuItemTypes";
 import { type ElementInfo } from "@/utils/inference/selectorTypes";
 import { type ModComponentBase } from "@/types/modComponentTypes";
 import { type UUID } from "@/types/stringTypes";
diff --git a/src/pageEditor/panes/save/saveHelpers.test.ts b/src/pageEditor/panes/save/saveHelpers.test.ts
index 8e85b39198..6fb2e99bd4 100644
--- a/src/pageEditor/panes/save/saveHelpers.test.ts
+++ b/src/pageEditor/panes/save/saveHelpers.test.ts
@@ -32,7 +32,7 @@ import {
 import { produce } from "immer";
 import { makeInternalId } from "@/registry/internal";
 import { cloneDeep, range, uniq } from "lodash";
-import { type MenuItemDefinition } from "@/starterBricks/menuItem/types";
+import { type MenuItemDefinition } from "@/starterBricks/menuItem/menuItemTypes";
 import extensionsSlice from "@/store/extensionsSlice";
 import {
   type StarterBrickDefinitionLike,
diff --git a/src/pageEditor/starterBricks/formStateTypes.ts b/src/pageEditor/starterBricks/formStateTypes.ts
index 064a874954..9e1f0bcb84 100644
--- a/src/pageEditor/starterBricks/formStateTypes.ts
+++ b/src/pageEditor/starterBricks/formStateTypes.ts
@@ -24,7 +24,7 @@ import {
 import {
   type MenuItemStarterBrickConfig,
   type MenuPosition,
-} from "@/starterBricks/menuItem/types";
+} from "@/starterBricks/menuItem/menuItemTypes";
 import { type PanelConfig } from "@/starterBricks/panel/types";
 import {
   type QuickBarConfig,
diff --git a/src/pageEditor/starterBricks/menuItem.ts b/src/pageEditor/starterBricks/menuItem.ts
index 80594eba52..9bf6df7fb5 100644
--- a/src/pageEditor/starterBricks/menuItem.ts
+++ b/src/pageEditor/starterBricks/menuItem.ts
@@ -32,7 +32,7 @@ import {
   cleanIsAvailable,
 } from "@/pageEditor/starterBricks/base";
 import { omitEditorMetadata } from "./pipelineMapping";
-import { MenuItemStarterBrickABC } from "@/starterBricks/menuItem/menuItemExtension";
+import { MenuItemStarterBrickABC } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
 import { getDomain } from "@/permissions/patterns";
 import { faMousePointer } from "@fortawesome/free-solid-svg-icons";
@@ -47,7 +47,7 @@ import { type ActionFormState } from "./formStateTypes";
 import {
   type MenuItemDefinition,
   type MenuItemStarterBrickConfig,
-} from "@/starterBricks/menuItem/types";
+} from "@/starterBricks/menuItem/menuItemTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 function fromNativeElement(
diff --git a/src/starterBricks/factory.ts b/src/starterBricks/factory.ts
index fa1f9c55ac..c1176d6648 100644
--- a/src/starterBricks/factory.ts
+++ b/src/starterBricks/factory.ts
@@ -16,7 +16,7 @@
  */
 
 import { fromJS as deserializePanel } from "@/starterBricks/panel/panelExtension";
-import { fromJS as deserializeMenuItem } from "@/starterBricks/menuItem/menuItemExtension";
+import { fromJS as deserializeMenuItem } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { fromJS as deserializeTrigger } from "@/starterBricks/trigger/triggerStarterBrick";
 import { fromJS as deserializeContextMenu } from "@/starterBricks/contextMenu/contextMenu";
 import { fromJS as deserializeSidebar } from "@/starterBricks/sidebar/sidebarExtension";
diff --git a/src/starterBricks/menuItem/menuItemExtension.test.ts b/src/starterBricks/menuItem/menuItemStarterBrick.test.ts
similarity index 77%
rename from src/starterBricks/menuItem/menuItemExtension.test.ts
rename to src/starterBricks/menuItem/menuItemStarterBrick.test.ts
index f7fb629c8f..ba7002160e 100644
--- a/src/starterBricks/menuItem/menuItemExtension.test.ts
+++ b/src/starterBricks/menuItem/menuItemStarterBrick.test.ts
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { fromJS } from "@/starterBricks/menuItem/menuItemExtension";
+import { fromJS } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { validateRegistryId } from "@/types/helpers";
 import { type Metadata } from "@/types/registryTypes";
 import { define } from "cooky-cutter";
@@ -37,7 +37,7 @@ import { getPlatform } from "@/platform/platformContext";
 import {
   type MenuItemDefinition,
   type MenuItemStarterBrickConfig,
-} from "@/starterBricks/menuItem/types";
+} from "@/starterBricks/menuItem/menuItemTypes";
 
 jest.mock("@/runtime/reducePipeline");
 
@@ -103,13 +103,13 @@ beforeEach(() => {
   rootReader.ref = null;
 });
 
-describe("menuItemExtension", () => {
+describe("menuItemStarterBrick", () => {
   it.each([["append"], [undefined]])(
     "can add menu item with position: %s",
     async (position) => {
       document.body.innerHTML = getDocument("<div>foo</div>").body.innerHTML;
 
-      const extensionPoint = fromJS(
+      const starterBrick = fromJS(
         getPlatform(),
         starterBrickFactory({
           position,
@@ -117,26 +117,26 @@ describe("menuItemExtension", () => {
       );
 
       const modComponent = modComponentFactory({
-        extensionPointId: extensionPoint.id,
+        extensionPointId: starterBrick.id,
       });
 
-      extensionPoint.registerModComponent(modComponent);
+      starterBrick.registerModComponent(modComponent);
 
-      await extensionPoint.install();
-      await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+      await starterBrick.install();
+      await starterBrick.runModComponents({ reason: RunReason.MANUAL });
 
       expect(document.querySelectorAll("button")).toHaveLength(1);
       expect(document.body.innerHTML).toBe(
-        `<div data-pb-extension-point="${extensionPoint.id}">foo<button data-pb-uuid="${modComponent.id}">Hello World</button></div>`,
+        `<div data-pb-extension-point="${starterBrick.id}">foo<button data-pb-uuid="${modComponent.id}">Hello World</button></div>`,
       );
 
-      extensionPoint.uninstall();
+      starterBrick.uninstall();
     },
   );
 
   it("can prepend menu item", async () => {
     document.body.innerHTML = getDocument("<div>foo</div>").body.innerHTML;
-    const extensionPoint = fromJS(
+    const starterBrick = fromJS(
       getPlatform(),
       starterBrickFactory({
         position: "prepend",
@@ -144,39 +144,39 @@ describe("menuItemExtension", () => {
     );
 
     const modComponent = modComponentFactory({
-      extensionPointId: extensionPoint.id,
+      extensionPointId: starterBrick.id,
     });
 
-    extensionPoint.registerModComponent(modComponent);
+    starterBrick.registerModComponent(modComponent);
 
-    await extensionPoint.install();
-    await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+    await starterBrick.install();
+    await starterBrick.runModComponents({ reason: RunReason.MANUAL });
 
     expect(document.querySelectorAll("button")).toHaveLength(1);
     expect(document.body.innerHTML).toBe(
-      `<div data-pb-extension-point="${extensionPoint.id}"><button data-pb-uuid="${modComponent.id}">Hello World</button>foo</div>`,
+      `<div data-pb-extension-point="${starterBrick.id}"><button data-pb-uuid="${modComponent.id}">Hello World</button>foo</div>`,
     );
 
-    extensionPoint.uninstall();
+    starterBrick.uninstall();
   });
 
   it("can use targetMode: eventTarget", async () => {
     document.body.innerHTML = getDocument("<div></div>").body.innerHTML;
-    const extensionPoint = fromJS(
+    const starterBrick = fromJS(
       getPlatform(),
       starterBrickFactory({
         targetMode: "eventTarget",
       })(),
     );
 
-    extensionPoint.registerModComponent(
+    starterBrick.registerModComponent(
       modComponentFactory({
-        extensionPointId: extensionPoint.id,
+        extensionPointId: starterBrick.id,
       }),
     );
 
-    await extensionPoint.install();
-    await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+    await starterBrick.install();
+    await starterBrick.runModComponents({ reason: RunReason.MANUAL });
 
     expect(document.querySelectorAll("button")).toHaveLength(1);
 
@@ -196,14 +196,14 @@ describe("menuItemExtension", () => {
       expect.toBeObject(),
     );
 
-    extensionPoint.uninstall();
+    starterBrick.uninstall();
   });
 
   it("can user reader selector", async () => {
     document.body.innerHTML = getDocument(
       '<div id="outer"><div id="toolbar"></div></div>',
     ).body.innerHTML;
-    const extensionPoint = fromJS(
+    const starterBrick = fromJS(
       getPlatform(),
       starterBrickFactory({
         readerSelector: "div",
@@ -211,14 +211,14 @@ describe("menuItemExtension", () => {
       })(),
     );
 
-    extensionPoint.registerModComponent(
+    starterBrick.registerModComponent(
       modComponentFactory({
-        extensionPointId: extensionPoint.id,
+        extensionPointId: starterBrick.id,
       }),
     );
 
-    await extensionPoint.install();
-    await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+    await starterBrick.install();
+    await starterBrick.runModComponents({ reason: RunReason.MANUAL });
 
     expect(document.querySelectorAll("button")).toHaveLength(1);
 
@@ -241,28 +241,28 @@ describe("menuItemExtension", () => {
       expect.toBeObject(),
     );
 
-    extensionPoint.uninstall();
+    starterBrick.uninstall();
   });
 
   it.each([[undefined], ["document"]])(
     "can use default targetMode: %s",
     async (targetMode) => {
       document.body.innerHTML = getDocument("<div></div>").body.innerHTML;
-      const extensionPoint = fromJS(
+      const starterBrick = fromJS(
         getPlatform(),
         starterBrickFactory({
           targetMode,
         })(),
       );
 
-      extensionPoint.registerModComponent(
+      starterBrick.registerModComponent(
         modComponentFactory({
-          extensionPointId: extensionPoint.id,
+          extensionPointId: starterBrick.id,
         }),
       );
 
-      await extensionPoint.install();
-      await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+      await starterBrick.install();
+      await starterBrick.runModComponents({ reason: RunReason.MANUAL });
 
       expect(document.querySelectorAll("button")).toHaveLength(1);
 
@@ -283,7 +283,7 @@ describe("menuItemExtension", () => {
         expect.toBeObject(),
       );
 
-      extensionPoint.uninstall();
+      starterBrick.uninstall();
     },
   );
 
@@ -315,20 +315,20 @@ describe("menuItemExtension", () => {
     document.body.innerHTML = getDocument(
       '<div id="root"><div id="menu"></div></div>',
     ).body.innerHTML;
-    const extensionPoint = fromJS(
+    const starterBrick = fromJS(
       getPlatform(),
       starterBrickFactory({
         containerSelector: ".newClass #menu",
       })(),
     );
 
-    extensionPoint.registerModComponent(
+    starterBrick.registerModComponent(
       modComponentFactory({
-        extensionPointId: extensionPoint.id,
+        extensionPointId: starterBrick.id,
       }),
     );
 
-    const installPromise = extensionPoint.install();
+    const installPromise = starterBrick.install();
 
     expect(document.querySelectorAll("button")).toHaveLength(0);
 
@@ -336,7 +336,7 @@ describe("menuItemExtension", () => {
 
     await installPromise;
 
-    await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+    await starterBrick.runModComponents({ reason: RunReason.MANUAL });
 
     await tick();
 
@@ -344,27 +344,27 @@ describe("menuItemExtension", () => {
 
     expect(document.querySelectorAll("button")).toHaveLength(1);
 
-    extensionPoint.uninstall();
+    starterBrick.uninstall();
   });
 
   it("watch attach mode attaches new menu items", async () => {
     document.body.innerHTML = getDocument(
       "<div><div class='menu'></div></div>",
     ).body.innerHTML;
-    const starterBrick = starterBrickFactory()();
-    starterBrick.definition.containerSelector = ".menu";
-    starterBrick.definition.attachMode = "watch";
+    const starterBrickDefinition = starterBrickFactory()();
+    starterBrickDefinition.definition.containerSelector = ".menu";
+    starterBrickDefinition.definition.attachMode = "watch";
 
-    const extensionPoint = fromJS(getPlatform(), starterBrick);
+    const starterBrick = fromJS(getPlatform(), starterBrickDefinition);
 
-    extensionPoint.registerModComponent(
+    starterBrick.registerModComponent(
       modComponentFactory({
-        extensionPointId: extensionPoint.id,
+        extensionPointId: starterBrick.id,
       }),
     );
 
-    await extensionPoint.install();
-    await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+    await starterBrick.install();
+    await starterBrick.runModComponents({ reason: RunReason.MANUAL });
     expect(document.querySelectorAll("button")).toHaveLength(1);
 
     $("div:first").append("<div class='menu'></div>");
@@ -374,26 +374,26 @@ describe("menuItemExtension", () => {
     await tick();
     expect(document.querySelectorAll("button")).toHaveLength(2);
 
-    extensionPoint.uninstall();
+    starterBrick.uninstall();
   });
 
   it("once does not attach for new items", async () => {
     // Test the quirky behavior of "once" mode when there are multiple elements on the page and the original menu
     // is removed from the page
     document.body.innerHTML = getDocument("<div></div>").body.innerHTML;
-    const starterBrick = starterBrickFactory()();
-    starterBrick.definition.containerSelector = ".menu";
-    starterBrick.definition.attachMode = "once";
+    const starterBrickDefinition = starterBrickFactory()();
+    starterBrickDefinition.definition.containerSelector = ".menu";
+    starterBrickDefinition.definition.attachMode = "once";
 
-    const extensionPoint = fromJS(getPlatform(), starterBrick);
+    const starterBrick = fromJS(getPlatform(), starterBrickDefinition);
 
-    extensionPoint.registerModComponent(
+    starterBrick.registerModComponent(
       modComponentFactory({
-        extensionPointId: extensionPoint.id,
+        extensionPointId: starterBrick.id,
       }),
     );
 
-    const installPromise = extensionPoint.install();
+    const installPromise = starterBrick.install();
 
     expect(document.querySelectorAll("button")).toHaveLength(0);
 
@@ -401,7 +401,7 @@ describe("menuItemExtension", () => {
     await tick();
     await tick();
     await installPromise;
-    await extensionPoint.runModComponents({ reason: RunReason.MANUAL });
+    await starterBrick.runModComponents({ reason: RunReason.MANUAL });
     expect(document.querySelectorAll("button")).toHaveLength(1);
 
     // 2 ticks were necessary in the watch test
@@ -418,6 +418,6 @@ describe("menuItemExtension", () => {
     await tick();
     expect(document.querySelectorAll("button")).toHaveLength(1);
 
-    extensionPoint.uninstall();
+    starterBrick.uninstall();
   });
 });
diff --git a/src/starterBricks/menuItem/menuItemExtension.ts b/src/starterBricks/menuItem/menuItemStarterBrick.ts
similarity index 86%
rename from src/starterBricks/menuItem/menuItemExtension.ts
rename to src/starterBricks/menuItem/menuItemStarterBrick.ts
index 17a632927c..b52f6ad7d7 100644
--- a/src/starterBricks/menuItem/menuItemExtension.ts
+++ b/src/starterBricks/menuItem/menuItemStarterBrick.ts
@@ -88,7 +88,7 @@ import {
   type AttachMode,
   type MenuItemDefinition,
   type MenuTargetMode,
-} from "@/starterBricks/menuItem/types";
+} from "@/starterBricks/menuItem/menuItemTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 const DATA_ATTR = "data-pb-uuid";
@@ -126,20 +126,20 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
   private readonly removed: Set<UUID>;
 
   /**
-   * Set of methods to call to cancel any DOM watchers associated with this extension point
+   * Set of methods to call to cancel any DOM watchers associated with this starter brick
    */
   private readonly cancelController = new ReusableAbortController();
 
   /**
-   * True if the extension point has been uninstalled
+   * True if the starter brick has been uninstalled
    */
   private uninstalled = false;
 
   /**
-   * Mapping from extension id to the set of menu items that have been clicked and still running.
+   * Mapping from component id to the set of menu items that have been clicked and still running.
    * @see MenuItemStarterBrickConfig.synchronous
    */
-  private readonly runningExtensionElements = new Map<
+  private readonly runningModComponentPageElements = new Map<
     UUID,
     WeakSet<HTMLElement>
   >();
@@ -212,21 +212,21 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
   );
 
   private cancelAllPending(): void {
-    console.debug("Cancelling menuItemExtension observers");
+    console.debug("Cancelling menuItemStarterBrick observers");
     this.cancelController.abortAndReset();
   }
 
-  clearModComponentInterfaceAndEvents(extensionIds: UUID[]): void {
+  clearModComponentInterfaceAndEvents(modComponentIds: UUID[]): void {
     console.debug(
-      "Remove extensionIds for menuItem extension point: %s",
+      "Remove componentIds for menuItem starter brick: %s",
       this.id,
-      { extensionIds },
+      { modComponentIds },
     );
     // Can't use this.menus.values() here b/c because it may have already been cleared
-    for (const extensionId of extensionIds) {
-      const $item = $safeFind(`[${DATA_ATTR}="${extensionId}"]`);
+    for (const modComponentId of modComponentIds) {
+      const $item = $safeFind(`[${DATA_ATTR}="${modComponentId}"]`);
       if ($item.length === 0) {
-        console.warn(`Item for ${extensionId} was not in the menu`);
+        console.warn(`Item for ${modComponentId} was not in the menu`);
       }
 
       $item.remove();
@@ -239,24 +239,26 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
     const menus = [...this.menus.values()];
 
     // Clear so they don't get re-added by the onNodeRemoved mechanism
-    const extensions = this.modComponents.splice(0);
+    const modComponents = this.modComponents.splice(0);
     this.menus.clear();
 
-    if (extensions.length === 0) {
+    if (modComponents.length === 0) {
       console.warn(
-        `uninstall called on menu extension point with no extensions: ${this.id}`,
+        `uninstall called on menu starter brick with no mod components: ${this.id}`,
       );
     }
 
     console.debug(
-      `Uninstalling ${menus.length} menus for ${extensions.length} extensions`,
+      `Uninstalling ${menus.length} menus for ${modComponents.length} mod components`,
     );
 
     this.cancelAllPending();
 
     for (const element of menus) {
       try {
-        this.clearModComponentInterfaceAndEvents(extensions.map((x) => x.id));
+        this.clearModComponentInterfaceAndEvents(
+          modComponents.map((x) => x.id),
+        );
         // Release the menu element
         element.removeAttribute(EXTENSION_POINT_DATA_ATTR);
       } catch (error) {
@@ -291,9 +293,9 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
   }
 
   async getBricks(
-    extension: ResolvedModComponent<MenuItemStarterBrickConfig>,
+    modComponent: ResolvedModComponent<MenuItemStarterBrickConfig>,
   ): Promise<Brick[]> {
-    return collectAllBricks(extension.config.action);
+    return collectAllBricks(modComponent.config.action);
   }
 
   /**
@@ -308,7 +310,7 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
 
     if (this.uninstalled) {
       console.warn(
-        `${this.instanceNonce}: cannot reacquire because extension ${this.id} is destroyed`,
+        `${this.instanceNonce}: cannot reacquire because mod component ${this.id} is destroyed`,
       );
       return;
     }
@@ -333,7 +335,7 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
   }
 
   /**
-   * Attach extension point to the provided menu containers.
+   * Attach starter brick to the provided menu containers.
    */
   private attachMenus($menuContainers: JQuery): void {
     const existingMenuContainers = new Set(this.menus.values());
@@ -388,13 +390,13 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
   }
 
   /**
-   * Find and claim the new menu containers currently on the page for the extension point.
+   * Find and claim the new menu containers currently on the page for the starter brick.
    * @returns true iff one or more menu containers were found
    */
   private async waitAttachMenus(): Promise<boolean> {
     if (this.uninstalled) {
-      console.error("Menu item extension point is uninstalled", {
-        extensionPointNonce: this.instanceNonce,
+      console.error("Menu item starter brick is uninstalled", {
+        starerBrickNonce: this.instanceNonce,
       });
       throw new Error(
         "Cannot install menu item because starter brick was uninstalled",
@@ -447,25 +449,25 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
 
   protected abstract makeItem(
     html: string,
-    extension: ResolvedModComponent<MenuItemStarterBrickConfig>,
+    modComponent: ResolvedModComponent<MenuItemStarterBrickConfig>,
   ): JQuery;
 
-  private async runExtension(
+  private async runModComponent(
     menu: HTMLElement,
     ctxtPromise: Promise<JsonObject> | undefined,
-    extension: ResolvedModComponent<MenuItemStarterBrickConfig>,
+    modComponent: ResolvedModComponent<MenuItemStarterBrickConfig>,
   ) {
-    if (!extension.id) {
+    if (!modComponent.id) {
       this.logger.error(`Refusing to run mod without id for ${this.id}`);
       return;
     }
 
-    const extensionLogger = this.logger.childLogger(
-      selectModComponentContext(extension),
+    const modComponentLogger = this.logger.childLogger(
+      selectModComponentContext(modComponent),
     );
 
     console.debug(
-      `${this.instanceNonce}: running menuItem extension ${extension.id}`,
+      `${this.instanceNonce}: running menuItem mod component ${modComponent.id}`,
     );
 
     // Safe because menu is an HTMLElement, not a string
@@ -480,24 +482,24 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
       onSuccess = {},
       icon = { id: "box", size: 18 },
       synchronous,
-    } = extension.config;
+    } = modComponent.config;
 
-    const versionOptions = apiVersionOptions(extension.apiVersion);
+    const versionOptions = apiVersionOptions(modComponent.apiVersion);
 
     const implicitRender = versionOptions.explicitRender
       ? null
       : engineRenderer(
-          extension.templateEngine ?? DEFAULT_IMPLICIT_TEMPLATE_ENGINE,
+          modComponent.templateEngine ?? DEFAULT_IMPLICIT_TEMPLATE_ENGINE,
           versionOptions,
         );
 
     let html: string;
 
-    if (extension.config.if) {
+    if (modComponent.config.if) {
       // Read the latest state at the time of the action
       const input = await ctxtPromise;
       const serviceContext = await makeIntegrationsContextFromDependencies(
-        extension.integrationDependencies,
+        modComponent.integrationDependencies,
       );
 
       console.debug("Checking menuItem precondition", {
@@ -515,14 +517,14 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
       const initialValues: InitialValues = {
         input,
         serviceContext,
-        optionsArgs: extension.optionsArgs,
+        optionsArgs: modComponent.optionsArgs,
         root: document,
       };
 
       // NOTE: don't use reduceExtensionPipeline because this is just evaluating the condition and shouldn't show up
       // as a "run" in the logs/traces. We also leave off the extensionLogger (see note)
-      const show = await reducePipeline(extension.config.if, initialValues, {
-        // Don't pass extension: extensionLogger because our log display doesn't handle the in-extension point
+      const show = await reducePipeline(modComponent.config.if, initialValues, {
+        // Don't pass extension: modComponentLogger because our log display doesn't handle the in-starter brick
         // conditionals yet
         ...versionOptions,
       });
@@ -538,15 +540,15 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
     if (dynamicCaption) {
       const ctxt = await ctxtPromise;
       const serviceContext = await makeIntegrationsContextFromDependencies(
-        extension.integrationDependencies,
+        modComponent.integrationDependencies,
       );
 
       // Integrations take precedence over the other context
       // XXX: don't support adding "@mod" variable for now. Dynamic Captions are not available in the Page Editor
-      const extensionContext = { ...ctxt, ...serviceContext };
+      const modComponentContext = { ...ctxt, ...serviceContext };
 
       html = (await renderMustache(this.getTemplate(), {
-        caption: (await mapArgs(caption, extensionContext, {
+        caption: (await mapArgs(caption, modComponentContext, {
           implicitRender,
           autoescape: versionOptions.autoescape,
         })) as string,
@@ -559,14 +561,17 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
       })) as string;
     }
 
-    const $menuItem = this.makeItem(html, extension);
+    const $menuItem = this.makeItem(html, modComponent);
 
     $menuItem.on("click", async (event) => {
       let runningElements: WeakSet<HTMLElement> | undefined =
-        this.runningExtensionElements.get(extension.id);
+        this.runningModComponentPageElements.get(modComponent.id);
       if (runningElements == null) {
         runningElements = new WeakSet([event.target]);
-        this.runningExtensionElements.set(extension.id, runningElements);
+        this.runningModComponentPageElements.set(
+          modComponent.id,
+          runningElements,
+        );
       } else {
         if (synchronous && runningElements.has(event.target)) {
           return;
@@ -581,7 +586,7 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
 
         console.debug("Run menu item", this.logger.context);
 
-        reportEvent(Events.MENU_ITEM_CLICK, selectEventData(extension));
+        reportEvent(Events.MENU_ITEM_CLICK, selectEventData(modComponent));
 
         try {
           // Read the latest state at the time of the action
@@ -595,15 +600,15 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
               }),
             ),
             serviceContext: await makeIntegrationsContextFromDependencies(
-              extension.integrationDependencies,
+              modComponent.integrationDependencies,
             ),
-            optionsArgs: extension.optionsArgs,
+            optionsArgs: modComponent.optionsArgs,
             root: this.getPipelineRoot($menuItem),
           };
 
           await reduceExtensionPipeline(actionConfig, initialValues, {
-            logger: extensionLogger,
-            ...apiVersionOptions(extension.apiVersion),
+            logger: modComponentLogger,
+            ...apiVersionOptions(modComponent.apiVersion),
           });
 
           if (onSuccess) {
@@ -625,7 +630,7 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
               ...pick(onCancel, "message", "type"),
             });
           } else {
-            extensionLogger.error(error);
+            modComponentLogger.error(error);
             this.platform.toasts.showNotification({
               ...DEFAULT_ACTION_RESULTS.error,
               error, // Include more details in the notification
@@ -639,17 +644,17 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
       }
     });
 
-    const $existingItem = $menu.find(`[${DATA_ATTR}="${extension.id}"]`);
+    const $existingItem = $menu.find(`[${DATA_ATTR}="${modComponent.id}"]`);
 
     if ($existingItem.length > 0) {
       // We don't need to unbind any click handlers because we're replacing the element completely.
       console.debug(
-        `Replacing existing menu item for ${extension.id} (${extension.label})`,
+        `Replacing existing menu item for ${modComponent.id} (${modComponent.label})`,
       );
       $existingItem.replaceWith($menuItem);
     } else {
       console.debug(
-        `Adding new menu item ${extension.id} (${extension.label})`,
+        `Adding new menu item ${modComponent.id} (${modComponent.label})`,
       );
       this.addMenuItem($menu, $menuItem);
     }
@@ -663,7 +668,7 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
         () => {
           // Don't re-install here. We're reinstalling the entire menu
           console.debug(
-            `Menu item for ${extension.id} was removed from the DOM`,
+            `Menu item for ${modComponent.id} was removed from the DOM`,
           );
         },
         this.cancelController.signal,
@@ -698,11 +703,11 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
 
       let ctxtPromise: Promise<JsonObject> | undefined;
 
-      for (const extension of this.modComponents) {
+      for (const modComponent of this.modComponents) {
         // Run in order so that the order stays the same for where they get rendered. The service
         // context is the only thing that's async as part of the initial configuration right now
 
-        if (extensionIds != null && !extensionIds.includes(extension.id)) {
+        if (extensionIds != null && !extensionIds.includes(modComponent.id)) {
           continue;
         }
 
@@ -710,8 +715,8 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
           continue;
         }
 
-        if (extension.config.dynamicCaption || extension.config.if) {
-          // Lazily read context for the menu if one of the extensions actually uses it
+        if (modComponent.config.dynamicCaption || modComponent.config.if) {
+          // Lazily read context for the menu if one of the mod components actually uses it
 
           // Wrap in rejectOnCancelled because if the reader takes a long time to run, the user may
           // navigate away from the page before the reader comes back.
@@ -728,19 +733,19 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
 
         try {
           // eslint-disable-next-line no-await-in-loop -- TODO: Make it run in parallel if possible while maintaining the order
-          await this.runExtension(menu, ctxtPromise, extension);
+          await this.runModComponent(menu, ctxtPromise, modComponent);
         } catch (error) {
           if (error instanceof PromiseCancelled) {
             console.debug(
-              `menuItemExtension run promise cancelled for extension: ${extension.id}`,
+              `menuItemStarterBrick run promise cancelled for mod component: ${modComponent.id}`,
             );
           } else {
             errors.push(error);
             reportError(error, {
               context: {
-                deploymentId: extension._deployment?.id,
-                extensionPointId: extension.extensionPointId,
-                extensionId: extension.id,
+                deploymentId: modComponent._deployment?.id,
+                extensionPointId: modComponent.extensionPointId,
+                extensionId: modComponent.id,
               },
             });
           }
@@ -760,7 +765,7 @@ export abstract class MenuItemStarterBrickABC extends StarterBrickABC<MenuItemSt
   }
 }
 
-export class RemoteMenuItemExtensionPoint extends MenuItemStarterBrickABC {
+export class RemoteMenuItemStarterBrick extends MenuItemStarterBrickABC {
   private readonly _definition: MenuItemDefinition;
 
   public readonly permissions: Permissions.Permissions;
@@ -923,7 +928,7 @@ export class RemoteMenuItemExtensionPoint extends MenuItemStarterBrickABC {
 
   protected makeItem(
     unsanitizedHTML: string,
-    extension: ResolvedModComponent<MenuItemStarterBrickConfig>,
+    modComponent: ResolvedModComponent<MenuItemStarterBrickConfig>,
   ): JQuery {
     const sanitizedHTML = sanitize(unsanitizedHTML);
 
@@ -940,7 +945,7 @@ export class RemoteMenuItemExtensionPoint extends MenuItemStarterBrickABC {
       $root = $(sanitizedHTML);
     }
 
-    $root.attr(DATA_ATTR, extension.id);
+    $root.attr(DATA_ATTR, modComponent.id);
 
     return $root;
   }
@@ -960,5 +965,5 @@ export function fromJS(
     throw new Error(`Expected type=menuItem, got ${type as string}`);
   }
 
-  return new RemoteMenuItemExtensionPoint(platform, config);
+  return new RemoteMenuItemStarterBrick(platform, config);
 }
diff --git a/src/starterBricks/menuItem/types.ts b/src/starterBricks/menuItem/menuItemTypes.ts
similarity index 89%
rename from src/starterBricks/menuItem/types.ts
rename to src/starterBricks/menuItem/menuItemTypes.ts
index d07a5d47ab..cce8b02ffd 100644
--- a/src/starterBricks/menuItem/types.ts
+++ b/src/starterBricks/menuItem/menuItemTypes.ts
@@ -31,13 +31,13 @@ export type AttachMode =
 
 export type MenuItemStarterBrickConfig = {
   /**
-   * The button caption to supply to the `caption` in the extension point template.
+   * The button caption to supply to the `caption` in the starter brick template.
    * If `dynamicCaption` is true, can include template expressions.
    */
   caption: string;
 
   /**
-   * (Optional) the icon to supply to the icon in the extension point template
+   * (Optional) the icon to supply to the icon in the starter brick template
    */
   icon?: IconConfig;
 
@@ -63,7 +63,7 @@ export type MenuItemStarterBrickConfig = {
   synchronous: boolean;
 
   /**
-   * (Experimental) message to show on error running the extension
+   * (Experimental) message to show on error running the component
    */
   onError?: MessageConfig;
   /**
@@ -71,7 +71,7 @@ export type MenuItemStarterBrickConfig = {
    */
   onCancel?: MessageConfig;
   /**
-   * (Experimental) message to show on success when running the extension
+   * (Experimental) message to show on success when running the mod component
    */
   onSuccess?: MessageConfig | boolean;
 };
@@ -120,7 +120,7 @@ export interface MenuItemDefinition extends StarterBrickDefinitionProp {
    */
   readerSelector?: string;
   /**
-   * The element to pass as the root to the readers and extension (default="document")
+   * The element to pass as the root to the readers and mod component (default="document")
    * @since 1.7.16
    * @see readerSelector
    */
@@ -131,7 +131,7 @@ export interface MenuItemDefinition extends StarterBrickDefinitionProp {
    */
   shadowDOM?: ShadowDOM;
   /**
-   * Default options for ModComponentBases attached to the extension point
+   * Default options for ModComponentBases attached to the starter brick
    */
   defaultOptions?: MenuDefaultOptions;
   /**
diff --git a/src/store/checkAvailableInstalledExtensions.test.ts b/src/store/checkAvailableInstalledExtensions.test.ts
index ed898fa8a8..6e3364a24e 100644
--- a/src/store/checkAvailableInstalledExtensions.test.ts
+++ b/src/store/checkAvailableInstalledExtensions.test.ts
@@ -23,7 +23,7 @@ import { type ModComponentsRootState } from "@/store/extensionsTypes";
 import { selectModComponentAvailability } from "@/pageEditor/slices/editorSelectors";
 import { getInstalledExtensionPoints } from "@/contentScript/messenger/api";
 import { validateRegistryId } from "@/types/helpers";
-import { RemoteMenuItemExtensionPoint } from "@/starterBricks/menuItem/menuItemExtension";
+import { RemoteMenuItemStarterBrick } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
 import { type Metadata } from "@/types/registryTypes";
 import { RemoteQuickBarExtensionPoint } from "@/starterBricks/quickBar/quickBarExtension";
@@ -32,7 +32,7 @@ import { standaloneModDefinitionFactory } from "@/testUtils/factories/modCompone
 import { metadataFactory } from "@/testUtils/factories/metadataFactory";
 import { getCurrentInspectedURL } from "@/pageEditor/context/connection";
 import { getPlatform } from "@/platform/platformContext";
-import { type MenuItemDefinition } from "@/starterBricks/menuItem/types";
+import { type MenuItemDefinition } from "@/starterBricks/menuItem/menuItemTypes";
 import { type QuickBarDefinition } from "@/starterBricks/quickBar/types";
 
 jest.mock("@/contentScript/messenger/api");
@@ -83,7 +83,7 @@ describe("checkAvailableInstalledExtensions", () => {
         },
       },
     ) as StarterBrickDefinitionLike<MenuItemDefinition>;
-    const availableButtonExtensionPoint = new RemoteMenuItemExtensionPoint(
+    const availableButtonExtensionPoint = new RemoteMenuItemStarterBrick(
       getPlatform(),
       availableButtonStarterBrickDefinition,
     );
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index f2e84c60d3..12c986dd69 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -1344,9 +1344,9 @@
     "./starterBricks/factory.ts",
     "./starterBricks/helpers.test.ts",
     "./starterBricks/helpers.ts",
-    "./starterBricks/menuItem/menuItemExtension.test.ts",
-    "./starterBricks/menuItem/menuItemExtension.ts",
-    "./starterBricks/menuItem/types.ts",
+    "./starterBricks/menuItem/menuItemStarterBrick.test.ts",
+    "./starterBricks/menuItem/menuItemStarterBrick.ts",
+    "./starterBricks/menuItem/menuItemTypes.ts",
     "./starterBricks/panel/panelExtension.ts",
     "./starterBricks/panel/types.ts",
     "./starterBricks/quickBar/quickBarExtension.test.ts",