diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml
index 14b8ca0..5232679 100644
--- a/.mokogitea/workflows/issue-branch.yml
+++ b/.mokogitea/workflows/issue-branch.yml
@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.02.02
+# VERSION: 01.02.29
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index eeb9fa6..a79509f 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -14,7 +14,7 @@
 	DEFGROUP:
 	INGROUP: Project.Documentation
 	REPO:
-	VERSION: 01.02.02
+	VERSION: 01.02.29
 	PATH: ./CODE_OF_CONDUCT.md
 	BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default
 -->
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 3069030..a024814 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -19,7 +19,7 @@
  DEFGROUP: mokoconsulting-tech.Template-Joomla
  INGROUP: MokoStandards.Governance
  REPO: https://github.com/mokoconsulting-tech/Template-Joomla
- VERSION: 01.02.02
+ VERSION: 01.02.29
  PATH: /GOVERNANCE.md
  BRIEF: Project governance rules, roles, and decision process for Template-Joomla
 -->
diff --git a/SECURITY.md b/SECURITY.md
index fbf611e..a8f6b32 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME]
 INGROUP: [PROJECT_NAME].Documentation
 REPO: [REPOSITORY_URL]
 PATH: /SECURITY.md
-VERSION: 01.02.02
+VERSION: 01.02.29
 BRIEF: Security vulnerability reporting and handling policy
 -->
 
diff --git a/source/packages/com_mokosuitestorelocator/admin/forms/category.xml b/source/packages/com_mokosuitestorelocator/admin/forms/category.xml
index 2453fab..cefd57c 100644
--- a/source/packages/com_mokosuitestorelocator/admin/forms/category.xml
+++ b/source/packages/com_mokosuitestorelocator/admin/forms/category.xml
@@ -26,11 +26,11 @@
 		<field
 			name="parent_id"
 			type="sql"
-			label="COM_MOKOJOOMSTORELOCATOR_CATEGORY_PARENT"
+			label="COM_MOKOSUITESTORELOCATOR_CATEGORY_PARENT"
 			default="0"
 			query="SELECT id AS value, title AS text FROM #__mokosuitestorelocator_categories WHERE published = 1 ORDER BY ordering"
 		>
-			<option value="0">COM_MOKOJOOMSTORELOCATOR_CATEGORY_NO_PARENT</option>
+			<option value="0">COM_MOKOSUITESTORELOCATOR_CATEGORY_NO_PARENT</option>
 		</field>
 
 		<field
@@ -52,18 +52,18 @@
 		</field>
 	</fieldset>
 
-	<fieldset name="appearance" label="COM_MOKOJOOMSTORELOCATOR_FIELDSET_APPEARANCE">
+	<fieldset name="appearance" label="COM_MOKOSUITESTORELOCATOR_FIELDSET_APPEARANCE">
 		<field
 			name="color"
 			type="color"
-			label="COM_MOKOJOOMSTORELOCATOR_CATEGORY_COLOR"
+			label="COM_MOKOSUITESTORELOCATOR_CATEGORY_COLOR"
 			default=""
 		/>
 
 		<field
 			name="marker_icon"
 			type="media"
-			label="COM_MOKOJOOMSTORELOCATOR_CATEGORY_MARKER_ICON"
+			label="COM_MOKOSUITESTORELOCATOR_CATEGORY_MARKER_ICON"
 		/>
 	</fieldset>
 </form>
diff --git a/source/packages/com_mokosuitestorelocator/admin/forms/filter_categories.xml b/source/packages/com_mokosuitestorelocator/admin/forms/filter_categories.xml
index 04b3ff3..4d20b79 100644
--- a/source/packages/com_mokosuitestorelocator/admin/forms/filter_categories.xml
+++ b/source/packages/com_mokosuitestorelocator/admin/forms/filter_categories.xml
@@ -4,7 +4,7 @@
 		<field
 			name="search"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FILTER_SEARCH_LABEL"
+			label="COM_MOKOSUITESTORELOCATOR_FILTER_SEARCH_LABEL"
 			hint="JSEARCH_FILTER"
 		/>
 
diff --git a/source/packages/com_mokosuitestorelocator/admin/forms/filter_locations.xml b/source/packages/com_mokosuitestorelocator/admin/forms/filter_locations.xml
index 6e36331..bcb1b21 100644
--- a/source/packages/com_mokosuitestorelocator/admin/forms/filter_locations.xml
+++ b/source/packages/com_mokosuitestorelocator/admin/forms/filter_locations.xml
@@ -4,7 +4,7 @@
 		<field
 			name="search"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FILTER_SEARCH_LABEL"
+			label="COM_MOKOSUITESTORELOCATOR_FILTER_SEARCH_LABEL"
 			hint="JSEARCH_FILTER"
 			inputmode="search"
 		/>
@@ -29,8 +29,8 @@
 		>
 			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
 			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
-			<option value="a.city ASC">COM_MOKOJOOMSTORELOCATOR_CITY_ASC</option>
-			<option value="a.city DESC">COM_MOKOJOOMSTORELOCATOR_CITY_DESC</option>
+			<option value="a.city ASC">COM_MOKOSUITESTORELOCATOR_CITY_ASC</option>
+			<option value="a.city DESC">COM_MOKOSUITESTORELOCATOR_CITY_DESC</option>
 			<option value="a.published ASC">JSTATUS_ASC</option>
 			<option value="a.published DESC">JSTATUS_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
diff --git a/source/packages/com_mokosuitestorelocator/admin/forms/location.xml b/source/packages/com_mokosuitestorelocator/admin/forms/location.xml
index 2816f1e..b1b34bf 100644
--- a/source/packages/com_mokosuitestorelocator/admin/forms/location.xml
+++ b/source/packages/com_mokosuitestorelocator/admin/forms/location.xml
@@ -43,58 +43,58 @@
 		</field>
 	</fieldset>
 
-	<fieldset name="categories" label="COM_MOKOJOOMSTORELOCATOR_FIELDSET_CATEGORIES">
+	<fieldset name="categories" label="COM_MOKOSUITESTORELOCATOR_FIELDSET_CATEGORIES">
 		<field
 			name="categories"
 			type="sql"
-			label="COM_MOKOJOOMSTORELOCATOR_CATEGORIES"
+			label="COM_MOKOSUITESTORELOCATOR_CATEGORIES"
 			multiple="true"
 			query="SELECT id AS value, title AS text FROM #__mokosuitestorelocator_categories WHERE published = 1 ORDER BY ordering"
 		/>
 	</fieldset>
 
