diff --git a/extensions/ql-vscode/src/common/interface-types.ts b/extensions/ql-vscode/src/common/interface-types.ts
index 6c6271b8b..ad680886e 100644
--- a/extensions/ql-vscode/src/common/interface-types.ts
+++ b/extensions/ql-vscode/src/common/interface-types.ts
@@ -19,7 +19,7 @@ import { ErrorLike } from "../common/errors";
 import { DataFlowPaths } from "../variant-analysis/shared/data-flow-paths";
 import { ExternalApiUsage, Usage } from "../model-editor/external-api-usage";
 import { ModeledMethod } from "../model-editor/modeled-method";
-import { DataExtensionEditorViewState } from "../model-editor/shared/view-state";
+import { ModelEditorViewState } from "../model-editor/shared/view-state";
 import { Mode } from "../model-editor/shared/mode";
 
 /**
@@ -491,8 +491,8 @@ export type ToDataFlowPathsMessage = SetDataFlowPathsMessage;
 export type FromDataFlowPathsMessage = CommonFromViewMessages;
 
 interface SetExtensionPackStateMessage {
-  t: "setDataExtensionEditorViewState";
-  viewState: DataExtensionEditorViewState;
+  t: "setModelEditorViewState";
+  viewState: ModelEditorViewState;
 }
 
 interface SetExternalApiUsagesMessage {
diff --git a/extensions/ql-vscode/src/model-editor/model-editor-view.ts b/extensions/ql-vscode/src/model-editor/model-editor-view.ts
index 0d99f514e..81c2488ea 100644
--- a/extensions/ql-vscode/src/model-editor/model-editor-view.ts
+++ b/extensions/ql-vscode/src/model-editor/model-editor-view.ts
@@ -264,7 +264,7 @@ export class DataExtensionsEditorView extends AbstractWebview<
       this.databaseItem.language === "java" && showLlmGeneration();
 
     await this.postMessage({
-      t: "setDataExtensionEditorViewState",
+      t: "setModelEditorViewState",
       viewState: {
         extensionPack: this.extensionPack,
         showLlmButton,
diff --git a/extensions/ql-vscode/src/model-editor/shared/view-state.ts b/extensions/ql-vscode/src/model-editor/shared/view-state.ts
index 195d0842e..b3fd018af 100644
--- a/extensions/ql-vscode/src/model-editor/shared/view-state.ts
+++ b/extensions/ql-vscode/src/model-editor/shared/view-state.ts
@@ -1,7 +1,7 @@
 import { ExtensionPack } from "./extension-pack";
 import { Mode } from "./mode";
 
-export interface DataExtensionEditorViewState {
+export interface ModelEditorViewState {
   extensionPack: ExtensionPack;
   showLlmButton: boolean;
   mode: Mode;
diff --git a/extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx b/extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx
index 6897f028f..668f0deb4 100644
--- a/extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx
+++ b/extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx
@@ -13,7 +13,7 @@ import {
   VSCodeDivider,
   VSCodeTag,
 } from "@vscode/webview-ui-toolkit/react";
-import { DataExtensionEditorViewState } from "../../model-editor/shared/view-state";
+import { ModelEditorViewState } from "../../model-editor/shared/view-state";
 import { InProgressMethods } from "../../model-editor/shared/in-progress-methods";
 
 const LibraryContainer = styled.div`
@@ -74,7 +74,7 @@ type Props = {
   modeledMethods: Record<string, ModeledMethod>;
   modifiedSignatures: Set<string>;
   inProgressMethods: InProgressMethods;
-  viewState: DataExtensionEditorViewState;
+  viewState: ModelEditorViewState;
   hideModeledApis: boolean;
   onChange: (
     modelName: string,
diff --git a/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx b/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx
index e622fb070..447851bd4 100644
--- a/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx
+++ b/extensions/ql-vscode/src/view/model-editor/ModelEditor.tsx
@@ -13,7 +13,7 @@ import { assertNever } from "../../common/helpers-pure";
 import { vscode } from "../vscode-api";
 import { calculateModeledPercentage } from "../../model-editor/shared/modeled-percentage";
 import { LinkIconButton } from "../variant-analysis/LinkIconButton";
-import { DataExtensionEditorViewState } from "../../model-editor/shared/view-state";
+import { ModelEditorViewState } from "../../model-editor/shared/view-state";
 import { ModeledMethodsList } from "./ModeledMethodsList";
 import { percentFormatter } from "./formatters";
 import { Mode } from "../../model-editor/shared/mode";
@@ -72,7 +72,7 @@ const ButtonsContainer = styled.div`
 `;
 
 type Props = {
-  initialViewState?: DataExtensionEditorViewState;
+  initialViewState?: ModelEditorViewState;
   initialExternalApiUsages?: ExternalApiUsage[];
   initialModeledMethods?: Record<string, ModeledMethod>;
   initialHideModeledApis?: boolean;
@@ -84,9 +84,9 @@ export function DataExtensionsEditor({
   initialModeledMethods = {},
   initialHideModeledApis = INITIAL_HIDE_MODELED_APIS_VALUE,
 }: Props): JSX.Element {
-  const [viewState, setViewState] = useState<
-    DataExtensionEditorViewState | undefined
-  >(initialViewState);
+  const [viewState, setViewState] = useState<ModelEditorViewState | undefined>(
+    initialViewState,
+  );
 
   const [externalApiUsages, setExternalApiUsages] = useState<
     ExternalApiUsage[]
@@ -119,7 +119,7 @@ export function DataExtensionsEditor({
       if (evt.origin === window.origin) {
         const msg: ToDataExtensionsEditorMessage = evt.data;
         switch (msg.t) {
-          case "setDataExtensionEditorViewState":
+          case "setModelEditorViewState":
             setViewState(msg.viewState);
             break;
           case "setExternalApiUsages":
diff --git a/extensions/ql-vscode/src/view/model-editor/ModeledMethodsList.tsx b/extensions/ql-vscode/src/view/model-editor/ModeledMethodsList.tsx
index a2bb12aba..dd2c4b791 100644
--- a/extensions/ql-vscode/src/view/model-editor/ModeledMethodsList.tsx
+++ b/extensions/ql-vscode/src/view/model-editor/ModeledMethodsList.tsx
@@ -8,7 +8,7 @@ import {
   groupMethods,
   sortGroupNames,
 } from "../../model-editor/shared/sorting";
-import { DataExtensionEditorViewState } from "../../model-editor/shared/view-state";
+import { ModelEditorViewState } from "../../model-editor/shared/view-state";
 import { InProgressMethods } from "../../model-editor/shared/in-progress-methods";
 
 type Props = {
@@ -16,7 +16,7 @@ type Props = {
   modeledMethods: Record<string, ModeledMethod>;
   modifiedSignatures: Set<string>;
   inProgressMethods: InProgressMethods;
-  viewState: DataExtensionEditorViewState;
+  viewState: ModelEditorViewState;
   hideModeledApis: boolean;
   onChange: (
     modelName: string,