diff --git a/src/components/quickBar/quickBarRegistry.ts b/src/components/quickBar/quickBarRegistry.ts
index 80e22a67b5..6518d2e87d 100644
--- a/src/components/quickBar/quickBarRegistry.ts
+++ b/src/components/quickBar/quickBarRegistry.ts
@@ -119,17 +119,17 @@ class QuickBarRegistry implements QuickBarProtocol {
   /**
    * Remove all actions added by a given extension point.
    */
-  removeExtensionPointActions(extensionPointId: RegistryId): void {
-    remove(this.actions, (x) => x.extensionPointId === extensionPointId);
+  removeStarterBrickActions(starterBrickId: RegistryId): void {
+    remove(this.actions, (x) => x.extensionPointId === starterBrickId);
     this.notifyListeners();
   }
 
   /**
-   * Remove all actions added by a given extension.
-   * @param extensionId the ModComponentBase UUID
+   * Remove all actions added by a given mod component.
+   * @param modComponentId the ModComponentBase UUID
    */
-  removeExtensionActions(extensionId: UUID): void {
-    remove(this.actions, (x) => x.extensionId === extensionId);
+  removeModComponentActions(modComponentId: UUID): void {
+    remove(this.actions, (x) => x.extensionId === modComponentId);
     this.notifyListeners();
   }
 
diff --git a/src/pageEditor/slices/editorSlice.ts b/src/pageEditor/slices/editorSlice.ts
index dfa62d1343..c8d3072a77 100644
--- a/src/pageEditor/slices/editorSlice.ts
+++ b/src/pageEditor/slices/editorSlice.ts
@@ -67,7 +67,7 @@ import {
   checkAvailable,
 } from "@/contentScript/messenger/api";
 import { resolveExtensionInnerDefinitions } from "@/registry/internal";
-import { QuickBarStarterBrickABC } from "@/starterBricks/quickBar/quickBarExtension";
+import { QuickBarStarterBrickABC } from "@/starterBricks/quickBar/quickBarStarterBrick";
 import { testMatchPatterns } from "@/bricks/available";
 import { BusinessError } from "@/errors/businessErrors";
 import { serializeError } from "serialize-error";
@@ -187,7 +187,7 @@ const checkAvailableInstalledExtensions = createAsyncThunk<
 
       // QuickBar is installed on every page, need to filter by the documentUrlPatterns
       if (
-        QuickBarStarterBrickABC.isQuickBarExtensionPoint(activatedStarterBrick)
+        QuickBarStarterBrickABC.isQuickBarStarterBrick(activatedStarterBrick)
       ) {
         return testMatchPatterns(
           activatedStarterBrick.documentUrlPatterns,
diff --git a/src/pageEditor/starterBricks/formStateTypes.ts b/src/pageEditor/starterBricks/formStateTypes.ts
index 9e1f0bcb84..d3d04a0204 100644
--- a/src/pageEditor/starterBricks/formStateTypes.ts
+++ b/src/pageEditor/starterBricks/formStateTypes.ts
@@ -30,7 +30,7 @@ import {
   type QuickBarConfig,
   type QuickBarDefaultOptions,
   type QuickBarTargetMode,
-} from "@/starterBricks/quickBar/types";
+} from "@/starterBricks/quickBar/quickBarTypes";
 import {
   type SidebarConfig,
   type Trigger as SidebarTrigger,
@@ -51,7 +51,7 @@ import { type Menus } from "webextension-polyfill";
 import {
   type QuickBarProviderConfig,
   type QuickBarProviderDefaultOptions,
-} from "@/starterBricks/quickBarProvider/types";
+} from "@/starterBricks/quickBarProvider/quickBarProviderTypes";
 import { type TourDefinition } from "@/starterBricks/tour/types";
 import {
   type BaseExtensionPointState,
diff --git a/src/pageEditor/starterBricks/quickBar.ts b/src/pageEditor/starterBricks/quickBar.ts
index 427f916807..61e439e4a6 100644
--- a/src/pageEditor/starterBricks/quickBar.ts
+++ b/src/pageEditor/starterBricks/quickBar.ts
@@ -34,7 +34,7 @@ import { omitEditorMetadata } from "./pipelineMapping";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
 import { faThLarge } from "@fortawesome/free-solid-svg-icons";
 import { type ModComponentFormStateAdapter } from "@/pageEditor/starterBricks/modComponentFormStateAdapter";
-import { QuickBarStarterBrickABC } from "@/starterBricks/quickBar/quickBarExtension";
+import { QuickBarStarterBrickABC } from "@/starterBricks/quickBar/quickBarStarterBrick";
 import QuickBarConfiguration from "@/pageEditor/tabs/quickBar/QuickBarConfiguration";
 import type { DraftModComponent } from "@/contentScript/pageEditor/types";
 import { type QuickBarFormState } from "./formStateTypes";
@@ -42,7 +42,7 @@ import { type SingleLayerReaderConfig } from "@/pageEditor/baseFormStateTypes";
 import {
   type QuickBarDefinition,
   type QuickBarConfig,
-} from "@/starterBricks/quickBar/types";
+} from "@/starterBricks/quickBar/quickBarTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 function fromNativeElement(url: string, metadata: Metadata): QuickBarFormState {
diff --git a/src/pageEditor/starterBricks/quickBarProvider.ts b/src/pageEditor/starterBricks/quickBarProvider.ts
index 0ca8b86eeb..2479927645 100644
--- a/src/pageEditor/starterBricks/quickBarProvider.ts
+++ b/src/pageEditor/starterBricks/quickBarProvider.ts
@@ -36,13 +36,13 @@ import { faPlusSquare } from "@fortawesome/free-solid-svg-icons";
 import { type ModComponentFormStateAdapter } from "@/pageEditor/starterBricks/modComponentFormStateAdapter";
 import type { DraftModComponent } from "@/contentScript/pageEditor/types";
 import { type QuickBarProviderFormState } from "./formStateTypes";
-import { QuickBarProviderStarterBrickABC } from "@/starterBricks/quickBarProvider/quickBarProviderExtension";
+import { QuickBarProviderStarterBrickABC } from "@/starterBricks/quickBarProvider/quickBarProviderStarterBrick";
 import QuickBarProviderConfiguration from "@/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration";
 import { type SingleLayerReaderConfig } from "@/pageEditor/baseFormStateTypes";
 import {
   type QuickBarProviderDefinition,
   type QuickBarProviderConfig,
-} from "@/starterBricks/quickBarProvider/types";
+} from "@/starterBricks/quickBarProvider/quickBarProviderTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 function fromNativeElement(
diff --git a/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx b/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx
index ff3c7a8ee6..c2d09458c0 100644
--- a/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx
+++ b/src/pageEditor/tabs/quickBarProvider/QuickBarProviderConfiguration.tsx
@@ -23,7 +23,7 @@ import IconWidget from "@/components/fields/IconWidget";
 import ExtraPermissionsSection from "@/pageEditor/tabs/ExtraPermissionsSection";
 import { useField, useFormikContext } from "formik";
 import FieldTemplate from "@/components/form/FieldTemplate";
-import { type QuickBarProviderConfig } from "@/starterBricks/quickBarProvider/types";
+import { type QuickBarProviderConfig } from "@/starterBricks/quickBarProvider/quickBarProviderTypes";
 import { type QuickBarProviderFormState } from "@/pageEditor/starterBricks/formStateTypes";
 import SwitchButtonWidget, {
   type CheckBoxLike,
diff --git a/src/starterBricks/factory.ts b/src/starterBricks/factory.ts
index c1176d6648..066515a562 100644
--- a/src/starterBricks/factory.ts
+++ b/src/starterBricks/factory.ts
@@ -20,8 +20,8 @@ import { fromJS as deserializeMenuItem } from "@/starterBricks/menuItem/menuItem
 import { fromJS as deserializeTrigger } from "@/starterBricks/trigger/triggerStarterBrick";
 import { fromJS as deserializeContextMenu } from "@/starterBricks/contextMenu/contextMenu";
 import { fromJS as deserializeSidebar } from "@/starterBricks/sidebar/sidebarExtension";
-import { fromJS as deserializeQuickBar } from "@/starterBricks/quickBar/quickBarExtension";
-import { fromJS as deserializeQuickBarProvider } from "@/starterBricks/quickBarProvider/quickBarProviderExtension";
+import { fromJS as deserializeQuickBar } from "@/starterBricks/quickBar/quickBarStarterBrick";
+import { fromJS as deserializeQuickBarProvider } from "@/starterBricks/quickBarProvider/quickBarProviderStarterBrick";
 import { fromJS as deserializeTour } from "@/starterBricks/tour/tourExtension";
 import { type StarterBrick } from "@/types/starterBrickTypes";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
diff --git a/src/starterBricks/quickBar/quickBarExtension.test.ts b/src/starterBricks/quickBar/quickBarStarterBrick.test.ts
similarity index 94%
rename from src/starterBricks/quickBar/quickBarExtension.test.ts
rename to src/starterBricks/quickBar/quickBarStarterBrick.test.ts
index a12b628545..6c23d91595 100644
--- a/src/starterBricks/quickBar/quickBarExtension.test.ts
+++ b/src/starterBricks/quickBar/quickBarStarterBrick.test.ts
@@ -26,7 +26,7 @@ import {
   tick,
 } from "@/starterBricks/starterBrickTestUtils";
 import blockRegistry from "@/bricks/registry";
-import { fromJS } from "@/starterBricks/quickBar/quickBarExtension";
+import { fromJS } from "@/starterBricks/quickBar/quickBarStarterBrick";
 import { type Menus } from "webextension-polyfill";
 import userEvent from "@testing-library/user-event";
 import quickBarRegistry from "@/components/quickBar/quickBarRegistry";
@@ -46,7 +46,7 @@ import { getPlatform } from "@/platform/platformContext";
 import {
   type QuickBarDefinition,
   type QuickBarConfig,
-} from "@/starterBricks/quickBar/types";
+} from "@/starterBricks/quickBar/quickBarTypes";
 
 const rootReaderId = validateRegistryId("test/root-reader");
 
@@ -77,14 +77,14 @@ const starterBrickFactory = (definitionOverrides: UnknownObject = {}) =>
     }),
   });
 