-	<fieldset name="address" label="COM_MOKOJOOMSTORELOCATOR_FIELDSET_ADDRESS">
+	<fieldset name="address" label="COM_MOKOSUITESTORELOCATOR_FIELDSET_ADDRESS">
 		<field
 			name="address"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_ADDRESS"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_ADDRESS"
 			size="60"
 		/>
 
 		<field
 			name="city"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_CITY"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_CITY"
 			size="40"
 		/>
 
 		<field
 			name="state"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_STATE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_STATE"
 			size="40"
 		/>
 
 		<field
 			name="postcode"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_POSTCODE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_POSTCODE"
 			size="20"
 		/>
 
 		<field
 			name="country"
 			type="text"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_COUNTRY"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_COUNTRY"
 			size="40"
 		/>
 	</fieldset>
 
-	<fieldset name="coordinates" label="COM_MOKOJOOMSTORELOCATOR_FIELDSET_COORDINATES">
+	<fieldset name="coordinates" label="COM_MOKOSUITESTORELOCATOR_FIELDSET_COORDINATES">
 		<field
 			name="latitude"
 			type="number"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_LATITUDE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_LATITUDE"
 			step="0.00000001"
 			min="-90"
 			max="90"
@@ -103,18 +103,18 @@
 		<field
 			name="longitude"
 			type="number"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_LONGITUDE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_LONGITUDE"
 			step="0.00000001"
 			min="-180"
 			max="180"
 		/>
 	</fieldset>
 
-	<fieldset name="contact" label="COM_MOKOJOOMSTORELOCATOR_FIELDSET_CONTACT">
+	<fieldset name="contact" label="COM_MOKOSUITESTORELOCATOR_FIELDSET_CONTACT">
 		<field
 			name="phone"
 			type="tel"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_PHONE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_PHONE"
 			size="30"
 		/>
 
@@ -128,23 +128,23 @@
 		<field
 			name="website"
 			type="url"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_WEBSITE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_WEBSITE"
 			size="60"
 		/>
 
 		<field
 			name="hours"
 			type="textarea"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_HOURS"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_HOURS"
 			rows="5"
 		/>
 	</fieldset>
 
-	<fieldset name="image" label="COM_MOKOJOOMSTORELOCATOR_FIELDSET_IMAGE">
+	<fieldset name="image" label="COM_MOKOSUITESTORELOCATOR_FIELDSET_IMAGE">
 		<field
 			name="image"
 			type="media"
-			label="COM_MOKOJOOMSTORELOCATOR_FIELD_IMAGE"
+			label="COM_MOKOSUITESTORELOCATOR_FIELD_IMAGE"
 		/>
 	</fieldset>
 </form>
diff --git a/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.ini b/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.ini
index d5d3a53..82127eb 100644
--- a/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.ini
+++ b/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.ini
@@ -3,79 +3,79 @@
 ; License: GNU General Public License version 3 or later; see LICENSE
 
 COM_MOKOSUITESTORELOCATOR="MokoSuite Store Locator"
-COM_MOKOJOOMSTORELOCATOR="Store Locator"
-COM_MOKOJOOMSTORELOCATOR_DESC="A store locator component for managing and displaying location listings."
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS="Locations"
-COM_MOKOJOOMSTORELOCATOR_LOCATION_NEW="New Location"
-COM_MOKOJOOMSTORELOCATOR_LOCATION_EDIT="Edit Location"
-COM_MOKOJOOMSTORELOCATOR_TABLE_CAPTION="Store Location List"
+COM_MOKOSUITESTORELOCATOR_SHORT="Store Locator"
+COM_MOKOSUITESTORELOCATOR_DESC="A store locator component for managing and displaying location listings."
+COM_MOKOSUITESTORELOCATOR_LOCATIONS="Locations"
+COM_MOKOSUITESTORELOCATOR_LOCATION_NEW="New Location"
+COM_MOKOSUITESTORELOCATOR_LOCATION_EDIT="Edit Location"
+COM_MOKOSUITESTORELOCATOR_TABLE_CAPTION="Store Location List"
 
-COM_MOKOJOOMSTORELOCATOR_CITY="City"
-COM_MOKOJOOMSTORELOCATOR_STATE="State"
+COM_MOKOSUITESTORELOCATOR_CITY="City"
+COM_MOKOSUITESTORELOCATOR_STATE="State"
 
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_ADDRESS="Address"
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_COORDINATES="Coordinates"
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_CONTACT="Contact Information"
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_IMAGE="Image"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_ADDRESS="Address"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_COORDINATES="Coordinates"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_CONTACT="Contact Information"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_IMAGE="Image"
 
-COM_MOKOJOOMSTORELOCATOR_FIELD_ADDRESS="Street Address"
-COM_MOKOJOOMSTORELOCATOR_FIELD_CITY="City"
-COM_MOKOJOOMSTORELOCATOR_FIELD_STATE="State / Province"
-COM_MOKOJOOMSTORELOCATOR_FIELD_POSTCODE="Postal Code"
-COM_MOKOJOOMSTORELOCATOR_FIELD_COUNTRY="Country"
-COM_MOKOJOOMSTORELOCATOR_FIELD_LATITUDE="Latitude"
-COM_MOKOJOOMSTORELOCATOR_FIELD_LONGITUDE="Longitude"
-COM_MOKOJOOMSTORELOCATOR_FIELD_PHONE="Phone"
-COM_MOKOJOOMSTORELOCATOR_FIELD_WEBSITE="Website"
-COM_MOKOJOOMSTORELOCATOR_FIELD_HOURS="Business Hours"
-COM_MOKOJOOMSTORELOCATOR_FIELD_IMAGE="Location Image"
+COM_MOKOSUITESTORELOCATOR_FIELD_ADDRESS="Street Address"
+COM_MOKOSUITESTORELOCATOR_FIELD_CITY="City"
+COM_MOKOSUITESTORELOCATOR_FIELD_STATE="State / Province"
+COM_MOKOSUITESTORELOCATOR_FIELD_POSTCODE="Postal Code"
+COM_MOKOSUITESTORELOCATOR_FIELD_COUNTRY="Country"
+COM_MOKOSUITESTORELOCATOR_FIELD_LATITUDE="Latitude"
+COM_MOKOSUITESTORELOCATOR_FIELD_LONGITUDE="Longitude"
+COM_MOKOSUITESTORELOCATOR_FIELD_PHONE="Phone"
+COM_MOKOSUITESTORELOCATOR_FIELD_WEBSITE="Website"
+COM_MOKOSUITESTORELOCATOR_FIELD_HOURS="Business Hours"
+COM_MOKOSUITESTORELOCATOR_FIELD_IMAGE="Location Image"
 
