diff --git a/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php b/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php
index e9412d77..a5d16acf 100644
--- a/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php
+++ b/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php
@@ -188,8 +188,8 @@ 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;
 					}
 				}
 			}
diff --git a/source/packages/plg_system_mokosuiteclient/Extension/MokoSuiteClient.php b/source/packages/plg_system_mokosuiteclient/Extension/MokoSuiteClient.php
index d1702a2c..7fe0f4c2 100644
--- a/source/packages/plg_system_mokosuiteclient/Extension/MokoSuiteClient.php
+++ b/source/packages/plg_system_mokosuiteclient/Extension/MokoSuiteClient.php
@@ -2535,8 +2535,8 @@ class MokoSuiteClient extends CMSPlugin implements BootableExtensionInterface
 
 		if ($signature !== null)
 		{
-			$headers[] = 'X-MokoSuiteClient-Signature: ' . $signature;
-			$headers[] = 'X-MokoSuiteClient-Timestamp: ' . $timestamp;
+			$headers[] = 'X-MokoSuite-Signature: ' . $signature;
+			$headers[] = 'X-MokoSuite-Timestamp: ' . $timestamp;
 		}
 
 		$endpoint = $baseUrl . '/api/index.php/v1/mokosuitehq/heartbeat';
diff --git a/source/packages/plg_system_mokosuiteclient_monitor/src/Extension/Monitor.php b/source/packages/plg_system_mokosuiteclient_monitor/src/Extension/Monitor.php
index 9012e4ef..2d8ab2e7 100644
--- a/source/packages/plg_system_mokosuiteclient_monitor/src/Extension/Monitor.php
+++ b/source/packages/plg_system_mokosuiteclient_monitor/src/Extension/Monitor.php
@@ -187,8 +187,8 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 
 		if ($signature !== null)
 		{
-			$headers[] = 'X-MokoSuiteClient-Signature: ' . $signature;
-			$headers[] = 'X-MokoSuiteClient-Timestamp: ' . $timestamp;
+			$headers[] = 'X-MokoSuite-Signature: ' . $signature;
+			$headers[] = 'X-MokoSuite-Timestamp: ' . $timestamp;
 		}
 
 		$endpoint = $baseUrl . '/api/index.php/v1/mokosuitehq/heartbeat';
diff --git a/source/script.php b/source/script.php
index d596cca2..bc85e657 100644
--- a/source/script.php
+++ b/source/script.php
@@ -943,8 +943,8 @@ class Pkg_MokosuiteclientInstallerScript
 
 					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;
 					}
 				}
 			}