diff --git a/setup-wizard/docs.txt b/setup-wizard/docs.txt
index d0fa70f27..c413def83 100644
--- a/setup-wizard/docs.txt
+++ b/setup-wizard/docs.txt
@@ -1,4 +1,4 @@
-verifyProductKey
+setup.status
     Request
       key: string
 
@@ -6,7 +6,7 @@ verifyProductKey
       "is-recovering" : boolean
       "tor-address"   : string
 
-getEmbassyDrives
+setup.disk.list
     Request
     
     Response
@@ -17,7 +17,7 @@ getEmbassyDrives
         used: number
       }[]
 
-getRecoveryDrives
+setup.recovery.list
     Request
 
     Response
@@ -27,14 +27,14 @@ getRecoveryDrives
         name: string
       }[]
 
-getDataTransferProgress
+setup.recovery.status
     Request
     
     Response
       'bytes-transfered' : number
       'total-bytes'      : number
 
-verifyRecoveryPassword
+setup.recovery.test-password
     Request
       logicalname : string
       password    : string
@@ -42,12 +42,12 @@ verifyRecoveryPassword
     Response
       boolean
 
-setupEmbassy
+setup.execute
     Request
-      embassyLogicalname   : string,
-      embassyPassword      : string
-      recoveryLogicalname? : string,
-      recoveryPassword?    : string
+      embassy-logicalname   : string,
+      embassy-password      : string
+      recovery-logicalname? : string,
+      recovery-password?    : string
 
     Response
       "tor-address": string
diff --git a/setup-wizard/src/app/services/api/live-api.service.ts b/setup-wizard/src/app/services/api/live-api.service.ts
index f735d3117..6eb217585 100644
--- a/setup-wizard/src/app/services/api/live-api.service.ts
+++ b/setup-wizard/src/app/services/api/live-api.service.ts
@@ -13,42 +13,42 @@ export class LiveApiService extends ApiService {
 
   async verifyProductKey() {
     return this.http.rpcRequest<VerifyProductKeyRes>({
-      method: 'verifyProductKey',
+      method: 'setup.status',
       params: {}
     })
   }
 
   async getDataTransferProgress() {
     return this.http.rpcRequest<TransferProgressRes>({
-      method: 'getDataTransferProgress',
+      method: 'setup.recovery.status',
       params: {}
     })
   }
 
   async getEmbassyDrives() {
     return this.http.rpcRequest<EmbassyDrive[]>({
-      method: 'getEmbassyDrives',
+      method: 'setup.disk.list',
       params: {}
     })
   }
 
   async getRecoveryDrives() {
     return this.http.rpcRequest<RecoveryDrive[]>({
-      method: 'getRecoveryDrives',
+      method: 'setup.recovery.list',
       params: {}
     })
   }
 
   async verifyRecoveryPassword(logicalname, password) {
     return this.http.rpcRequest<boolean>({
-      method: 'verifyRecoveryPassword',
+      method: 'setup.recovery.test-password',
       params: {logicalname, password}
     })
   }
 
   async setupEmbassy (setupInfo) {
     return this.http.rpcRequest<SetupEmbassyRes>({
-      method: 'setupEmbassy',
+      method: 'setup.execute',
       params: setupInfo
     })
   }