diff --git a/src/client/java/works/alya/command/impl/NameCommand.java b/src/client/java/works/alya/command/impl/NameCommand.java
index 8e5da36..472f572 100644
--- a/src/client/java/works/alya/command/impl/NameCommand.java
+++ b/src/client/java/works/alya/command/impl/NameCommand.java
@@ -33,9 +33,9 @@ public NameCommand() {
     @Override
     protected void build(LiteralArgumentBuilder<ServerCommandSource> builder) {
         builder
-                .then(CommandManager.argument("name", StringArgumentType.word())
+                .then(CommandManager.argument("name", StringArgumentType.greedyString())
                         .executes(context -> {
-                            AlyaConstants.NAME = StringArgumentType.getString(context, "name");
+                            AlyaConstants.CLIENT_NAME = StringArgumentType.getString(context, "name");
                             return 1;
                         }))
                 .executes(this::usage);
diff --git a/src/client/java/works/alya/module/impl/visual/HUDModule.java b/src/client/java/works/alya/module/impl/visual/HUDModule.java
index b53fd95..1457bea 100644
--- a/src/client/java/works/alya/module/impl/visual/HUDModule.java
+++ b/src/client/java/works/alya/module/impl/visual/HUDModule.java
@@ -23,6 +23,7 @@
 import works.alya.event.impl.Render2DEvent;
 import works.alya.module.Module;
 import works.alya.module.ModuleCategory;
+import works.alya.utilities.misc.AlyaConstants;
 import works.alya.utilities.render.ColorUtility;
 import works.alya.utilities.render.RenderUtility;
 import works.alya.utilities.render.TextRendererUtility;
@@ -126,7 +127,7 @@ public HUDModule() {
         String fpsText = String.format("§7[§r%s FPS§7]§r", AlyaClient.getFps());
         String bpsText = String.format("§7[§r%s BPS§7]§r", AlyaClient.getBps());
         String timeText = String.format("§7[§r%s§7]§r", AlyaClient.getTime());
-        String hudText = AlyaClient.getName();
+        String hudText = AlyaConstants.CLIENT_NAME;
 
         if(showFPS.getValue())
             hudText += " " + fpsText;
diff --git a/src/client/java/works/alya/utilities/misc/AlyaConstants.java b/src/client/java/works/alya/utilities/misc/AlyaConstants.java
index a7d951e..8317f64 100644
--- a/src/client/java/works/alya/utilities/misc/AlyaConstants.java
+++ b/src/client/java/works/alya/utilities/misc/AlyaConstants.java
@@ -17,7 +17,8 @@
 package works.alya.utilities.misc;
 
 public class AlyaConstants {
-    public static String NAME = "Alya";
+    public static String CLIENT_NAME = "Alya";
+    public static final String NAME = "Alya";
     public static final String VERSION = "0.1";
     public static final String KIND = "Beta";
     public static final String BUILD_NUMBER = "07052025.6";