diff --git a/source/packages/com_mokosuiteclient/admin/src/View/Ticketsettings/HtmlView.php b/source/packages/com_mokosuiteclient/admin/src/View/Ticketsettings/HtmlView.php
index 5091a049..daac6e96 100644
--- a/source/packages/com_mokosuiteclient/admin/src/View/Ticketsettings/HtmlView.php
+++ b/source/packages/com_mokosuiteclient/admin/src/View/Ticketsettings/HtmlView.php
@@ -35,7 +35,7 @@ class HtmlView extends BaseHtmlView
 
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOSUITE_TICKET_SETTINGS'), 'cog');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITECLIENT_TICKET_SETTINGS'), 'cog');
 		ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuiteclient&view=tickets');
 	}
 }
diff --git a/source/packages/mod_mokosuiteclient_cache/mod_mokosuiteclient_cache.xml b/source/packages/mod_mokosuiteclient_cache/mod_mokosuiteclient_cache.xml
index 7aa1f3da..aaea17d6 100644
--- a/source/packages/mod_mokosuiteclient_cache/mod_mokosuiteclient_cache.xml
+++ b/source/packages/mod_mokosuiteclient_cache/mod_mokosuiteclient_cache.xml
@@ -8,7 +8,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>MOD_MOKOSUITE_CACHE_DESC</description>
+	<description>MOD_MOKOSUITECLIENT_CACHE_DESC</description>
 	<namespace path="src">Moko\Module\MokoSuiteCache</namespace>
 
 	<files>
diff --git a/source/packages/mod_mokosuiteclient_cpanel/mod_mokosuiteclient_cpanel.xml b/source/packages/mod_mokosuiteclient_cpanel/mod_mokosuiteclient_cpanel.xml
index 5a0df82f..9e41408a 100644
--- a/source/packages/mod_mokosuiteclient_cpanel/mod_mokosuiteclient_cpanel.xml
+++ b/source/packages/mod_mokosuiteclient_cpanel/mod_mokosuiteclient_cpanel.xml
@@ -8,7 +8,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>MOD_MOKOSUITE_CPANEL_DESC</description>
+	<description>MOD_MOKOSUITECLIENT_CPANEL_DESC</description>
 	<namespace path="src">Moko\Module\MokoSuiteCpanel</namespace>
 
 	<files>
@@ -25,64 +25,64 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic"
-				label="MOD_MOKOSUITE_CPANEL_FIELDSET_DISPLAY"
-				description="MOD_MOKOSUITE_CPANEL_FIELDSET_DISPLAY_DESC">
+				label="MOD_MOKOSUITECLIENT_CPANEL_FIELDSET_DISPLAY"
+				description="MOD_MOKOSUITECLIENT_CPANEL_FIELDSET_DISPLAY_DESC">
 
 				<field name="collapsed" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_COLLAPSED_LABEL"
-					description="MOD_MOKOSUITE_CPANEL_COLLAPSED_DESC"
+					label="MOD_MOKOSUITECLIENT_CPANEL_COLLAPSED_LABEL"
+					description="MOD_MOKOSUITECLIENT_CPANEL_COLLAPSED_DESC"
 					layout="joomla.form.field.radio.switcher">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="show_health" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_HEALTH_LABEL"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_HEALTH_LABEL"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
 
 				<field name="show_stats" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_STATS_LABEL"
-					description="MOD_MOKOSUITE_CPANEL_SHOW_STATS_DESC"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_STATS_LABEL"
+					description="MOD_MOKOSUITECLIENT_CPANEL_SHOW_STATS_DESC"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
 
 				<field name="show_disk" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_DISK_LABEL"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_DISK_LABEL"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
 
 				<field name="show_ip" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_IP_LABEL"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_IP_LABEL"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
 
 				<field name="show_plugins" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_PLUGINS_LABEL"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_PLUGINS_LABEL"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
 
 				<field name="show_actions" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_ACTIONS_LABEL"
-					description="MOD_MOKOSUITE_CPANEL_SHOW_ACTIONS_DESC"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_ACTIONS_LABEL"
+					description="MOD_MOKOSUITECLIENT_CPANEL_SHOW_ACTIONS_DESC"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
 				</field>
 
 				<field name="show_versions" type="radio" default="1"