-COM_MOKOJOOMSTORELOCATOR_FILTER_SEARCH_LABEL="Search Locations"
-COM_MOKOJOOMSTORELOCATOR_CITY_ASC="City ascending"
-COM_MOKOJOOMSTORELOCATOR_CITY_DESC="City descending"
+COM_MOKOSUITESTORELOCATOR_FILTER_SEARCH_LABEL="Search Locations"
+COM_MOKOSUITESTORELOCATOR_CITY_ASC="City ascending"
+COM_MOKOSUITESTORELOCATOR_CITY_DESC="City descending"
 
-COM_MOKOJOOMSTORELOCATOR_LOCATION_SAVE_SUCCESS="Location saved successfully."
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS_N_ITEMS_PUBLISHED="%d location(s) published."
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS_N_ITEMS_UNPUBLISHED="%d location(s) unpublished."
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS_N_ITEMS_DELETED="%d location(s) deleted."
+COM_MOKOSUITESTORELOCATOR_LOCATION_SAVE_SUCCESS="Location saved successfully."
+COM_MOKOSUITESTORELOCATOR_LOCATIONS_N_ITEMS_PUBLISHED="%d location(s) published."
+COM_MOKOSUITESTORELOCATOR_LOCATIONS_N_ITEMS_UNPUBLISHED="%d location(s) unpublished."
+COM_MOKOSUITESTORELOCATOR_LOCATIONS_N_ITEMS_DELETED="%d location(s) deleted."
 
-COM_MOKOJOOMSTORELOCATOR_ERROR_TITLE_REQUIRED="A location title is required."
-COM_MOKOJOOMSTORELOCATOR_ERROR_LATITUDE_RANGE="Latitude must be between -90 and 90."
-COM_MOKOJOOMSTORELOCATOR_ERROR_LONGITUDE_RANGE="Longitude must be between -180 and 180."
+COM_MOKOSUITESTORELOCATOR_ERROR_TITLE_REQUIRED="A location title is required."
+COM_MOKOSUITESTORELOCATOR_ERROR_LATITUDE_RANGE="Latitude must be between -90 and 90."
+COM_MOKOSUITESTORELOCATOR_ERROR_LONGITUDE_RANGE="Longitude must be between -180 and 180."
 
-COM_MOKOJOOMSTORELOCATOR_GEOCODING_SUCCESS="Coordinates were auto-populated from the address via OpenStreetMap."
-COM_MOKOJOOMSTORELOCATOR_GEOCODING_FAILED="Geocoding failed: %s. You can enter coordinates manually."
-COM_MOKOJOOMSTORELOCATOR_GET_DIRECTIONS="Get Directions"
+COM_MOKOSUITESTORELOCATOR_GEOCODING_SUCCESS="Coordinates were auto-populated from the address via OpenStreetMap."
+COM_MOKOSUITESTORELOCATOR_GEOCODING_FAILED="Geocoding failed: %s. You can enter coordinates manually."
+COM_MOKOSUITESTORELOCATOR_GET_DIRECTIONS="Get Directions"
 
-COM_MOKOJOOMSTORELOCATOR_IMPORT="Import Locations"
-COM_MOKOJOOMSTORELOCATOR_IMPORT_DESC="Import store locations from a CSV file."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_UPLOAD="Upload CSV File"
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FILE="CSV File"
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FILE_DESC="Select a CSV file with location data. First row must be column headers."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_DELIMITER="Delimiter"
-COM_MOKOJOOMSTORELOCATOR_IMPORT_DELIMITER_DESC="The character separating fields in your CSV file."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_SUCCESS="%d location(s) imported successfully."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_SKIPPED="%d row(s) skipped due to errors."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_NO_FILE="No file was uploaded."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_INVALID_FILE="The uploaded file is not a valid CSV."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_NO_ROWS="The CSV file contains no data rows."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_MISSING_TITLE="Row %d: Title is required."
+COM_MOKOSUITESTORELOCATOR_IMPORT="Import Locations"
+COM_MOKOSUITESTORELOCATOR_IMPORT_DESC="Import store locations from a CSV file."
+COM_MOKOSUITESTORELOCATOR_IMPORT_UPLOAD="Upload CSV File"
+COM_MOKOSUITESTORELOCATOR_IMPORT_FILE="CSV File"
+COM_MOKOSUITESTORELOCATOR_IMPORT_FILE_DESC="Select a CSV file with location data. First row must be column headers."
+COM_MOKOSUITESTORELOCATOR_IMPORT_DELIMITER="Delimiter"
+COM_MOKOSUITESTORELOCATOR_IMPORT_DELIMITER_DESC="The character separating fields in your CSV file."
+COM_MOKOSUITESTORELOCATOR_IMPORT_SUCCESS="%d location(s) imported successfully."
+COM_MOKOSUITESTORELOCATOR_IMPORT_SKIPPED="%d row(s) skipped due to errors."
+COM_MOKOSUITESTORELOCATOR_IMPORT_NO_FILE="No file was uploaded."
+COM_MOKOSUITESTORELOCATOR_IMPORT_INVALID_FILE="The uploaded file is not a valid CSV."
+COM_MOKOSUITESTORELOCATOR_IMPORT_NO_ROWS="The CSV file contains no data rows."
+COM_MOKOSUITESTORELOCATOR_IMPORT_MISSING_TITLE="Row %d: Title is required."
 
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_TITLE="Import from FocalPoint"
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_DESC="Migrate locations from an installed FocalPoint (Shack Locations) component. Coordinates, custom fields (email, website, hours), and metadata are mapped automatically."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_BUTTON="Import FocalPoint Locations"
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_SUCCESS="%d location(s) imported from FocalPoint."
-COM_MOKOJOOMSTORELOCATOR_IMPORT_FILE_TOO_LARGE="The uploaded file exceeds the 2 MB size limit."
+COM_MOKOSUITESTORELOCATOR_IMPORT_FP_TITLE="Import from FocalPoint"
+COM_MOKOSUITESTORELOCATOR_IMPORT_FP_DESC="Migrate locations from an installed FocalPoint (Shack Locations) component. Coordinates, custom fields (email, website, hours), and metadata are mapped automatically."
+COM_MOKOSUITESTORELOCATOR_IMPORT_FP_BUTTON="Import FocalPoint Locations"
+COM_MOKOSUITESTORELOCATOR_IMPORT_FP_SUCCESS="%d location(s) imported from FocalPoint."
+COM_MOKOSUITESTORELOCATOR_IMPORT_FILE_TOO_LARGE="The uploaded file exceeds the 2 MB size limit."
 
