diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
index 1db46379e..6b49a0418 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
@@ -526,7 +526,7 @@ _(Allow Remote Access)_:
 <?endif?>
 
 &nbsp;
-: <connect-wan-ip-check php-wan-ip="<?=@file_get_contents('https://wanip4.unraid.net/')?>"></connect-wan-ip-check>
+: <unraid-wan-ip-check php-wan-ip="<?=@file_get_contents('https://wanip4.unraid.net/')?>"></unraid-wan-ip-check>
 
 <div markdown="1" id="wanpanel" style="display:'none'">
 
@@ -691,7 +691,7 @@ $(function() {
 : <span>_(Questions? See <a href="https://docs.unraid.net/category/unraid-connect" target="_blank">the documentation</a>.)_</span>
 
 _(Account status)_:
-: <connect-auth></connect-auth>
+: <unraid-auth></unraid-auth>
 
 <?if($isRegistered):?>
 _(Connected to Unraid Connect Cloud)_: 
@@ -703,6 +703,6 @@ _(Connected to Unraid Connect Cloud)_:
 <?endif // end check for ($isRegistered) ?>
 
 _(Download unraid-api Logs)_:
-: <connect-download-api-logs></connect-download-api-logs>
+: <unraid-download-api-logs></unraid-download-api-logs>
 </div>
 <!-- end unraid-api section -->
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page
index 971d965cc..138f3a769 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Registration.page
@@ -259,4 +259,4 @@ _(Replaceable)_:
 <?endif;?>
 
 &nbsp;
-: <connect-key-actions></connect-key-actions>
+: <unraid-key-actions></unraid-key-actions>
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers1.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers1.php
index 4996d8525..5446d015a 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers1.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers1.php
@@ -11,7 +11,7 @@
     -ms-flex-align: center;
     align-items: center;
 }
-connect-user-profile {
+unraid-user-profile {
     font-size: 16px;
     margin-left: auto;
     height: 100%;
@@ -19,12 +19,12 @@ connect-user-profile {
 </style>
 <?php
 // Set the path for the local manifest file
-$localManifestFile = '/usr/local/emhttp/plugins/dynamix.my.servers/connect-components/manifest.json';
+$localManifestFile = '/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/manifest.json';
 
 // Load the local manifest
 $localManifest = json_decode(file_get_contents($localManifestFile), true);
 
-$searchText = 'connect-components.client.mjs';
+$searchText = 'unraid-components.client.mjs';
 $fileValue = null;
 
 foreach ($localManifest as $key => $value) {
@@ -35,7 +35,7 @@ foreach ($localManifest as $key => $value) {
 }
 
 if ($fileValue !== null) {
-    $prefixedPath = '/plugins/dynamix.my.servers/connect-components/';
+    $prefixedPath = '/plugins/dynamix.my.servers/unraid-components/';
     echo '<script src="' . $prefixedPath . $fileValue . '"></script>';
 } else {
     echo '<script>console.error("%cNo matching key containing \'' . $searchText . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers2.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers2.php
index 1538b0564..beae15cb1 100644
--- a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers2.php
+++ b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/myservers2.php
@@ -2,14 +2,14 @@
 $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 require_once("$docroot/plugins/dynamix.my.servers/include/state.php");
 // var_dump($serverState);
-echo "<connect-user-profile server='" . json_encode($serverState) . "'></connect-user-profile>";
+echo "<unraid-user-profile server='" . json_encode($serverState) . "'></unraid-user-profile>";
 ?>
 <script>
 /**
  * So we're not needing to modify DefaultLayout with an additional include,
  * we'll add the Modals web component to the bottom of the body
  */
-const modalsWebComponent = 'connect-modals';
+const modalsWebComponent = 'unraid-modals';
 if (!document.getElementsByTagName(modalsWebComponent).length) {
     const $body = document.getElementsByTagName('body')[0];
     const $modals = document.createElement(modalsWebComponent);