-					label="MOD_MOKOSUITE_CPANEL_SHOW_VERSIONS_LABEL"
-					description="MOD_MOKOSUITE_CPANEL_SHOW_VERSIONS_DESC"
+					label="MOD_MOKOSUITECLIENT_CPANEL_SHOW_VERSIONS_LABEL"
+					description="MOD_MOKOSUITECLIENT_CPANEL_SHOW_VERSIONS_DESC"
 					layout="joomla.form.field.radio.switcher">
 					<option value="0">JHIDE</option>
 					<option value="1">JSHOW</option>
diff --git a/source/packages/plg_system_mokosuiteclient/mokosuiteclient.xml b/source/packages/plg_system_mokosuiteclient/mokosuiteclient.xml
index 092f4fa1..c197eb67 100644
--- a/source/packages/plg_system_mokosuiteclient/mokosuiteclient.xml
+++ b/source/packages/plg_system_mokosuiteclient/mokosuiteclient.xml
@@ -68,13 +68,13 @@
 			addfieldprefix="Moko\Plugin\System\MokoSuiteClient\Field"
 			>
 			<fieldset name="basic"
-				label="PLG_SYSTEM_MOKOSUITE_FIELDSET_CORE_LABEL"
-				description="PLG_SYSTEM_MOKOSUITE_FIELDSET_CORE_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIELDSET_CORE_LABEL"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIELDSET_CORE_DESC">
 				<field
 					name="health_api_token"
 					type="CopyableToken"
-					label="PLG_SYSTEM_MOKOSUITE_HEALTH_TOKEN_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_HEALTH_TOKEN_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_HEALTH_TOKEN_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_HEALTH_TOKEN_DESC"
 					default=""
 					filter="raw"
 					readonly="true"
diff --git a/source/packages/plg_system_mokosuiteclient/script.php b/source/packages/plg_system_mokosuiteclient/script.php
index 31c1a13c..5f750f90 100644
--- a/source/packages/plg_system_mokosuiteclient/script.php
+++ b/source/packages/plg_system_mokosuiteclient/script.php
@@ -767,7 +767,7 @@ class plgSystemMokoSuiteClientInstallerScript implements InstallerScriptInterfac
 				'id_holder'           => '',
 				'title_holder'        => '',
 				'table_name'          => '',
-				'text_prefix'         => 'PLG_SYSTEM_MOKOSUITE',
+				'text_prefix'         => 'PLG_SYSTEM_MOKOSUITECLIENT',
 			];
 
 			$db->insertObject('#__action_log_config', $config);
diff --git a/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.ini b/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.ini
index fe0157dc..f13014d4 100644
--- a/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.ini
+++ b/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.ini
@@ -3,27 +3,27 @@
 ; License: GPL-3.0-or-later
 ; IP Geolocation by DB-IP — https://db-ip.com
 
-PLG_SYSTEM_MOKOSUITE_DBIP="System - MokoSuiteClient DB-IP"
-PLG_SYSTEM_MOKOSUITE_DBIP_DESC="IP geolocation for MokoSuiteClient using DB-IP Lite databases. Ships with country-level data; city-level data is downloaded from CDN or loaded from a local file."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP="System - MokoSuiteClient DB-IP"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DESC="IP geolocation for MokoSuiteClient using DB-IP Lite databases. Ships with country-level data; city-level data is downloaded from CDN or loaded from a local file."
 
-PLG_SYSTEM_MOKOSUITE_DBIP_FIELDSET_BASIC="DB-IP Settings"
-PLG_SYSTEM_MOKOSUITE_DBIP_FIELDSET_BASIC_DESC="Configure IP geolocation database source and level."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_FIELDSET_BASIC="DB-IP Settings"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_FIELDSET_BASIC_DESC="Configure IP geolocation database source and level."
 
-PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_LABEL="Database Source"
-PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_DESC="CDN downloads the city database automatically from the configured URL. Local uses a MMDB file you provide on the server."
-PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_CDN="CDN (auto-download)"
-PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_LOCAL="Local file"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_LABEL="Database Source"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_DESC="CDN downloads the city database automatically from the configured URL. Local uses a MMDB file you provide on the server."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_CDN="CDN (auto-download)"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_LOCAL="Local file"
 
-PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_LEVEL_LABEL="Database Level"
-PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_LEVEL_DESC="Country is bundled (~8 MB). City provides region, city, and coordinates but requires a separate download (~125 MB)."
-PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_COUNTRY="Country (bundled)"
-PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_CITY="City (remote download)"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_LEVEL_LABEL="Database Level"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_LEVEL_DESC="Country is bundled (~8 MB). City provides region, city, and coordinates but requires a separate download (~125 MB)."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_COUNTRY="Country (bundled)"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_CITY="City (remote download)"
 
-PLG_SYSTEM_MOKOSUITE_DBIP_AUTO_UPDATE_LABEL="Auto-Update Database"
-PLG_SYSTEM_MOKOSUITE_DBIP_AUTO_UPDATE_DESC="Automatically download the latest city database monthly when an admin visits the backend."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_AUTO_UPDATE_LABEL="Auto-Update Database"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_AUTO_UPDATE_DESC="Automatically download the latest city database monthly when an admin visits the backend."
 
-PLG_SYSTEM_MOKOSUITE_DBIP_CDN_URL_LABEL="CDN Download URL"
-PLG_SYSTEM_MOKOSUITE_DBIP_CDN_URL_DESC="URL to download the city-level MMDB file. Default points to the MokoConsulting geoip-data repository."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_CDN_URL_LABEL="CDN Download URL"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_CDN_URL_DESC="URL to download the city-level MMDB file. Default points to the MokoConsulting geoip-data repository."
 
-PLG_SYSTEM_MOKOSUITE_DBIP_LOCAL_PATH_LABEL="Local MMDB Path"
-PLG_SYSTEM_MOKOSUITE_DBIP_LOCAL_PATH_DESC="Absolute path to a DB-IP MMDB file on the server (e.g. /home/user/dbip-city-lite.mmdb)."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_LOCAL_PATH_LABEL="Local MMDB Path"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_LOCAL_PATH_DESC="Absolute path to a DB-IP MMDB file on the server (e.g. /home/user/dbip-city-lite.mmdb)."
diff --git a/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.sys.ini b/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.sys.ini
index fee3b1d8..8e2f8ac5 100644
--- a/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.sys.ini
+++ b/source/packages/plg_system_mokosuiteclient_dbip/language/en-GB/plg_system_mokosuiteclient_dbip.sys.ini
@@ -2,5 +2,5 @@
 ; Copyright (C) 2026 Moko Consulting. All rights reserved.
 ; License: GPL-3.0-or-later
 
-PLG_SYSTEM_MOKOSUITE_DBIP="System - MokoSuiteClient DB-IP"
-PLG_SYSTEM_MOKOSUITE_DBIP_DESC="IP geolocation for MokoSuiteClient using DB-IP Lite databases."
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP="System - MokoSuiteClient DB-IP"
+PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DESC="IP geolocation for MokoSuiteClient using DB-IP Lite databases."
diff --git a/source/packages/plg_system_mokosuiteclient_dbip/mokosuiteclient_dbip.xml b/source/packages/plg_system_mokosuiteclient_dbip/mokosuiteclient_dbip.xml
index 967dd039..30f90045 100644
--- a/source/packages/plg_system_mokosuiteclient_dbip/mokosuiteclient_dbip.xml
+++ b/source/packages/plg_system_mokosuiteclient_dbip/mokosuiteclient_dbip.xml
@@ -9,7 +9,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_SYSTEM_MOKOSUITE_DBIP_DESC</description>
+	<description>PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoSuiteClientDBIP</namespace>
 
 	<files>
@@ -28,26 +28,26 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic"
-				label="PLG_SYSTEM_MOKOSUITE_DBIP_FIELDSET_BASIC"
-				description="PLG_SYSTEM_MOKOSUITE_DBIP_FIELDSET_BASIC_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_FIELDSET_BASIC"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_FIELDSET_BASIC_DESC">
 
 				<field name="database_source" type="list" default="cdn"
-					label="PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_DESC">
-					<option value="cdn">PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_CDN</option>
-					<option value="local">PLG_SYSTEM_MOKOSUITE_DBIP_SOURCE_LOCAL</option>
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_DESC">
+					<option value="cdn">PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_CDN</option>
+					<option value="local">PLG_SYSTEM_MOKOSUITECLIENT_DBIP_SOURCE_LOCAL</option>
 				</field>
 
 				<field name="database_level" type="list" default="country"
