diff --git a/src/Controller/RoomController.php b/src/Controller/RoomController.php
index 51b014b..f349cbd 100644
--- a/src/Controller/RoomController.php
+++ b/src/Controller/RoomController.php
@@ -344,7 +344,7 @@ class RoomController extends AbstractController
                 sprintf(
                     '%s@%s',
                     time(), // @TODO save timestamp as part of key to keep timing actual for the chat feature
-                    $request->get('user') === 'ip' ? $request->getClientIp() : 'anonymous'
+                    $request->get('user') === 'ip' ? $request->getClientIp() : 'guest'
                 ),
                 $request->get('message')
             )
@@ -408,7 +408,7 @@ class RoomController extends AbstractController
 
     private function _identicon(mixed $value): ?string
     {
-        if ($value === 'anonymous')
+        if ($value === 'guest')
         {
             return null;
         }
diff --git a/templates/default/module/post.html.twig b/templates/default/module/post.html.twig
index 75c2c77..ba5bc67 100644
--- a/templates/default/module/post.html.twig
+++ b/templates/default/module/post.html.twig
@@ -4,13 +4,13 @@
             <output name="error" for="form-post-message">{{ error }}</output>
         {% endif %}
         <textarea name="message" id="form-post-message" placeholder="{{ 'enter your message...' | trans }}">{{ message }}</textarea>
-        {% if user == 'anonymous' or user != 'ip' %}
-            <input type="radio" name="user" value="anonymous" id="form-post-user-anonymous" checked="checked" />
+        {% if user == 'guest' or user != 'ip' %}
+            <input type="radio" name="user" value="guest" id="form-post-user-guest" checked="checked" />
         {% else %}
-            <input type="radio" name="user" value="anonymous" id="form-post-user-anonymous" />
+            <input type="radio" name="user" value="guest" id="form-post-user-guest" />
         {% endif %}
-        <label for="form-post-user-anonymous">
-            {{ 'anonymous' | trans }}
+        <label for="form-post-user-guest">
+            {{ 'guest' | trans }}
         </label>
         {% if user == 'ip' %}
             <input type="radio" name="user" value="ip" id="form-post-user-ip" checked="checked" />
diff --git a/templates/default/room/index.html.twig b/templates/default/room/index.html.twig
index 5a61c72..2b2b71b 100644
--- a/templates/default/room/index.html.twig
+++ b/templates/default/room/index.html.twig
@@ -20,7 +20,7 @@
                         <img src="{{ post.icon }}" alt="icon" />
                     {% else %}
                         <strong>
-                            @{{ 'anonymous' | trans }}
+                            @{{ 'guest' | trans }}
                         </strong>
                     {% endif %}
                     &bull;