diff --git a/extensions/ql-vscode/src/common/vscode/webview-html.ts b/extensions/ql-vscode/src/common/vscode/webview-html.ts
index 787c7969f..eec9d8d21 100644
--- a/extensions/ql-vscode/src/common/vscode/webview-html.ts
+++ b/extensions/ql-vscode/src/common/vscode/webview-html.ts
@@ -7,7 +7,7 @@ export type WebviewKind =
   | "compare"
   | "variant-analysis"
   | "data-flow-paths"
-  | "data-extensions-editor"
+  | "model-editor"
   | "method-modeling";
 
 export interface WebviewMessage {
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index db765cc05..ce7278601 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -128,7 +128,7 @@ import { getAstCfgCommands } from "./language-support/ast-viewer/ast-cfg-command
 import { App } from "./common/app";
 import { registerCommandWithErrorHandling } from "./common/vscode/commands";
 import { DebuggerUI } from "./debugger/debugger-ui";
-import { DataExtensionsEditorModule } from "./model-editor/data-extensions-editor-module";
+import { DataExtensionsEditorModule } from "./model-editor/model-editor-module";
 import { TestManager } from "./query-testing/test-manager";
 import { TestRunner } from "./query-testing/test-runner";
 import { TestManagerBase } from "./query-testing/test-manager-base";
diff --git a/extensions/ql-vscode/src/model-editor/data-extensions-editor-module.ts b/extensions/ql-vscode/src/model-editor/model-editor-module.ts
similarity index 97%
rename from extensions/ql-vscode/src/model-editor/data-extensions-editor-module.ts
rename to extensions/ql-vscode/src/model-editor/model-editor-module.ts
index bda074389..a18ab45c4 100644
--- a/extensions/ql-vscode/src/model-editor/data-extensions-editor-module.ts
+++ b/extensions/ql-vscode/src/model-editor/model-editor-module.ts
@@ -1,5 +1,5 @@
 import { ExtensionContext } from "vscode";
-import { DataExtensionsEditorView } from "./data-extensions-editor-view";
+import { DataExtensionsEditorView } from "./model-editor-view";
 import { DataExtensionsEditorCommands } from "../common/commands";
 import { CliVersionConstraint, CodeQLCliServer } from "../codeql-cli/cli";
 import { QueryRunner } from "../query-server";
@@ -18,7 +18,7 @@ import { MethodsUsagePanel } from "./methods-usage/methods-usage-panel";
 import { Mode } from "./shared/mode";
 import { showResolvableLocation } from "../databases/local-databases/locations";
 import { Usage } from "./external-api-usage";
-import { setUpPack } from "./data-extensions-editor-queries";
+import { setUpPack } from "./model-editor-queries";
 import { MethodModelingPanel } from "./method-modeling/method-modeling-panel";
 
 const SUPPORTED_LANGUAGES: string[] = ["java", "csharp"];
diff --git a/extensions/ql-vscode/src/model-editor/data-extensions-editor-queries.ts b/extensions/ql-vscode/src/model-editor/model-editor-queries.ts
similarity index 100%
rename from extensions/ql-vscode/src/model-editor/data-extensions-editor-queries.ts
rename to extensions/ql-vscode/src/model-editor/model-editor-queries.ts
diff --git a/extensions/ql-vscode/src/model-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/model-editor/model-editor-view.ts
similarity index 99%
rename from extensions/ql-vscode/src/model-editor/data-extensions-editor-view.ts
rename to extensions/ql-vscode/src/model-editor/model-editor-view.ts
index 3842aee1d..0d99f514e 100644
--- a/extensions/ql-vscode/src/model-editor/data-extensions-editor-view.ts
+++ b/extensions/ql-vscode/src/model-editor/model-editor-view.ts
@@ -147,13 +147,13 @@ export class DataExtensionsEditorView extends AbstractWebview<
 
   protected async getPanelConfig(): Promise<WebviewPanelConfig> {
     return {
-      viewId: "data-extensions-editor",
+      viewId: "model-editor",
       title: `Modeling ${getLanguageDisplayName(
         this.extensionPack.language,
       )} (${this.extensionPack.name})`,
       viewColumn: ViewColumn.Active,
       preserveFocus: true,
-      view: "data-extensions-editor",
+      view: "model-editor",
       iconPath: {
         dark: Uri.file(
           join(this.ctx.extensionPath, "media/dark/symbol-misc.svg"),
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/model-editor-queries.test.ts
similarity index 96%
rename from extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts
rename to extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/model-editor-queries.test.ts
index f67c073c2..f722bbec4 100644
--- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/model-editor-queries.test.ts
@@ -1,7 +1,7 @@
 import { readFile, readFileSync, readdir } from "fs-extra";
 import { join } from "path";
 import { load } from "js-yaml";
-import { setUpPack } from "../../../../src/model-editor/data-extensions-editor-queries";
+import { setUpPack } from "../../../../src/model-editor/model-editor-queries";
 import { dirSync } from "tmp-promise";
 import { fetchExternalApiQueries } from "../../../../src/model-editor/queries";
 import { QueryLanguage } from "../../../../src/common/query-language";