-					label="PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_LEVEL_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_LEVEL_DESC">
-					<option value="country">PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_COUNTRY</option>
-					<option value="city">PLG_SYSTEM_MOKOSUITE_DBIP_DATABASE_CITY</option>
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_LEVEL_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_LEVEL_DESC">
+					<option value="country">PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_COUNTRY</option>
+					<option value="city">PLG_SYSTEM_MOKOSUITECLIENT_DBIP_DATABASE_CITY</option>
 				</field>
 
 				<field name="auto_update" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_DBIP_AUTO_UPDATE_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DBIP_AUTO_UPDATE_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_AUTO_UPDATE_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_AUTO_UPDATE_DESC"
 					class="btn-group btn-group-yesno"
 					showon="database_source:cdn">
 					<option value="1">JYES</option>
@@ -56,15 +56,15 @@
 
 				<field name="cdn_url" type="url"
 					default="https://git.mokoconsulting.tech/MokoConsulting/geoip-data/releases/download/latest/dbip-city-lite.mmdb"
-					label="PLG_SYSTEM_MOKOSUITE_DBIP_CDN_URL_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DBIP_CDN_URL_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_CDN_URL_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_CDN_URL_DESC"
 					filter="url"
 					showon="database_source:cdn" />
 
 				<field name="local_path" type="text"
 					default=""
-					label="PLG_SYSTEM_MOKOSUITE_DBIP_LOCAL_PATH_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DBIP_LOCAL_PATH_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_LOCAL_PATH_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DBIP_LOCAL_PATH_DESC"
 					filter="path"
 					showon="database_source:local" />
 
diff --git a/source/packages/plg_system_mokosuiteclient_devtools/mokosuiteclient_devtools.xml b/source/packages/plg_system_mokosuiteclient_devtools/mokosuiteclient_devtools.xml
index 834ca223..a9560094 100644
--- a/source/packages/plg_system_mokosuiteclient_devtools/mokosuiteclient_devtools.xml
+++ b/source/packages/plg_system_mokosuiteclient_devtools/mokosuiteclient_devtools.xml
@@ -9,7 +9,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_SYSTEM_MOKOSUITE_DEVTOOLS_DESC</description>
+	<description>PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoSuiteClientDevTools</namespace>
 
 	<files>
@@ -26,36 +26,36 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic"
-				label="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_FIELDSET_BASIC"
-				description="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_FIELDSET_BASIC_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_FIELDSET_BASIC"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_FIELDSET_BASIC_DESC">
 
 				<field name="dev_mode" type="radio" default="0"
-					label="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_DEV_MODE_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_DEV_MODE_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_DEV_MODE_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_DEV_MODE_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="reset_hits" type="radio" default="0"
-					label="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_RESET_HITS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_RESET_HITS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_RESET_HITS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_RESET_HITS_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="delete_versions" type="radio" default="0"
-					label="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_DELETE_VERSIONS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_DELETE_VERSIONS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_DELETE_VERSIONS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_DELETE_VERSIONS_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="reset_download_keys" type="radio" default="0"
-					label="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_RESET_DLKEYS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_DEVTOOLS_RESET_DLKEYS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_RESET_DLKEYS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_DEVTOOLS_RESET_DLKEYS_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
diff --git a/source/packages/plg_system_mokosuiteclient_firewall/mokosuiteclient_firewall.xml b/source/packages/plg_system_mokosuiteclient_firewall/mokosuiteclient_firewall.xml
index 5335a502..1b07d1ad 100644
--- a/source/packages/plg_system_mokosuiteclient_firewall/mokosuiteclient_firewall.xml
+++ b/source/packages/plg_system_mokosuiteclient_firewall/mokosuiteclient_firewall.xml
@@ -9,7 +9,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_SYSTEM_MOKOSUITE_FIREWALL_DESC</description>
+	<description>PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoSuiteClientFirewall</namespace>
 
 	<files>
@@ -36,25 +36,25 @@
 		<fields name="params">
 			<!-- Network & Session -->
 			<fieldset name="basic"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_BASIC"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_BASIC_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_BASIC"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_BASIC_DESC">
 
 				<field name="force_https" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FORCE_HTTPS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FORCE_HTTPS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FORCE_HTTPS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FORCE_HTTPS_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="admin_session_timeout" type="number"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_SESSION_TIMEOUT_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_SESSION_TIMEOUT_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_SESSION_TIMEOUT_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_SESSION_TIMEOUT_DESC"
 					default="60" hint="Minutes (0 = Joomla default)" />
 
 				<field name="trusted_ips" type="subform"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_TRUSTED_IPS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_TRUSTED_IPS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_TRUSTED_IPS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_TRUSTED_IPS_DESC"
 					formsource="plugins/system/mokosuiteclient_firewall/forms/trusted_ip_entry.xml"
 					multiple="true"
 					layout="joomla.form.field.subform.repeatable-table"