-COM_MOKOJOOMSTORELOCATOR_CATEGORIES="Categories"
-COM_MOKOJOOMSTORELOCATOR_CATEGORY_NEW="New Category"
-COM_MOKOJOOMSTORELOCATOR_CATEGORY_EDIT="Edit Category"
-COM_MOKOJOOMSTORELOCATOR_CATEGORY_PARENT="Parent Category"
-COM_MOKOJOOMSTORELOCATOR_CATEGORY_NO_PARENT="- No Parent -"
-COM_MOKOJOOMSTORELOCATOR_CATEGORY_COLOR="Color"
-COM_MOKOJOOMSTORELOCATOR_CATEGORY_MARKER_ICON="Custom Marker Icon"
-COM_MOKOJOOMSTORELOCATOR_CATEGORIES_TABLE_CAPTION="Store Location Categories"
-COM_MOKOJOOMSTORELOCATOR_ERROR_CATEGORY_TITLE_REQUIRED="A category title is required."
+COM_MOKOSUITESTORELOCATOR_CATEGORIES="Categories"
+COM_MOKOSUITESTORELOCATOR_CATEGORY_NEW="New Category"
+COM_MOKOSUITESTORELOCATOR_CATEGORY_EDIT="Edit Category"
+COM_MOKOSUITESTORELOCATOR_CATEGORY_PARENT="Parent Category"
+COM_MOKOSUITESTORELOCATOR_CATEGORY_NO_PARENT="- No Parent -"
+COM_MOKOSUITESTORELOCATOR_CATEGORY_COLOR="Color"
+COM_MOKOSUITESTORELOCATOR_CATEGORY_MARKER_ICON="Custom Marker Icon"
+COM_MOKOSUITESTORELOCATOR_CATEGORIES_TABLE_CAPTION="Store Location Categories"
+COM_MOKOSUITESTORELOCATOR_ERROR_CATEGORY_TITLE_REQUIRED="A category title is required."
 
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_CATEGORIES="Categories"
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_APPEARANCE="Appearance"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_CATEGORIES="Categories"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_APPEARANCE="Appearance"
diff --git a/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.sys.ini b/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.sys.ini
index 2ef78d9..1dbd4e6 100644
--- a/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.sys.ini
+++ b/source/packages/com_mokosuitestorelocator/admin/language/en-GB/com_mokosuitestorelocator.sys.ini
@@ -3,6 +3,6 @@
 ; License: GNU General Public License version 3 or later; see LICENSE
 
 COM_MOKOSUITESTORELOCATOR="MokoSuite Store Locator"
