diff --git a/libs/client-api/src/http.rs b/libs/client-api/src/http.rs
index 0596db73..6d364d51 100644
--- a/libs/client-api/src/http.rs
+++ b/libs/client-api/src/http.rs
@@ -553,10 +553,7 @@ impl Client {
   }
 
   #[instrument(level = "debug", skip_all, err)]
-  pub async fn rename_workspace(
-    &self,
-    params: PatchWorkspaceParam,
-  ) -> Result<(), AppResponseError> {
+  pub async fn patch_workspace(&self, params: PatchWorkspaceParam) -> Result<(), AppResponseError> {
     let url = format!("{}/api/workspace", self.base_url);
     let resp = self
       .http_client_with_auth(Method::PATCH, &url)
diff --git a/tests/workspace/workspace_crud.rs b/tests/workspace/workspace_crud.rs
index c38e780a..500b0768 100644
--- a/tests/workspace/workspace_crud.rs
+++ b/tests/workspace/workspace_crud.rs
@@ -2,6 +2,7 @@ use client_api_test_util::generate_unique_registered_user_client;
 use database_entity::dto::AFRole;
 use shared_entity::dto::workspace_dto::CreateWorkspaceMember;
 use shared_entity::dto::workspace_dto::CreateWorkspaceParam;
+use shared_entity::dto::workspace_dto::PatchWorkspaceParam;
 
 #[tokio::test]
 async fn add_and_delete_workspace_for_user() {
@@ -72,3 +73,50 @@ async fn add_and_delete_workspace_for_non_owner_user() {
   let member_workspaces = member.get_workspaces().await.unwrap();
   assert_eq!(member_workspaces.0.len(), 1);
 }
+
+#[tokio::test]
+async fn test_workspace_rename() {
+  let (c, _user) = generate_unique_registered_user_client().await;
+  let workspace_id = c
+    .get_workspaces()
+    .await
+    .unwrap()
+    .0
+    .first()
+    .unwrap()
+    .workspace_id;
+  let desired_new_name = "tom's workspace";
+
+  {
+    c.patch_workspace(PatchWorkspaceParam {
+      workspace_id,
+      workspace_name: Some(desired_new_name.to_string()),
+    })
+    .await
+    .expect("Failed to rename workspace");
+
+    let workspaces = c.get_workspaces().await.expect("Failed to get workspaces");
+    let actual_new_name = &workspaces
+      .0
+      .first()
+      .expect("No workspace found")
+      .workspace_name;
+    assert_eq!(actual_new_name, desired_new_name);
+  }
+
+  {
+    c.patch_workspace(PatchWorkspaceParam {
+      workspace_id,
+      workspace_name: None,
+    })
+    .await
+    .expect("Failed to rename workspace");
+    let workspaces = c.get_workspaces().await.expect("Failed to get workspaces");
+    let actual_new_name = &workspaces
+      .0
+      .first()
+      .expect("No workspace found")
+      .workspace_name;
+    assert_eq!(actual_new_name, desired_new_name);
+  }
+}