chore(version): pre-release bump to 02.34.83-dev [skip ci]

chore(version): pre-release bump to 02.34.82-dev [skip ci]
feat(tickets): add status/priority admin CRUD (#206 )
2026-06-12 02:55:44 +00:00 · 2026-06-12 02:54:29 +00:00 · 2026-06-11 21:53:01 -05:00 · 2026-06-11 21:53:00 -05:00 · 2026-06-12 02:09:56 +00:00 · 2026-06-11 21:09:22 -05:00
319 changed files with 9845 additions and 12448 deletions
@@ -1,4 +1,4 @@
-# MokoSuiteClient
+# MokoSuite

 Joomla 5/6 admin tools suite — heartbeat health monitoring, extension management, security firewall, tenant restrictions, and site administration.

@@ -6,10 +6,10 @@ Joomla 5/6 admin tools suite — heartbeat health monitoring, extension manageme

 | Field | Value |
 |---|---|
-| **Package** | `pkg_mokosuiteclient` |
+| **Package** | `pkg_mokosuite` |
 | **Language** | PHP 8.1+ |
 | **Branch** | develop on `dev`, merge to `main` (protected) |
-| **Wiki** | [MokoSuiteClient Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki) |
+| **Wiki** | [MokoSuite Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki) |

 ## Commands

@@ -19,38 +19,38 @@ composer install  # Install PHP dependencies

 ## Architecture

-Joomla **package** (`pkg_mokosuiteclient`) with 17 sub-extensions:
+Joomla **package** (`pkg_mokosuite`) with 17 sub-extensions:

-### Core Plugin (`plg_system_mokosuiteclient`)
- Heartbeat health endpoint (`/?mokosuiteclient=health`) with 16 diagnostic checks
+### Core Plugin (`plg_system_mokosuite`)
+- Heartbeat health endpoint (`/?mokosuite=health`) with 16 diagnostic checks
 - Grafana provisioning and heartbeat sender
 - Site alias / domain management
 - Extension cascade (enable/disable coordination)
 - Download key preservation across Joomla updates
- Namespace: `Moko\Plugin\System\MokoSuiteClient`
+- Namespace: `Moko\Plugin\System\MokoSuite`

 ### Feature Plugins
- `plg_system_mokosuiteclient_firewall` — WAF, IP blocklist, security headers, password policy
- `plg_system_mokosuiteclient_tenant` — admin restrictions for non-master users
- `plg_system_mokosuiteclient_devtools` — dev mode, hit reset, version cleanup, download key reset
- `plg_system_mokosuiteclient_offline` — offline mode bypass for legal pages
- `plg_system_mokosuiteclient_monitor` — Grafana heartbeat registration
+- `plg_system_mokosuite_firewall` — WAF, IP blocklist, security headers, password policy
+- `plg_system_mokosuite_tenant` — admin restrictions for non-master users
+- `plg_system_mokosuite_devtools` — dev mode, hit reset, version cleanup, download key reset
+- `plg_system_mokosuite_offline` — offline mode bypass for legal pages
+- `plg_system_mokosuite_monitor` — Grafana heartbeat registration

-### Component (`com_mokosuiteclient`)
+### Component (`com_mokosuite`)
 - Admin dashboard with plugin management, WAF charts, extension catalog
 - Helpdesk ticketing system
 - REST API controllers

 ### Modules
- `mod_mokosuiteclient_cpanel` — admin dashboard widget
- `mod_mokosuiteclient_menu` — admin sidebar menu
- `mod_mokosuiteclient_cache` — status bar cache/temp cleaner
- `mod_mokosuiteclient_categories` — auto-category tree menu
+- `mod_mokosuite_cpanel` — admin dashboard widget
+- `mod_mokosuite_menu` — admin sidebar menu
+- `mod_mokosuite_cache` — status bar cache/temp cleaner
+- `mod_mokosuite_categories` — auto-category tree menu

 ### Task Plugins
- `plg_task_mokosuiteclientdemo` — scheduled demo site reset
- `plg_task_mokosuiteclientsync` — scheduled content sync
- `plg_task_mokosuiteclient_tickets` — ticket automation
+- `plg_task_mokosuitedemo` — scheduled demo site reset
+- `plg_task_mokosuitesync` — scheduled content sync
+- `plg_task_mokosuite_tickets` — ticket automation

 ### Update Server

@@ -59,7 +59,7 @@ MokoGitea generates update feeds dynamically from releases — no static `update
 ## Source Directory

 Source lives in `source/` (not `src/`):
- `source/pkg_mokosuiteclient.xml` — package manifest
+- `source/pkg_mokosuite.xml` — package manifest
 - `source/script.php` — install script
 - `source/packages/` — all sub-extensions

@@ -52,7 +52,7 @@ Attach screenshots showing the issue (desktop and mobile if relevant).
 ## Template Details
 - **Joomla Version**: [e.g., 5.x]
 - **Template Name**: [e.g., clienttemplate]
- **MokoSuiteClient Plugin**: [Active / Inactive]
+- **MokoSuite Plugin**: [Active / Inactive]
 - **MokoOnyx Admin**: [Active / Inactive]

 ## CSS Custom Properties
@@ -11,9 +11,9 @@ INGROUP: MokoStandards.Templates
 REPO: https://github.com/mokoconsulting-tech/MokoStandards
 PATH: /templates/github/copilot-instructions.joomla.md.template
 VERSION: XX.YY.ZZ
-BRIEF: GitHub Copilot custom instructions template for Joomla/MokoSuiteClient governed repositories
+BRIEF: GitHub Copilot custom instructions template for Joomla/MokoSuite governed repositories
 NOTE: Synced to .github/copilot-instructions.md in all Joomla/Suite repos via bulk sync.
-      Tokens replaced at sync time: MokoSuiteClient, https://github.com/mokoconsulting-tech/MokoSuiteClient, {{EXTENSION_NAME}},
+      Tokens replaced at sync time: MokoSuite, https://github.com/mokoconsulting-tech/MokoSuite, {{EXTENSION_NAME}},
      {{EXTENSION_TYPE}}, {{EXTENSION_ELEMENT}}
 -->

@@ -36,24 +36,24 @@ NOTE: Synced to .github/copilot-instructions.md in all Joomla/Suite repos via bu
 >
 > | Placeholder | Where to find the value |
 > |---|---|
-> | `MokoSuiteClient` | The GitHub repository name (visible in the URL, `README.md` heading, or `git remote -v`) |
-> | `https://github.com/mokoconsulting-tech/MokoSuiteClient` | Full GitHub URL, e.g. `https://github.com/mokoconsulting-tech/<repo-name>` |
+> | `MokoSuite` | The GitHub repository name (visible in the URL, `README.md` heading, or `git remote -v`) |
+> | `https://github.com/mokoconsulting-tech/MokoSuite` | Full GitHub URL, e.g. `https://github.com/mokoconsulting-tech/<repo-name>` |
 > | `{{EXTENSION_NAME}}` | The `<name>` element in `manifest.xml` at the repository root |
 > | `{{EXTENSION_TYPE}}` | The `type` attribute of the `<extension>` tag in `manifest.xml` (`component`, `module`, `plugin`, or `template`) |
 > | `{{EXTENSION_ELEMENT}}` | The `<element>` tag in `manifest.xml`, or the filename prefix (e.g. `com_myextension`, `mod_mymodule`) |
 >
 > ---

-# MokoSuiteClient — GitHub Copilot Custom Instructions
+# MokoSuite — GitHub Copilot Custom Instructions

 ## What This Repo Is

-This is a **Moko Consulting MokoSuiteClient** (Joomla) repository governed by [MokoStandards](https://github.com/mokoconsulting-tech/MokoStandards). All coding standards, workflows, and policies are defined there and enforced here via bulk sync.
+This is a **Moko Consulting MokoSuite** (Joomla) repository governed by [MokoStandards](https://github.com/mokoconsulting-tech/MokoStandards). All coding standards, workflows, and policies are defined there and enforced here via bulk sync.

-Repository URL: https://github.com/mokoconsulting-tech/MokoSuiteClient
+Repository URL: https://github.com/mokoconsulting-tech/MokoSuite
 Extension name: **{{EXTENSION_NAME}}**
 Extension type: **{{EXTENSION_TYPE}}** (`{{EXTENSION_ELEMENT}}`)
-Platform: **Joomla 4.x / MokoSuiteClient**
+Platform: **Joomla 4.x / MokoSuite**

 ---

@@ -77,9 +77,9 @@ Every new file needs a copyright header as its first content.
 * SPDX-License-Identifier: GPL-3.0-or-later
 *
 * FILE INFORMATION
- * DEFGROUP: MokoSuiteClient.{{EXTENSION_TYPE}}
- * INGROUP: MokoSuiteClient
- * REPO: https://github.com/mokoconsulting-tech/MokoSuiteClient
+ * DEFGROUP: MokoSuite.{{EXTENSION_TYPE}}
+ * INGROUP: MokoSuite
+ * REPO: https://github.com/mokoconsulting-tech/MokoSuite
 * PATH: /path/to/file.php
 * VERSION: XX.YY.ZZ
 * BRIEF: One-line description of purpose
@@ -98,9 +98,9 @@ This file is part of a Moko Consulting project.
 SPDX-License-Identifier: GPL-3.0-or-later

 # FILE INFORMATION
-DEFGROUP: MokoSuiteClient.Documentation
-INGROUP: MokoSuiteClient
-REPO: https://github.com/mokoconsulting-tech/MokoSuiteClient
+DEFGROUP: MokoSuite.Documentation
+INGROUP: MokoSuite
+REPO: https://github.com/mokoconsulting-tech/MokoSuite
 PATH: /docs/file.md
 VERSION: XX.YY.ZZ
 BRIEF: One-line description
@@ -138,7 +138,7 @@ The version in `README.md` **must always match** the `<version>` tag in `manifes
 		<version>01.02.04</version>
 		<downloads>
 			<downloadurl type="full" format="zip">
-				https://github.com/mokoconsulting-tech/MokoSuiteClient/releases/download/01.02.04/{{EXTENSION_ELEMENT}}-01.02.04.zip
+				https://github.com/mokoconsulting-tech/MokoSuite/releases/download/01.02.04/{{EXTENSION_ELEMENT}}-01.02.04.zip
 			</downloadurl>
 		</downloads>
 		<targetplatform name="joomla" version="4\.[0-9]+" />
@@ -152,7 +152,7 @@ The version in `README.md` **must always match** the `<version>` tag in `manifes
 ## Joomla Extension Structure

 ```
-MokoSuiteClient/
+MokoSuite/
 ├── manifest.xml          # Joomla installer manifest (root — required)
 ├── (no updates.xml)       # Update XML is generated dynamically by MokoGitea
 ├── site/                 # Frontend (site) code
@@ -191,11 +191,11 @@ MokoSuiteClient/
 https://git.mokoconsulting.tech/{Owner}/{Repo}/updates.xml
 ```

-The package manifest (`pkg_mokosuiteclient.xml`) references it via:
+The package manifest (`pkg_mokosuite.xml`) references it via:
 ```xml
 <updateservers>
-	<server type="extension" priority="1" name="MokoSuiteClient Update Server">
-		https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/updates.xml
+	<server type="extension" priority="1" name="MokoSuite Update Server">
+		https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/updates.xml
 	</server>
 </updateservers>
 ```
@@ -257,7 +257,7 @@ This repository is governed by [MokoStandards](https://github.com/mokoconsulting
 | [branching-strategy.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/branching-strategy.md) | Branch naming, hierarchy, and release workflow |
 | [merge-strategy.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/merge-strategy.md) | Squash-merge policy and PR title/body conventions |
 | [changelog-standards.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/changelog-standards.md) | How and when to update CHANGELOG.md |
-| [joomla-development-guide.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/guide/waas/joomla-development-guide.md) | MokoSuiteClient Joomla extension development guide |
+| [joomla-development-guide.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/guide/waas/joomla-development-guide.md) | MokoSuite Joomla extension development guide |

 ---

@@ -5,11 +5,11 @@
 -->
 <moko-platform xmlns="https://standards.mokoconsulting.tech/moko-platform/1.0" schema-version="1.0">
  <identity>
-    <name>MokoSuiteClient</name>
-    <display-name>Package - MokoSuiteClient</display-name>
+    <name>MokoSuite</name>
+    <display-name>Package - MokoSuite</display-name>
    <org>MokoConsulting</org>
    <description>White-label identity, security hardening, and tenant restriction layer for Suite-managed Joomla environments</description>
-    <version>02.34.50</version>
+    <version>02.34.83</version>
    <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
  </identity>
  <governance>
@@ -1,66 +1,63 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
-# PATH: /.mokogitea/workflows/auto-bump.yml
-# VERSION: 09.02.00
-# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
-
-name: "Universal: Auto Version Bump"
-
-on:
-  push:
-    branches:
-      - dev
-      - rc
-      - 'feature/**'
-      - 'patch/**'
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-
-permissions:
-  contents: write
-
-jobs:
-  bump:
-    name: Version Bump
-    runs-on: release
-    if: >-
-      !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip bump]') &&
-      !startsWith(github.event.head_commit.message, 'Merge pull request')
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 1
-
-      - name: Setup moko-platform tools
-        run: |
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          if [ -d "/opt/moko-platform/cli" ]; then
-            echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV"
-          else
-            git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \
-              /tmp/moko-platform-api
-            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-            echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
-          fi
-
-      - name: Bump version
-        run: |
-          php ${MOKO_CLI}/version_auto_bump.php \
-            --path . --branch "${GITHUB_REF_NAME}" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --repo-url "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: moko-platform.Release
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# PATH: /.mokogitea/workflows/auto-bump.yml
+# VERSION: 09.23.00
+# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
+
+name: "Universal: Auto Version Bump"
+
+on:
+  push:
+    branches:
+      - dev
+      - rc
+      - 'feature/**'
+      - 'patch/**'
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+
+permissions:
+  contents: write
+
+jobs:
+  bump:
+    name: Version Bump
+    runs-on: release
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]') &&
+      !contains(github.event.head_commit.message, '[skip bump]') &&
+      !startsWith(github.event.head_commit.message, 'Merge pull request')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          fetch-depth: 1
+
+      - name: Setup moko-platform tools
+        run: |
+          if ! command -v composer &> /dev/null; then
+            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          fi
+          rm -rf /tmp/moko-platform-api
+          git clone --depth 1 --branch main --quiet \
+            "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \
+            /tmp/moko-platform-api
+          cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
+
+      - name: Bump version
+        run: |
+          php ${MOKO_CLI}/version_auto_bump.php \
+            --path . --branch "${GITHUB_REF_NAME}" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --repo-url "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
@@ -4,10 +4,10 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Universal
+# INGROUP: MokoPlatform.Universal
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /.mokogitea/workflows/branch-cleanup.yml
-# VERSION: 01.00.00
+# VERSION: 09.23.00
 # BRIEF: Delete feature branches after PR merge

 name: "Branch Cleanup"
@@ -1,204 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.CI
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /.gitea/workflows/ci-generic.yml
-# VERSION: 01.00.00
-# BRIEF: CI pipeline — lint, validate, and test for generic projects (PHP + Node.js)
-
-name: "Generic: Project CI"
-
-on:
-  push:
-    branches:
-      - main
-      - dev
-      - dev/**
-      - rc/**
-      - version/**
-  pull_request:
-    branches:
-      - main
-      - dev
-      - dev/**
-      - rc/**
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-
-jobs:
-  # ── Lint & Validate ───────────────────────────────────────────────────
-  lint:
-    name: Lint & Validate
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Detect toolchain
-        id: detect
-        run: |
-          HAS_PHP=false
-          HAS_NODE=false
-          [ -f "composer.json" ] && HAS_PHP=true
-          [ -f "package.json" ] && HAS_NODE=true
-          echo "has_php=$HAS_PHP" >> "$GITHUB_OUTPUT"
-          echo "has_node=$HAS_NODE" >> "$GITHUB_OUTPUT"
-          echo "Toolchain: PHP=$HAS_PHP Node=$HAS_NODE"
-
-      - name: Setup PHP
-        if: steps.detect.outputs.has_php == 'true'
-        run: |
-          if ! command -v php &> /dev/null; then
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
-          fi
-          php -v
-
-      - name: Setup Node.js
-        if: steps.detect.outputs.has_node == 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Install PHP dependencies
-        if: steps.detect.outputs.has_php == 'true'
-        run: |
-          if [ -f "composer.json" ]; then
-            composer install --no-interaction --prefer-dist --quiet 2>/dev/null || true
-          fi
-
-      - name: Install Node.js dependencies
-        if: steps.detect.outputs.has_node == 'true'
-        run: |
-          if [ -f "package.json" ]; then
-            npm ci --quiet 2>/dev/null || npm install --quiet 2>/dev/null || true
-          fi
-
-      - name: PHP syntax check
-        if: steps.detect.outputs.has_php == 'true'
-        run: |
-          ERRORS=0
-          while IFS= read -r -d '' file; do
-            if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then
-              echo "::error file=${file}::PHP syntax error"
-              ERRORS=$((ERRORS + 1))
-            fi
-          done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -not -path "./node_modules/*" -print0)
-
-          echo "## PHP Lint" >> $GITHUB_STEP_SUMMARY
-          if [ "$ERRORS" -eq 0 ]; then
-            echo "All PHP files passed syntax check." >> $GITHUB_STEP_SUMMARY
-          else
-            echo "${ERRORS} file(s) with syntax errors." >> $GITHUB_STEP_SUMMARY
-            exit 1
-          fi
-
-      - name: TypeScript/JavaScript lint
-        if: steps.detect.outputs.has_node == 'true'
-        run: |
-          if [ -f "node_modules/.bin/eslint" ]; then
-            npx eslint src/ --quiet 2>&1 || { echo "::error::ESLint errors found"; exit 1; }
-            echo "## ESLint" >> $GITHUB_STEP_SUMMARY
-            echo "All files passed ESLint." >> $GITHUB_STEP_SUMMARY
-          elif [ -f ".eslintrc.json" ] || [ -f ".eslintrc.js" ] || [ -f "eslint.config.js" ]; then
-            echo "::warning::ESLint config found but eslint not installed"
-          else
-            echo "No ESLint configured — skipping"
-          fi
-
-      - name: TypeScript compile check
-        if: steps.detect.outputs.has_node == 'true'
-        run: |
-          if [ -f "tsconfig.json" ] && [ -f "node_modules/.bin/tsc" ]; then
-            npx tsc --noEmit 2>&1 || { echo "::error::TypeScript compilation errors"; exit 1; }
-            echo "## TypeScript" >> $GITHUB_STEP_SUMMARY
-            echo "TypeScript compilation passed." >> $GITHUB_STEP_SUMMARY
-          fi
-
-      - name: PHPStan static analysis
-        if: steps.detect.outputs.has_php == 'true'
-        run: |
-          if [ -f "phpstan.neon" ] && [ -f "vendor/bin/phpstan" ]; then
-            vendor/bin/phpstan analyse --no-progress 2>&1 || { echo "::warning::PHPStan found issues"; }
-          fi
-
-  # ── Tests ─────────────────────────────────────────────────────────────
-  test:
-    name: Tests
-    runs-on: ubuntu-latest
-    needs: lint
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Detect toolchain
-        id: detect
-        run: |
-          HAS_PHP=false
-          HAS_NODE=false
-          [ -f "composer.json" ] && HAS_PHP=true
-          [ -f "package.json" ] && HAS_NODE=true
-          echo "has_php=$HAS_PHP" >> "$GITHUB_OUTPUT"
-          echo "has_node=$HAS_NODE" >> "$GITHUB_OUTPUT"
-
-      - name: Setup PHP
-        if: steps.detect.outputs.has_php == 'true'
-        run: |
-          if ! command -v php &> /dev/null; then
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
-          fi
-
-      - name: Setup Node.js
-        if: steps.detect.outputs.has_node == 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Install dependencies
-        run: |
-          [ -f "composer.json" ] && composer install --no-interaction --prefer-dist --quiet 2>/dev/null || true
-          [ -f "package.json" ] && { npm ci --quiet 2>/dev/null || npm install --quiet 2>/dev/null || true; }
-
-      - name: Run PHP tests
-        if: steps.detect.outputs.has_php == 'true'
-        run: |
-          if [ -f "vendor/bin/phpunit" ]; then
-            vendor/bin/phpunit --testdox 2>&1
-            echo "## PHPUnit" >> $GITHUB_STEP_SUMMARY
-            echo "Tests passed." >> $GITHUB_STEP_SUMMARY
-          elif [ -f "phpunit.xml" ] || [ -f "phpunit.xml.dist" ]; then
-            echo "::warning::PHPUnit config found but phpunit not installed"
-          else
-            echo "No PHPUnit configured — skipping"
-          fi
-
-      - name: Run Node.js tests
-        if: steps.detect.outputs.has_node == 'true'
-        run: |
-          if jq -e '.scripts.test' package.json > /dev/null 2>&1; then
-            npm test 2>&1
-            echo "## Node.js Tests" >> $GITHUB_STEP_SUMMARY
-            echo "Tests passed." >> $GITHUB_STEP_SUMMARY
-          else
-            echo "No test script in package.json — skipping"
-          fi
-
-      - name: Build check
-        run: |
-          if [ -f "Makefile" ]; then
-            make build 2>&1 || echo "::warning::Build failed or not configured"
-          elif [ -f "package.json" ] && jq -e '.scripts.build' package.json > /dev/null 2>&1; then
-            npm run build 2>&1 || echo "::warning::Build failed"
-          fi
@@ -1,500 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# This file is part of a Moko Consulting project.
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow.Template
-# INGROUP: MokoStandards.CI
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
-# PATH: /templates/workflows/joomla/ci-joomla.yml.template
-# VERSION: 04.06.00
-# BRIEF: CI workflow for Joomla extensions — lint, validate, test
-
-name: "Joomla: Extension CI"
-
-on:
-  pull_request:
-    branches:
-      - main
-      - 'dev/**'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pull-requests: write
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-
-jobs:
-  lint-and-validate:
-    name: Lint & Validate
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        run: |
-          if ! command -v php &> /dev/null; then
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          php -v && composer --version
-
-      - name: Setup moko-platform tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN || github.token }}
-          MOKO_CLONE_HOST: ${{ secrets.GA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
-        run: |
-          if [ -d "/tmp/moko-platform" ] || [ -d "/opt/moko-platform" ]; then
-            echo "moko-platform already available on runner — skipping clone"
-          else
-            git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-              /tmp/moko-platform 2>/dev/null || echo "moko-platform clone skipped — continuing without it"
-          fi
-
-      - name: Install dependencies
-        env:
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || secrets.GA_TOKEN || github.token }}"}}'
-        run: |
-          if [ -f "composer.json" ]; then
-            composer install \
-              --no-interaction \
-              --prefer-dist \
-              --optimize-autoloader
-          else
-            echo "No composer.json found — skipping dependency install"
-          fi
-
-      - name: PHP syntax check
-        run: |
-          ERRORS=0
-          for DIR in src/ htdocs/; do
-            if [ -d "$DIR" ]; then
-              FOUND=1
-              while IFS= read -r -d '' FILE; do
-                OUTPUT=$(php -l "$FILE" 2>&1)
-                if echo "$OUTPUT" | grep -q "Parse error"; then
-                  echo "::error file=${FILE}::${OUTPUT}"
-                  ERRORS=$((ERRORS + 1))
-                fi
-              done < <(find "$DIR" -name "*.php" -print0)
-            fi
-          done
-          echo "### PHP Syntax Check" >> $GITHUB_STEP_SUMMARY
-          if [ "${ERRORS}" -gt 0 ]; then
-            echo "**${ERRORS} syntax error(s) found.**" >> $GITHUB_STEP_SUMMARY
-            exit 1
-          else
-            echo "All PHP files passed syntax check." >> $GITHUB_STEP_SUMMARY
-          fi
-
-      - name: XML manifest validation
-        run: |
-          echo "### XML Manifest Validation" >> $GITHUB_STEP_SUMMARY
-          ERRORS=0
-
-          # Find the extension manifest (XML with <extension tag)
-          MANIFEST=""
-          for XML_FILE in $(find . -maxdepth 2 -name "*.xml" -not -path "./.git/*" -not -path "./vendor/*"); do
-            if grep -q "<extension" "$XML_FILE" 2>/dev/null; then
-              MANIFEST="$XML_FILE"
-              break
-            fi
-          done
-
-          if [ -z "$MANIFEST" ]; then
-            echo "No Joomla extension manifest found (XML file with \`<extension\` tag)." >> $GITHUB_STEP_SUMMARY
-            ERRORS=$((ERRORS + 1))
-          else
-            echo "Manifest found: \`${MANIFEST}\`" >> $GITHUB_STEP_SUMMARY
-
-            # Validate well-formed XML
-            php -r "
-              \$xml = @simplexml_load_file('$MANIFEST');
-              if (\$xml === false) {
-                echo 'INVALID';
-                exit(1);
-              }
-              echo 'VALID';
-            " > /tmp/xml_result 2>&1
-            XML_RESULT=$(cat /tmp/xml_result)
-            if [ "$XML_RESULT" != "VALID" ]; then
-              echo "Manifest is not well-formed XML." >> $GITHUB_STEP_SUMMARY
-              ERRORS=$((ERRORS + 1))
-            else
-              echo "Manifest is well-formed XML." >> $GITHUB_STEP_SUMMARY
-            fi
-
-            # Check required tags: name, version, author
-            for TAG in name version author; do
-              if ! grep -q "<${TAG}>" "$MANIFEST" 2>/dev/null; then
-                echo "Missing required tag: \`<${TAG}>\`" >> $GITHUB_STEP_SUMMARY
-                ERRORS=$((ERRORS + 1))
-              else
-                echo "Found required tag: \`<${TAG}>\`" >> $GITHUB_STEP_SUMMARY
-              fi
-            done
-
-            # Namespace is required for components/plugins but not packages
-            EXT_TYPE=$(grep -oP '<extension[^>]*\btype="\K[^"]+' "$MANIFEST" | head -1)
-            if [ "$EXT_TYPE" != "package" ]; then
-              if ! grep -q "<namespace" "$MANIFEST" 2>/dev/null; then
-                echo "Missing required tag: \`<namespace>\` (required for Joomla 5+ ${EXT_TYPE} extensions)" >> $GITHUB_STEP_SUMMARY
-                ERRORS=$((ERRORS + 1))
-              else
-                echo "Found required tag: \`<namespace>\`" >> $GITHUB_STEP_SUMMARY
-              fi
-            else
-              echo "Package extension — \`<namespace>\` not required." >> $GITHUB_STEP_SUMMARY
-            fi
-          fi
-
-          if [ "${ERRORS}" -gt 0 ]; then
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**${ERRORS} manifest issue(s) found.**" >> $GITHUB_STEP_SUMMARY
-            exit 1
-          else
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**Manifest validation passed.**" >> $GITHUB_STEP_SUMMARY
-          fi
-
-      - name: Check language files referenced in manifest
-        run: |
-          echo "### Language File Check" >> $GITHUB_STEP_SUMMARY
-          ERRORS=0
-
-          MANIFEST=""
-          for XML_FILE in $(find . -maxdepth 2 -name "*.xml" -not -path "./.git/*" -not -path "./vendor/*"); do
-            if grep -q "<extension" "$XML_FILE" 2>/dev/null; then
-              MANIFEST="$XML_FILE"
-              break
-            fi
-          done
-
-          if [ -n "$MANIFEST" ]; then
-            # Extract language file references from manifest
-            LANG_FILES=$(grep -oP 'language\s+tag="[^"]*"[^>]*>\K[^<]+' "$MANIFEST" 2>/dev/null || true)
-            if [ -z "$LANG_FILES" ]; then
-              echo "No language file references found in manifest — skipping." >> $GITHUB_STEP_SUMMARY
-            else
-              while IFS= read -r LANG_FILE; do
-                LANG_FILE=$(echo "$LANG_FILE" | xargs)
-                if [ -z "$LANG_FILE" ]; then
-                  continue
-                fi
-                # Check in common locations
-                FOUND=0
-                for BASE in "." "src" "htdocs"; do
-                  if [ -f "${BASE}/${LANG_FILE}" ]; then
-                    FOUND=1
-                    break
-                  fi
-                done
-                if [ "$FOUND" -eq 0 ]; then
-                  echo "Missing language file: \`${LANG_FILE}\`" >> $GITHUB_STEP_SUMMARY
-                  ERRORS=$((ERRORS + 1))
-                else
-                  echo "Language file present: \`${LANG_FILE}\`" >> $GITHUB_STEP_SUMMARY
-                fi
-              done <<< "$LANG_FILES"
-            fi
-          else
-            echo "No manifest found — skipping language check." >> $GITHUB_STEP_SUMMARY
-          fi
-
-          if [ "${ERRORS}" -gt 0 ]; then
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**${ERRORS} missing language file(s).**" >> $GITHUB_STEP_SUMMARY
-            exit 1
-          else
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**Language file check passed.**" >> $GITHUB_STEP_SUMMARY
-          fi
-
-      - name: Check index.html files in directories
-        run: |
-          echo "### Index.html Check" >> $GITHUB_STEP_SUMMARY
-          MISSING=0
-          CHECKED=0
-
-          for DIR in src/ htdocs/; do
-            if [ -d "$DIR" ]; then
-              while IFS= read -r -d '' SUBDIR; do
-                CHECKED=$((CHECKED + 1))
-                if [ ! -f "${SUBDIR}/index.html" ]; then
-                  echo "Missing index.html in: \`${SUBDIR}\`" >> $GITHUB_STEP_SUMMARY
-                  MISSING=$((MISSING + 1))
-                fi
-              done < <(find "$DIR" -type d -print0)
-            fi
-          done
-
-          if [ "${CHECKED}" -eq 0 ]; then
-            echo "No src/ or htdocs/ directories found — skipping." >> $GITHUB_STEP_SUMMARY
-          elif [ "${MISSING}" -gt 0 ]; then
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "**${MISSING} director(ies) missing index.html out of ${CHECKED} checked.**" >> $GITHUB_STEP_SUMMARY
-            exit 1
-          else
-            echo "All ${CHECKED} directories contain index.html." >> $GITHUB_STEP_SUMMARY
-          fi
-
-  release-readiness:
-    name: Release Readiness Check
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request' && github.base_ref == 'main'
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Validate release readiness
-        run: |
-          echo "## Release Readiness" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          ERRORS=0
-
-          # Extract version from README.md
-          README_VERSION=$(grep -oP '^\s*VERSION:\s*\K[0-9]{2}\.[0-9]{2}\.[0-9]{2}' README.md | head -1)
-          if [ -z "$README_VERSION" ]; then
-            echo "No VERSION found in README.md FILE INFORMATION block." >> $GITHUB_STEP_SUMMARY
-            ERRORS=$((ERRORS + 1))
-          else
-            echo "README version: \`${README_VERSION}\`" >> $GITHUB_STEP_SUMMARY
-          fi
-
-          # Find the extension manifest
-          MANIFEST=""
-          for XML_FILE in $(find . -maxdepth 2 -name "*.xml" -not -path "./.git/*" -not -path "./vendor/*"); do
-            if grep -q "<extension" "$XML_FILE" 2>/dev/null; then
-              MANIFEST="$XML_FILE"
-              break
-            fi
-          done
-
-          if [ -z "$MANIFEST" ]; then
-            echo "No Joomla extension manifest found." >> $GITHUB_STEP_SUMMARY
-            ERRORS=$((ERRORS + 1))
-          else
-            echo "Manifest: \`${MANIFEST}\`" >> $GITHUB_STEP_SUMMARY
-
-            # Check <version> matches README VERSION
-            MANIFEST_VERSION=$(grep -oP '<version>\K[^<]+' "$MANIFEST" | head -1)
-            if [ -z "$MANIFEST_VERSION" ]; then
-              echo "No \`<version>\` tag in manifest." >> $GITHUB_STEP_SUMMARY
-              ERRORS=$((ERRORS + 1))
-            elif [ -n "$README_VERSION" ] && [ "$MANIFEST_VERSION" != "$README_VERSION" ]; then
-              echo "Manifest version \`${MANIFEST_VERSION}\` does not match README \`${README_VERSION}\`." >> $GITHUB_STEP_SUMMARY
-              ERRORS=$((ERRORS + 1))
-            else
-              echo "Manifest version: \`${MANIFEST_VERSION}\`" >> $GITHUB_STEP_SUMMARY
-            fi
-
-            # Check extension type, element, client attributes
-            EXT_TYPE=$(grep -oP '<extension[^>]*\btype="\K[^"]+' "$MANIFEST" | head -1)
-            if [ -z "$EXT_TYPE" ]; then
-              echo "Missing \`type\` attribute on \`<extension>\` tag." >> $GITHUB_STEP_SUMMARY
-              ERRORS=$((ERRORS + 1))
-            else
-              echo "Extension type: \`${EXT_TYPE}\`" >> $GITHUB_STEP_SUMMARY
-            fi
-
-            # Element check (component/module/plugin name)
-            HAS_ELEMENT=$(grep -cP '<(element|name)>' "$MANIFEST" 2>/dev/null || echo "0")
-            if [ "$HAS_ELEMENT" -eq 0 ]; then
-              echo "Missing \`<element>\` or \`<name>\` in manifest." >> $GITHUB_STEP_SUMMARY
-              ERRORS=$((ERRORS + 1))
-            fi
-
-            # Client attribute for site/admin modules and plugins
-            if echo "$EXT_TYPE" | grep -qP "^(module|plugin)$"; then
-              HAS_CLIENT=$(grep -cP '<extension[^>]*\bclient=' "$MANIFEST" 2>/dev/null || echo "0")
-              if [ "$HAS_CLIENT" -eq 0 ]; then
-                echo "Missing \`client\` attribute for ${EXT_TYPE} extension." >> $GITHUB_STEP_SUMMARY
-                ERRORS=$((ERRORS + 1))
-              fi
-            fi
-          fi
-
-          # Check updates.xml exists
-          if [ -f "updates.xml" ] || [ -f "updates.xml" ]; then
-            echo "Update XML present." >> $GITHUB_STEP_SUMMARY
-          else
-            echo "No updates.xml found." >> $GITHUB_STEP_SUMMARY
-            ERRORS=$((ERRORS + 1))
-          fi
-
-          # Check CHANGELOG.md exists
-          if [ -f "CHANGELOG.md" ]; then
-            echo "CHANGELOG.md present." >> $GITHUB_STEP_SUMMARY
-          else
-            echo "No CHANGELOG.md found." >> $GITHUB_STEP_SUMMARY
-            ERRORS=$((ERRORS + 1))
-          fi
-
-          echo "" >> $GITHUB_STEP_SUMMARY
-          if [ $ERRORS -gt 0 ]; then
-            echo "**${ERRORS} issue(s) must be resolved before release.**" >> $GITHUB_STEP_SUMMARY
-            exit 1
-          else
-            echo "**Extension is ready for release.**" >> $GITHUB_STEP_SUMMARY
-          fi
-
-  test:
-    name: Tests (PHP ${{ matrix.php }})
-    runs-on: ubuntu-latest
-    needs: lint-and-validate
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['8.2', '8.3']
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup PHP ${{ matrix.php }}
-        run: |
-          if ! command -v php &> /dev/null; then
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          php -v && composer --version
-
-      - name: Install dependencies
-        env:
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || secrets.GA_TOKEN || github.token }}"}}'
-        run: |
-          if [ -f "composer.json" ]; then
-            composer install \
-              --no-interaction \
-              --prefer-dist \
-              --optimize-autoloader
-          else
-            echo "No composer.json found — skipping dependency install"
-          fi
-
-      - name: Run tests
-        run: |
-          echo "### Test Results (PHP ${{ matrix.php }})" >> $GITHUB_STEP_SUMMARY
-          if [ -f "phpunit.xml" ] || [ -f "phpunit.xml.dist" ]; then
-            vendor/bin/phpunit --testdox 2>&1 | tee /tmp/test-output.log
-            EXIT=${PIPESTATUS[0]}
-            if [ $EXIT -eq 0 ]; then
-              echo "All tests passed." >> $GITHUB_STEP_SUMMARY
-            else
-              echo "Test failures detected — see log." >> $GITHUB_STEP_SUMMARY
-              echo '```' >> $GITHUB_STEP_SUMMARY
-              cat /tmp/test-output.log >> $GITHUB_STEP_SUMMARY
-              echo '```' >> $GITHUB_STEP_SUMMARY
-            fi
-            exit $EXIT
-          else
-            echo "No phpunit.xml found — skipping tests." >> $GITHUB_STEP_SUMMARY
-          fi
-
-  static-analysis:
-    name: PHPStan Analysis
-    runs-on: ubuntu-latest
-    needs: lint-and-validate
-    continue-on-error: true
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        run: |
-          if ! command -v php &> /dev/null; then
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          php -v && composer --version
-
-      - name: Install dependencies
-        env:
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || secrets.GA_TOKEN || github.token }}"}}'
-        run: |
-          if [ -f "composer.json" ]; then
-            composer install --no-interaction --prefer-dist --optimize-autoloader
-          fi
-
-      - name: Install PHPStan
-        run: |
-          if ! command -v vendor/bin/phpstan &> /dev/null; then
-            composer require --dev phpstan/phpstan --no-interaction 2>/dev/null || \
-              composer global require phpstan/phpstan --no-interaction
-          fi
-
-      - name: Run PHPStan
-        run: |
-          echo "### PHPStan Static Analysis" >> $GITHUB_STEP_SUMMARY
-          PHPSTAN="vendor/bin/phpstan"
-          if [ ! -f "$PHPSTAN" ]; then
-            PHPSTAN=$(composer global config bin-dir --absolute 2>/dev/null)/phpstan
-          fi
-
-          # Determine source directory
-          SRC_DIR=""
-          for DIR in src/ htdocs/ lib/; do
-            if [ -d "$DIR" ]; then
-              SRC_DIR="$DIR"
-              break
-            fi
-          done
-
-          if [ -z "$SRC_DIR" ]; then
-            echo "No source directory found (src/, htdocs/, lib/) — skipping." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-
-          # Use repo phpstan.neon if present, otherwise use baseline config
-          ARGS="analyse ${SRC_DIR} --memory-limit=512M --no-progress --error-format=table"
-          if [ -f "phpstan.neon" ] || [ -f "phpstan.neon.dist" ]; then
-            echo "Using project PHPStan config." >> $GITHUB_STEP_SUMMARY
-          else
-            ARGS="$ARGS --level=3"
-            echo "No phpstan.neon found — using level 3 (type inference)." >> $GITHUB_STEP_SUMMARY
-          fi
-
-          $PHPSTAN $ARGS 2>&1 | tee /tmp/phpstan-output.txt
-          EXIT=${PIPESTATUS[0]}
-
-          if [ $EXIT -eq 0 ]; then
-            echo "**No errors found.**" >> $GITHUB_STEP_SUMMARY
-          else
-            ERRORS=$(grep -c "ERROR" /tmp/phpstan-output.txt 2>/dev/null || echo "some")
-            echo "**${ERRORS} error(s) found.** Review output above." >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            tail -30 /tmp/phpstan-output.txt >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-          fi
-          exit $EXIT
-
-  pre-release:
-    name: Build RC Pre-Release
-    runs-on: ubuntu-latest
-    needs: [lint-and-validate, test]
-    if: github.event_name == 'pull_request'
-
-    steps:
-      - name: Trigger pre-release build
-        env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
-          REPO: ${{ github.repository }}
-          BRANCH: ${{ github.head_ref }}
-        run: |
-          curl -s -X POST \
-            "${GITEA_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches" \
-            -H "Authorization: token ${GA_TOKEN}" \
-            -H "Content-Type: application/json" \
-            -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}"
-          echo "### Pre-Release" >> $GITHUB_STEP_SUMMARY
-          echo "Triggered RC build on branch \`${BRANCH}\`" >> $GITHUB_STEP_SUMMARY
@@ -4,10 +4,10 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Maintenance
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
+# INGROUP: moko-platform.Maintenance
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /.gitea/workflows/cleanup.yml
-# VERSION: 01.00.00
+# VERSION: 09.23.00
 # BRIEF: Scheduled cleanup — delete merged branches and old workflow runs

 name: "Universal: Repository Cleanup"
@@ -33,17 +33,17 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
-          token: ${{ secrets.GA_TOKEN }}
+          token: ${{ secrets.MOKOGITEA_TOKEN }}

      - name: Delete merged branches
        env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
        run: |
          echo "=== Merged Branch Cleanup ==="
          API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"

          # List branches via API
-          BRANCHES=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
+          BRANCHES=$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" \
            "${API}/branches?limit=50" | jq -r '.[].name')

          DELETED=0
@@ -56,7 +56,7 @@ jobs:
            # Check if branch is merged into main
            if git merge-base --is-ancestor "origin/${BRANCH}" origin/main 2>/dev/null; then
              echo "  Deleting merged branch: ${BRANCH}"
-              curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
+              curl -sS -X DELETE -H "Authorization: token ${GITEA_TOKEN}" \
                "${API}/branches/${BRANCH}" 2>/dev/null || true
              DELETED=$((DELETED + 1))
            fi
@@ -66,20 +66,20 @@ jobs:

      - name: Clean old workflow runs
        env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
        run: |
          echo "=== Workflow Run Cleanup ==="
          API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
          CUTOFF=$(date -d "30 days ago" +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -v-30d +%Y-%m-%dT%H:%M:%SZ)

          # Get old completed runs
-          RUNS=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
+          RUNS=$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" \
            "${API}/actions/runs?status=completed&limit=50" | \
            jq -r ".workflow_runs[] | select(.created_at < \"${CUTOFF}\") | .id" 2>/dev/null)

          DELETED=0
          for RUN_ID in $RUNS; do
-            curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
+            curl -sS -X DELETE -H "Authorization: token ${GITEA_TOKEN}" \
              "${API}/actions/runs/${RUN_ID}" 2>/dev/null || true
            DELETED=$((DELETED + 1))
          done
@@ -1,126 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Deploy
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
-# PATH: /templates/workflows/joomla/deploy-manual.yml.template
-# VERSION: 04.07.00
-# BRIEF: Manual SFTP deploy to dev server for Joomla repos
-
-name: "Universal: Deploy to Dev (Manual)"
-
-on:
-  workflow_dispatch:
-    inputs:
-      clear_remote:
-        description: 'Delete all remote files before uploading'
-        required: false
-        default: 'false'
-        type: boolean
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-    name: SFTP Deploy to Dev
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Setup PHP
-        run: |
-          php -v && composer --version
-
-      - name: Setup MokoStandards tools
-        env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }}
-          MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }}
-          MOKO_CLONE_HOST: ${{ secrets.GA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GA_TOKEN || github.token }}"}}'
-        run: |
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
-            /tmp/mokostandards-api 2>/dev/null || true
-          if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
-            cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
-          fi
-
-      - name: Check FTP configuration
-        id: check
-        env:
-          HOST: ${{ vars.DEV_FTP_HOST }}
-          PATH_VAR: ${{ vars.DEV_FTP_PATH }}
-          PORT: ${{ vars.DEV_FTP_PORT }}
-        run: |
-          if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
-            echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          echo "skip=false" >> "$GITHUB_OUTPUT"
-          echo "host=$HOST" >> "$GITHUB_OUTPUT"
-
-          REMOTE="${PATH_VAR%/}"
-          echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
-
-          [ -z "$PORT" ] && PORT="22"
-          echo "port=$PORT" >> "$GITHUB_OUTPUT"
-
-      - name: Deploy via SFTP
-        if: steps.check.outputs.skip != 'true'
-        env:
-          SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
-          SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
-          SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
-        run: |
-          SOURCE_DIR="src"
-          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
-          [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
-
-          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
-            "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
-            > /tmp/sftp-config.json
-
-          if [ -n "$SFTP_KEY" ]; then
-            echo "$SFTP_KEY" > /tmp/deploy_key
-            chmod 600 /tmp/deploy_key
-            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
-          else
-            printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
-          fi
-
-          DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
-          [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
-
-          PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
-          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
-            php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
-          else
-            php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
-          fi
-
-          rm -f /tmp/deploy_key /tmp/sftp-config.json
-
-      - name: Summary
-        if: always()
-        run: |
-          if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
-            echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
-            echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
-            echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
-          fi
@@ -4,10 +4,10 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
+# INGROUP: moko-platform.Security
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
 # PATH: /templates/workflows/gitleaks.yml.template
-# VERSION: 01.00.00
+# VERSION: 09.23.00
 # BRIEF: Secret scanning — detect leaked credentials, API keys, and tokens
 #
 # +========================================================================+
@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: moko-platform.Automation
-# VERSION: 01.00.00
+# VERSION: 02.34.83
 # BRIEF: Auto-create feature branch when an issue is opened

 name: "Universal: Issue Branch"
@@ -28,7 +28,7 @@ jobs:
    steps:
      - name: Create branch and comment
        run: |
-          TOKEN="${{ secrets.GA_TOKEN }}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
          API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
          ISSUE_NUM="${{ github.event.issue.number }}"
          ISSUE_TITLE="${{ github.event.issue.title }}"
@@ -4,10 +4,10 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Notifications
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
+# INGROUP: moko-platform.Notifications
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /.gitea/workflows/notify.yml
-# VERSION: 01.00.00
+# VERSION: 09.23.00
 # BRIEF: Push notifications via ntfy on release success or workflow failure

 name: "Universal: Notifications"
@@ -8,4 +8,245 @@
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /templates/workflows/universal/pre-release.yml.template
 # VERSION: 05.01.00
-# BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
+# BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
+
+name: "Universal: Pre-Release"
+
+on:
+  push:
+    branches:
+      - dev
+      - 'fix/**'
+      - 'patch/**'
+      - 'hotfix/**'
+      - 'bugfix/**'
+      - 'chore/**'
+      - alpha
+      - beta
+      - rc
+  workflow_dispatch:
+    inputs:
+      stability:
+        description: 'Pre-release channel'
+        required: true
+        type: choice
+        options:
+          - development
+          - alpha
+          - beta
+          - release-candidate
+
+permissions:
+  contents: write
+
+env:
+  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
+  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
+
+jobs:
+  build:
+    name: "Build Pre-Release (${{ inputs.stability || github.ref_name }})"
+    runs-on: release
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'push'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          ref: ${{ github.ref_name }}
+
+      - name: Setup moko-platform tools
+        env:
+          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
+        run: |
+          # Use pre-installed /opt/moko-platform if available (updated by cron every 6h)
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/cli/manifest_element.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
+          fi
+
+      - name: Detect platform
+        id: platform
+        run: |
+          # Auto-detect and update platform if not set in manifest
+          php ${MOKO_CLI}/platform_detect.php --path . --github-output 2>/dev/null || true
+          php ${MOKO_CLI}/manifest_read.php --path . --github-output
+
+      - name: Resolve metadata and bump version
+        id: meta
+        run: |
+          # Auto-detect stability from branch name on push, or use input on dispatch
+          if [ "${{ github.event_name }}" = "push" ]; then
+            case "${{ github.ref_name }}" in
+              rc)    STABILITY="release-candidate" ;;
+              alpha) STABILITY="alpha" ;;
+              beta)  STABILITY="beta" ;;
+              *)     STABILITY="development" ;;
+            esac
+          else
+            STABILITY="${{ inputs.stability || 'development' }}"
+          fi
+
+          case "$STABILITY" in
+            development)        SUFFIX="-dev";   TAG="development" ;;
+            alpha)              SUFFIX="-alpha"; TAG="alpha" ;;
+            beta)               SUFFIX="-beta";  TAG="beta" ;;
+            release-candidate)  SUFFIX="-rc";    TAG="release-candidate" ;;
+          esac
+
+          # Bump version via CLI: patch for dev/alpha/beta, minor for RC
+          case "$STABILITY" in
+            release-candidate) BUMP="minor" ;;
+            *)                 BUMP="patch" ;;
+          esac
+
+          php ${MOKO_CLI}/version_bump.php --path . $([ "$BUMP" = "minor" ] && echo "--minor") 2>/dev/null || true
+
+          # Set stability suffix and verify consistency
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
+          VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
+
+          php ${MOKO_CLI}/version_set_platform.php \
+            --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
+          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
+
+          # Ensure licensing tags (updateservers, dlid) if enabled in manifest.xml
+          php ${MOKO_CLI}/manifest_licensing.php --path . --fix 2>/dev/null || true
+
+          # Append suffix for output
+          if [ -n "$SUFFIX" ]; then
+            VERSION="${VERSION}${SUFFIX}"
+          fi
+
+          # Commit version bump
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
+          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+          git add -A
+          git diff --cached --quiet || {
+            git commit -m "chore(version): pre-release bump to ${VERSION} [skip ci]"
+            git push origin HEAD 2>&1
+          }
+
+          # Auto-detect element via manifest_element.php
+          php ${MOKO_CLI}/manifest_element.php \
+            --path . --version "$VERSION" --stability "$STABILITY" \
+            --repo "${GITEA_REPO}" --github-output
+
+          # Read back element outputs
+          EXT_ELEMENT=$(grep '^ext_element=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
+          ZIP_NAME=$(grep '^zip_name=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
+          [ -z "$EXT_ELEMENT" ] && EXT_ELEMENT=$(echo "${GITEA_REPO}" | tr '[:upper:]' '[:lower:]' | tr -d ' -')
+          [ -z "$ZIP_NAME" ] && ZIP_NAME="${EXT_ELEMENT}-${VERSION}.zip"
+
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
+          echo "suffix=${SUFFIX}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
+          echo "ext_element=${EXT_ELEMENT}" >> "$GITHUB_OUTPUT"
+
+          echo "=== Pre-Release: ${EXT_ELEMENT} ${VERSION}${SUFFIX} ==="
+
+      - name: Create release
+        id: release
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/release_create.php \
+            --path . --version "$VERSION" --tag "$TAG" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
+            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
+
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog (everything between [Unreleased] and next ## heading)
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Release ${VERSION}"
+          else
+            NOTES="Release ${VERSION}"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/${TAG}" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
+
+      - name: Build package and upload
+        id: package
+        run: |
+          VERSION="${{ steps.meta.outputs.version }}"
+          TAG="${{ steps.meta.outputs.tag }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/release_package.php \
+            --path . --version "$VERSION" --tag "$TAG" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
+            --repo "${GITEA_REPO}" --output /tmp || true
+
+      # updates.xml is generated dynamically by MokoGitea license server
+      # No need to build, commit, or sync updates.xml from workflows
+
+      - name: "Delete lesser pre-release channels (cascade)"
+        continue-on-error: true
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          php ${MOKO_CLI}/release_cascade.php \
+            --stability "${{ steps.meta.outputs.stability }}" \
+            --token "${TOKEN}" \
+            --api-base "${API_BASE}"
+
+      - name: Summary
+        if: always()
+        run: |
+          VERSION="${{ steps.meta.outputs.version }}"
+          STABILITY="${{ steps.meta.outputs.stability }}"
+          ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
+          SHA256="${{ steps.package.outputs.sha256_zip }}"
+          echo "## Pre-Release Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
+          echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
+          echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| Channel | ${STABILITY} |" >> $GITHUB_STEP_SUMMARY
+          echo "| Package | \`${ZIP_NAME}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| SHA-256 | \`${SHA256:-n/a}\` |" >> $GITHUB_STEP_SUMMARY
@@ -0,0 +1,66 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoPlatform.Universal
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# PATH: /.mokogitea/workflows/rc-revert.yml
+# VERSION: 09.23.00
+# BRIEF: Rename rc/ branch back to dev/ when PR is closed without merge
+
+name: "RC Revert"
+
+on:
+  pull_request:
+    types: [closed]
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  revert:
+    name: Rename rc/ back to dev/
+    runs-on: ubuntu-latest
+    if: >-
+      github.event.pull_request.merged == false &&
+      startsWith(github.event.pull_request.head.ref, 'rc/')
+
+    steps:
+      - name: Rename branch
+        run: |
+          BRANCH="${{ github.event.pull_request.head.ref }}"
+          SUFFIX="${BRANCH#rc/}"
+          DEV_BRANCH="dev/${SUFFIX}"
+          API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          # Create dev/ branch from rc/ branch
+          STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X POST \
+            -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "{\"new_branch_name\": \"${DEV_BRANCH}\", \"old_branch_name\": \"${BRANCH}\"}" \
+            "${API}" 2>/dev/null || true)
+
+          if [ "$STATUS" = "201" ]; then
+            echo "Created branch: ${DEV_BRANCH}" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "::error::Failed to create ${DEV_BRANCH} from ${BRANCH} (HTTP ${STATUS})"
+            exit 1
+          fi
+
+          # Delete rc/ branch
+          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
+          STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X DELETE \
+            -H "Authorization: token ${TOKEN}" \
+            "${API}/${ENCODED}" 2>/dev/null || true)
+
+          if [ "$STATUS" = "204" ]; then
+            echo "Deleted branch: ${BRANCH}" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "::warning::Failed to delete ${BRANCH} (HTTP ${STATUS})"
+          fi
+
+          echo "### RC Reverted" >> $GITHUB_STEP_SUMMARY
+          echo "${BRANCH} → ${DEV_BRANCH}" >> $GITHUB_STEP_SUMMARY
@@ -4,10 +4,10 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
+# INGROUP: moko-platform.Security
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /.gitea/workflows/security-audit.yml
-# VERSION: 01.00.00
+# VERSION: 09.23.00
 # BRIEF: Dependency vulnerability scanning for composer and npm packages

 name: "Universal: Security Audit"
@@ -80,3 +80,19 @@ jobs:
            -H "Priority: high" \
            -d "Security audit found vulnerabilities. Review dependency updates." \
            "${NTFY_URL}/${NTFY_TOPIC}" || true
+
+
+      - name: Joomla version audit
+        if: always()
+        run: |
+          if [ -f "monitoring/joomla-version-audit.php" ] && [ -n "$JOOMLA_SITES" ]; then
+            echo "$JOOMLA_SITES" > /tmp/sites.json
+            php monitoring/joomla-version-audit.php --sites /tmp/sites.json || true
+            echo "### Joomla Version Audit" >> $GITHUB_STEP_SUMMARY
+            rm -f /tmp/sites.json
+          else
+            echo "Joomla audit skipped (no script or JOOMLA_SITES_JSON not configured)"
+          fi
+        env:
+          JOOMLA_SITES: ${{ vars.JOOMLA_SITES_JSON }}
+
@@ -11,10 +11,10 @@
 
 # FILE INFORMATION 
 DEFGROUP: 
- INGROUP: MokoSuiteClient.Documentation
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
+ INGROUP: MokoSuite.Documentation
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
 PATH: ./CHANGELOG.md
- VERSION: 02.34.50
+ VERSION: 02.34.83
 BRIEF: Version history using `Keep a Changelog`
 -->

@@ -22,22 +22,32 @@

 ## [Unreleased]

-### Changed
- **Full rename: MokoSuite → MokoSuiteClient** — repo, all Joomla element names (com_mokosuiteclient, plg_system_mokosuiteclient, mod_mokosuiteclient_*, etc.), PHP classes, language files, folder structure, and manifest references. This is the client tracker for the MokoSuite platform.
-
 ### Added
- RSA-signed heartbeat authentication — private key in monitor plugin manifest, public key on MokoSuiteClientHQ
+- plg_system_mokosuite_dbip — IP geolocation plugin using DB-IP MMDB databases (CDN auto-download, local file mode, bundled MaxMind reader)
+- Admin sidebar menu restructure — each Moko component gets its own collapsible section, com_mokosuitehq pinned first
+- rc-revert workflow for release candidate rollbacks
+- Ntfy push notifications for ticket events and security alerts (#205) — configurable server/topic/token
+- Canned responses admin UI with edit modal, category filter, drag-and-drop reorder (#138)
+- Ticket categories drag-and-drop reorder (#139)
+- File attachments on tickets and replies (#141) — upload/download/delete with type and size validation
+- Satisfaction ratings on resolved tickets (#140) — 1-5 star widget with optional feedback
+- Helpdesk REST API (#142) — GET/POST/PATCH tickets, POST replies, filters, pagination
+- Component config options UI (#149) — general, notification (email + ntfy), helpdesk settings
+- Automation rule visual builder (#137) — condition/action dropdowns, edit existing, reorder, XSS-safe DOM
+- Admin login and failed login security notifications (#147)
+- Automation engine with Joomla event triggers (#151) — user_login, user_register, content_save, extension_install, behavior modes (append/always_new/skip_if_open), create_ticket action
+- RSA-signed heartbeat authentication — private key in monitor plugin manifest, public key on MokoSuiteHQ
 - Monitor plugin base_url set via manifest (hidden from admin UI), propagated via update server
 - Send Heartbeat button on health token field for manual heartbeat testing
 - Font Awesome 7 loaded in admin backend — picks up MokoOnyx Kit code if present, falls back to bundled FA7 Free or FA6 CDN
- MokoWaaS → MokoSuiteClient database table migration in install script (create new, copy data, drop old)
- MokoWaaS → MokoSuiteClient extension param migration — copies params from all old mokowaas plugins/modules/component, then removes old entries and filesystem remnants
+- MokoWaaS → MokoSuite database table migration in install script (create new, copy data, drop old)
+- MokoWaaS → MokoSuite extension param migration — copies params from all old mokowaas plugins/modules/component, then removes old entries and filesystem remnants
 - Ticket contact linking — optional FK to Joomla contact records with display in list and detail views
 - Multi-assignee tickets — junction table supports multiple users and user groups per ticket
 - Customizable ticket statuses — admin-configurable lookup table replaces hardcoded ENUM (title, color, is_closed flag)
 - Customizable ticket priorities — admin-configurable lookup table with weight and color
- Joomla custom fields integration for tickets (context: com_mokosuiteclient.ticket) with field groups assignable per category
- MokoWaaS/MokoWaaSHQ migration bridge repos with updates.xml redirecting existing installs to MokoSuiteClient/HQ
+- Joomla custom fields integration for tickets (context: com_mokosuite.ticket) with field groups assignable per category
+- MokoWaaS/MokoWaaSHQ migration bridge repos with updates.xml redirecting existing installs to MokoSuite/HQ
 - Pre-release workflow triggers on push to dev/alpha/beta/rc branches (deployed to all 11 repos)

 ### Removed
@@ -52,14 +62,14 @@
 - Core plugin stripped to heartbeat-only config (~5,500 lines removed)
 - Extension catalog (catalog.xml) with update server discovery (#186)
 - Download key preservation across Joomla updates (#187)
- Remote login endpoint for MokoSuiteClientHQ auto-login
+- Remote login endpoint for MokoSuiteHQ auto-login
 - Provision reset API for new client setup (hits, versions, tokens)
 - Setup required banner after provision reset
 - Support verification PIN (MOKO-XXXX-XXXX)
- mod_mokosuiteclient_categories — auto-category tree menu (#184)
+- mod_mokosuite_categories — auto-category tree menu (#184)
 - Cache/temp split button in status bar
 - Dashboard version tiles for component and modules
- Monitor plugin sends full health payload to MokoSuiteClientHQ
+- Monitor plugin sends full health payload to MokoSuiteHQ
 - Firewall: block_frontend_superuser, own trusted_ip_entry.xml
 - DevTools: reset download keys toggle

@@ -79,17 +89,17 @@
 ### Added
 - Database Tools view — table status, optimize, repair, session purge (#127)
 - Cache Cleanup view — directory size reporting and one-click cleanup (#128)
- mod_mokosuiteclient_cache — one-click cache cleaner button in admin status bar (replaces Regular Labs Cache Cleaner)
- mod_mokosuiteclient_menu — collapsible admin sidebar menu using native MetisMenu classes (like Community Builder)
+- mod_mokosuite_cache — one-click cache cleaner button in admin status bar (replaces Regular Labs Cache Cleaner)
+- mod_mokosuite_menu — collapsible admin sidebar menu using native MetisMenu classes (like Community Builder)
 - SSL certificate expiry monitoring in cpanel module (#148)
- MokoSuiteClient-specific update badge (blue) separate from other updates in cpanel module
+- MokoSuite-specific update badge (blue) separate from other updates in cpanel module
 - migrateUpdateServerUrls() — rewrites all Moko extension update server URLs to clean /updates.xml on install/update
 - fixMenuIcons() — sets menu_icon params on submenu items (Joomla only renders img on level 1)
 - setupCacheModule() — registers cache cleaner module in status bar position on install
 - Component config.xml for Joomla Options modal (#149)
 - preflight() ALTER for #__extensions.element default (MySQL strict mode fix)
 - Retire MokoJoomTOS, MokoATS-Automation, MokoDPCalendarAPI, MokoGalleryCalendar on install
- MokoJoomTOS settings auto-migrate to mokosuiteclient_offline before removal
+- MokoJoomTOS settings auto-migrate to mokosuite_offline before removal
 - dev-release and pre-release workflows with changelog extraction into release notes
 - RC pre-release consolidates dev patches into clean minor version bump

@@ -121,20 +131,20 @@
 ## [02.32] - 2026-06-02

 ### Added
- Admin control panel dashboard in com_mokosuiteclient with site info bar, feature plugin grid, and quick actions
- Feature plugin architecture — MokoSuiteClient features split into toggleable plugins managed from the dashboard
- plg_system_mokosuiteclient_firewall — HTTPS enforcement, trusted IPs, session timeout, upload restrictions, password policy
- plg_system_mokosuiteclient_tenant — Installer, sysinfo, config, template, and menu restrictions for non-master users
- plg_system_mokosuiteclient_devtools — Dev mode, hit counter reset, content version cleanup
- plg_system_mokosuiteclient_monitor — Grafana heartbeat integration and health monitoring
- MokoSuiteClientHelper utility class for shared master-user detection across feature plugins
+- Admin control panel dashboard in com_mokosuite with site info bar, feature plugin grid, and quick actions
+- Feature plugin architecture — MokoSuite features split into toggleable plugins managed from the dashboard
+- plg_system_mokosuite_firewall — HTTPS enforcement, trusted IPs, session timeout, upload restrictions, password policy
+- plg_system_mokosuite_tenant — Installer, sysinfo, config, template, and menu restrictions for non-master users
+- plg_system_mokosuite_devtools — Dev mode, hit counter reset, content version cleanup
+- plg_system_mokosuite_monitor — Grafana heartbeat integration and health monitoring
+- MokoSuiteHelper utility class for shared master-user detection across feature plugins
 - AJAX plugin toggle — enable/disable feature plugins directly from the dashboard
 - Clear cache quick action on dashboard
 - Static updates.xml for update server (licensing system deferred)
 - Automatic param migration from core plugin to feature plugins on upgrade

 ### Changed
- com_mokosuiteclient upgraded from API-only to full admin component with dashboard views
+- com_mokosuite upgraded from API-only to full admin component with dashboard views
 - Package manifest updated with 4 new feature plugin entries (10 extensions total)
 - Update server URL changed to static raw file endpoint
 - Core plugin slimmed — security, tenant, devtools, and monitor features extracted to dedicated plugins
@@ -152,7 +162,7 @@
 - Persistent admin warning when no license key is configured in Update Sites
 - Daily heartbeat validation of license key against MokoGitea — warns if key is invalid or expired
 - Stale/duplicate update site cleanup on install/update (removes old static URL entries and orphaned records)
- Content sync rewritten — bulk MokoSuiteClient API endpoints (syncclear + syncpush) replace per-item Joomla API calls
+- Content sync rewritten — bulk MokoSuite API endpoints (syncclear + syncpush) replace per-item Joomla API calls
 - Sync task per-instance config: target URL, health token, content type checkboxes (articles, categories, menus, modules)
 - Bulk sync completes in under 5 seconds (clear + push in 2-3 HTTP requests)
 - Asset table and nested set tree repair after sync push on target site
@@ -186,24 +196,24 @@
 ### Fixed
 - Emergency access IP whitelist: empty `allowed_ips` now permits all IPs (was blocking everyone)
 - Emergency access reads `allowed_ips` from plugin params instead of global config
- `plg_task_mokosuiteclientsync` — Joomla Scheduled Task plugin for automatic content sync to remote sites
+- `plg_task_mokosuitesync` — Joomla Scheduled Task plugin for automatic content sync to remote sites
 - Community Builder tables added to demo reset safe table list
- API endpoint `POST /api/index.php/v1/mokosuiteclient/install` — install extensions from a remote ZIP URL
+- API endpoint `POST /api/index.php/v1/mokosuite/install` — install extensions from a remote ZIP URL

 - Demo Mode with configurable warning banner on frontend when enabled

 - Demo banner countdown now shows weeks/days/months for longer intervals instead of raw hours
 - `DemoResetService` — baseline snapshot and restore for DB tables + media files
- API endpoints `POST /?mokosuiteclient=reset` and `POST /?mokosuiteclient=snapshot` (query-string)
- REST endpoints `POST /api/v1/mokosuiteclient/reset` and `GET/POST /api/v1/mokosuiteclient/snapshot`
- `plg_task_mokosuiteclientdemo` — Joomla Scheduled Task plugin for automatic demo site reset
+- API endpoints `POST /?mokosuite=reset` and `POST /?mokosuite=snapshot` (query-string)
+- REST endpoints `POST /api/v1/mokosuite/reset` and `GET/POST /api/v1/mokosuite/snapshot`
+- `plg_task_mokosuitedemo` — Joomla Scheduled Task plugin for automatic demo site reset
 - Admin toggles: Take Snapshot Now and Restore Baseline Now in plugin config
- Content Sync: one-way push of articles, categories, menus, and modules to remote MokoSuiteClient sites
- Content Sync: API endpoints `POST /?mokosuiteclient=sync` (sender) and `POST /?mokosuiteclient=sync-receive` (receiver)
- Content Sync: REST endpoints `POST /api/v1/mokosuiteclient/sync` and `POST /api/v1/mokosuiteclient/sync-receive`
+- Content Sync: one-way push of articles, categories, menus, and modules to remote MokoSuite sites
+- Content Sync: API endpoints `POST /?mokosuite=sync` (sender) and `POST /?mokosuite=sync-receive` (receiver)
+- Content Sync: REST endpoints `POST /api/v1/mokosuite/sync` and `POST /api/v1/mokosuite/sync-receive`
 - Content Sync: configurable sync targets with URL + API token in plugin settings
- Package installer: protect all MokoSuiteClient extensions (not just system plugin) and ensure update server stays enabled
- Package installer: clean up legacy `mokosuiteclientbrand` extension entries and files on install/update
- API endpoint `GET /?mokosuiteclient=extensions` and `GET /api/v1/mokosuiteclient/extensions` — list installed extensions with version, status, and update server info
+- Package installer: protect all MokoSuite extensions (not just system plugin) and ensure update server stays enabled
+- Package installer: clean up legacy `mokosuitebrand` extension entries and files on install/update
+- API endpoint `GET /?mokosuite=extensions` and `GET /api/v1/mokosuite/extensions` — list installed extensions with version, status, and update server info

 ## [02.20] --- 2026-05-28
@@ -12,9 +12,9 @@

 	# FILE INFORMATION
 	DEFGROUP: Joomla.Plugin
-	INGROUP: MokoSuiteClient.Documentation
-	REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
-	VERSION: 02.34.50
+	INGROUP: MokoSuite.Documentation
+	REPO: https://github.com/mokoconsulting-tech/mokosuite
+	VERSION: 02.34.83
 	PATH: ./CODE_OF_CONDUCT.md
 	BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default
 -->
@@ -16,12 +16,12 @@
 You should have received a copy of the GNU General Public License (./LICENSE).

 FILE INFORMATION
- DEFGROUP: mokoconsulting-tech.MokoSuiteClientBrand
+ DEFGROUP: mokoconsulting-tech.MokoSuiteBrand
 INGROUP: MokoStandards.Governance
- REPO: https://github.com/mokoconsulting-tech/MokoSuiteClientBrand
- VERSION: 02.34.50
+ REPO: https://github.com/mokoconsulting-tech/MokoSuiteBrand
+ VERSION: 02.34.83
 PATH: /GOVERNANCE.md
- BRIEF: Project governance rules, roles, and decision process for MokoSuiteClientBrand
+ BRIEF: Project governance rules, roles, and decision process for MokoSuiteBrand
 -->

 [![MokoStandards](https://img.shields.io/badge/MokoStandards-02.01.08-blue)](https://github.com/mokoconsulting-tech/MokoStandards)
@@ -30,7 +30,7 @@

 ## Overview

-This document defines the governance model for the `MokoSuiteClientBrand` repository within the
+This document defines the governance model for the `MokoSuiteBrand` repository within the
 `mokoconsulting-tech` organization. It is automatically maintained by
 [MokoStandards](https://github.com/mokoconsulting-tech/MokoStandards) v04.00.04.

@@ -97,7 +97,7 @@ See the full policy:

 ## Reporting Issues

- **Bugs / Features**: Open a [GitHub Issue](https://github.com/mokoconsulting-tech/MokoSuiteClientBrand/issues)
+- **Bugs / Features**: Open a [GitHub Issue](https://github.com/mokoconsulting-tech/MokoSuiteBrand/issues)
 - **Security vulnerabilities**: See [SECURITY.md](./SECURITY.md)
 - **Code of Conduct**: See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md)
 - **Contact**: dev@mokoconsulting.tech
@@ -110,10 +110,10 @@ See the full policy:
 | ------------- | ----------------------------------------------- |
 | Document Type | Policy                                          |
 | Domain        | Governance                                      |
-| Applies To    | mokoconsulting-tech/MokoSuiteClientBrand                           |
+| Applies To    | mokoconsulting-tech/MokoSuiteBrand                           |
 | Jurisdiction  | Tennessee, USA                                  |
 | Maintainer    | @mokoconsulting-tech                            |
 | Standards     | MokoStandards v04.00.04            |
-| Repo          | https://github.com/mokoconsulting-tech/MokoSuiteClientBrand        |
+| Repo          | https://github.com/mokoconsulting-tech/MokoSuiteBrand        |
 | Path          | /GOVERNANCE.md                                  |
 | Status        | Active — auto-maintained by MokoStandards       |
@@ -12,10 +12,10 @@

 	# FILE INFORMATION
 	DEFGROUP: Joomla.Plugin
-	INGROUP: MokoSuiteClient.Documentation
-  REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
+	INGROUP: MokoSuite.Documentation
+  REPO: https://github.com/mokoconsulting-tech/mokosuite
 	PATH: ./LICENSE.md
-	VERSION: 02.34.50
+	VERSION: 02.34.83
 	BRIEF: Project license (GPL-3.0-or-later)
 -->
 										GNU GENERAL PUBLIC LICENSE
@@ -7,27 +7,27 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient
- REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient
- VERSION: 02.34.50
+ INGROUP: MokoSuite
+ REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoSuite
+ VERSION: 02.34.83
 PATH: /README.md
- BRIEF: MokoSuiteClient platform plugin for Joomla
+ BRIEF: MokoSuite platform plugin for Joomla
 -->

-# MokoSuiteClient
+# MokoSuite

-[![Version](https://img.shields.io/badge/version-02.03.11-blue.svg?logo=v&logoColor=white)](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/releases)
+[![Version](https://img.shields.io/badge/version-02.03.11-blue.svg?logo=v&logoColor=white)](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/releases)
 [![License](https://img.shields.io/badge/license-GPL--3.0--or--later-green.svg?logo=gnu&logoColor=white)](LICENSE)
 [![Joomla](https://img.shields.io/badge/Joomla-5.x%20%7C%206.x-red.svg?logo=joomla&logoColor=white)](https://www.joomla.org)
 [![PHP](https://img.shields.io/badge/PHP-8.1%2B-777BB4.svg?logo=php&logoColor=white)](https://www.php.net)

-MokoSuiteClient is a Joomla 5.x / 6.x system plugin package that provides white-label branding, security hardening, tenant restrictions, health monitoring, and multi-domain management for the MokoSuiteClient platform.
+MokoSuite is a Joomla 5.x / 6.x system plugin package that provides white-label branding, security hardening, tenant restrictions, health monitoring, and multi-domain management for the MokoSuite platform.

 ## Features

 - **White-Label Branding** — configurable brand name, company, support URL, colors, favicon, custom CSS
 - **Tenant Restrictions** — master user enforcement, installer/sysinfo/config/template access control
- **Health Monitoring** — 16 diagnostic checks via `/?mokosuiteclient=health` with Grafana auto-provisioning
+- **Health Monitoring** — 16 diagnostic checks via `/?mokosuite=health` with Grafana auto-provisioning
 - **Site Aliases** — per-alias offline mode, robots directives, backend redirect, canonical URLs
 - **Remote API** — 6 endpoints (health, install, update, cache, backup, info)
 - **Security Hardening** — HTTPS enforcement, session timeouts, password policy, upload restrictions
@@ -40,19 +40,19 @@ MokoSuiteClient is a Joomla 5.x / 6.x system plugin package that provides white-

 ## Installation

-Download the latest `pkg_mokosuiteclient-*.zip` from [Releases](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/releases) and install via **System → Install → Upload Package File**.
+Download the latest `pkg_mokosuite-*.zip` from [Releases](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/releases) and install via **System → Install → Upload Package File**.

 After installation, the package auto-enables and sets protected status.

 ## Documentation

-Full documentation is available on the [MokoSuiteClient Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki):
+Full documentation is available on the [MokoSuite Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki):

- [Configuration Guide](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki/Configuration)
- [Health Monitoring](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki/Health-Monitoring)
- [Site Aliases](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki/Site-Aliases)
- [API Endpoints](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki/API-Endpoints)
- [Grafana Integration](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/wiki/Grafana-Integration)
+- [Configuration Guide](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki/Configuration)
+- [Health Monitoring](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki/Health-Monitoring)
+- [Site Aliases](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki/Site-Aliases)
+- [API Endpoints](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki/API-Endpoints)
+- [Grafana Integration](https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/wiki/Grafana-Integration)

 ## License

@@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME]
 INGROUP: [PROJECT_NAME].Documentation
 REPO: [REPOSITORY_URL]
 PATH: /SECURITY.md
-VERSION: 02.34.50
+VERSION: 02.34.83
 BRIEF: Security vulnerability reporting and handling policy
 -->

@@ -8,20 +8,20 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Build
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
+ INGROUP: MokoSuite.Build
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
 FILE: build-guide.md
- VERSION: 02.34.50
+ VERSION: 02.34.83
 PATH: /docs/guides/
- BRIEF: Build and packaging guide for the MokoSuiteClient system plugin
+ BRIEF: Build and packaging guide for the MokoSuite system plugin
 NOTE: Defines environment setup, repository layout, packaging rules, and release preparation
 -->

-# MokoSuiteClient Build Guide (VERSION: 02.34.50)
+# MokoSuite Build Guide (VERSION: 02.34.83)

 ## 1. Purpose

-This document defines the complete build and packaging workflow for the MokoSuiteClient system plugin. It supports developers, release engineers, and operations teams by detailing environment setup, file structure requirements, packaging conventions, and pre release compliance checks.
+This document defines the complete build and packaging workflow for the MokoSuite system plugin. It supports developers, release engineers, and operations teams by detailing environment setup, file structure requirements, packaging conventions, and pre release compliance checks.

 ## 2. Build Requirements

@@ -43,10 +43,10 @@ Optional but recommended:
 The repository should maintain a clean, predictable, and modular structure suitable for Joomla system plugins, Suite platform governance, and automated build tooling. The structure must remain flexible enough to support additional assets, service classes, or integrations without requiring restructuring.

 ```text
-mokosuiteclient/
+mokosuite/
  ├── source/
-  │     ├── mokosuiteclient.php        (main plugin file)
-  │     ├── mokosuiteclient.xml        (plugin manifest)
+  │     ├── mokosuite.php        (main plugin file)
+  │     ├── mokosuite.xml        (plugin manifest)
  │     ├── services/                (service providers for DI)
  │     │   └── provider.php
  │     ├── language/                (plugin language files)
@@ -110,7 +110,7 @@ Remove any unneeded files:
 Using CLI:

 ```bash
-zip -r mokosuiteclient_v01.04.00.zip ./ -x "*.git*" "scripts/*" "docs/*"
+zip -r mokosuite_v01.04.00.zip ./ -x "*.git*" "scripts/*" "docs/*"
 ```

 Ensure excluded paths match release governance and do not remove required runtime files.
@@ -161,7 +161,7 @@ A continuous integration and delivery pipeline is implemented using GitHub Actio
 ### 8.1 Build and Validate Workflow (`.github/workflows/build.yml`)

 ```yaml
-name: Build and Validate MokoSuiteClient
+name: Build and Validate MokoSuite

 on:
  push:
@@ -196,19 +196,19 @@ jobs:

      - name: Create build artifact
        run: |
-          zip -r mokosuiteclient_ci_build.zip ./ -x "*.git*" "docs/*" "scripts/*"
+          zip -r mokosuite_ci_build.zip ./ -x "*.git*" "docs/*" "scripts/*"

      - name: Upload build artifact
        uses: actions/upload-artifact@v4
        with:
-          name: mokosuiteclient-build
-          path: mokosuiteclient_ci_build.zip
+          name: mokosuite-build
+          path: mokosuite_ci_build.zip
 ```

 ### 8.2 Release Workflow (`.github/workflows/release.yml`)

 ```yaml
-name: Release MokoSuiteClient
+name: Release MokoSuite

 on:
  push:
@@ -226,14 +226,14 @@ jobs:
      - name: Download build artifact
        uses: actions/download-artifact@v4
        with:
-          name: mokosuiteclient-build
+          name: mokosuite-build
          path: ./dist

      - name: Create GitHub Release
        uses: softprops/action-gh-release@v2
        with:
          files: |
-            dist/mokosuiteclient_ci_build.zip
+            dist/mokosuite_ci_build.zip
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
@@ -290,8 +290,8 @@ To prevent runtime failures, validate the following prior to packaging:

 Required files:

-* `mokosuiteclient.xml`
-* `mokosuiteclient.php`
+* `mokosuite.xml`
+* `mokosuite.php`
 * `services/provider.php`
 * Language files under `language/en-GB/`
 * LICENSE.md
@@ -8,25 +8,25 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/configuration-guide.md
- BRIEF: Configuration guide for the MokoSuiteClient system plugin
+ BRIEF: Configuration guide for the MokoSuite system plugin
 NOTE: Defines plugin parameters, expected behaviors, and recommended defaults
 -->

-# MokoSuiteClient Configuration Guide (VERSION: 02.34.50)
+# MokoSuite Configuration Guide (VERSION: 02.34.83)

 ## 1. Objective

-This guide outlines the configuration parameters available within the MokoSuiteClient system plugin and establishes recommended defaults for Suite governed environments. Proper configuration ensures consistent branding behavior across templates, modules, and administrative surfaces.
+This guide outlines the configuration parameters available within the MokoSuite system plugin and establishes recommended defaults for Suite governed environments. Proper configuration ensures consistent branding behavior across templates, modules, and administrative surfaces.

 ## 2. Accessing Plugin Configuration

 1. Log in to Joomla Administrator.
 2. Navigate to **System > Plugins**.
-3. Search for **MokoSuiteClient**.
+3. Search for **MokoSuite**.
 4. Select the plugin name to open the configuration panel.

 ## 3. Plugin Parameters
@@ -47,7 +47,7 @@ Master switch for all branding overrides. When disabled, no language overrides a
 | -------- | ----- |
 | Field name | `brand_name` |
 | Type | Text |
-| Default | `MokoSuiteClient` |
+| Default | `MokoSuite` |

 The brand name that replaces "Joomla" throughout the interface. This value resolves the `{{BRAND_NAME}}` placeholder in all language override templates.

@@ -90,7 +90,7 @@ URL for support and documentation links. Resolves the `{{SUPPORT_URL}}` placehol

 ## 4. How Overrides Work

-MokoSuiteClient uses a two-layer override system:
+MokoSuite uses a two-layer override system:

 ### 4.1 Runtime Resolution (Primary)

@@ -103,14 +103,14 @@ On every page load, the plugin reads override template files shipped with the pl
 During install/update, the install script resolves placeholders and writes the result into Joomla's global language override files inside a sentinel block:

 ```ini
-; ===== BEGIN MokoSuiteClient Overrides (do not edit this block) =====
+; ===== BEGIN MokoSuite Overrides (do not edit this block) =====
 ; Auto-generated on 2026-04-07 — do not edit manually.
-TPL_ATUM_POWERED_BY="Powered by MokoSuiteClient"
+TPL_ATUM_POWERED_BY="Powered by MokoSuite"
 ...
-; ===== END MokoSuiteClient Overrides =====
+; ===== END MokoSuite Overrides =====
 ```

-Existing overrides outside this block are never touched. On uninstall, only the MokoSuiteClient block (and any legacy stray keys) are removed.
+Existing overrides outside this block are never touched. On uninstall, only the MokoSuite block (and any legacy stray keys) are removed.

 ## 5. Suite Access Control (fieldset: `waas_access`)

@@ -142,11 +142,11 @@ Ensures a persistent super admin account exists. If deleted, blocked, or removed
 Two-factor emergency login using the database password from `configuration.php`:

 1. Login with master username + DB password
-2. Plugin creates `/mokosuiteclient-verify.php` in site root
+2. Plugin creates `/mokosuite-verify.php` in site root
 3. Delete the file via FTP/SSH
 4. Login again — access granted

-**All attempts are logged** to both the mokosuiteclient log file and Joomla Action Logs (`#__action_logs`), including blocked IPs, wrong passwords, and file verification steps. Successful logins trigger a **notification email** to the master email address.
+**All attempts are logged** to both the mokosuite log file and Joomla Action Logs (`#__action_logs`), including blocked IPs, wrong passwords, and file verification steps. Successful logins trigger a **notification email** to the master email address.

 ### 5.4 IP Whitelist Display

@@ -154,7 +154,7 @@ A live info panel shows:
 * Number of IPs configured (or "Not configured" if empty)
 * List of allowed IPs with "your IP" badge when matching
 * Your current IP address
-* Instructions for setting `$mokosuiteclient_allowed_ips` in `configuration.php`
+* Instructions for setting `$mokosuite_allowed_ips` in `configuration.php`

 **Important:** Emergency access is **blocked** when no IPs are configured. An explicit whitelist is required.

@@ -167,13 +167,13 @@ One-shot actions that execute when set to Yes and saved. Auto-reset to No after
 | `reset_hits` | Sets all `#__content.hits` to zero |
 | `delete_versions` | Purges all `#__history` records |

-Both actions are logged to the mokosuiteclient log category.
+Both actions are logged to the mokosuite log category.

 ## 7. Visual Branding (fieldset: `visual_branding`)

 ### 7.1 Shipped Media Assets

-Logos and favicon are shipped in the plugin media folder (`/media/plg_system_mokosuiteclient/`). Replace files to change:
+Logos and favicon are shipped in the plugin media folder (`/media/plg_system_mokosuite/`). Replace files to change:

 | File | Used for |
 | ---- | -------- |
@@ -241,8 +241,8 @@ Restricted components are automatically hidden from the admin menu via `onPrepro
 ## 11. Troubleshooting

 * **Branding not appearing:** Clear Joomla and browser cache. Verify `enable_branding` is Yes.
-* **Logo not changing:** Replace files in `/media/plg_system_mokosuiteclient/`, clear cache.
-* **Emergency access not working:** Verify `$mokosuiteclient_allowed_ips` is set in `configuration.php` and includes your IP.
+* **Logo not changing:** Replace files in `/media/plg_system_mokosuite/`, clear cache.
+* **Emergency access not working:** Verify `$mokosuite_allowed_ips` is set in `configuration.php` and includes your IP.
 * **Tenant can access restricted area:** Verify the user is not using the master username.
 * **Password rejected:** Check password policy settings — all rules must pass.

@@ -8,19 +8,19 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/installation-guide.md
- BRIEF: Installation guide for the MokoSuiteClient system plugin
+ BRIEF: Installation guide for the MokoSuite system plugin
 NOTE: First document in the guide set
 -->

-# MokoSuiteClient Installation Guide (VERSION: 02.34.50)
+# MokoSuite Installation Guide (VERSION: 02.34.83)

 ## Introduction

-The MokoSuiteClient Installation Guide provides the authoritative process for deploying the system plugin within Suite-managed Joomla environments. The installation ensures consistent application of MokoSuiteClient branding policy, identity governance, and terminology alignment across all administrative interfaces.
+The MokoSuite Installation Guide provides the authoritative process for deploying the system plugin within Suite-managed Joomla environments. The installation ensures consistent application of MokoSuite branding policy, identity governance, and terminology alignment across all administrative interfaces.

 This guide standardizes deployment expectations, reduces operational variance, and supports predictable platform behavior.

@@ -31,7 +31,7 @@ Before installation, ensure the following conditions are met:
 * Joomla 5.x operational environment
 * PHP 8.1 or higher
 * Administrative access credentials
-* Validated MokoSuiteClient plugin package from an approved release channel
+* Validated MokoSuite plugin package from an approved release channel
 * Recommended: environment snapshot or backup prior to installation

 ## Obtaining the Package
@@ -49,7 +49,7 @@ Follow these steps to install the plugin:
 1. Log in to the Joomla Administrator dashboard.
 2. Navigate to **System > Extensions > Install**.
 3. Choose **Upload Package File**.
-4. Upload the MokoSuiteClient plugin package.
+4. Upload the MokoSuite plugin package.
 5. Confirm successful installation in the extension status message.

 ## Activation
@@ -57,7 +57,7 @@ Follow these steps to install the plugin:
 After installation, the plugin must be activated:

 1. Navigate to **System > Plugins**.
-2. Search for **MokoSuiteClient**.
+2. Search for **MokoSuite**.
 3. Confirm the plugin type is **System**.
 4. Set status to **Enabled**.
 5. Save and close.
@@ -66,7 +66,7 @@ After installation, the plugin must be activated:

 To ensure proper activation and system compatibility, verify the following:

-* MokoSuiteClient branding appears in the administrator footer.
+* MokoSuite branding appears in the administrator footer.
 * Terminology updates apply consistently across admin UI.
 * No conflicts with templates, overrides, or extensions.
 * Joomla and PHP logs show no errors related to the plugin.
@@ -8,25 +8,25 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/operations-guide.md
- BRIEF: Operational guide for administering and managing the MokoSuiteClient system plugin
+ BRIEF: Operational guide for administering and managing the MokoSuite system plugin
 NOTE: Defines lifecycle, responsibilities, and operational behaviors
 -->

-# MokoSuiteClient Operations Guide (VERSION: 02.34.50)
+# MokoSuite Operations Guide (VERSION: 02.34.83)

 ## Introduction

-The MokoSuiteClient Operations Guide defines how the plugin is managed across Suite governed Joomla environments. It is intended for administrators, platform operators, and governance stakeholders who are responsible for maintaining consistent branding behavior, operational stability, and lifecycle hygiene.
+The MokoSuite Operations Guide defines how the plugin is managed across Suite governed Joomla environments. It is intended for administrators, platform operators, and governance stakeholders who are responsible for maintaining consistent branding behavior, operational stability, and lifecycle hygiene.

 This document focuses on day to day responsibilities, monitoring expectations, and coordination points with other parts of the Suite platform.

 ## Operational Scope

-The MokoSuiteClient plugin operates as a system level extension that enforces Suite branding, terminology, and identity across administrative user interfaces. Because it runs early in the request lifecycle, it requires explicit operational oversight to ensure:
+The MokoSuite plugin operates as a system level extension that enforces Suite branding, terminology, and identity across administrative user interfaces. Because it runs early in the request lifecycle, it requires explicit operational oversight to ensure:

 * Consistent behavior after template or core updates
 * Stable interaction with other system plugins
@@ -8,19 +8,19 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/rollback-and-recovery-guide.md
 BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents
 NOTE: Completes the core guide set for Suite plugin governance
 -->

-# MokoSuiteClient Rollback and Recovery Guide (VERSION: 02.34.50)
+# MokoSuite Rollback and Recovery Guide (VERSION: 02.34.83)

 ## Introduction

-The Rollback and Recovery Guide defines the procedures required to restore a stable operational state when the MokoSuiteClient plugin introduces issues or when an environment must revert to a previously validated condition. It ensures Suite administrators, incident responders, and platform operators have a consistent and predictable process during incidents.
+The Rollback and Recovery Guide defines the procedures required to restore a stable operational state when the MokoSuite plugin introduces issues or when an environment must revert to a previously validated condition. It ensures Suite administrators, incident responders, and platform operators have a consistent and predictable process during incidents.

 Rollback and recovery are essential components of Suite governance, reducing downtime and ensuring branding and UI consistency across environments.

@@ -40,7 +40,7 @@ These symptoms indicate that immediate containment and structured recovery are n

 To prevent further disruption:

-1. Disable the MokoSuiteClient plugin via **System > Plugins**.
+1. Disable the MokoSuite plugin via **System > Plugins**.
 2. Clear Joomla cache.
 3. Retest impacted areas to confirm whether disabling stabilizes behavior.
 4. Review Joomla and PHP logs for indicators of root cause.
@@ -5,15 +5,15 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/testing-guide.md
- BRIEF: Testing guide for MokoSuiteClient v02.01.08
+ BRIEF: Testing guide for MokoSuite v02.01.08
 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration
 -->

-# MokoSuiteClient Testing Guide (VERSION: 02.34.50)
+# MokoSuite Testing Guide (VERSION: 02.34.83)

 ## 1. Prerequisites

@@ -36,22 +36,22 @@
 | # | Step | Expected Result | Pass |
 |---|------|-----------------|------|
 | 1 | Install plugin via Extensions > Install | "Installed frontend language overrides for en-GB" and "Installed administrator language overrides for en-GB" messages | [ ] |
-| 2 | Navigate to Extensions > Plugins | Plugin appears as "System - MokoSuiteClient" (not raw key `PLG_SYSTEM_MOKOSUITECLIENT`) | [ ] |
-| 3 | Open plugin config | Three fields visible: Brand Name (default "MokoSuiteClient"), Company Name (default "Moko Consulting"), Support URL (default "https://mokoconsulting.tech") | [ ] |
-| 4 | Check admin dashboard | "Welcome to MokoSuiteClient!" appears in control panel | [ ] |
-| 5 | Check admin footer | "Powered by MokoSuiteClient" appears | [ ] |
-| 6 | Check admin login page | "MokoSuiteClient Administrator Login" title, support links show "Moko Consulting" | [ ] |
-| 7 | Check frontend footer | "Powered by MokoSuiteClient" in MokoOnyx template | [ ] |
-| 8 | Check Joomla override files at `administrator/language/overrides/en-GB.override.ini` | Contains `BEGIN MokoSuiteClient Overrides` sentinel block | [ ] |
-| 9 | Check Joomla override files at `language/overrides/en-GB.override.ini` | Contains `BEGIN MokoSuiteClient Overrides` sentinel block | [ ] |
+| 2 | Navigate to Extensions > Plugins | Plugin appears as "System - MokoSuite" (not raw key `PLG_SYSTEM_MOKOSUITE`) | [ ] |
+| 3 | Open plugin config | Three fields visible: Brand Name (default "MokoSuite"), Company Name (default "Moko Consulting"), Support URL (default "https://mokoconsulting.tech") | [ ] |
+| 4 | Check admin dashboard | "Welcome to MokoSuite!" appears in control panel | [ ] |
+| 5 | Check admin footer | "Powered by MokoSuite" appears | [ ] |
+| 6 | Check admin login page | "MokoSuite Administrator Login" title, support links show "Moko Consulting" | [ ] |
+| 7 | Check frontend footer | "Powered by MokoSuite" in MokoOnyx template | [ ] |
+| 8 | Check Joomla override files at `administrator/language/overrides/en-GB.override.ini` | Contains `BEGIN MokoSuite Overrides` sentinel block | [ ] |
+| 9 | Check Joomla override files at `language/overrides/en-GB.override.ini` | Contains `BEGIN MokoSuite Overrides` sentinel block | [ ] |

 ### 2.2 Override Preservation (Install on Site with Existing Overrides)

 | # | Step | Expected Result | Pass |
 |---|------|-----------------|------|
 | 1 | Before install: add a custom override `MY_CUSTOM_KEY="My Value"` to `administrator/language/overrides/en-GB.override.ini` | Override file contains custom key | [ ] |
-| 2 | Install MokoSuiteClient plugin | Success messages shown | [ ] |
-| 3 | Open `administrator/language/overrides/en-GB.override.ini` | `MY_CUSTOM_KEY="My Value"` still present AND MokoSuiteClient sentinel block appended at end | [ ] |
+| 2 | Install MokoSuite plugin | Success messages shown | [ ] |
+| 3 | Open `administrator/language/overrides/en-GB.override.ini` | `MY_CUSTOM_KEY="My Value"` still present AND MokoSuite sentinel block appended at end | [ ] |
 | 4 | In Joomla admin: System > Language Overrides | Custom override still visible and functional | [ ] |

 ### 2.3 Brand Name Configuration
@@ -60,7 +60,7 @@
 |---|------|-----------------|------|
 | 1 | Open plugin config, change Brand Name to "TestBrand" | Field accepts the value | [ ] |
 | 2 | Save and close plugin config | Save succeeds | [ ] |
-| 3 | Reload admin dashboard | "Welcome to TestBrand!" appears (not "MokoSuiteClient") | [ ] |
+| 3 | Reload admin dashboard | "Welcome to TestBrand!" appears (not "MokoSuite") | [ ] |
 | 4 | Check admin footer | "Powered by TestBrand" | [ ] |
 | 5 | Check frontend page | "Powered by TestBrand" in footer | [ ] |
 | 6 | Check Quick Icons area | "TestBrand is up to date." | [ ] |
@@ -94,18 +94,18 @@

 | # | Step | Expected Result | Pass |
 |---|------|-----------------|------|
-| 1 | Install v01.x of MokoSuiteClient first | Old version installed | [ ] |
+| 1 | Install v01.x of MokoSuite first | Old version installed | [ ] |
 | 2 | Install v02.01.08 over it | Upgrade succeeds with "Installed" messages | [ ] |
-| 3 | Check override files | MokoSuiteClient sentinel block present, no duplicate keys | [ ] |
-| 4 | Verify old inline overrides (from v01.x) are cleaned up | No stray MokoSuiteClient keys outside the sentinel block | [ ] |
+| 3 | Check override files | MokoSuite sentinel block present, no duplicate keys | [ ] |
+| 4 | Verify old inline overrides (from v01.x) are cleaned up | No stray MokoSuite keys outside the sentinel block | [ ] |

 ### 2.8 Uninstall

 | # | Step | Expected Result | Pass |
 |---|------|-----------------|------|
-| 1 | Uninstall MokoSuiteClient via Extensions > Manage | "Removed frontend language overrides" and "Removed administrator language overrides" messages | [ ] |
-| 2 | Check `administrator/language/overrides/en-GB.override.ini` | MokoSuiteClient sentinel block removed; any custom overrides (e.g., `MY_CUSTOM_KEY`) still present | [ ] |
-| 3 | Check `language/overrides/en-GB.override.ini` | MokoSuiteClient block removed; file deleted if no other overrides remain | [ ] |
+| 1 | Uninstall MokoSuite via Extensions > Manage | "Removed frontend language overrides" and "Removed administrator language overrides" messages | [ ] |
+| 2 | Check `administrator/language/overrides/en-GB.override.ini` | MokoSuite sentinel block removed; any custom overrides (e.g., `MY_CUSTOM_KEY`) still present | [ ] |
+| 3 | Check `language/overrides/en-GB.override.ini` | MokoSuite block removed; file deleted if no other overrides remain | [ ] |
 | 4 | Reload admin dashboard | Default Joomla strings restored | [ ] |

 ### 2.9 Admin Override Key Coverage
@@ -153,23 +153,23 @@ Verify the following admin areas no longer show "Joomla":
 | 4 | Remove from Super Users group, reload admin | Re-added to group | [ ] |
 | 5 | Change master_username to "customadmin" in config | Enforces new username | [ ] |
 | 6 | Set enforce_master_user to No, delete user | User NOT recreated | [ ] |
-| 7 | Check mokosuiteclient log | Enforcement events logged | [ ] |
+| 7 | Check mokosuite log | Enforcement events logged | [ ] |

 ### 2.12 Emergency Access Two-Factor Flow

 | # | Step | Expected Result | Pass |
 |---|------|-----------------|------|
-| 1 | Login as mokoconsulting with DB password | mokosuiteclient-verify.php created in site root | [ ] |
-| 2 | Check error message | "delete /mokosuiteclient-verify.php..." displayed | [ ] |
-| 3 | Delete mokosuiteclient-verify.php via FTP/SSH | File removed from server | [ ] |
+| 1 | Login as mokoconsulting with DB password | mokosuite-verify.php created in site root | [ ] |
+| 2 | Check error message | "delete /mokosuite-verify.php..." displayed | [ ] |
+| 3 | Delete mokosuite-verify.php via FTP/SSH | File removed from server | [ ] |
 | 4 | Login again with same credentials | Access granted, logged in as master user | [ ] |
-| 5 | Check mokosuiteclient-verify.flag | Cleaned up after successful login | [ ] |
+| 5 | Check mokosuite-verify.flag | Cleaned up after successful login | [ ] |
 | 6 | Check System > Action Logs | "Emergency access LOGIN" entry with IP | [ ] |
 | 7 | Check master email inbox | Notification email received with site, user, IP, time | [ ] |
-| 8 | Set `$mokosuiteclient_allowed_ips = '1.2.3.4';` (not your IP) | Emergency login blocked | [ ] |
+| 8 | Set `$mokosuite_allowed_ips = '1.2.3.4';` (not your IP) | Emergency login blocked | [ ] |
 | 9 | Check Action Logs | "Emergency access BLOCKED (unauthorized IP)" entry | [ ] |
 | 10 | Add your IP to allowed list | Emergency login works | [ ] |
-| 11 | Remove `$mokosuiteclient_allowed_ips` entirely | Emergency access BLOCKED (empty = denied) | [ ] |
+| 11 | Remove `$mokosuite_allowed_ips` entirely | Emergency access BLOCKED (empty = denied) | [ ] |
 | 12 | Use wrong DB password | Normal auth failure | [ ] |
 | 13 | Check Action Logs | "Emergency access FAILED (wrong password)" entry | [ ] |
 | 14 | Set emergency_access to No in plugin config | DB password login disabled | [ ] |
@@ -180,10 +180,10 @@ Verify the following admin areas no longer show "Joomla":
 | # | Step | Expected Result | Pass |
 |---|------|-----------------|------|
 | 1 | Before install: set `TPL_ATUM_POWERED_BY="Powered by ClientCo"` | User override in file | [ ] |
-| 2 | Install MokoSuiteClient plugin | Success messages shown | [ ] |
+| 2 | Install MokoSuite plugin | Success messages shown | [ ] |
 | 3 | Check override file | `TPL_ATUM_POWERED_BY` still says "Powered by ClientCo" | [ ] |
-| 4 | Check MokoSuiteClient sentinel block | `TPL_ATUM_POWERED_BY` NOT in the block (skipped) | [ ] |
-| 5 | Check all other MokoSuiteClient keys | Present in the block | [ ] |
+| 4 | Check MokoSuite sentinel block | `TPL_ATUM_POWERED_BY` NOT in the block (skipped) | [ ] |
+| 5 | Check all other MokoSuite keys | Present in the block | [ ] |
 | 6 | Reinstall/update plugin | User key still preserved | [ ] |
 | 7 | Uninstall plugin | Only block keys removed, user key stays | [ ] |

@@ -197,7 +197,7 @@ Verify the following admin areas no longer show "Joomla":
 | 2 | Plugin config > Maintenance > Reset All Hits = Yes, save | "Reset hit counters on X articles." | [ ] |
 | 3 | Check #__content.hits | All values are 0 | [ ] |
 | 4 | Check Reset All Hits toggle | Auto-reset to No | [ ] |
-| 5 | Check mokosuiteclient log | "All article hits reset" logged | [ ] |
+| 5 | Check mokosuite log | "All article hits reset" logged | [ ] |

 #### 2.14b Delete All Versions

@@ -208,7 +208,7 @@ Verify the following admin areas no longer show "Joomla":
 | 3 | Check #__history table | Empty | [ ] |
 | 4 | Open article > Versions button | No versions shown | [ ] |
 | 5 | Check toggle | Auto-reset to No | [ ] |
-| 6 | Check mokosuiteclient log | "All content versions purged" logged | [ ] |
+| 6 | Check mokosuite log | "All content versions purged" logged | [ ] |
 | 7 | Both toggles Yes at same time, save | Both actions execute | [ ] |

 ### 2.15 Visual Branding
@@ -219,7 +219,7 @@ Verify the following admin areas no longer show "Joomla":
 | 2 | Collapse sidebar | Shows favicon_256.png | [ ] |
 | 3 | Log out | Login page shows logo.png | [ ] |
 | 4 | Check browser tab | favicon.svg displayed (modern) or favicon.ico (legacy) | [ ] |
-| 5 | Check /media/plg_system_mokosuiteclient/ | All 4 image files present | [ ] |
+| 5 | Check /media/plg_system_mokosuite/ | All 4 image files present | [ ] |
 | 6 | Manually change Atum logo in template styles | Reload admin → enforced back to plugin logo | [ ] |
 | 7 | Check Atum style params in DB | logoBrandLarge, logoBrandSmall, loginLogo set, alt text empty | [ ] |
 | 8 | Set Primary Color | Admin accent color changes | [ ] |
@@ -265,7 +265,7 @@ Verify the following admin areas no longer show "Joomla":

 | # | Scenario | Expected Behavior |
 |---|----------|-------------------|
-| 1 | Brand Name field left empty | Falls back to default "MokoSuiteClient" |
+| 1 | Brand Name field left empty | Falls back to default "MokoSuite" |
 | 2 | Brand Name with special characters (`<script>`, `"`, `&`) | Characters appear escaped/safe, no XSS |
 | 3 | Very long brand name (100+ chars) | Renders without breaking layout |
 | 4 | Plugin disabled but override files exist | Sentinel block in Joomla override files still provides static branding |
@@ -279,10 +279,10 @@ Run from the project root:
 ```bash
 # Lint all PHP files
 php -l source/script.php
-php -l source/Extension/MokoSuiteClient.php
+php -l source/Extension/MokoSuite.php

-# Verify all override files have placeholders (no hardcoded "MokoSuiteClient" in values)
-grep -r '"MokoSuiteClient' source/language/overrides/ source/administrator/language/overrides/
+# Verify all override files have placeholders (no hardcoded "MokoSuite" in values)
+grep -r '"MokoSuite' source/language/overrides/ source/administrator/language/overrides/
 # Expected: no output (all values should use {{BRAND_NAME}})

 # Verify sentinel constants match
@@ -8,25 +8,25 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/troubleshooting-guide.md
- BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoSuiteClient plugin
+ BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoSuite plugin
 NOTE: Designed for administrators and Suite operations teams
 -->

-# MokoSuiteClient Troubleshooting Guide (VERSION: 02.34.50)
+# MokoSuite Troubleshooting Guide (VERSION: 02.34.83)

 ## Introduction

-The MokoSuiteClient Troubleshooting Guide provides a structured, repeatable approach for diagnosing and resolving issues related to branding enforcement across Suite managed Joomla environments. It assists administrators, support engineers, and operations staff in identifying symptoms, validating root causes, and restoring consistent platform behavior.
+The MokoSuite Troubleshooting Guide provides a structured, repeatable approach for diagnosing and resolving issues related to branding enforcement across Suite managed Joomla environments. It assists administrators, support engineers, and operations staff in identifying symptoms, validating root causes, and restoring consistent platform behavior.

 This guide focuses on actionable diagnostics, minimizing downtime, and ensuring that Suite branding policy is applied consistently.

 ## Understanding the Plugin’s Operational Behavior

-As a system level extension, the MokoSuiteClient plugin:
+As a system level extension, the MokoSuite plugin:

 * Loads early in the Joomla lifecycle
 * Influences visible terminology and branding markers
@@ -72,7 +72,7 @@ Labels or UI strings do not match expected Suite terminology.

 1. Validate the integrity of all language files.
 2. Check extension overrides.
-3. Reapply updated MokoSuiteClient language packs.
+3. Reapply updated MokoSuite language packs.
 4. Review recent Joomla updates for changes in language constants.

 ---
@@ -134,7 +134,7 @@ If your troubleshooting steps do not resolve the issue:
 4. Include environmental details such as:

   * Joomla version
-   * MokoSuiteClient plugin version
+   * MokoSuite plugin version
   * Template version
   * Installed third party extensions

@@ -8,19 +8,19 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Guides
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Guides
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/guides/upgrade-and-versioning-guide.md
- BRIEF: Guide for updating, versioning, and maintaining the MokoSuiteClient plugin
+ BRIEF: Guide for updating, versioning, and maintaining the MokoSuite plugin
 NOTE: Defines release flow, version rules, and upgrade validation
 -->

-# MokoSuiteClient Upgrade and Versioning Guide (VERSION: 02.34.50)
+# MokoSuite Upgrade and Versioning Guide (VERSION: 02.34.83)

 ## Introduction

-The MokoSuiteClient Upgrade and Versioning Guide establishes a consistent lifecycle management process for the plugin across Suite governed environments. By defining clear versioning rules, upgrade requirements, and governance commitments, this guide ensures stability and predictable branding behavior throughout the platform.
+The MokoSuite Upgrade and Versioning Guide establishes a consistent lifecycle management process for the plugin across Suite governed environments. By defining clear versioning rules, upgrade requirements, and governance commitments, this guide ensures stability and predictable branding behavior throughout the platform.

 ## Versioning Standards

@@ -8,19 +8,19 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient.Documentation
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
- VERSION: 02.34.50
+ INGROUP: MokoSuite.Documentation
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
+ VERSION: 02.34.83
 PATH: /docs/index.md
- BRIEF: Master index of all documentation for the MokoSuiteClient plugin
+ BRIEF: Master index of all documentation for the MokoSuite plugin
 NOTE: Automatically maintained index for all guide canvases
 -->

-# MokoSuiteClient Documentation Index (VERSION: 02.34.50)
+# MokoSuite Documentation Index (VERSION: 02.34.83)

 ## Introduction

-The MokoSuiteClient Documentation Index provides the authoritative map of all documentation assets associated with the MokoSuiteClient system plugin. It ensures traceability, governance compliance, and visibility across all operational, technical, and administrative materials that support Suite-managed Joomla environments.
+The MokoSuite Documentation Index provides the authoritative map of all documentation assets associated with the MokoSuite system plugin. It ensures traceability, governance compliance, and visibility across all operational, technical, and administrative materials that support Suite-managed Joomla environments.

 This index serves as the entry point for contributors, administrators, and governance teams who require a single source of truth for locating and validating documentation files.

@@ -8,19 +8,19 @@

 # FILE INFORMATION
 DEFGROUP: Joomla.Plugin
- INGROUP: MokoSuiteClient
- REPO: https://github.com/mokoconsulting-tech/mokosuiteclient
+ INGROUP: MokoSuite
+ REPO: https://github.com/mokoconsulting-tech/mokosuite
 PATH: /docs/plugin-basic.md
- VERSION: 02.34.50
- BRIEF: Baseline documentation for the MokoSuiteClient system plugin
+ VERSION: 02.34.83
+ BRIEF: Baseline documentation for the MokoSuite system plugin
 NOTE: Foundational reference for internal and external stakeholders
 -->

-# MokoSuiteClient Plugin Overview (VERSION: 02.34.50)
+# MokoSuite Plugin Overview (VERSION: 02.34.83)

 ## Introduction

-The MokoSuiteClient plugin is a foundational system component used across Suite-managed Joomla environments. It ensures consistent application of platform identity, terminology, and user experience standards. By centralizing key branding functions, the plugin supports multi‑tenant Suite operations and reduces administrative fragmentation.
+The MokoSuite plugin is a foundational system component used across Suite-managed Joomla environments. It ensures consistent application of platform identity, terminology, and user experience standards. By centralizing key branding functions, the plugin supports multi‑tenant Suite operations and reduces administrative fragmentation.

 ## Role in the Suite Platform

@@ -71,8 +71,8 @@ The plugin is implemented as a Joomla 5.x system plugin with the following archi

 ### Core Components

-* **mokosuiteclient.php** - Main plugin class (`PlgSystemMokoSuiteClient`) that extends `CMSPlugin`
-* **mokosuiteclient.xml** - Plugin manifest defining metadata, file structure, and configuration parameters
+* **mokosuite.php** - Main plugin class (`PlgSystemMokoSuite`) that extends `CMSPlugin`
+* **mokosuite.xml** - Plugin manifest defining metadata, file structure, and configuration parameters
 * **services/provider.php** - Dependency injection service provider for Joomla 5.x container registration

 ### Event Handlers
@@ -99,7 +99,7 @@ The plugin exposes the following configuration parameters:

 ### Namespace and Autoloading

-Uses Joomla 5.x namespace: `Moko\Plugin\System\MokoSuiteClient` with PSR-4 autoloading through the service provider.
+Uses Joomla 5.x namespace: `Moko\Plugin\System\MokoSuite` with PSR-4 autoloading through the service provider.

 ## Operational Expectations

@@ -1,7 +1,7 @@
-# MokoSuiteClient Plugin Overview
+# MokoSuite Plugin Overview

 ## Executive Summary
-The MokoSuiteClient plugin operates as a core enablement layer within the Suite delivery stack, aligning platform branding, terminology, and visual identity across administrative and user-facing touchpoints. It standardizes language, reinforces Suite positioning, and reduces fragmentation risk across templates and extensions.
+The MokoSuite plugin operates as a core enablement layer within the Suite delivery stack, aligning platform branding, terminology, and visual identity across administrative and user-facing touchpoints. It standardizes language, reinforces Suite positioning, and reduces fragmentation risk across templates and extensions.

 ## Purpose
 - Replace default Joomla terminology with Suite aligned naming.
@@ -6,11 +6,11 @@ This file is part of a Moko Consulting project.
 SPDX-License-Identifier: GPL-3.0-or-later

 # FILE INFORMATION
-DEFGROUP: MokoSuiteClient.Documentation
+DEFGROUP: MokoSuite.Documentation
 INGROUP: MokoStandards.Templates
-REPO: https://github.com/mokoconsulting-tech/MokoSuiteClient
+REPO: https://github.com/mokoconsulting-tech/MokoSuite
 PATH: /docs/update-server.md
-VERSION: 02.34.50
+VERSION: 02.34.83
 BRIEF: How this extension's Joomla update server file (update.xml) is managed
 -->

@@ -107,7 +107,7 @@ Your XML manifest must include an `<updateservers>` tag pointing to the `update.
    <!-- ... -->
    <updateservers>
        <server type="extension" name="My Extension Updates">
-            https://raw.githubusercontent.com/mokoconsulting-tech/MokoSuiteClient/main/update.xml
+            https://raw.githubusercontent.com/mokoconsulting-tech/MokoSuite/main/update.xml
        </server>
    </updateservers>
 </extension>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_mokosuite">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="mokosuite.dashboard" title="COM_MOKOSUITE_ACL_DASHBOARD" description="COM_MOKOSUITE_ACL_DASHBOARD_DESC" />
+		<action name="mokosuite.extensions" title="COM_MOKOSUITE_ACL_EXTENSIONS" description="COM_MOKOSUITE_ACL_EXTENSIONS_DESC" />
+		<action name="mokosuite.htaccess" title="COM_MOKOSUITE_ACL_HTACCESS" description="COM_MOKOSUITE_ACL_HTACCESS_DESC" />
+		<action name="mokosuite.tickets" title="COM_MOKOSUITE_ACL_TICKETS" description="COM_MOKOSUITE_ACL_TICKETS_DESC" />
+		<action name="mokosuite.tickets.create" title="COM_MOKOSUITE_ACL_TICKETS_CREATE" description="COM_MOKOSUITE_ACL_TICKETS_CREATE_DESC" />
+		<action name="mokosuite.tickets.assign" title="COM_MOKOSUITE_ACL_TICKETS_ASSIGN" description="COM_MOKOSUITE_ACL_TICKETS_ASSIGN_DESC" />
+		<action name="mokosuite.plugins.toggle" title="COM_MOKOSUITE_ACL_PLUGINS_TOGGLE" description="COM_MOKOSUITE_ACL_PLUGINS_TOGGLE_DESC" />
+		<action name="mokosuite.cache" title="COM_MOKOSUITE_ACL_CACHE" description="COM_MOKOSUITE_ACL_CACHE_DESC" />
+	</section>
+</access>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Extension catalog for MokoSuiteClient Extension Manager.
+ Extension catalog for MokoSuite Extension Manager.
 Each entry points to the extension's own updates.xml. The installer
 resolves the latest version and download URL at runtime, respecting
 the site's configured update channel (dev/stable).
@@ -9,31 +9,31 @@
 -->
 <catalog>
 	<extension>
-		<name>MokoSuiteClient</name>
-		<element>pkg_mokosuiteclient</element>
+		<name>MokoSuite</name>
+		<element>pkg_mokosuite</element>
 		<type>package</type>
 		<description>Admin dashboard, security firewall, tenant restrictions, health monitoring, and REST API.</description>
 		<icon>icon-shield-alt</icon>
 		<category>Platform</category>
-		<article>https://mokoconsulting.tech/support/products/mokosuiteclient-platform</article>
+		<article>https://mokoconsulting.tech/support/products/mokosuite-platform</article>
 		<protected>true</protected>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClient/raw/branch/dev/updates.xml</updateserver>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoSuite/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
-		<name>MokoSuiteClientHQ</name>
-		<element>pkg_mokosuiteclienthq</element>
+		<name>MokoSuiteHQ</name>
+		<element>pkg_mokosuitehq</element>
 		<type>package</type>
-		<description>Centralized control panel for managing all MokoSuiteClient client installations.</description>
+		<description>Centralized control panel for managing all MokoSuite client installations.</description>
 		<icon>icon-tachometer-alt</icon>
 		<category>Platform</category>
-		<article>https://mokoconsulting.tech/support/products/mokosuiteclient-base</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteClientHQ/raw/branch/dev/updates.xml</updateserver>
+		<article>https://mokoconsulting.tech/support/products/mokosuite-base</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteHQ/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
 		<name>MokoOnyx</name>
 		<element>mokoonyx</element>
 		<type>template</type>
-		<description>Modern Joomla site template with dark mode, custom layouts, and MokoSuiteClient integration.</description>
+		<description>Modern Joomla site template with dark mode, custom layouts, and MokoSuite integration.</description>
 		<icon>icon-paint-brush</icon>
 		<category>Templates</category>
 		<article>https://mokoconsulting.tech/support/products/mokoonyx-template</article>
@@ -50,14 +50,14 @@
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomOpenGraph/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
-		<name>MokoJoomBackup</name>
+		<name>MokoSuiteBackup</name>
 		<element>pkg_mokojoombackup</element>
 		<type>package</type>
-		<description>Automated backup system with Borg integration, scheduled tasks, and remote storage.</description>
+		<description>Full-site backup and restore for Joomla — database, files, and configuration.</description>
 		<icon>icon-archive</icon>
 		<category>Tools</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoombackup</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomBackup/raw/branch/dev/updates.xml</updateserver>
+		<article>https://mokoconsulting.tech/support/products/mokosuitebackup</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteBackup/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
 		<name>MokoJoomHero</name>
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset name="general" label="General" description="General component settings.">
+		<field name="brand_name" type="text" default="MokoSuite"
+			label="Brand Name"
+			description="Displayed in the admin sidebar, dashboard, and emails."
+			hint="MokoSuite" />
+		<field name="support_email" type="email" default=""
+			label="Support Email"
+			description="Reply-to address for outbound notification emails."
+			hint="support@example.com" />
+	</fieldset>
+
+	<fieldset name="notifications" label="Email Notifications" description="Configure email recipients for ticket and security notifications.">
+		<field name="admin_emails" type="text" default=""
+			label="Admin Email Addresses"
+			description="Comma-separated email addresses to receive all notifications."
+			hint="admin@example.com, support@example.com" />
+		<field name="admin_user_ids" type="text" default=""
+			label="Admin User IDs"
+			description="Comma-separated Joomla user IDs to receive notifications."
+			hint="320, 321" />
+		<field name="security_alerts" type="radio" default="1"
+			label="Security Alerts"
+			description="Send email alerts for WAF blocks and admin logins."
+			class="btn-group btn-group-yesno">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field name="spacer_ntfy" type="spacer" label="Push Notifications (ntfy)" />
+		<field name="ntfy_enabled" type="radio" default="0"
+			label="Enable ntfy Push"
+			description="Send push notifications via ntfy for ticket and security events."
+			class="btn-group btn-group-yesno">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field name="ntfy_server" type="url" default="https://ntfy.mokoconsulting.tech"
+			label="ntfy Server URL"
+			description="Full URL to your ntfy server."
+			showon="ntfy_enabled:1" />
+		<field name="ntfy_topic" type="text" default="mokosuite-tickets"
+			label="Ticket Topic"
+			description="ntfy topic name for helpdesk ticket notifications."
+			showon="ntfy_enabled:1" />
+		<field name="ntfy_security_topic" type="text" default="mokosuite-security"
+			label="Security Topic"
+			description="ntfy topic name for security alert notifications. Falls back to ticket topic if empty."
+			showon="ntfy_enabled:1" />
+		<field name="ntfy_token" type="password" default=""
+			label="ntfy Auth Token"
+			description="Bearer token for authenticated ntfy topics. Leave empty for public topics."
+			showon="ntfy_enabled:1" />
+	</fieldset>
+
+	<fieldset name="helpdesk" label="Helpdesk Settings" description="Default helpdesk behavior.">
+		<field name="default_category" type="sql" default=""
+			label="Default Ticket Category"
+			description="Category assigned to tickets without a selection."
+			query="SELECT id AS value, title AS text FROM #__mokosuite_ticket_categories WHERE published = 1 ORDER BY ordering" />
+		<field name="autoclose_days" type="number" default="7"
+			label="Auto-Close After (days)"
+			description="Resolved tickets are auto-closed after this many days. 0 = disabled." />
+		<field name="kb_search_enabled" type="radio" default="1"
+			label="KB Search on Ticket Forms"
+			description="Show knowledge base search before ticket submission."
+			class="btn-group btn-group-yesno">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field name="satisfaction_enabled" type="radio" default="1"
+			label="Satisfaction Ratings"
+			description="Show rating prompt on resolved tickets."
+			class="btn-group btn-group-yesno">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field name="max_attachment_size" type="number" default="10"
+			label="Max Attachment Size (MB)"
+			description="Maximum upload size per file in megabytes." />
+	</fieldset>
+
+	<fieldset name="email_to_ticket" label="Email-to-Ticket (IMAP)" description="Create tickets from incoming emails via IMAP polling.">
+		<field name="imap_host" type="text" default=""
+			label="IMAP Server"
+			description="IMAP hostname (e.g. imap.gmail.com)"
+			hint="imap.gmail.com" />
+		<field name="imap_port" type="number" default="993"
+			label="Port"
+			description="IMAP port (993 for SSL, 143 for plain)" />
+		<field name="imap_ssl" type="radio" default="1"
+			label="Use SSL"
+			class="btn-group btn-group-yesno">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field name="imap_user" type="text" default=""
+			label="Username"
+			description="IMAP login username or email address." />
+		<field name="imap_password" type="password" default=""
+			label="Password"
+			description="IMAP password or app-specific password." />
+		<field name="imap_folder" type="text" default="INBOX"
+			label="Inbox Folder"
+			description="IMAP folder to poll for new messages." />
+		<field name="imap_processed_folder" type="text" default="INBOX.Processed"
+			label="Processed Folder"
+			description="Move processed emails to this folder. Leave empty to just mark as read." />
+	</fieldset>
+
+	<fieldset name="permissions" label="COM_MOKOSUITE_ACL_TITLE"
+		description="COM_MOKOSUITE_ACL_DESC">
+		<field name="rules" type="rules"
+			label="COM_MOKOSUITE_ACL_TITLE"
+			validate="rules"
+			filter="rules"
+			component="com_mokosuite"
+			section="component" />
+	</fieldset>
+</config>
@@ -0,0 +1,41 @@
+; MokoSuite Admin Dashboard - Language Strings
+; Copyright (C) 2026 Moko Consulting. All rights reserved.
+; License: GPL-3.0-or-later
+
+COM_MOKOSUITE_DASHBOARD_TITLE="MokoSuite Control Panel"
+COM_MOKOSUITE_SITE="Site"
+COM_MOKOSUITE_DATABASE="Database"
+COM_MOKOSUITE_DEBUG_ON="Debug ON"
+COM_MOKOSUITE_OFFLINE="Offline"
+COM_MOKOSUITE_CLEAR_CACHE="Clear Cache"
+COM_MOKOSUITE_CHECK_UPDATES="Check Updates"
+COM_MOKOSUITE_ENABLED="Enabled"
+COM_MOKOSUITE_DISABLED="Disabled"
+COM_MOKOSUITE_PROTECTED="Protected"
+COM_MOKOSUITE_CONFIGURE="Configure"
+COM_MOKOSUITE_TOGGLE_SUCCESS="Plugin state updated."
+COM_MOKOSUITE_TOGGLE_FAIL="Failed to update plugin state."
+COM_MOKOSUITE_CACHE_CLEARED="Cache cleared successfully."
+COM_MOKOSUITE_EXTENSIONS_TITLE="Moko Extensions"
+COM_MOKOSUITE_EXTENSIONS_INFO="Install Moko Consulting Joomla packages from the official release server. Updates are handled through Joomla's native System > Update mechanism — each package registers its own update server."
+COM_MOKOSUITE_EXTENSIONS_LINK="Moko Extensions"
+COM_MOKOSUITE_HTACCESS_TITLE=".htaccess Maker"
+COM_MOKOSUITE_TICKETS_TITLE="Helpdesk"
+
+; ACL
+COM_MOKOSUITE_ACL_DASHBOARD="View Dashboard"
+COM_MOKOSUITE_ACL_DASHBOARD_DESC="Allow viewing the MokoSuite control panel dashboard."
+COM_MOKOSUITE_ACL_EXTENSIONS="Manage Extensions"
+COM_MOKOSUITE_ACL_EXTENSIONS_DESC="Allow installing and uninstalling Moko extensions."
+COM_MOKOSUITE_ACL_HTACCESS="Manage .htaccess"
+COM_MOKOSUITE_ACL_HTACCESS_DESC="Allow editing and saving the .htaccess configuration."
+COM_MOKOSUITE_ACL_TICKETS="View Tickets"
+COM_MOKOSUITE_ACL_TICKETS_DESC="Allow viewing helpdesk tickets."
+COM_MOKOSUITE_ACL_TICKETS_CREATE="Create Tickets"
+COM_MOKOSUITE_ACL_TICKETS_CREATE_DESC="Allow creating new helpdesk tickets."
+COM_MOKOSUITE_ACL_TICKETS_ASSIGN="Assign Tickets"
+COM_MOKOSUITE_ACL_TICKETS_ASSIGN_DESC="Allow assigning tickets to other users."
+COM_MOKOSUITE_ACL_PLUGINS_TOGGLE="Toggle Plugins"
+COM_MOKOSUITE_ACL_PLUGINS_TOGGLE_DESC="Allow enabling and disabling MokoSuite feature plugins."
+COM_MOKOSUITE_ACL_CACHE="Clear Cache"
+COM_MOKOSUITE_ACL_CACHE_DESC="Allow clearing the Joomla cache from the dashboard."
@@ -0,0 +1,19 @@
+; MokoSuite Admin Dashboard - System Language Strings
+; Copyright (C) 2026 Moko Consulting. All rights reserved.
+; License: GPL-3.0-or-later
+
+COM_MOKOSUITE="MokoSuite"
+COM_MOKOSUITE_DESCRIPTION="MokoSuite admin dashboard and REST API. Control panel for managing site features, health monitoring, and remote management."
+COM_MOKOSUITE_DASHBOARD_TITLE="MokoSuite Control Panel"
+COM_MOKOSUITE_MENU_DASHBOARD="Dashboard"
+COM_MOKOSUITE_MENU_EXTENSIONS="Moko Extensions"
+COM_MOKOSUITE_MENU_PLUGINS="Feature Plugins"
+COM_MOKOSUITE_MENU_UPDATES="Joomla Updates"
+COM_MOKOSUITE_MENU_CHECKIN="Global Check-in"
+COM_MOKOSUITE_MENU_TICKETS="Helpdesk"
+COM_MOKOSUITE_MENU_HTACCESS=".htaccess Maker"
+COM_MOKOSUITE_MENU_PRIVACY="Privacy Guard"
+COM_MOKOSUITE_MENU_WAFLOG="WAF Log"
+COM_MOKOSUITE_MENU_DATABASE="Database Tools"
+COM_MOKOSUITE_MENU_CLEANUP="Cache Cleanup"
+COM_MOKOSUITE_MENU_CACHE="Cache Management"
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */
@@ -20,8 +20,8 @@ return new class implements ServiceProviderInterface
 {
 	public function register(Container $container): void
 	{
-		$container->registerServiceProvider(new MVCFactory('\\Moko\\Component\\MokoSuiteClient'));
-		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Moko\\Component\\MokoSuiteClient'));
+		$container->registerServiceProvider(new MVCFactory('\\Moko\\Component\\MokoSuite'));
+		$container->registerServiceProvider(new ComponentDispatcherFactory('\\Moko\\Component\\MokoSuite'));

 		$container->set(
 			ComponentInterface::class,
@@ -1,8 +1,8 @@
 --
-- MokoSuiteClient Helpdesk Tables
+-- MokoSuite Helpdesk Tables
 --

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_categories` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_categories` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(255) NOT NULL,
  `alias` VARCHAR(255) NOT NULL DEFAULT '',
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_categories` (
  KEY `idx_alias` (`alias`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_statuses` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_statuses` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(100) NOT NULL,
  `alias` VARCHAR(100) NOT NULL,
@@ -28,14 +28,14 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_statuses` (
  UNIQUE KEY `idx_alias` (`alias`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-INSERT IGNORE INTO `#__mokosuiteclient_ticket_statuses` (`id`, `title`, `alias`, `color`, `is_default`, `is_closed`, `ordering`) VALUES
+INSERT IGNORE INTO `#__mokosuite_ticket_statuses` (`id`, `title`, `alias`, `color`, `is_default`, `is_closed`, `ordering`) VALUES
 (1, 'Open',        'open',        'bg-primary',            1, 0, 1),
 (2, 'In Progress', 'in_progress', 'bg-info',               0, 0, 2),
 (3, 'Waiting',     'waiting',     'bg-warning text-dark',  0, 0, 3),
 (4, 'Resolved',    'resolved',    'bg-success',            0, 0, 4),
 (5, 'Closed',      'closed',      'bg-secondary',          0, 1, 5);

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_priorities` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_priorities` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(100) NOT NULL,
  `alias` VARCHAR(100) NOT NULL,
@@ -47,13 +47,13 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_priorities` (
  UNIQUE KEY `idx_alias` (`alias`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-INSERT IGNORE INTO `#__mokosuiteclient_ticket_priorities` (`id`, `title`, `alias`, `color`, `is_default`, `weight`, `ordering`) VALUES
+INSERT IGNORE INTO `#__mokosuite_ticket_priorities` (`id`, `title`, `alias`, `color`, `is_default`, `weight`, `ordering`) VALUES
 (1, 'Low',    'low',    'bg-secondary',          0, 10, 1),
 (2, 'Normal', 'normal', 'bg-primary',            1, 20, 2),
 (3, 'High',   'high',   'bg-warning text-dark',  0, 30, 3),
 (4, 'Urgent', 'urgent', 'bg-danger',             0, 40, 4);

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_tickets` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_tickets` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `subject` VARCHAR(512) NOT NULL,
  `body` TEXT NOT NULL,
@@ -72,6 +72,9 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_tickets` (
  `sla_response_due` DATETIME DEFAULT NULL,
  `sla_resolution_due` DATETIME DEFAULT NULL,
  `sla_responded` TINYINT NOT NULL DEFAULT 0,
+  `satisfaction_rating` TINYINT UNSIGNED DEFAULT NULL,
+  `satisfaction_feedback` TEXT DEFAULT NULL,
+  `satisfaction_rated_at` DATETIME DEFAULT NULL,
  PRIMARY KEY (`id`),
  KEY `idx_status` (`status`),
  KEY `idx_status_id` (`status_id`),
@@ -83,14 +86,14 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_tickets` (
  KEY `idx_created` (`created`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_category_field_groups` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_category_field_groups` (
  `category_id` INT UNSIGNED NOT NULL,
  `field_group_id` INT NOT NULL,
  PRIMARY KEY (`category_id`, `field_group_id`),
  KEY `idx_field_group` (`field_group_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_replies` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_replies` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `ticket_id` INT UNSIGNED NOT NULL,
  `user_id` INT NOT NULL DEFAULT 0,
@@ -102,7 +105,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_replies` (
  KEY `idx_created` (`created`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_canned` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_canned` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(255) NOT NULL,
  `body` TEXT NOT NULL,
@@ -111,18 +114,35 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_canned` (
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_automation` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_attachments` (
+  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  `ticket_id` INT UNSIGNED NOT NULL,
+  `reply_id` INT UNSIGNED DEFAULT NULL,
+  `filename` VARCHAR(255) NOT NULL,
+  `filepath` VARCHAR(512) NOT NULL,
+  `filesize` INT UNSIGNED NOT NULL DEFAULT 0,
+  `mimetype` VARCHAR(100) NOT NULL DEFAULT '',
+  `uploaded_by` INT NOT NULL DEFAULT 0,
+  `created` DATETIME NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_ticket` (`ticket_id`),
+  KEY `idx_reply` (`reply_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_automation` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(255) NOT NULL,
  `trigger_event` VARCHAR(50) NOT NULL DEFAULT 'ticket_created',
-  `conditions` TEXT NOT NULL DEFAULT '[]',
-  `actions` TEXT NOT NULL DEFAULT '[]',
+  `conditions` TEXT NOT NULL,
+  `actions` TEXT NOT NULL,
+  `behavior` ENUM('append','always_new','skip_if_open') NOT NULL DEFAULT 'append',
  `enabled` TINYINT NOT NULL DEFAULT 1,
  `ordering` INT NOT NULL DEFAULT 0,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `idx_trigger` (`trigger_event`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_assignees` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_assignees` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `ticket_id` INT UNSIGNED NOT NULL,
  `assignee_type` ENUM('user','group') NOT NULL DEFAULT 'user',
@@ -134,13 +154,13 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_assignees` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

 -- Default automation rules
-INSERT IGNORE INTO `#__mokosuiteclient_ticket_automation` (`id`, `title`, `trigger_event`, `conditions`, `actions`, `enabled`, `ordering`) VALUES
+INSERT IGNORE INTO `#__mokosuite_ticket_automation` (`id`, `title`, `trigger_event`, `conditions`, `actions`, `enabled`, `ordering`) VALUES
 (1, 'Auto-close resolved tickets after 7 days', 'scheduled', '[{"field":"status","op":"eq","value":"resolved"},{"field":"age_hours","op":"gt","value":"168"}]', '[{"type":"set_status","value":"closed"},{"type":"add_note","value":"Auto-closed after 7 days with no response."}]', 1, 1),
 (2, 'Escalate urgent tickets with no response in 1 hour', 'scheduled', '[{"field":"priority","op":"eq","value":"urgent"},{"field":"sla_responded","op":"eq","value":"0"},{"field":"age_hours","op":"gt","value":"1"}]', '[{"type":"add_note","value":"SLA BREACH: Urgent ticket has no staff response after 1 hour."}]', 1, 2),
 (3, 'Notify on high priority ticket creation', 'ticket_created', '[{"field":"priority","op":"in","value":"high,urgent"}]', '[{"type":"add_note","value":"High/urgent ticket created — requires immediate attention."}]', 1, 3);

 -- Default categories
-INSERT IGNORE INTO `#__mokosuiteclient_ticket_categories` (`id`, `title`, `alias`, `description`, `sla_response_minutes`, `sla_resolution_minutes`, `ordering`) VALUES
+INSERT IGNORE INTO `#__mokosuite_ticket_categories` (`id`, `title`, `alias`, `description`, `sla_response_minutes`, `sla_resolution_minutes`, `ordering`) VALUES
 (1, 'General Support', 'general-support', 'General questions and assistance', 480, 2880, 1),
 (2, 'Bug Report', 'bug-report', 'Report a software bug or issue', 240, 1440, 2),
 (3, 'Feature Request', 'feature-request', 'Request a new feature or enhancement', 1440, 10080, 3),
@@ -151,7 +171,7 @@ INSERT IGNORE INTO `#__mokosuiteclient_ticket_categories` (`id`, `title`, `alias
 -- Privacy Guard Tables
 --

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_consent_log` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_consent_log` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `user_id` INT NOT NULL,
  `category` VARCHAR(50) NOT NULL,
@@ -163,7 +183,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_consent_log` (
  KEY `idx_category` (`category`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_data_requests` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_data_requests` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `user_id` INT NOT NULL,
  `type` ENUM('export','delete','anonymize') NOT NULL,
@@ -177,7 +197,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_data_requests` (
  KEY `idx_status` (`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_retention_policies` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_retention_policies` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `content_type` VARCHAR(100) NOT NULL,
  `retention_days` INT UNSIGNED NOT NULL DEFAULT 365,
@@ -188,7 +208,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_retention_policies` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

 -- Default retention policies
-INSERT IGNORE INTO `#__mokosuiteclient_retention_policies` (`id`, `content_type`, `retention_days`, `action`, `enabled`, `description`) VALUES
+INSERT IGNORE INTO `#__mokosuite_retention_policies` (`id`, `content_type`, `retention_days`, `action`, `enabled`, `description`) VALUES
 (1, 'action_logs', 90, 'delete', 1, 'Delete action log entries older than 90 days'),
 (2, 'waf_logs', 30, 'delete', 1, 'Delete WAF block logs older than 30 days'),
 (3, 'sessions', 7, 'delete', 1, 'Purge expired sessions older than 7 days'),
@@ -0,0 +1,13 @@
+--
+-- MokoSuite component uninstall — drop all tables
+--
+DROP TABLE IF EXISTS `#__mokosuite_download_keys`;
+DROP TABLE IF EXISTS `#__mokosuite_retention_policies`;
+DROP TABLE IF EXISTS `#__mokosuite_data_requests`;
+DROP TABLE IF EXISTS `#__mokosuite_consent_log`;
+DROP TABLE IF EXISTS `#__mokosuite_waf_log`;
+DROP TABLE IF EXISTS `#__mokosuite_ticket_automation`;
+DROP TABLE IF EXISTS `#__mokosuite_ticket_canned`;
+DROP TABLE IF EXISTS `#__mokosuite_ticket_replies`;
+DROP TABLE IF EXISTS `#__mokosuite_tickets`;
+DROP TABLE IF EXISTS `#__mokosuite_ticket_categories`;
@@ -1,2 +1,2 @@
 -- Remove download_keys table (feature reverted — preflight handles key preservation)
-DROP TABLE IF EXISTS `#__mokosuiteclient_download_keys`;
+DROP TABLE IF EXISTS `#__mokosuite_download_keys`;
@@ -1,2 +1,2 @@
 -- RSA signing replaces key ring — drop table if it was created
-DROP TABLE IF EXISTS `#__mokosuiteclient_api_keys`;
+DROP TABLE IF EXISTS `#__mokosuite_api_keys`;
@@ -1,10 +1,10 @@
 -- Add contact link to tickets (optional FK to #__contact_details)
-ALTER TABLE `#__mokosuiteclient_tickets`
+ALTER TABLE `#__mokosuite_tickets`
  ADD COLUMN `contact_id` INT UNSIGNED DEFAULT NULL AFTER `category_id`,
  ADD KEY `idx_contact` (`contact_id`);

 -- Multi-assignee junction table (replaces single assigned_to column)
-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_assignees` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_assignees` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `ticket_id` INT UNSIGNED NOT NULL,
  `assignee_type` ENUM('user','group') NOT NULL DEFAULT 'user',
@@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_assignees` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

 -- Migrate existing single-assignee data to junction table
-INSERT IGNORE INTO `#__mokosuiteclient_ticket_assignees` (`ticket_id`, `assignee_type`, `assignee_id`)
-SELECT `id`, 'user', `assigned_to` FROM `#__mokosuiteclient_tickets` WHERE `assigned_to` IS NOT NULL AND `assigned_to` > 0;
+INSERT IGNORE INTO `#__mokosuite_ticket_assignees` (`ticket_id`, `assignee_type`, `assignee_id`)
+SELECT `id`, 'user', `assigned_to` FROM `#__mokosuite_tickets` WHERE `assigned_to` IS NOT NULL AND `assigned_to` > 0;

 -- Customizable ticket statuses (replaces ENUM)
-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_statuses` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_statuses` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(100) NOT NULL,
  `alias` VARCHAR(100) NOT NULL,
@@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_statuses` (
  UNIQUE KEY `idx_alias` (`alias`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-INSERT IGNORE INTO `#__mokosuiteclient_ticket_statuses` (`id`, `title`, `alias`, `color`, `is_default`, `is_closed`, `ordering`) VALUES
+INSERT IGNORE INTO `#__mokosuite_ticket_statuses` (`id`, `title`, `alias`, `color`, `is_default`, `is_closed`, `ordering`) VALUES
 (1, 'Open',        'open',        'bg-primary',            1, 0, 1),
 (2, 'In Progress', 'in_progress', 'bg-info',               0, 0, 2),
 (3, 'Waiting',     'waiting',     'bg-warning text-dark',  0, 0, 3),
@@ -40,7 +40,7 @@ INSERT IGNORE INTO `#__mokosuiteclient_ticket_statuses` (`id`, `title`, `alias`,
 (5, 'Closed',      'closed',      'bg-secondary',          0, 1, 5);

 -- Customizable ticket priorities (replaces ENUM)
-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_priorities` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_priorities` (
  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
  `title` VARCHAR(100) NOT NULL,
  `alias` VARCHAR(100) NOT NULL,
@@ -52,32 +52,32 @@ CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_priorities` (
  UNIQUE KEY `idx_alias` (`alias`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-INSERT IGNORE INTO `#__mokosuiteclient_ticket_priorities` (`id`, `title`, `alias`, `color`, `is_default`, `weight`, `ordering`) VALUES
+INSERT IGNORE INTO `#__mokosuite_ticket_priorities` (`id`, `title`, `alias`, `color`, `is_default`, `weight`, `ordering`) VALUES
 (1, 'Low',    'low',    'bg-secondary',          0, 10, 1),
 (2, 'Normal', 'normal', 'bg-primary',            1, 20, 2),
 (3, 'High',   'high',   'bg-warning text-dark',  0, 30, 3),
 (4, 'Urgent', 'urgent', 'bg-danger',             0, 40, 4);

 -- Add INT FK columns for status/priority (coexist with ENUM during migration)
-ALTER TABLE `#__mokosuiteclient_tickets`
+ALTER TABLE `#__mokosuite_tickets`
  ADD COLUMN `status_id` INT UNSIGNED DEFAULT NULL AFTER `status`,
  ADD COLUMN `priority_id` INT UNSIGNED DEFAULT NULL AFTER `priority`,
  ADD KEY `idx_status_id` (`status_id`),
  ADD KEY `idx_priority_id` (`priority_id`);

 -- Populate new columns from existing ENUM values
-UPDATE `#__mokosuiteclient_tickets` t
-  JOIN `#__mokosuiteclient_ticket_statuses` s ON s.alias = t.status
+UPDATE `#__mokosuite_tickets` t
+  JOIN `#__mokosuite_ticket_statuses` s ON s.alias = t.status
  SET t.status_id = s.id
  WHERE t.status_id IS NULL;

-UPDATE `#__mokosuiteclient_tickets` t
-  JOIN `#__mokosuiteclient_ticket_priorities` p ON p.alias = t.priority
+UPDATE `#__mokosuite_tickets` t
+  JOIN `#__mokosuite_ticket_priorities` p ON p.alias = t.priority
  SET t.priority_id = p.id
  WHERE t.priority_id IS NULL;

 -- Junction: which Joomla field groups apply to which ticket categories
-CREATE TABLE IF NOT EXISTS `#__mokosuiteclient_ticket_category_field_groups` (
+CREATE TABLE IF NOT EXISTS `#__mokosuite_ticket_category_field_groups` (
  `category_id` INT UNSIGNED NOT NULL,
  `field_group_id` INT NOT NULL,
  PRIMARY KEY (`category_id`, `field_group_id`),
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Controller;
+namespace Moko\Component\MokoSuite\Administrator\Controller;

 defined('_JEXEC') or die;

@@ -24,18 +24,19 @@ class DisplayController extends BaseController
 	 * ACL map: view name => required permission.
 	 */
 	private const VIEW_ACL = [
-		'dashboard'  => 'mokosuiteclient.dashboard',
-		'extensions' => 'mokosuiteclient.extensions',
-		'htaccess'   => 'mokosuiteclient.htaccess',
-		'tickets'    => 'mokosuiteclient.tickets',
-		'ticket'     => 'mokosuiteclient.tickets',
+		'dashboard'  => 'mokosuite.dashboard',
+		'extensions' => 'mokosuite.extensions',
+		'htaccess'   => 'mokosuite.htaccess',
+		'tickets'    => 'mokosuite.tickets',
+		'ticket'     => 'mokosuite.tickets',
 		'privacy'    => 'core.admin',
 		'waflog'     => 'core.admin',
-		'categories' => 'mokosuiteclient.tickets',
-		'canned'     => 'mokosuiteclient.tickets',
-		'automation' => 'core.admin',
-		'database'   => 'core.admin',
-		'cleanup'    => 'mokosuiteclient.cache',
+		'categories' => 'mokosuite.tickets',
+		'canned'     => 'mokosuite.tickets',
+		'automation'      => 'core.admin',
+		'database'        => 'core.admin',
+		'cleanup'         => 'mokosuite.cache',
+		'ticketsettings'  => 'core.admin',
 	];

 	public function display($cachable = false, $urlparams = [])
@@ -62,7 +63,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.plugins.toggle'))
+		if (!$this->checkAcl('mokosuite.plugins.toggle'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -89,7 +90,7 @@ class DisplayController extends BaseController

 		try
 		{
-			$monitorPlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokosuiteclient_monitor');
+			$monitorPlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokosuite_monitor');

 			if (!$monitorPlugin)
 			{
@@ -104,7 +105,7 @@ class DisplayController extends BaseController
 			// Fall back to manifest XML default if not yet saved in params
 			if (empty($baseUrl))
 			{
-				$manifestFile = JPATH_PLUGINS . '/system/mokosuiteclient_monitor/mokosuiteclient_monitor.xml';
+				$manifestFile = JPATH_PLUGINS . '/system/mokosuite_monitor/mokosuite_monitor.xml';

 				if (is_file($manifestFile))
 				{
@@ -123,12 +124,12 @@ class DisplayController extends BaseController

 			if (empty($baseUrl))
 			{
-				$this->jsonResponse(['success' => false, 'message' => 'MokoSuiteClientHQ URL not configured in monitor plugin.']);
+				$this->jsonResponse(['success' => false, 'message' => 'MokoSuiteHQ URL not configured in monitor plugin.']);

 				return;
 			}

-			$corePlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokosuiteclient');
+			$corePlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokosuite');
 			$coreParams = new \Joomla\Registry\Registry($corePlugin ? $corePlugin->params : '{}');
 			$healthToken = $coreParams->get('health_api_token', '');

@@ -160,7 +161,7 @@ class DisplayController extends BaseController
 			// Fall back to manifest XML default if not yet saved in params
 			if (empty($signingKeyB64))
 			{
-				$manifestFile = JPATH_PLUGINS . '/system/mokosuiteclient_monitor/mokosuiteclient_monitor.xml';
+				$manifestFile = JPATH_PLUGINS . '/system/mokosuite_monitor/mokosuite_monitor.xml';

 				if (is_file($manifestFile))
 				{
@@ -189,13 +190,13 @@ class DisplayController extends BaseController

 					if (openssl_sign($message, $signature, $privateKey, OPENSSL_ALGO_SHA256))
 					{
-						$headers[] = 'X-MokoSuiteClient-Signature: ' . base64_encode($signature);
-						$headers[] = 'X-MokoSuiteClient-Timestamp: ' . $timestamp;
+						$headers[] = 'X-MokoSuite-Signature: ' . base64_encode($signature);
+						$headers[] = 'X-MokoSuite-Timestamp: ' . $timestamp;
 					}
 				}
 			}

-			$endpoint = $baseUrl . '/api/index.php/v1/mokosuiteclienthq/heartbeat';
+			$endpoint = $baseUrl . '/api/index.php/v1/mokosuitehq/heartbeat';

 			$ch = curl_init($endpoint);
 			curl_setopt_array($ch, [
@@ -241,7 +242,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.cache'))
+		if (!$this->checkAcl('mokosuite.cache'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -254,7 +255,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.cache'))
+		if (!$this->checkAcl('mokosuite.cache'))
 		{
 			$this->jsonForbidden();
 			return;
@@ -271,7 +272,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.extensions'))
+		if (!$this->checkAcl('mokosuite.extensions'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -296,7 +297,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.htaccess'))
+		if (!$this->checkAcl('mokosuite.htaccess'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -328,7 +329,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.htaccess'))
+		if (!$this->checkAcl('mokosuite.htaccess'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -356,7 +357,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.tickets.create'))
+		if (!$this->checkAcl('mokosuite.tickets.create'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -365,10 +366,14 @@ class DisplayController extends BaseController
 		$input = Factory::getApplication()->getInput();

 		$this->jsonResponse($this->getModel('Tickets')->createTicket([
-			'subject'     => $input->getString('subject', ''),
-			'body'        => $input->getRaw('body', ''),
-			'priority'    => $input->getString('priority', 'normal'),
-			'category_id' => $input->getInt('category_id', 0),
+			'subject'       => $input->getString('subject', ''),
+			'body'          => $input->getRaw('body', ''),
+			'priority'      => $input->getString('priority', 'normal'),
+			'category_id'   => $input->getInt('category_id', 0),
+			'contact_id'    => $input->getInt('contact_id', 0),
+			'assign_users'  => $input->get('assign_users', [], 'ARRAY'),
+			'assign_groups' => $input->get('assign_groups', [], 'ARRAY'),
+			'custom_fields' => $input->get('custom_fields', [], 'ARRAY'),
 		]));
 	}

@@ -376,7 +381,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.tickets'))
+		if (!$this->checkAcl('mokosuite.tickets'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -395,7 +400,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.tickets'))
+		if (!$this->checkAcl('mokosuite.tickets'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -405,10 +410,85 @@ class DisplayController extends BaseController

 		$this->jsonResponse($this->getModel('Tickets')->updateStatus(
 			$input->getInt('ticket_id', 0),
-			$input->getString('status', '')
+			$input->getInt('status', 0)
 		));
 	}

+	// ==================================================================
+	// Ticket Settings — Status/Priority CRUD
+	// ==================================================================
+
+	public function saveStatus()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		if (!$this->checkAcl('core.admin'))
+		{
+			$this->jsonForbidden();
+			return;
+		}
+
+		$input = Factory::getApplication()->getInput();
+		$this->jsonResponse($this->getModel('Tickets')->saveStatus([
+			'id'         => $input->getInt('id', 0),
+			'title'      => $input->getString('title', ''),
+			'alias'      => $input->getString('alias', ''),
+			'color'      => $input->getString('color', 'bg-secondary'),
+			'is_default' => $input->getInt('is_default', 0),
+			'is_closed'  => $input->getInt('is_closed', 0),
+			'ordering'   => $input->getInt('ordering', 0),
+		]));
+	}
+
+	public function deleteStatus()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		if (!$this->checkAcl('core.admin'))
+		{
+			$this->jsonForbidden();
+			return;
+		}
+
+		$id = Factory::getApplication()->getInput()->getInt('id', 0);
+		$this->jsonResponse($this->getModel('Tickets')->deleteStatus($id));
+	}
+
+	public function savePriority()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		if (!$this->checkAcl('core.admin'))
+		{
+			$this->jsonForbidden();
+			return;
+		}
+
+		$input = Factory::getApplication()->getInput();
+		$this->jsonResponse($this->getModel('Tickets')->savePriority([
+			'id'         => $input->getInt('id', 0),
+			'title'      => $input->getString('title', ''),
+			'alias'      => $input->getString('alias', ''),
+			'color'      => $input->getString('color', 'bg-secondary'),
+			'is_default' => $input->getInt('is_default', 0),
+			'ordering'   => $input->getInt('ordering', 0),
+		]));
+	}
+
+	public function deletePriority()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		if (!$this->checkAcl('core.admin'))
+		{
+			$this->jsonForbidden();
+			return;
+		}
+
+		$id = Factory::getApplication()->getInput()->getInt('id', 0);
+		$this->jsonResponse($this->getModel('Tickets')->deletePriority($id));
+	}
+
 	// ==================================================================
 	// KB Search
 	// ==================================================================
@@ -459,7 +539,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; }
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\MaintenanceModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\MaintenanceModel();
 		$this->jsonResponse($model->optimizeTables());
 	}

@@ -467,7 +547,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; }
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\MaintenanceModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\MaintenanceModel();
 		$this->jsonResponse($model->repairTables());
 	}

@@ -475,16 +555,16 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; }
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\MaintenanceModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\MaintenanceModel();
 		$this->jsonResponse($model->purgeSessions());
 	}

 	public function cleanDirectory()
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		if (!$this->checkAcl('mokosuiteclient.cache')) { $this->jsonForbidden(); return; }
+		if (!$this->checkAcl('mokosuite.cache')) { $this->jsonForbidden(); return; }
 		$dirKey = Factory::getApplication()->getInput()->getString('dir_key', '');
-		$model  = new \Moko\Component\MokoSuiteClient\Administrator\Model\MaintenanceModel();
+		$model  = new \Moko\Component\MokoSuite\Administrator\Model\MaintenanceModel();
 		$this->jsonResponse($model->cleanDirectory($dirKey));
 	}

@@ -495,7 +575,7 @@ class DisplayController extends BaseController
 	public function saveCategory()
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		if (!$this->checkAcl('mokosuiteclient.tickets')) { $this->jsonForbidden(); }
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
 		$input = Factory::getApplication()->getInput();
 		$db = Factory::getDbo();
 		$id = $input->getInt('id', 0);
@@ -509,10 +589,10 @@ class DisplayController extends BaseController
 		];
 		if ($id) {
 			$data->id = $id;
-			$db->updateObject('#__mokosuiteclient_ticket_categories', $data, 'id');
+			$db->updateObject('#__mokosuite_ticket_categories', $data, 'id');
 		} else {
 			$data->ordering = 0;
-			$db->insertObject('#__mokosuiteclient_ticket_categories', $data, 'id');
+			$db->insertObject('#__mokosuite_ticket_categories', $data, 'id');
 		}
 		$this->jsonResponse(['success' => true, 'message' => 'Category saved.', 'id' => (int) $data->id]);
 	}
@@ -520,16 +600,29 @@ class DisplayController extends BaseController
 	public function deleteCategory()
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		if (!$this->checkAcl('mokosuiteclient.tickets')) { $this->jsonForbidden(); }
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
 		$db = Factory::getDbo();
-		$db->setQuery($db->getQuery(true)->delete('#__mokosuiteclient_ticket_categories')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute();
+		$db->setQuery($db->getQuery(true)->delete('#__mokosuite_ticket_categories')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute();
 		$this->jsonResponse(['success' => true, 'message' => 'Category deleted.']);
 	}

+	public function reorderCategory()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
+		$order = json_decode(Factory::getApplication()->getInput()->getRaw('order', '[]'), true);
+		if (!is_array($order)) { $this->jsonResponse(['success' => false, 'message' => 'Invalid order']); return; }
+		$db = Factory::getDbo();
+		foreach ($order as $i => $id) {
+			$db->setQuery('UPDATE ' . $db->quoteName('#__mokosuite_ticket_categories') . ' SET ordering = ' . (int) $i . ' WHERE id = ' . (int) $id)->execute();
+		}
+		$this->jsonResponse(['success' => true, 'message' => 'Order saved.']);
+	}
+
 	public function saveCanned()
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		if (!$this->checkAcl('mokosuiteclient.tickets')) { $this->jsonForbidden(); }
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
 		$input = Factory::getApplication()->getInput();
 		$db = Factory::getDbo();
 		$data = (object) [
@@ -539,20 +632,97 @@ class DisplayController extends BaseController
 			'ordering' => 0,
 		];
 		$id = $input->getInt('id', 0);
-		if ($id) { $data->id = $id; $db->updateObject('#__mokosuiteclient_ticket_canned', $data, 'id'); }
-		else { $db->insertObject('#__mokosuiteclient_ticket_canned', $data, 'id'); }
+		if ($id) { $data->id = $id; $db->updateObject('#__mokosuite_ticket_canned', $data, 'id'); }
+		else { $db->insertObject('#__mokosuite_ticket_canned', $data, 'id'); }
 		$this->jsonResponse(['success' => true, 'message' => 'Canned response saved.', 'id' => (int) $data->id]);
 	}

 	public function deleteCanned()
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-		if (!$this->checkAcl('mokosuiteclient.tickets')) { $this->jsonForbidden(); }
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
 		$db = Factory::getDbo();
-		$db->setQuery($db->getQuery(true)->delete('#__mokosuiteclient_ticket_canned')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute();
+		$db->setQuery($db->getQuery(true)->delete('#__mokosuite_ticket_canned')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute();
 		$this->jsonResponse(['success' => true, 'message' => 'Canned response deleted.']);
 	}

+	public function reorderCanned()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
+		$order = json_decode(Factory::getApplication()->getInput()->getRaw('order', '[]'), true);
+		if (!is_array($order)) { $this->jsonResponse(['success' => false, 'message' => 'Invalid order']); return; }
+		$db = Factory::getDbo();
+		foreach ($order as $i => $id) {
+			$db->setQuery('UPDATE ' . $db->quoteName('#__mokosuite_ticket_canned') . ' SET ordering = ' . (int) $i . ' WHERE id = ' . (int) $id)->execute();
+		}
+		$this->jsonResponse(['success' => true, 'message' => 'Order saved.']);
+	}
+
+	public function uploadAttachment()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
+		$input = Factory::getApplication()->getInput();
+		$ticketId = $input->getInt('ticket_id', 0);
+		$replyId  = $input->getInt('reply_id', 0) ?: null;
+		if (!$ticketId) { $this->jsonResponse(['success' => false, 'message' => 'Missing ticket_id']); return; }
+		$files = $input->files->get('attachments', [], 'raw');
+		if (empty($files) || empty($files['name'])) { $this->jsonResponse(['success' => false, 'message' => 'No files uploaded']); return; }
+		$saved = \Moko\Component\MokoSuite\Administrator\Service\AttachmentService::upload($ticketId, $replyId, $files);
+		$this->jsonResponse(['success' => true, 'message' => count($saved) . ' file(s) uploaded', 'count' => count($saved)]);
+	}
+
+	public function downloadAttachment()
+	{
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
+		$id = Factory::getApplication()->getInput()->getInt('id', 0);
+		$db = Factory::getDbo();
+		$db->setQuery($db->getQuery(true)->select('*')->from('#__mokosuite_ticket_attachments')->where('id = ' . $id));
+		$att = $db->loadObject();
+		if (!$att) { throw new \RuntimeException('Attachment not found', 404); }
+		$path = \Moko\Component\MokoSuite\Administrator\Service\AttachmentService::getAbsolutePath($att);
+		if (!file_exists($path)) { throw new \RuntimeException('File not found', 404); }
+		$app = Factory::getApplication();
+		$app->setHeader('Content-Type', $att->mimetype ?: 'application/octet-stream');
+		$app->setHeader('Content-Disposition', 'attachment; filename="' . $att->filename . '"');
+		$app->setHeader('Content-Length', (string) filesize($path));
+		$app->sendHeaders();
+		readfile($path);
+		$app->close();
+	}
+
+	public function deleteAttachment()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('mokosuite.tickets')) { $this->jsonForbidden(); }
+		$id = Factory::getApplication()->getInput()->getInt('id', 0);
+		$ok = \Moko\Component\MokoSuite\Administrator\Service\AttachmentService::delete($id);
+		$this->jsonResponse(['success' => $ok, 'message' => $ok ? 'Attachment deleted' : 'Not found']);
+	}
+
+	public function rateTicket()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		$input = Factory::getApplication()->getInput();
+		$ticketId = $input->getInt('ticket_id', 0);
+		$rating   = $input->getInt('rating', 0);
+		$feedback = $input->getString('feedback', '');
+		if (!$ticketId || $rating < 1 || $rating > 5) {
+			$this->jsonResponse(['success' => false, 'message' => 'Invalid rating (1-5)']);
+			return;
+		}
+		$db = Factory::getDbo();
+		$db->setQuery(
+			'UPDATE ' . $db->quoteName('#__mokosuite_tickets')
+			. ' SET satisfaction_rating = ' . $rating
+			. ', satisfaction_feedback = ' . $db->quote($feedback)
+			. ', satisfaction_rated_at = ' . $db->quote(Factory::getDate()->toSql())
+			. ' WHERE id = ' . $ticketId
+		)->execute();
+		$this->jsonResponse(['success' => true, 'message' => 'Thank you for your feedback!']);
+	}
+
 	public function saveAutomation()
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
@@ -564,12 +734,13 @@ class DisplayController extends BaseController
 			'trigger_event' => $input->getString('trigger_event', 'ticket_created'),
 			'conditions' => $input->getRaw('conditions', '[]'),
 			'actions' => $input->getRaw('actions', '[]'),
+			'behavior' => $input->getString('behavior', 'append'),
 			'enabled' => 1,
 			'ordering' => 0,
 		];
 		$id = $input->getInt('id', 0);
-		if ($id) { $data->id = $id; $db->updateObject('#__mokosuiteclient_ticket_automation', $data, 'id'); }
-		else { $db->insertObject('#__mokosuiteclient_ticket_automation', $data, 'id'); }
+		if ($id) { $data->id = $id; $db->updateObject('#__mokosuite_ticket_automation', $data, 'id'); }
+		else { $db->insertObject('#__mokosuite_ticket_automation', $data, 'id'); }
 		$this->jsonResponse(['success' => true, 'message' => 'Rule saved.', 'id' => (int) $data->id]);
 	}

@@ -578,7 +749,7 @@ class DisplayController extends BaseController
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
 		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); }
 		$db = Factory::getDbo();
-		$db->setQuery($db->getQuery(true)->delete('#__mokosuiteclient_ticket_automation')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute();
+		$db->setQuery($db->getQuery(true)->delete('#__mokosuite_ticket_automation')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute();
 		$this->jsonResponse(['success' => true, 'message' => 'Rule deleted.']);
 	}

@@ -588,12 +759,25 @@ class DisplayController extends BaseController
 		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); }
 		$input = Factory::getApplication()->getInput();
 		$db = Factory::getDbo();
-		$db->setQuery($db->getQuery(true)->update('#__mokosuiteclient_ticket_automation')
+		$db->setQuery($db->getQuery(true)->update('#__mokosuite_ticket_automation')
 			->set('enabled = ' . $input->getInt('enabled', 0))
 			->where('id = ' . $input->getInt('id', 0)))->execute();
 		$this->jsonResponse(['success' => true, 'message' => 'Rule updated.']);
 	}

+	public function reorderAutomation()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); }
+		$order = json_decode(Factory::getApplication()->getInput()->getRaw('order', '[]'), true);
+		if (!is_array($order)) { $this->jsonResponse(['success' => false, 'message' => 'Invalid order']); return; }
+		$db = Factory::getDbo();
+		foreach ($order as $i => $id) {
+			$db->setQuery('UPDATE ' . $db->quoteName('#__mokosuite_ticket_automation') . ' SET ordering = ' . (int) $i . ' WHERE id = ' . (int) $id)->execute();
+		}
+		$this->jsonResponse(['success' => true, 'message' => 'Order saved.']);
+	}
+
 	// ==================================================================
 	// Settings Import/Export (#132)
 	// ==================================================================
@@ -611,8 +795,8 @@ class DisplayController extends BaseController
 		$db = Factory::getDbo();
 		$settings = [];

-		// Export all MokoSuiteClient plugin params
-		$plugins = ['mokosuiteclient', 'mokosuiteclient_firewall', 'mokosuiteclient_tenant', 'mokosuiteclient_devtools', 'mokosuiteclient_offline'];
+		// Export all MokoSuite plugin params
+		$plugins = ['mokosuite', 'mokosuite_firewall', 'mokosuite_tenant', 'mokosuite_devtools', 'mokosuite_offline'];

 		foreach ($plugins as $element)
 		{
@@ -632,7 +816,7 @@ class DisplayController extends BaseController
 			$db->getQuery(true)
 				->select($db->quoteName('params'))
 				->from($db->quoteName('#__extensions'))
-				->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 		);
 		$settings['component'] = json_decode($db->loadResult() ?? '{}', true);
@@ -688,7 +872,7 @@ class DisplayController extends BaseController
 				$db->getQuery(true)
 					->update($db->quoteName('#__extensions'))
 					->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($data['component'])))
-					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			)->execute();
 			$count++;
@@ -712,7 +896,7 @@ class DisplayController extends BaseController
 		}

 		$days  = Factory::getApplication()->getInput()->getInt('days', 30);
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\WaflogModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\WaflogModel();

 		$this->jsonResponse($model->purgeLogs($days));
 	}
@@ -728,7 +912,7 @@ class DisplayController extends BaseController
 		}

 		$ip    = Factory::getApplication()->getInput()->getString('ip', '');
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\WaflogModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\WaflogModel();

 		$this->jsonResponse($model->banIp($ip));
 	}
@@ -748,7 +932,7 @@ class DisplayController extends BaseController
 		}

 		$input  = Factory::getApplication()->getInput();
-		$model  = new \Moko\Component\MokoSuiteClient\Administrator\Model\PrivacyModel();
+		$model  = new \Moko\Component\MokoSuite\Administrator\Model\PrivacyModel();
 		$action = $input->getString('action', 'deny');

 		if ($action === 'create')
@@ -794,7 +978,7 @@ class DisplayController extends BaseController
 		return;
 		}

-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\PrivacyModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\PrivacyModel();

 		$this->jsonResponse($model->exportUserData(
 			Factory::getApplication()->getInput()->getInt('user_id', 0)
@@ -809,7 +993,7 @@ class DisplayController extends BaseController
 	{
 		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));

-		if (!$this->checkAcl('mokosuiteclient.tickets'))
+		if (!$this->checkAcl('mokosuite.tickets'))
 		{
 			$this->jsonForbidden();
 		return;
@@ -836,19 +1020,19 @@ class DisplayController extends BaseController
 	// ==================================================================

 	/**
-	 * Check a MokoSuiteClient ACL permission for the current user.
+	 * Check a MokoSuite ACL permission for the current user.
 	 */
 	private function checkAcl(string $action): bool
 	{
 		$user = Factory::getApplication()->getIdentity();

 		// Super admins always pass
-		if ($user->authorise('core.admin', 'com_mokosuiteclient'))
+		if ($user->authorise('core.admin', 'com_mokosuite'))
 		{
 			return true;
 		}

-		return $user->authorise($action, 'com_mokosuiteclient');
+		return $user->authorise($action, 'com_mokosuite');
 	}

 	/**
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -21,7 +21,7 @@ class DashboardModel extends BaseDatabaseModel
 	 * Provides icon, category, and description for dashboard display.
 	 */
 	private const PLUGIN_META = [
-		'mokosuiteclient' => [
+		'mokosuite' => [
 			'icon'           => 'icon-shield-alt',
 			'category'       => 'core',
 			'label'          => 'Core',
@@ -29,7 +29,7 @@ class DashboardModel extends BaseDatabaseModel
 			'protected'      => true,
 			'configure_only' => false,
 		],
-		'mokosuiteclient_firewall' => [
+		'mokosuite_firewall' => [
 			'icon'           => 'icon-lock',
 			'category'       => 'security',
 			'label'          => 'Firewall',
@@ -37,7 +37,7 @@ class DashboardModel extends BaseDatabaseModel
 			'protected'      => false,
 			'configure_only' => false,
 		],
-		'mokosuiteclient_tenant' => [
+		'mokosuite_tenant' => [
 			'icon'           => 'icon-users',
 			'category'       => 'security',
 			'label'          => 'Tenant Restrictions',
@@ -45,7 +45,7 @@ class DashboardModel extends BaseDatabaseModel
 			'protected'      => false,
 			'configure_only' => false,
 		],
-		'mokosuiteclient_offline' => [
+		'mokosuite_offline' => [
 			'icon'           => 'icon-globe',
 			'category'       => 'security',
 			'label'          => 'Offline Bypass',
@@ -53,7 +53,7 @@ class DashboardModel extends BaseDatabaseModel
 			'protected'      => false,
 			'configure_only' => true,
 		],
-		'mokosuiteclient_devtools' => [
+		'mokosuite_devtools' => [
 			'icon'           => 'icon-wrench',
 			'category'       => 'tools',
 			'label'          => 'Developer Tools',
@@ -61,7 +61,7 @@ class DashboardModel extends BaseDatabaseModel
 			'protected'      => false,
 			'configure_only' => true,
 		],
-		'mokosuiteclientdemo' => [
+		'mokosuitedemo' => [
 			'icon'           => 'icon-undo',
 			'category'       => 'content',
 			'label'          => 'Demo Reset Task',
@@ -69,11 +69,11 @@ class DashboardModel extends BaseDatabaseModel
 			'protected'      => false,
 			'configure_only' => true,
 		],
-		'mokosuiteclientsync' => [
+		'mokosuitesync' => [
 			'icon'           => 'icon-sync',
 			'category'       => 'content',
 			'label'          => 'Content Sync Task',
-			'description'    => 'Scheduled content synchronisation to remote MokoSuiteClient sites.',
+			'description'    => 'Scheduled content synchronisation to remote MokoSuite sites.',
 			'protected'      => false,
 			'configure_only' => true,
 		],
@@ -92,7 +92,7 @@ class DashboardModel extends BaseDatabaseModel
 	];

 	/**
-	 * Discover all installed MokoSuiteClient plugins.
+	 * Discover all installed MokoSuite plugins.
 	 *
 	 * @return  array  Plugin rows enriched with dashboard metadata.
 	 */
@@ -114,20 +114,20 @@ class DashboardModel extends BaseDatabaseModel
 			->from($db->quoteName('#__extensions'))
 			->where([
 				'(' .
-					// System plugins: mokosuiteclient, mokosuiteclient_*
+					// System plugins: mokosuite, mokosuite_*
 					'(' . $db->quoteName('type') . ' = ' . $db->quote('plugin')
 						. ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('system')
-						. ' AND (' . $db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient')
-						. ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuiteclient\_%') . ')'
-					. ' AND ' . $db->quoteName('element') . ' != ' . $db->quote('mokosuiteclient_monitor') . ')'
+						. ' AND (' . $db->quoteName('element') . ' = ' . $db->quote('mokosuite')
+						. ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuite\_%') . ')'
+					. ' AND ' . $db->quoteName('element') . ' != ' . $db->quote('mokosuite_monitor') . ')'
 					// Webservices plugins
 					. ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('plugin')
 						. ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('webservices')
-						. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient') . ')'
+						. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('mokosuite') . ')'
 					// Task plugins
 					. ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('plugin')
 						. ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('task')
-						. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuiteclient%') . ')'
+						. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuite%') . ')'
 				. ')',
 			])
 			->order($db->quoteName('folder') . ' ASC, ' . $db->quoteName('element') . ' ASC');
@@ -190,11 +190,11 @@ class DashboardModel extends BaseDatabaseModel
 		$config = $app->getConfig();
 		$db     = $this->getDatabase();

-		// Get MokoSuiteClient package version
+		// Get MokoSuite package version
 		$query = $db->getQuery(true)
 			->select($db->quoteName('manifest_cache'))
 			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('element') . ' = ' . $db->quote('pkg_mokosuiteclient'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('pkg_mokosuite'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('package'));
 		$db->setQuery($query);
 		$pkgCache = json_decode($db->loadResult() ?? '{}');
@@ -204,7 +204,7 @@ class DashboardModel extends BaseDatabaseModel
 			'joomla_version'   => (new Version())->getShortVersion(),
 			'php_version'      => PHP_VERSION,
 			'db_type'          => $db->getServerType(),
-			'mokosuiteclient_version' => $pkgCache->version ?? '—',
+			'mokosuite_version' => $pkgCache->version ?? '—',
 			'debug'            => (bool) $config->get('debug'),
 			'offline'          => (bool) $config->get('offline'),
 			'sef'              => (bool) $config->get('sef'),
@@ -213,7 +213,7 @@ class DashboardModel extends BaseDatabaseModel
 	}

 	/**
-	 * Get installed MokoSuiteClient component and modules with versions.
+	 * Get installed MokoSuite component and modules with versions.
 	 *
 	 * @return  array  Array of extension objects with name, element, type, version.
 	 */
@@ -232,10 +232,10 @@ class DashboardModel extends BaseDatabaseModel
 			->where('('
 				// The component
 				. '(' . $db->quoteName('type') . ' = ' . $db->quote('component')
-				. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient') . ')'
+				. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('com_mokosuite') . ')'
 				// Admin modules
 				. ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('module')
-				. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mod_mokosuiteclient%') . ')'
+				. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mod_mokosuite%') . ')'
 			. ')')
 			->order($db->quoteName('type') . ' ASC, ' . $db->quoteName('element') . ' ASC');

@@ -272,7 +272,7 @@ class DashboardModel extends BaseDatabaseModel
 	{
 		$db = $this->getDatabase();

-		// Verify the extension exists and is a MokoSuiteClient plugin
+		// Verify the extension exists and is a MokoSuite plugin
 		$query = $db->getQuery(true)
 			->select([$db->quoteName('element'), $db->quoteName('protected')])
 			->from($db->quoteName('#__extensions'))
@@ -287,7 +287,7 @@ class DashboardModel extends BaseDatabaseModel
 		}

 		// Don't allow disabling protected/core plugins
-		if (!$enabled && ((int) $ext->protected || $ext->element === 'mokosuiteclient'))
+		if (!$enabled && ((int) $ext->protected || $ext->element === 'mokosuite'))
 		{
 			return ['success' => false, 'message' => 'This plugin is protected and cannot be disabled.'];
 		}
@@ -425,7 +425,7 @@ class DashboardModel extends BaseDatabaseModel
 			if (str_contains($row->element, 'sync'))
 			{
 				$meta['label']       = 'Content Sync Task';
-				$meta['description'] = 'Scheduled content synchronisation to remote MokoSuiteClient sites.';
+				$meta['description'] = 'Scheduled content synchronisation to remote MokoSuite sites.';
 			}
 			elseif (str_contains($row->element, 'demo'))
 			{
@@ -544,7 +544,7 @@ class DashboardModel extends BaseDatabaseModel
 			$db    = $this->getDatabase();
 			$query = $db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_waf_log'))
+				->from($db->quoteName('#__mokosuite_waf_log'))
 				->order($db->quoteName('created') . ' DESC')
 				->setLimit($limit);
 			$db->setQuery($query);
@@ -567,7 +567,7 @@ class DashboardModel extends BaseDatabaseModel
 			$db = $this->getDatabase();
 			$db->setQuery(
 				"SELECT DATE(" . $db->quoteName('created') . ") AS day, COUNT(*) AS total"
-				. " FROM " . $db->quoteName('#__mokosuiteclient_waf_log')
+				. " FROM " . $db->quoteName('#__mokosuite_waf_log')
 				. " WHERE " . $db->quoteName('created') . " >= DATE_SUB(NOW(), INTERVAL $days DAY)"
 				. " GROUP BY day ORDER BY day"
 			);
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -15,7 +15,7 @@ class ErpReportsModel extends BaseDatabaseModel
 		$db->setQuery($db->getQuery(true)
 			->select('DATE_FORMAT(inv.created, ' . $db->quote($fmt) . ') AS period')
 			->select('COUNT(*) AS invoice_count, COALESCE(SUM(inv.total), 0) AS revenue, COALESCE(SUM(inv.amount_paid), 0) AS collected')
-			->from($db->quoteName('#__mokosuiteclient_erp_invoices', 'inv'))
+			->from($db->quoteName('#__mokosuite_erp_invoices', 'inv'))
 			->where($db->quoteName('inv.created') . ' >= ' . $db->quote($from))
 			->where($db->quoteName('inv.created') . ' <= ' . $db->quote($to . ' 23:59:59'))
 			->where($db->quoteName('inv.type') . ' = ' . $db->quote('standard'))
@@ -28,7 +28,7 @@ class ErpReportsModel extends BaseDatabaseModel
 		$db = $this->getDatabase();
 		$db->setQuery($db->getQuery(true)
 			->select('cd.name AS contact_name, COALESCE(SUM(inv.total), 0) AS total_revenue, COUNT(*) AS invoice_count')
-			->from($db->quoteName('#__mokosuiteclient_erp_invoices', 'inv'))
+			->from($db->quoteName('#__mokosuite_erp_invoices', 'inv'))
 			->join('LEFT', $db->quoteName('#__contact_details', 'cd') . ' ON cd.id = inv.contact_id')
 			->where($db->quoteName('inv.created') . ' >= ' . $db->quote($from))
 			->where($db->quoteName('inv.created') . ' <= ' . $db->quote($to . ' 23:59:59'))
@@ -41,9 +41,9 @@ class ErpReportsModel extends BaseDatabaseModel
 		$db = $this->getDatabase();
 		$db->setQuery($db->getQuery(true)
 			->select('p.sku, c.title AS product_name, COALESCE(SUM(ii.quantity), 0) AS qty_sold, COALESCE(SUM(ii.line_total), 0) AS revenue')
-			->from($db->quoteName('#__mokosuiteclient_erp_invoice_items', 'ii'))
-			->join('INNER', $db->quoteName('#__mokosuiteclient_erp_invoices', 'inv') . ' ON inv.id = ii.invoice_id')
-			->join('LEFT', $db->quoteName('#__mokosuiteclient_erp_products', 'p') . ' ON p.id = ii.product_id')
+			->from($db->quoteName('#__mokosuite_erp_invoice_items', 'ii'))
+			->join('INNER', $db->quoteName('#__mokosuite_erp_invoices', 'inv') . ' ON inv.id = ii.invoice_id')
+			->join('LEFT', $db->quoteName('#__mokosuite_erp_products', 'p') . ' ON p.id = ii.product_id')
 			->join('LEFT', $db->quoteName('#__content', 'c') . ' ON c.id = p.article_id')
 			->where($db->quoteName('inv.created') . ' >= ' . $db->quote($from))
 			->where($db->quoteName('inv.created') . ' <= ' . $db->quote($to . ' 23:59:59'))
@@ -57,7 +57,7 @@ class ErpReportsModel extends BaseDatabaseModel
 		$db = $this->getDatabase();
 		$db->setQuery($db->getQuery(true)
 			->select('status, COUNT(*) AS cnt, COALESCE(SUM(value), 0) AS total_value')
-			->from($db->quoteName('#__mokosuiteclient_erp_deals'))
+			->from($db->quoteName('#__mokosuite_erp_deals'))
 			->where($db->quoteName('created') . ' >= ' . $db->quote($from))
 			->where($db->quoteName('created') . ' <= ' . $db->quote($to . ' 23:59:59'))
 			->group('status'));
@@ -70,7 +70,7 @@ class ErpReportsModel extends BaseDatabaseModel
 		$db->setQuery($db->getQuery(true)
 			->select('inv.id, inv.ref, inv.total, inv.amount_paid, inv.due_date, (inv.total - inv.amount_paid) AS balance, DATEDIFF(CURDATE(), inv.due_date) AS days_overdue')
 			->select('cd.name AS contact_name')
-			->from($db->quoteName('#__mokosuiteclient_erp_invoices', 'inv'))
+			->from($db->quoteName('#__mokosuite_erp_invoices', 'inv'))
 			->join('LEFT', $db->quoteName('#__contact_details', 'cd') . ' ON cd.id = inv.contact_id')
 			->where($db->quoteName('inv.status') . ' IN (' . $db->quote('sent') . ',' . $db->quote('partial') . ',' . $db->quote('overdue') . ')')
 			->where('(inv.total - inv.amount_paid) > 0')
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -104,7 +104,7 @@ class ExtensionsModel extends BaseDatabaseModel
 	public function installFromUrl(string $url): array
 	{
 		$tmpPath = Factory::getConfig()->get('tmp_path', JPATH_ROOT . '/tmp');
-		$tmpFile = $tmpPath . '/mokosuiteclient_install_' . md5($url) . '.zip';
+		$tmpFile = $tmpPath . '/mokosuite_install_' . md5($url) . '.zip';

 		try
 		{
@@ -160,7 +160,7 @@ class ExtensionsModel extends BaseDatabaseModel
 			return $this->catalogCache;
 		}

-		$catalogFile = JPATH_ADMINISTRATOR . '/components/com_mokosuiteclient/catalog.xml';
+		$catalogFile = JPATH_ADMINISTRATOR . '/components/com_mokosuite/catalog.xml';

 		if (!file_exists($catalogFile))
 		{
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -63,7 +63,7 @@ class HtaccessModel extends BaseDatabaseModel
 		$query = $db->getQuery(true)
 			->select($db->quoteName('params'))
 			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('component'));
 		$db->setQuery($query);
 		$params = new Registry($db->loadResult() ?? '{}');
@@ -89,7 +89,7 @@ class HtaccessModel extends BaseDatabaseModel
 			$query = $db->getQuery(true)
 				->select($db->quoteName('params'))
 				->from($db->quoteName('#__extensions'))
-				->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('component'));
 			$db->setQuery($query);
 			$params = new Registry($db->loadResult() ?? '{}');
@@ -107,7 +107,7 @@ class HtaccessModel extends BaseDatabaseModel
 				$db->getQuery(true)
 					->update($db->quoteName('#__extensions'))
 					->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
-					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			)->execute();

@@ -135,7 +135,7 @@ class HtaccessModel extends BaseDatabaseModel
 	public function saveHtaccess(string $content): array
 	{
 		$path   = JPATH_ROOT . '/.htaccess';
-		$backup = JPATH_ROOT . '/.htaccess.mokosuiteclient.bak';
+		$backup = JPATH_ROOT . '/.htaccess.mokosuite.bak';

 		try
 		{
@@ -158,7 +158,7 @@ class HtaccessModel extends BaseDatabaseModel
 				return ['success' => false, 'message' => '.htaccess is not writable.'];
 			}

-			return ['success' => true, 'message' => '.htaccess saved. Backup at .htaccess.mokosuiteclient.bak'];
+			return ['success' => true, 'message' => '.htaccess saved. Backup at .htaccess.mokosuite.bak'];
 		}
 		catch (\Throwable $e)
 		{
@@ -178,9 +178,9 @@ class HtaccessModel extends BaseDatabaseModel
 	{
 		$lines = [];
 		$lines[] = '##';
-		$lines[] = '## MokoSuiteClient Generated .htaccess';
+		$lines[] = '## MokoSuite Generated .htaccess';
 		$lines[] = '## Generated: ' . gmdate('Y-m-d H:i:s') . ' UTC';
-		$lines[] = '## DO NOT EDIT — regenerate from MokoSuiteClient > .htaccess Maker';
+		$lines[] = '## DO NOT EDIT — regenerate from MokoSuite > .htaccess Maker';
 		$lines[] = '##';
 		$lines[] = '';

@@ -412,7 +412,7 @@ class HtaccessModel extends BaseDatabaseModel
 	public function generateNginx(array $opts): string
 	{
 		$lines = [];
-		$lines[] = '## MokoSuiteClient Generated NginX Configuration';
+		$lines[] = '## MokoSuite Generated NginX Configuration';
 		$lines[] = '## Add these directives inside your server { } block';
 		$lines[] = '';

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -16,10 +16,10 @@ use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\Registry\Registry;

 /**
- * Importer for migrating from Akeeba Admin Tools to MokoSuiteClient.
+ * Importer for migrating from Akeeba Admin Tools to MokoSuite.
 *
 * Reads Admin Tools WAF config, htaccess settings, IP blocklists,
- * and security headers — maps them to MokoSuiteClient firewall plugin params
+ * and security headers — maps them to MokoSuite firewall plugin params
 * and htaccess maker options.
 *
 * @since  02.32.00
@@ -94,7 +94,7 @@ class ImportModel extends BaseDatabaseModel
 	}

 	/**
-	 * Import Admin Tools settings into MokoSuiteClient.
+	 * Import Admin Tools settings into MokoSuite.
 	 */
 	public function importAdminTools(): array
 	{
@@ -111,7 +111,7 @@ class ImportModel extends BaseDatabaseModel

 			if (!empty($firewallParams))
 			{
-				$this->mergePluginParams('mokosuiteclient_firewall', 'system', $firewallParams);
+				$this->mergePluginParams('mokosuite_firewall', 'system', $firewallParams);
 				$results['firewall'] = \count($firewallParams);
 			}

@@ -260,7 +260,7 @@ class ImportModel extends BaseDatabaseModel
 	}

 	/**
-	 * Map Admin Tools WAF config to MokoSuiteClient firewall plugin params.
+	 * Map Admin Tools WAF config to MokoSuite firewall plugin params.
 	 */
 	private function mapWafToFirewall(array $waf): array
 	{
@@ -332,7 +332,7 @@ class ImportModel extends BaseDatabaseModel
 	}

 	/**
-	 * Map Admin Tools config to MokoSuiteClient htaccess maker options.
+	 * Map Admin Tools config to MokoSuite htaccess maker options.
 	 */
 	private function mapToHtaccess(array $storage, array $waf): array
 	{
@@ -448,7 +448,7 @@ class ImportModel extends BaseDatabaseModel
 		$query = $db->getQuery(true)
 			->select($db->quoteName('params'))
 			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('component'));
 		$db->setQuery($query);
 		$params = new Registry($db->loadResult() ?? '{}');
@@ -466,7 +466,7 @@ class ImportModel extends BaseDatabaseModel
 			$db->getQuery(true)
 				->update($db->quoteName('#__extensions'))
 				->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
-				->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 		)->execute();
 	}
@@ -481,7 +481,7 @@ class ImportModel extends BaseDatabaseModel
 		$query = $db->getQuery(true)
 			->select($db->quoteName('params'))
 			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient_firewall'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('mokosuite_firewall'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 			->where($db->quoteName('folder') . ' = ' . $db->quote('system'));
 		$db->setQuery($query);
@@ -513,7 +513,7 @@ class ImportModel extends BaseDatabaseModel
 			$db->getQuery(true)
 				->update($db->quoteName('#__extensions'))
 				->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
-				->where($db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient_firewall'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('mokosuite_firewall'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 				->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
 		)->execute();
@@ -541,7 +541,7 @@ class ImportModel extends BaseDatabaseModel
 				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 		)->execute();

-		Log::add('Admin Tools component and plugins disabled after MokoSuiteClient import', Log::INFO, 'mokosuiteclient');
+		Log::add('Admin Tools component and plugins disabled after MokoSuite import', Log::INFO, 'mokosuite');
 	}

 	// ==================================================================
@@ -619,7 +619,7 @@ class ImportModel extends BaseDatabaseModel
 			)->execute();

 			$result['message'] .= ' Akeeba Ticket System has been disabled.';
-			Log::add('Akeeba Ticket System disabled after MokoSuiteClient import', Log::INFO, 'mokosuiteclient');
+			Log::add('Akeeba Ticket System disabled after MokoSuite import', Log::INFO, 'mokosuite');
 		}
 		catch (\Throwable $e)
 		{
@@ -644,7 +644,7 @@ class ImportModel extends BaseDatabaseModel
 				$db->getQuery(true)
 					->select($db->quoteName('params'))
 					->from($db->quoteName('#__extensions'))
-					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			);
 			$params = new Registry($db->loadResult() ?? '{}');
@@ -666,7 +666,7 @@ class ImportModel extends BaseDatabaseModel
 				$db->getQuery(true)
 					->select($db->quoteName('params'))
 					->from($db->quoteName('#__extensions'))
-					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			);
 			$params = new Registry($db->loadResult() ?? '{}');
@@ -676,13 +676,13 @@ class ImportModel extends BaseDatabaseModel
 				$db->getQuery(true)
 					->update($db->quoteName('#__extensions'))
 					->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
-					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			)->execute();
 		}
 		catch (\Throwable $e)
 		{
-			Log::add('Import marker error: ' . $e->getMessage(), Log::WARNING, 'mokosuiteclient');
+			Log::add('Import marker error: ' . $e->getMessage(), Log::WARNING, 'mokosuite');
 		}
 	}
 }
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -36,7 +36,7 @@ class MaintenanceModel extends BaseDatabaseModel
 				'engine'     => $t->Engine,
 				'size_mb'    => $sizeMb,
 				'overhead_kb' => $overheadKb,
-				'is_moko'    => str_contains($t->Name, 'mokosuiteclient'),
+				'is_moko'    => str_contains($t->Name, 'mokosuite'),
 			];
 		}

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -30,7 +30,7 @@ class PrivacyModel extends BaseDatabaseModel
 				$db->quoteName('u.username'),
 				$db->quoteName('p.name', 'processed_by_name'),
 			])
-			->from($db->quoteName('#__mokosuiteclient_data_requests', 'r'))
+			->from($db->quoteName('#__mokosuite_data_requests', 'r'))
 			->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id')
 			->leftJoin($db->quoteName('#__users', 'p') . ' ON p.id = r.processed_by');

@@ -68,7 +68,7 @@ class PrivacyModel extends BaseDatabaseModel
 				'created' => Factory::getDate()->toSql(),
 			];

-			$db->insertObject('#__mokosuiteclient_data_requests', $row, 'id');
+			$db->insertObject('#__mokosuite_data_requests', $row, 'id');

 			return ['success' => true, 'message' => ucfirst($type) . ' request #' . $row->id . ' created.', 'id' => (int) $row->id];
 		}
@@ -90,7 +90,7 @@ class PrivacyModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select('*')
-					->from($db->quoteName('#__mokosuiteclient_data_requests'))
+					->from($db->quoteName('#__mokosuite_data_requests'))
 					->where($db->quoteName('id') . ' = ' . $requestId)
 			);
 			$request = $db->loadObject();
@@ -104,7 +104,7 @@ class PrivacyModel extends BaseDatabaseModel
 			{
 				$db->setQuery(
 					$db->getQuery(true)
-						->update($db->quoteName('#__mokosuiteclient_data_requests'))
+						->update($db->quoteName('#__mokosuite_data_requests'))
 						->set($db->quoteName('status') . ' = ' . $db->quote('denied'))
 						->set($db->quoteName('processed_by') . ' = ' . (int) Factory::getApplication()->getIdentity()->id)
 						->set($db->quoteName('processed') . ' = ' . $db->quote(Factory::getDate()->toSql()))
@@ -117,7 +117,7 @@ class PrivacyModel extends BaseDatabaseModel
 			// Mark as processing
 			$db->setQuery(
 				$db->getQuery(true)
-					->update($db->quoteName('#__mokosuiteclient_data_requests'))
+					->update($db->quoteName('#__mokosuite_data_requests'))
 					->set($db->quoteName('status') . ' = ' . $db->quote('processing'))
 					->where($db->quoteName('id') . ' = ' . $requestId)
 			)->execute();
@@ -143,7 +143,7 @@ class PrivacyModel extends BaseDatabaseModel
 			// Mark completed
 			$db->setQuery(
 				$db->getQuery(true)
-					->update($db->quoteName('#__mokosuiteclient_data_requests'))
+					->update($db->quoteName('#__mokosuite_data_requests'))
 					->set($db->quoteName('status') . ' = ' . $db->quote('completed'))
 					->set($db->quoteName('processed_by') . ' = ' . (int) Factory::getApplication()->getIdentity()->id)
 					->set($db->quoteName('processed') . ' = ' . $db->quote(Factory::getDate()->toSql()))
@@ -201,7 +201,7 @@ class PrivacyModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select(['id', 'subject', 'body', 'status', 'priority', 'created'])
-					->from($db->quoteName('#__mokosuiteclient_tickets'))
+					->from($db->quoteName('#__mokosuite_tickets'))
 					->where($db->quoteName('created_by') . ' = ' . $userId)
 			);
 			$data['tickets'] = $db->loadObjectList() ?: [];
@@ -210,7 +210,7 @@ class PrivacyModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select(['r.id', 'r.ticket_id', 'r.body', 'r.created'])
-					->from($db->quoteName('#__mokosuiteclient_ticket_replies', 'r'))
+					->from($db->quoteName('#__mokosuite_ticket_replies', 'r'))
 					->where($db->quoteName('r.user_id') . ' = ' . $userId)
 			);
 			$data['ticket_replies'] = $db->loadObjectList() ?: [];
@@ -219,7 +219,7 @@ class PrivacyModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select('*')
-					->from($db->quoteName('#__mokosuiteclient_consent_log'))
+					->from($db->quoteName('#__mokosuite_consent_log'))
 					->where($db->quoteName('user_id') . ' = ' . $userId)
 					->order('created ASC')
 			);
@@ -295,7 +295,7 @@ class PrivacyModel extends BaseDatabaseModel
 			// Anonymize ticket replies
 			$db->setQuery(
 				$db->getQuery(true)
-					->update($db->quoteName('#__mokosuiteclient_ticket_replies'))
+					->update($db->quoteName('#__mokosuite_ticket_replies'))
 					->set($db->quoteName('body') . ' = ' . $db->quote('[Content removed per data request]'))
 					->where($db->quoteName('user_id') . ' = ' . $userId)
 			)->execute();
@@ -374,7 +374,7 @@ class PrivacyModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select($db->quoteName('id'))
-					->from($db->quoteName('#__mokosuiteclient_tickets'))
+					->from($db->quoteName('#__mokosuite_tickets'))
 					->where($db->quoteName('created_by') . ' = ' . $userId)
 			);
 			$ticketIds = $db->loadColumn() ?: [];
@@ -383,13 +383,13 @@ class PrivacyModel extends BaseDatabaseModel
 			{
 				$db->setQuery(
 					$db->getQuery(true)
-						->delete($db->quoteName('#__mokosuiteclient_ticket_replies'))
+						->delete($db->quoteName('#__mokosuite_ticket_replies'))
 						->where($db->quoteName('ticket_id') . ' IN (' . implode(',', $ticketIds) . ')')
 				)->execute();

 				$db->setQuery(
 					$db->getQuery(true)
-						->delete($db->quoteName('#__mokosuiteclient_tickets'))
+						->delete($db->quoteName('#__mokosuite_tickets'))
 						->where($db->quoteName('created_by') . ' = ' . $userId)
 				)->execute();
 			}
@@ -397,7 +397,7 @@ class PrivacyModel extends BaseDatabaseModel
 			// Delete consent log
 			$db->setQuery(
 				$db->getQuery(true)
-					->delete($db->quoteName('#__mokosuiteclient_consent_log'))
+					->delete($db->quoteName('#__mokosuite_consent_log'))
 					->where($db->quoteName('user_id') . ' = ' . $userId)
 			)->execute();

@@ -429,7 +429,7 @@ class PrivacyModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_consent_log'))
+				->from($db->quoteName('#__mokosuite_consent_log'))
 				->where($db->quoteName('user_id') . ' = ' . $userId)
 				->order($db->quoteName('created') . ' DESC')
 		);
@@ -450,7 +450,7 @@ class PrivacyModel extends BaseDatabaseModel
 			'ip_address' => $_SERVER['REMOTE_ADDR'] ?? '',
 			'created'    => Factory::getDate()->toSql(),
 		];
-		$db->insertObject('#__mokosuiteclient_consent_log', $row, 'id');
+		$db->insertObject('#__mokosuite_consent_log', $row, 'id');
 	}

 	// ==================================================================
@@ -466,7 +466,7 @@ class PrivacyModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_retention_policies'))
+				->from($db->quoteName('#__mokosuite_retention_policies'))
 				->order($db->quoteName('id') . ' ASC')
 		);

@@ -508,7 +508,7 @@ class PrivacyModel extends BaseDatabaseModel
 					case 'waf_logs':
 						$db->setQuery(
 							$db->getQuery(true)
-								->delete($db->quoteName('#__mokosuiteclient_waf_log'))
+								->delete($db->quoteName('#__mokosuite_waf_log'))
 								->where($db->quoteName('created') . ' < ' . $db->quote($cutoff))
 						)->execute();
 						$count = $db->getAffectedRows();
@@ -528,7 +528,7 @@ class PrivacyModel extends BaseDatabaseModel
 						{
 							$db->setQuery(
 								$db->getQuery(true)
-									->update($db->quoteName('#__mokosuiteclient_tickets'))
+									->update($db->quoteName('#__mokosuite_tickets'))
 									->set($db->quoteName('body') . ' = ' . $db->quote('[Removed per retention policy]'))
 									->where($db->quoteName('status') . ' = ' . $db->quote('closed'))
 									->where($db->quoteName('closed') . ' < ' . $db->quote($cutoff))
@@ -565,12 +565,12 @@ class PrivacyModel extends BaseDatabaseModel
 				{
 					$results['policies_run']++;
 					$results['items_affected'] += $count;
-					Log::add(\sprintf('Retention: %s — %d items affected', $policy->content_type, $count), Log::INFO, 'mokosuiteclient');
+					Log::add(\sprintf('Retention: %s — %d items affected', $policy->content_type, $count), Log::INFO, 'mokosuite');
 				}
 			}
 			catch (\Throwable $e)
 			{
-				Log::add('Retention policy error (' . $policy->content_type . '): ' . $e->getMessage(), Log::WARNING, 'mokosuiteclient');
+				Log::add('Retention policy error (' . $policy->content_type . '): ' . $e->getMessage(), Log::WARNING, 'mokosuite');
 			}
 		}

@@ -593,16 +593,16 @@ class PrivacyModel extends BaseDatabaseModel

 		try
 		{
-			$db->setQuery('SELECT COUNT(*) FROM #__mokosuiteclient_data_requests WHERE status = ' . $db->quote('pending'));
+			$db->setQuery('SELECT COUNT(*) FROM #__mokosuite_data_requests WHERE status = ' . $db->quote('pending'));
 			$summary->pending_requests = (int) $db->loadResult();

-			$db->setQuery('SELECT COUNT(*) FROM #__mokosuiteclient_data_requests');
+			$db->setQuery('SELECT COUNT(*) FROM #__mokosuite_data_requests');
 			$summary->total_requests = (int) $db->loadResult();

-			$db->setQuery('SELECT COUNT(*) FROM #__mokosuiteclient_consent_log');
+			$db->setQuery('SELECT COUNT(*) FROM #__mokosuite_consent_log');
 			$summary->consent_entries = (int) $db->loadResult();

-			$db->setQuery('SELECT COUNT(*) FROM #__mokosuiteclient_retention_policies WHERE enabled = 1');
+			$db->setQuery('SELECT COUNT(*) FROM #__mokosuite_retention_policies WHERE enabled = 1');
 			$summary->policies_active = (int) $db->loadResult();
 		}
 		catch (\Throwable $e) {}
@@ -1,18 +1,18 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Moko\Component\MokoSuiteClient\Administrator\Service\NotificationService;
+use Moko\Component\MokoSuite\Administrator\Service\NotificationService;

 class TicketsModel extends BaseDatabaseModel
 {
@@ -45,12 +45,12 @@ class TicketsModel extends BaseDatabaseModel
 				$db->quoteName('pr.color', 'priority_color'),
 				$db->quoteName('st.is_closed', 'status_is_closed'),
 			])
-			->from($db->quoteName('#__mokosuiteclient_tickets', 't'))
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_categories', 'c') . ' ON c.id = t.category_id')
+			->from($db->quoteName('#__mokosuite_tickets', 't'))
+			->leftJoin($db->quoteName('#__mokosuite_ticket_categories', 'c') . ' ON c.id = t.category_id')
 			->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = t.created_by')
 			->leftJoin($db->quoteName('#__contact_details', 'ct') . ' ON ct.id = t.contact_id')
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_statuses', 'st') . ' ON st.id = t.status_id')
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_priorities', 'pr') . ' ON pr.id = t.priority_id');
+			->leftJoin($db->quoteName('#__mokosuite_ticket_statuses', 'st') . ' ON st.id = t.status_id')
+			->leftJoin($db->quoteName('#__mokosuite_ticket_priorities', 'pr') . ' ON pr.id = t.priority_id');

 		if (!empty($filters['status_id']))
 		{
@@ -115,12 +115,12 @@ class TicketsModel extends BaseDatabaseModel
 				$db->quoteName('pr.alias', 'priority_alias'),
 				$db->quoteName('pr.color', 'priority_color'),
 			])
-			->from($db->quoteName('#__mokosuiteclient_tickets', 't'))
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_categories', 'c') . ' ON c.id = t.category_id')
+			->from($db->quoteName('#__mokosuite_tickets', 't'))
+			->leftJoin($db->quoteName('#__mokosuite_ticket_categories', 'c') . ' ON c.id = t.category_id')
 			->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = t.created_by')
 			->leftJoin($db->quoteName('#__contact_details', 'ct') . ' ON ct.id = t.contact_id')
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_statuses', 'st') . ' ON st.id = t.status_id')
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_priorities', 'pr') . ' ON pr.id = t.priority_id')
+			->leftJoin($db->quoteName('#__mokosuite_ticket_statuses', 'st') . ' ON st.id = t.status_id')
+			->leftJoin($db->quoteName('#__mokosuite_ticket_priorities', 'pr') . ' ON pr.id = t.priority_id')
 			->where($db->quoteName('t.id') . ' = ' . $id);
 		$db->setQuery($query);
 		$ticket = $db->loadObject();
@@ -136,7 +136,7 @@ class TicketsModel extends BaseDatabaseModel
 				$db->quoteName('r') . '.*',
 				$db->quoteName('u.name', 'user_name'),
 			])
-			->from($db->quoteName('#__mokosuiteclient_ticket_replies', 'r'))
+			->from($db->quoteName('#__mokosuite_ticket_replies', 'r'))
 			->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id')
 			->where($db->quoteName('r.ticket_id') . ' = ' . $id)
 			->order($db->quoteName('r.created') . ' ASC');
@@ -187,7 +187,7 @@ class TicketsModel extends BaseDatabaseModel
 			{
 				$query = $db->getQuery(true)
 					->select($db->quoteName('auto_assign_user'))
-					->from($db->quoteName('#__mokosuiteclient_ticket_categories'))
+					->from($db->quoteName('#__mokosuite_ticket_categories'))
 					->where($db->quoteName('id') . ' = ' . (int) $ticket->category_id);
 				$db->setQuery($query);
 				$autoAssign = (int) $db->loadResult();
@@ -203,7 +203,7 @@ class TicketsModel extends BaseDatabaseModel
 			{
 				$query = $db->getQuery(true)
 					->select([$db->quoteName('sla_response_minutes'), $db->quoteName('sla_resolution_minutes')])
-					->from($db->quoteName('#__mokosuiteclient_ticket_categories'))
+					->from($db->quoteName('#__mokosuite_ticket_categories'))
 					->where($db->quoteName('id') . ' = ' . (int) $ticket->category_id);
 				$db->setQuery($query);
 				$sla = $db->loadObject();
@@ -215,7 +215,7 @@ class TicketsModel extends BaseDatabaseModel
 				}
 			}

-			$db->insertObject('#__mokosuiteclient_tickets', $ticket, 'id');
+			$db->insertObject('#__mokosuite_tickets', $ticket, 'id');

 			// Handle multi-assignee (users and groups)
 			$assignUsers  = array_filter(array_map('intval', (array) ($data['assign_users'] ?? [])));
@@ -271,14 +271,14 @@ class TicketsModel extends BaseDatabaseModel
 				'created'     => $now,
 			];

-			$db->insertObject('#__mokosuiteclient_ticket_replies', $reply, 'id');
+			$db->insertObject('#__mokosuite_ticket_replies', $reply, 'id');

 			// Mark SLA as responded only for staff replies (not customer self-replies)
 			$ticket = $this->getTicket($ticketId);
 			$isStaffReply = $ticket && (int) $user->id !== (int) $ticket->created_by;

 			$updateQuery = $db->getQuery(true)
-				->update($db->quoteName('#__mokosuiteclient_tickets'))
+				->update($db->quoteName('#__mokosuite_tickets'))
 				->set($db->quoteName('modified') . ' = ' . $db->quote($now))
 				->where($db->quoteName('id') . ' = ' . $ticketId);

@@ -323,7 +323,7 @@ class TicketsModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select('*')
-					->from($db->quoteName('#__mokosuiteclient_ticket_statuses'))
+					->from($db->quoteName('#__mokosuite_ticket_statuses'))
 					->where($db->quoteName('id') . ' = ' . $statusId)
 			);
 			$status = $db->loadObject();
@@ -337,7 +337,7 @@ class TicketsModel extends BaseDatabaseModel
 			$db->setQuery(
 				$db->getQuery(true)
 					->select($db->quoteName('status_id'))
-					->from($db->quoteName('#__mokosuiteclient_tickets'))
+					->from($db->quoteName('#__mokosuite_tickets'))
 					->where($db->quoteName('id') . ' = ' . $ticketId)
 			);
 			$oldStatusId = (int) $db->loadResult();
@@ -361,7 +361,7 @@ class TicketsModel extends BaseDatabaseModel

 			$db->setQuery(
 				$db->getQuery(true)
-					->update($db->quoteName('#__mokosuiteclient_tickets'))
+					->update($db->quoteName('#__mokosuite_tickets'))
 					->set($sets)
 					->where($db->quoteName('id') . ' = ' . $ticketId)
 			)->execute();
@@ -394,7 +394,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_categories'))
+				->from($db->quoteName('#__mokosuite_ticket_categories'))
 				->where($db->quoteName('published') . ' = 1')
 				->order($db->quoteName('ordering') . ' ASC')
 		);
@@ -411,7 +411,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_assignees'))
+				->from($db->quoteName('#__mokosuite_ticket_assignees'))
 				->where($db->quoteName('ticket_id') . ' = ' . $ticketId)
 		);
 		$rows = $db->loadObjectList() ?: [];
@@ -457,7 +457,7 @@ class TicketsModel extends BaseDatabaseModel
 		// Clear existing
 		$db->setQuery(
 			$db->getQuery(true)
-				->delete($db->quoteName('#__mokosuiteclient_ticket_assignees'))
+				->delete($db->quoteName('#__mokosuite_ticket_assignees'))
 				->where($db->quoteName('ticket_id') . ' = ' . $ticketId)
 		)->execute();

@@ -468,7 +468,7 @@ class TicketsModel extends BaseDatabaseModel

 			if ($uid > 0)
 			{
-				$db->insertObject('#__mokosuiteclient_ticket_assignees', (object) [
+				$db->insertObject('#__mokosuite_ticket_assignees', (object) [
 					'ticket_id'     => $ticketId,
 					'assignee_type' => 'user',
 					'assignee_id'   => $uid,
@@ -483,7 +483,7 @@ class TicketsModel extends BaseDatabaseModel

 			if ($gid > 0)
 			{
-				$db->insertObject('#__mokosuiteclient_ticket_assignees', (object) [
+				$db->insertObject('#__mokosuite_ticket_assignees', (object) [
 					'ticket_id'     => $ticketId,
 					'assignee_type' => 'group',
 					'assignee_id'   => $gid,
@@ -518,7 +518,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_statuses'))
+				->from($db->quoteName('#__mokosuite_ticket_statuses'))
 				->where($db->quoteName('is_default') . ' = 1')
 				->setLimit(1)
 		);
@@ -535,7 +535,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_priorities'))
+				->from($db->quoteName('#__mokosuite_ticket_priorities'))
 				->where($db->quoteName('is_default') . ' = 1')
 				->setLimit(1)
 		);
@@ -552,7 +552,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_statuses'))
+				->from($db->quoteName('#__mokosuite_ticket_statuses'))
 				->order($db->quoteName('ordering') . ' ASC')
 		);

@@ -568,13 +568,46 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_priorities'))
+				->from($db->quoteName('#__mokosuite_ticket_priorities'))
 				->order($db->quoteName('ordering') . ' ASC')
 		);

 		return $db->loadObjectList() ?: [];
 	}

+	/**
+	 * Get backend users for assignee selection.
+	 */
+	public function getBackendUsers(): array
+	{
+		$db = $this->getDatabase();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select(['u.id', 'u.name', 'u.username'])
+				->from($db->quoteName('#__users', 'u'))
+				->where($db->quoteName('u.block') . ' = 0')
+				->order($db->quoteName('u.name') . ' ASC')
+		);
+
+		return $db->loadObjectList() ?: [];
+	}
+
+	/**
+	 * Get Joomla user groups for assignee selection.
+	 */
+	public function getUserGroups(): array
+	{
+		$db = $this->getDatabase();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select(['id', 'title'])
+				->from($db->quoteName('#__usergroups'))
+				->order($db->quoteName('title') . ' ASC')
+		);
+
+		return $db->loadObjectList() ?: [];
+	}
+
 	/**
 	 * Get Joomla custom field groups assigned to a ticket category.
 	 */
@@ -584,7 +617,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select([$db->quoteName('fg.id'), $db->quoteName('fg.title')])
-				->from($db->quoteName('#__mokosuiteclient_ticket_category_field_groups', 'cfg'))
+				->from($db->quoteName('#__mokosuite_ticket_category_field_groups', 'cfg'))
 				->innerJoin($db->quoteName('#__fields_groups', 'fg') . ' ON fg.id = cfg.field_group_id')
 				->where($db->quoteName('cfg.category_id') . ' = ' . $categoryId)
 				->where($db->quoteName('fg.state') . ' = 1')
@@ -595,7 +628,7 @@ class TicketsModel extends BaseDatabaseModel
 	}

 	/**
-	 * Get Joomla custom fields for given field group IDs (context: com_mokosuiteclient.ticket).
+	 * Get Joomla custom fields for given field group IDs (context: com_mokosuite.ticket).
 	 */
 	public function getFieldsForGroups(array $groupIds): array
 	{
@@ -610,7 +643,7 @@ class TicketsModel extends BaseDatabaseModel
 			$db->getQuery(true)
 				->select('*')
 				->from($db->quoteName('#__fields'))
-				->where($db->quoteName('context') . ' = ' . $db->quote('com_mokosuiteclient.ticket'))
+				->where($db->quoteName('context') . ' = ' . $db->quote('com_mokosuite.ticket'))
 				->where($db->quoteName('group_id') . ' IN (' . $ids . ')')
 				->where($db->quoteName('state') . ' = 1')
 				->order($db->quoteName('ordering') . ' ASC')
@@ -682,7 +715,7 @@ class TicketsModel extends BaseDatabaseModel
 		$db    = $this->getDatabase();
 		$query = $db->getQuery(true)
 			->select('*')
-			->from($db->quoteName('#__mokosuiteclient_ticket_canned'))
+			->from($db->quoteName('#__mokosuite_ticket_canned'))
 			->order($db->quoteName('ordering') . ' ASC');

 		if ($categoryId)
@@ -712,8 +745,8 @@ class TicketsModel extends BaseDatabaseModel
 					$db->quoteName('s.is_closed'),
 					'COUNT(' . $db->quoteName('t.id') . ') AS ' . $db->quoteName('cnt'),
 				])
-				->from($db->quoteName('#__mokosuiteclient_ticket_statuses', 's'))
-				->leftJoin($db->quoteName('#__mokosuiteclient_tickets', 't') . ' ON t.status_id = s.id')
+				->from($db->quoteName('#__mokosuite_ticket_statuses', 's'))
+				->leftJoin($db->quoteName('#__mokosuite_tickets', 't') . ' ON t.status_id = s.id')
 				->group($db->quoteName('s.id'))
 				->order($db->quoteName('s.ordering') . ' ASC')
 		);
@@ -732,8 +765,8 @@ class TicketsModel extends BaseDatabaseModel
 		$query = $db->getQuery(true)
 			->select(['t.' . $db->quoteName('id'), $db->quoteName('t.subject'), $db->quoteName('t.priority'),
 				$db->quoteName('t.sla_response_due'), $db->quoteName('t.sla_resolution_due'), $db->quoteName('t.sla_responded')])
-			->from($db->quoteName('#__mokosuiteclient_tickets', 't'))
-			->leftJoin($db->quoteName('#__mokosuiteclient_ticket_statuses', 's') . ' ON s.id = t.status_id')
+			->from($db->quoteName('#__mokosuite_tickets', 't'))
+			->leftJoin($db->quoteName('#__mokosuite_ticket_statuses', 's') . ' ON s.id = t.status_id')
 			->where('(' . $db->quoteName('s.is_closed') . ' = 0 OR ' . $db->quoteName('s.is_closed') . ' IS NULL)')
 			->where('((' . $db->quoteName('sla_response_due') . ' < ' . $db->quote($now) . ' AND ' . $db->quoteName('sla_responded') . ' = 0)'
 				. ' OR ' . $db->quoteName('sla_resolution_due') . ' < ' . $db->quote($now) . ')')
@@ -762,7 +795,7 @@ class TicketsModel extends BaseDatabaseModel
 			// Load enabled rules for this event
 			$query = $db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_automation'))
+				->from($db->quoteName('#__mokosuite_ticket_automation'))
 				->where($db->quoteName('trigger_event') . ' = ' . $db->quote($event))
 				->where($db->quoteName('enabled') . ' = 1')
 				->order($db->quoteName('ordering') . ' ASC');
@@ -798,7 +831,7 @@ class TicketsModel extends BaseDatabaseModel
 		}
 		catch (\Throwable $e)
 		{
-			\Joomla\CMS\Log\Log::add('Automation error: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokosuiteclient');
+			\Joomla\CMS\Log\Log::add('Automation error: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokosuite');
 		}
 	}

@@ -813,7 +846,7 @@ class TicketsModel extends BaseDatabaseModel
 		// Load scheduled rules
 		$query = $db->getQuery(true)
 			->select('*')
-			->from($db->quoteName('#__mokosuiteclient_ticket_automation'))
+			->from($db->quoteName('#__mokosuite_ticket_automation'))
 			->where($db->quoteName('trigger_event') . ' = ' . $db->quote('scheduled'))
 			->where($db->quoteName('enabled') . ' = 1')
 			->order($db->quoteName('ordering') . ' ASC');
@@ -828,7 +861,7 @@ class TicketsModel extends BaseDatabaseModel
 		// Load all non-closed tickets
 		$query = $db->getQuery(true)
 			->select('*')
-			->from($db->quoteName('#__mokosuiteclient_tickets'))
+			->from($db->quoteName('#__mokosuite_tickets'))
 			->where($db->quoteName('status') . ' != ' . $db->quote('closed'));
 		$db->setQuery($query);
 		$tickets = $db->loadObjectList() ?: [];
@@ -925,7 +958,7 @@ class TicketsModel extends BaseDatabaseModel
 				case 'set_priority':
 					$db->setQuery(
 						$db->getQuery(true)
-							->update($db->quoteName('#__mokosuiteclient_tickets'))
+							->update($db->quoteName('#__mokosuite_tickets'))
 							->set($db->quoteName('priority') . ' = ' . $db->quote($value))
 							->set($db->quoteName('modified') . ' = ' . $db->quote($now))
 							->where($db->quoteName('id') . ' = ' . $ticketId)
@@ -935,7 +968,7 @@ class TicketsModel extends BaseDatabaseModel
 				case 'assign':
 					$db->setQuery(
 						$db->getQuery(true)
-							->update($db->quoteName('#__mokosuiteclient_tickets'))
+							->update($db->quoteName('#__mokosuite_tickets'))
 							->set($db->quoteName('assigned_to') . ' = ' . (int) $value)
 							->set($db->quoteName('modified') . ' = ' . $db->quote($now))
 							->where($db->quoteName('id') . ' = ' . $ticketId)
@@ -950,7 +983,7 @@ class TicketsModel extends BaseDatabaseModel
 						'is_internal' => 1,
 						'created'     => $now,
 					];
-					$db->insertObject('#__mokosuiteclient_ticket_replies', $reply, 'id');
+					$db->insertObject('#__mokosuite_ticket_replies', $reply, 'id');
 					break;

 				case 'send_email':
@@ -970,7 +1003,7 @@ class TicketsModel extends BaseDatabaseModel
 						}
 						catch (\Throwable $e)
 						{
-							\Joomla\CMS\Log\Log::add('Automation email failed: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokosuiteclient');
+							\Joomla\CMS\Log\Log::add('Automation email failed: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokosuite');
 						}
 					}
 					break;
@@ -988,7 +1021,7 @@ class TicketsModel extends BaseDatabaseModel
 						$db->setQuery(
 							$db->getQuery(true)
 								->select($db->quoteName('id'))
-								->from($db->quoteName('#__mokosuiteclient_tickets'))
+								->from($db->quoteName('#__mokosuite_tickets'))
 								->where($db->quoteName('created_by') . ' = ' . $userId)
 								->where($db->quoteName('status') . ' NOT IN (' . $db->quote('resolved') . ',' . $db->quote('closed') . ')')
 								->where($catId ? $db->quoteName('category_id') . ' = ' . $catId : '1=1')
@@ -1008,7 +1041,7 @@ class TicketsModel extends BaseDatabaseModel
 						$db->setQuery(
 							$db->getQuery(true)
 								->select('COUNT(*)')
-								->from($db->quoteName('#__mokosuiteclient_tickets'))
+								->from($db->quoteName('#__mokosuite_tickets'))
 								->where($db->quoteName('created_by') . ' = ' . $userId)
 								->where($db->quoteName('status') . ' NOT IN (' . $db->quote('resolved') . ',' . $db->quote('closed') . ')')
 						);
@@ -1043,7 +1076,7 @@ class TicketsModel extends BaseDatabaseModel

 			$query = $db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_automation'))
+				->from($db->quoteName('#__mokosuite_ticket_automation'))
 				->where($db->quoteName('trigger_event') . ' = ' . $db->quote($event))
 				->where($db->quoteName('enabled') . ' = 1')
 				->order($db->quoteName('ordering') . ' ASC');
@@ -1080,7 +1113,7 @@ class TicketsModel extends BaseDatabaseModel
 		}
 		catch (\Throwable $e)
 		{
-			\Joomla\CMS\Log\Log::add('System event automation error: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokosuiteclient');
+			\Joomla\CMS\Log\Log::add('System event automation error: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokosuite');
 		}
 	}

@@ -1093,13 +1126,124 @@ class TicketsModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('*')
-				->from($db->quoteName('#__mokosuiteclient_ticket_automation'))
+				->from($db->quoteName('#__mokosuite_ticket_automation'))
 				->order($db->quoteName('ordering') . ' ASC')
 		);

 		return $db->loadObjectList() ?: [];
 	}

+	// ==================================================================
+	// Status/Priority CRUD
+	// ==================================================================
+
+	public function saveStatus(array $data): array
+	{
+		$db  = $this->getDatabase();
+		$obj = (object) $data;
+
+		if (!empty($obj->title) && empty($obj->alias))
+		{
+			$obj->alias = strtolower(preg_replace('/[^a-z0-9]+/i', '_', $obj->title));
+		}
+
+		if (empty($obj->id))
+		{
+			unset($obj->id);
+			$db->insertObject('#__mokosuite_ticket_statuses', $obj, 'id');
+
+			return ['status' => 'ok', 'id' => (int) $obj->id, 'message' => 'Status created'];
+		}
+
+		$db->updateObject('#__mokosuite_ticket_statuses', $obj, 'id');
+
+		return ['status' => 'ok', 'id' => (int) $obj->id, 'message' => 'Status updated'];
+	}
+
+	public function deleteStatus(int $id): array
+	{
+		if ($id < 1)
+		{
+			return ['status' => 'error', 'message' => 'Invalid ID'];
+		}
+
+		$db = $this->getDatabase();
+
+		// Check no tickets use this status
+		$db->setQuery(
+			$db->getQuery(true)
+				->select('COUNT(*)')
+				->from($db->quoteName('#__mokosuite_tickets'))
+				->where($db->quoteName('status_id') . ' = ' . $id)
+		);
+
+		if ((int) $db->loadResult() > 0)
+		{
+			return ['status' => 'error', 'message' => 'Cannot delete — status is in use by tickets'];
+		}
+
+		$db->setQuery(
+			$db->getQuery(true)
+				->delete($db->quoteName('#__mokosuite_ticket_statuses'))
+				->where($db->quoteName('id') . ' = ' . $id)
+		)->execute();
+
+		return ['status' => 'ok', 'message' => 'Status deleted'];
+	}
+
+	public function savePriority(array $data): array
+	{
+		$db  = $this->getDatabase();
+		$obj = (object) $data;
+
+		if (!empty($obj->title) && empty($obj->alias))
+		{
+			$obj->alias = strtolower(preg_replace('/[^a-z0-9]+/i', '_', $obj->title));
+		}
+
+		if (empty($obj->id))
+		{
+			unset($obj->id);
+			$db->insertObject('#__mokosuite_ticket_priorities', $obj, 'id');
+
+			return ['status' => 'ok', 'id' => (int) $obj->id, 'message' => 'Priority created'];
+		}
+
+		$db->updateObject('#__mokosuite_ticket_priorities', $obj, 'id');
+
+		return ['status' => 'ok', 'id' => (int) $obj->id, 'message' => 'Priority updated'];
+	}
+
+	public function deletePriority(int $id): array
+	{
+		if ($id < 1)
+		{
+			return ['status' => 'error', 'message' => 'Invalid ID'];
+		}
+
+		$db = $this->getDatabase();
+
+		$db->setQuery(
+			$db->getQuery(true)
+				->select('COUNT(*)')
+				->from($db->quoteName('#__mokosuite_tickets'))
+				->where($db->quoteName('priority_id') . ' = ' . $id)
+		);
+
+		if ((int) $db->loadResult() > 0)
+		{
+			return ['status' => 'error', 'message' => 'Cannot delete — priority is in use by tickets'];
+		}
+
+		$db->setQuery(
+			$db->getQuery(true)
+				->delete($db->quoteName('#__mokosuite_ticket_priorities'))
+				->where($db->quoteName('id') . ' = ' . $id)
+		)->execute();
+
+		return ['status' => 'ok', 'message' => 'Priority deleted'];
+	}
+
 	// ==================================================================
 	// Akeeba Ticket System Importer
 	// ==================================================================
@@ -1140,7 +1284,7 @@ class TicketsModel extends BaseDatabaseModel

 		try
 		{
-			// Status mapping: ATS → MokoSuiteClient
+			// Status mapping: ATS → MokoSuite
 			$statusMap = [
 				'O' => 'open',       // Open
 				'P' => 'in_progress', // Pending (staff action needed)
@@ -1174,7 +1318,7 @@ class TicketsModel extends BaseDatabaseModel
 				$exists = $db->setQuery(
 					$db->getQuery(true)
 						->select('COUNT(*)')
-						->from('#__mokosuiteclient_ticket_canned')
+						->from('#__mokosuite_ticket_canned')
 						->where($db->quoteName('title') . ' = ' . $db->quote($c->title))
 				)->loadResult();

@@ -1189,7 +1333,7 @@ class TicketsModel extends BaseDatabaseModel
 					'category_id' => null,
 					'ordering'    => (int) ($c->ordering ?? 0),
 				];
-				$db->insertObject('#__mokosuiteclient_ticket_canned', $row, 'id');
+				$db->insertObject('#__mokosuite_ticket_canned', $row, 'id');
 				$results['canned']++;
 			}

@@ -1197,7 +1341,7 @@ class TicketsModel extends BaseDatabaseModel
 			$db->setQuery('SELECT * FROM #__ats_tickets ORDER BY id');
 			$atsTickets = $db->loadObjectList() ?: [];

-			$ticketIdMap = []; // ATS id → MokoSuiteClient id
+			$ticketIdMap = []; // ATS id → MokoSuite id

 			foreach ($atsTickets as $t)
 			{
@@ -1205,7 +1349,7 @@ class TicketsModel extends BaseDatabaseModel
 				$exists = $db->setQuery(
 					$db->getQuery(true)
 						->select('COUNT(*)')
-						->from('#__mokosuiteclient_tickets')
+						->from('#__mokosuite_tickets')
 						->where($db->quoteName('subject') . ' = ' . $db->quote($t->title))
 						->where($db->quoteName('created_by') . ' = ' . (int) $t->created_by)
 				)->loadResult();
@@ -1233,7 +1377,7 @@ class TicketsModel extends BaseDatabaseModel
 					'sla_responded' => 1,
 				];

-				$db->insertObject('#__mokosuiteclient_tickets', $row, 'id');
+				$db->insertObject('#__mokosuite_tickets', $row, 'id');
 				$ticketIdMap[(int) $t->id] = (int) $row->id;
 				$results['tickets']++;
 			}
@@ -1258,7 +1402,7 @@ class TicketsModel extends BaseDatabaseModel
 					$body = strip_tags($p->content_html ?? '');
 					$db->setQuery(
 						$db->getQuery(true)
-							->update('#__mokosuiteclient_tickets')
+							->update('#__mokosuite_tickets')
 							->set($db->quoteName('body') . ' = ' . $db->quote($body))
 							->where($db->quoteName('id') . ' = ' . $newTicketId)
 					)->execute();
@@ -1274,7 +1418,7 @@ class TicketsModel extends BaseDatabaseModel
 					'created'     => $p->created ?: Factory::getDate()->toSql(),
 				];

-				$db->insertObject('#__mokosuiteclient_ticket_replies', $row, 'id');
+				$db->insertObject('#__mokosuite_ticket_replies', $row, 'id');
 				$results['replies']++;
 			}

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Model;
+namespace Moko\Component\MokoSuite\Administrator\Model;

 defined('_JEXEC') or die;

@@ -23,7 +23,7 @@ class WaflogModel extends BaseDatabaseModel
 		$db    = $this->getDatabase();
 		$query = $db->getQuery(true)
 			->select('*')
-			->from($db->quoteName('#__mokosuiteclient_waf_log'));
+			->from($db->quoteName('#__mokosuite_waf_log'));

 		if (!empty($filters['rule']))
 		{
@@ -69,7 +69,7 @@ class WaflogModel extends BaseDatabaseModel
 		$db    = $this->getDatabase();
 		$query = $db->getQuery(true)
 			->select('COUNT(*)')
-			->from($db->quoteName('#__mokosuiteclient_waf_log'));
+			->from($db->quoteName('#__mokosuite_waf_log'));

 		if (!empty($filters['rule']))
 		{
@@ -95,7 +95,7 @@ class WaflogModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select([$db->quoteName('rule'), 'COUNT(*) AS ' . $db->quoteName('cnt')])
-				->from($db->quoteName('#__mokosuiteclient_waf_log'))
+				->from($db->quoteName('#__mokosuite_waf_log'))
 				->group($db->quoteName('rule'))
 				->order($db->quoteName('cnt') . ' DESC')
 		);
@@ -113,7 +113,7 @@ class WaflogModel extends BaseDatabaseModel
 			$db->getQuery(true)
 				->select([$db->quoteName('ip'), 'COUNT(*) AS ' . $db->quoteName('cnt'),
 					'MAX(' . $db->quoteName('created') . ') AS ' . $db->quoteName('last_seen')])
-				->from($db->quoteName('#__mokosuiteclient_waf_log'))
+				->from($db->quoteName('#__mokosuite_waf_log'))
 				->group($db->quoteName('ip'))
 				->order($db->quoteName('cnt') . ' DESC')
 				->setLimit($limit)
@@ -131,7 +131,7 @@ class WaflogModel extends BaseDatabaseModel
 		$db->setQuery(
 			$db->getQuery(true)
 				->select('DISTINCT ' . $db->quoteName('rule'))
-				->from($db->quoteName('#__mokosuiteclient_waf_log'))
+				->from($db->quoteName('#__mokosuite_waf_log'))
 				->order($db->quoteName('rule') . ' ASC')
 		);

@@ -150,7 +150,7 @@ class WaflogModel extends BaseDatabaseModel

 			$db->setQuery(
 				$db->getQuery(true)
-					->delete($db->quoteName('#__mokosuiteclient_waf_log'))
+					->delete($db->quoteName('#__mokosuite_waf_log'))
 					->where($db->quoteName('created') . ' < ' . $db->quote($cutoff))
 			)->execute();

@@ -176,7 +176,7 @@ class WaflogModel extends BaseDatabaseModel
 			$query = $db->getQuery(true)
 				->select($db->quoteName('params'))
 				->from($db->quoteName('#__extensions'))
-				->where($db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient_firewall'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('mokosuite_firewall'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 				->where($db->quoteName('folder') . ' = ' . $db->quote('system'));
 			$db->setQuery($query);
@@ -200,7 +200,7 @@ class WaflogModel extends BaseDatabaseModel
 				$db->getQuery(true)
 					->update($db->quoteName('#__extensions'))
 					->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
-					->where($db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient_firewall'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('mokosuite_firewall'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 					->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
 			)->execute();
@@ -0,0 +1,177 @@
+<?php
+/**
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+namespace Moko\Component\MokoSuite\Administrator\Service;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filesystem\Folder;
+use Joomla\CMS\Log\Log;
+
+class AttachmentService
+{
+	private const STORAGE_DIR = JPATH_ROOT . '/media/com_mokosuite/attachments';
+
+	private const ALLOWED_EXTENSIONS = [
+		'jpg', 'jpeg', 'png', 'gif', 'webp', 'svg',
+		'pdf', 'doc', 'docx', 'xls', 'xlsx', 'csv', 'txt', 'rtf',
+		'zip', 'gz', 'tar',
+	];
+
+	private const MAX_FILE_SIZE = 10 * 1024 * 1024; // 10 MB
+
+	/**
+	 * Upload file(s) for a ticket or reply.
+	 *
+	 * @param  int       $ticketId   Ticket ID
+	 * @param  int|null  $replyId    Reply ID (null for ticket-level attachments)
+	 * @param  array     $files      $_FILES array entry (single or multi)
+	 * @return array     Saved attachment records
+	 */
+	public static function upload(int $ticketId, ?int $replyId, array $files): array
+	{
+		$saved = [];
+
+		// Normalize single file to array format
+		if (!is_array($files['name'])) {
+			$files = [
+				'name'     => [$files['name']],
+				'type'     => [$files['type']],
+				'tmp_name' => [$files['tmp_name']],
+				'error'    => [$files['error']],
+				'size'     => [$files['size']],
+			];
+		}
+
+		$ticketDir = self::STORAGE_DIR . '/' . $ticketId;
+
+		if (!is_dir($ticketDir)) {
+			Folder::create($ticketDir);
+		}
+
+		$userId = (int) Factory::getUser()->id;
+		$db = Factory::getDbo();
+
+		for ($i = 0, $count = count($files['name']); $i < $count; $i++)
+		{
+			if ($files['error'][$i] !== UPLOAD_ERR_OK) {
+				continue;
+			}
+
+			$originalName = File::makeSafe($files['name'][$i]);
+			$ext = strtolower(pathinfo($originalName, PATHINFO_EXTENSION));
+
+			// Validate extension
+			if (!in_array($ext, self::ALLOWED_EXTENSIONS, true)) {
+				Log::add("Attachment rejected: disallowed extension .{$ext}", Log::WARNING, 'mokosuite');
+				continue;
+			}
+
+			// Validate size
+			if ($files['size'][$i] > self::MAX_FILE_SIZE) {
+				Log::add("Attachment rejected: file too large ({$files['size'][$i]} bytes)", Log::WARNING, 'mokosuite');
+				continue;
+			}
+
+			// Generate unique filename to prevent overwrites
+			$storedName = uniqid('att_', true) . '.' . $ext;
+			$destPath = $ticketDir . '/' . $storedName;
+
+			if (!File::upload($files['tmp_name'][$i], $destPath)) {
+				Log::add("Attachment upload failed: {$originalName}", Log::ERROR, 'mokosuite');
+				continue;
+			}
+
+			$record = (object) [
+				'ticket_id'   => $ticketId,
+				'reply_id'    => $replyId,
+				'filename'    => $originalName,
+				'filepath'    => $ticketId . '/' . $storedName,
+				'filesize'    => $files['size'][$i],
+				'mimetype'    => $files['type'][$i],
+				'uploaded_by' => $userId,
+				'created'     => Factory::getDate()->toSql(),
+			];
+
+			$db->insertObject('#__mokosuite_ticket_attachments', $record, 'id');
+			$saved[] = $record;
+		}
+
+		return $saved;
+	}
+
+	/**
+	 * Get attachments for a ticket.
+	 */
+	public static function getForTicket(int $ticketId): array
+	{
+		$db = Factory::getDbo();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select('a.*, u.name AS uploader_name')
+				->from($db->quoteName('#__mokosuite_ticket_attachments', 'a'))
+				->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = a.uploaded_by')
+				->where($db->quoteName('a.ticket_id') . ' = ' . $ticketId)
+				->order('a.created ASC')
+		);
+		return $db->loadObjectList() ?: [];
+	}
+
+	/**
+	 * Get the absolute filesystem path for an attachment.
+	 */
+	public static function getAbsolutePath(object $attachment): string
+	{
+		return self::STORAGE_DIR . '/' . $attachment->filepath;
+	}
+
+	/**
+	 * Delete an attachment (file + DB record).
+	 */
+	public static function delete(int $attachmentId): bool
+	{
+		$db = Factory::getDbo();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select('*')
+				->from('#__mokosuite_ticket_attachments')
+				->where('id = ' . $attachmentId)
+		);
+		$att = $db->loadObject();
+
+		if (!$att) {
+			return false;
+		}
+
+		$path = self::STORAGE_DIR . '/' . $att->filepath;
+
+		if (file_exists($path)) {
+			File::delete($path);
+		}
+
+		$db->setQuery(
+			$db->getQuery(true)
+				->delete('#__mokosuite_ticket_attachments')
+				->where('id = ' . $attachmentId)
+		)->execute();
+
+		return true;
+	}
+
+	/**
+	 * Format file size for display.
+	 */
+	public static function formatSize(int $bytes): string
+	{
+		if ($bytes < 1024) return $bytes . ' B';
+		if ($bytes < 1048576) return round($bytes / 1024, 1) . ' KB';
+		return round($bytes / 1048576, 1) . ' MB';
+	}
+}
@@ -0,0 +1,241 @@
+<?php
+/**
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+namespace Moko\Component\MokoSuite\Administrator\Service;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Automation rule engine — evaluates trigger/condition/action rules.
+ *
+ * Called from event hooks (system plugin, task plugin) whenever
+ * a triggering event occurs. Loads matching rules, checks conditions,
+ * and executes actions.
+ *
+ * @since  02.35.00
+ */
+class AutomationEngine
+{
+	/**
+	 * Fire all matching rules for a given trigger event.
+	 *
+	 * @param  string  $triggerEvent  Event name (ticket_created, user_login, etc.)
+	 * @param  array   $context       Context data (ticket object, user data, etc.)
+	 */
+	public static function fire(string $triggerEvent, array $context = []): void
+	{
+		try
+		{
+			$rules = self::getActiveRules($triggerEvent);
+
+			foreach ($rules as $rule)
+			{
+				$conditions = json_decode($rule->conditions, true) ?: [];
+				$actions    = json_decode($rule->actions, true) ?: [];
+
+				if (self::evaluateConditions($conditions, $context))
+				{
+					self::executeActions($actions, $rule, $context);
+				}
+			}
+		}
+		catch (\Throwable $e)
+		{
+			Log::add('Automation engine error: ' . $e->getMessage(), Log::ERROR, 'mokosuite');
+		}
+	}
+
+	/**
+	 * Get active automation rules for a trigger event.
+	 */
+	private static function getActiveRules(string $event): array
+	{
+		$db = Factory::getDbo();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select('*')
+				->from('#__mokosuite_ticket_automation')
+				->where($db->quoteName('trigger_event') . ' = ' . $db->quote($event))
+				->where($db->quoteName('enabled') . ' = 1')
+				->order('ordering ASC')
+		);
+		return $db->loadObjectList() ?: [];
+	}
+
+	/**
+	 * Evaluate all conditions (AND logic).
+	 */
+	private static function evaluateConditions(array $conditions, array $context): bool
+	{
+		foreach ($conditions as $c)
+		{
+			$field = $c['field'] ?? '';
+			$op    = $c['op'] ?? 'eq';
+			$expected = $c['value'] ?? '';
+			$actual = $context[$field] ?? '';
+
+			switch ($op)
+			{
+				case 'eq':     if ((string) $actual !== (string) $expected) return false; break;
+				case 'neq':    if ((string) $actual === (string) $expected) return false; break;
+				case 'gt':     if ((float) $actual <= (float) $expected) return false; break;
+				case 'lt':     if ((float) $actual >= (float) $expected) return false; break;
+				case 'in':
+					$values = array_map('trim', explode(',', $expected));
+					if (!in_array((string) $actual, $values, true)) return false;
+					break;
+				case 'not_in':
+					$values = array_map('trim', explode(',', $expected));
+					if (in_array((string) $actual, $values, true)) return false;
+					break;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Execute actions for a matched rule.
+	 */
+	private static function executeActions(array $actions, object $rule, array $context): void
+	{
+		$db = Factory::getDbo();
+		$ticketId = (int) ($context['ticket_id'] ?? $context['id'] ?? 0);
+
+		foreach ($actions as $action)
+		{
+			$type  = $action['type'] ?? '';
+			$value = $action['value'] ?? '';
+
+			try
+			{
+				switch ($type)
+				{
+					case 'set_status':
+						if ($ticketId) {
+							$db->setQuery("UPDATE {$db->quoteName('#__mokosuite_tickets')} SET status = {$db->quote($value)}, modified = {$db->quote(Factory::getDate()->toSql())} WHERE id = {$ticketId}")->execute();
+						}
+						break;
+
+					case 'set_priority':
+						if ($ticketId) {
+							$db->setQuery("UPDATE {$db->quoteName('#__mokosuite_tickets')} SET priority = {$db->quote($value)}, modified = {$db->quote(Factory::getDate()->toSql())} WHERE id = {$ticketId}")->execute();
+						}
+						break;
+
+					case 'assign':
+						if ($ticketId) {
+							$db->setQuery("UPDATE {$db->quoteName('#__mokosuite_tickets')} SET assigned_to = {$db->quote($value)}, modified = {$db->quote(Factory::getDate()->toSql())} WHERE id = {$ticketId}")->execute();
+						}
+						break;
+
+					case 'add_note':
+						if ($ticketId) {
+							$note = (object) [
+								'ticket_id' => $ticketId,
+								'user_id'   => 0,
+								'body'      => $value ?: '[Automation: ' . ($rule->title ?? '') . ']',
+								'is_internal' => 1,
+								'created'   => Factory::getDate()->toSql(),
+							];
+							$db->insertObject('#__mokosuite_ticket_replies', $note);
+						}
+						break;
+
+					case 'send_email':
+						NotificationService::securityAlert(
+							'automation',
+							'Automation: ' . ($rule->title ?? ''),
+							$value ?: 'Rule triggered for ticket #' . $ticketId
+						);
+						break;
+
+					case 'send_ntfy':
+						NotificationService::pushNtfySecurity(
+							'automation',
+							'Automation: ' . ($rule->title ?? ''),
+							$value ?: 'Rule triggered for ticket #' . $ticketId
+						);
+						break;
+
+					case 'close':
+						if ($ticketId) {
+							$db->setQuery("UPDATE {$db->quoteName('#__mokosuite_tickets')} SET status = 'closed', closed = {$db->quote(Factory::getDate()->toSql())}, modified = {$db->quote(Factory::getDate()->toSql())} WHERE id = {$ticketId}")->execute();
+						}
+						break;
+
+					case 'create_ticket':
+						self::createTicketFromAutomation($rule, $context, $value);
+						break;
+				}
+			}
+			catch (\Throwable $e)
+			{
+				Log::add("Automation action {$type} failed: " . $e->getMessage(), Log::WARNING, 'mokosuite');
+			}
+		}
+	}
+
+	/**
+	 * Create a ticket from automation (with behavior: append/always_new/skip_if_open).
+	 */
+	private static function createTicketFromAutomation(object $rule, array $context, string $subject): void
+	{
+		$db       = Factory::getDbo();
+		$behavior = $rule->behavior ?? 'append';
+		$userId   = (int) ($context['user_id'] ?? 0);
+		$catId    = (int) ($context['category_id'] ?? 0);
+
+		if ($behavior !== 'always_new' && $userId > 0)
+		{
+			// Check for existing open ticket
+			$query = $db->getQuery(true)
+				->select('id')
+				->from('#__mokosuite_tickets')
+				->where('created_by = ' . $userId)
+				->where("status NOT IN ('closed', 'resolved')");
+
+			if ($catId > 0) {
+				$query->where('category_id = ' . $catId);
+			}
+
+			$db->setQuery($query, 0, 1);
+			$existingId = (int) $db->loadResult();
+
+			if ($existingId > 0)
+			{
+				if ($behavior === 'skip_if_open') return;
+
+				// append — add reply to existing ticket
+				$reply = (object) [
+					'ticket_id'   => $existingId,
+					'user_id'     => 0,
+					'body'        => $subject ?: '[Automation: ' . ($rule->title ?? '') . ']',
+					'is_internal' => 1,
+					'created'     => Factory::getDate()->toSql(),
+				];
+				$db->insertObject('#__mokosuite_ticket_replies', $reply);
+				return;
+			}
+		}
+
+		// Create new ticket
+		$ticket = (object) [
+			'subject'     => $subject ?: 'Automation: ' . ($rule->title ?? ''),
+			'body'        => $context['body'] ?? '',
+			'status'      => 'open',
+			'priority'    => $context['priority'] ?? 'normal',
+			'category_id' => $catId ?: null,
+			'created_by'  => $userId,
+			'created'     => Factory::getDate()->toSql(),
+		];
+		$db->insertObject('#__mokosuite_tickets', $ticket, 'id');
+	}
+}
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\Service;
+namespace Moko\Component\MokoSuite\Administrator\Service;

 defined('_JEXEC') or die;

@@ -67,13 +67,16 @@ class NotificationService
 				}
 				catch (\Throwable $e)
 				{
-					Log::add('Notification send failed to ' . $email . ': ' . $e->getMessage(), Log::WARNING, 'mokosuiteclient');
+					Log::add('Notification send failed to ' . $email . ': ' . $e->getMessage(), Log::WARNING, 'mokosuite');
 				}
 			}
+
+			// Push notification via ntfy
+			self::pushNtfy($event, $ticket, $subject);
 		}
 		catch (\Throwable $e)
 		{
-			Log::add('Notification error: ' . $e->getMessage(), Log::WARNING, 'mokosuiteclient');
+			Log::add('Notification error: ' . $e->getMessage(), Log::WARNING, 'mokosuite');
 		}
 	}

@@ -207,7 +210,7 @@ class NotificationService
 	{
 		$siteName  = Factory::getConfig()->get('sitename', 'Support');
 		$siteUrl   = rtrim(Uri::root(), '/');
-		$ticketUrl = $siteUrl . '/index.php?option=com_mokosuiteclient&view=ticket&id=' . $ticket->id;
+		$ticketUrl = $siteUrl . '/index.php?option=com_mokosuite&view=ticket&id=' . $ticket->id;

 		$lines = [];
 		$lines[] = $siteName . ' Support';
@@ -273,7 +276,7 @@ class NotificationService
 		$lines[] = 'View ticket: ' . $ticketUrl;
 		$lines[] = '';
 		$lines[] = '-- ';
-		$lines[] = $siteName . ' | Powered by MokoSuiteClient';
+		$lines[] = $siteName . ' | Powered by MokoSuite';

 		return implode("\n", $lines);
 	}
@@ -318,7 +321,7 @@ class NotificationService
 				$db->getQuery(true)
 					->select($db->quoteName('params'))
 					->from($db->quoteName('#__extensions'))
-					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuiteclient'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('com_mokosuite'))
 					->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 			);

@@ -332,6 +335,159 @@ class NotificationService
 		}
 	}

+	// ==================================================================
+	// Ntfy Push Notifications (#205)
+	// ==================================================================
+
+	/**
+	 * Send a push notification via ntfy for ticket events.
+	 */
+	private static function pushNtfy(string $event, object $ticket, string $title): void
+	{
+		$config = self::getNotificationConfig();
+		$ntfyEnabled = $config['ntfy_enabled'] ?? '0';
+
+		if (!$ntfyEnabled)
+		{
+			return;
+		}
+
+		$ntfyServer = rtrim($config['ntfy_server'] ?? 'https://ntfy.mokoconsulting.tech', '/');
+		$ntfyTopic  = $config['ntfy_topic'] ?? 'mokosuite-tickets';
+		$ntfyToken  = $config['ntfy_token'] ?? '';
+
+		$tagMap = [
+			'ticket_created'  => 'ticket,new',
+			'ticket_replied'  => 'speech_balloon',
+			'status_changed'  => 'arrows_counterclockwise',
+			'ticket_assigned' => 'bust_in_silhouette',
+		];
+
+		$priorityMap = [
+			'ticket_created'  => '4',
+			'ticket_replied'  => '3',
+			'status_changed'  => '3',
+			'ticket_assigned' => '3',
+		];
+
+		$siteUrl   = rtrim(Uri::root(), '/');
+		$ticketUrl = $siteUrl . '/administrator/index.php?option=com_mokosuite&view=ticket&id=' . ($ticket->id ?? 0);
+
+		$message = self::buildNtfyMessage($event, $ticket);
+
+		$headers = [
+			'Title: ' . $title,
+			'Priority: ' . ($priorityMap[$event] ?? '3'),
+			'Tags: ' . ($tagMap[$event] ?? 'ticket'),
+			'Click: ' . $ticketUrl,
+		];
+
+		if ($ntfyToken !== '')
+		{
+			$headers[] = 'Authorization: Bearer ' . $ntfyToken;
+		}
+
+		$url = $ntfyServer . '/' . $ntfyTopic;
+
+		try
+		{
+			$ch = curl_init($url);
+			curl_setopt($ch, CURLOPT_POST, true);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $message);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+			curl_exec($ch);
+
+			$httpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			curl_close($ch);
+
+			if ($httpCode < 200 || $httpCode >= 300)
+			{
+				Log::add("Ntfy push failed (HTTP {$httpCode}) for event {$event}", Log::WARNING, 'mokosuite');
+			}
+		}
+		catch (\Throwable $e)
+		{
+			Log::add('Ntfy push error: ' . $e->getMessage(), Log::WARNING, 'mokosuite');
+		}
+	}
+
+	/**
+	 * Build a short ntfy message body for ticket events.
+	 */
+	private static function buildNtfyMessage(string $event, object $ticket): string
+	{
+		$subject = $ticket->subject ?? 'Ticket #' . ($ticket->id ?? '?');
+
+		switch ($event)
+		{
+			case 'ticket_created':
+				$priority = ucfirst($ticket->priority ?? 'normal');
+				return "New ticket: {$subject}\nPriority: {$priority}";
+
+			case 'ticket_replied':
+				return "Reply on: {$subject}";
+
+			case 'status_changed':
+				$status = ucwords(str_replace('_', ' ', $ticket->status ?? ''));
+				return "Status → {$status}: {$subject}";
+
+			case 'ticket_assigned':
+				return "Assigned to you: {$subject}";
+
+			default:
+				return $subject;
+		}
+	}
+
+	/**
+	 * Send a push notification via ntfy for security events.
+	 */
+	public static function pushNtfySecurity(string $event, string $title, string $body): void
+	{
+		$config = self::getNotificationConfig();
+		$ntfyEnabled = $config['ntfy_enabled'] ?? '0';
+
+		if (!$ntfyEnabled)
+		{
+			return;
+		}
+
+		$ntfyServer = rtrim($config['ntfy_server'] ?? 'https://ntfy.mokoconsulting.tech', '/');
+		$ntfyTopic  = $config['ntfy_security_topic'] ?? $config['ntfy_topic'] ?? 'mokosuite-security';
+		$ntfyToken  = $config['ntfy_token'] ?? '';
+
+		$headers = [
+			'Title: [Security] ' . $title,
+			'Priority: 5',
+			'Tags: warning,shield',
+		];
+
+		if ($ntfyToken !== '')
+		{
+			$headers[] = 'Authorization: Bearer ' . $ntfyToken;
+		}
+
+		$url = $ntfyServer . '/' . $ntfyTopic;
+
+		try
+		{
+			$ch = curl_init($url);
+			curl_setopt($ch, CURLOPT_POST, true);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+			curl_exec($ch);
+			curl_close($ch);
+		}
+		catch (\Throwable $e)
+		{
+			Log::add('Ntfy security push error: ' . $e->getMessage(), Log::WARNING, 'mokosuite');
+		}
+	}
+
 	// ==================================================================
 	// Security Event Notifications (#131)
 	// ==================================================================
@@ -386,7 +542,7 @@ class NotificationService
 				$body,
 				'',
 				'-- ',
-				$siteName . ' | MokoSuiteClient Security',
+				$siteName . ' | MokoSuite Security',
 			];

 			$mailer = Factory::getMailer();
@@ -404,13 +560,16 @@ class NotificationService
 				}
 				catch (\Throwable $e)
 				{
-					Log::add('Security alert send failed: ' . $e->getMessage(), Log::WARNING, 'mokosuiteclient');
+					Log::add('Security alert send failed: ' . $e->getMessage(), Log::WARNING, 'mokosuite');
 				}
 			}
+
+			// Also push via ntfy
+			self::pushNtfySecurity($event, $subject, $body);
 		}
 		catch (\Throwable $e)
 		{
-			Log::add('Security alert error: ' . $e->getMessage(), Log::WARNING, 'mokosuiteclient');
+			Log::add('Security alert error: ' . $e->getMessage(), Log::WARNING, 'mokosuite');
 		}
 	}
 }
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Automation;
+namespace Moko\Component\MokoSuite\Administrator\View\Automation;

 defined('_JEXEC') or die;

@@ -13,14 +13,14 @@ class HtmlView extends BaseHtmlView

 	public function display($tpl = null)
 	{
-		$model       = new \Moko\Component\MokoSuiteClient\Administrator\Model\TicketsModel();
+		$model       = new \Moko\Component\MokoSuite\Administrator\Model\TicketsModel();
 		$this->rules = $model->getAutomationRules();

 		ToolbarHelper::title('Automation Rules', 'cogs');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient&view=tickets');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite&view=tickets');

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Canned;
+namespace Moko\Component\MokoSuite\Administrator\View\Canned;

 defined('_JEXEC') or die;

@@ -16,17 +16,17 @@ class HtmlView extends BaseHtmlView
 	{
 		$db = Factory::getContainer()->get('Joomla\Database\DatabaseInterface');

-		$db->setQuery('SELECT * FROM #__mokosuiteclient_ticket_canned ORDER BY ordering ASC');
+		$db->setQuery('SELECT * FROM #__mokosuite_ticket_canned ORDER BY ordering ASC');
 		$this->responses = $db->loadObjectList() ?: [];

-		$db->setQuery('SELECT id, title FROM #__mokosuiteclient_ticket_categories WHERE published = 1 ORDER BY ordering');
+		$db->setQuery('SELECT id, title FROM #__mokosuite_ticket_categories WHERE published = 1 ORDER BY ordering');
 		$this->categories = $db->loadObjectList() ?: [];

 		ToolbarHelper::title('Canned Responses', 'comment');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient&view=tickets');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite&view=tickets');

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Categories;
+namespace Moko\Component\MokoSuite\Administrator\View\Categories;

 defined('_JEXEC') or die;

@@ -16,7 +16,7 @@ class HtmlView extends BaseHtmlView
 	{
 		$db = Factory::getContainer()->get('Joomla\Database\DatabaseInterface');

-		$db->setQuery('SELECT * FROM #__mokosuiteclient_ticket_categories ORDER BY ordering ASC');
+		$db->setQuery('SELECT * FROM #__mokosuite_ticket_categories ORDER BY ordering ASC');
 		$this->categories = $db->loadObjectList() ?: [];

 		// Get admin users for auto-assign dropdown
@@ -31,10 +31,10 @@ class HtmlView extends BaseHtmlView
 		$this->users = $db->loadObjectList() ?: [];

 		ToolbarHelper::title('Ticket Categories', 'folder');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient&view=tickets');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite&view=tickets');

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Cleanup;
+namespace Moko\Component\MokoSuite\Administrator\View\Cleanup;

 defined('_JEXEC') or die;

@@ -13,14 +13,14 @@ class HtmlView extends BaseHtmlView

 	public function display($tpl = null)
 	{
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\MaintenanceModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\MaintenanceModel();
 		$this->dirs = $model->getCleanupInfo();

 		ToolbarHelper::title('Cache &amp; Temp Cleanup', 'trash');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\View\Dashboard;
+namespace Moko\Component\MokoSuite\Administrator\View\Dashboard;

 defined('_JEXEC') or die;

@@ -44,7 +44,7 @@ class HtmlView extends BaseHtmlView
 		// Check for importable Akeeba data
 		try
 		{
-			$importModel = new \Moko\Component\MokoSuiteClient\Administrator\Model\ImportModel();
+			$importModel = new \Moko\Component\MokoSuite\Administrator\Model\ImportModel();
 			$this->adminToolsAvailable = $importModel->checkAdminToolsAvailable();
 			$this->atsAvailable        = $importModel->checkAtsAvailable();
 		}
@@ -57,21 +57,21 @@ class HtmlView extends BaseHtmlView
 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
-		$wa->registerAndUseScript('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.js', [], ['defer' => true]);
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');
+		$wa->registerAndUseScript('com_mokosuite.dashboard', 'com_mokosuite/dashboard.js', [], ['defer' => true]);

 		parent::display($tpl);
 	}

 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOSUITECLIENT_DASHBOARD_TITLE'), 'cogs');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITE_DASHBOARD_TITLE'), 'cogs');

 		$user = Factory::getApplication()->getIdentity();

-		if ($user->authorise('core.admin', 'com_mokosuiteclient'))
+		if ($user->authorise('core.admin', 'com_mokosuite'))
 		{
-			ToolbarHelper::preferences('com_mokosuiteclient');
+			ToolbarHelper::preferences('com_mokosuite');
 		}
 	}
 }
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Database;
+namespace Moko\Component\MokoSuite\Administrator\View\Database;

 defined('_JEXEC') or die;

@@ -13,14 +13,14 @@ class HtmlView extends BaseHtmlView

 	public function display($tpl = null)
 	{
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\MaintenanceModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\MaintenanceModel();
 		$this->tableData = $model->getTableStatus();

 		ToolbarHelper::title('Database Tools', 'database');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\ErpReports;
+namespace Moko\Component\MokoSuite\Administrator\View\ErpReports;

 defined('_JEXEC') or die;

@@ -32,9 +32,9 @@ class HtmlView extends BaseHtmlView
 		$this->agingData    = $model->getAgingReceivables();
 		ToolbarHelper::title('ERP Reports', 'icon-chart-bar');
 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.erp', 'com_mokosuiteclient/erp.css');
-		$wa->registerAndUseScript('com_mokosuiteclient.erp-dashboard', 'com_mokosuiteclient/erp-dashboard.js', [], ['defer' => true]);
-		Factory::getApplication()->getDocument()->addScriptOptions('mokosuiteclient.erp', ['revenueChart' => $this->salesData]);
+		$wa->registerAndUseStyle('com_mokosuite.erp', 'com_mokosuite/erp.css');
+		$wa->registerAndUseScript('com_mokosuite.erp-dashboard', 'com_mokosuite/erp-dashboard.js', [], ['defer' => true]);
+		Factory::getApplication()->getDocument()->addScriptOptions('mokosuite.erp', ['revenueChart' => $this->salesData]);
 		parent::display($tpl);
 	}
 }
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\View\Extensions;
+namespace Moko\Component\MokoSuite\Administrator\View\Extensions;

 defined('_JEXEC') or die;

@@ -28,14 +28,14 @@ class HtmlView extends BaseHtmlView
 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}

 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOSUITECLIENT_EXTENSIONS_TITLE'), 'puzzle-piece');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITE_EXTENSIONS_TITLE'), 'puzzle-piece');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');
 	}
 }
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\View\Htaccess;
+namespace Moko\Component\MokoSuite\Administrator\View\Htaccess;

 defined('_JEXEC') or die;

@@ -34,14 +34,14 @@ class HtmlView extends BaseHtmlView
 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}

 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOSUITECLIENT_HTACCESS_TITLE'), 'file-code');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITE_HTACCESS_TITLE'), 'file-code');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');
 	}
 }
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Privacy;
+namespace Moko\Component\MokoSuite\Administrator\View\Privacy;

 defined('_JEXEC') or die;

@@ -16,7 +16,7 @@ class HtmlView extends BaseHtmlView

 	public function display($tpl = null)
 	{
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\PrivacyModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\PrivacyModel();

 		$filterStatus     = Factory::getApplication()->getInput()->getString('filter_status', '');
 		$this->requests   = $model->getDataRequests($filterStatus);
@@ -26,7 +26,7 @@ class HtmlView extends BaseHtmlView
 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -34,6 +34,6 @@ class HtmlView extends BaseHtmlView
 	protected function addToolbar(): void
 	{
 		ToolbarHelper::title('Privacy Guard', 'lock');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');
 	}
 }
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\View\Ticket;
+namespace Moko\Component\MokoSuite\Administrator\View\Ticket;

 defined('_JEXEC') or die;

@@ -23,6 +23,7 @@ class HtmlView extends BaseHtmlView
 	protected $priorities = [];
 	protected $customFields = [];
 	protected $fieldValues = [];
+	protected $attachments = [];

 	public function display($tpl = null)
 	{
@@ -43,10 +44,13 @@ class HtmlView extends BaseHtmlView
 			$this->fieldValues  = $model->getFieldValues($id);
 		}

+		// Load attachments
+		$this->attachments = \Moko\Component\MokoSuite\Administrator\Service\AttachmentService::getForTicket($id);
+
 		if (!$this->ticket)
 		{
 			Factory::getApplication()->enqueueMessage('Ticket not found.', 'error');
-			Factory::getApplication()->redirect('index.php?option=com_mokosuiteclient&view=tickets');
+			Factory::getApplication()->redirect('index.php?option=com_mokosuite&view=tickets');

 			return;
 		}
@@ -54,7 +58,7 @@ class HtmlView extends BaseHtmlView
 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -63,6 +67,6 @@ class HtmlView extends BaseHtmlView
 	{
 		$title = $this->ticket ? 'Ticket #' . $this->ticket->id . ' — ' . $this->ticket->subject : 'Ticket';
 		ToolbarHelper::title($title, 'headphones');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient&view=tickets');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite&view=tickets');
 	}
 }
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Administrator\View\Tickets;
+namespace Moko\Component\MokoSuite\Administrator\View\Tickets;

 defined('_JEXEC') or die;

@@ -25,6 +25,8 @@ class HtmlView extends BaseHtmlView
 	protected $contacts = [];
 	protected $statuses = [];
 	protected $priorities = [];
+	protected $backendUsers = [];
+	protected $userGroups = [];

 	public function display($tpl = null)
 	{
@@ -46,18 +48,20 @@ class HtmlView extends BaseHtmlView
 		$this->overdue      = $model->getOverdueTickets();
 		$this->atsAvailable = $model->checkAtsAvailable();
 		$this->contacts     = $model->getContacts();
+		$this->backendUsers = $model->getBackendUsers();
+		$this->userGroups   = $model->getUserGroups();

 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}

 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOSUITECLIENT_TICKETS_TITLE'), 'headphones');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITE_TICKETS_TITLE'), 'headphones');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');
 	}
 }
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later
+ *
+ * @package    MokoSuite
+ * @subpackage Component
+ */
+
+namespace Moko\Component\MokoSuite\Administrator\View\Ticketsettings;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $statuses = [];
+	protected $priorities = [];
+
+	public function display($tpl = null)
+	{
+		$model = $this->getModel('Tickets');
+
+		$this->statuses   = $model->getStatuses();
+		$this->priorities = $model->getPriorities();
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	protected function addToolbar(): void
+	{
+		ToolbarHelper::title(Text::_('COM_MOKOSUITE_TICKET_SETTINGS'), 'cog');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite&view=tickets');
+	}
+}
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
@@ -1,5 +1,5 @@
 <?php
-namespace Moko\Component\MokoSuiteClient\Administrator\View\Waflog;
+namespace Moko\Component\MokoSuite\Administrator\View\Waflog;

 defined('_JEXEC') or die;

@@ -18,7 +18,7 @@ class HtmlView extends BaseHtmlView

 	public function display($tpl = null)
 	{
-		$model = new \Moko\Component\MokoSuiteClient\Administrator\Model\WaflogModel();
+		$model = new \Moko\Component\MokoSuite\Administrator\Model\WaflogModel();
 		$input = Factory::getApplication()->getInput();

 		$this->filters = [
@@ -42,7 +42,7 @@ class HtmlView extends BaseHtmlView
 		$this->addToolbar();

 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokosuiteclient.dashboard', 'com_mokosuiteclient/dashboard.css');
+		$wa->registerAndUseStyle('com_mokosuite.dashboard', 'com_mokosuite/dashboard.css');

 		parent::display($tpl);
 	}
@@ -50,6 +50,6 @@ class HtmlView extends BaseHtmlView
 	protected function addToolbar(): void
 	{
 		ToolbarHelper::title('WAF Log Viewer', 'shield-alt');
-		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient');
+		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuite');
 	}
 }
@@ -0,0 +1,297 @@
+<?php
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+$rules   = $this->rules;
+$token   = Session::getFormToken();
+$saveUrl = Route::_('index.php?option=com_mokosuite&task=display.saveAutomation&format=json');
+$deleteUrl = Route::_('index.php?option=com_mokosuite&task=display.deleteAutomation&format=json');
+$toggleUrl = Route::_('index.php?option=com_mokosuite&task=display.toggleAutomation&format=json');
+$reorderUrl = Route::_('index.php?option=com_mokosuite&task=display.reorderAutomation&format=json');
+
+$triggerLabels = [
+	'ticket_created' => 'On Ticket Created',
+	'ticket_replied' => 'On Reply',
+	'status_changed' => 'On Status Change',
+	'ticket_assigned' => 'On Assignment',
+	'user_login' => 'On User Login',
+	'user_register' => 'On User Register',
+	'user_login_failed' => 'On Failed Login',
+	'content_save' => 'On Article Save',
+	'extension_install' => 'On Extension Install',
+	'scheduled' => 'Scheduled (Cron)',
+];
+$conditionFields = ['status', 'priority', 'category_id', 'assigned_to', 'sla_responded', 'age_hours'];
+$conditionOps = ['eq' => '=', 'neq' => '≠', 'gt' => '>', 'lt' => '<', 'in' => 'in', 'not_in' => 'not in'];
+$actionTypes = ['set_status', 'set_priority', 'assign', 'add_note', 'send_email', 'send_ntfy', 'close'];
+?>
+
+<div id="mokosuite-automation">
+	<div class="d-flex justify-content-between align-items-center mb-3">
+		<h4><?php echo count($rules); ?> Automation Rules</h4>
+		<button type="button" class="btn btn-primary btn-sm" onclick="openRuleModal(0)">
+			<span class="icon-plus"></span> Add Rule
+		</button>
+	</div>
+
+	<div id="rules-list">
+		<?php foreach ($rules as $r): ?>
+		<?php $conditions = json_decode($r->conditions, true) ?: []; $actions = json_decode($r->actions, true) ?: []; ?>
+		<div class="card mb-2 rule-card <?php echo !$r->enabled ? 'opacity-50' : ''; ?>" data-id="<?php echo $r->id; ?>" draggable="true">
+			<div class="card-body py-2">
+				<div class="d-flex justify-content-between align-items-start">
+					<div class="flex-grow-1" style="cursor:pointer;" onclick="openRuleModal(<?php echo $r->id; ?>)">
+						<div class="d-flex align-items-center gap-2">
+							<span class="icon-menu text-muted" style="cursor:grab;"></span>
+							<div class="form-check form-switch" onclick="event.stopPropagation();">
+								<input type="checkbox" class="form-check-input rule-toggle" data-id="<?php echo $r->id; ?>" <?php echo $r->enabled ? 'checked' : ''; ?>>
+							</div>
+							<strong><?php echo htmlspecialchars($r->title); ?></strong>
+							<span class="badge bg-secondary"><?php echo $triggerLabels[$r->trigger_event] ?? $r->trigger_event; ?></span>
+						</div>
+						<div class="small text-muted mt-1 ms-4">
+							<?php if (!empty($conditions)): ?>
+							<span class="text-primary">IF</span>
+							<?php foreach ($conditions as $i => $c): ?>
+								<?php echo $i > 0 ? ' AND ' : ''; ?><code><?php echo htmlspecialchars($c['field'] ?? ''); ?></code> <?php echo $conditionOps[$c['op'] ?? ''] ?? $c['op'] ?? ''; ?> <em><?php echo htmlspecialchars($c['value'] ?? ''); ?></em>
+							<?php endforeach; ?>
+							<?php endif; ?>
+							<span class="text-success ms-1">THEN</span>
+							<?php foreach ($actions as $a): ?>
+								<code><?php echo htmlspecialchars($a['type'] ?? ''); ?></code><?php if (!empty($a['value'])): ?>=<em><?php echo htmlspecialchars(mb_substr($a['value'], 0, 30)); ?></em><?php endif; ?>
+							<?php endforeach; ?>
+						</div>
+					</div>
+					<button type="button" class="btn btn-sm btn-outline-danger btn-delete-rule" data-id="<?php echo $r->id; ?>" onclick="event.stopPropagation();">
+						<span class="icon-trash"></span>
+					</button>
+				</div>
+			</div>
+		</div>
+		<?php endforeach; ?>
+
+		<?php if (empty($rules)): ?>
+		<div class="alert alert-info">No automation rules. Click "Add Rule" to create one.</div>
+		<?php endif; ?>
+	</div>
+</div>
+
+<!-- Rule Modal -->
+<div class="modal fade" id="ruleModal" tabindex="-1">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header"><h5 id="ruleModalTitle">Add Automation Rule</h5><button type="button" class="btn-close" data-bs-dismiss="modal"></button></div>
+			<div class="modal-body">
+				<input type="hidden" id="rule-id" value="0">
+				<div class="row mb-3">
+					<div class="col-5">
+						<label class="form-label">Title</label>
+						<input type="text" id="rule-title" class="form-control" required>
+					</div>
+					<div class="col-4">
+						<label class="form-label">Trigger</label>
+						<select id="rule-trigger" class="form-select">
+							<?php foreach ($triggerLabels as $k => $v): ?><option value="<?php echo $k; ?>"><?php echo $v; ?></option><?php endforeach; ?>
+						</select>
+					</div>
+					<div class="col-3">
+						<label class="form-label">Behavior</label>
+						<select id="rule-behavior" class="form-select">
+							<option value="append">Append to existing</option>
+							<option value="always_new">Always new ticket</option>
+							<option value="skip_if_open">Skip if open</option>
+						</select>
+					</div>
+				</div>
+
+				<label class="form-label">Conditions <small class="text-muted">(all must match)</small></label>
+				<div id="conditions-builder" class="mb-3"></div>
+				<button type="button" class="btn btn-sm btn-outline-secondary mb-3" onclick="addConditionRow()"><span class="icon-plus"></span> Add Condition</button>
+
+				<label class="form-label">Actions</label>
+				<div id="actions-builder" class="mb-3"></div>
+				<button type="button" class="btn btn-sm btn-outline-secondary" onclick="addActionRow()"><span class="icon-plus"></span> Add Action</button>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+				<button type="button" class="btn btn-primary" id="btn-save-rule"><span class="icon-save"></span> Save Rule</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+	var tokenKey = '<?php echo $token; ?>';
+	var condFields = <?php echo json_encode($conditionFields); ?>;
+	var condOps = <?php echo json_encode($conditionOps); ?>;
+	var actTypes = <?php echo json_encode($actionTypes); ?>;
+
+	// Rule data store for editing
+	var ruleData = {};
+	<?php foreach ($rules as $r): ?>
+	ruleData[<?php echo $r->id; ?>] = {
+		title: <?php echo json_encode($r->title); ?>,
+		trigger_event: <?php echo json_encode($r->trigger_event); ?>,
+		behavior: <?php echo json_encode($r->behavior ?? 'append'); ?>,
+		conditions: <?php echo $r->conditions ?: '[]'; ?>,
+		actions: <?php echo $r->actions ?: '[]'; ?>
+	};
+	<?php endforeach; ?>
+
+	// ── Builder helpers ─────────────────────────────────────────
+	function makeSelect(cls, options, selected) {
+		var sel = document.createElement('select');
+		sel.className = 'form-select ' + cls;
+		options.forEach(function(o) {
+			var opt = document.createElement('option');
+			opt.value = o.value;
+			opt.textContent = o.label;
+			if (o.value === selected) opt.selected = true;
+			sel.appendChild(opt);
+		});
+		return sel;
+	}
+
+	function makeRemoveBtn() {
+		var btn = document.createElement('button');
+		btn.type = 'button';
+		btn.className = 'btn btn-outline-danger';
+		btn.innerHTML = '<span class="icon-minus"></span>';
+		btn.addEventListener('click', function() { this.parentNode.remove(); });
+		return btn;
+	}
+
+	window.addConditionRow = function(field, op, value) {
+		var div = document.createElement('div');
+		div.className = 'input-group input-group-sm mb-1';
+		div.appendChild(makeSelect('cond-field', condFields.map(function(f){return {value:f, label:f}}), field));
+		div.appendChild(makeSelect('cond-op', Object.keys(condOps).map(function(k){return {value:k, label:condOps[k]}}), op));
+		var inp = document.createElement('input');
+		inp.type = 'text'; inp.className = 'form-control cond-value'; inp.placeholder = 'value'; inp.value = value || '';
+		div.appendChild(inp);
+		div.appendChild(makeRemoveBtn());
+		document.getElementById('conditions-builder').appendChild(div);
+	};
+
+	window.addActionRow = function(type, value) {
+		var div = document.createElement('div');
+		div.className = 'input-group input-group-sm mb-1';
+		div.appendChild(makeSelect('act-type', actTypes.map(function(t){return {value:t, label:t}}), type));
+		var inp = document.createElement('input');
+		inp.type = 'text'; inp.className = 'form-control act-value'; inp.placeholder = 'value'; inp.value = value || '';
+		div.appendChild(inp);
+		div.appendChild(makeRemoveBtn());
+		document.getElementById('actions-builder').appendChild(div);
+	};
+
+	// ── Open modal ──────────────────────────────────────────────
+	window.openRuleModal = function(id) {
+		document.getElementById('rule-id').value = id;
+		document.getElementById('conditions-builder').innerHTML = '';
+		document.getElementById('actions-builder').innerHTML = '';
+
+		if (id > 0 && ruleData[id]) {
+			document.getElementById('ruleModalTitle').textContent = 'Edit Automation Rule';
+			document.getElementById('rule-title').value = ruleData[id].title;
+			document.getElementById('rule-trigger').value = ruleData[id].trigger_event;
+			document.getElementById('rule-behavior').value = ruleData[id].behavior || 'append';
+			ruleData[id].conditions.forEach(function(c) { addConditionRow(c.field, c.op, c.value); });
+			ruleData[id].actions.forEach(function(a) { addActionRow(a.type, a.value); });
+		} else {
+			document.getElementById('ruleModalTitle').textContent = 'Add Automation Rule';
+			document.getElementById('rule-title').value = '';
+			document.getElementById('rule-trigger').value = 'ticket_created';
+			document.getElementById('rule-behavior').value = 'append';
+			addConditionRow();
+			addActionRow();
+		}
+		new bootstrap.Modal(document.getElementById('ruleModal')).show();
+	};
+
+	// ── Save rule ───────────────────────────────────────────────
+	document.getElementById('btn-save-rule').addEventListener('click', function() {
+		var conditions = [];
+		document.querySelectorAll('#conditions-builder .input-group').forEach(function(row) {
+			var f = row.querySelector('.cond-field').value;
+			var o = row.querySelector('.cond-op').value;
+			var v = row.querySelector('.cond-value').value;
+			if (f && v) conditions.push({field:f, op:o, value:v});
+		});
+		var actions = [];
+		document.querySelectorAll('#actions-builder .input-group').forEach(function(row) {
+			var t = row.querySelector('.act-type').value;
+			var v = row.querySelector('.act-value').value;
+			if (t) actions.push({type:t, value:v});
+		});
+
+		var fd = new FormData();
+		fd.append('id', document.getElementById('rule-id').value);
+		fd.append('title', document.getElementById('rule-title').value);
+		fd.append('trigger_event', document.getElementById('rule-trigger').value);
+		fd.append('behavior', document.getElementById('rule-behavior').value);
+		fd.append('conditions', JSON.stringify(conditions));
+		fd.append('actions', JSON.stringify(actions));
+		fd.append(tokenKey, '1');
+		fetch('<?php echo $saveUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+			.then(function(r){return r.json()})
+			.then(function(d){ if (d.success) location.reload(); else Joomla.renderMessages({error:[d.message]}); });
+	});
+
+	// ── Toggle ──────────────────────────────────────────────────
+	document.querySelectorAll('.rule-toggle').forEach(function(cb) {
+		cb.addEventListener('change', function() {
+			var fd = new FormData();
+			fd.append('id', this.dataset.id);
+			fd.append('enabled', this.checked ? '1' : '0');
+			fd.append(tokenKey, '1');
+			fetch('<?php echo $toggleUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+				.then(function(r){return r.json()})
+				.then(function(d){ if (!d.success) Joomla.renderMessages({error:[d.message]}); else this.closest('.card').classList.toggle('opacity-50', !this.checked); }.bind(this));
+		});
+	});
+
+	// ── Delete ──────────────────────────────────────────────────
+	document.querySelectorAll('.btn-delete-rule').forEach(function(btn) {
+		btn.addEventListener('click', function() {
+			if (!confirm('Delete this rule?')) return;
+			var card = this.closest('.card');
+			var fd = new FormData();
+			fd.append('id', this.dataset.id);
+			fd.append(tokenKey, '1');
+			fetch('<?php echo $deleteUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+				.then(function(r){return r.json()})
+				.then(function(d){ if (d.success) card.remove(); else Joomla.renderMessages({error:[d.message]}); });
+		});
+	});
+
+	// ── Drag-and-drop reorder ───────────────────────────────────
+	var list = document.getElementById('rules-list');
+	var dragCard = null;
+	list.addEventListener('dragstart', function(e) {
+		dragCard = e.target.closest('.rule-card');
+		if (dragCard) dragCard.style.opacity = '0.5';
+	});
+	list.addEventListener('dragend', function() { if (dragCard) dragCard.style.opacity = ''; dragCard = null; });
+	list.addEventListener('dragover', function(e) {
+		e.preventDefault();
+		var target = e.target.closest('.rule-card');
+		if (target && target !== dragCard) {
+			var rect = target.getBoundingClientRect();
+			if ((e.clientY - rect.top) > rect.height / 2) target.parentNode.insertBefore(dragCard, target.nextSibling);
+			else target.parentNode.insertBefore(dragCard, target);
+		}
+	});
+	list.addEventListener('drop', function(e) {
+		e.preventDefault();
+		var ids = [];
+		document.querySelectorAll('.rule-card').forEach(function(c) { ids.push(c.dataset.id); });
+		var fd = new FormData();
+		fd.append('order', JSON.stringify(ids));
+		fd.append(tokenKey, '1');
+		fetch('<?php echo $reorderUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}});
+	});
+});
+</script>
@@ -0,0 +1,227 @@
+<?php
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+$responses  = $this->responses;
+$categories = $this->categories;
+$token      = Session::getFormToken();
+$saveUrl    = Route::_('index.php?option=com_mokosuite&task=display.saveCanned&format=json');
+$deleteUrl  = Route::_('index.php?option=com_mokosuite&task=display.deleteCanned&format=json');
+$reorderUrl = Route::_('index.php?option=com_mokosuite&task=display.reorderCanned&format=json');
+
+// Build category map for filter display
+$catMap = [0 => 'All Categories'];
+foreach ($categories as $cat)
+{
+	$catMap[$cat->id] = $cat->title;
+}
+?>
+
+<div id="mokosuite-canned">
+	<div class="d-flex justify-content-between align-items-center mb-3">
+		<div class="d-flex align-items-center gap-3">
+			<h4 class="mb-0"><?php echo count($responses); ?> Canned Responses</h4>
+			<select id="canned-filter-category" class="form-select form-select-sm" style="width:auto;">
+				<option value="">All Categories</option>
+				<?php foreach ($categories as $cat): ?>
+				<option value="<?php echo $cat->id; ?>"><?php echo htmlspecialchars($cat->title); ?></option>
+				<?php endforeach; ?>
+			</select>
+		</div>
+		<button type="button" class="btn btn-primary btn-sm" onclick="openCannedModal(0)">
+			<span class="icon-plus"></span> Add Response
+		</button>
+	</div>
+
+	<div id="canned-list">
+		<?php foreach ($responses as $r): ?>
+		<div class="card mb-2 canned-card" data-id="<?php echo $r->id; ?>" data-category="<?php echo (int) $r->category_id; ?>" style="cursor:grab;">
+			<div class="card-body py-2">
+				<div class="d-flex justify-content-between align-items-start">
+					<div class="flex-grow-1" style="cursor:pointer;" onclick="openCannedModal(<?php echo $r->id; ?>)">
+						<div class="d-flex align-items-center gap-2">
+							<span class="icon-menu text-muted" style="cursor:grab;" title="Drag to reorder"></span>
+							<strong><?php echo htmlspecialchars($r->title); ?></strong>
+							<?php if (!empty($r->category_id) && isset($catMap[$r->category_id])): ?>
+							<span class="badge bg-secondary"><?php echo htmlspecialchars($catMap[$r->category_id]); ?></span>
+							<?php endif; ?>
+						</div>
+						<p class="text-muted small mb-0 mt-1 ms-4"><?php echo htmlspecialchars(mb_substr(strip_tags($r->body), 0, 150)); ?></p>
+					</div>
+					<button type="button" class="btn btn-sm btn-outline-danger btn-delete-canned" data-id="<?php echo $r->id; ?>">
+						<span class="icon-trash"></span>
+					</button>
+				</div>
+			</div>
+		</div>
+		<?php endforeach; ?>
+
+		<?php if (empty($responses)): ?>
+		<div class="alert alert-info" id="canned-empty">No canned responses yet. Click "Add Response" to create one.</div>
+		<?php endif; ?>
+	</div>
+</div>
+
+<!-- Canned Response Modal (create + edit) -->
+<div class="modal fade" id="cannedModal" tabindex="-1">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h5 id="cannedModalTitle">Add Canned Response</h5>
+				<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+			</div>
+			<div class="modal-body">
+				<input type="hidden" id="canned-id" value="0">
+				<div class="mb-3">
+					<label class="form-label">Title</label>
+					<input type="text" id="canned-title" class="form-control" required>
+				</div>
+				<div class="mb-3">
+					<label class="form-label">Category (optional)</label>
+					<select id="canned-category" class="form-select">
+						<option value="">No category</option>
+						<?php foreach ($categories as $cat): ?>
+						<option value="<?php echo $cat->id; ?>"><?php echo htmlspecialchars($cat->title); ?></option>
+						<?php endforeach; ?>
+					</select>
+				</div>
+				<div class="mb-3">
+					<label class="form-label">Response Text</label>
+					<textarea id="canned-body" class="form-control" rows="8" required></textarea>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+				<button type="button" class="btn btn-primary" id="btn-save-canned"><span class="icon-save"></span> Save</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+	var tokenKey = '<?php echo $token; ?>';
+
+	// ── Response data store (for edit modal) ────────────────────
+	var responseData = {};
+	<?php foreach ($responses as $r): ?>
+	responseData[<?php echo $r->id; ?>] = {
+		title: <?php echo json_encode($r->title); ?>,
+		body: <?php echo json_encode($r->body); ?>,
+		category_id: <?php echo json_encode($r->category_id ?? ''); ?>
+	};
+	<?php endforeach; ?>
+
+	// ── Open modal for create (id=0) or edit ────────────────────
+	window.openCannedModal = function(id) {
+		document.getElementById('canned-id').value = id;
+		if (id > 0 && responseData[id]) {
+			document.getElementById('cannedModalTitle').textContent = 'Edit Canned Response';
+			document.getElementById('canned-title').value = responseData[id].title;
+			document.getElementById('canned-body').value = responseData[id].body;
+			document.getElementById('canned-category').value = responseData[id].category_id || '';
+		} else {
+			document.getElementById('cannedModalTitle').textContent = 'Add Canned Response';
+			document.getElementById('canned-title').value = '';
+			document.getElementById('canned-body').value = '';
+			document.getElementById('canned-category').value = '';
+		}
+		new bootstrap.Modal(document.getElementById('cannedModal')).show();
+	};
+
+	// ── Save (create or update) ─────────────────────────────────
+	document.getElementById('btn-save-canned').addEventListener('click', function() {
+		var title = document.getElementById('canned-title').value.trim();
+		if (!title) { Joomla.renderMessages({error:['Title is required']}); return; }
+
+		var fd = new FormData();
+		fd.append('id', document.getElementById('canned-id').value);
+		fd.append('title', title);
+		fd.append('body', document.getElementById('canned-body').value);
+		fd.append('category_id', document.getElementById('canned-category').value);
+		fd.append(tokenKey, '1');
+		fetch('<?php echo $saveUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+			.then(function(r){return r.json()})
+			.then(function(d){
+				if (d.success) location.reload();
+				else Joomla.renderMessages({error:[d.message]});
+			});
+	});
+
+	// ── Delete ──────────────────────────────────────────────────
+	document.querySelectorAll('.btn-delete-canned').forEach(function(btn) {
+		btn.addEventListener('click', function(e) {
+			e.stopPropagation();
+			if (!confirm('Delete this canned response?')) return;
+			var card = this.closest('.card');
+			var fd = new FormData();
+			fd.append('id', this.dataset.id);
+			fd.append(tokenKey, '1');
+			fetch('<?php echo $deleteUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+				.then(function(r){return r.json()})
+				.then(function(d){ if (d.success) card.remove(); else Joomla.renderMessages({error:[d.message]}); });
+		});
+	});
+
+	// ── Category filter ─────────────────────────────────────────
+	document.getElementById('canned-filter-category').addEventListener('change', function() {
+		var catId = this.value;
+		document.querySelectorAll('.canned-card').forEach(function(card) {
+			if (!catId || card.dataset.category === catId) {
+				card.style.display = '';
+			} else {
+				card.style.display = 'none';
+			}
+		});
+	});
+
+	// ── Drag-and-drop reorder ───────────────────────────────────
+	var list = document.getElementById('canned-list');
+	var dragCard = null;
+
+	list.addEventListener('dragstart', function(e) {
+		dragCard = e.target.closest('.canned-card');
+		if (dragCard) {
+			dragCard.style.opacity = '0.5';
+			e.dataTransfer.effectAllowed = 'move';
+		}
+	});
+
+	list.addEventListener('dragend', function() {
+		if (dragCard) dragCard.style.opacity = '';
+		dragCard = null;
+	});
+
+	list.addEventListener('dragover', function(e) {
+		e.preventDefault();
+		var target = e.target.closest('.canned-card');
+		if (target && target !== dragCard) {
+			var rect = target.getBoundingClientRect();
+			var after = (e.clientY - rect.top) > rect.height / 2;
+			if (after) {
+				target.parentNode.insertBefore(dragCard, target.nextSibling);
+			} else {
+				target.parentNode.insertBefore(dragCard, target);
+			}
+		}
+	});
+
+	list.addEventListener('drop', function(e) {
+		e.preventDefault();
+		// Persist new order
+		var ids = [];
+		document.querySelectorAll('.canned-card').forEach(function(c) { ids.push(c.dataset.id); });
+		var fd = new FormData();
+		fd.append('order', JSON.stringify(ids));
+		fd.append(tokenKey, '1');
+		fetch('<?php echo $reorderUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}});
+	});
+
+	// Make cards draggable
+	document.querySelectorAll('.canned-card').forEach(function(card) {
+		card.setAttribute('draggable', 'true');
+	});
+});
+</script>
@@ -7,11 +7,12 @@ use Joomla\CMS\Session\Session;
 $categories = $this->categories;
 $users      = $this->users;
 $token      = Session::getFormToken();
-$saveUrl    = Route::_('index.php?option=com_mokosuiteclient&task=display.saveCategory&format=json');
-$deleteUrl  = Route::_('index.php?option=com_mokosuiteclient&task=display.deleteCategory&format=json');
+$saveUrl    = Route::_('index.php?option=com_mokosuite&task=display.saveCategory&format=json');
+$deleteUrl  = Route::_('index.php?option=com_mokosuite&task=display.deleteCategory&format=json');
+$reorderUrl = Route::_('index.php?option=com_mokosuite&task=display.reorderCategory&format=json');
 ?>

-<div id="mokosuiteclient-categories">
+<div id="mokosuite-categories">
 	<div class="d-flex justify-content-between align-items-center mb-3">
 		<h4><?php echo count($categories); ?> Categories</h4>
 		<button type="button" class="btn btn-primary btn-sm" id="btn-add-cat">
@@ -22,10 +23,11 @@ $deleteUrl  = Route::_('index.php?option=com_mokosuiteclient&task=display.delete
 	<div class="card">
 		<div class="table-responsive">
 			<table class="table table-striped mb-0" id="cat-table">
-				<thead><tr><th>Title</th><th>SLA Response</th><th>SLA Resolution</th><th>Auto-Assign</th><th>Active</th><th></th></tr></thead>
+				<thead><tr><th style="width:30px"></th><th>Title</th><th>SLA Response</th><th>SLA Resolution</th><th>Auto-Assign</th><th>Active</th><th></th></tr></thead>
 				<tbody>
 				<?php foreach ($categories as $c): ?>
-				<tr data-id="<?php echo $c->id; ?>">
+				<tr data-id="<?php echo $c->id; ?>" draggable="true">
+					<td><span class="icon-menu text-muted" style="cursor:grab;"></span></td>
 					<td><input type="text" class="form-control form-control-sm cat-field" data-field="title" value="<?php echo htmlspecialchars($c->title); ?>"></td>
 					<td><input type="number" class="form-control form-control-sm cat-field" data-field="sla_response_minutes" value="<?php echo $c->sla_response_minutes; ?>" style="width:80px"> min</td>
 					<td><input type="number" class="form-control form-control-sm cat-field" data-field="sla_resolution_minutes" value="<?php echo $c->sla_resolution_minutes; ?>" style="width:80px"> min</td>
@@ -122,5 +124,39 @@ document.addEventListener('DOMContentLoaded', function() {
 		});
 		tr.querySelector('input').focus();
 	});
+
+	// Drag-and-drop reorder
+	var tbody = document.querySelector('#cat-table tbody');
+	var dragRow = null;
+
+	tbody.addEventListener('dragstart', function(e) {
+		dragRow = e.target.closest('tr');
+		if (dragRow) dragRow.style.opacity = '0.5';
+	});
+	tbody.addEventListener('dragend', function() {
+		if (dragRow) dragRow.style.opacity = '';
+		dragRow = null;
+	});
+	tbody.addEventListener('dragover', function(e) {
+		e.preventDefault();
+		var target = e.target.closest('tr');
+		if (target && target !== dragRow) {
+			var rect = target.getBoundingClientRect();
+			if ((e.clientY - rect.top) > rect.height / 2) {
+				target.parentNode.insertBefore(dragRow, target.nextSibling);
+			} else {
+				target.parentNode.insertBefore(dragRow, target);
+			}
+		}
+	});
+	tbody.addEventListener('drop', function(e) {
+		e.preventDefault();
+		var ids = [];
+		tbody.querySelectorAll('tr[data-id]').forEach(function(r) { if (r.dataset.id !== '0') ids.push(r.dataset.id); });
+		var fd = new FormData();
+		fd.append('order', JSON.stringify(ids));
+		fd.append(token, '1');
+		fetch('<?php echo $reorderUrl; ?>', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}});
+	});
 });
 </script>
@@ -6,7 +6,7 @@ use Joomla\CMS\Session\Session;

 $dirs    = $this->dirs;
 $token   = Session::getFormToken();
-$cleanUrl = Route::_('index.php?option=com_mokosuiteclient&task=display.cleanDirectory&format=json');
+$cleanUrl = Route::_('index.php?option=com_mokosuite&task=display.cleanDirectory&format=json');

 $dirKeys = ['site_cache', 'admin_cache', 'tmp', 'logs'];
 $totalMb = 0;
@@ -14,7 +14,7 @@ $totalFiles = 0;
 foreach ($dirs as $d) { $totalMb += $d->size_mb; $totalFiles += $d->files; }
 ?>

-<div id="mokosuiteclient-cleanup">
+<div id="mokosuite-cleanup">
 	<div class="row g-3 mb-4">
 		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo number_format($totalMb, 1); ?> MB</span><small class="text-muted">Total Size</small></div></div>
 		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo number_format($totalFiles); ?></span><small class="text-muted">Total Files</small></div></div>
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */
@@ -13,7 +13,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;

-/** @var \Moko\Component\MokoSuiteClient\Administrator\View\Dashboard\HtmlView $this */
+/** @var \Moko\Component\MokoSuite\Administrator\View\Dashboard\HtmlView $this */

 $siteInfo       = $this->siteInfo;
 $plugins        = $this->plugins;
@@ -36,37 +36,37 @@ foreach ($plugins as $plugin)
 $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 ?>

-<div id="mokosuiteclient-dashboard">
+<div id="mokosuite-dashboard">
 	<!-- Site Info Bar -->
-	<div class="mokosuiteclient-info-bar card mb-4">
+	<div class="mokosuite-info-bar card mb-4">
 		<div class="card-body d-flex flex-wrap align-items-center gap-4">
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label"><?php echo Text::_('COM_MOKOSUITECLIENT_SITE'); ?></span>
-				<span class="mokosuiteclient-info-value fw-bold"><?php echo $this->escape($siteInfo->sitename); ?></span>
+			<div class="mokosuite-info-item">
+				<span class="mokosuite-info-label"><?php echo Text::_('COM_MOKOSUITE_SITE'); ?></span>
+				<span class="mokosuite-info-value fw-bold"><?php echo $this->escape($siteInfo->sitename); ?></span>
 			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">MokoSuiteClient</span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-primary"><?php echo $this->escape($siteInfo->mokosuiteclient_version); ?></span></span>
+			<div class="mokosuite-info-item">
+				<span class="mokosuite-info-label">MokoSuite</span>
+				<span class="mokosuite-info-value"><span class="badge bg-primary"><?php echo $this->escape($siteInfo->mokosuite_version); ?></span></span>
 			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">Joomla</span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->joomla_version); ?></span></span>
+			<div class="mokosuite-info-item">
+				<span class="mokosuite-info-label">Joomla</span>
+				<span class="mokosuite-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->joomla_version); ?></span></span>
 			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label">PHP</span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->php_version); ?></span></span>
+			<div class="mokosuite-info-item">
+				<span class="mokosuite-info-label">PHP</span>
+				<span class="mokosuite-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->php_version); ?></span></span>
 			</div>
-			<div class="mokosuiteclient-info-item">
-				<span class="mokosuiteclient-info-label"><?php echo Text::_('COM_MOKOSUITECLIENT_DATABASE'); ?></span>
-				<span class="mokosuiteclient-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->db_type); ?></span></span>
+			<div class="mokosuite-info-item">
+				<span class="mokosuite-info-label"><?php echo Text::_('COM_MOKOSUITE_DATABASE'); ?></span>
+				<span class="mokosuite-info-value"><span class="badge bg-secondary"><?php echo $this->escape($siteInfo->db_type); ?></span></span>
 			</div>
 			<?php if ($siteInfo->debug): ?>
-			<span class="badge bg-warning text-dark"><?php echo Text::_('COM_MOKOSUITECLIENT_DEBUG_ON'); ?></span>
+			<span class="badge bg-warning text-dark"><?php echo Text::_('COM_MOKOSUITE_DEBUG_ON'); ?></span>
 			<?php endif; ?>
 			<?php if ($siteInfo->offline): ?>
-			<span class="badge bg-danger"><?php echo Text::_('COM_MOKOSUITECLIENT_OFFLINE'); ?></span>
+			<span class="badge bg-danger"><?php echo Text::_('COM_MOKOSUITE_OFFLINE'); ?></span>
 			<?php endif; ?>
-			<div class="mokosuiteclient-info-item ms-auto">
+			<div class="mokosuite-info-item ms-auto">
 				<span class="icon-globe" aria-hidden="true"></span>
 				<code><?php echo $this->escape($_SERVER['REMOTE_ADDR'] ?? ''); ?></code>
 			</div>
@@ -78,15 +78,15 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 	<div class="d-flex flex-wrap gap-2 mb-4">
 		<?php
 		$extIcons = [
-			'com_mokosuiteclient'           => 'icon-cogs',
-			'mod_mokosuiteclient_cpanel'    => 'icon-tachometer-alt',
-			'mod_mokosuiteclient_menu'      => 'icon-bars',
-			'mod_mokosuiteclient_cache'     => 'icon-bolt',
-			'mod_mokosuiteclient_categories' => 'icon-folder',
+			'com_mokosuite'           => 'icon-cogs',
+			'mod_mokosuite_cpanel'    => 'icon-tachometer-alt',
+			'mod_mokosuite_menu'      => 'icon-bars',
+			'mod_mokosuite_cache'     => 'icon-bolt',
+			'mod_mokosuite_categories' => 'icon-folder',
 		];
 		foreach ($mokoExts as $ext):
 			$icon = $extIcons[$ext->element] ?? 'icon-puzzle-piece';
-			$label = str_replace(['mod_mokosuiteclient_', 'com_mokosuiteclient'], ['', 'Component'], $ext->element);
+			$label = str_replace(['mod_mokosuite_', 'com_mokosuite'], ['', 'Component'], $ext->element);
 			$label = ucfirst($label ?: 'Component');
 		?>
 		<div class="d-flex align-items-center gap-2 px-3 py-2 rounded border bg-white" style="font-size:0.85rem;">
@@ -102,17 +102,17 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 	<!-- Akeeba Import Banner -->
 	<div class="alert alert-info d-flex flex-wrap align-items-center gap-3 mb-4">
 		<span class="icon-info-circle" style="font-size:1.25rem"></span>
-		<strong>Akeeba data detected — import into MokoSuiteClient:</strong>
+		<strong>Akeeba data detected — import into MokoSuite:</strong>
 		<?php if ($adminToolsAvail): ?>
 		<button type="button" class="btn btn-sm btn-info" id="btn-import-admintools"
-			data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.importAdminTools&format=json'); ?>"
+			data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.importAdminTools&format=json'); ?>"
 			data-token="<?php echo $token; ?>">
 			<span class="icon-shield-alt"></span> Import Admin Tools Settings
 		</button>
 		<?php endif; ?>
 		<?php if ($atsAvail): ?>
 		<button type="button" class="btn btn-sm btn-info" id="btn-import-ats-dash"
-			data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.importAts&format=json'); ?>"
+			data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.importAts&format=json'); ?>"
 			data-token="<?php echo $token; ?>">
 			<span class="icon-headphones"></span> Import Tickets (<?php echo $atsAvail->tickets; ?> tickets)
 		</button>
@@ -123,8 +123,8 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 	<!-- Quick Actions (large buttons) -->
 	<div class="row g-3 mb-4">
 		<div class="col-6 col-md-4 col-xl-3">
-			<button type="button" class="btn btn-outline-primary w-100 py-3" id="mokosuiteclient-btn-cache"
-				data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.clearCache&format=json'); ?>"
+			<button type="button" class="btn btn-outline-primary w-100 py-3" id="mokosuite-btn-cache"
+				data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.clearCache&format=json'); ?>"
 				data-token="<?php echo $token; ?>">
 				<span class="icon-bolt d-block mb-1" aria-hidden="true" style="font-size:1.5rem"></span>
 				Clear Cache
@@ -137,7 +137,7 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 			</a>
 		</div>
 		<div class="col-6 col-md-4 col-xl-3">
-			<a href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=extensions'); ?>" class="btn btn-outline-primary w-100 py-3">
+			<a href="<?php echo Route::_('index.php?option=com_mokosuite&view=extensions'); ?>" class="btn btn-outline-primary w-100 py-3">
 				<span class="icon-puzzle-piece d-block mb-1" aria-hidden="true" style="font-size:1.5rem"></span>
 				Moko Extensions
 			</a>
@@ -192,18 +192,18 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 					$catPlugins = $grouped[$catKey];
 					$first      = $catPlugins[0];
 				?>
-				<h3 class="mokosuiteclient-category-heading mb-3">
+				<h3 class="mokosuite-category-heading mb-3">
 					<span class="badge <?php echo $this->escape($first->categoryBadge); ?>"><?php echo $this->escape($first->categoryLabel); ?></span>
 				</h3>
-				<div class="mokosuiteclient-plugin-grid row g-3 mb-4">
+				<div class="mokosuite-plugin-grid row g-3 mb-4">
 					<?php foreach ($catPlugins as $plugin): ?>
 					<div class="col-12 col-md-6">
-						<div class="card mokosuiteclient-plugin-card h-100 <?php echo $plugin->enabled ? '' : 'mokosuiteclient-plugin-disabled'; ?>"
+						<div class="card mokosuite-plugin-card h-100 <?php echo $plugin->enabled ? '' : 'mokosuite-plugin-disabled'; ?>"
 							data-extension-id="<?php echo $plugin->extension_id; ?>">
 							<div class="card-body d-flex flex-column">
 								<div class="d-flex align-items-start justify-content-between mb-2">
 									<div class="d-flex align-items-center gap-2">
-										<span class="<?php echo $this->escape($plugin->icon); ?> mokosuiteclient-plugin-icon" aria-hidden="true"></span>
+										<span class="<?php echo $this->escape($plugin->icon); ?> mokosuite-plugin-icon" aria-hidden="true"></span>
 										<h5 class="card-title mb-0"><?php echo $this->escape($plugin->name); ?></h5>
 									</div>
 									<?php if ($plugin->version): ?>
@@ -213,27 +213,27 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 								<p class="card-text text-muted text-muted flex-grow-1"><?php echo $this->escape($plugin->description); ?></p>
 								<div class="d-flex align-items-center justify-content-between mt-auto pt-2 border-top">
 									<?php if ($plugin->protected): ?>
-										<span class="badge bg-dark"><?php echo Text::_('COM_MOKOSUITECLIENT_PROTECTED'); ?></span>
+										<span class="badge bg-dark"><?php echo Text::_('COM_MOKOSUITE_PROTECTED'); ?></span>
 									<?php elseif ($plugin->configure_only): ?>
 										<span class="badge bg-<?php echo $plugin->enabled ? 'success' : 'secondary'; ?>">
-											<?php echo $plugin->enabled ? Text::_('COM_MOKOSUITECLIENT_ENABLED') : Text::_('COM_MOKOSUITECLIENT_DISABLED'); ?>
+											<?php echo $plugin->enabled ? Text::_('COM_MOKOSUITE_ENABLED') : Text::_('COM_MOKOSUITE_DISABLED'); ?>
 										</span>
 									<?php else: ?>
 										<div class="form-check form-switch">
-											<input type="checkbox" class="form-check-input mokosuiteclient-toggle" role="switch"
+											<input type="checkbox" class="form-check-input mokosuite-toggle" role="switch"
 												id="toggle-<?php echo $plugin->extension_id; ?>"
 												data-extension-id="<?php echo $plugin->extension_id; ?>"
-												data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.togglePlugin&format=json'); ?>"
+												data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.togglePlugin&format=json'); ?>"
 												data-token="<?php echo $token; ?>"
 												<?php echo $plugin->enabled ? 'checked' : ''; ?>>
 											<label class="form-check-label" for="toggle-<?php echo $plugin->extension_id; ?>">
-												<?php echo $plugin->enabled ? Text::_('COM_MOKOSUITECLIENT_ENABLED') : Text::_('COM_MOKOSUITECLIENT_DISABLED'); ?>
+												<?php echo $plugin->enabled ? Text::_('COM_MOKOSUITE_ENABLED') : Text::_('COM_MOKOSUITE_DISABLED'); ?>
 											</label>
 										</div>
 									<?php endif; ?>
 									<?php if ($plugin->type === 'plugin'): ?>
 										<a href="<?php echo Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . $plugin->extension_id); ?>" class="btn btn-sm btn-outline-secondary">
-											<span class="icon-cog" aria-hidden="true"></span> <?php echo Text::_('COM_MOKOSUITECLIENT_CONFIGURE'); ?>
+											<span class="icon-cog" aria-hidden="true"></span> <?php echo Text::_('COM_MOKOSUITE_CONFIGURE'); ?>
 										</a>
 									<?php endif; ?>
 								</div>
@@ -254,7 +254,7 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 					<strong><span class="icon-shield-alt" aria-hidden="true"></span> WAF Activity (14 days)</strong>
 				</div>
 				<div class="card-body py-2">
-					<canvas id="mokosuiteclient-chart-waf" height="140"></canvas>
+					<canvas id="mokosuite-chart-waf" height="140"></canvas>
 				</div>
 			</div>

@@ -264,7 +264,7 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 					<strong><span class="icon-user" aria-hidden="true"></span> Login Activity (14 days)</strong>
 				</div>
 				<div class="card-body py-2">
-					<canvas id="mokosuiteclient-chart-logins" height="140"></canvas>
+					<canvas id="mokosuite-chart-logins" height="140"></canvas>
 				</div>
 			</div>

@@ -409,7 +409,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	};

 	// WAF chart
-	var wafCtx = document.getElementById('mokosuiteclient-chart-waf');
+	var wafCtx = document.getElementById('mokosuite-chart-waf');
 	if (wafCtx) {
 		new Chart(wafCtx, {
 			type: 'bar',
@@ -428,7 +428,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	}

 	// Login chart
-	var loginCtx = document.getElementById('mokosuiteclient-chart-logins');
+	var loginCtx = document.getElementById('mokosuite-chart-logins');
 	if (loginCtx) {
 		new Chart(loginCtx, {
 			type: 'line',
@@ -7,12 +7,12 @@ use Joomla\CMS\Session\Session;
 $data    = $this->tableData;
 $tables  = $data['tables'] ?? [];
 $token   = Session::getFormToken();
-$optimizeUrl = Route::_('index.php?option=com_mokosuiteclient&task=display.optimizeDb&format=json');
-$repairUrl   = Route::_('index.php?option=com_mokosuiteclient&task=display.repairDb&format=json');
-$purgeUrl    = Route::_('index.php?option=com_mokosuiteclient&task=display.purgeSessions&format=json');
+$optimizeUrl = Route::_('index.php?option=com_mokosuite&task=display.optimizeDb&format=json');
+$repairUrl   = Route::_('index.php?option=com_mokosuite&task=display.repairDb&format=json');
+$purgeUrl    = Route::_('index.php?option=com_mokosuite&task=display.purgeSessions&format=json');
 ?>

-<div id="mokosuiteclient-database">
+<div id="mokosuite-database">
 	<div class="row g-3 mb-4">
 		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo $data['count']; ?></span><small class="text-muted">Tables</small></div></div>
 		<div class="col-6 col-md-3"><div class="card text-center p-3"><span class="fw-bold fs-3"><?php echo $data['total_size_mb']; ?> MB</span><small class="text-muted">Total Size</small></div></div>
@@ -11,19 +11,19 @@ $openDeals = $this->pipelineData['open'] ?? (object) ['cnt' => 0, 'total_value'
 $closedTotal = ((int) ($wonDeals->cnt ?? 0)) + ((int) ($lostDeals->cnt ?? 0));
 $winRate = $closedTotal > 0 ? round((int) ($wonDeals->cnt ?? 0) / $closedTotal * 100, 1) : 0;
 ?>
-<div class="mokosuiteclient-erp-reports">
+<div class="mokosuite-erp-reports">
 	<div class="card shadow-sm mb-3"><div class="card-body py-2">
 		<form method="get" class="d-flex gap-2 align-items-center flex-wrap">
-			<input type="hidden" name="option" value="com_mokosuiteclient"><input type="hidden" name="view" value="erpreports"><input type="hidden" name="tab" value="<?php echo $this->escape($tab); ?>">
+			<input type="hidden" name="option" value="com_mokosuite"><input type="hidden" name="view" value="erpreports"><input type="hidden" name="tab" value="<?php echo $this->escape($tab); ?>">
 			<label class="form-label mb-0 small">From:</label><input type="date" name="from" class="form-control form-control-sm" style="max-width:160px" value="<?php echo $this->escape($this->dateFrom); ?>">
 			<label class="form-label mb-0 small">To:</label><input type="date" name="to" class="form-control form-control-sm" style="max-width:160px" value="<?php echo $this->escape($this->dateTo); ?>">
 			<button type="submit" class="btn btn-sm btn-primary">Apply</button>
 		</form>
 	</div></div>
 	<ul class="nav nav-tabs mb-3">
-		<li class="nav-item"><a class="nav-link <?php echo $tab === 'sales' ? 'active' : ''; ?>" href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=erpreports&tab=sales&from=' . $this->dateFrom . '&to=' . $this->dateTo); ?>">Sales</a></li>
-		<li class="nav-item"><a class="nav-link <?php echo $tab === 'pipeline' ? 'active' : ''; ?>" href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=erpreports&tab=pipeline&from=' . $this->dateFrom . '&to=' . $this->dateTo); ?>">Pipeline</a></li>
-		<li class="nav-item"><a class="nav-link <?php echo $tab === 'aging' ? 'active' : ''; ?>" href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=erpreports&tab=aging'); ?>">Aging Receivables</a></li>
+		<li class="nav-item"><a class="nav-link <?php echo $tab === 'sales' ? 'active' : ''; ?>" href="<?php echo Route::_('index.php?option=com_mokosuite&view=erpreports&tab=sales&from=' . $this->dateFrom . '&to=' . $this->dateTo); ?>">Sales</a></li>
+		<li class="nav-item"><a class="nav-link <?php echo $tab === 'pipeline' ? 'active' : ''; ?>" href="<?php echo Route::_('index.php?option=com_mokosuite&view=erpreports&tab=pipeline&from=' . $this->dateFrom . '&to=' . $this->dateTo); ?>">Pipeline</a></li>
+		<li class="nav-item"><a class="nav-link <?php echo $tab === 'aging' ? 'active' : ''; ?>" href="<?php echo Route::_('index.php?option=com_mokosuite&view=erpreports&tab=aging'); ?>">Aging Receivables</a></li>
 	</ul>
 	<?php if ($tab === 'sales') : ?>
 	<div class="row g-3 mb-3">
@@ -61,7 +61,7 @@ $winRate = $closedTotal > 0 ? round((int) ($wonDeals->cnt ?? 0) / $closedTotal *
 	<div class="card shadow-sm"><div class="card-body p-0"><table class="table table-sm table-hover mb-0"><thead class="table-light"><tr><th>Ref</th><th>Contact</th><th class="text-end">Total</th><th class="text-end">Paid</th><th class="text-end">Balance</th><th>Due</th><th>Days</th></tr></thead><tbody>
 		<?php foreach ($this->agingData as $r) : ?>
 		<tr class="<?php echo (int) $r->days_overdue > 60 ? 'table-danger' : ((int) $r->days_overdue > 30 ? 'table-warning' : ''); ?>">
-			<td><a href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=erpinvoice&id=' . (int) $r->id); ?>" class="font-monospace"><?php echo $this->escape($r->ref); ?></a></td>
+			<td><a href="<?php echo Route::_('index.php?option=com_mokosuite&view=erpinvoice&id=' . (int) $r->id); ?>" class="font-monospace"><?php echo $this->escape($r->ref); ?></a></td>
 			<td><?php echo $this->escape($r->contact_name ?? '—'); ?></td><td class="text-end">$<?php echo number_format((float) $r->total, 2); ?></td>
 			<td class="text-end">$<?php echo number_format((float) $r->amount_paid, 2); ?></td><td class="text-end fw-bold text-danger">$<?php echo number_format((float) $r->balance, 2); ?></td>
 			<td class="small"><?php echo $this->escape($r->due_date); ?></td><td class="fw-bold"><?php echo (int) $r->days_overdue; ?></td>
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */
@@ -12,7 +12,7 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;

-/** @var \Moko\Component\MokoSuiteClient\Administrator\View\Extensions\HtmlView $this */
+/** @var \Moko\Component\MokoSuite\Administrator\View\Extensions\HtmlView $this */

 $packages = $this->packages;
 $token    = Session::getFormToken();
@@ -31,10 +31,10 @@ $statusBadge = [
 ];
 ?>

-<div id="mokosuiteclient-extensions">
+<div id="mokosuite-extensions">
 	<div class="alert alert-info">
 		<span class="icon-info-circle" aria-hidden="true"></span>
-		<?php echo Text::_('COM_MOKOSUITECLIENT_EXTENSIONS_INFO'); ?>
+		<?php echo Text::_('COM_MOKOSUITE_EXTENSIONS_INFO'); ?>
 	</div>

 	<?php foreach ($grouped as $category => $pkgs): ?>
@@ -86,8 +86,8 @@ $statusBadge = [
 							</a>
 							<?php endif; ?>
 							<?php if ($pkg->download_url && $pkg->status === 'update_available'): ?>
-						<button type="button" class="btn btn-sm btn-warning mokosuiteclient-install-btn"
-							data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.installExtension&format=json'); ?>"
+						<button type="button" class="btn btn-sm btn-warning mokosuite-install-btn"
+							data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.installExtension&format=json'); ?>"
 							data-download="<?php echo htmlspecialchars($pkg->download_url); ?>"
 							data-token="<?php echo $token; ?>"
 							data-label="<?php echo htmlspecialchars($pkg->label); ?>"
@@ -97,8 +97,8 @@ $statusBadge = [
 							Update to <?php echo htmlspecialchars($pkg->remote_version); ?>
 						</button>
 						<?php elseif ($pkg->download_url && $pkg->status === 'not_installed'): ?>
-							<button type="button" class="btn btn-sm btn-primary mokosuiteclient-install-btn"
-								data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.installExtension&format=json'); ?>"
+							<button type="button" class="btn btn-sm btn-primary mokosuite-install-btn"
+								data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.installExtension&format=json'); ?>"
 								data-download="<?php echo htmlspecialchars($pkg->download_url); ?>"
 								data-token="<?php echo $token; ?>"
 								data-label="<?php echo htmlspecialchars($pkg->label); ?>"
@@ -154,7 +154,7 @@ $statusBadge = [

 <script>
 document.addEventListener('DOMContentLoaded', function() {
-	document.querySelectorAll('.mokosuiteclient-install-btn').forEach(function(btn) {
+	document.querySelectorAll('.mokosuite-install-btn').forEach(function(btn) {
 		btn.addEventListener('click', function() {
 			var el = this;
 			var url = el.dataset.url;
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */
@@ -17,8 +17,8 @@ $preview = $this->preview;
 $nginx   = $this->nginxPreview;
 $current = $this->currentHtaccess;
 $token   = Session::getFormToken();
-$saveUrl = Route::_('index.php?option=com_mokosuiteclient&task=display.saveHtaccess&format=json');
-$genUrl  = Route::_('index.php?option=com_mokosuiteclient&task=display.generateHtaccess&format=json');
+$saveUrl = Route::_('index.php?option=com_mokosuite&task=display.saveHtaccess&format=json');
+$genUrl  = Route::_('index.php?option=com_mokosuite&task=display.generateHtaccess&format=json');

 // Helper for toggle switch
 $sw = function($name, $label, $desc = '') use ($opts) {
@@ -33,7 +33,7 @@ $sw = function($name, $label, $desc = '') use ($opts) {
 };
 ?>

-<div id="mokosuiteclient-htaccess">
+<div id="mokosuite-htaccess">
 	<ul class="nav nav-tabs mb-3" role="tablist">
 		<li class="nav-item"><a class="nav-link active" data-bs-toggle="tab" href="#tab-htaccess" role="tab">.htaccess</a></li>
 		<li class="nav-item"><a class="nav-link" data-bs-toggle="tab" href="#tab-nginx" role="tab">NginX</a></li>
@@ -263,7 +263,7 @@ document.addEventListener('DOMContentLoaded', function() {

 	// Save to disk
 	saveBtn.addEventListener('click', function() {
-		if (!confirm('This will overwrite your current .htaccess file. A backup will be created at .htaccess.mokosuiteclient.bak. Continue?')) return;
+		if (!confirm('This will overwrite your current .htaccess file. A backup will be created at .htaccess.mokosuite.bak. Continue?')) return;
 		var btn = this;
 		btn.disabled = true;

@@ -300,7 +300,7 @@ document.addEventListener('DOMContentLoaded', function() {
 		downloadText(preview.value, '.htaccess');
 	});
 	document.getElementById('nginx-download').addEventListener('click', function() {
-		downloadText(document.getElementById('nginx-preview').value, 'mokosuiteclient-nginx.conf');
+		downloadText(document.getElementById('nginx-preview').value, 'mokosuite-nginx.conf');
 	});
 });
 </script>
@@ -24,7 +24,7 @@ $typeBadge = [
 ];
 ?>

-<div id="mokosuiteclient-privacy">
+<div id="mokosuite-privacy">
 	<!-- Summary cards -->
 	<div class="row g-3 mb-4">
 		<div class="col-6 col-md-3">
@@ -100,7 +100,7 @@ $typeBadge = [
 					</div>
 					<div class="col-12 col-md-2 d-flex align-items-end">
 						<button type="submit" class="btn btn-primary w-100" id="btnCreateRequest"
-							data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.processDataRequest&format=json'); ?>"
+							data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.processDataRequest&format=json'); ?>"
 							data-token="<?php echo $token; ?>">
 							<span class="icon-check"></span> Submit
 						</button>
@@ -117,7 +117,7 @@ $typeBadge = [
 				<div class="card-header d-flex justify-content-between align-items-center">
 					<strong><span class="icon-user-shield"></span> Data Subject Requests</strong>
 					<form method="get" class="d-inline">
-						<input type="hidden" name="option" value="com_mokosuiteclient">
+						<input type="hidden" name="option" value="com_mokosuite">
 						<input type="hidden" name="view" value="privacy">
 						<select name="filter_status" class="form-select form-select-sm" style="width:auto" onchange="this.form.submit()">
 							<option value="">All</option>
@@ -146,15 +146,15 @@ $typeBadge = [
 								<?php if ($r->status === 'pending'): ?>
 								<div class="btn-group btn-group-sm">
 									<button type="button" class="btn btn-success btn-privacy-action" data-id="<?php echo $r->id; ?>" data-action="approve"
-										data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.processDataRequest&format=json'); ?>"
+										data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.processDataRequest&format=json'); ?>"
 										data-token="<?php echo $token; ?>">Approve</button>
 									<button type="button" class="btn btn-outline-danger btn-privacy-action" data-id="<?php echo $r->id; ?>" data-action="deny"
-										data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.processDataRequest&format=json'); ?>"
+										data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.processDataRequest&format=json'); ?>"
 										data-token="<?php echo $token; ?>">Deny</button>
 								</div>
 								<?php elseif ($r->status === 'completed' && $r->type === 'export'): ?>
 								<button type="button" class="btn btn-sm btn-outline-primary btn-export-download" data-user="<?php echo $r->user_id; ?>"
-									data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.exportUserData&format=json'); ?>"
+									data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.exportUserData&format=json'); ?>"
 									data-token="<?php echo $token; ?>">
 									<span class="icon-download"></span> Download
 								</button>
@@ -8,12 +8,23 @@ use Joomla\CMS\Session\Session;
 $t       = $this->ticket;
 $canned  = $this->cannedResponses;
 $token   = Session::getFormToken();
+$attachments = $this->attachments;
+$downloadUrl = Route::_('index.php?option=com_mokosuite&task=display.downloadAttachment');
+$uploadUrl   = Route::_('index.php?option=com_mokosuite&task=display.uploadAttachment&format=json');
+$deleteAttUrl = Route::_('index.php?option=com_mokosuite&task=display.deleteAttachment&format=json');
+
+// Group attachments by reply_id (null = ticket-level)
+$attByReply = [];
+foreach ($attachments as $att) {
+	$key = $att->reply_id ?? 0;
+	$attByReply[$key][] = $att;
+}

 $statuses   = $this->statuses ?? [];
 $priorities = $this->priorities ?? [];
 ?>

-<div id="mokosuiteclient-ticket" class="row">
+<div id="mokosuite-ticket" class="row">
 	<!-- Left: conversation thread -->
 	<div class="col-12 col-xl-8">
 		<!-- Original ticket -->
@@ -25,7 +36,21 @@ $priorities = $this->priorities ?? [];
 				</div>
 				<span class="badge bg-dark">Original</span>
 			</div>
-			<div class="card-body"><?php echo nl2br($this->escape($t->body)); ?></div>
+			<div class="card-body">
+				<?php echo nl2br($this->escape($t->body)); ?>
+				<?php if (!empty($attByReply[0])): ?>
+				<hr>
+				<div class="small">
+					<strong>Attachments:</strong>
+					<?php foreach ($attByReply[0] as $att): ?>
+					<a href="<?php echo $downloadUrl . '&id=' . $att->id; ?>" class="d-inline-block me-3">
+						<span class="icon-download"></span> <?php echo $this->escape($att->filename); ?>
+						<span class="text-muted">(<?php echo \Moko\Component\MokoSuite\Administrator\Service\AttachmentService::formatSize($att->filesize); ?>)</span>
+					</a>
+					<?php endforeach; ?>
+				</div>
+				<?php endif; ?>
+			</div>
 		</div>

 		<!-- Replies -->
@@ -40,7 +65,21 @@ $priorities = $this->priorities ?? [];
 				<span class="badge bg-warning text-dark">Internal Note</span>
 				<?php endif; ?>
 			</div>
-			<div class="card-body"><?php echo nl2br($this->escape($reply->body)); ?></div>
+			<div class="card-body">
+				<?php echo nl2br($this->escape($reply->body)); ?>
+				<?php if (!empty($attByReply[$reply->id])): ?>
+				<hr>
+				<div class="small">
+					<strong>Attachments:</strong>
+					<?php foreach ($attByReply[$reply->id] as $att): ?>
+					<a href="<?php echo $downloadUrl . '&id=' . $att->id; ?>" class="d-inline-block me-3">
+						<span class="icon-download"></span> <?php echo $this->escape($att->filename); ?>
+						<span class="text-muted">(<?php echo \Moko\Component\MokoSuite\Administrator\Service\AttachmentService::formatSize($att->filesize); ?>)</span>
+					</a>
+					<?php endforeach; ?>
+				</div>
+				<?php endif; ?>
+			</div>
 		</div>
 		<?php endforeach; ?>

@@ -59,14 +98,18 @@ $priorities = $this->priorities ?? [];
 				</div>
 				<?php endif; ?>
 				<textarea id="reply-body" class="form-control mb-2" rows="5" placeholder="Type your reply..."></textarea>
+				<div class="mb-2">
+					<input type="file" id="reply-attachments" class="form-control form-control-sm" multiple
+						accept=".jpg,.jpeg,.png,.gif,.webp,.pdf,.doc,.docx,.xls,.xlsx,.csv,.txt,.zip">
+				</div>
 				<div class="d-flex gap-2">
 					<button type="button" class="btn btn-primary" id="btn-reply"
-						data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.addTicketReply&format=json'); ?>"
+						data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.addTicketReply&format=json'); ?>"
 						data-ticket="<?php echo $t->id; ?>" data-token="<?php echo $token; ?>">
 						<span class="icon-reply"></span> Send Reply
 					</button>
 					<button type="button" class="btn btn-outline-warning" id="btn-internal"
-						data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.addTicketReply&format=json'); ?>"
+						data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.addTicketReply&format=json'); ?>"
 						data-ticket="<?php echo $t->id; ?>" data-token="<?php echo $token; ?>" data-internal="1">
 						<span class="icon-eye-slash"></span> Internal Note
 					</button>
@@ -145,6 +188,45 @@ $priorities = $this->priorities ?? [];
 		</div>
 		<?php endif; ?>

+		<!-- Satisfaction Rating -->
+		<?php
+		$isClosed = in_array($t->status, ['resolved', 'closed'], true);
+		$hasRating = !empty($t->satisfaction_rating);
+		?>
+		<?php if ($hasRating): ?>
+		<div class="card mb-3">
+			<div class="card-header"><strong>Satisfaction</strong></div>
+			<div class="card-body text-center">
+				<div class="mb-1">
+					<?php for ($s = 1; $s <= 5; $s++): ?>
+					<span style="font-size:1.5rem;color:<?php echo $s <= $t->satisfaction_rating ? '#f5a623' : '#dee2e6'; ?>;">&#9733;</span>
+					<?php endfor; ?>
+				</div>
+				<div class="text-muted small"><?php echo $t->satisfaction_rating; ?>/5</div>
+				<?php if (!empty($t->satisfaction_feedback)): ?>
+				<p class="small mt-2 mb-0"><?php echo $this->escape($t->satisfaction_feedback); ?></p>
+				<?php endif; ?>
+			</div>
+		</div>
+		<?php elseif ($isClosed): ?>
+		<div class="card mb-3" id="rating-card">
+			<div class="card-header"><strong>Rate this Support</strong></div>
+			<div class="card-body text-center">
+				<div class="mb-2" id="star-rating">
+					<?php for ($s = 1; $s <= 5; $s++): ?>
+					<span class="star-btn" data-value="<?php echo $s; ?>" style="font-size:2rem;cursor:pointer;color:#dee2e6;">&#9733;</span>
+					<?php endfor; ?>
+				</div>
+				<textarea id="rating-feedback" class="form-control form-control-sm mb-2" rows="2" placeholder="Optional feedback..."></textarea>
+				<button type="button" class="btn btn-primary btn-sm" id="btn-rate"
+					data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.rateTicket&format=json'); ?>"
+					data-ticket="<?php echo $t->id; ?>" data-token="<?php echo $token; ?>" disabled>
+					Submit Rating
+				</button>
+			</div>
+		</div>
+		<?php endif; ?>
+
 		<!-- Status actions -->
 		<div class="card mb-3">
 			<div class="card-header"><strong>Actions</strong></div>
@@ -152,7 +234,7 @@ $priorities = $this->priorities ?? [];
 				<?php foreach ($statuses as $s): ?>
 				<?php if ((int) $s->id !== (int) $t->status_id): ?>
 				<button type="button" class="btn btn-sm btn-outline-<?php echo $s->is_closed ? 'danger' : 'secondary'; ?> btn-status"
-					data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.updateTicketStatus&format=json'); ?>"
+					data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.updateTicketStatus&format=json'); ?>"
 					data-ticket="<?php echo $t->id; ?>" data-status="<?php echo $s->id; ?>" data-token="<?php echo $token; ?>">
 					<?php echo $this->escape($s->title); ?>
 				</button>
@@ -190,22 +272,39 @@ document.addEventListener('DOMContentLoaded', function() {
 		});
 	}

-	// Reply buttons
+	// Reply buttons (with attachment upload)
 	document.querySelectorAll('#btn-reply, #btn-internal').forEach(function(btn) {
 		btn.addEventListener('click', function() {
 			var body = document.getElementById('reply-body').value.trim();
-			if (!body) return;
+			var fileInput = document.getElementById('reply-attachments');
+			if (!body && (!fileInput || !fileInput.files.length)) return;
 			var el = this;
 			el.disabled = true;
 			var fd = new FormData();
 			fd.append('ticket_id', el.dataset.ticket);
-			fd.append('body', body);
+			fd.append('body', body || '(attachment)');
 			fd.append('is_internal', el.dataset.internal || '0');
 			fd.append(el.dataset.token, '1');
 			fetch(el.dataset.url, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
 				.then(function(r){return r.json()})
-				.then(function(d){ if(d.success) location.reload(); else Joomla.renderMessages({error:[d.message]}); })
-				.finally(function(){ el.disabled = false; });
+				.then(function(d){
+					if (!d.success) { Joomla.renderMessages({error:[d.message]}); el.disabled = false; return; }
+					// Upload attachments if any
+					if (fileInput && fileInput.files.length > 0) {
+						var afd = new FormData();
+						afd.append('ticket_id', el.dataset.ticket);
+						if (d.reply_id) afd.append('reply_id', d.reply_id);
+						for (var i = 0; i < fileInput.files.length; i++) {
+							afd.append('attachments[' + i + ']', fileInput.files[i]);
+						}
+						afd.append(el.dataset.token, '1');
+						fetch('<?php echo $uploadUrl; ?>', {method:'POST', body:afd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+							.then(function(){ location.reload(); });
+					} else {
+						location.reload();
+					}
+				})
+				.catch(function(){ el.disabled = false; });
 		});
 	});

@@ -224,5 +323,42 @@ document.addEventListener('DOMContentLoaded', function() {
 				.finally(function(){ el.disabled = false; });
 		});
 	});
+	// Star rating
+	var selectedRating = 0;
+	document.querySelectorAll('.star-btn').forEach(function(star) {
+		star.addEventListener('mouseenter', function() {
+			var val = parseInt(this.dataset.value);
+			document.querySelectorAll('.star-btn').forEach(function(s) {
+				s.style.color = parseInt(s.dataset.value) <= val ? '#f5a623' : '#dee2e6';
+			});
+		});
+		star.addEventListener('mouseleave', function() {
+			document.querySelectorAll('.star-btn').forEach(function(s) {
+				s.style.color = parseInt(s.dataset.value) <= selectedRating ? '#f5a623' : '#dee2e6';
+			});
+		});
+		star.addEventListener('click', function() {
+			selectedRating = parseInt(this.dataset.value);
+			document.getElementById('btn-rate').disabled = false;
+		});
+	});
+
+	var rateBtn = document.getElementById('btn-rate');
+	if (rateBtn) {
+		rateBtn.addEventListener('click', function() {
+			if (!selectedRating) return;
+			var el = this;
+			el.disabled = true;
+			var fd = new FormData();
+			fd.append('ticket_id', el.dataset.ticket);
+			fd.append('rating', selectedRating);
+			fd.append('feedback', document.getElementById('rating-feedback').value);
+			fd.append(el.dataset.token, '1');
+			fetch(el.dataset.url, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+				.then(function(r){return r.json()})
+				.then(function(d){ if(d.success) location.reload(); else Joomla.renderMessages({error:[d.message]}); })
+				.finally(function(){ el.disabled = false; });
+		});
+	}
 });
 </script>
@@ -17,7 +17,7 @@ $atsAvailable = $this->atsAvailable;
 $token        = Session::getFormToken();
 ?>

-<div id="mokosuiteclient-tickets">
+<div id="mokosuite-tickets">
 	<!-- Status summary cards -->
 	<div class="row g-3 mb-4">
 		<?php foreach ($counts as $sc): ?>
@@ -36,7 +36,7 @@ $token        = Session::getFormToken();
 			</button>
 			<?php if ($atsAvailable): ?>
 			<button type="button" class="btn btn-outline-info" id="btn-import-ats"
-				data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.importAts&format=json'); ?>"
+				data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.importAts&format=json'); ?>"
 				data-token="<?php echo $token; ?>"
 				data-tickets="<?php echo $atsAvailable->tickets; ?>"
 				data-posts="<?php echo $atsAvailable->posts; ?>">
@@ -45,7 +45,7 @@ $token        = Session::getFormToken();
 			<?php endif; ?>
 		</div>
 		<form method="get" class="d-flex gap-2">
-			<input type="hidden" name="option" value="com_mokosuiteclient">
+			<input type="hidden" name="option" value="com_mokosuite">
 			<input type="hidden" name="view" value="tickets">
 			<select name="filter_status" class="form-select form-select-sm" style="width:auto" onchange="this.form.submit()">
 				<option value="">All Statuses</option>
@@ -93,8 +93,8 @@ $token        = Session::getFormToken();
 						elseif ($t->sla_response_due && !$t->sla_responded && strtotime($t->sla_response_due) < $now + 3600) $slaClass = 'table-warning';
 					?>
 					<tr class="<?php echo $slaClass; ?>">
-						<td><a href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=ticket&id=' . $t->id); ?>"><?php echo $t->id; ?></a></td>
-						<td><a href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=ticket&id=' . $t->id); ?>"><?php echo $this->escape(mb_substr($t->subject, 0, 60)); ?></a></td>
+						<td><a href="<?php echo Route::_('index.php?option=com_mokosuite&view=ticket&id=' . $t->id); ?>"><?php echo $t->id; ?></a></td>
+						<td><a href="<?php echo Route::_('index.php?option=com_mokosuite&view=ticket&id=' . $t->id); ?>"><?php echo $this->escape(mb_substr($t->subject, 0, 60)); ?></a></td>
 						<td><span class="badge <?php echo $this->escape($t->status_color ?? 'bg-secondary'); ?>"><?php echo $this->escape($t->status_title ?? $t->status); ?></span></td>
 						<td><span class="badge <?php echo $this->escape($t->priority_color ?? 'bg-secondary'); ?>"><?php echo $this->escape($t->priority_title ?? $t->priority); ?></span></td>
 						<td><?php echo $this->escape($t->category_title ?? '—'); ?></td>
@@ -149,7 +149,7 @@ $token        = Session::getFormToken();
 				</div>

 				<!-- Ticket form step (hidden initially) -->
-				<form id="modal-ticket-form" class="d-none" method="post" action="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.createTicket&format=json'); ?>">
+				<form id="modal-ticket-form" class="d-none" method="post" action="<?php echo Route::_('index.php?option=com_mokosuite&task=display.createTicket&format=json'); ?>">
 					<div class="mb-3">
 						<label class="form-label">Subject</label>
 						<input type="text" name="subject" id="modal-subject" class="form-control" required>
@@ -182,6 +182,26 @@ $token        = Session::getFormToken();
 							</select>
 						</div>
 					</div>
+					<div class="row mb-3">
+						<div class="col-md-6">
+							<label class="form-label">Assign Users</label>
+							<select name="assign_users[]" class="form-select" multiple size="4">
+								<?php foreach ($this->backendUsers as $u): ?>
+								<option value="<?php echo $u->id; ?>"><?php echo $this->escape($u->name); ?></option>
+								<?php endforeach; ?>
+							</select>
+							<small class="text-muted">Hold Ctrl/Cmd to select multiple</small>
+						</div>
+						<div class="col-md-6">
+							<label class="form-label">Assign Groups</label>
+							<select name="assign_groups[]" class="form-select" multiple size="4">
+								<?php foreach ($this->userGroups as $g): ?>
+								<option value="<?php echo $g->id; ?>"><?php echo $this->escape($g->title); ?></option>
+								<?php endforeach; ?>
+							</select>
+							<small class="text-muted">Hold Ctrl/Cmd to select multiple</small>
+						</div>
+					</div>
 					<div class="mb-3">
 						<label class="form-label">Description</label>
 						<textarea name="body" class="form-control" rows="6" required></textarea>
@@ -210,7 +230,7 @@ var modalSubject = document.getElementById('modal-subject');
 function modalDoSearch() {
 	var q = modalSearch.value.trim();
 	if (q.length < 3) return;
-	fetch('<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.searchKb&format=json'); ?>&q=' + encodeURIComponent(q), {
+	fetch('<?php echo Route::_('index.php?option=com_mokosuite&task=display.searchKb&format=json'); ?>&q=' + encodeURIComponent(q), {
 		headers: {'X-Requested-With': 'XMLHttpRequest'}
 	}).then(function(r){return r.json()}).then(function(d) {
 		modalResults.textContent = '';
@@ -260,7 +280,7 @@ if (modalForm) {
 		fetch(form.action, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
 			.then(function(r){return r.json()})
 			.then(function(d){
-				if (d.success) { location.href = 'index.php?option=com_mokosuiteclient&view=ticket&id=' + d.id; }
+				if (d.success) { location.href = 'index.php?option=com_mokosuite&view=ticket&id=' + d.id; }
 				else { Joomla.renderMessages({error:[d.message]}); }
 			});
 	});
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later
+ *
+ * @package    MokoSuite
+ * @subpackage Component
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+$token = Session::getFormToken();
+
+$colorOptions = [
+	'bg-primary', 'bg-secondary', 'bg-success', 'bg-danger',
+	'bg-warning text-dark', 'bg-info text-dark', 'bg-dark', 'bg-light text-dark',
+];
+?>
+
+<div class="row">
+	<!-- Statuses -->
+	<div class="col-lg-6">
+		<div class="card mb-4">
+			<div class="card-header d-flex justify-content-between align-items-center">
+				<strong><span class="fa-solid fa-circle-dot"></span> Ticket Statuses</strong>
+			</div>
+			<div class="card-body p-0">
+				<table class="table table-striped mb-0">
+					<thead>
+						<tr>
+							<th>Title</th>
+							<th class="w-10 text-center">Color</th>
+							<th class="w-10 text-center">Default</th>
+							<th class="w-10 text-center">Closed?</th>
+							<th class="w-10 text-center">Order</th>
+							<th class="w-10 text-center">Actions</th>
+						</tr>
+					</thead>
+					<tbody>
+					<?php foreach ($this->statuses as $s): ?>
+						<tr>
+							<td><?php echo $this->escape($s->title); ?> <small class="text-muted">(<?php echo $this->escape($s->alias); ?>)</small></td>
+							<td class="text-center"><span class="badge <?php echo $this->escape($s->color); ?>">&nbsp;&nbsp;&nbsp;</span></td>
+							<td class="text-center"><?php echo $s->is_default ? '<span class="badge bg-success">Yes</span>' : ''; ?></td>
+							<td class="text-center"><?php echo $s->is_closed ? '<span class="badge bg-dark">Closed</span>' : ''; ?></td>
+							<td class="text-center"><?php echo (int) $s->ordering; ?></td>
+							<td class="text-center">
+								<button class="btn btn-sm btn-outline-primary" onclick="editStatus(<?php echo htmlspecialchars(json_encode($s)); ?>)">
+									<span class="icon-pencil"></span>
+								</button>
+								<a href="<?php echo Route::_('index.php?option=com_mokosuite&task=display.deleteStatus&id=' . $s->id . '&' . $token . '=1'); ?>"
+									class="btn btn-sm btn-outline-danger"
+									onclick="return confirm('Delete this status?')">
+									<span class="icon-trash"></span>
+								</a>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+					</tbody>
+				</table>
+			</div>
+			<div class="card-footer">
+				<form method="post" action="<?php echo Route::_('index.php?option=com_mokosuite&task=display.saveStatus'); ?>" id="statusForm" class="row g-2 align-items-end">
+					<input type="hidden" name="id" id="status-id" value="0">
+					<div class="col-md-3">
+						<label class="form-label small">Title</label>
+						<input type="text" name="title" id="status-title" class="form-control form-control-sm" required>
+					</div>
+					<div class="col-md-2">
+						<label class="form-label small">Alias</label>
+						<input type="text" name="alias" id="status-alias" class="form-control form-control-sm">
+					</div>
+					<div class="col-md-2">
+						<label class="form-label small">Color</label>
+						<select name="color" id="status-color" class="form-select form-select-sm">
+							<?php foreach ($colorOptions as $c): ?>
+							<option value="<?php echo $c; ?>"><?php echo $c; ?></option>
+							<?php endforeach; ?>
+						</select>
+					</div>
+					<div class="col-md-1">
+						<label class="form-label small">Order</label>
+						<input type="number" name="ordering" id="status-ordering" class="form-control form-control-sm" value="0">
+					</div>
+					<div class="col-md-1 text-center">
+						<label class="form-label small">Default</label>
+						<input type="checkbox" name="is_default" id="status-default" value="1" class="form-check-input">
+					</div>
+					<div class="col-md-1 text-center">
+						<label class="form-label small">Closed</label>
+						<input type="checkbox" name="is_closed" id="status-closed" value="1" class="form-check-input">
+					</div>
+					<div class="col-md-2">
+						<input type="hidden" name="<?php echo $token; ?>" value="1">
+						<button type="submit" class="btn btn-sm btn-primary w-100" id="status-btn">Add</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+
+	<!-- Priorities -->
+	<div class="col-lg-6">
+		<div class="card mb-4">
+			<div class="card-header d-flex justify-content-between align-items-center">
+				<strong><span class="fa-solid fa-flag"></span> Ticket Priorities</strong>
+			</div>
+			<div class="card-body p-0">
+				<table class="table table-striped mb-0">
+					<thead>
+						<tr>
+							<th>Title</th>
+							<th class="w-10 text-center">Color</th>
+							<th class="w-10 text-center">Default</th>
+							<th class="w-10 text-center">Order</th>
+							<th class="w-10 text-center">Actions</th>
+						</tr>
+					</thead>
+					<tbody>
+					<?php foreach ($this->priorities as $p): ?>
+						<tr>
+							<td><?php echo $this->escape($p->title); ?> <small class="text-muted">(<?php echo $this->escape($p->alias); ?>)</small></td>
+							<td class="text-center"><span class="badge <?php echo $this->escape($p->color); ?>">&nbsp;&nbsp;&nbsp;</span></td>
+							<td class="text-center"><?php echo $p->is_default ? '<span class="badge bg-success">Yes</span>' : ''; ?></td>
+							<td class="text-center"><?php echo (int) $p->ordering; ?></td>
+							<td class="text-center">
+								<button class="btn btn-sm btn-outline-primary" onclick="editPriority(<?php echo htmlspecialchars(json_encode($p)); ?>)">
+									<span class="icon-pencil"></span>
+								</button>
+								<a href="<?php echo Route::_('index.php?option=com_mokosuite&task=display.deletePriority&id=' . $p->id . '&' . $token . '=1'); ?>"
+									class="btn btn-sm btn-outline-danger"
+									onclick="return confirm('Delete this priority?')">
+									<span class="icon-trash"></span>
+								</a>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+					</tbody>
+				</table>
+			</div>
+			<div class="card-footer">
+				<form method="post" action="<?php echo Route::_('index.php?option=com_mokosuite&task=display.savePriority'); ?>" id="priorityForm" class="row g-2 align-items-end">
+					<input type="hidden" name="id" id="priority-id" value="0">
+					<div class="col-md-3">
+						<label class="form-label small">Title</label>
+						<input type="text" name="title" id="priority-title" class="form-control form-control-sm" required>
+					</div>
+					<div class="col-md-2">
+						<label class="form-label small">Alias</label>
+						<input type="text" name="alias" id="priority-alias" class="form-control form-control-sm">
+					</div>
+					<div class="col-md-2">
+						<label class="form-label small">Color</label>
+						<select name="color" id="priority-color" class="form-select form-select-sm">
+							<?php foreach ($colorOptions as $c): ?>
+							<option value="<?php echo $c; ?>"><?php echo $c; ?></option>
+							<?php endforeach; ?>
+						</select>
+					</div>
+					<div class="col-md-1">
+						<label class="form-label small">Order</label>
+						<input type="number" name="ordering" id="priority-ordering" class="form-control form-control-sm" value="0">
+					</div>
+					<div class="col-md-1 text-center">
+						<label class="form-label small">Default</label>
+						<input type="checkbox" name="is_default" id="priority-default" value="1" class="form-check-input">
+					</div>
+					<div class="col-md-3">
+						<input type="hidden" name="<?php echo $token; ?>" value="1">
+						<button type="submit" class="btn btn-sm btn-primary w-100" id="priority-btn">Add</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+function editStatus(s) {
+	document.getElementById('status-id').value = s.id;
+	document.getElementById('status-title').value = s.title;
+	document.getElementById('status-alias').value = s.alias;
+	document.getElementById('status-color').value = s.color;
+	document.getElementById('status-ordering').value = s.ordering;
+	document.getElementById('status-default').checked = !!parseInt(s.is_default);
+	document.getElementById('status-closed').checked = !!parseInt(s.is_closed);
+	document.getElementById('status-btn').textContent = 'Update';
+}
+function editPriority(p) {
+	document.getElementById('priority-id').value = p.id;
+	document.getElementById('priority-title').value = p.title;
+	document.getElementById('priority-alias').value = p.alias;
+	document.getElementById('priority-color').value = p.color;
+	document.getElementById('priority-ordering').value = p.ordering;
+	document.getElementById('priority-default').checked = !!parseInt(p.is_default);
+	document.getElementById('priority-btn').textContent = 'Update';
+}
+</script>
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
@@ -25,7 +25,7 @@ $ruleBadge = [
 ];
 ?>

-<div id="mokosuiteclient-waflog">
+<div id="mokosuite-waflog">
 	<!-- Rule distribution cards -->
 	<div class="d-flex flex-wrap gap-2 mb-4">
 		<?php foreach ($ruleCounts as $rc): ?>
@@ -46,7 +46,7 @@ $ruleBadge = [
 			<!-- Filters -->
 			<form method="get" class="card mb-3">
 				<div class="card-body">
-					<input type="hidden" name="option" value="com_mokosuiteclient">
+					<input type="hidden" name="option" value="com_mokosuite">
 					<input type="hidden" name="view" value="waflog">
 					<div class="row g-2">
 						<div class="col-md-2">
@@ -71,7 +71,7 @@ $ruleBadge = [
 						</div>
 						<div class="col-md-2 d-flex gap-1">
 							<button type="submit" class="btn btn-sm btn-primary"><span class="icon-search"></span> Filter</button>
-							<a href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=waflog'); ?>" class="btn btn-sm btn-outline-secondary">Reset</a>
+							<a href="<?php echo Route::_('index.php?option=com_mokosuite&view=waflog'); ?>" class="btn btn-sm btn-outline-secondary">Reset</a>
 						</div>
 					</div>
 				</div>
@@ -82,7 +82,7 @@ $ruleBadge = [
 				<div class="card-header d-flex justify-content-between align-items-center">
 					<strong><?php echo number_format($total); ?> blocked requests</strong>
 					<button type="button" class="btn btn-sm btn-outline-danger" id="btn-purge"
-						data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.purgeWafLog&format=json'); ?>"
+						data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.purgeWafLog&format=json'); ?>"
 						data-token="<?php echo $token; ?>">
 						<span class="icon-trash"></span> Purge Old Logs
 					</button>
@@ -106,7 +106,7 @@ $ruleBadge = [
 								<td class="small" style="max-width:200px;overflow:hidden;text-overflow:ellipsis"><?php echo htmlspecialchars(mb_substr($log->user_agent, 0, 40)); ?></td>
 								<td>
 									<button type="button" class="btn btn-sm btn-outline-danger btn-ban-ip" data-ip="<?php echo htmlspecialchars($log->ip); ?>"
-										data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.banIpFromLog&format=json'); ?>"
+										data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.banIpFromLog&format=json'); ?>"
 										data-token="<?php echo $token; ?>" title="Ban this IP">
 										<span class="icon-ban"></span>
 									</button>
@@ -124,10 +124,10 @@ $ruleBadge = [
 					<nav>
 						<ul class="pagination pagination-sm mb-0">
 							<?php if ($page > 1): ?>
-							<li class="page-item"><a class="page-link" href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=waflog&page=' . ($page - 1)); ?>">Prev</a></li>
+							<li class="page-item"><a class="page-link" href="<?php echo Route::_('index.php?option=com_mokosuite&view=waflog&page=' . ($page - 1)); ?>">Prev</a></li>
 							<?php endif; ?>
 							<?php if ($page < $totalPages): ?>
-							<li class="page-item"><a class="page-link" href="<?php echo Route::_('index.php?option=com_mokosuiteclient&view=waflog&page=' . ($page + 1)); ?>">Next</a></li>
+							<li class="page-item"><a class="page-link" href="<?php echo Route::_('index.php?option=com_mokosuite&view=waflog&page=' . ($page + 1)); ?>">Next</a></li>
 							<?php endif; ?>
 						</ul>
 					</nav>
@@ -151,7 +151,7 @@ $ruleBadge = [
 							<td class="small text-nowrap"><?php echo HTMLHelper::_('date', $tip->last_seen, 'M d'); ?></td>
 							<td>
 								<button type="button" class="btn btn-sm btn-outline-danger btn-ban-ip" data-ip="<?php echo htmlspecialchars($tip->ip); ?>"
-									data-url="<?php echo Route::_('index.php?option=com_mokosuiteclient&task=display.banIpFromLog&format=json'); ?>"
+									data-url="<?php echo Route::_('index.php?option=com_mokosuite&task=display.banIpFromLog&format=json'); ?>"
 									data-token="<?php echo $token; ?>" title="Ban">
 									<span class="icon-ban"></span>
 								</button>
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -16,7 +16,7 @@ use Joomla\CMS\MVC\Controller\BaseController;
 /**
 * Cache management API controller.
 *
- * POST /api/index.php/v1/mokosuiteclient/cache
+ * POST /api/index.php/v1/mokosuite/cache
 *
 * @since  1.0.0
 */
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -20,7 +20,7 @@ use Joomla\Registry\Registry;
 /**
 * Dashboard summary API controller.
 *
- * GET /api/index.php/v1/mokosuiteclient/dashboard
+ * GET /api/index.php/v1/mokosuite/dashboard
 *
 * Returns a combined payload of site info and feature plugin states,
 * suitable for remote dashboards and monitoring.
@@ -53,7 +53,7 @@ class DashboardController extends BaseController
 		$query = $db->getQuery(true)
 			->select($db->quoteName('manifest_cache'))
 			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('element') . ' = ' . $db->quote('pkg_mokosuiteclient'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('pkg_mokosuite'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('package'));
 		$db->setQuery($query);
 		$pkgCache = json_decode($db->loadResult() ?? '{}');
@@ -71,8 +71,8 @@ class DashboardController extends BaseController
 			->from($db->quoteName('#__extensions'))
 			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-			->where('(' . $db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient')
-				. ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuiteclient\\_%') . ')')
+			->where('(' . $db->quoteName('element') . ' = ' . $db->quote('mokosuite')
+				. ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuite\\_%') . ')')
 			->order($db->quoteName('element') . ' ASC');
 		$db->setQuery($query);
 		$pluginRows = $db->loadObjectList() ?: [];
@@ -118,7 +118,7 @@ class DashboardController extends BaseController
 			'site'      => [
 				'name'              => $config->get('sitename', ''),
 				'url'               => rtrim(Uri::root(), '/'),
-				'mokosuiteclient_version'  => $pkgCache->version ?? '',
+				'mokosuite_version'  => $pkgCache->version ?? '',
 				'joomla_version'    => (new Version())->getShortVersion(),
 				'php_version'       => PHP_VERSION,
 				'db_type'           => $db->getServerType(),
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -16,7 +16,7 @@ use Joomla\CMS\MVC\Controller\BaseController;
 /**
 * Extensions list API controller.
 *
- * GET /api/index.php/v1/mokosuiteclient/extensions
+ * GET /api/index.php/v1/mokosuite/extensions
 *
 * Returns all installed extensions with type, element, folder, version,
 * enabled/protected/locked status, and update server info.
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -19,9 +19,9 @@ use Joomla\Registry\Registry;
 /**
 * Health check API controller.
 *
- * GET /api/index.php/v1/mokosuiteclient/health
+ * GET /api/index.php/v1/mokosuite/health
 *
- * Returns full health diagnostics from the MokoSuiteClient system plugin.
+ * Returns full health diagnostics from the MokoSuite system plugin.
 * Requires a Joomla API token with core.manage permissions.
 *
 * @since  1.0.0
@@ -46,11 +46,11 @@ class HealthController extends BaseController
 			return;
 		}

-		$plugin = PluginHelper::getPlugin('system', 'mokosuiteclient');
+		$plugin = PluginHelper::getPlugin('system', 'mokosuite');

 		if (!$plugin)
 		{
-			$this->sendJson(503, ['error' => 'MokoSuiteClient system plugin not enabled']);
+			$this->sendJson(503, ['error' => 'MokoSuite system plugin not enabled']);
 			return;
 		}

@@ -74,7 +74,7 @@ class HealthController extends BaseController
 				'caching'        => (bool) $config->get('caching', 0),
 			],
 			'plugin'    => [
-				'brand'   => $params->get('brand_name', 'MokoSuiteClient'),
+				'brand'   => $params->get('brand_name', 'MokoSuite'),
 				'company' => $params->get('company_name', 'Moko Consulting'),
 			],
 		];
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -17,7 +17,7 @@ use Joomla\CMS\MVC\Controller\BaseController;
 /**
 * Extension install-from-URL API controller.
 *
- * POST /api/index.php/v1/mokosuiteclient/install
+ * POST /api/index.php/v1/mokosuite/install
 * Body: {"url": "https://example.com/path/to/extension.zip"}
 *
 * Downloads a ZIP from the given URL and installs it via Joomla's Installer.
@@ -115,7 +115,7 @@ class InstallController extends BaseController
 	{
 		$config  = Factory::getConfig();
 		$tmpPath = $config->get('tmp_path', JPATH_ROOT . '/tmp');
-		$zipFile = $tmpPath . '/mokosuiteclient_install_' . bin2hex(random_bytes(8)) . '.zip';
+		$zipFile = $tmpPath . '/mokosuite_install_' . bin2hex(random_bytes(8)) . '.zip';

 		// Download
 		$this->downloadFile($url, $zipFile);
@@ -123,7 +123,7 @@ class InstallController extends BaseController
 		try
 		{
 			// Extract
-			$extractDir = $tmpPath . '/mokosuiteclient_extract_' . bin2hex(random_bytes(8));
+			$extractDir = $tmpPath . '/mokosuite_extract_' . bin2hex(random_bytes(8));

 			if (!mkdir($extractDir, 0755, true))
 			{
@@ -207,7 +207,7 @@ class InstallController extends BaseController
 			CURLOPT_TIMEOUT        => 120,
 			CURLOPT_CONNECTTIMEOUT => 15,
 			CURLOPT_FAILONERROR    => true,
-			CURLOPT_USERAGENT      => 'MokoSuiteClient-Installer/1.0',
+			CURLOPT_USERAGENT      => 'MokoSuite-Installer/1.0',
 		]);

 		$success = curl_exec($ch);
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -16,15 +16,15 @@ use Joomla\CMS\MVC\Controller\BaseController;
 /**
 * Feature plugins API controller.
 *
- * GET  /api/index.php/v1/mokosuiteclient/plugins       — list MokoSuiteClient plugins + status
- * POST /api/index.php/v1/mokosuiteclient/plugins/toggle — enable/disable a feature plugin
+ * GET  /api/index.php/v1/mokosuite/plugins       — list MokoSuite plugins + status
+ * POST /api/index.php/v1/mokosuite/plugins/toggle — enable/disable a feature plugin
 *
 * @since  02.32.00
 */
 class PluginsController extends BaseController
 {
 	/**
-	 * List all MokoSuiteClient feature plugins with their enabled state.
+	 * List all MokoSuite feature plugins with their enabled state.
 	 *
 	 * @return  void
 	 */
@@ -57,14 +57,14 @@ class PluginsController extends BaseController
 				'(' .
 					'(' . $db->quoteName('type') . ' = ' . $db->quote('plugin')
 						. ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('system')
-						. ' AND (' . $db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient')
-						. ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuiteclient\\_%') . '))'
+						. ' AND (' . $db->quoteName('element') . ' = ' . $db->quote('mokosuite')
+						. ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuite\\_%') . '))'
 					. ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('plugin')
 						. ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('webservices')
-						. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient') . ')'
+						. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('mokosuite') . ')'
 					. ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('plugin')
 						. ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('task')
-						. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuiteclient%') . ')'
+						. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokosuite%') . ')'
 				. ')',
 			])
 			->order($db->quoteName('folder') . ' ASC, ' . $db->quoteName('element') . ' ASC');
@@ -98,7 +98,7 @@ class PluginsController extends BaseController
 	}

 	/**
-	 * Toggle a MokoSuiteClient feature plugin on or off.
+	 * Toggle a MokoSuite feature plugin on or off.
 	 *
 	 * Expects JSON body: {"extension_id": 123, "enabled": true}
 	 *
@@ -130,7 +130,7 @@ class PluginsController extends BaseController

 		$db = Factory::getDbo();

-		// Verify the extension exists and is a MokoSuiteClient plugin
+		// Verify the extension exists and is a MokoSuite plugin
 		$query = $db->getQuery(true)
 			->select([$db->quoteName('element'), $db->quoteName('protected')])
 			->from($db->quoteName('#__extensions'))
@@ -147,7 +147,7 @@ class PluginsController extends BaseController
 		}

 		// Don't allow disabling protected/core plugins
-		if (!$enabled && ((int) $ext->protected || $ext->element === 'mokosuiteclient'))
+		if (!$enabled && ((int) $ext->protected || $ext->element === 'mokosuite'))
 		{
 			$this->sendJson(409, ['error' => 'This plugin is protected and cannot be disabled']);

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -16,7 +16,7 @@ use Joomla\CMS\MVC\Controller\BaseController;
 /**
 * Provision reset API controller.
 *
- * POST /api/index.php/v1/mokosuiteclient/provision-reset
+ * POST /api/index.php/v1/mokosuite/provision-reset
 *
 * Resets a site for new client provisioning: clears hits, versions,
 * download keys, and flags the site for fresh client info collection.
@@ -36,7 +36,7 @@ class ProvisionController extends BaseController
 		$app  = Factory::getApplication();
 		$user = $app->getIdentity();

-		if (!$user->authorise('core.manage', 'com_mokosuiteclient'))
+		if (!$user->authorise('core.manage', 'com_mokosuite'))
 		{
 			$this->sendJson(403, ['error' => 'Not authorized']);

@@ -91,7 +91,7 @@ class ProvisionController extends BaseController
 			{
 				$newToken = bin2hex(random_bytes(32));

-				$plugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokosuiteclient');
+				$plugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokosuite');

 				if ($plugin)
 				{
@@ -102,7 +102,7 @@ class ProvisionController extends BaseController
 						$db->getQuery(true)
 							->update($db->quoteName('#__extensions'))
 							->set($db->quoteName('params') . ' = ' . $db->quote($pluginParams->toString()))
-							->where($db->quoteName('element') . ' = ' . $db->quote('mokosuiteclient'))
+							->where($db->quoteName('element') . ' = ' . $db->quote('mokosuite'))
 							->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 							->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
 					)->execute();
@@ -156,7 +156,7 @@ class ProvisionController extends BaseController
 		try
 		{
 			// Write a flag file that the core plugin checks on next admin load
-			$flagFile = JPATH_ADMINISTRATOR . '/cache/mokosuiteclient_setup_required.flag';
+			$flagFile = JPATH_ADMINISTRATOR . '/cache/mokosuite_setup_required.flag';
 			file_put_contents($flagFile, json_encode([
 				'created'  => gmdate('Y-m-d\TH:i:s\Z'),
 				'reason'   => 'provision-reset',
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -19,8 +19,8 @@ use Joomla\Registry\Registry;
 /**
 * Remote login API controller.
 *
- * POST /api/index.php/v1/mokosuiteclient/remote-login
- * Body: {"token": "health_api_token", "user": "requesting_username", "origin": "MokoSuiteClientHQ"}
+ * POST /api/index.php/v1/mokosuite/remote-login
+ * Body: {"token": "health_api_token", "user": "requesting_username", "origin": "MokoSuiteHQ"}
 *
 * Validates the health API token, generates a one-time login token
 * for the master user, and returns a URL that auto-authenticates.
@@ -55,11 +55,11 @@ class RemoteLoginController extends BaseController
 		}

 		// Validate against the core plugin's health_api_token
-		$plugin = PluginHelper::getPlugin('system', 'mokosuiteclient');
+		$plugin = PluginHelper::getPlugin('system', 'mokosuite');

 		if (!$plugin)
 		{
-			$this->sendJson(503, ['error' => 'MokoSuiteClient core plugin not found']);
+			$this->sendJson(503, ['error' => 'MokoSuite core plugin not found']);

 			return;
 		}
@@ -110,7 +110,7 @@ class RemoteLoginController extends BaseController
 		$expires  = time() + self::OTL_TTL;

 		// Store in a temp file (avoids DB schema changes)
-		$otlFile = JPATH_ADMINISTRATOR . '/cache/mokosuiteclient_otl_' . md5($otlToken) . '.json';
+		$otlFile = JPATH_ADMINISTRATOR . '/cache/mokosuite_otl_' . md5($otlToken) . '.json';
 		file_put_contents($otlFile, json_encode([
 			'token'    => $otlToken,
 			'user_id'  => (int) $user->id,
@@ -120,7 +120,7 @@ class RemoteLoginController extends BaseController
 		]));

 		// Build login URL
-		$loginUrl = rtrim(Uri::root(), '/') . '/administrator/index.php?mokosuiteclient_otl=' . $otlToken;
+		$loginUrl = rtrim(Uri::root(), '/') . '/administrator/index.php?mokosuite_otl=' . $otlToken;

 		$this->sendJson(200, [
 			'status'    => 'ok',
@@ -139,16 +139,16 @@ class RemoteLoginController extends BaseController
 	 */
 	private function getMasterUsernames(Registry $params): array
 	{
-		// Use MokoSuiteClientHelper if available
-		$helperFile = JPATH_PLUGINS . '/system/mokosuiteclient/Helper/MokoSuiteClientHelper.php';
+		// Use MokoSuiteHelper if available
+		$helperFile = JPATH_PLUGINS . '/system/mokosuite/Helper/MokoSuiteHelper.php';

 		if (file_exists($helperFile))
 		{
 			require_once $helperFile;

-			if (method_exists(\Moko\Plugin\System\MokoSuiteClient\Helper\MokoSuiteClientHelper::class, 'getMasterUsernames'))
+			if (method_exists(\Moko\Plugin\System\MokoSuite\Helper\MokoSuiteHelper::class, 'getMasterUsernames'))
 			{
-				return \Moko\Plugin\System\MokoSuiteClient\Helper\MokoSuiteClientHelper::getMasterUsernames();
+				return \Moko\Plugin\System\MokoSuite\Helper\MokoSuiteHelper::getMasterUsernames();
 			}
 		}

@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -18,7 +18,7 @@ use Joomla\Registry\Registry;
 /**
 * Demo site reset API controller.
 *
- * POST /api/index.php/v1/mokosuiteclient/reset
+ * POST /api/index.php/v1/mokosuite/reset
 * Body: {"baseline": "default"}
 *
 * Restores the site to a named baseline snapshot.
@@ -53,11 +53,11 @@ class ResetController extends BaseController
 			return;
 		}

-		$plugin = PluginHelper::getPlugin('system', 'mokosuiteclient');
+		$plugin = PluginHelper::getPlugin('system', 'mokosuite');

 		if (!$plugin)
 		{
-			$this->sendJson(503, ['error' => 'MokoSuiteClient system plugin not enabled']);
+			$this->sendJson(503, ['error' => 'MokoSuite system plugin not enabled']);
 			return;
 		}

@@ -84,13 +84,13 @@ class ResetController extends BaseController
 	 *
 	 * @param   Registry  $params  Plugin parameters
 	 *
-	 * @return  \Moko\Plugin\System\MokoSuiteClient\Service\DemoResetService
+	 * @return  \Moko\Plugin\System\MokoSuite\Service\DemoResetService
 	 *
 	 * @since   02.21.00
 	 */
 	private function createService(Registry $params)
 	{
-		$serviceFile = JPATH_PLUGINS . '/task/mokosuiteclientdemo/src/Service/DemoResetService.php';
+		$serviceFile = JPATH_PLUGINS . '/task/mokosuitedemo/src/Service/DemoResetService.php';

 		if (!file_exists($serviceFile))
 		{
@@ -101,7 +101,7 @@ class ResetController extends BaseController

 		$media = (bool) $params->get('demo_snapshot_include_media', 1);

-		return new \Moko\Plugin\Task\MokoSuiteClientDemo\Service\DemoResetService($media);
+		return new \Moko\Plugin\Task\MokoSuiteDemo\Service\DemoResetService($media);
 	}

 	/**
@@ -1,12 +1,12 @@
 <?php
 /**
- * @package     MokoSuiteClient
- * @subpackage  com_mokosuiteclient
+ * @package     MokoSuite
+ * @subpackage  com_mokosuite
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */

-namespace Moko\Component\MokoSuiteClient\Api\Controller;
+namespace Moko\Component\MokoSuite\Api\Controller;

 defined('_JEXEC') or die;

@@ -18,8 +18,8 @@ use Joomla\Registry\Registry;
 /**
 * Snapshot management API controller.
 *
- * GET  /api/index.php/v1/mokosuiteclient/snapshot  — list snapshots
- * POST /api/index.php/v1/mokosuiteclient/snapshot  — create snapshot
+ * GET  /api/index.php/v1/mokosuite/snapshot  — list snapshots
+ * POST /api/index.php/v1/mokosuite/snapshot  — create snapshot
 *
 * @since  02.21.00
 */
@@ -88,7 +88,7 @@ class SnapshotController extends BaseController

 		try
 		{
-			$plugin = PluginHelper::getPlugin('system', 'mokosuiteclient');
+			$plugin = PluginHelper::getPlugin('system', 'mokosuite');
 			$params = $plugin ? new Registry($plugin->params) : new Registry;

 			$body = json_decode($app->input->json->getRaw(), true);
@@ -112,13 +112,13 @@ class SnapshotController extends BaseController
 	/**
 	 * Create DemoResetService from plugin params.
 	 *
-	 * @return  \Moko\Plugin\System\MokoSuiteClient\Service\DemoResetService
+	 * @return  \Moko\Plugin\System\MokoSuite\Service\DemoResetService
 	 *
 	 * @since   02.21.00
 	 */
 	private function createService()
 	{
-		$serviceFile = JPATH_PLUGINS . '/task/mokosuiteclientdemo/src/Service/DemoResetService.php';
+		$serviceFile = JPATH_PLUGINS . '/task/mokosuitedemo/src/Service/DemoResetService.php';

 		if (!file_exists($serviceFile))
 		{
@@ -127,12 +127,12 @@ class SnapshotController extends BaseController

 		require_once $serviceFile;

-		$plugin = PluginHelper::getPlugin('system', 'mokosuiteclient');
+		$plugin = PluginHelper::getPlugin('system', 'mokosuite');
 		$params = $plugin ? new Registry($plugin->params) : new Registry;

 		$media = (bool) $params->get('demo_snapshot_include_media', 1);

-		return new \Moko\Plugin\Task\MokoSuiteClientDemo\Service\DemoResetService($media);
+		return new \Moko\Plugin\Task\MokoSuiteDemo\Service\DemoResetService($media);
 	}

 	/**
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<html><body bgcolor="#FFFFFF"></body></html>`