diff --git a/src/clients/template.rs b/src/clients/template.rs
index 109ed81..acbe27c 100644
--- a/src/clients/template.rs
+++ b/src/clients/template.rs
@@ -187,7 +187,7 @@ impl<C: golem_client::api::TemplateClient + Sync + Send> TemplateClient for Temp
 
         let name = name.map(|n| n.0);
 
-        let templates: Vec<Template> = self.client.get(name.as_deref()).await?;
+        let templates: Vec<Template> = self.client.get_all_templates(name.as_deref()).await?;
         let views = templates.iter().map(|c| c.into()).collect();
         Ok(views)
     }
@@ -205,7 +205,7 @@ impl<C: golem_client::api::TemplateClient + Sync + Send> TemplateClient for Temp
                     .await
                     .map_err(|e| GolemError(format!("Can't open template file: {e}")))?;
 
-                self.client.post(&name.0, file).await?
+                self.client.upload_template(&name.0, file).await?
             }
             PathBufOrStdin::Stdin => {
                 let mut bytes = Vec::new();
@@ -214,7 +214,7 @@ impl<C: golem_client::api::TemplateClient + Sync + Send> TemplateClient for Temp
                     .read_to_end(&mut bytes) // TODO: steaming request from stdin
                     .map_err(|e| GolemError(format!("Failed to read stdin: {e:?}")))?;
 
-                self.client.post(&name.0, bytes).await?
+                self.client.upload_template(&name.0, bytes).await?
             }
         };
 
@@ -234,7 +234,7 @@ impl<C: golem_client::api::TemplateClient + Sync + Send> TemplateClient for Temp
                     .await
                     .map_err(|e| GolemError(format!("Can't open template file: {e}")))?;
 
-                self.client.template_id_upload_put(&id.0, file).await?
+                self.client.update_template(&id.0, file).await?
             }
             PathBufOrStdin::Stdin => {
                 let mut bytes = Vec::new();
@@ -243,7 +243,7 @@ impl<C: golem_client::api::TemplateClient + Sync + Send> TemplateClient for Temp
                     .read_to_end(&mut bytes) // TODO: steaming request from stdin
                     .map_err(|e| GolemError(format!("Failed to read stdin: {e:?}")))?;
 
-                self.client.template_id_upload_put(&id.0, bytes).await?
+                self.client.update_template(&id.0, bytes).await?
             }
         };
 
diff --git a/src/clients/worker.rs b/src/clients/worker.rs
index 3f5ff0f..4e4b5ba 100644
--- a/src/clients/worker.rs
+++ b/src/clients/worker.rs
@@ -104,7 +104,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         Ok(self
             .client
-            .template_id_workers_post(
+            .launch_new_worker(
                 &template_id.0,
                 &WorkerCreationRequest {
                     name: name.0,
@@ -124,7 +124,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         let key = self
             .client
-            .template_id_workers_worker_name_key_post(&template_id.0, &name.0)
+            .get_invocation_key(&template_id.0, &name.0)
             .await?;
 
         Ok(key_api_to_cli(key))
@@ -152,7 +152,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         Ok(self
             .client
-            .template_id_workers_worker_name_invoke_and_await_post(
+            .invoke_and_await_function(
                 &template_id.0,
                 &name.0,
                 &invocation_key.0,
@@ -174,12 +174,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         let _ = self
             .client
-            .template_id_workers_worker_name_invoke_post(
-                &template_id.0,
-                &name.0,
-                &function,
-                &parameters,
-            )
+            .invoke_function(&template_id.0, &name.0, &function, &parameters)
             .await?;
         Ok(())
     }
@@ -193,7 +188,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         let _ = self
             .client
-            .template_id_workers_worker_name_interrupt_post(&template_id.0, &name.0, Some(false))
+            .interrupt_worker(&template_id.0, &name.0, Some(false))
             .await?;
         Ok(())
     }
@@ -207,7 +202,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         let _ = self
             .client
-            .template_id_workers_worker_name_interrupt_post(&template_id.0, &name.0, Some(true))
+            .interrupt_worker(&template_id.0, &name.0, Some(true))
             .await?;
         Ok(())
     }
@@ -215,10 +210,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
     async fn delete(&self, name: WorkerName, template_id: RawTemplateId) -> Result<(), GolemError> {
         info!("Deleting worker {}/{}", template_id.0, name.0);
 
-        let _ = self
-            .client
-            .template_id_workers_worker_name_delete(&template_id.0, &name.0)
-            .await?;
+        let _ = self.client.delete_worker(&template_id.0, &name.0).await?;
         Ok(())
     }
 
@@ -231,7 +223,7 @@ impl<C: golem_client::api::WorkerClient + Sync + Send> WorkerClient for WorkerCl
 
         Ok(self
             .client
-            .template_id_workers_worker_name_get(&template_id.0, &name.0)
+            .get_worker_metadata(&template_id.0, &name.0)
             .await?)
     }