diff --git a/cli/client_provision.php b/cli/client_provision.php
index 1aa2206..f56a5cd 100644
--- a/cli/client_provision.php
+++ b/cli/client_provision.php
@@ -156,7 +156,7 @@ class ClientProvisionCli extends CliFramework
         $resp = $this->giteaApi(
             'POST',
             '/api/v1/repos/MokoConsulting/'
-            . 'Template-Client-WaaS/generate',
+            . 'Template-Client/generate',
             $payload
         );
 
diff --git a/cli/scaffold_client.php b/cli/scaffold_client.php
index 7cd1fa0..d49b681 100644
--- a/cli/scaffold_client.php
+++ b/cli/scaffold_client.php
@@ -13,7 +13,7 @@
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
  * PATH: /cli/scaffold_client.php
  * VERSION: 09.43.00
- * BRIEF: Scaffold a new client-waas repo from Template-Client-WaaS with pre-configured settings
+ * BRIEF: Scaffold a new client-waas repo from Template-Client with pre-configured settings
  */
 
 declare(strict_types=1);
@@ -26,7 +26,7 @@ class ScaffoldClientCli extends CliFramework
 {
     protected function configure(): void
     {
-        $this->setDescription('Scaffold a new client-waas repo from Template-Client-WaaS');
+        $this->setDescription('Scaffold a new client-waas repo from Template-Client');
         $this->addArgument('--name', 'Client name', '');
         $this->addArgument('--org', 'Gitea organization', '');
         $this->addArgument('--gitea-url', 'Gitea URL', 'https://git.mokoconsulting.tech');
@@ -47,7 +47,7 @@ class ScaffoldClientCli extends CliFramework
         $this->log('INFO', "Scaffolding client repo: {$org}/{$repoName}");
         $this->log('INFO', "Gitea URL: {$giteaUrl}");
         if ($this->dryRun) {
-            $this->log('INFO', '[DRY RUN] Would create repo from template MokoConsulting/Template-Client-WaaS');
+            $this->log('INFO', '[DRY RUN] Would create repo from template MokoConsulting/Template-Client');
             $this->log('INFO', "[DRY RUN] Repo: {$org}/{$repoName}");
             $this->printPostSetupInstructions($repoName, $giteaUrl, $org);
             return 0;
@@ -64,7 +64,7 @@ class ScaffoldClientCli extends CliFramework
         ]);
         $response = $this->apiRequest(
             'POST',
-            "/api/v1/repos/MokoConsulting/Template-Client-WaaS/generate",
+            "/api/v1/repos/MokoConsulting/Template-Client/generate",
             $giteaUrl,
             $token,
             $createPayload
diff --git a/lib/Enterprise/RepositorySynchronizer.php b/lib/Enterprise/RepositorySynchronizer.php
index 523c0cb..219a24f 100644
--- a/lib/Enterprise/RepositorySynchronizer.php
+++ b/lib/Enterprise/RepositorySynchronizer.php
@@ -934,7 +934,7 @@ class RepositorySynchronizer
         'mcp'            => 'MokoConsulting/Template-Generic',
         'dolibarr'       => 'MokoConsulting/Template-Generic',
         'crm-module'     => 'MokoConsulting/Template-Generic',
-        'client'         => 'MokoConsulting/Template-Client-WaaS',
+        'client'         => 'MokoConsulting/Template-Client',
     ];
 
     /**
@@ -951,7 +951,7 @@ class RepositorySynchronizer
      */
     private const TEMPLATE_SYNC_TARGETS = [
         'MokoConsulting/Template-Joomla',
-        'MokoConsulting/Template-Client-WaaS',
+        'MokoConsulting/Template-Client',
     ];
 
     /**
diff --git a/scripts/sync-wikis-to-github.sh b/scripts/sync-wikis-to-github.sh
index e1f7f8f..af5812c 100644
--- a/scripts/sync-wikis-to-github.sh
+++ b/scripts/sync-wikis-to-github.sh
@@ -78,7 +78,7 @@ else
         ["MokoConsulting/ssh-mcp"]="ssh-mcp"
         ["MokoConsulting/backup-mcp"]="backup-mcp"
         ["MokoConsulting/joomla-api-mcp"]="joomla-api-mcp"
-        ["MokoConsulting/Template-Client-WaaS"]="Template-Client-WaaS"
+        ["MokoConsulting/Template-Client"]="Template-Client"
         ["ClarksvilleFurs/client-waas-clarksvillefurs"]="client-clarksvillefurs"
     )
 fi