diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
index 35c63cb975..20c64f827d 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
@@ -4,12 +4,12 @@
     MinWidth="500">
     <GridContainer Columns="1">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <LineEdit Name="_announcer" PlaceHolder="{Loc 'announcer-placeholder'}" Text="{Loc 'Central Command'}" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
+            <LineEdit Name="Announcer" Access="Public" PlaceHolder="{Loc 'announcer-placeholder'}" Text="{Loc 'Central Command'}" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
             <Control HorizontalExpand="True" SizeFlagsStretchRatio="1" />
-            <OptionButton Name="_announceMethod" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
+            <OptionButton Name="AnnounceMethod" Access="Public" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
         </BoxContainer>
-        <LineEdit Name="_announcement" PlaceHolder="{Loc 'announcement-placeholder'}"/>
+        <LineEdit Name="Announcement" Access="Public" PlaceHolder="{Loc 'announcement-placeholder'}"/>
 
-        <Button Name="_announceButton" Disabled="True" Text="{Loc 'Announce'}" HorizontalAlignment="Center"/>
+        <Button Name="AnnounceButton" Access="Public" Disabled="True" Text="{Loc 'Announce'}" HorizontalAlignment="Center"/>
     </GridContainer>
 </SS14Window>
diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
index bbb1f4907d..93f81ca807 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
@@ -13,10 +13,6 @@ namespace Content.Client.Administration.UI
     public partial class AdminAnnounceWindow : SS14Window
     {
         [Dependency] private readonly ILocalizationManager _localization = default!;
-        public Button AnnounceButton => _announceButton;
-        public OptionButton AnnounceMethod => _announceMethod;
-        public LineEdit Announcer => _announcer;
-        public LineEdit Announcement => _announcement;
 
         public AdminAnnounceWindow()
         {
diff --git a/Content.Client/Alerts/ClientAlertsComponent.cs b/Content.Client/Alerts/ClientAlertsComponent.cs
index 7f400dce25..385135589c 100644
--- a/Content.Client/Alerts/ClientAlertsComponent.cs
+++ b/Content.Client/Alerts/ClientAlertsComponent.cs
@@ -112,7 +112,7 @@ namespace Content.Client.Alerts
             {
                 _alertControls.Remove(alertKeyToRemove, out var control);
                 if (control == null) return;
-                _ui.Grid.Children.Remove(control);
+                _ui.AlertContainer.Children.Remove(control);
             }
 
             // now we know that alertControls contains alerts that should still exist but
@@ -145,7 +145,7 @@ namespace Content.Client.Alerts
                 {
                     if (existingAlertControl != null)
                     {
-                        _ui.Grid.Children.Remove(existingAlertControl);
+                        _ui.AlertContainer.Children.Remove(existingAlertControl);
                     }
 
                     // this is a new alert + alert key or just a different alert with the same
@@ -154,12 +154,12 @@ namespace Content.Client.Alerts
                     if (_alertOrder != null)
                     {
                         var added = false;
-                        foreach (var alertControl in _ui.Grid.Children)
+                        foreach (var alertControl in _ui.AlertContainer.Children)
                         {
                             if (_alertOrder.Compare(newAlert, ((AlertControl) alertControl).Alert) < 0)
                             {
                                 var idx = alertControl.GetPositionInParent();
-                                _ui.Grid.Children.Add(newAlertControl);
+                                _ui.AlertContainer.Children.Add(newAlertControl);
                                 newAlertControl.SetPositionInParent(idx);
                                 added = true;
                                 break;
@@ -168,12 +168,12 @@ namespace Content.Client.Alerts
 
                         if (!added)
                         {
-                            _ui.Grid.Children.Add(newAlertControl);
+                            _ui.AlertContainer.Children.Add(newAlertControl);
                         }
                     }
                     else
                     {
-                        _ui.Grid.Children.Add(newAlertControl);
+                        _ui.AlertContainer.Children.Add(newAlertControl);
                     }
 
                     _alertControls[newAlert.AlertKey] = newAlertControl;
diff --git a/Content.Client/Alerts/UI/AlertsUI.xaml b/Content.Client/Alerts/UI/AlertsUI.xaml
index 516db31159..bfb0824499 100644
--- a/Content.Client/Alerts/UI/AlertsUI.xaml
+++ b/Content.Client/Alerts/UI/AlertsUI.xaml
@@ -3,7 +3,7 @@
     <PanelContainer StyleClasses="TransparentBorderedWindowPanel"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Top">
-        <GridContainer Name="AlertContainer" MaxGridHeight="64" ExpandBackwards="True">
+        <GridContainer Name="AlertContainer" Access="Public" MaxGridHeight="64" ExpandBackwards="True">
 
         </GridContainer>
     </PanelContainer>
diff --git a/Content.Client/Alerts/UI/AlertsUI.xaml.cs b/Content.Client/Alerts/UI/AlertsUI.xaml.cs
index 0a1d35ef88..0bbbe9d08c 100644
--- a/Content.Client/Alerts/UI/AlertsUI.xaml.cs
+++ b/Content.Client/Alerts/UI/AlertsUI.xaml.cs
@@ -18,8 +18,6 @@ namespace Content.Client.Alerts.UI
 
         public const float ChatSeparation = 38f;
 
-        public GridContainer Grid => AlertContainer;
-
         public AlertsUI()
         {
             IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index 867556ce92..2a8953ff2b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -2,7 +2,7 @@
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
             SetSize="400 600"
             MinSize="400 600">
-    <BoxContainer Orientation="Vertical" Name="rows"> <!-- TODO: remove name -->
+    <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-console-menu-account-name-label'}"
                    StyleClasses="LabelKeyText" />
@@ -28,7 +28,8 @@
                    Text="0/20" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Button Name="CallShuttleButtonProtected"
+            <Button Name="CallShuttleButton"
+                    Access="Public"
                     Text="{Loc 'cargo-console-menu-call-shuttle-button'}"
                     TextAlign="Center"
                     HorizontalExpand="True"/>
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index a4a5ac5e9b..b0d45d7bf1 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -25,8 +25,6 @@ namespace Content.Client.Cargo.UI
         public event Action<ButtonEventArgs>? OnOrderApproved;
         public event Action<ButtonEventArgs>? OnOrderCanceled;
 
-        public Button CallShuttleButton => CallShuttleButtonProtected;
-
         private readonly List<string> _categoryStrings = new();
         private string? _category;
 
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
index 513b3e749c..38b9da642b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml
@@ -3,15 +3,19 @@
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
             <Label Text="{Loc 'cargo-console-order-menu-requester-label'}" />
-            <LineEdit Name="RequesterProtected" />
+            <LineEdit Name="Requester"
+                      Access="Public" />
             <Label Text="{Loc 'cargo-console-order-menu-reason-label'}" />
-            <LineEdit Name="ReasonProtected" />
+            <LineEdit Name="Reason"
+                      Access="Public" />
             <Label Text="{Loc 'cargo-console-order-menu-amount-label'}" />
-            <SpinBox Name="AmountProtected"
+            <SpinBox Name="Amount"
+                     Access="Public"
                      HorizontalExpand="True"
                      Value="1" />
         </GridContainer>
-        <Button Name="SubmitButtonProtected"
+        <Button Name="SubmitButton"
+                Access="Public"
                 Text="{Loc 'cargo-console-order-menu-submit-button'}"
                 TextAlign="Center" />
     </BoxContainer>
diff --git a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
index f5b12989f8..00454b9f72 100644
--- a/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.xaml.cs
@@ -10,11 +10,6 @@ namespace Content.Client.Cargo.UI
     [GenerateTypedNameReferences]
     partial class CargoConsoleOrderMenu : SS14Window
     {
-        public LineEdit Requester => RequesterProtected;
-        public LineEdit Reason => ReasonProtected;
-        public SpinBox Amount => AmountProtected;
-        public Button SubmitButton => SubmitButtonProtected;
-
         public CargoConsoleOrderMenu()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml b/Content.Client/Cargo/UI/CargoOrderRow.xaml
index e20a5a7005..1d636a1a29 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml
@@ -2,25 +2,30 @@
                 HorizontalExpand="True">
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True">
-        <TextureRect Name="IconProtected"
+        <TextureRect Name="Icon"
+                     Access="Public"
                      MinSize="32 32"
                      RectClipContent="True" />
         <BoxContainer Orientation="Vertical"
                       HorizontalExpand="True"
                       VerticalExpand="True">
-            <Label Name="ProductNameProtected"
+            <Label Name="ProductName"
+                   Access="Public"
                    HorizontalExpand="True"
                    StyleClasses="LabelSubText"
                    ClipText="True" />
-            <Label Name="DescriptionProtected"
+            <Label Name="Description"
+                   Access="Public"
                    HorizontalExpand="True"
                    StyleClasses="LabelSubText"
                    ClipText="True" />
         </BoxContainer>
-        <Button Name="ApproveProtected"
+        <Button Name="Approve"
+                Access="Public"
                 Text="{Loc 'cargo-console-menu-cargo-order-row-approve-button'}"
                 StyleClasses="LabelSubText" />
-        <Button Name="CancelProtected"
+        <Button Name="Cancel"
+                Access="Public"
                 Text="{Loc 'cargo-console-menu-cargo-order-row-cancel-button'}"
                 StyleClasses="LabelSubText" />
     </BoxContainer>
diff --git a/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs b/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
index 9caebaf3bf..27e1aaa061 100644
--- a/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoOrderRow.xaml.cs
@@ -9,11 +9,6 @@ namespace Content.Client.Cargo.UI
     public partial class CargoOrderRow : PanelContainer
     {
         public CargoOrderData? Order { get; set; }
-        public TextureRect Icon => IconProtected;
-        public Label ProductName => ProductNameProtected;
-        public Label Description => DescriptionProtected;
-        public Button Approve => ApproveProtected;
-        public Button Cancel => CancelProtected;
 
         public CargoOrderRow()
         {
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml b/Content.Client/Cargo/UI/CargoProductRow.xaml
index 0a33a253d6..ccdf927019 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml
@@ -1,21 +1,25 @@
 <PanelContainer xmlns="https://spacestation14.io"
                 xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                 HorizontalExpand="True">
-    <Button Name="MainButtonProtected"
+    <Button Name="MainButton"
+            Access="Public"
             HorizontalExpand="True"
             VerticalExpand="True" />
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True">
-        <TextureRect Name="IconProtected"
+        <TextureRect Name="Icon"
+                     Access="Public"
                      MinSize="32 32"
                      RectClipContent="True" />
-        <Label Name="ProductNameProtected"
+        <Label Name="ProductName"
+               Access="Public"
                HorizontalExpand="True" />
         <PanelContainer>
             <PanelContainer.PanelOverride>
                 <gfx:StyleBoxFlat BackgroundColor="#25252A" />
             </PanelContainer.PanelOverride>
-            <Label Name="PointCostProtected"
+            <Label Name="PointCost"
+                   Access="Public"
                    MinSize="40 32"
                    Align="Right" />
         </PanelContainer>
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
index e708ee4c6d..2c7c396500 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
@@ -9,10 +9,6 @@ namespace Content.Client.Cargo.UI
     public partial class CargoProductRow : PanelContainer
     {
         public CargoProductPrototype? Product { get; set; }
-        public TextureRect Icon => IconProtected;
-        public Button MainButton => MainButtonProtected;
-        public Label ProductName => ProductNameProtected;
-        public Label PointCost => PointCostProtected;
 
         public CargoProductRow()
         {
diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
index f2256d80f9..df0c3356e4 100644
--- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs
@@ -16,9 +16,9 @@ namespace Content.Client.Chemistry.UI
             base.Open();
             _window = new TransferAmountWindow();
 
-            _window.applyButton.OnPressed += _ =>
+            _window.ApplyButton.OnPressed += _ =>
             {
-                if (int.TryParse(_window.amountLineEdit.Text, out var i))
+                if (int.TryParse(_window.AmountLineEdit.Text, out var i))
                 {
                     SendMessage(new TransferAmountSetValueMessage(ReagentUnit.New(i)));
                     _window.Close();
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
index 63affa73b1..eb0e18b12a 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml
@@ -4,8 +4,8 @@
 
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinSize="240 80">
         <BoxContainer Orientation="Horizontal">
-            <LineEdit Name="AmountLineEdit" HorizontalExpand="True" PlaceHolder="{Loc 'ui-transfer-amount-line-edit-placeholder'}"/>
+            <LineEdit Name="AmountLineEdit" Access="Public" HorizontalExpand="True" PlaceHolder="{Loc 'ui-transfer-amount-line-edit-placeholder'}"/>
         </BoxContainer>
-        <Button Name="ApplyButton" Text="{Loc 'ui-transfer-amount-apply'}"/>
+        <Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-transfer-amount-apply'}"/>
     </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
index 1c94789444..8a25af5f29 100644
--- a/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/TransferAmountWindow.xaml.cs
@@ -8,9 +8,6 @@ namespace Content.Client.Chemistry.UI
     [GenerateTypedNameReferences]
     public partial class TransferAmountWindow : SS14Window
     {
-        public Button applyButton => ApplyButton;
-        public LineEdit amountLineEdit => AmountLineEdit;
-
         public TransferAmountWindow()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
index 2c943206bb..193742e0e6 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml
@@ -3,9 +3,9 @@
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.4">
             <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
                 <LineEdit Name="SearchBar" PlaceHolder="Search" HorizontalExpand="True"/>
-                <OptionButton Name="Category" MinSize="130 0"/>
+                <OptionButton Name="Category" Access="Public" MinSize="130 0"/>
             </BoxContainer>
-            <ItemList Name="RecipesList" SelectMode="Single" VerticalExpand="True"/>
+            <ItemList Name="Recipes" Access="Public" SelectMode="Single" VerticalExpand="True"/>
         </BoxContainer>
         <Control MinSize="10 0"/>
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.6">
@@ -19,7 +19,7 @@
                     </BoxContainer>
                 </BoxContainer>
             </Control>
-            <ItemList Name="StepList" VerticalExpand="True"/>
+            <ItemList Name="RecipeStepList" Access="Public" VerticalExpand="True"/>
             <BoxContainer Orientation="Vertical">
                 <Button Name="BuildButton" Disabled="True" ToggleMode="True" VerticalExpand="True" SizeFlagsStretchRatio="0.5"/>
                 <BoxContainer Orientation="Horizontal" VerticalExpand="True" SizeFlagsStretchRatio="0.5">
diff --git a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index 7ad635d6b7..f149cfb36f 100644
--- a/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Construction.UI
         // It isn't optimal to expose UI controls like this, but the UI control design is
         // questionable so it can't be helped.
         string[] Categories { get; set; }
-        OptionButton CategoryButton { get; }
+        OptionButton Category { get; }
 
         bool EraseButtonPressed { get; set; }
         bool BuildButtonPressed { get; set; }
@@ -63,19 +63,12 @@ namespace Content.Client.Construction.UI
 
         public string[] Categories { get; set; } = Array.Empty<string>();
 
-        public OptionButton CategoryButton => Category;
-
         public bool EraseButtonPressed
         {
             get => EraseButton.Pressed;
             set => EraseButton.Pressed = value;
         }
 
-        /// <inheritdoc />
-        public ItemList Recipes => RecipesList;
-
-        public ItemList RecipeStepList => StepList;
-
         public ConstructionMenu()
         {
             SetSize = MinSize = (720, 320);
@@ -86,8 +79,8 @@ namespace Content.Client.Construction.UI
             Title = Loc.GetString("construction-menu-title");
 
             BuildButton.Text = Loc.GetString("construction-menu-place-ghost");
-            RecipesList.OnItemSelected += obj => RecipeSelected?.Invoke(this, obj.ItemList[obj.ItemIndex]);
-            RecipesList.OnItemDeselected += _ => RecipeSelected?.Invoke(this, null);
+            Recipes.OnItemSelected += obj => RecipeSelected?.Invoke(this, obj.ItemList[obj.ItemIndex]);
+            Recipes.OnItemDeselected += _ => RecipeSelected?.Invoke(this, null);
 
             SearchBar.OnTextChanged += _ => PopulateRecipes?.Invoke(this, (SearchBar.Text, Categories[Category.SelectedId]));
             Category.OnItemSelected += obj =>
@@ -132,7 +125,7 @@ namespace Content.Client.Construction.UI
             TargetName.SetMessage(string.Empty);
             TargetDesc.SetMessage(string.Empty);
             TargetTexture.Texture = null;
-            StepList.Clear();
+            RecipeStepList.Clear();
         }
     }
 }
diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index cbd7bcb62b..684f89afd8 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -199,7 +199,7 @@ namespace Content.Client.Construction.UI
                     uniqueCategories.Add(category);
             }
 
-            _constructionView.CategoryButton.Clear();
+            _constructionView.Category.Clear();
 
             var array = uniqueCategories.ToArray();
             Array.Sort(array);
@@ -207,7 +207,7 @@ namespace Content.Client.Construction.UI
             for (var i = 0; i < array.Length; i++)
             {
                 var category = array[i];
-                _constructionView.CategoryButton.AddItem(category, i);
+                _constructionView.Category.AddItem(category, i);
             }
 
             _constructionView.Categories = array;
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
index 9f93d37b17..3849082435 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml
@@ -6,12 +6,14 @@
         <Label Text="{Loc 'disposal-router-window-tags-label'}" />
         <Control MinSize="0 10" />
         <BoxContainer Orientation="Horizontal">
-            <LineEdit Name="TagInputProtected"
+            <LineEdit Name="TagInput"
+                      Access="Public"
                       HorizontalExpand="True"
                       MinSize="320 0"
                       ToolTip="{Loc 'disposal-router-window-tag-input-tooltip'}" />
             <Control MinSize="10 0" />
-            <Button Name="ConfirmProtected"
+            <Button Name="Confirm"
+                    Access="Public"
                     Text="{Loc 'disposal-router-window-tag-input-confirm-button'}" />
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
index c35653195d..eee479d05d 100644
--- a/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.xaml.cs
@@ -13,9 +13,6 @@ namespace Content.Client.Disposal.UI
     [GenerateTypedNameReferences]
     public partial class DisposalRouterWindow : SS14Window
     {
-        public LineEdit TagInput => TagInputProtected;
-        public Button Confirm => ConfirmProtected;
-
         public DisposalRouterWindow()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
index b395aa6698..0441b0f8f6 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml
@@ -6,11 +6,13 @@
         <Label Text="{Loc 'disposal-tagger-window-tag-input-label'}" />
         <Control MinSize="0 10" />
         <BoxContainer Orientation="Horizontal">
-            <LineEdit Name="TagInputProtected"
+            <LineEdit Name="TagInput"
+                      Access="Public"
                       HorizontalExpand="True"
                       MinSize="320 0" />
             <Control MinSize="10 0" />
-            <Button Name="ConfirmProtected"
+            <Button Name="Confirm"
+                    Access="Public"
                     Text="{Loc 'disposal-tagger-window-tag-confirm-button'}" />
         </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
index 89423b64bf..a7a8c98b78 100644
--- a/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.xaml.cs
@@ -13,9 +13,6 @@ namespace Content.Client.Disposal.UI
     [GenerateTypedNameReferences]
     public partial class DisposalTaggerWindow : SS14Window
     {
-        public LineEdit TagInput => TagInputProtected;
-        public Button Confirm => ConfirmProtected;
-
         public DisposalTaggerWindow()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
index 64e7c81cc0..f8776f7755 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml
@@ -23,14 +23,17 @@
         </BoxContainer>
         <Control MinSize="0 10" />
         <BoxContainer Orientation="Horizontal">
-            <Button Name="EngageProtected"
+            <Button Name="Engage"
+                    Access="Public"
                     Text="{Loc 'ui-disposal-unit-button-flush'}"
                     StyleClasses="OpenRight"
                     ToggleMode="True" />
-            <Button Name="EjectProtected"
+            <Button Name="Eject"
+                    Access="Public"
                     Text="{Loc 'ui-disposal-unit-button-eject'}"
                     StyleClasses="OpenBoth" />
-            <CheckButton Name="PowerProtected"
+            <CheckButton Name="Power"
+                         Access="Public"
                          Text="{Loc 'ui-disposal-unit-button-power'}"
                          StyleClasses="OpenLeft" />
         </BoxContainer>
diff --git a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
index 911ade1385..9d39f54671 100644
--- a/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.xaml.cs
@@ -19,10 +19,6 @@ namespace Content.Client.Disposal.UI
     [GenerateTypedNameReferences]
     public partial class DisposalUnitWindow : SS14Window
     {
-        public Button Engage => EngageProtected;
-        public Button Eject => EjectProtected;
-        public Button Power => PowerProtected;
-
         public DisposalUnitWindow()
         {
             IoCManager.InjectDependencies(this);
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
index da20612921..29100d72a9 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
@@ -6,7 +6,8 @@
         <BoxContainer Orientation="Horizontal">
             <RichTextLabel Name="Status" />
         </BoxContainer>
-        <Button Name="SwitchProtected"
+        <Button Name="Switch"
+                Access="Public"
                 TextAlign="Center"
                 MinHeight="60" />
     </BoxContainer>
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
index ed95b3c835..c092e4ddde 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -13,8 +13,6 @@ namespace Content.Client.Gravity.UI
     {
         private readonly GravityGeneratorBoundUserInterface _owner;
 
-        public Button Switch => SwitchProtected;
-
         public GravityGeneratorWindow(GravityGeneratorBoundUserInterface ui)
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Kitchen/UI/LabelledContentBox.xaml b/Content.Client/Kitchen/UI/LabelledContentBox.xaml
index d69e52e2a1..0c6a5f9e9c 100644
--- a/Content.Client/Kitchen/UI/LabelledContentBox.xaml
+++ b/Content.Client/Kitchen/UI/LabelledContentBox.xaml
@@ -1,7 +1,7 @@
-<customControls:BoxContainer Orientation="Vertical" xmlns:customControls="https://spacestation14.io">
-    <customControls:SplitContainer Orientation="Horizontal">
-        <customControls:Label Name="Label" Align="Center"/>
-        <customControls:Button Name="Button" TextAlign="Center"/>
-    </customControls:SplitContainer>
-    <customControls:ItemList Name="ItemList" VerticalExpand="True" HorizontalExpand="True" SelectMode="Button" SizeFlagsStretchRatio="2" MinSize="100 128"/>
-</customControls:BoxContainer>
+<BoxContainer Orientation="Vertical" xmlns="https://spacestation14.io">
+    <SplitContainer Orientation="Horizontal">
+        <Label Name="Label" Align="Center"/>
+        <Button Name="EjectButton" Access="Public" TextAlign="Center"/>
+    </SplitContainer>
+    <ItemList Name="BoxContents" Access="Public" VerticalExpand="True" HorizontalExpand="True" SelectMode="Button" SizeFlagsStretchRatio="2" MinSize="100 128"/>
+</BoxContainer>
diff --git a/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs b/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
index b88f8fc4e3..a7a0447328 100644
--- a/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
+++ b/Content.Client/Kitchen/UI/LabelledContentBox.xaml.cs
@@ -7,9 +7,6 @@ namespace Content.Client.Kitchen.UI
     public partial class LabelledContentBox : BoxContainer
     {
         public string? LabelText { get => Label.Text; set => Label.Text = value; }
-        public string? ButtonText { get => Button.Text; set => Button.Text = value; }
-
-        public ItemList BoxContents => ItemList;
-        public Button EjectButton => Button;
+        public string? ButtonText { get => EjectButton.Text; set => EjectButton.Text = value; }
     }
 }
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index d21526aab6..cbab3cf710 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -20,10 +20,10 @@
                 <!-- Top row -->
                 <BoxContainer Orientation="Horizontal" MinSize="0 40">
                     <Label Margin="8 0 0 0" StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'Lobby'}" />
-                    <Label Name="CServerName" StyleClasses="LabelHeadingBigger" VAlign="Center" />
-                    <ui:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" />
-                    <Button Name="COptionsButton" StyleClasses="ButtonBig" Text="{Loc 'Options'}" />
-                    <Button Name="CLeaveButton" StyleClasses="ButtonBig" Text="{Loc 'Leave'}" />
+                    <Label Name="ServerName" Access="Public" StyleClasses="LabelHeadingBigger" VAlign="Center" />
+                    <ui:VoteCallMenuButton Name="CallVoteButton" StyleClasses="ButtonBig" />
+                    <Button Name="OptionsButton" Access="Public" StyleClasses="ButtonBig" Text="{Loc 'Options'}" />
+                    <Button Name="LeaveButton" Access="Public" StyleClasses="ButtonBig" Text="{Loc 'Leave'}" />
                 </BoxContainer>
                 <!-- Gold line -->
                 <PanelContainer>
@@ -35,18 +35,20 @@
                 <!-- Middle section with the two vertical panels -->
                 <BoxContainer Orientation="Horizontal" VerticalExpand="True">
                     <!-- Left panel -->
-                    <BoxContainer Orientation="Vertical" Name="CLeftPanelContainer" HorizontalExpand="True">
+                    <BoxContainer Orientation="Vertical" Name="LeftPanelContainer" HorizontalExpand="True">
                         <hudUi:StripeBack>
                             <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
-                                <cc:UICommandButton Command="observe" Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
-                                <Label Name="CStartTime" Align="Right"
+                                <cc:UICommandButton Command="observe" Name="ObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
+                                <Label Name="StartTime"
+                                       Access="Public"
+                                       Align="Right"
                                        FontColorOverride="{x:Static maths:Color.DarkGray}"
                                        StyleClasses="LabelBig" HorizontalExpand="True" />
-                                <Button Name="CReadyButton" ToggleMode="True" Text="{Loc 'Ready Up'}"
+                                <Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'Ready Up'}"
                                         StyleClasses="ButtonBig" />
                             </BoxContainer>
                         </hudUi:StripeBack>
-                        <chatUi:ChatBox Name="CChat" VerticalExpand="True" Margin="3 3 3 3"/>
+                        <chatUi:ChatBox Name="Chat" Access="Public" VerticalExpand="True" Margin="3 3 3 3"/>
                     </BoxContainer>
                     <!-- Gold line -->
                     <PanelContainer MinSize="2 0">
@@ -59,16 +61,21 @@
                         <BoxContainer Orientation="Vertical">
                             <!-- Player list -->
                             <hudUi:NanoHeading Text="{Loc 'Online Players'}" />
-                            <lobbyUi:LobbyPlayerList Name="COnlinePlayerList"
+                            <lobbyUi:LobbyPlayerList Name="OnlinePlayerList"
+                                                     Access="Public"
                                                      HorizontalExpand="True"
                                                      VerticalExpand="True"
                                                      Margin="3 3 3 3" />
                             <!-- Server info -->
                             <hudUi:NanoHeading Text="{Loc 'Server Info'}" />
-                            <info:ServerInfo Name="CServerInfo" VerticalExpand="True" Margin="3 3 3 3"/>
+                            <info:ServerInfo Name="ServerInfo"
+                                             Access="Public"
+                                             VerticalExpand="True"
+                                             Margin="3 3 3 3"/>
                         </BoxContainer>
                         <BoxContainer Orientation="Vertical"
-                                      Name="CVoteContainer"
+                                      Name="VoteContainer"
+                                      Access="Public"
                                       HorizontalAlignment="Right"
                                       Margin="0 8 8 0" />
                     </Control>
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index f96344daa7..aff5d14146 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -15,16 +15,6 @@ namespace Content.Client.Lobby.UI
     [GenerateTypedNameReferences]
     internal sealed partial class LobbyGui : Control
     {
-        public Label ServerName => CServerName;
-        public Label StartTime => CStartTime;
-        public Button ReadyButton => CReadyButton;
-        public Button ObserveButton => CObserveButton;
-        public Button OptionsButton => COptionsButton;
-        public Button LeaveButton => CLeaveButton;
-        public ChatBox Chat => CChat;
-        public BoxContainer VoteContainer => CVoteContainer;
-        public LobbyPlayerList OnlinePlayerList => COnlinePlayerList;
-        public ServerInfo ServerInfo => CServerInfo;
         public LobbyCharacterPreviewPanel CharacterPreview { get; }
 
         public LobbyGui(IEntityManager entityManager,
@@ -42,7 +32,7 @@ namespace Content.Client.Lobby.UI
                 HorizontalAlignment = HAlignment.Left
             };
 
-            CLeftPanelContainer.AddChild(CharacterPreview);
+            LeftPanelContainer.AddChild(CharacterPreview);
             CharacterPreview.SetPositionFirst();
         }
     }
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index f37e78d10a..cb15e16584 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -99,7 +99,7 @@ namespace Content.Client.MainMenu
 
         private void TryConnect(string address)
         {
-            var inputName = _mainMenuControl.UserNameBox.Text.Trim();
+            var inputName = _mainMenuControl.UsernameBox.Text.Trim();
             if (!UsernameHelpers.IsNameValid(inputName, out var reason))
             {
                 var invalidReason = Loc.GetString(reason.ToText());
@@ -110,7 +110,7 @@ namespace Content.Client.MainMenu
             }
 
             var configName = _configurationManager.GetCVar(CVars.PlayerName);
-            if (_mainMenuControl.UserNameBox.Text != configName)
+            if (_mainMenuControl.UsernameBox.Text != configName)
             {
                 _configurationManager.SetCVar(CVars.PlayerName, inputName);
                 _configurationManager.SaveToFile();
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index aa31a8f1ee..12c82db00c 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -11,29 +11,35 @@
             <BoxContainer Orientation="Horizontal"
                           SeparationOverride="4">
                 <Label Text="{Loc 'main-menu-username-label'}" />
-                <LineEdit Name="UsernameBoxProtected"
+                <LineEdit Name="UsernameBox"
+                          Access="Public"
                           PlaceHolder="{Loc 'main-menu-username-text'}"
                           HorizontalExpand="True" />
             </BoxContainer>
-            <Button Name="JoinPublicServerButtonProtected"
+            <Button Name="JoinPublicServerButton"
+                    Access="Public"
                     Text="{Loc 'main-menu-join-public-server-button'}"
                     StyleIdentifier="mainMenu"
                     TextAlign="Center" />
             <Control MinSize="0 2" />
-            <LineEdit Name="AddressBoxProtected"
+            <LineEdit Name="AddressBox"
+                      Access="Public"
                       Text="localhost"
                       PlaceHolder="server address:port"
                       HorizontalExpand="True" />
-            <Button Name="DirectConnectButtonProtected"
+            <Button Name="DirectConnectButton"
+                    Access="Public"
                     Text="{Loc 'main-menu-direct-connect-button'}"
                     TextAlign="Center"
                     StyleIdentifier="mainMenu" />
             <Control MinSize="0 2" />
-            <Button Name="OptionsButtonProtected"
+            <Button Name="OptionsButton"
+                    Access="Public"
                     Text="{Loc 'main-menu-options-button'}"
                     TextAlign="Center"
                     StyleIdentifier="mainMenu" />
-            <Button Name="QuitButtonProtected"
+            <Button Name="QuitButton"
+                    Access="Public"
                     Text="{Loc 'main-menu-quit-button'}"
                     TextAlign="Center"
                     StyleIdentifier="mainMenu" />
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
index ace22b16eb..ab30b5f65b 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
@@ -14,13 +14,6 @@ namespace Content.Client.MainMenu.UI
     [GenerateTypedNameReferences]
     public partial class MainMenuControl : Control
         {
-            public LineEdit UserNameBox => UsernameBoxProtected;
-            public Button JoinPublicServerButton => JoinPublicServerButtonProtected;
-            public LineEdit AddressBox => AddressBoxProtected;
-            public Button DirectConnectButton => DirectConnectButtonProtected;
-            public Button OptionsButton => OptionsButtonProtected;
-            public Button QuitButton => QuitButtonProtected;
-
             public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
             {
                 RobustXamlLoader.Load(this);
@@ -36,7 +29,7 @@ namespace Content.Client.MainMenu.UI
                 Logo.Texture = logoTexture;
 
                 var currentUserName = configMan.GetCVar(CVars.PlayerName);
-                UserNameBox.Text = currentUserName;
+                UsernameBox.Text = currentUserName;
 
 #if !FULL_RELEASE
                 JoinPublicServerButton.Disabled = true;
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
index c0284c1805..454812010a 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml
@@ -2,7 +2,8 @@
             MinSize="250 100"
             SetSize="250 100">
     <BoxContainer Orientation="Vertical">
-        <Button Name="ScanButtonProtected"
+        <Button Name="ScanButton"
+                Access="Public"
                 Text="{Loc 'medical-scanner-window-save-button-text'}" />
         <Label Name="Diagnostics" />
     </BoxContainer>
diff --git a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
index 1c5f0a62fd..3fc13a341b 100644
--- a/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.xaml.cs
@@ -17,8 +17,6 @@ namespace Content.Client.MedicalScanner.UI
     [GenerateTypedNameReferences]
     public partial class MedicalScannerWindow : SS14Window
     {
-        public Button ScanButton => ScanButtonProtected;
-
         public MedicalScannerWindow()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/PDA/PDAMenu.xaml b/Content.Client/PDA/PDAMenu.xaml
index e477c94577..5be5c1187b 100644
--- a/Content.Client/PDA/PDAMenu.xaml
+++ b/Content.Client/PDA/PDAMenu.xaml
@@ -7,25 +7,30 @@
                       VerticalExpand="True"
                       HorizontalExpand="True"
                       MinSize="50 50">
-            <RichTextLabel Name="PdaOwnerLabelProtected" />
+            <RichTextLabel Name="PdaOwnerLabel" Access="Public" />
             <PanelContainer>
                 <BoxContainer Orientation="Horizontal">
-                    <RichTextLabel Name="IdInfoLabelProtected"
+                    <RichTextLabel Name="IdInfoLabel"
+                                   Access="Public"
                                    HorizontalExpand="True" />
-                    <Button Name="EjectIdButtonProtected"
+                    <Button Name="EjectIdButton"
+                            Access="Public"
                             Text="{Loc 'comp-pda-ui-eject-id-button'}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center" />
-                    <Button Name="EjectPenButtonProtected"
+                    <Button Name="EjectPenButton"
+                            Access="Public"
                             Text="{Loc 'comp-pda-ui-eject-pen-button'}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center" />
                 </BoxContainer>
             </PanelContainer>
-            <Button Name="FlashLightToggleButtonProtected"
+            <Button Name="FlashLightToggleButton"
+                    Access="Public"
                     Text="{Loc 'comp-pda-ui-toggle-flashlight-button'}"
                     ToggleMode="True" />
-            <Button Name="ActivateUplinkButtonProtected"
+            <Button Name="ActivateUplinkButton"
+                    Access="Public"
                     Text="{Loc 'pda-bound-user-interface-uplink-tab-title'}" />
         </BoxContainer>
     </TabContainer>
diff --git a/Content.Client/PDA/PDAMenu.xaml.cs b/Content.Client/PDA/PDAMenu.xaml.cs
index c25b209b74..cb3977ff85 100644
--- a/Content.Client/PDA/PDAMenu.xaml.cs
+++ b/Content.Client/PDA/PDAMenu.xaml.cs
@@ -1,5 +1,4 @@
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Localization;
@@ -9,15 +8,6 @@ namespace Content.Client.PDA
     [GenerateTypedNameReferences]
     public partial class PDAMenu : SS14Window
     {
-        public Button FlashLightToggleButton => FlashLightToggleButtonProtected;
-        public Button EjectIdButton => EjectIdButtonProtected;
-        public Button EjectPenButton => EjectPenButtonProtected;
-
-        public Button ActivateUplinkButton => ActivateUplinkButtonProtected;
-
-        public RichTextLabel PdaOwnerLabel => PdaOwnerLabelProtected;
-        public RichTextLabel IdInfoLabel => IdInfoLabelProtected;
-
         public PDAMenu()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml
index dda0c339a8..c4929fd4e6 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml
+++ b/Content.Client/Paper/UI/PaperWindow.xaml
@@ -3,7 +3,8 @@
             SetSize="300 300">
     <BoxContainer Orientation="Vertical">
         <RichTextLabel Name="Label" />
-        <LineEdit Name="InputProtected"
+        <LineEdit Name="Input"
+                  Access="Public"
                   Visible="False" />
     </BoxContainer>
 </SS14Window>
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index f80a8518f8..a35af8fd10 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -10,8 +10,6 @@ namespace Content.Client.Paper.UI
     [GenerateTypedNameReferences]
     public partial class PaperWindow : SS14Window
     {
-        public LineEdit Input => InputProtected;
-
         public PaperWindow()
         {
             RobustXamlLoader.Load(this);
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml b/Content.Client/Preferences/UI/CharacterSetupGui.xaml
index cc1ed26641..f4abb40c21 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml
@@ -1,26 +1,26 @@
 <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:magicmirror="clr-namespace:Content.Client.CharacterAppearance"
          xmlns:parallax="clr-namespace:Content.Client.Parallax"
-         xmlns:prefUi="clr-namespace:Content.Client.Preferences.UI"
          xmlns:style="clr-namespace:Content.Client.Stylesheets">
     <parallax:ParallaxControl />
     <Control Margin="20 20 20 20">
-        <PanelContainer Name="CBackgroundPanel" />
+        <PanelContainer Name="BackgroundPanel" />
         <BoxContainer Orientation="Vertical" SeparationOverride="0">
             <BoxContainer Orientation="Horizontal" MinSize="0 40">
                 <Label Text="{Loc 'character-setup-gui-character-setup-label'}"
                        Margin="8 0 0 0" VAlign="Center"
                        StyleClasses="{x:Static style:StyleNano.StyleClassLabelHeadingBigger}" />
-                <Button Name="CRulesButton" HorizontalExpand="True"
+                <Button Name="RulesButton" HorizontalExpand="True"
                         Text="{Loc 'character-setup-gui-character-setup-rules-button'}"
                         StyleClasses="{x:Static style:StyleNano.StyleClassButtonBig}"
                         HorizontalAlignment="Right" />
-                <Button Name="CSaveButton"
+                <Button Name="SaveButton"
+                        Access="Public"
                         Text="{Loc 'character-setup-gui-character-setup-save-button'}"
                         StyleClasses="{x:Static style:StyleNano.StyleClassButtonBig}"/>
-                <Button Name="CCloseButton"
+                <Button Name="CloseButton"
+                        Access="Public"
                         Text="{Loc 'character-setup-gui-character-setup-close-button'}"
                         StyleClasses="{x:Static style:StyleNano.StyleClassButtonBig}"/>
             </BoxContainer>
@@ -31,14 +31,14 @@
             </PanelContainer>
             <BoxContainer Orientation="Horizontal" VerticalExpand="True" SeparationOverride="0">
                 <ScrollContainer MinSize="325 0" Margin="5 5 0 0">
-                    <BoxContainer Name="CCharacters" Orientation="Vertical" />
+                    <BoxContainer Name="Characters" Orientation="Vertical" />
                 </ScrollContainer>
                 <PanelContainer MinSize="2 0">
                     <PanelContainer.PanelOverride>
                         <gfx:StyleBoxFlat BackgroundColor="{x:Static style:StyleNano.NanoGold}" ContentMarginTopOverride="2" />
                     </PanelContainer.PanelOverride>
                 </PanelContainer>
-                <BoxContainer Name="CCharEditor" />
+                <BoxContainer Name="CharEditor" />
             </BoxContainer>
         </BoxContainer>
     </Control>
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
index 12d37b1345..f8ff373a54 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -29,14 +29,8 @@ namespace Content.Client.Preferences.UI
     {
         private readonly IClientPreferencesManager _preferencesManager;
         private readonly IEntityManager _entityManager;
-        private PanelContainer _backgroundPanel => CBackgroundPanel;
-        private BoxContainer _charactersVBox => CCharacters;
-        private Button _createNewCharacterButton;
-        private HumanoidProfileEditor _humanoidProfileEditor;
-        private BoxContainer _humanoidProfileEditorContainer => CCharEditor;
-        public Button CloseButton => CCloseButton;
-        public Button SaveButton => CSaveButton;
-        public Button RulesButton => CRulesButton;
+        private readonly Button _createNewCharacterButton;
+        private readonly HumanoidProfileEditor _humanoidProfileEditor;
 
         public CharacterSetupGui(
             IEntityManager entityManager,
@@ -56,7 +50,7 @@ namespace Content.Client.Preferences.UI
             };
             back.SetPatchMargin(StyleBox.Margin.All, 10);
 
-            _backgroundPanel.PanelOverride = back;
+            BackgroundPanel.PanelOverride = back;
 
             _createNewCharacterButton = new Button
             {
@@ -71,7 +65,7 @@ namespace Content.Client.Preferences.UI
 
             _humanoidProfileEditor = new HumanoidProfileEditor(preferencesManager, prototypeManager, entityManager);
             _humanoidProfileEditor.OnProfileChanged += ProfileChanged;
-            _humanoidProfileEditorContainer.AddChild(_humanoidProfileEditor);
+            CharEditor.AddChild(_humanoidProfileEditor);
 
             UpdateUI();
 
@@ -100,7 +94,7 @@ namespace Content.Client.Preferences.UI
         {
             var numberOfFullSlots = 0;
             var characterButtonsGroup = new ButtonGroup();
-            _charactersVBox.RemoveAllChildren();
+            Characters.RemoveAllChildren();
 
             if (!_preferencesManager.ServerDataLoaded)
             {
@@ -123,7 +117,7 @@ namespace Content.Client.Preferences.UI
                     _preferencesManager,
                     characterButtonsGroup,
                     character);
-                _charactersVBox.AddChild(characterPickerButton);
+                Characters.AddChild(characterPickerButton);
 
                 var characterIndexCopy = slot;
                 characterPickerButton.OnPressed += args =>
@@ -139,7 +133,7 @@ namespace Content.Client.Preferences.UI
 
             _createNewCharacterButton.Disabled =
                 numberOfFullSlots >= _preferencesManager.Settings.MaxCharacterSlots;
-            _charactersVBox.AddChild(_createNewCharacterButton);
+            Characters.AddChild(_createNewCharacterButton);
         }
 
         private class CharacterPickerButton : ContainerButton
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 636f5dbb92..af77597d05 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -71,11 +71,14 @@
                               Align="End"
                               HorizontalExpand="True"
                               VerticalExpand="True">
-                    <Button Name="ServerSelectionButtonProtected"
+                    <Button Name="ServerSelectionButton"
+                            Access="Public"
                             Text="{Loc 'research-console-menu-server-selection-button'}" />
-                    <Button Name="ServerSyncButtonProtected"
+                    <Button Name="ServerSyncButton"
+                            Access="Public"
                             Text="{Loc 'research-console-menu-server-sync-button'}" />
-                    <Button Name="UnlockButtonProtected"
+                    <Button Name="UnlockButton"
+                            Access="Public"
                             Disabled="True" />
                 </BoxContainer>
             </BoxContainer>
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index 26df39ae00..ef562430b1 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -21,10 +21,6 @@ namespace Content.Client.Research.UI
         private readonly List<TechnologyPrototype> _unlockableTechnologyPrototypes = new();
         private readonly List<TechnologyPrototype> _futureTechnologyPrototypes = new();
 
-        public Button UnlockButton => UnlockButtonProtected;
-        public Button ServerSelectionButton => ServerSelectionButtonProtected;
-        public Button ServerSyncButton => ServerSyncButtonProtected;
-
         public TechnologyPrototype? TechnologySelected;
 
         public ResearchConsoleMenu(ResearchConsoleBoundUserInterface owner)
diff --git a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml
index 46fa1062d7..544edc191d 100644
--- a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml
+++ b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml
@@ -4,7 +4,8 @@
         <BoxContainer Orientation="Horizontal">
             <Label Name="UplinkItemName"
                    HorizontalExpand="True"/>
-            <Button Name="UplinkItemBuyButtonProtected"
+            <Button Name="UplinkItemBuyButton"
+                    Access="Public"
                     HorizontalAlignment="Right"
                     MinWidth="64"/>
         </BoxContainer>
diff --git a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs
index 32d5468bc3..8080f42fd8 100644
--- a/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs
+++ b/Content.Client/Traitor/Uplink/UplinkListingControl.xaml.cs
@@ -9,8 +9,6 @@ namespace Content.Client.Traitor.Uplink
     [GenerateTypedNameReferences]
     public partial class UplinkListingControl : Control
     {
-        public Button UplinkItemBuyButton => UplinkItemBuyButtonProtected;
-
         public UplinkListingControl(string itemName, string itemDescription, int itemPrice, bool canBuy)
         {
             RobustXamlLoader.Load(this);
@@ -18,8 +16,8 @@ namespace Content.Client.Traitor.Uplink
             UplinkItemName.Text = itemName;
             UplinkItemDescription.SetMessage(itemDescription);
 
-            UplinkItemBuyButtonProtected.Text = $"{itemPrice} TC";
-            UplinkItemBuyButtonProtected.Disabled = !canBuy;
+            UplinkItemBuyButton.Text = $"{itemPrice} TC";
+            UplinkItemBuyButton.Disabled = !canBuy;
         }
     }
 }
diff --git a/Content.Client/Traitor/Uplink/UplinkMenu.xaml b/Content.Client/Traitor/Uplink/UplinkMenu.xaml
index 43c6610f83..dae85f2e81 100644
--- a/Content.Client/Traitor/Uplink/UplinkMenu.xaml
+++ b/Content.Client/Traitor/Uplink/UplinkMenu.xaml
@@ -8,7 +8,8 @@
                       VerticalExpand="True">
             <BoxContainer Orientation="Horizontal"
                           Margin="4 4 4 4">
-                <RichTextLabel Name="BalanceInfoProtected"
+                <RichTextLabel Name="BalanceInfo"
+                               Access="Public"
                                HorizontalExpand="True"
                                HorizontalAlignment="Left" />
             </BoxContainer>
diff --git a/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs b/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
index f39644feff..a599a018cd 100644
--- a/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
+++ b/Content.Client/Traitor/Uplink/UplinkMenu.xaml.cs
@@ -16,7 +16,6 @@ namespace Content.Client.Traitor.Uplink
     {
         private readonly IPrototypeManager _prototypeManager;
 
-        public RichTextLabel BalanceInfo => BalanceInfoProtected;
         public event Action<BaseButton.ButtonEventArgs, UplinkListingData>? OnListingButtonPressed;
         public event Action<BaseButton.ButtonEventArgs, UplinkCategory>? OnCategoryButtonPressed;
 
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
index cad657e3ba..a517b5fc16 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -60,8 +60,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
                 Assert.NotNull(alertsUI);
 
                 // we should be seeing 3 alerts - our health, and the 2 debug alerts, in a specific order.
-                Assert.That(alertsUI.Grid.ChildCount, Is.GreaterThanOrEqualTo(3));
-                var alertControls = alertsUI.Grid.Children.Select(c => (AlertControl) c);
+                Assert.That(alertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3));
+                var alertControls = alertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
                 var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
                 var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug1, AlertType.Debug2};
                 Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
@@ -96,8 +96,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
                 Assert.NotNull(alertsUI);
 
                 // we should be seeing 2 alerts now because one was cleared
-                Assert.That(alertsUI.Grid.ChildCount, Is.GreaterThanOrEqualTo(2));
-                var alertControls = alertsUI.Grid.Children.Select(c => (AlertControl) c);
+                Assert.That(alertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2));
+                var alertControls = alertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
                 var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
                 var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug2};
                 Assert.That(alertIDs, Is.SupersetOf(expectedIDs));