@@ -64,20 +64,20 @@
 
 			<!-- WAF Shields -->
 			<fieldset name="waf"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_WAF"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_WAF_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_WAF"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_WAF_DESC">
 
 				<field name="waf_enabled" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_ENABLED_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_ENABLED_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_ENABLED_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_ENABLED_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="waf_sqli" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_SQLI_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_SQLI_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_SQLI_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_SQLI_DESC"
 					class="btn-group btn-group-yesno"
 					showon="waf_enabled:1">
 					<option value="1">JYES</option>
@@ -85,8 +85,8 @@
 				</field>
 
 				<field name="waf_xss" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_XSS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_XSS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_XSS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_XSS_DESC"
 					class="btn-group btn-group-yesno"
 					showon="waf_enabled:1">
 					<option value="1">JYES</option>
@@ -94,8 +94,8 @@
 				</field>
 
 				<field name="waf_mua" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_MUA_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_MUA_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_MUA_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_MUA_DESC"
 					class="btn-group btn-group-yesno"
 					showon="waf_enabled:1">
 					<option value="1">JYES</option>
@@ -103,15 +103,15 @@
 				</field>
 
 				<field name="waf_mua_blocklist" type="textarea"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_MUA_LIST_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_MUA_LIST_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_MUA_LIST_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_MUA_LIST_DESC"
 					rows="4" filter="raw"
 					default="sqlmap,nikto,nmap,havij,w3af,acunetix,nessus,openvas,masscan,gobuster,dirbuster,wpscan,joomscan"
 					showon="waf_enabled:1[AND]waf_mua:1" />
 
 				<field name="waf_rfi" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_RFI_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_RFI_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_RFI_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_RFI_DESC"
 					class="btn-group btn-group-yesno"
 					showon="waf_enabled:1">
 					<option value="1">JYES</option>
@@ -119,8 +119,8 @@
 				</field>
 
 				<field name="waf_dfi" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_DFI_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_WAF_DFI_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_DFI_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_WAF_DFI_DESC"
 					class="btn-group btn-group-yesno"
 					showon="waf_enabled:1">
 					<option value="1">JYES</option>
@@ -130,8 +130,8 @@
 
 			<!-- Security Headers -->
 			<fieldset name="headers"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_HEADERS"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_HEADERS_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_HEADERS"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_HEADERS_DESC">
 
 				<field name="header_xframe" type="radio" default="1"
 					label="X-Frame-Options" description="Clickjacking protection (SAMEORIGIN)"
@@ -177,12 +177,12 @@
 
 			<!-- Access Control -->
 			<fieldset name="access_control"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_ACCESS"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_ACCESS_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_ACCESS"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_ACCESS_DESC">
 
 				<field name="ip_blocklist" type="subform"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_IP_BLOCKLIST_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_IP_BLOCKLIST_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_IP_BLOCKLIST_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_IP_BLOCKLIST_DESC"
 					formsource="plugins/system/mokosuiteclient_firewall/forms/trusted_ip_entry.xml"
 					multiple="true"
 					layout="joomla.form.field.subform.repeatable-table"
@@ -190,13 +190,13 @@
 					buttons="add,remove,move" />
 
 				<field name="admin_secret" type="text"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_ADMIN_SECRET_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_ADMIN_SECRET_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_ADMIN_SECRET_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_ADMIN_SECRET_DESC"
 					default="" filter="raw" hint="Leave empty to disable" />
 
 				<field name="admin_secret_redirect" type="text"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_ADMIN_SECRET_REDIRECT_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_ADMIN_SECRET_REDIRECT_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_ADMIN_SECRET_REDIRECT_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_ADMIN_SECRET_REDIRECT_DESC"
 					default="" filter="url" hint="Empty = 403 Forbidden"
 					showon="admin_secret!:" />
 
