diff --git a/FakeName/Hooker.cs b/FakeName/Hooker.cs
index 7d2b6b5..07b4469 100644
--- a/FakeName/Hooker.cs
+++ b/FakeName/Hooker.cs
@@ -105,6 +105,11 @@ private unsafe void Framework_Update(IFramework framework)
             Replacement.Clear();
             Replacement[GetNamesSimple(player.Name.TextValue)] = Service.Config.FakeNameText;
 
+            foreach ((var key, var value) in Service.Config.NameDict)
+            {
+                Replacement[new string[] { key }] = value;
+            }
+
             if (!Service.Config.AllPlayerReplace) return;
 
             foreach (var obj in Service.ObjectTable)
@@ -141,7 +146,8 @@ private unsafe void Framework_Update(IFramework framework)
                 var item = list->ItemRendererList[i];
                 var textNode = item.AtkComponentListItemRenderer->AtkComponentButton.ButtonTextNode;
 
-                if (Service.Config.FriendList.Add(textNode->NodeText.ToString()))
+                var text = textNode->NodeText.ToString();
+                if (!text.Contains('.') && Service.Config.FriendList.Add(text))
                 {
                     Service.Config.SaveConfig();
                 }
@@ -209,15 +215,15 @@ private static string[] GetNamesFull(string name)
 
         var first = names[0];
         var last = names[1];
-        var firstShort = first.ToUpper()[0] + ".";
-        var lastShort = last.ToUpper()[0] + ".";
+        //var firstShort = first.ToUpper()[0] + ".";
+        //var lastShort = last.ToUpper()[0] + ".";
 
         return new string[]
         {
             name,
-            $"{first} {lastShort}",
-            $"{firstShort} {last}",
-            $"{firstShort} {lastShort}",
+            //$"{first} {lastShort}",
+            //$"{firstShort} {last}",
+            //$"{firstShort} {lastShort}",
             first, last,
         };
     }
diff --git a/FakeName/Windows/ConfigWindow.cs b/FakeName/Windows/ConfigWindow.cs
index cccd378..8610c28 100644
--- a/FakeName/Windows/ConfigWindow.cs
+++ b/FakeName/Windows/ConfigWindow.cs
@@ -1,11 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Windowing;
-using FFXIVClientStructs.FFXIV.Client.UI;
 using ImGuiNET;
-using System;
-using System.Drawing;
 using System.Linq;
-using static Dalamud.Interface.Utility.Raii.ImRaii;
 
 namespace FakeName.Windows;