diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 31afd6e2db..d185daadb5 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -46,7 +46,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [
     "communityScripts/notificationCore/notificationCore.js",
     "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
     {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"},
-    "communityScripts/armored-chat/armored_chat.js",
+    "system/domainChat/domainChat.js",
     //"system/chat.js"
 ];
 
diff --git a/scripts/communityScripts/armored-chat/README.md b/scripts/system/domainChat/README.md
similarity index 93%
rename from scripts/communityScripts/armored-chat/README.md
rename to scripts/system/domainChat/README.md
index 2385494676..8ed2e8d911 100644
--- a/scripts/communityScripts/armored-chat/README.md
+++ b/scripts/system/domainChat/README.md
@@ -1,15 +1,15 @@
-# Armored Chat
+# Domain Chat
 
-1. What is Armored Chat
+1. What is Domain Chat
 2. User manual
     - Installation
     - Settings
     - Usability tips
 3. Development
 
-## What is Armored Chat
+## What is Domain Chat
 
-Armored Chat is a chat application strictly made to communicate between players in the same domain. It is made using QML and to be as light weight as reasonably possible.
+Domain Chat is a chat application strictly made to communicate between players in the same domain. It is made using QML and to be as light weight as reasonably possible.
 
 ### Dependencies
 
@@ -21,7 +21,7 @@ For notifications, AC uses [notificationCore.js](https://github.com/overte-org/o
 
 ### Installation
 
-Armored Chat is preinstalled courtesy of [defaultScripts.js](https://github.com/overte-org/overte/blob/8661e8a858663b48e8485c2cd7120dc3e2d7b87e/scripts/defaultScripts.js).
+Domain Chat is preinstalled courtesy of [defaultScripts.js](https://github.com/overte-org/overte/blob/8661e8a858663b48e8485c2cd7120dc3e2d7b87e/scripts/defaultScripts.js).
 
 If AC is not preinstalled, or for some other reason it can not be automatically installed, you can install it manually by following [these instructions](https://github.com/overte-org/overte/blob/8661e8a858663b48e8485c2cd7120dc3e2d7b87e/scripts/defaultScripts.js) to open your script management application, and loading the script url:
 
@@ -33,7 +33,7 @@ https://raw.githubusercontent.com/overte-org/overte/master/scripts/communityScri
 
 ### Settings
 
-Armored Chat comes with basic settings for managing itself.
+Domain Chat comes with basic settings for managing itself.
 
 #### External window
 
diff --git a/scripts/communityScripts/armored-chat/armored_chat.js b/scripts/system/domainChat/domainChat.js
similarity index 98%
rename from scripts/communityScripts/armored-chat/armored_chat.js
rename to scripts/system/domainChat/domainChat.js
index ae46f4d8f3..8d64f35e16 100644
--- a/scripts/communityScripts/armored-chat/armored_chat.js
+++ b/scripts/system/domainChat/domainChat.js
@@ -1,5 +1,5 @@
 //
-//  armored_chat.js
+//  domainChat.js
 //
 //  Created by Armored Dragon, May 17th, 2024.
 //  Copyright 2024 Overte e.V.
@@ -62,7 +62,7 @@
         appButton.clicked.connect(toggleMainChatWindow);
 
         quickMessage = new OverlayWindow({
-            source: Script.resolvePath("./armored_chat_quick_message.qml"),
+            source: Script.resolvePath("./domainChatQuick.qml"),
         });
 
         _openWindow();
@@ -79,7 +79,7 @@
     }
     function _openWindow() {
         chatOverlayWindow = new Desktop.createWindow(
-            Script.resolvePath("./armored_chat.qml"),
+            Script.resolvePath("./domainChat.qml"),
             {
                 title: "Chat",
                 size: { x: 550, y: 400 },
diff --git a/scripts/communityScripts/armored-chat/armored_chat.qml b/scripts/system/domainChat/domainChat.qml
similarity index 100%
rename from scripts/communityScripts/armored-chat/armored_chat.qml
rename to scripts/system/domainChat/domainChat.qml
diff --git a/scripts/communityScripts/armored-chat/armored_chat_quick_message.qml b/scripts/system/domainChat/domainChatQuick.qml
similarity index 100%
rename from scripts/communityScripts/armored-chat/armored_chat_quick_message.qml
rename to scripts/system/domainChat/domainChatQuick.qml
diff --git a/scripts/communityScripts/armored-chat/img/icon_black.png b/scripts/system/domainChat/img/icon_black.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/icon_black.png
rename to scripts/system/domainChat/img/icon_black.png
diff --git a/scripts/communityScripts/armored-chat/img/icon_white.png b/scripts/system/domainChat/img/icon_white.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/icon_white.png
rename to scripts/system/domainChat/img/icon_white.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/send.svg b/scripts/system/domainChat/img/ui/send.svg
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/send.svg
rename to scripts/system/domainChat/img/ui/send.svg
diff --git a/scripts/communityScripts/armored-chat/img/ui/send_black.png b/scripts/system/domainChat/img/ui/send_black.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/send_black.png
rename to scripts/system/domainChat/img/ui/send_black.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/send_white.png b/scripts/system/domainChat/img/ui/send_white.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/send_white.png
rename to scripts/system/domainChat/img/ui/send_white.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/settings_black.png b/scripts/system/domainChat/img/ui/settings_black.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/settings_black.png
rename to scripts/system/domainChat/img/ui/settings_black.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/settings_white.png b/scripts/system/domainChat/img/ui/settings_white.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/settings_white.png
rename to scripts/system/domainChat/img/ui/settings_white.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/social_black.png b/scripts/system/domainChat/img/ui/social_black.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/social_black.png
rename to scripts/system/domainChat/img/ui/social_black.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/social_white.png b/scripts/system/domainChat/img/ui/social_white.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/social_white.png
rename to scripts/system/domainChat/img/ui/social_white.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/world_black.png b/scripts/system/domainChat/img/ui/world_black.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/world_black.png
rename to scripts/system/domainChat/img/ui/world_black.png
diff --git a/scripts/communityScripts/armored-chat/img/ui/world_white.png b/scripts/system/domainChat/img/ui/world_white.png
similarity index 100%
rename from scripts/communityScripts/armored-chat/img/ui/world_white.png
rename to scripts/system/domainChat/img/ui/world_white.png