-COM_MOKOJOOMSTORELOCATOR="Store Locator"
-COM_MOKOJOOMSTORELOCATOR_DESC="A store locator component for managing and displaying location listings."
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS="Locations"
+COM_MOKOSUITESTORELOCATOR_SHORT="Store Locator"
+COM_MOKOSUITESTORELOCATOR_DESC="A store locator component for managing and displaying location listings."
+COM_MOKOSUITESTORELOCATOR_LOCATIONS="Locations"
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/Controller/ImportController.php b/source/packages/com_mokosuitestorelocator/admin/src/Controller/ImportController.php
index 63f7b76..436da7a 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/Controller/ImportController.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/Controller/ImportController.php
@@ -59,7 +59,7 @@ class ImportController extends BaseController
 
 		if (!$csvFile || $csvFile['error'] !== UPLOAD_ERR_OK || !is_uploaded_file($csvFile['tmp_name']))
 		{
-			$this->setMessage(Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_NO_FILE'), 'error');
+			$this->setMessage(Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_NO_FILE'), 'error');
 			$this->setRedirect(Route::_('index.php?option=com_mokosuitestorelocator&view=import', false));
 
 			return;
@@ -68,7 +68,7 @@ class ImportController extends BaseController
 		// Enforce 2 MB file size limit
 		if ($csvFile['size'] > 2 * 1024 * 1024)
 		{
-			$this->setMessage(Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_FILE_TOO_LARGE'), 'error');
+			$this->setMessage(Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_FILE_TOO_LARGE'), 'error');
 			$this->setRedirect(Route::_('index.php?option=com_mokosuitestorelocator&view=import', false));
 
 			return;
@@ -79,7 +79,7 @@ class ImportController extends BaseController
 
 		if ($ext !== 'csv' && $ext !== 'txt')
 		{
-			$this->setMessage(Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_INVALID_FILE'), 'error');
+			$this->setMessage(Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_INVALID_FILE'), 'error');
 			$this->setRedirect(Route::_('index.php?option=com_mokosuitestorelocator&view=import', false));
 
 			return;
@@ -92,7 +92,7 @@ class ImportController extends BaseController
 
 		if (!$mime || !\in_array($mime, $allowedMimes, true))
 		{
-			$this->setMessage(Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_INVALID_FILE'), 'error');
+			$this->setMessage(Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_INVALID_FILE'), 'error');
 			$this->setRedirect(Route::_('index.php?option=com_mokosuitestorelocator&view=import', false));
 
 			return;
@@ -102,12 +102,12 @@ class ImportController extends BaseController
 
 		if ($result['imported'] > 0)
 		{
-			$this->setMessage(Text::sprintf('COM_MOKOJOOMSTORELOCATOR_IMPORT_SUCCESS', $result['imported']));
+			$this->setMessage(Text::sprintf('COM_MOKOSUITESTORELOCATOR_IMPORT_SUCCESS', $result['imported']));
 		}
 
 		if ($result['skipped'] > 0)
 		{
-			$this->setMessage(Text::sprintf('COM_MOKOJOOMSTORELOCATOR_IMPORT_SKIPPED', $result['skipped']), 'warning');
+			$this->setMessage(Text::sprintf('COM_MOKOSUITESTORELOCATOR_IMPORT_SKIPPED', $result['skipped']), 'warning');
 		}
 
 		$this->setRedirect(Route::_('index.php?option=com_mokosuitestorelocator&view=locations', false));
@@ -138,12 +138,12 @@ class ImportController extends BaseController
 
 		if ($result['imported'] > 0)
 		{
-			$this->setMessage(Text::sprintf('COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_SUCCESS', $result['imported']));
+			$this->setMessage(Text::sprintf('COM_MOKOSUITESTORELOCATOR_IMPORT_FP_SUCCESS', $result['imported']));
 		}
 
 		if ($result['skipped'] > 0)
 		{
-			$this->setMessage(Text::sprintf('COM_MOKOJOOMSTORELOCATOR_IMPORT_SKIPPED', $result['skipped']), 'warning');
+			$this->setMessage(Text::sprintf('COM_MOKOSUITESTORELOCATOR_IMPORT_SKIPPED', $result['skipped']), 'warning');
 		}
 
 		foreach ($result['errors'] as $error)
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationController.php b/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationController.php
index 68a56dc..59b8b2f 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationController.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationController.php
@@ -25,7 +25,7 @@ class LocationController extends FormController
 	 * @var    string
 	 * @since  1.0.0
 	 */
-	protected $text_prefix = 'COM_MOKOJOOMSTORELOCATOR_LOCATION';
+	protected $text_prefix = 'COM_MOKOSUITESTORELOCATOR_LOCATION';
 
 	/**
 	 * The view list to redirect to after save.
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationsController.php b/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationsController.php
index 840a1d4..fb550ac 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationsController.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/Controller/LocationsController.php
@@ -25,7 +25,7 @@ class LocationsController extends AdminController
 	 * @var    string
 	 * @since  1.0.0
 	 */
-	protected $text_prefix = 'COM_MOKOJOOMSTORELOCATOR_LOCATIONS';
+	protected $text_prefix = 'COM_MOKOSUITESTORELOCATOR_LOCATIONS';
 
 	/**
 	 * Proxy for getModel.
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/Model/LocationModel.php b/source/packages/com_mokosuitestorelocator/admin/src/Model/LocationModel.php
index 1c314eb..a6cc49a 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/Model/LocationModel.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/Model/LocationModel.php
@@ -99,7 +99,7 @@ class LocationModel extends AdminModel
 				$data['latitude']  = $coords['lat'];
 				$data['longitude'] = $coords['lng'];
 				Factory::getApplication()->enqueueMessage(
-					Text::_('COM_MOKOJOOMSTORELOCATOR_GEOCODING_SUCCESS'),
+					Text::_('COM_MOKOSUITESTORELOCATOR_GEOCODING_SUCCESS'),
 					'success'
 				);
 			}
@@ -252,7 +252,7 @@ class LocationModel extends AdminModel
 		catch (\Exception $e)
 		{
 			Factory::getApplication()->enqueueMessage(
-				Text::sprintf('COM_MOKOJOOMSTORELOCATOR_GEOCODING_FAILED', $e->getMessage()),
+				Text::sprintf('COM_MOKOSUITESTORELOCATOR_GEOCODING_FAILED', $e->getMessage()),
 				'warning'
 			);
 		}
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/View/Categories/HtmlView.php b/source/packages/com_mokosuitestorelocator/admin/src/View/Categories/HtmlView.php
index 4b3b069..9545a1d 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/View/Categories/HtmlView.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/View/Categories/HtmlView.php
@@ -42,7 +42,7 @@ class HtmlView extends BaseHtmlView
 
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMSTORELOCATOR_CATEGORIES'), 'folder');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITESTORELOCATOR_CATEGORIES'), 'folder');
 		ToolbarHelper::addNew('category.add');
 		ToolbarHelper::publish('categories.publish', 'JTOOLBAR_PUBLISH', true);
 		ToolbarHelper::unpublish('categories.unpublish', 'JTOOLBAR_UNPUBLISH', true);
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/View/Category/HtmlView.php b/source/packages/com_mokosuitestorelocator/admin/src/View/Category/HtmlView.php
index 2067665..56d181d 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/View/Category/HtmlView.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/View/Category/HtmlView.php
@@ -42,7 +42,7 @@ class HtmlView extends BaseHtmlView
 		$isNew = ($this->item->id == 0);
 
 		ToolbarHelper::title(
-			Text::_('COM_MOKOJOOMSTORELOCATOR_CATEGORY_' . ($isNew ? 'NEW' : 'EDIT')),
+			Text::_('COM_MOKOSUITESTORELOCATOR_CATEGORY_' . ($isNew ? 'NEW' : 'EDIT')),
 			'folder'
 		);
 
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/View/Import/HtmlView.php b/source/packages/com_mokosuitestorelocator/admin/src/View/Import/HtmlView.php
index 0e074e9..d6ed19e 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/View/Import/HtmlView.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/View/Import/HtmlView.php
@@ -32,7 +32,7 @@ class HtmlView extends BaseHtmlView
 	 */
 	public function display($tpl = null): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT'), 'upload');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT'), 'upload');
 
 		parent::display($tpl);
 	}
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/View/Location/HtmlView.php b/source/packages/com_mokosuitestorelocator/admin/src/View/Location/HtmlView.php
index f8208a0..9014322 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/View/Location/HtmlView.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/View/Location/HtmlView.php
@@ -71,7 +71,7 @@ class HtmlView extends BaseHtmlView
 		$isNew = ($this->item->id == 0);
 
 		ToolbarHelper::title(
-			Text::_('COM_MOKOJOOMSTORELOCATOR_LOCATION_' . ($isNew ? 'NEW' : 'EDIT')),
+			Text::_('COM_MOKOSUITESTORELOCATOR_LOCATION_' . ($isNew ? 'NEW' : 'EDIT')),
 			'location'
 		);
 
diff --git a/source/packages/com_mokosuitestorelocator/admin/src/View/Locations/HtmlView.php b/source/packages/com_mokosuitestorelocator/admin/src/View/Locations/HtmlView.php
index cd59316..bef9432 100644
--- a/source/packages/com_mokosuitestorelocator/admin/src/View/Locations/HtmlView.php
+++ b/source/packages/com_mokosuitestorelocator/admin/src/View/Locations/HtmlView.php
@@ -82,11 +82,11 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMSTORELOCATOR_LOCATIONS'), 'location');
+		ToolbarHelper::title(Text::_('COM_MOKOSUITESTORELOCATOR_LOCATIONS'), 'location');
 		ToolbarHelper::addNew('location.add');
 		ToolbarHelper::publish('locations.publish', 'JTOOLBAR_PUBLISH', true);
 		ToolbarHelper::unpublish('locations.unpublish', 'JTOOLBAR_UNPUBLISH', true);
 		ToolbarHelper::deleteList('', 'locations.delete', 'JTOOLBAR_DELETE');
-		ToolbarHelper::custom('import.display', 'upload', '', 'COM_MOKOJOOMSTORELOCATOR_IMPORT', false);
+		ToolbarHelper::custom('import.display', 'upload', '', 'COM_MOKOSUITESTORELOCATOR_IMPORT', false);
 	}
 }
diff --git a/source/packages/com_mokosuitestorelocator/admin/tmpl/categories/default.php b/source/packages/com_mokosuitestorelocator/admin/tmpl/categories/default.php
index 45523f7..ae9d3cf 100644
--- a/source/packages/com_mokosuitestorelocator/admin/tmpl/categories/default.php
+++ b/source/packages/com_mokosuitestorelocator/admin/tmpl/categories/default.php
@@ -31,7 +31,7 @@ use Joomla\CMS\Router\Route;
 				<?php else : ?>
 					<table class="table" id="categoryList">
 						<caption class="visually-hidden">
-							<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_CATEGORIES_TABLE_CAPTION'); ?>
+							<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_CATEGORIES_TABLE_CAPTION'); ?>
 						</caption>
 						<thead>
 							<tr>
@@ -42,10 +42,10 @@ use Joomla\CMS\Router\Route;
 									<?php echo Text::_('JGLOBAL_TITLE'); ?>
 								</th>
 								<th scope="col" class="w-5 text-center">
-									<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_CATEGORY_COLOR'); ?>
+									<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_CATEGORY_COLOR'); ?>
 								</th>
 								<th scope="col" class="w-10 text-center d-none d-md-table-cell">
-									<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_LOCATIONS'); ?>
+									<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_LOCATIONS'); ?>
 								</th>
 								<th scope="col" class="w-5 text-center">
 									<?php echo Text::_('JSTATUS'); ?>
diff --git a/source/packages/com_mokosuitestorelocator/admin/tmpl/category/edit.php b/source/packages/com_mokosuitestorelocator/admin/tmpl/category/edit.php
index 4eb2923..23a7e68 100644
--- a/source/packages/com_mokosuitestorelocator/admin/tmpl/category/edit.php
+++ b/source/packages/com_mokosuitestorelocator/admin/tmpl/category/edit.php
@@ -36,7 +36,7 @@ HTMLHelper::_('behavior.keepalive');
 	</div>
 	<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
-	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'appearance', Text::_('COM_MOKOJOOMSTORELOCATOR_FIELDSET_APPEARANCE')); ?>
+	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'appearance', Text::_('COM_MOKOSUITESTORELOCATOR_FIELDSET_APPEARANCE')); ?>
 	<div class="row">
 		<div class="col-lg-6">
 			<?php echo $this->form->renderField('color'); ?>
diff --git a/source/packages/com_mokosuitestorelocator/admin/tmpl/import/default.php b/source/packages/com_mokosuitestorelocator/admin/tmpl/import/default.php
index b311f27..a40e6bb 100644
--- a/source/packages/com_mokosuitestorelocator/admin/tmpl/import/default.php
+++ b/source/packages/com_mokosuitestorelocator/admin/tmpl/import/default.php
@@ -22,12 +22,12 @@ use Joomla\CMS\Session\Session;
 		<div class="col-lg-8">
 			<div class="card">
 				<div class="card-body">
-					<h3><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_UPLOAD'); ?></h3>
-					<p class="text-muted"><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_FILE_DESC'); ?></p>
+					<h3><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_UPLOAD'); ?></h3>
+					<p class="text-muted"><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_FILE_DESC'); ?></p>
 
 					<div class="mb-3">
 						<label for="csv_file" class="form-label">
-							<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_FILE'); ?>
+							<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_FILE'); ?>
 						</label>
 						<input type="file" name="jform[csv_file]" id="csv_file"
 							   class="form-control" accept=".csv,text/csv" required />
@@ -35,7 +35,7 @@ use Joomla\CMS\Session\Session;
 
 					<div class="mb-3">
 						<label for="delimiter" class="form-label">
-							<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_DELIMITER'); ?>
+							<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_DELIMITER'); ?>
 						</label>
 						<select name="delimiter" id="delimiter" class="form-select" style="width: auto;">
 							<option value=","><?php echo Text::_('Comma (,)'); ?></option>
@@ -48,7 +48,7 @@ use Joomla\CMS\Session\Session;
 					<div class="mb-3">
 						<button type="submit" class="btn btn-primary">
 							<span class="icon-upload" aria-hidden="true"></span>
-							<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT'); ?>
+							<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT'); ?>
 						</button>
 						<a href="<?php echo Route::_('index.php?option=com_mokosuitestorelocator&view=locations'); ?>"
 						   class="btn btn-secondary ms-2">
@@ -62,13 +62,13 @@ use Joomla\CMS\Session\Session;
 		<div class="col-lg-4">
 			<div class="card mb-3">
 				<div class="card-body">
-					<h4><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_TITLE'); ?></h4>
-					<p class="text-muted"><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_DESC'); ?></p>
+					<h4><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_FP_TITLE'); ?></h4>
+					<p class="text-muted"><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_FP_DESC'); ?></p>
 					<form action="<?php echo Route::_('index.php?option=com_mokosuitestorelocator&task=import.focalpoint'); ?>"
 						  method="post">
 						<button type="submit" class="btn btn-outline-primary w-100">
 							<span class="icon-download" aria-hidden="true"></span>
-							<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_IMPORT_FP_BUTTON'); ?>
+							<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_IMPORT_FP_BUTTON'); ?>
 						</button>
 						<?php echo HTMLHelper::_('form.token'); ?>
 					</form>
diff --git a/source/packages/com_mokosuitestorelocator/admin/tmpl/location/edit.php b/source/packages/com_mokosuitestorelocator/admin/tmpl/location/edit.php
index 2eb6251..6082ab8 100644
--- a/source/packages/com_mokosuitestorelocator/admin/tmpl/location/edit.php
+++ b/source/packages/com_mokosuitestorelocator/admin/tmpl/location/edit.php
@@ -37,7 +37,7 @@ HTMLHelper::_('behavior.keepalive');
 	</div>
 	<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
-	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'categories', Text::_('COM_MOKOJOOMSTORELOCATOR_FIELDSET_CATEGORIES')); ?>
+	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'categories', Text::_('COM_MOKOSUITESTORELOCATOR_FIELDSET_CATEGORIES')); ?>
 	<div class="row">
 		<div class="col-lg-9">
 			<?php echo $this->form->renderField('categories'); ?>
@@ -45,7 +45,7 @@ HTMLHelper::_('behavior.keepalive');
 	</div>
 	<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
-	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'address', Text::_('COM_MOKOJOOMSTORELOCATOR_FIELDSET_ADDRESS')); ?>
+	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'address', Text::_('COM_MOKOSUITESTORELOCATOR_FIELDSET_ADDRESS')); ?>
 	<div class="row">
 		<div class="col-lg-6">
 			<?php echo $this->form->renderField('address'); ?>
@@ -61,7 +61,7 @@ HTMLHelper::_('behavior.keepalive');
 	</div>
 	<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
-	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'contact', Text::_('COM_MOKOJOOMSTORELOCATOR_FIELDSET_CONTACT')); ?>
+	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'contact', Text::_('COM_MOKOSUITESTORELOCATOR_FIELDSET_CONTACT')); ?>
 	<div class="row">
 		<div class="col-lg-6">
 			<?php echo $this->form->renderField('phone'); ?>