-const extensionFactory = define<ResolvedModComponent<QuickBarConfig>>({
+const modComponentFactory = define<ResolvedModComponent<QuickBarConfig>>({
   apiVersion: "v3",
   _resolvedModComponentBrand: undefined as never,
   id: uuidSequence,
   extensionPointId: (n: number) =>
     validateRegistryId(`test/starter-brick-${n}`),
   _recipe: undefined,
-  label: "Test Extension",
+  label: "Test Mod Component",
   config: define<QuickBarConfig>({
     title: "Test Action",
     action: () => [] as BrickPipeline,
@@ -105,7 +105,7 @@ beforeEach(() => {
 const NUM_DEFAULT_QUICKBAR_ACTIONS = [...defaultActions, pageEditorAction]
   .length;
 
-describe("quickBarExtension", () => {
+describe("quickBarStarterBrick", () => {
   it("quick bar smoke test", async () => {
     const user = userEvent.setup();
 
@@ -117,7 +117,7 @@ describe("quickBarExtension", () => {
     const starterBrick = fromJS(getPlatform(), starterBrickFactory()());
 
     starterBrick.registerModComponent(
-      extensionFactory({
+      modComponentFactory({
         extensionPointId: starterBrick.id,
       }),
     );
diff --git a/src/starterBricks/quickBar/quickBarExtension.tsx b/src/starterBricks/quickBar/quickBarStarterBrick.tsx
similarity index 82%
rename from src/starterBricks/quickBar/quickBarExtension.tsx
rename to src/starterBricks/quickBar/quickBarStarterBrick.tsx
index 105c921514..59e21b0aa8 100644
--- a/src/starterBricks/quickBar/quickBarExtension.tsx
+++ b/src/starterBricks/quickBar/quickBarStarterBrick.tsx
@@ -62,16 +62,16 @@ import {
   type QuickBarDefinition,
   type QuickBarConfig,
   type QuickBarTargetMode,
-} from "@/starterBricks/quickBar/types";
+} from "@/starterBricks/quickBar/quickBarTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarConfig> {
-  static isQuickBarExtensionPoint(
-    extensionPoint: StarterBrick,
-  ): extensionPoint is QuickBarStarterBrickABC {
+  static isQuickBarStarterBrick(
+    starterBrick: StarterBrick,
+  ): starterBrick is QuickBarStarterBrickABC {
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any
-    -- Need to a access a type specific property (QuickBarExtensionPoint._definition) on a base-typed entity (StarterBrick) */
-    return (extensionPoint as any)?._definition?.type === "quickBar";
+    -- Need to access a type specific property (QuickBarStarterBrick._definition) on a base-typed entity (StarterBrick) */
+    return (starterBrick as any)?._definition?.type === "quickBar";
   }
 
   abstract get targetMode(): QuickBarTargetMode;
@@ -106,9 +106,9 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
   );
 
   async getBricks(
-    extension: ResolvedModComponent<QuickBarConfig>,
+    modComponent: ResolvedModComponent<QuickBarConfig>,
   ): Promise<Brick[]> {
-    return collectAllBricks(extension.config.action);
+    return collectAllBricks(modComponent.config.action);
   }
 
   public get kind(): "quickBar" {
@@ -116,12 +116,12 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
   }
 
   override uninstall(): void {
-    quickBarRegistry.removeExtensionPointActions(this.id);
+    quickBarRegistry.removeStarterBrickActions(this.id);
   }
 
-  clearModComponentInterfaceAndEvents(extensionIds: UUID[]): void {
-    for (const extensionId of extensionIds) {
-      quickBarRegistry.removeAction(extensionId);
+  clearModComponentInterfaceAndEvents(modComponentIds: UUID[]): void {
+    for (const modComponentId of modComponentIds) {
+      quickBarRegistry.removeAction(modComponentId);
     }
   }
 
@@ -132,7 +132,7 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
     );
 
     await initQuickBarApp();
-    // Like for context menus, the match patterns for quick bar control which pages the extension point requires early
+    // Like for context menus, the match patterns for quick bar control which pages the starter brick requires early
     // access to (so PixieBrix will ask for permissions). Whether a quick bar item actually appears is controlled by the
     // documentUrlPatterns.
     return true;
@@ -162,15 +162,15 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
   private async syncActionsForUrl(): Promise<void> {
     // Remove any actions that were available on the previous navigation, but are no longer available
     if (!testMatchPatterns(this.documentUrlPatterns, null)) {
-      quickBarRegistry.removeExtensionPointActions(this.id);
+      quickBarRegistry.removeStarterBrickActions(this.id);
       return;
     }
 
-    const promises = this.modComponents.map(async (extension) => {
+    const promises = this.modComponents.map(async (modComponent) => {
       try {
-        await this.registerExtensionAction(extension);
+        await this.registerModComponentAction(modComponent);
       } catch (error) {
-        reportError(error, { context: selectEventData(extension) });
+        reportError(error, { context: selectEventData(modComponent) });
         throw error;
       }
     });
@@ -189,16 +189,16 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
   }
 
   /**
-   * Add a QuickBar action for extension
+   * Add a QuickBar action for a mod component.
    */
-  private async registerExtensionAction(
-    extension: ResolvedModComponent<QuickBarConfig>,
+  private async registerModComponentAction(
+    modComponent: ResolvedModComponent<QuickBarConfig>,
   ): Promise<void> {
     const {
       title: name,
       action: actionConfig,
       icon: iconConfig,
-    } = extension.config;
+    } = modComponent.config;
 
     const icon = iconConfig ? (
       <Icon icon={iconConfig.id} library={iconConfig.library} />
@@ -206,22 +206,22 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
       <Icon />
     ); // Defaults to a box
 
-    const extensionLogger = this.logger.childLogger(
-      selectModComponentContext(extension),
+    const modComponentLogger = this.logger.childLogger(
+      selectModComponentContext(modComponent),
     );
 
     quickBarRegistry.addAction({
-      id: extension.id,
+      id: modComponent.id,
       extensionPointId: this.id,
       name,
       icon,
       perform: async () => {
-        reportEvent(Events.HANDLE_QUICK_BAR, selectEventData(extension));
+        reportEvent(Events.HANDLE_QUICK_BAR, selectEventData(modComponent));
 
         try {
           const reader = await this.getBaseReader();
           const serviceContext = await makeIntegrationsContextFromDependencies(
-            extension.integrationDependencies,
+            modComponent.integrationDependencies,
           );
 
           const targetElement = guessSelectedElement() ?? document;
@@ -236,12 +236,12 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
             input,
             root: this.decideRoot(targetElement),
             serviceContext,
-            optionsArgs: extension.optionsArgs,
+            optionsArgs: modComponent.optionsArgs,
           };
 
           await reduceExtensionPipeline(actionConfig, initialValues, {
-            logger: extensionLogger,
-            ...apiVersionOptions(extension.apiVersion),
+            logger: modComponentLogger,
+            ...apiVersionOptions(modComponent.apiVersion),
           });
         } catch (error) {
           if (hasSpecificErrorCause(error, CancelError)) {
@@ -249,7 +249,7 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
               DEFAULT_ACTION_RESULTS.cancel,
             );
           } else {
-            extensionLogger.error(error);
+            modComponentLogger.error(error);
             this.platform.toasts.showNotification({
               ...DEFAULT_ACTION_RESULTS.error,
               error, // Include more details in the notification
@@ -262,10 +262,10 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
 
     console.debug(
       "Register quick bar action handler for: %s (%s)",
-      extension.id,
-      extension.label ?? "No Label",
+      modComponent.id,
+      modComponent.label ?? "No Label",
       {
-        extension,
+        modComponent,
       },
     );
   }
@@ -273,10 +273,10 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
   async runModComponents(): Promise<void> {
     if (this.modComponents.length === 0) {
       console.debug(
-        `quickBar extension point ${this.id} has no installed extensions`,
+        `quickBar starter brick ${this.id} has no installed mod components`,
       );
-      // Not sure if this is needed or not, but remove any straggler extension actions
-      quickBarRegistry.removeExtensionPointActions(this.id);
+      // Not sure if this is needed or not, but remove any straggler mod component actions
+      quickBarRegistry.removeStarterBrickActions(this.id);
       return;
     }
 
@@ -284,7 +284,7 @@ export abstract class QuickBarStarterBrickABC extends StarterBrickABC<QuickBarCo
   }
 }
 
-export class RemoteQuickBarExtensionPoint extends QuickBarStarterBrickABC {
+export class RemoteQuickBarStarterBrick extends QuickBarStarterBrickABC {
   private readonly _definition: QuickBarDefinition;
 
   public readonly permissions: Permissions.Permissions;
@@ -365,5 +365,5 @@ export function fromJS(
     throw new Error(`Expected type=quickBar, got ${type}`);
   }
 
-  return new RemoteQuickBarExtensionPoint(platform, config);
+  return new RemoteQuickBarStarterBrick(platform, config);
 }
diff --git a/src/starterBricks/quickBar/types.ts b/src/starterBricks/quickBar/quickBarTypes.ts
similarity index 100%
rename from src/starterBricks/quickBar/types.ts
rename to src/starterBricks/quickBar/quickBarTypes.ts
diff --git a/src/starterBricks/quickBarProvider/quickbarProviderExtension.test.ts b/src/starterBricks/quickBarProvider/quickBarProviderStarterBrick.test.ts
similarity index 98%
rename from src/starterBricks/quickBarProvider/quickbarProviderExtension.test.ts
rename to src/starterBricks/quickBarProvider/quickBarProviderStarterBrick.test.ts
index 329c7d9c07..946ca10b0b 100644
--- a/src/starterBricks/quickBarProvider/quickbarProviderExtension.test.ts
+++ b/src/starterBricks/quickBarProvider/quickBarProviderStarterBrick.test.ts
@@ -18,7 +18,7 @@
 import { validateRegistryId } from "@/types/helpers";
 import { mockAnimationsApi } from "jsdom-testing-mocks";
 import { define } from "cooky-cutter";
-import { fromJS } from "@/starterBricks/quickBarProvider/quickBarProviderExtension";
+import { fromJS } from "@/starterBricks/quickBarProvider/quickBarProviderStarterBrick";
 import { type BrickPipeline } from "@/bricks/types";
 import {
   getDocument,
@@ -46,7 +46,7 @@ import { getPlatform } from "@/platform/platformContext";
 import {
   type QuickBarProviderDefinition,
   type QuickBarProviderConfig,
-} from "@/starterBricks/quickBarProvider/types";
+} from "@/starterBricks/quickBarProvider/quickBarProviderTypes";
 
 const rootReaderId = validateRegistryId("test/root-reader");
 
diff --git a/src/starterBricks/quickBarProvider/quickBarProviderExtension.tsx b/src/starterBricks/quickBarProvider/quickBarProviderStarterBrick.tsx
similarity index 82%
rename from src/starterBricks/quickBarProvider/quickBarProviderExtension.tsx
rename to src/starterBricks/quickBarProvider/quickBarProviderStarterBrick.tsx
index 09b00ff885..5d6a35262d 100644
--- a/src/starterBricks/quickBarProvider/quickBarProviderExtension.tsx
+++ b/src/starterBricks/quickBarProvider/quickBarProviderStarterBrick.tsx
@@ -40,9 +40,9 @@ import { isSpecificError } from "@/errors/errorHelpers";
 import { type ActionGenerator } from "@/components/quickBar/quickbarTypes";
 import ArrayCompositeReader from "@/bricks/readers/ArrayCompositeReader";
 import {
-  QuickbarQueryReader,
+  QuickBarQueryReader,
   quickbarQueryReaderShim,
-} from "@/starterBricks/quickBarProvider/quickbarQueryReader";
+} from "@/starterBricks/quickBarProvider/quickBarQueryReader";
 import { type Reader } from "@/types/bricks/readerTypes";
 import { type StarterBrick } from "@/types/starterBrickTypes";
 import { type UUID } from "@/types/stringTypes";
@@ -61,16 +61,16 @@ import {
   type QuickBarProviderDefaultOptions,
   type QuickBarProviderConfig,
   type QuickBarProviderDefinition,
-} from "@/starterBricks/quickBarProvider/types";
+} from "@/starterBricks/quickBarProvider/quickBarProviderTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<QuickBarProviderConfig> {
-  static isQuickBarProviderExtensionPoint(
-    extensionPoint: StarterBrick,
-  ): extensionPoint is QuickBarProviderStarterBrickABC {
+  static isQuickBarProviderStarterBrick(
+    starterBrick: StarterBrick,
+  ): starterBrick is QuickBarProviderStarterBrickABC {
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any
     -- Need to access a type specific property (QuickBarProviderStarterBrickABC._definition) on a base-typed entity (StarterBrick) */
-    return (extensionPoint as any)?._definition?.type === "quickBarProvider";
+    return (starterBrick as any)?._definition?.type === "quickBarProvider";
   }
 
   abstract getBaseReader(): Promise<Reader>;
@@ -108,9 +108,9 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
   );
 
   async getBricks(
-    extension: ResolvedModComponent<QuickBarProviderConfig>,
+    modComponent: ResolvedModComponent<QuickBarProviderConfig>,
   ): Promise<Brick[]> {
-    return collectAllBricks(extension.config.generator);
+    return collectAllBricks(modComponent.config.generator);
   }
 
   public get kind(): "quickBarProvider" {
@@ -122,21 +122,21 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
     this.clearModComponentInterfaceAndEvents(
       this.modComponents.map((x) => x.id),
     );
-    quickBarRegistry.removeExtensionPointActions(this.id);
+    quickBarRegistry.removeStarterBrickActions(this.id);
     this.modComponents.length = 0;
   }
 
   /**
-   * Unregister quick bar action providers for the given extension IDs.
-   * @param extensionIds the extensions IDs to unregister
+   * Unregister quick bar action providers for the given mod component IDs.
+   * @param modComponentIds the mod component IDs to unregister
    */
-  clearModComponentInterfaceAndEvents(extensionIds: UUID[]): void {
-    for (const extensionId of extensionIds) {
-      const generator = this.generators.get(extensionId);
-      assertNotNullish(generator, `Generator not found for ${extensionId}`);
+  clearModComponentInterfaceAndEvents(modComponentIds: UUID[]): void {
+    for (const modComponentId of modComponentIds) {
+      const generator = this.generators.get(modComponentId);
+      assertNotNullish(generator, `Generator not found for ${modComponentId}`);
 
       quickBarRegistry.removeGenerator(generator);
-      this.generators.delete(extensionId);
+      this.generators.delete(modComponentId);
     }
   }
 
@@ -148,7 +148,7 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
 
     await initQuickBarApp();
 
-    // Like for context menus, the match patterns for quick bar control which pages the extension point requires early
+    // Like for context menus, the match patterns for quick bar control which pages the starter brick requires early
     // access to (so PixieBrix will ask for permissions). Whether a quick bar item actually appears is controlled by the
     // documentUrlPatterns.
     return true;
@@ -160,8 +160,8 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
         `quickBar starter brick ${this.id} has no installed components`,
       );
 
-      // Not sure if this is needed or not, but remove any straggler extension actions
-      quickBarRegistry.removeExtensionPointActions(this.id);
+      // Not sure if this is needed or not, but remove any straggler mod component actions
+      quickBarRegistry.removeStarterBrickActions(this.id);
       return;
     }
 
@@ -171,7 +171,7 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
   override async defaultReader(): Promise<Reader> {
     return new ArrayCompositeReader([
       // Include QuickbarQueryReader for the outputSchema. The value gets filled in by the run method
-      new QuickbarQueryReader(),
+      new QuickBarQueryReader(),
       await this.getBaseReader(),
     ]);
   }
@@ -187,18 +187,18 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
     // Remove any actions that were available on the previous navigation, but are no longer available
     if (!testMatchPatterns(this.documentUrlPatterns, null)) {
       // Remove actions and un-attach generators
-      quickBarRegistry.removeExtensionPointActions(this.id);
+      quickBarRegistry.removeStarterBrickActions(this.id);
       this.clearModComponentInterfaceAndEvents(
         this.modComponents.map((x) => x.id),
       );
       return;
     }
 
-    const promises = this.modComponents.map(async (extension) => {
+    const promises = this.modComponents.map(async (modComponent) => {
       try {
-        await this.registerActionProvider(extension);
+        await this.registerActionProvider(modComponent);
       } catch (error) {
-        reportError(error, { context: selectEventData(extension) });
+        reportError(error, { context: selectEventData(modComponent) });
         throw error;
       }
     });
@@ -217,15 +217,15 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
   }
 
   /**
-   * Add a QuickBar action for extension
+   * Add a QuickBar action for mod component
    */
   private async registerActionProvider(
-    extension: ResolvedModComponent<QuickBarProviderConfig>,
+    modComponent: ResolvedModComponent<QuickBarProviderConfig>,
   ): Promise<void> {
-    const { generator, rootAction } = extension.config;
+    const { generator, rootAction } = modComponent.config;
 
-    const extensionLogger = this.logger.childLogger(
-      selectModComponentContext(extension),
+    const modComponentLogger = this.logger.childLogger(
+      selectModComponentContext(modComponent),
     );
 
     let rootActionId: string | null = null;
@@ -238,7 +238,7 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
         <Icon />
       ); // Defaults to a box
 
-      rootActionId = `provider-${extension.id}`;
+      rootActionId = `provider-${modComponent.id}`;
 
       quickBarRegistry.addAction({
         id: rootActionId,
@@ -254,7 +254,7 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
       abortSignal,
     }) => {
       // Remove the old results during re-generation because they're no longer relevant
-      quickBarRegistry.removeExtensionActions(extension.id);
+      quickBarRegistry.removeModComponentActions(modComponent.id);
 
       if (
         rootActionId &&
@@ -268,7 +268,7 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
       const [reader, serviceContext] = await Promise.all([
         this.getBaseReader(),
         makeIntegrationsContextFromDependencies(
-          extension.integrationDependencies,
+          modComponent.integrationDependencies,
         ),
       ]);
 
@@ -284,13 +284,13 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
         input,
         root: targetElement,
         serviceContext,
-        optionsArgs: extension.optionsArgs,
+        optionsArgs: modComponent.optionsArgs,
       };
 
       try {
         await reduceExtensionPipeline(generator, initialValues, {
-          logger: extensionLogger,
-          ...apiVersionOptions(extension.apiVersion),
+          logger: modComponentLogger,
+          ...apiVersionOptions(modComponent.apiVersion),
           abortSignal,
         });
       } catch (error) {
@@ -303,18 +303,18 @@ export abstract class QuickBarProviderStarterBrickABC extends StarterBrickABC<Qu
     };
 
     // Remove previous generator (if any)
-    const prevGenerator = this.generators.get(extension.id);
+    const prevGenerator = this.generators.get(modComponent.id);
     if (prevGenerator) {
       quickBarRegistry.removeGenerator(prevGenerator);
     }
 
     // Register new generator
-    this.generators.set(extension.id, actionGenerator);
+    this.generators.set(modComponent.id, actionGenerator);
     quickBarRegistry.addGenerator(actionGenerator, rootActionId);
   }
 }
 
-class RemoteQuickBarProviderExtensionPoint extends QuickBarProviderStarterBrickABC {
+class RemoteQuickBarProviderStarterBrick extends QuickBarProviderStarterBrickABC {
   private readonly _definition: QuickBarProviderDefinition;
 
   public readonly permissions: Permissions.Permissions;
@@ -382,5 +382,5 @@ export function fromJS(
     throw new Error(`Expected type=quickBarProvider, got ${type}`);
   }
 
-  return new RemoteQuickBarProviderExtensionPoint(platform, config);
+  return new RemoteQuickBarProviderStarterBrick(platform, config);
 }
diff --git a/src/starterBricks/quickBarProvider/types.ts b/src/starterBricks/quickBarProvider/quickBarProviderTypes.ts
similarity index 100%
rename from src/starterBricks/quickBarProvider/types.ts
rename to src/starterBricks/quickBarProvider/quickBarProviderTypes.ts
diff --git a/src/starterBricks/quickBarProvider/quickbarQueryReader.ts b/src/starterBricks/quickBarProvider/quickBarQueryReader.ts
similarity index 91%
rename from src/starterBricks/quickBarProvider/quickbarQueryReader.ts
rename to src/starterBricks/quickBarProvider/quickBarQueryReader.ts
index 2cb2df1a6f..4c575d52b1 100644
--- a/src/starterBricks/quickBarProvider/quickbarQueryReader.ts
+++ b/src/starterBricks/quickBarProvider/quickBarQueryReader.ts
@@ -24,7 +24,7 @@ import { type Schema } from "@/types/schemaTypes";
  *
  * The data for the output scheme is filled by the dynamic Quick Bar.
  */
-export class QuickbarQueryReader extends ReaderABC {
+export class QuickBarQueryReader extends ReaderABC {
   constructor() {
     super(
       "@pixiebrix/quickbar/query",
@@ -40,7 +40,7 @@ export class QuickbarQueryReader extends ReaderABC {
   async read(): Promise<JsonObject> {
     // The actual field is set by the extension point, not the reader, because it's made available
     // by the browser API in the menu handler
-    throw new Error("QuickbarQueryReader.read() should not be called directly");
+    throw new Error("QuickBarQueryReader.read() should not be called directly");
   }
 
   override outputSchema: Schema = {
@@ -57,7 +57,7 @@ export class QuickbarQueryReader extends ReaderABC {
 export const quickbarQueryReaderShim = {
   isAvailable: async () => true,
 
-  outputSchema: new QuickbarQueryReader().outputSchema,
+  outputSchema: new QuickBarQueryReader().outputSchema,
 
   async read() {
     return {
diff --git a/src/starterBricks/starterBrickModUtils.ts b/src/starterBricks/starterBrickModUtils.ts
index 990150bf57..a771f82629 100644
--- a/src/starterBricks/starterBrickModUtils.ts
+++ b/src/starterBricks/starterBrickModUtils.ts
@@ -25,8 +25,8 @@ import starterBrickRegistry from "@/starterBricks/registry";
 import { type RegistryId } from "@/types/registryTypes";
 import { compact, uniq } from "lodash";
 import { resolveRecipeInnerDefinitions } from "@/registry/internal";
-import { QuickBarStarterBrickABC } from "@/starterBricks/quickBar/quickBarExtension";
-import { QuickBarProviderStarterBrickABC } from "@/starterBricks/quickBarProvider/quickBarProviderExtension";
+import { QuickBarStarterBrickABC } from "@/starterBricks/quickBar/quickBarStarterBrick";
+import { QuickBarProviderStarterBrickABC } from "@/starterBricks/quickBarProvider/quickBarProviderStarterBrick";
 import { type ActivatedModComponent } from "@/types/modComponentTypes";
 import { type UUID } from "@/types/stringTypes";
 
@@ -92,8 +92,8 @@ export async function includesQuickBarStarterBrick(
     // eslint-disable-next-line no-await-in-loop -- can break when we find one
     const starterBrick = await starterBrickRegistry.lookup(id);
     if (
-      QuickBarStarterBrickABC.isQuickBarExtensionPoint(starterBrick) ||
-      QuickBarProviderStarterBrickABC.isQuickBarProviderExtensionPoint(
+      QuickBarStarterBrickABC.isQuickBarStarterBrick(starterBrick) ||
+      QuickBarProviderStarterBrickABC.isQuickBarProviderStarterBrick(
         starterBrick,
       )
     ) {
diff --git a/src/store/checkAvailableInstalledExtensions.test.ts b/src/store/checkAvailableInstalledExtensions.test.ts
index 6e3364a24e..01e33c58a4 100644
--- a/src/store/checkAvailableInstalledExtensions.test.ts
+++ b/src/store/checkAvailableInstalledExtensions.test.ts
@@ -26,14 +26,14 @@ import { validateRegistryId } from "@/types/helpers";
 import { RemoteMenuItemStarterBrick } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
 import { type Metadata } from "@/types/registryTypes";
-import { RemoteQuickBarExtensionPoint } from "@/starterBricks/quickBar/quickBarExtension";
+import { RemoteQuickBarStarterBrick } from "@/starterBricks/quickBar/quickBarStarterBrick";
 import { starterBrickDefinitionFactory } from "@/testUtils/factories/modDefinitionFactories";
 import { standaloneModDefinitionFactory } from "@/testUtils/factories/modComponentFactories";
 import { metadataFactory } from "@/testUtils/factories/metadataFactory";
 import { getCurrentInspectedURL } from "@/pageEditor/context/connection";
 import { getPlatform } from "@/platform/platformContext";
 import { type MenuItemDefinition } from "@/starterBricks/menuItem/menuItemTypes";
-import { type QuickBarDefinition } from "@/starterBricks/quickBar/types";
+import { type QuickBarDefinition } from "@/starterBricks/quickBar/quickBarTypes";
 
 jest.mock("@/contentScript/messenger/api");
 
@@ -108,7 +108,7 @@ describe("checkAvailableInstalledExtensions", () => {
           };
         },
       }) as StarterBrickDefinitionLike<QuickBarDefinition>;
-    const availableQuickbarExtensionPoint = new RemoteQuickBarExtensionPoint(
+    const availableQuickbarExtensionPoint = new RemoteQuickBarStarterBrick(
       getPlatform(),
       availableQuickbarStarterBrickDefinition,
     );
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index 11793c41c1..0f0c4bef7a 100644
--- a/src/tsconfig.strictNullChecks.json
+++ b/src/tsconfig.strictNullChecks.json
@@ -1350,13 +1350,13 @@
     "./starterBricks/menuItem/menuItemTypes.ts",
     "./starterBricks/panel/panelExtension.ts",
     "./starterBricks/panel/types.ts",
-    "./starterBricks/quickBar/quickBarExtension.test.ts",
-    "./starterBricks/quickBar/quickBarExtension.tsx",
-    "./starterBricks/quickBar/types.ts",
-    "./starterBricks/quickBarProvider/quickBarProviderExtension.tsx",
-    "./starterBricks/quickBarProvider/quickbarProviderExtension.test.ts",
-    "./starterBricks/quickBarProvider/quickbarQueryReader.ts",
-    "./starterBricks/quickBarProvider/types.ts",
+    "./starterBricks/quickBar/quickBarStarterBrick.test.ts",
+    "./starterBricks/quickBar/quickBarStarterBrick.tsx",
+    "./starterBricks/quickBar/quickBarTypes.ts",
+    "./starterBricks/quickBarProvider/quickBarProviderStarterBrick.tsx",
+    "./starterBricks/quickBarProvider/quickBarProviderStarterBrick.test.ts",
+    "./starterBricks/quickBarProvider/quickBarQueryReader.ts",
+    "./starterBricks/quickBarProvider/quickBarProviderTypes.ts",
     "./starterBricks/registry.ts",
     "./starterBricks/sidebar/sidebarExtension.test.ts",
     "./starterBricks/sidebar/sidebarExtension.ts",