@@ -211,8 +211,8 @@
 					showon="autoban_threshold!:0" />
 
 				<field name="block_frontend_superuser" type="radio" default="0"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_FE_SU_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_FE_SU_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_FE_SU_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_FE_SU_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
@@ -221,28 +221,28 @@
 
 			<!-- File & Template Protection -->
 			<fieldset name="protection"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_PROTECTION"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_PROTECTION_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_PROTECTION"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_PROTECTION_DESC">
 
 				<field name="block_sensitive_files" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_FILES_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_FILES_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_FILES_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_FILES_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="block_direct_php" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_PHP_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_PHP_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_PHP_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_PHP_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="block_template_switch" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_TMPL_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_BLOCK_TMPL_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_TMPL_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_BLOCK_TMPL_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
@@ -251,29 +251,29 @@
 
 			<!-- Password Policy -->
 			<fieldset name="password_policy"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_PASSWORD"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_PASSWORD_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_PASSWORD"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_PASSWORD_DESC">
 
 				<field name="password_min_length" type="number" default="12"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_PASSWORD_LENGTH_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_PASSWORD_LENGTH_DESC" />
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_PASSWORD_LENGTH_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_PASSWORD_LENGTH_DESC" />
 
 				<field name="password_require_uppercase" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_PASSWORD_UPPER_LABEL"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_PASSWORD_UPPER_LABEL"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="password_require_number" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_PASSWORD_NUMBER_LABEL"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_PASSWORD_NUMBER_LABEL"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="password_require_special" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_PASSWORD_SPECIAL_LABEL"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_PASSWORD_SPECIAL_LABEL"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
@@ -282,17 +282,17 @@
 
 			<!-- Upload Restrictions -->
 			<fieldset name="uploads"
-				label="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_UPLOADS"
-				description="PLG_SYSTEM_MOKOSUITE_FIREWALL_FIELDSET_UPLOADS_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_UPLOADS"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_FIELDSET_UPLOADS_DESC">
 
 				<field name="upload_allowed_types" type="text"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_UPLOAD_TYPES_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_UPLOAD_TYPES_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_UPLOAD_TYPES_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_UPLOAD_TYPES_DESC"
 					default="jpg,jpeg,png,gif,webp,svg,pdf,doc,docx,xls,xlsx" />
 
 				<field name="upload_max_size_mb" type="number"
-					label="PLG_SYSTEM_MOKOSUITE_FIREWALL_UPLOAD_SIZE_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_FIREWALL_UPLOAD_SIZE_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_UPLOAD_SIZE_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_FIREWALL_UPLOAD_SIZE_DESC"
 					default="100" />
 			</fieldset>
 		</fields>
diff --git a/source/packages/plg_system_mokosuiteclient_monitor/mokosuiteclient_monitor.xml b/source/packages/plg_system_mokosuiteclient_monitor/mokosuiteclient_monitor.xml
index 69b1105d..6693e885 100644
--- a/source/packages/plg_system_mokosuiteclient_monitor/mokosuiteclient_monitor.xml
+++ b/source/packages/plg_system_mokosuiteclient_monitor/mokosuiteclient_monitor.xml
@@ -9,7 +9,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_SYSTEM_MOKOSUITE_MONITOR_DESC</description>
+	<description>PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoSuiteClientMonitor</namespace>
 
 	<files>
@@ -26,12 +26,12 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic"
-				label="PLG_SYSTEM_MOKOSUITE_MONITOR_FIELDSET_BASIC"
-				description="PLG_SYSTEM_MOKOSUITE_MONITOR_FIELDSET_BASIC_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_FIELDSET_BASIC"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_FIELDSET_BASIC_DESC">
 
 				<field name="heartbeat_enabled" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_MONITOR_HEARTBEAT_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_MONITOR_HEARTBEAT_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_HEARTBEAT_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_HEARTBEAT_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
@@ -39,8 +39,8 @@
 
 				<field name="base_url" type="url"
 					default="https://waas.dev.mokoconsulting.tech"
-					label="PLG_SYSTEM_MOKOSUITE_MONITOR_BASE_URL_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_MONITOR_BASE_URL_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_BASE_URL_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_MONITOR_BASE_URL_DESC"
 					filter="url" />
 
 				<field name="signing_key" type="hidden"
