diff --git a/package.json b/package.json
index 817fd106..8b219aed 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
           "when": "vscode-objectscript.connectActive"
         },
         {
-          "command": "vscode-objectscript.getGlobalDocumentation",
+          "command": "vscode-objectscript.ccs.getGlobalDocumentation",
           "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         },
         {
@@ -858,33 +858,28 @@
     ],
     "commands": [
       {
-        "category": "ObjectScript",
-        "command": "vscode-objectscript.export",
-        "title": "Export Code from Server"
-      },
-      {
-        "category": "ObjectScript",
-        "command": "vscode-objectscript.resolveContextExpression",
+        "category": "Consistem",
+        "command": "vscode-objectscript.ccs.resolveContextExpression",
         "title": "Resolve Context Expression"
       },
       {
-        "category": "ObjectScript",
-        "command": "vscode-objectscript.getGlobalDocumentation",
+        "category": "Consistem",
+        "command": "vscode-objectscript.ccs.getGlobalDocumentation",
         "title": "Show Global Documentation",
         "enablement": "vscode-objectscript.connectActive"
       },
       {
-        "category": "ObjectScript",
+        "category": "Consistem",
         "command": "vscode-objectscript.ccs.goToDefinition",
         "title": "Go to Definition"
       },
       {
-        "category": "ObjectScript",
+        "category": "Consistem",
         "command": "vscode-objectscript.ccs.followDefinitionLink",
         "title": "Follow Definition Link"
       },
       {
-        "category": "ObjectScript",
+        "category": "Consistem",
         "command": "vscode-objectscript.ccs.followSourceAnalysisLink",
         "title": "Follow Source Analysis Link"
       },
@@ -893,6 +888,11 @@
         "command": "vscode-objectscript.ccs.createItem",
         "title": "Create Item"
       },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.export",
+        "title": "Export Code from Server"
+      },
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.compile",
@@ -994,7 +994,7 @@
       },
       {
         "category": "ObjectScript",
-        "command": "vscode-objectscript.getGlobalDocumentation",
+        "command": "vscode-objectscript.ccs.getGlobalDocumentation",
         "enablement": "vscode-objectscript.connectActive",
         "title": "Show Global Documentation"
       },
@@ -1285,13 +1285,13 @@
         "when": "editorLangId =~ /^objectscript/"
       },
       {
-        "command": "vscode-objectscript.resolveContextExpression",
+        "command": "vscode-objectscript.ccs.resolveContextExpression",
         "key": "Ctrl+Alt+Space",
         "mac": "Cmd+Alt+Space",
         "when": "editorTextFocus && editorLangId =~ /^objectscript/"
       },
       {
-        "command": "vscode-objectscript.getGlobalDocumentation",
+        "command": "vscode-objectscript.ccs.getGlobalDocumentation",
         "key": "Ctrl+Q",
         "mac": "Cmd+Q",
         "when": "editorTextFocus && editorLangId =~ /^objectscript/"
diff --git a/src/extension.ts b/src/extension.ts
index 04d2e29e..f49d911c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1291,7 +1291,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       sendCommandTelemetryEvent("copyToClipboard");
       vscode.env.clipboard.writeText(command);
     }),
-    vscode.commands.registerCommand("vscode-objectscript.resolveContextExpression", () => {
+    vscode.commands.registerCommand("vscode-objectscript.ccs.resolveContextExpression", () => {
       sendCommandTelemetryEvent("resolveContextExpression");
       void resolveContextExpression();
     }),
@@ -1422,7 +1422,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       sendCommandTelemetryEvent("viewOthers");
       viewOthers(false);
     }),
-    vscode.commands.registerCommand("vscode-objectscript.getGlobalDocumentation", () => {
+    vscode.commands.registerCommand("vscode-objectscript.ccs.getGlobalDocumentation", () => {
       sendCommandTelemetryEvent("getGlobalDocumentation");
       void showGlobalDocumentation();
     }),