diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml b/Content.Client/Administration/UI/AdminMenuWindow.xaml
index b60988b12f..7153dfb5a7 100644
--- a/Content.Client/Administration/UI/AdminMenuWindow.xaml
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml
@@ -1,17 +1,13 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:adminMenu="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs;assembly=Content.Client"
-    xmlns:adminTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
-    xmlns:adminbusTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
-    xmlns:atmosTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
-    xmlns:adminTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
-    xmlns:adminbusTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
-    xmlns:atmosTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
+    xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+    xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
+    xmlns:atmosTab="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
     xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs">
     <TabContainer Name="MasterTabContainer">
-        <adminTab1:AdminTab />
-        <adminbusTab1:AdminbusTab />
-        <atmosTab1:AtmosTab />
+        <adminTab:AdminTab />
+        <adminbusTab:AdminbusTab />
+        <atmosTab:AtmosTab />
         <tabs:RoundTab />
         <tabs:ServerTab />
         <tabs:PlayerTab Name="PlayerTabControl" />
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index a4b022ee27..30a1cb64bf 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -1,19 +1,17 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
     Margin="4"
     MinSize="50 50">
     <VBoxContainer>
         <GridContainer Columns="4">
-            <customControls:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type adminTab:KickWindow}" />
-            <customControls:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type adminTab:BanWindow}" />
-            <customControls:CommandButton Command="aghost" Text="{Loc Admin Ghost}" />
-            <customControls:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type adminTab:TeleportWindow}" />
-            <customControls:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
+            <cc:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type at:KickWindow}" />
+            <cc:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type at:BanWindow}" />
+            <cc:CommandButton Command="aghost" Text="{Loc Admin Ghost}" />
+            <cc:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type at:TeleportWindow}" />
+            <cc:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
         </GridContainer>
     </VBoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
index c228b2dd28..18b82ca927 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
@@ -1,6 +1,5 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     Title="{Loc Ban}" MinSize="425 162">
     <VBoxContainer>
         <HBoxContainer>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
index cf317b4570..72d79c8a53 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
@@ -1,7 +1,6 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Kick}" MinSize="425 272">
     <VBoxContainer>
         <HBoxContainer>
@@ -9,7 +8,7 @@
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
         </HBoxContainer>
-        <customControls:PlayerListControl Name="PlayerList" />
+        <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Kick}" />
     </VBoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
index 55b58fa5e6..ef7635c599 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -1,10 +1,9 @@
 <SS14Window
     xmlns="https://spacestation14.io"
-    xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Teleport}" MinSize="425 230">
     <VBoxContainer>
-        <customControls:PlayerListControl Name="PlayerList" />
+        <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Teleport}" />
     </VBoxContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
index 5f97a32289..36b4e7baee 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
@@ -1,16 +1,14 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abt="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:abt="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="4">
-        <customControls:CommandButton Name="SpawnEntitiesButton" Text="{Loc Spawn Entities}" />
-        <customControls:CommandButton Name="SpawnTilesButton" Text="{Loc Spawn Tiles} " />
-        <customControls:UICommandButton Command="events" Text="{Loc Station Events}" WindowType="{x:Type adminbusTab:StationEventsWindow}" />
+        <cc:CommandButton Name="SpawnEntitiesButton" Text="{Loc Spawn Entities}" />
+        <cc:CommandButton Name="SpawnTilesButton" Text="{Loc Spawn Tiles} " />
+        <cc:UICommandButton Command="events" Text="{Loc Station Events}" WindowType="{x:Type abt:StationEventsWindow}" />
     </GridContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
index 034947bb2c..9916972ac1 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
@@ -1,17 +1,15 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    xmlns:atmosTab="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
     Margin="4"
     MinSize="50 50">
     <GridContainer Columns="4">
-        <customControls:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type atmosTab:AddAtmosWindow}" />
-        <customControls:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type atmosTab:AddGasWindow}" />
-        <customControls:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type atmosTab:FillGasWindow}" />
-        <customControls:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
-                             WindowType="{x:Type atmosTab:SetTemperatureWindow}" />
+        <cc:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
+        <cc:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
+        <cc:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
+        <cc:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
+                             WindowType="{x:Type at:SetTemperatureWindow}" />
     </GridContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
index 7a3cdae0b1..4d629c806f 100644
--- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
@@ -1,13 +1,12 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="4">
-        <customControls:CommandButton Command="startround" Text="{Loc Start Round}" />
-        <customControls:CommandButton Command="endround" Text="{Loc End Round}" />
-        <customControls:CommandButton Command="restartround" Text="{Loc Restart Round}" />
+        <cc:CommandButton Command="startround" Text="{Loc Start Round}" />
+        <cc:CommandButton Command="endround" Text="{Loc End Round}" />
+        <cc:CommandButton Command="restartround" Text="{Loc Restart Round}" />
     </GridContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/ServerTab.xaml b/Content.Client/Administration/UI/Tabs/ServerTab.xaml
index 25a2636da7..fb2431734a 100644
--- a/Content.Client/Administration/UI/Tabs/ServerTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml
@@ -1,12 +1,11 @@
 <Control
     xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Margin="4"
     MinSize="50 50">
     <GridContainer
         Columns="4" >
