diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
index ce1218483..411dd1cda 100644
--- a/extensions/ql-vscode/package.json
+++ b/extensions/ql-vscode/package.json
@@ -943,7 +943,7 @@
         "enablement": "codeql.hasQLSource"
       },
       {
-        "command": "codeQL.openDataExtensionsEditor",
+        "command": "codeQL.openModelEditor",
         "title": "CodeQL: Open CodeQL Model Editor"
       },
       {
@@ -1415,7 +1415,7 @@
           "when": "false"
         },
         {
-          "command": "codeQL.openDataExtensionsEditor",
+          "command": "codeQL.openModelEditor",
           "when": "config.codeQL.canary && config.codeQL.dataExtensions.editor"
         },
         {
@@ -1763,7 +1763,7 @@
         {
           "id": "codeQLMethodsUsage",
           "name": "CodeQL Methods Usage",
-          "when": "config.codeQL.canary && codeql.dataExtensionsEditorOpen"
+          "when": "config.codeQL.canary && codeql.modelEditorOpen"
         }
       ],
       "explorer": [
@@ -1771,7 +1771,7 @@
           "type": "webview",
           "id": "codeQLMethodModeling",
           "name": "CodeQL Method Modeling",
-          "when": "config.codeQL.canary && config.codeQL.modelEditor.methodModelingView && codeql.dataExtensionsEditorOpen"
+          "when": "config.codeQL.canary && config.codeQL.modelEditor.methodModelingView && codeql.modelEditorOpen"
         }
       ]
     },
diff --git a/extensions/ql-vscode/src/common/commands.ts b/extensions/ql-vscode/src/common/commands.ts
index c1e069e65..b19f374bd 100644
--- a/extensions/ql-vscode/src/common/commands.ts
+++ b/extensions/ql-vscode/src/common/commands.ts
@@ -303,8 +303,8 @@ export type PackagingCommands = {
 };
 
 export type ModelEditorCommands = {
-  "codeQL.openDataExtensionsEditor": () => Promise<void>;
-  "codeQLDataExtensionsEditor.jumpToUsageLocation": (
+  "codeQL.openModelEditor": () => Promise<void>;
+  "codeQLModelEditor.jumpToUsageLocation": (
     usage: Usage,
     databaseItem: DatabaseItem,
   ) => Promise<void>;
diff --git a/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts b/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts
index cff8893c7..92d633a26 100644
--- a/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts
+++ b/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts
@@ -79,7 +79,7 @@ export class MethodsUsageDataProvider
         collapsibleState: TreeItemCollapsibleState.None,
         command: {
           title: "Show usage",
-          command: "codeQLDataExtensionsEditor.jumpToUsageLocation",
+          command: "codeQLModelEditor.jumpToUsageLocation",
           arguments: [item, this.databaseItem],
         },
         iconPath: new ThemeIcon("error", new ThemeColor("errorForeground")),
diff --git a/extensions/ql-vscode/src/model-editor/model-editor-module.ts b/extensions/ql-vscode/src/model-editor/model-editor-module.ts
index 23803d23d..9eadf35ad 100644
--- a/extensions/ql-vscode/src/model-editor/model-editor-module.ts
+++ b/extensions/ql-vscode/src/model-editor/model-editor-module.ts
@@ -83,7 +83,7 @@ export class ModelEditorModule extends DisposableObject {
 
   public getCommands(): ModelEditorCommands {
     return {
-      "codeQL.openDataExtensionsEditor": async () => {
+      "codeQL.openModelEditor": async () => {
         const db = this.databaseManager.currentDatabaseItem;
         if (!db) {
           void showAndLogErrorMessage(this.app.logger, "No database selected");
@@ -164,7 +164,7 @@ export class ModelEditorModule extends DisposableObject {
           },
         );
       },
-      "codeQLDataExtensionsEditor.jumpToUsageLocation": async (
+      "codeQLModelEditor.jumpToUsageLocation": async (
         usage: Usage,
         databaseItem: DatabaseItem,
       ) => {
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 33ceb734e..3b395ac65 100644
--- a/extensions/ql-vscode/src/model-editor/model-editor-view.ts
+++ b/extensions/ql-vscode/src/model-editor/model-editor-view.ts
@@ -116,7 +116,7 @@ export class ModelEditorView extends AbstractWebview<
       // so we want to check if there are any others still open.
       void this.app.commands.execute(
         "setContext",
-        "codeql.dataExtensionsEditorOpen",
+        "codeql.modelEditorOpen",
         this.isAModelEditorOpen(),
       );
     });
@@ -125,7 +125,7 @@ export class ModelEditorView extends AbstractWebview<
 
     void this.app.commands.execute(
       "setContext",
-      "codeql.dataExtensionsEditorOpen",
+      "codeql.modelEditorOpen",
       true,
     );
   }
diff --git a/extensions/ql-vscode/test/unit-tests/command-lint.test.ts b/extensions/ql-vscode/test/unit-tests/command-lint.test.ts
index 1475b5b23..2b289ecdc 100644
--- a/extensions/ql-vscode/test/unit-tests/command-lint.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/command-lint.test.ts
@@ -45,7 +45,7 @@ describe("commands declared in package.json", () => {
       command.match(/^codeQLAstViewer\./) ||
       command.match(/^codeQLEvalLogViewer\./) ||
       command.match(/^codeQLTests\./) ||
-      command.match(/^codeQLDataExtensionsEditor\./)
+      command.match(/^codeQLModelEditor\./)
     ) {
       scopedCmds.add(command);
       expect(title).toBeDefined();