diff --git a/source/packages/plg_system_mokosuiteclient_offline/mokosuiteclient_offline.xml b/source/packages/plg_system_mokosuiteclient_offline/mokosuiteclient_offline.xml
index 75cdd53e..69c15d2f 100644
--- a/source/packages/plg_system_mokosuiteclient_offline/mokosuiteclient_offline.xml
+++ b/source/packages/plg_system_mokosuiteclient_offline/mokosuiteclient_offline.xml
@@ -9,7 +9,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_SYSTEM_MOKOSUITE_OFFLINE_DESC</description>
+	<description>PLG_SYSTEM_MOKOSUITECLIENT_OFFLINE_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoSuiteClientOffline</namespace>
 
 	<files>
@@ -25,15 +25,15 @@
 
 	<config>
 		<fields name="params" addfieldprefix="Moko\Plugin\System\MokoSuiteClientOffline\Field">
-			<fieldset name="basic" label="PLG_SYSTEM_MOKOSUITE_OFFLINE_FIELDSET_BASIC">
+			<fieldset name="basic" label="PLG_SYSTEM_MOKOSUITECLIENT_OFFLINE_FIELDSET_BASIC">
 				<field name="tos_slug" type="menuslug"
-					label="PLG_SYSTEM_MOKOSUITE_OFFLINE_SLUG_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_OFFLINE_SLUG_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_OFFLINE_SLUG_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_OFFLINE_SLUG_DESC"
 					multiple="true" />
 
 				<field name="include_children" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_OFFLINE_CHILDREN_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_OFFLINE_CHILDREN_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_OFFLINE_CHILDREN_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_OFFLINE_CHILDREN_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
diff --git a/source/packages/plg_system_mokosuiteclient_tenant/mokosuiteclient_tenant.xml b/source/packages/plg_system_mokosuiteclient_tenant/mokosuiteclient_tenant.xml
index 7c097ebf..bcb9322b 100644
--- a/source/packages/plg_system_mokosuiteclient_tenant/mokosuiteclient_tenant.xml
+++ b/source/packages/plg_system_mokosuiteclient_tenant/mokosuiteclient_tenant.xml
@@ -9,7 +9,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_SYSTEM_MOKOSUITE_TENANT_DESC</description>
+	<description>PLG_SYSTEM_MOKOSUITECLIENT_TENANT_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoSuiteClientTenant</namespace>
 
 	<files>
@@ -26,20 +26,20 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic"
-				label="PLG_SYSTEM_MOKOSUITE_TENANT_FIELDSET_BASIC"
-				description="PLG_SYSTEM_MOKOSUITE_TENANT_FIELDSET_BASIC_DESC">
+				label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_FIELDSET_BASIC"
+				description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_FIELDSET_BASIC_DESC">
 
 				<field name="restrict_installer" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_RESTRICT_INSTALLER_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_RESTRICT_INSTALLER_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_RESTRICT_INSTALLER_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_RESTRICT_INSTALLER_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="allow_extension_updates" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_ALLOW_UPDATES_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_ALLOW_UPDATES_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_ALLOW_UPDATES_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_ALLOW_UPDATES_DESC"
 					class="btn-group btn-group-yesno"
 					showon="restrict_installer:1">
 					<option value="1">JYES</option>
@@ -47,40 +47,40 @@
 				</field>
 
 				<field name="hide_sysinfo" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_HIDE_SYSINFO_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_HIDE_SYSINFO_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_HIDE_SYSINFO_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_HIDE_SYSINFO_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="restrict_global_config" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_RESTRICT_CONFIG_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_RESTRICT_CONFIG_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_RESTRICT_CONFIG_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_RESTRICT_CONFIG_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="restrict_template_editing" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_RESTRICT_TEMPLATE_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_RESTRICT_TEMPLATE_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_RESTRICT_TEMPLATE_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_RESTRICT_TEMPLATE_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="disable_install_url" type="radio" default="1"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_DISABLE_INSTALL_URL_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_DISABLE_INSTALL_URL_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_DISABLE_INSTALL_URL_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_DISABLE_INSTALL_URL_DESC"
 					class="btn-group btn-group-yesno">
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
 
 				<field name="hidden_menu_items" type="textarea"