-        <customControls:CommandButton Command="restart" Text="{Loc Reboot}"></customControls:CommandButton>
-        <customControls:CommandButton Command="shutdown" Text="{Loc Shutdown}"></customControls:CommandButton>
+        <cc:CommandButton Command="restart" Text="{Loc Reboot}"></cc:CommandButton>
+        <cc:CommandButton Command="shutdown" Text="{Loc Shutdown}"></cc:CommandButton>
     </GridContainer>
 </Control>
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index cd76429379..c763c4ad2e 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -1,5 +1,4 @@
 <changelog:ChangelogWindow xmlns="https://spacestation14.io"
-                           xmlns:cui="clr-namespace:Content.Client.UserInterface"
                            xmlns:changelog="clr-namespace:Content.Client.Changelog"
                            xmlns:ui="clr-namespace:Content.Client.HUD.UI"
                            MinSize="500 400" MouseFilter="Stop">
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
index 2707629137..aa892e473b 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
@@ -1,5 +1,4 @@
 <SS14Window xmlns="https://spacestation14.io"
-            xmlns:voting="clr-namespace:Content.Client.Voting"
             xmlns:changelog="clr-namespace:Content.Client.Changelog"
             xmlns:ui="clr-namespace:Content.Client.Voting.UI"
             Title="{Loc 'ui-escape-title'}"
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index 5d0b18a7ce..f879c5ff73 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -1,7 +1,6 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:cuic="clr-namespace:Content.Client.UserInterface"
          xmlns:parallax="clr-namespace:Content.Client.Parallax"
          xmlns:ui="clr-namespace:Content.Client.HUD.UI">
     <parallax:ParallaxControl />
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 044efe17a1..71501731f4 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -1,16 +1,13 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:cui="clr-namespace:Content.Client.UserInterface"
-         xmlns:chat="clr-namespace:Content.Client.Chat"
          xmlns:maths="clr-namespace:Robust.Shared.Maths;assembly=Robust.Shared.Maths"
-         xmlns:voting="clr-namespace:Content.Client.Voting"
          xmlns:parallax="clr-namespace:Content.Client.Parallax"
          xmlns:ui="clr-namespace:Content.Client.Voting.UI"
          xmlns:style="clr-namespace:Content.Client.Stylesheets"
-         xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
-         xmlns:ui2="clr-namespace:Content.Client.Chat.UI"
-         xmlns:ui3="clr-namespace:Content.Client.Lobby.UI"
+         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
+         xmlns:chatUi="clr-namespace:Content.Client.Chat.UI"
+         xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI"
          xmlns:info="clr-namespace:Content.Client.Info">
 
     <Control>
@@ -43,7 +40,7 @@
                 <HBoxContainer VerticalExpand="True">
                     <!-- Left panel -->
                     <VBoxContainer Name="CLeftPanelContainer" HorizontalExpand="True">
-                        <ui1:StripeBack>
+                        <hudUi:StripeBack>
                             <MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3"
                                              MarginTopOverride="3">
                                 <HBoxContainer SeparationOverride="6">
@@ -55,11 +52,11 @@
                                             StyleClasses="ButtonBig" />
                                 </HBoxContainer>
                             </MarginContainer>
-                        </ui1:StripeBack>
+                        </hudUi:StripeBack>
                         <MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3"
                                          MarginBottomOverride="3"
                                          MarginTopOverride="3">
-                            <ui2:ChatBox Name="CChat" />
+                            <chatUi:ChatBox Name="CChat" />
                         </MarginContainer>
                     </VBoxContainer>
                     <!-- Gold line -->
@@ -72,16 +69,16 @@
                     <Control HorizontalExpand="True">
                         <VBoxContainer>
                             <!-- Player list -->
-                            <ui1:NanoHeading Text="{Loc 'Online Players'}" />
+                            <hudUi:NanoHeading Text="{Loc 'Online Players'}" />
                             <MarginContainer VerticalExpand="True"
                                              MarginRightOverride="3" MarginLeftOverride="3"
                                              MarginBottomOverride="3" MarginTopOverride="3">
-                                <ui3:LobbyPlayerList Name="COnlinePlayerList"
+                                <lobbyUi:LobbyPlayerList Name="COnlinePlayerList"
                                                      HorizontalExpand="True"
                                                      VerticalExpand="True" />
                             </MarginContainer>
                             <!-- Server info -->
-                            <ui1:NanoHeading Text="{Loc 'Server Info'}" />
+                            <hudUi:NanoHeading Text="{Loc 'Server Info'}" />
                             <MarginContainer VerticalExpand="True"
                                              MarginRightOverride="3" MarginLeftOverride="3"
                                              MarginBottomOverride="2" MarginTopOverride="3">
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
index 727f73c702..5867ca9588 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -1,8 +1,7 @@
 <ui:VoteCallMenu xmlns="https://spacestation14.io"
-                xmlns:v="clr-namespace:Content.Client.Voting"
-                xmlns:ui="clr-namespace:Content.Client.Voting.UI"
-                xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
-                MouseFilter="Stop" MinSize="350 150">
+                 xmlns:ui="clr-namespace:Content.Client.Voting.UI"
+                 xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
+                 MouseFilter="Stop" MinSize="350 150">
     <PanelContainer StyleClasses="AngleRect" />
     <VBoxContainer>
         <HBoxContainer>
@@ -14,7 +13,7 @@
                                SizeFlagsVertical="ShrinkCenter" />
             </MarginContainer>
         </HBoxContainer>
-        <ui1:HighDivider />
+        <hudUi:HighDivider />
 
         <MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
                          MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">