diff --git a/src/codegate/pipeline/cli/commands.py b/src/codegate/pipeline/cli/commands.py
index 7e783113..b3a6db7e 100644
--- a/src/codegate/pipeline/cli/commands.py
+++ b/src/codegate/pipeline/cli/commands.py
@@ -63,11 +63,11 @@ async def _add_workspace(self, args: List[str]) -> str:
         Add a workspace
         """
         if args is None or len(args) == 0:
-            return "Please provide a name. Use `codegate-workspace add your_workspace_name`"
+            return "Please provide a name. Use `codegate workspace add your_workspace_name`"
 
         new_workspace_name = args[0]
         if not new_workspace_name:
-            return "Please provide a name. Use `codegate-workspace add your_workspace_name`"
+            return "Please provide a name. Use `codegate workspace add your_workspace_name`"
 
         workspace_created = await self.workspace_crud.add_workspace(new_workspace_name)
         if not workspace_created:
@@ -83,17 +83,17 @@ async def _activate_workspace(self, args: List[str]) -> str:
         Activate a workspace
         """
         if args is None or len(args) == 0:
-            return "Please provide a name. Use `codegate-workspace activate workspace_name`"
+            return "Please provide a name. Use `codegate workspace activate workspace_name`"
 
         workspace_name = args[0]
         if not workspace_name:
-            return "Please provide a name. Use `codegate-workspace activate workspace_name`"
+            return "Please provide a name. Use `codegate workspace activate workspace_name`"
 
         was_activated = await self.workspace_crud.activate_workspace(workspace_name)
         if not was_activated:
             return (
                 f"Workspace **{workspace_name}** does not exist or was already active. "
-                f"Use `codegate-workspace add {workspace_name}` to add it"
+                f"Use `codegate workspace add {workspace_name}` to add it"
             )
         return f"Workspace **{workspace_name}** has been activated"
 
diff --git a/tests/pipeline/workspace/test_workspace.py b/tests/pipeline/workspace/test_workspace.py
index 61475102..039b69fe 100644
--- a/tests/pipeline/workspace/test_workspace.py
+++ b/tests/pipeline/workspace/test_workspace.py
@@ -54,9 +54,9 @@ async def test_list_workspaces(mock_workspaces, expected_output):
     "args, existing_workspaces, expected_message",
     [
         # Case 1: No workspace name provided
-        ([], [], "Please provide a name. Use `codegate-workspace add your_workspace_name`"),
+        ([], [], "Please provide a name. Use `codegate workspace add your_workspace_name`"),
         # Case 2: Workspace name is empty string
-        ([""], [], "Please provide a name. Use `codegate-workspace add your_workspace_name`"),
+        ([""], [], "Please provide a name. Use `codegate workspace add your_workspace_name`"),
         # Case 3: Successful add
         (["myworkspace"], [], "Workspace **myworkspace** has been added"),
     ],