diff --git a/source/packages/com_mokosuitestorelocator/admin/tmpl/locations/default.php b/source/packages/com_mokosuitestorelocator/admin/tmpl/locations/default.php
index c00941f..3c56963 100644
--- a/source/packages/com_mokosuitestorelocator/admin/tmpl/locations/default.php
+++ b/source/packages/com_mokosuitestorelocator/admin/tmpl/locations/default.php
@@ -31,7 +31,7 @@ use Joomla\CMS\Router\Route;
 				<?php else : ?>
 					<table class="table" id="locationList">
 						<caption class="visually-hidden">
-							<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_TABLE_CAPTION'); ?>
+							<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_TABLE_CAPTION'); ?>
 						</caption>
 						<thead>
 							<tr>
@@ -42,10 +42,10 @@ use Joomla\CMS\Router\Route;
 									<?php echo Text::_('JGLOBAL_TITLE'); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell">
-									<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_CITY'); ?>
+									<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_CITY'); ?>
 								</th>
 								<th scope="col" class="w-10 d-none d-md-table-cell">
-									<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_STATE'); ?>
+									<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_STATE'); ?>
 								</th>
 								<th scope="col" class="w-5 text-center">
 									<?php echo Text::_('JSTATUS'); ?>
diff --git a/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml b/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml
index 2a5973a..9e9bb44 100644
--- a/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml
+++ b/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml
@@ -15,14 +15,14 @@
 -->
 <extension type="component" method="upgrade">
 	<name>com_mokosuitestorelocator</name>
