diff --git a/mcp/servers/mokobackup/.mokogitea/CLAUDE.md b/mcp/servers/mokobackup/.mokogitea/CLAUDE.md
index ae85f8b..887da73 100644
--- a/mcp/servers/mokobackup/.mokogitea/CLAUDE.md
+++ b/mcp/servers/mokobackup/.mokogitea/CLAUDE.md
@@ -28,7 +28,7 @@ src/
 ├── config.ts        # Loads ~/.mcp_mokobackup.json, resolves targets
 ├── client.ts        # Backup execution logic
 ├── akeeba.ts        # Akeeba Backup API integration (Joomla sites)
-├── mokobackup.ts    # MokoJoomBackup REST API integration
+├── mokobackup.ts    # MokoSuite Backup REST API integration
 └── types.ts         # BackupConfig, BackupTarget types
 ```
 
diff --git a/mcp/servers/mokobackup/src/mokobackup.ts b/mcp/servers/mokobackup/src/mokobackup.ts
index b497874..da23d74 100644
--- a/mcp/servers/mokobackup/src/mokobackup.ts
+++ b/mcp/servers/mokobackup/src/mokobackup.ts
@@ -7,7 +7,7 @@ import type { BackupTarget, BackupResult, AkeebaBackupRecord } from './types.js'
 const TIMEOUT_MS = 300_000; // 5 min for backup operations
 
 /**
- * MokoJoomBackup client using Joomla Web Services API
+ * MokoSuite Backup client using Joomla Web Services API
  * Endpoint: /api/index.php/v1/mokobackup/*
  * Auth: Bearer token (Joomla API token)
  *
diff --git a/templates/repos/joomla/Makefile b/templates/repos/joomla/Makefile
index 15fbfde..c8b025b 100644
--- a/templates/repos/joomla/Makefile
+++ b/templates/repos/joomla/Makefile
@@ -2,14 +2,15 @@
 # Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
-# MokoJoomGallery — Photo gallery management for Joomla
+# MokoSuite — Joomla extension template
+# Replace EXTENSION_NAME with your extension's element name.
 
 # ==============================================================================
 # CONFIGURATION - Customize these for your extension
 # ==============================================================================
 
 # Extension Configuration
-EXTENSION_NAME := mokojoomgallery
+EXTENSION_NAME := mokosuite
 EXTENSION_TYPE := package
 # Options: module, plugin, component, package, template
 EXTENSION_VERSION := 1.0.0
@@ -132,11 +133,11 @@ build: clean minify ## Build extension package
 
 	@# --- Build the outer package ZIP ---
 	@echo "  Assembling pkg_$(EXTENSION_NAME)..."
-	@cp $(SRC_DIR)/pkg_mokojoomgallery.xml $(BUILD_DIR)/pkg_mokojoomgallery.xml
+	@cp $(SRC_DIR)/pkg_$(EXTENSION_NAME).xml $(BUILD_DIR)/pkg_$(EXTENSION_NAME).xml
 	@cp $(SRC_DIR)/script.php $(BUILD_DIR)/script.php
 	@[ -d "$(SRC_DIR)/language" ] && cp -r $(SRC_DIR)/language $(BUILD_DIR)/language || true
 	@cd $(BUILD_DIR) && $(ZIP) -r "$(CURDIR)/$(DIST_DIR)/pkg_$(EXTENSION_NAME)-$(EXTENSION_VERSION).zip" \
-		pkg_mokojoomgallery.xml script.php language/ packages/
+		pkg_$(EXTENSION_NAME).xml script.php language/ packages/
 
 	@echo "$(COLOR_GREEN)✓ Package created: $(DIST_DIR)/pkg_$(EXTENSION_NAME)-$(EXTENSION_VERSION).zip$(COLOR_RESET)"
 	@echo "  Contents:"
diff --git a/templates/repos/joomla/composer.json b/templates/repos/joomla/composer.json
index 10afe3a..e47af58 100644
--- a/templates/repos/joomla/composer.json
+++ b/templates/repos/joomla/composer.json
@@ -1,6 +1,6 @@
 {
-    "name": "mokoconsulting/mokojoomgallery",
-    "description": "Photo gallery management for Joomla — galleries, images, thumbnails, lightbox, and frontend display",
+    "name": "mokoconsulting/mokosuite",
+    "description": "Joomla extension — replace with your extension description",
     "type": "joomla-package",
     "version": "01.00.00",
     "license": "GPL-3.0-or-later",