-					label="PLG_SYSTEM_MOKOSUITE_TENANT_HIDDEN_MENUS_LABEL"
-					description="PLG_SYSTEM_MOKOSUITE_TENANT_HIDDEN_MENUS_DESC"
+					label="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_HIDDEN_MENUS_LABEL"
+					description="PLG_SYSTEM_MOKOSUITECLIENT_TENANT_HIDDEN_MENUS_DESC"
 					rows="5" filter="raw" />
 			</fieldset>
 		</fields>
diff --git a/source/packages/plg_task_mokosuiteclient_tickets/src/Extension/TicketAutomation.php b/source/packages/plg_task_mokosuiteclient_tickets/src/Extension/TicketAutomation.php
index 81d7709a..55013bab 100644
--- a/source/packages/plg_task_mokosuiteclient_tickets/src/Extension/TicketAutomation.php
+++ b/source/packages/plg_task_mokosuiteclient_tickets/src/Extension/TicketAutomation.php
@@ -27,15 +27,15 @@ class TicketAutomation extends CMSPlugin implements SubscriberInterface
 
 	protected const TASKS_MAP = [
 		'mokosuiteclient.ticket.automation' => [
-			'langConstPrefix' => 'PLG_TASK_MOKOSUITE_TICKETS_AUTOMATION',
+			'langConstPrefix' => 'PLG_TASK_MOKOSUITECLIENT_TICKETS_AUTOMATION',
 			'method'          => 'runAutomation',
 		],
 		'mokosuiteclient.ticket.imap_poll' => [
-			'langConstPrefix' => 'PLG_TASK_MOKOSUITE_TICKETS_IMAP_POLL',
+			'langConstPrefix' => 'PLG_TASK_MOKOSUITECLIENT_TICKETS_IMAP_POLL',
 			'method'          => 'runImapPoll',
 		],
 		'mokosuiteclient.ticket.autoclose' => [
-			'langConstPrefix' => 'PLG_TASK_MOKOSUITE_TICKETS_AUTOCLOSE',
+			'langConstPrefix' => 'PLG_TASK_MOKOSUITECLIENT_TICKETS_AUTOCLOSE',
 			'method'          => 'runAutoClose',
 		],
 	];
diff --git a/source/packages/plg_task_mokosuiteclientdemo/mokosuiteclientdemo.xml b/source/packages/plg_task_mokosuiteclientdemo/mokosuiteclientdemo.xml
index 6fbc187a..6714d2ad 100644
--- a/source/packages/plg_task_mokosuiteclientdemo/mokosuiteclientdemo.xml
+++ b/source/packages/plg_task_mokosuiteclientdemo/mokosuiteclientdemo.xml
@@ -13,7 +13,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_TASK_MOKOSUITEDEMO_DESC</description>
+	<description>PLG_TASK_MOKOSUITECLIENTDEMO_DESC</description>
 	<namespace path="src">Moko\Plugin\Task\MokoSuiteClientDemo</namespace>
 
 	<files>
diff --git a/source/packages/plg_task_mokosuiteclientsync/mokosuiteclientsync.xml b/source/packages/plg_task_mokosuiteclientsync/mokosuiteclientsync.xml
index 1c9f967c..9a4ff1cb 100644
--- a/source/packages/plg_task_mokosuiteclientsync/mokosuiteclientsync.xml
+++ b/source/packages/plg_task_mokosuiteclientsync/mokosuiteclientsync.xml
@@ -13,7 +13,7 @@
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>02.36.00-rc</version>
-	<description>PLG_TASK_MOKOSUITESYNC_DESC</description>
+	<description>PLG_TASK_MOKOSUITECLIENTSYNC_DESC</description>
 	<namespace path="src">Moko\Plugin\Task\MokoSuiteClientSync</namespace>
 
 	<files>
diff --git a/source/script.php b/source/script.php
index bed2845b..d8ae9f3c 100644
--- a/source/script.php
+++ b/source/script.php
@@ -78,6 +78,7 @@ class Pkg_MokosuiteInstallerScript
 		$this->enablePlugin('system', 'mokosuiteclient_devtools');
 		$this->enablePlugin('system', 'mokosuiteclient_offline');
 		$this->enablePlugin('system', 'mokosuiteclient_dbip');
+		$this->enablePlugin('system', 'mokosuiteclient_monitor');
 		$this->enablePlugin('webservices', 'mokosuiteclient');
 		$this->enablePlugin('task', 'mokosuiteclientdemo');
 		$this->enablePlugin('task', 'mokosuiteclientsync');