-	<version>01.02.02</version>
+	<version>01.02.29</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GNU General Public License version 3 or later; see LICENSE</license>
-	<description>COM_MOKOJOOMSTORELOCATOR_DESC</description>
+	<description>COM_MOKOSUITESTORELOCATOR_DESC</description>
 
 	<namespace path="src">Moko\Component\MokoSuiteStoreLocator</namespace>
 
@@ -67,11 +67,11 @@
 			<folder>tmpl</folder>
 		</files>
 
-		<menu>COM_MOKOJOOMSTORELOCATOR</menu>
+		<menu>COM_MOKOSUITESTORELOCATOR_SHORT</menu>
 		<submenu>
-			<menu link="option=com_mokosuitestorelocator&amp;view=locations">COM_MOKOJOOMSTORELOCATOR_LOCATIONS</menu>
-			<menu link="option=com_mokosuitestorelocator&amp;view=categories">COM_MOKOJOOMSTORELOCATOR_CATEGORIES</menu>
-			<menu link="option=com_mokosuitestorelocator&amp;view=import">COM_MOKOJOOMSTORELOCATOR_IMPORT</menu>
+			<menu link="option=com_mokosuitestorelocator&amp;view=locations">COM_MOKOSUITESTORELOCATOR_LOCATIONS</menu>
+			<menu link="option=com_mokosuitestorelocator&amp;view=categories">COM_MOKOSUITESTORELOCATOR_CATEGORIES</menu>
+			<menu link="option=com_mokosuitestorelocator&amp;view=import">COM_MOKOSUITESTORELOCATOR_IMPORT</menu>
 		</submenu>
 	</administration>
 </extension>
diff --git a/source/packages/com_mokosuitestorelocator/site/language/en-GB/com_mokosuitestorelocator.ini b/source/packages/com_mokosuitestorelocator/site/language/en-GB/com_mokosuitestorelocator.ini
index e6861bb..618f15e 100644
--- a/source/packages/com_mokosuitestorelocator/site/language/en-GB/com_mokosuitestorelocator.ini
+++ b/source/packages/com_mokosuitestorelocator/site/language/en-GB/com_mokosuitestorelocator.ini
@@ -3,19 +3,19 @@
 ; License: GNU General Public License version 3 or later; see LICENSE
 
 COM_MOKOSUITESTORELOCATOR="MokoSuite Store Locator"
-COM_MOKOJOOMSTORELOCATOR="Store Locator"
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS="Locations"
-COM_MOKOJOOMSTORELOCATOR_NO_LOCATIONS="No locations found."
+COM_MOKOSUITESTORELOCATOR_SHORT="Store Locator"
+COM_MOKOSUITESTORELOCATOR_LOCATIONS="Locations"
+COM_MOKOSUITESTORELOCATOR_NO_LOCATIONS="No locations found."
 
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_ADDRESS="Address"
-COM_MOKOJOOMSTORELOCATOR_FIELDSET_CONTACT="Contact Information"
-COM_MOKOJOOMSTORELOCATOR_FIELD_PHONE="Phone"
-COM_MOKOJOOMSTORELOCATOR_FIELD_WEBSITE="Website"
-COM_MOKOJOOMSTORELOCATOR_FIELD_HOURS="Business Hours"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_ADDRESS="Address"
+COM_MOKOSUITESTORELOCATOR_FIELDSET_CONTACT="Contact Information"
+COM_MOKOSUITESTORELOCATOR_FIELD_PHONE="Phone"
+COM_MOKOSUITESTORELOCATOR_FIELD_WEBSITE="Website"
+COM_MOKOSUITESTORELOCATOR_FIELD_HOURS="Business Hours"
 
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS_VIEW_DEFAULT_TITLE="All Locations"
-COM_MOKOJOOMSTORELOCATOR_LOCATIONS_VIEW_DEFAULT_DESC="Displays a list of all store locations."
-COM_MOKOJOOMSTORELOCATOR_LOCATION_VIEW_DEFAULT_TITLE="Location Detail"
-COM_MOKOJOOMSTORELOCATOR_LOCATION_VIEW_DEFAULT_DESC="Displays a single store location with full details."
-COM_MOKOJOOMSTORELOCATOR_FIELD_LOCATION="Select Location"
-COM_MOKOJOOMSTORELOCATOR_GET_DIRECTIONS="Get Directions"
+COM_MOKOSUITESTORELOCATOR_LOCATIONS_VIEW_DEFAULT_TITLE="All Locations"
+COM_MOKOSUITESTORELOCATOR_LOCATIONS_VIEW_DEFAULT_DESC="Displays a list of all store locations."
+COM_MOKOSUITESTORELOCATOR_LOCATION_VIEW_DEFAULT_TITLE="Location Detail"
+COM_MOKOSUITESTORELOCATOR_LOCATION_VIEW_DEFAULT_DESC="Displays a single store location with full details."
+COM_MOKOSUITESTORELOCATOR_FIELD_LOCATION="Select Location"
+COM_MOKOSUITESTORELOCATOR_GET_DIRECTIONS="Get Directions"
diff --git a/source/packages/com_mokosuitestorelocator/site/tmpl/location/default.php b/source/packages/com_mokosuitestorelocator/site/tmpl/location/default.php
index ef2df01..c561603 100644
--- a/source/packages/com_mokosuitestorelocator/site/tmpl/location/default.php
+++ b/source/packages/com_mokosuitestorelocator/site/tmpl/location/default.php
@@ -42,7 +42,7 @@ if ($item->latitude && $item->longitude)
 
 	<div class="com-mokosuitestorelocator-location__details">
 		<div class="com-mokosuitestorelocator-location__address" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-			<h3><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_FIELDSET_ADDRESS'); ?></h3>
+			<h3><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_FIELDSET_ADDRESS'); ?></h3>
 			<?php if ($item->address) : ?>
 				<span itemprop="streetAddress"><?php echo $this->escape($item->address); ?></span><br>
 			<?php endif; ?>
@@ -68,17 +68,17 @@ if ($item->latitude && $item->longitude)
 					   data-lat="<?php echo (float) $item->latitude; ?>"
 					   data-lng="<?php echo (float) $item->longitude; ?>"
 					   data-title="<?php echo $this->escape($item->title); ?>">
-						<?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_GET_DIRECTIONS'); ?>
+						<?php echo Text::_('COM_MOKOSUITESTORELOCATOR_GET_DIRECTIONS'); ?>
 					</a>
 				</div>
 			<?php endif; ?>
 		</div>
 
 		<div class="com-mokosuitestorelocator-location__contact">
-			<h3><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_FIELDSET_CONTACT'); ?></h3>
+			<h3><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_FIELDSET_CONTACT'); ?></h3>
 			<?php if ($item->phone) : ?>
 				<div>
-					<strong><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_FIELD_PHONE'); ?>:</strong>
+					<strong><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_FIELD_PHONE'); ?>:</strong>
 					<?php $safePhone = preg_replace('/[^0-9+\-() ]/', '', $item->phone); ?>
 					<a href="tel:<?php echo $this->escape($safePhone); ?>" itemprop="telephone">
 						<?php echo $this->escape($item->phone); ?>
@@ -97,7 +97,7 @@ if ($item->latitude && $item->longitude)
 
 			<?php if ($item->website && preg_match('#^https?://#i', $item->website)) : ?>
 				<div>
-					<strong><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_FIELD_WEBSITE'); ?>:</strong>
+					<strong><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_FIELD_WEBSITE'); ?>:</strong>
 					<a href="<?php echo $this->escape($item->website); ?>" itemprop="url" target="_blank" rel="noopener">
 						<?php echo $this->escape($item->website); ?>
 					</a>
@@ -107,7 +107,7 @@ if ($item->latitude && $item->longitude)
 
 		<?php if ($item->hours) : ?>
 			<div class="com-mokosuitestorelocator-location__hours">
-				<h3><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_FIELD_HOURS'); ?></h3>
+				<h3><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_FIELD_HOURS'); ?></h3>
 				<div itemprop="openingHours">
 					<?php echo nl2br($this->escape($item->hours)); ?>
 				</div>
diff --git a/source/packages/com_mokosuitestorelocator/site/tmpl/locations/default.php b/source/packages/com_mokosuitestorelocator/site/tmpl/locations/default.php
index e5e21dd..9f5522f 100644
--- a/source/packages/com_mokosuitestorelocator/site/tmpl/locations/default.php
+++ b/source/packages/com_mokosuitestorelocator/site/tmpl/locations/default.php
@@ -14,10 +14,10 @@ use Joomla\CMS\Router\Route;
 /** @var \Moko\Component\MokoSuiteStoreLocator\Site\View\Locations\HtmlView $this */
 ?>
 <div class="com-mokosuitestorelocator-locations">
-	<h2><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_LOCATIONS'); ?></h2>
+	<h2><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_LOCATIONS'); ?></h2>
 
 	<?php if (empty($this->items)) : ?>
-		<p><?php echo Text::_('COM_MOKOJOOMSTORELOCATOR_NO_LOCATIONS'); ?></p>
+		<p><?php echo Text::_('COM_MOKOSUITESTORELOCATOR_NO_LOCATIONS'); ?></p>
 	<?php else : ?>
 		<div class="com-mokosuitestorelocator-locations__list">
 			<?php foreach ($this->items as $item) : ?>
diff --git a/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml b/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml
index e237f6f..9279f87 100644
--- a/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml
+++ b/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml
@@ -14,7 +14,7 @@
 -->
 <extension type="module" client="site" method="upgrade">
 	<name>mod_mokosuitestorelocator_map</name>
-	<version>01.02.02</version>
+	<version>01.02.29</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
diff --git a/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php b/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php
index 92b2865..b2d0fb9 100644
--- a/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php
+++ b/source/packages/mod_mokosuitestorelocator_map/tmpl/default.php
@@ -55,7 +55,7 @@ if ($provider === 'leaflet')
 </div>
 
 <?php
-$directionsText = Text::_('COM_MOKOJOOMSTORELOCATOR_GET_DIRECTIONS', true);
+$directionsText = Text::_('COM_MOKOSUITESTORELOCATOR_GET_DIRECTIONS', true);
 $clusteringJs = $enableClustering ? 'true' : 'false';
 
 $wa->addInlineScript(<<<JS
diff --git a/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml b/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml
index 72cff31..3ce13ce 100644
--- a/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml
+++ b/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml
@@ -14,7 +14,7 @@
 -->
 <extension type="module" client="site" method="upgrade">
 	<name>mod_mokosuitestorelocator_search</name>
-	<version>01.02.02</version>
+	<version>01.02.29</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
diff --git a/source/packages/plg_webservices_mokosuitestorelocator/mokosuitestorelocator.xml b/source/packages/plg_webservices_mokosuitestorelocator/mokosuitestorelocator.xml
index 6be5b15..42e84c0 100644
--- a/source/packages/plg_webservices_mokosuitestorelocator/mokosuitestorelocator.xml
+++ b/source/packages/plg_webservices_mokosuitestorelocator/mokosuitestorelocator.xml
@@ -5,7 +5,7 @@
 	========================================================================= -->
 <extension type="plugin" group="webservices" method="upgrade">
 	<name>plg_webservices_mokosuitestorelocator</name>
-	<version>01.02.02</version>
+	<version>01.02.29</version>
 	<creationDate>2026-06-24</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
diff --git a/source/pkg_mokosuitestorelocator.xml b/source/pkg_mokosuitestorelocator.xml
index e756649..5343e94 100644
--- a/source/pkg_mokosuitestorelocator.xml
+++ b/source/pkg_mokosuitestorelocator.xml
@@ -18,7 +18,7 @@
 <extension type="package" method="upgrade">
 	<name>MokoSuite Store Locator</name>
 	<packagename>mokosuitestorelocator</packagename>
-	<version>01.02.02</version>
+	<version>01.02.29</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>