diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml
index b048f4527b..a512e694f6 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml
@@ -35,12 +35,12 @@
         <Control SetHeight="28" Margin="1 0 2 1">
             <PanelContainer Name="FooterPanel"></PanelContainer>
             <BoxContainer Name="ContentFooter" HorizontalExpand="True" SetHeight="28">
-                <Label Text="Net#Link ™" VerticalAlignment="Center" Margin="6 0" StyleClasses="PDAContentFooterText"/>
-                <Label Name="AddressLabel" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="6 0" StyleClasses="PDAContentFooterText"/>
+                <Label Text="Net#Link ™" VerticalAlignment="Center" Margin="6 0" StyleClasses="PdaContentFooterText"/>
+                <Label Name="AddressLabel" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="6 0" StyleClasses="PdaContentFooterText"/>
                 <Control HorizontalExpand="True"/>
-                <Label Name="FromAddressLabel" Margin="6 0" StyleClasses="PDAContentFooterText"/>
-                <Label SetWidth="25" StyleClasses="PDAContentFooterText" Align="Center" Text="➝"/><!--Turn this into an arrow texture-->
-                <Label Name="ToAddressLabel" Margin="6 0" StyleClasses="PDAContentFooterText"/>
+                <Label Name="FromAddressLabel" Margin="6 0" StyleClasses="PdaContentFooterText"/>
+                <Label SetWidth="25" StyleClasses="PdaContentFooterText" Align="Center" Text="➝"/><!--Turn this into an arrow texture-->
+                <Label Name="ToAddressLabel" Margin="6 0" StyleClasses="PdaContentFooterText"/>
             </BoxContainer>
         </Control>
     </BoxContainer>
diff --git a/Content.Client/PDA/PDABorderColorComponent.cs b/Content.Client/PDA/PdaBorderColorComponent.cs
similarity index 86%
rename from Content.Client/PDA/PDABorderColorComponent.cs
rename to Content.Client/PDA/PdaBorderColorComponent.cs
index c9af50d2f5..fc0ba25963 100644
--- a/Content.Client/PDA/PDABorderColorComponent.cs
+++ b/Content.Client/PDA/PdaBorderColorComponent.cs
@@ -4,7 +4,7 @@
 /// Used for specifying the pda windows border colors
 /// </summary>
 [RegisterComponent]
-public sealed class PDABorderColorComponent : Component
+public sealed class PdaBorderColorComponent : Component
 {
     [DataField("borderColor", required: true)]
     public string? BorderColor;
diff --git a/Content.Client/PDA/PDABoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs
similarity index 79%
rename from Content.Client/PDA/PDABoundUserInterface.cs
rename to Content.Client/PDA/PdaBoundUserInterface.cs
index 4553b23fd3..6e569dcf13 100644
--- a/Content.Client/PDA/PDABoundUserInterface.cs
+++ b/Content.Client/PDA/PdaBoundUserInterface.cs
@@ -12,14 +12,14 @@ using Robust.Shared.Configuration;
 namespace Content.Client.PDA
 {
     [UsedImplicitly]
-    public sealed class PDABoundUserInterface : CartridgeLoaderBoundUserInterface
+    public sealed class PdaBoundUserInterface : CartridgeLoaderBoundUserInterface
     {
         [Dependency] private readonly IEntityManager? _entityManager = default!;
         [Dependency] private readonly IConfigurationManager _configManager = default!;
 
-        private PDAMenu? _menu;
+        private PdaMenu? _menu;
 
-        public PDABoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
+        public PdaBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
         {
             IoCManager.InjectDependencies(this);
         }
@@ -27,13 +27,13 @@ namespace Content.Client.PDA
         protected override void Open()
         {
             base.Open();
-            SendMessage(new PDARequestUpdateInterfaceMessage());
-            _menu = new PDAMenu();
+            SendMessage(new PdaRequestUpdateInterfaceMessage());
+            _menu = new PdaMenu();
             _menu.OpenCenteredLeft();
             _menu.OnClose += Close;
             _menu.FlashLightToggleButton.OnToggled += _ =>
             {
-                SendMessage(new PDAToggleFlashlightMessage());
+                SendMessage(new PdaToggleFlashlightMessage());
             };
 
             if (_configManager.GetCVar(CCVars.CrewManifestUnsecure))
@@ -47,32 +47,32 @@ namespace Content.Client.PDA
 
             _menu.EjectIdButton.OnPressed += _ =>
             {
-                SendMessage(new ItemSlotButtonPressedEvent(PDAComponent.PDAIdSlotId));
+                SendMessage(new ItemSlotButtonPressedEvent(PdaComponent.PdaIdSlotId));
             };
 
             _menu.EjectPenButton.OnPressed += _ =>
             {
-                SendMessage(new ItemSlotButtonPressedEvent(PDAComponent.PDAPenSlotId));
+                SendMessage(new ItemSlotButtonPressedEvent(PdaComponent.PdaPenSlotId));
             };
 
             _menu.ActivateMusicButton.OnPressed += _ =>
             {
-                SendMessage(new PDAShowMusicMessage());
+                SendMessage(new PdaShowMusicMessage());
             };
 
             _menu.AccessRingtoneButton.OnPressed += _ =>
             {
-                SendMessage(new PDAShowRingtoneMessage());
+                SendMessage(new PdaShowRingtoneMessage());
             };
 
             _menu.ShowUplinkButton.OnPressed += _ =>
             {
-                SendMessage(new PDAShowUplinkMessage());
+                SendMessage(new PdaShowUplinkMessage());
             };
 
             _menu.LockUplinkButton.OnPressed += _ =>
             {
-                SendMessage(new PDALockUplinkMessage());
+                SendMessage(new PdaLockUplinkMessage());
             };
 
             _menu.OnProgramItemPressed += ActivateCartridge;
@@ -93,7 +93,7 @@ namespace Content.Client.PDA
         {
             base.UpdateState(state);
 
-            if (state is not PDAUpdateState updateState)
+            if (state is not PdaUpdateState updateState)
                 return;
 
             _menu?.UpdateState(updateState);
@@ -130,9 +130,9 @@ namespace Content.Client.PDA
             _menu?.Dispose();
         }
 
-        private PDABorderColorComponent? GetBorderColorComponent()
+        private PdaBorderColorComponent? GetBorderColorComponent()
         {
-            return _entityManager?.GetComponentOrNull<PDABorderColorComponent>(Owner.Owner);
+            return _entityManager?.GetComponentOrNull<PdaBorderColorComponent>(Owner.Owner);
         }
     }
 }
diff --git a/Content.Client/PDA/PDAMenu.xaml b/Content.Client/PDA/PdaMenu.xaml
similarity index 81%
rename from Content.Client/PDA/PDAMenu.xaml
rename to Content.Client/PDA/PdaMenu.xaml
index 0b61cde932..a06032d6d2 100644
--- a/Content.Client/PDA/PDAMenu.xaml
+++ b/Content.Client/PDA/PdaMenu.xaml
@@ -1,25 +1,25 @@
-<pda:PDAWindow  xmlns="https://spacestation14.io"
+<pda:PdaWindow  xmlns="https://spacestation14.io"
                 xmlns:pda="clr-namespace:Content.Client.PDA"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 MinSize="576 450"
                 SetSize="576 450">
     <!-- This: (Margin="1 1 3 0") is necessary so the navigation bar doesn't sticks into the black content border. -->
     <BoxContainer Name="NavigationBar" HorizontalExpand="True" MinHeight="32" Margin="1 1 3 0">
-        <pda:PDANavigationButton Name="HomeButton" SetWidth="32" CurrentTabBorderThickness="0 0 2 0" IsCurrent="True"/>
-        <pda:PDANavigationButton Name="ProgramListButton" Access="Public" MinWidth="100" LabelText="{Loc 'comp-pda-io-program-list-button'}"/>
-        <pda:PDANavigationButton Name="SettingsButton" MinWidth="100" LabelText="{Loc 'comp-pda-io-settings-button'}"/>
+        <pda:PdaNavigationButton Name="HomeButton" SetWidth="32" CurrentTabBorderThickness="0 0 2 0" IsCurrent="True"/>
+        <pda:PdaNavigationButton Name="ProgramListButton" Access="Public" MinWidth="100" LabelText="{Loc 'comp-pda-io-program-list-button'}"/>
+        <pda:PdaNavigationButton Name="SettingsButton" MinWidth="100" LabelText="{Loc 'comp-pda-io-settings-button'}"/>
 
-        <pda:PDANavigationButton Name="ProgramTitle" Access="Public" BorderThickness="0 0 0 2" CurrentTabBorderThickness="2 0 0 2"
+        <pda:PdaNavigationButton Name="ProgramTitle" Access="Public" BorderThickness="0 0 0 2" CurrentTabBorderThickness="2 0 0 2"
                                  ActiveBgColor="#202023" Visible="False"/>
 
-        <pda:PDANavigationButton HorizontalExpand="True"/>
+        <pda:PdaNavigationButton HorizontalExpand="True"/>
 
-        <pda:PDANavigationButton Name="ProgramCloseButton" Access="Public" IconScale="0.5 0.5" BorderThickness="0 0 2 2"
+        <pda:PdaNavigationButton Name="ProgramCloseButton" Access="Public" IconScale="0.5 0.5" BorderThickness="0 0 2 2"
                                  Visible="False" IsActive="False" SetWidth="32"/>
 
-        <pda:PDANavigationButton Name="FlashLightToggleButton" Access="Public" ToggleMode="True" ActiveFgColor="#EAEFBB" SetWidth="32"/>
-        <pda:PDANavigationButton Name="EjectPenButton" Access="Public" SetWidth="32"/>
-        <pda:PDANavigationButton Name="EjectIdButton" Access="Public" SetWidth="32"/>
+        <pda:PdaNavigationButton Name="FlashLightToggleButton" Access="Public" ToggleMode="True" ActiveFgColor="#EAEFBB" SetWidth="32"/>
+        <pda:PdaNavigationButton Name="EjectPenButton" Access="Public" SetWidth="32"/>
+        <pda:PdaNavigationButton Name="EjectIdButton" Access="Public" SetWidth="32"/>
     </BoxContainer>
     <BoxContainer Name="ViewContainer" HorizontalExpand="True" VerticalExpand="True" Access="Public">
         <BoxContainer Orientation="Vertical"
@@ -56,24 +56,24 @@
                           HorizontalExpand="True"
                           MinSize="50 50"
                           Name="Settings">
-                <pda:PDASettingsButton Name="AccessRingtoneButton"
+                <pda:PdaSettingsButton Name="AccessRingtoneButton"
                                        Access="Public"
                                        Text="{Loc 'comp-pda-ui-ringtone-button'}"
                                        Description="{Loc 'comp-pda-ui-ringtone-button-description'}"/>
-                <pda:PDASettingsButton Name="CrewManifestButton"
+                <pda:PdaSettingsButton Name="CrewManifestButton"
                                        Access="Public"
                                        Text="{Loc 'crew-manifest-button-label'}"
                                        Description="{Loc 'crew-manifest-button-description'}"
                                        Visible="False" />
-                <pda:PDASettingsButton Name="ActivateMusicButton"
+                <pda:PdaSettingsButton Name="ActivateMusicButton"
                                        Access="Public"
                                        Text="{Loc 'pda-bound-user-interface-music-button'}"
                                        Description="{Loc 'pda-bound-user-interface-music-button-description'}"/>
-                <pda:PDASettingsButton Name="ShowUplinkButton"
+                <pda:PdaSettingsButton Name="ShowUplinkButton"
                                        Access="Public"
                                        Text="{Loc 'pda-bound-user-interface-show-uplink-title'}"
                                        Description="{Loc 'pda-bound-user-interface-show-uplink-description'}"/>
-                <pda:PDASettingsButton Name="LockUplinkButton"
+                <pda:PdaSettingsButton Name="LockUplinkButton"
                                        Access="Public"
                                        Text="{Loc 'pda-bound-user-interface-lock-uplink-title'}"
                                        Description="{Loc 'pda-bound-user-interface-lock-uplink-description'}"/>
@@ -88,8 +88,8 @@
     </BoxContainer>
     <BoxContainer Name="ContentFooter" HorizontalExpand="True" SetHeight="28" Margin="1 0 2 1">
         <controls:StripeBack HasBottomEdge="False" HasMargins="False" HorizontalExpand="True">
-            <Label Text="Robust#OS ™" VerticalAlignment="Center" Margin="6 0" StyleClasses="PDAContentFooterText"/>
-            <Label Name="AddressLabel" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="6 0" StyleClasses="PDAContentFooterText"/>
+            <Label Text="Robust#OS ™" VerticalAlignment="Center" Margin="6 0" StyleClasses="PdaContentFooterText"/>
+            <Label Name="AddressLabel" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="6 0" StyleClasses="PdaContentFooterText"/>
         </controls:StripeBack>
     </BoxContainer>
-</pda:PDAWindow>
+</pda:PdaWindow>
diff --git a/Content.Client/PDA/PDAMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
similarity index 93%
rename from Content.Client/PDA/PDAMenu.xaml.cs
rename to Content.Client/PDA/PdaMenu.xaml.cs
index a639c9d184..e19c6710a2 100644
--- a/Content.Client/PDA/PDAMenu.xaml.cs
+++ b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -13,7 +13,7 @@ using Robust.Shared.Timing;
 namespace Content.Client.PDA
 {
     [GenerateTypedNameReferences]
-    public sealed partial class PDAMenu : PDAWindow
+    public sealed partial class PdaMenu : PdaWindow
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
@@ -29,7 +29,7 @@ namespace Content.Client.PDA
         public event Action<EntityUid>? OnProgramItemPressed;
         public event Action<EntityUid>? OnUninstallButtonPressed;
         public event Action<EntityUid>? OnInstallButtonPressed;
-        public PDAMenu()
+        public PdaMenu()
         {
             IoCManager.InjectDependencies(this);
             _gameTicker = _entitySystem.GetEntitySystem<ClientGameTicker>();
@@ -88,22 +88,22 @@ namespace Content.Client.PDA
             ToHomeScreen();
         }
 
-        public void UpdateState(PDAUpdateState state)
+        public void UpdateState(PdaUpdateState state)
         {
             FlashLightToggleButton.IsActive = state.FlashlightEnabled;
 
-            if (state.PDAOwnerInfo.ActualOwnerName != null)
+            if (state.PdaOwnerInfo.ActualOwnerName != null)
             {
                 PdaOwnerLabel.SetMarkup(Loc.GetString("comp-pda-ui-owner",
-                    ("actualOwnerName", state.PDAOwnerInfo.ActualOwnerName)));
+                    ("actualOwnerName", state.PdaOwnerInfo.ActualOwnerName)));
             }
 
 
-            if (state.PDAOwnerInfo.IdOwner != null || state.PDAOwnerInfo.JobTitle != null)
+            if (state.PdaOwnerInfo.IdOwner != null || state.PdaOwnerInfo.JobTitle != null)
             {
                 IdInfoLabel.SetMarkup(Loc.GetString("comp-pda-ui",
-                    ("owner", state.PDAOwnerInfo.IdOwner ?? Loc.GetString("comp-pda-ui-unknown")),
-                    ("jobTitle", state.PDAOwnerInfo.JobTitle ?? Loc.GetString("comp-pda-ui-unassigned"))));
+                    ("owner", state.PdaOwnerInfo.IdOwner ?? Loc.GetString("comp-pda-ui-unknown")),
+                    ("jobTitle", state.PdaOwnerInfo.JobTitle ?? Loc.GetString("comp-pda-ui-unassigned"))));
             }
             else
             {
@@ -118,8 +118,8 @@ namespace Content.Client.PDA
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
                 ("time", stationTime.ToString("hh\\:mm\\:ss"))));
 
-            var alertLevel = state.PDAOwnerInfo.StationAlertLevel;
-            var alertColor = state.PDAOwnerInfo.StationAlertColor;
+            var alertLevel = state.PdaOwnerInfo.StationAlertLevel;
+            var alertColor = state.PdaOwnerInfo.StationAlertColor;
             var alertLevelKey = alertLevel != null ? $"alert-level-{alertLevel}" : "alert-level-unknown";
 
             StationAlertLevelLabel.SetMarkup(Loc.GetString(
@@ -135,7 +135,7 @@ namespace Content.Client.PDA
 
             AddressLabel.Text = state.Address?.ToUpper() ?? " - ";
 
-            EjectIdButton.IsActive = state.PDAOwnerInfo.IdOwner != null || state.PDAOwnerInfo.JobTitle != null;
+            EjectIdButton.IsActive = state.PdaOwnerInfo.IdOwner != null || state.PdaOwnerInfo.JobTitle != null;
             EjectPenButton.IsActive = state.HasPen;
             ActivateMusicButton.Visible = state.CanPlayMusic;
             ShowUplinkButton.Visible = state.HasUplink;
@@ -172,7 +172,7 @@ namespace Content.Client.PDA
                     ProgramList.AddChild(row);
                 }
 
-                var item = new PDAProgramItem();
+                var item = new PdaProgramItem();
 
                 if (component.Icon is not null)
                     item.Icon.SetFromSpriteSpecifier(component.Icon);
diff --git a/Content.Client/PDA/PDANavigationButton.xaml b/Content.Client/PDA/PdaNavigationButton.xaml
similarity index 78%
rename from Content.Client/PDA/PDANavigationButton.xaml
rename to Content.Client/PDA/PdaNavigationButton.xaml
index 94badd9451..03cf68f0ec 100644
--- a/Content.Client/PDA/PDANavigationButton.xaml
+++ b/Content.Client/PDA/PdaNavigationButton.xaml
@@ -1,5 +1,5 @@
-<pda:PDANavigationButton xmlns="https://spacestation14.io" xmlns:pda="clr-namespace:Content.Client.PDA">
+<pda:PdaNavigationButton xmlns="https://spacestation14.io" xmlns:pda="clr-namespace:Content.Client.PDA">
     <PanelContainer Name="Background"/>
     <AnimatedTextureRect Margin="0 0 0 2" Visible="False" Name="Icon" HorizontalAlignment="Center" VerticalAlignment="Center"/>
     <Label Visible="True" Name="Label" Margin="8 0 8 2" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-</pda:PDANavigationButton>
+</pda:PdaNavigationButton>
diff --git a/Content.Client/PDA/PDANavigationButton.xaml.cs b/Content.Client/PDA/PdaNavigationButton.xaml.cs
similarity index 96%
rename from Content.Client/PDA/PDANavigationButton.xaml.cs
rename to Content.Client/PDA/PdaNavigationButton.xaml.cs
index 83907717c3..3e44829411 100644
--- a/Content.Client/PDA/PDANavigationButton.xaml.cs
+++ b/Content.Client/PDA/PdaNavigationButton.xaml.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Utility;
 namespace Content.Client.PDA;
 
 [GenerateTypedNameReferences]
-public sealed partial class PDANavigationButton : ContainerButton
+public sealed partial class PdaNavigationButton : ContainerButton
 {
 
     private bool _isCurrent;
@@ -100,7 +100,7 @@ public sealed partial class PDANavigationButton : ContainerButton
         }
     }
 
-    public PDANavigationButton()
+    public PdaNavigationButton()
     {
         RobustXamlLoader.Load(this);
         Background.PanelOverride = _styleBox;
diff --git a/Content.Client/PDA/PDAProgramItem.xaml b/Content.Client/PDA/PdaProgramItem.xaml
similarity index 92%
rename from Content.Client/PDA/PDAProgramItem.xaml
rename to Content.Client/PDA/PdaProgramItem.xaml
index d47df17e7f..9f9fba938f 100644
--- a/Content.Client/PDA/PDAProgramItem.xaml
+++ b/Content.Client/PDA/PdaProgramItem.xaml
@@ -1,4 +1,4 @@
-<pda:PDAProgramItem HorizontalExpand="True" MinHeight="60" Margin="4"
+<pda:PdaProgramItem HorizontalExpand="True" MinHeight="60" Margin="4"
                     xmlns:pda="clr-namespace:Content.Client.PDA"
                     xmlns="https://spacestation14.io">
     <PanelContainer Name="Panel"/>
@@ -14,4 +14,4 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-</pda:PDAProgramItem>
+</pda:PdaProgramItem>
diff --git a/Content.Client/PDA/PDAProgramItem.xaml.cs b/Content.Client/PDA/PdaProgramItem.xaml.cs
similarity index 91%
rename from Content.Client/PDA/PDAProgramItem.xaml.cs
rename to Content.Client/PDA/PdaProgramItem.xaml.cs
index 9348cc5c12..9709f5706b 100644
--- a/Content.Client/PDA/PDAProgramItem.xaml.cs
+++ b/Content.Client/PDA/PdaProgramItem.xaml.cs
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.PDA;
 
 [GenerateTypedNameReferences]
-public sealed partial class PDAProgramItem : ContainerButton
+public sealed partial class PdaProgramItem : ContainerButton
 {
     public const string StylePropertyBgColor = "backgroundColor";
     public const string NormalBgColor = "#313138";
@@ -23,7 +23,7 @@ public sealed partial class PDAProgramItem : ContainerButton
         set => _styleBox.BackgroundColor = value;
     }
 
-    public PDAProgramItem()
+    public PdaProgramItem()
     {
         RobustXamlLoader.Load(this);
         Panel.PanelOverride = _styleBox;
diff --git a/Content.Client/PDA/PDASettingsButton.xaml b/Content.Client/PDA/PdaSettingsButton.xaml
similarity index 82%
rename from Content.Client/PDA/PDASettingsButton.xaml
rename to Content.Client/PDA/PdaSettingsButton.xaml
index 39bd560324..213616f6c9 100644
--- a/Content.Client/PDA/PDASettingsButton.xaml
+++ b/Content.Client/PDA/PdaSettingsButton.xaml
@@ -1,4 +1,4 @@
-<pda:PDASettingsButton xmlns="https://spacestation14.io"
+<pda:PdaSettingsButton xmlns="https://spacestation14.io"
                        xmlns:pda="clr-namespace:Content.Client.PDA"
                        HorizontalExpand="True"
                        MinHeight="48"
@@ -8,4 +8,4 @@
     <Label Name="OptionName"/>
     <Label Name="OptionDescription"/>
 </BoxContainer>
-</pda:PDASettingsButton>
+</pda:PdaSettingsButton>
diff --git a/Content.Client/PDA/PDASettingsButton.xaml.cs b/Content.Client/PDA/PdaSettingsButton.xaml.cs
similarity index 94%
rename from Content.Client/PDA/PDASettingsButton.xaml.cs
rename to Content.Client/PDA/PdaSettingsButton.xaml.cs
index c62f214194..f460f60200 100644
--- a/Content.Client/PDA/PDASettingsButton.xaml.cs
+++ b/Content.Client/PDA/PdaSettingsButton.xaml.cs
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.XAML;
 namespace Content.Client.PDA;
 
 [GenerateTypedNameReferences]
-public sealed partial class PDASettingsButton : ContainerButton
+public sealed partial class PdaSettingsButton : ContainerButton
 {
     public const string StylePropertyFgColor = "foregroundColor";
     public const string StylePropertyBgColor = "backgroundColor";
@@ -49,7 +49,7 @@ public sealed partial class PDASettingsButton : ContainerButton
         }
     }
 
-    public PDASettingsButton()
+    public PdaSettingsButton()
     {
         RobustXamlLoader.Load(this);
         Panel.PanelOverride = _styleBox;
diff --git a/Content.Client/PDA/PDASystem.cs b/Content.Client/PDA/PdaSystem.cs
similarity index 56%
rename from Content.Client/PDA/PDASystem.cs
rename to Content.Client/PDA/PdaSystem.cs
index a5de98b9cf..00a12ae2e6 100644
--- a/Content.Client/PDA/PDASystem.cs
+++ b/Content.Client/PDA/PdaSystem.cs
@@ -4,28 +4,28 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.PDA;
 
-public sealed class PDASystem : SharedPDASystem
+public sealed class PdaSystem : SharedPdaSystem
 {
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<PDAComponent, AppearanceChangeEvent>(OnAppearanceChange);
+        SubscribeLocalEvent<PdaComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
-    private void OnAppearanceChange(EntityUid uid, PDAComponent component, ref AppearanceChangeEvent args)
+    private void OnAppearanceChange(EntityUid uid, PdaComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
         if (Appearance.TryGetData<bool>(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component))
-            args.Sprite.LayerSetVisible(PDAVisualLayers.Flashlight, isFlashlightOn);
+            args.Sprite.LayerSetVisible(PdaVisualLayers.Flashlight, isFlashlightOn);
 
-        if (Appearance.TryGetData<bool>(uid, PDAVisuals.IDCardInserted, out var isCardInserted, args.Component))
-            args.Sprite.LayerSetVisible(PDAVisualLayers.IDLight, isCardInserted);
+        if (Appearance.TryGetData<bool>(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component))
+            args.Sprite.LayerSetVisible(PdaVisualLayers.IdLight, isCardInserted);
     }
 
-    protected override void OnComponentInit(EntityUid uid, PDAComponent component, ComponentInit args)
+    protected override void OnComponentInit(EntityUid uid, PdaComponent component, ComponentInit args)
     {
         base.OnComponentInit(uid, component, args);
 
@@ -33,16 +33,16 @@ public sealed class PDASystem : SharedPDASystem
             return;
 
         if (component.State != null)
-            sprite.LayerSetState(PDAVisualLayers.Base, component.State);
+            sprite.LayerSetState(PdaVisualLayers.Base, component.State);
 
-        sprite.LayerSetVisible(PDAVisualLayers.Flashlight, component.FlashlightOn);
-        sprite.LayerSetVisible(PDAVisualLayers.IDLight, component.IdSlot.StartingItem != null);
+        sprite.LayerSetVisible(PdaVisualLayers.Flashlight, component.FlashlightOn);
+        sprite.LayerSetVisible(PdaVisualLayers.IdLight, component.IdSlot.StartingItem != null);
     }
 
-    public enum PDAVisualLayers : byte
+    public enum PdaVisualLayers : byte
     {
         Base,
         Flashlight,
-        IDLight
+        IdLight
     }
 }
diff --git a/Content.Client/PDA/PDAWindow.xaml b/Content.Client/PDA/PdaWindow.xaml
similarity index 77%
rename from Content.Client/PDA/PDAWindow.xaml
rename to Content.Client/PDA/PdaWindow.xaml
index fd6ec57ebe..0b0898cc3a 100644
--- a/Content.Client/PDA/PDAWindow.xaml
+++ b/Content.Client/PDA/PdaWindow.xaml
@@ -1,11 +1,11 @@
-<pda:PDAWindow  xmlns="https://spacestation14.io"
+<pda:PdaWindow  xmlns="https://spacestation14.io"
                 xmlns:pda="clr-namespace:Content.Client.PDA"
                 MouseFilter="Stop">
-    <PanelContainer Name="Background" Access="Public" StyleClasses="PDABackgroundRect" />
+    <PanelContainer Name="Background" Access="Public" StyleClasses="PdaBackgroundRect" />
     <!-- The negative markin fixes a gap between the window edges and the decorative panel -->
-    <PanelContainer Name="AccentH" Margin="-1 170 -2 170" Access="Public" StyleClasses="PDABackground" />
-    <PanelContainer Name="AccentV" Margin="220 -1 220 -1" Access="Public" StyleClasses="PDABackground" />
-    <PanelContainer Name="Border" StyleClasses="PDABorderRect" />
+    <PanelContainer Name="AccentH" Margin="-1 170 -2 170" Access="Public" StyleClasses="PdaBackground" />
+    <PanelContainer Name="AccentV" Margin="220 -1 220 -1" Access="Public" StyleClasses="PdaBackground" />
+    <PanelContainer Name="Border" StyleClasses="PdaBorderRect" />
     <BoxContainer Orientation="Vertical" HorizontalExpand="True">
         <!--Heading-->
         <BoxContainer SetHeight="26" Margin="4 2 8 0" Orientation="Horizontal">
@@ -16,16 +16,16 @@
         <!--Content-->
         <Control Margin="18 0" RectClipContent="True" VerticalExpand="true"
                  HorizontalExpand="True">
-            <PanelContainer Name="ContentBorder" StyleClasses="PDABackground"/>
+            <PanelContainer Name="ContentBorder" StyleClasses="PdaBackground"/>
             <Control Margin="3 3">
-                <PanelContainer Name="ContentBackground" StyleClasses="PDAContentBackground"/>
-                <BoxContainer Access="Public" Name="ContentsContainer" Orientation="Vertical" StyleClasses="PDAContent"/>
+                <PanelContainer Name="ContentBackground" StyleClasses="PdaContentBackground"/>
+                <BoxContainer Access="Public" Name="ContentsContainer" Orientation="Vertical" StyleClasses="PdaContent"/>
 
             </Control>
         </Control>
         <!--Footer-->
         <BoxContainer Orientation="Horizontal" SetHeight="28">
-            <Label Text="Personal Digital Assistant" StyleClasses="PDAWindowFooterText" Margin="32 0 0 6"/>
+            <Label Text="Personal Digital Assistant" StyleClasses="PdaWindowFooterText" Margin="32 0 0 6"/>
         </BoxContainer>
     </BoxContainer>
-</pda:PDAWindow>
+</pda:PdaWindow>
diff --git a/Content.Client/PDA/PDAWindow.xaml.cs b/Content.Client/PDA/PdaWindow.xaml.cs
similarity index 94%
rename from Content.Client/PDA/PDAWindow.xaml.cs
rename to Content.Client/PDA/PdaWindow.xaml.cs
index 4a7ef89c64..cc4d622751 100644
--- a/Content.Client/PDA/PDAWindow.xaml.cs
+++ b/Content.Client/PDA/PdaWindow.xaml.cs
@@ -6,7 +6,7 @@ namespace Content.Client.PDA;
 
 [Virtual]
 [GenerateTypedNameReferences]
-public partial class PDAWindow : BaseWindow
+public partial class PdaWindow : BaseWindow
 {
 
     public string? BorderColor
@@ -38,7 +38,7 @@ public partial class PDAWindow : BaseWindow
         }
     }
 
-    public PDAWindow()
+    public PdaWindow()
     {
         RobustXamlLoader.Load(this);
 
diff --git a/Content.Client/Research/UI/MiniTechnologyCardControl.xaml b/Content.Client/Research/UI/MiniTechnologyCardControl.xaml
index 2808995524..c447df7bc0 100644
--- a/Content.Client/Research/UI/MiniTechnologyCardControl.xaml
+++ b/Content.Client/Research/UI/MiniTechnologyCardControl.xaml
@@ -2,7 +2,7 @@
     <BoxContainer Orientation="Horizontal">
         <PanelContainer Name="Background"
                         Access="Public"
-                        StyleClasses="PDABackground"
+                        StyleClasses="PdaBackground"
                         VerticalExpand="False"
                         HorizontalExpand="False"
                         MaxWidth="10"
diff --git a/Content.Client/Research/UI/TechnologyCardControl.xaml b/Content.Client/Research/UI/TechnologyCardControl.xaml
index e8d02015e6..f04036081d 100644
--- a/Content.Client/Research/UI/TechnologyCardControl.xaml
+++ b/Content.Client/Research/UI/TechnologyCardControl.xaml
@@ -3,7 +3,7 @@
     <BoxContainer Name="MainContainer" Orientation="Vertical" Margin="10 0 10 10">
         <PanelContainer Name="Background"
                         Access="Public"
-                        StyleClasses="PDABackground"
+                        StyleClasses="PdaBackground"
                         MinHeight="15"
                         VerticalExpand="False"
                         HorizontalExpand="True"
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index 5097132a86..e0f0a45224 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1396,56 +1396,56 @@ namespace Content.Client.Stylesheets
                     .Prop("font-color", DisabledFore),
 
                 //PDA - Backgrounds
-                Element<PanelContainer>().Class("PDAContentBackground")
+                Element<PanelContainer>().Class("PdaContentBackground")
                     .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252a")),
 
-                Element<PanelContainer>().Class("PDABackground")
+                Element<PanelContainer>().Class("PdaBackground")
                     .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenBoth)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#000000")),
 
-                Element<PanelContainer>().Class("PDABackgroundRect")
+                Element<PanelContainer>().Class("PdaBackgroundRect")
                     .Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#717059")),
 
-                Element<PanelContainer>().Class("PDABorderRect")
+                Element<PanelContainer>().Class("PdaBorderRect")
                     .Prop(PanelContainer.StylePropertyPanel, AngleBorderRect),
 
                 Element<PanelContainer>().Class("BackgroundDark")
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))),
 
                 //PDA - Buttons
-                Element<PDASettingsButton>().Pseudo(ContainerButton.StylePseudoClassNormal)
-                    .Prop(PDASettingsButton.StylePropertyBgColor, Color.FromHex(PDASettingsButton.NormalBgColor))
-                    .Prop(PDASettingsButton.StylePropertyFgColor, Color.FromHex(PDASettingsButton.EnabledFgColor)),
+                Element<PdaSettingsButton>().Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.NormalBgColor))
+                    .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.EnabledFgColor)),
 
-                Element<PDASettingsButton>().Pseudo(ContainerButton.StylePseudoClassHover)
-                    .Prop(PDASettingsButton.StylePropertyBgColor, Color.FromHex(PDASettingsButton.HoverColor))
-                    .Prop(PDASettingsButton.StylePropertyFgColor, Color.FromHex(PDASettingsButton.EnabledFgColor)),
+                Element<PdaSettingsButton>().Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.HoverColor))
+                    .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.EnabledFgColor)),
 
-                Element<PDASettingsButton>().Pseudo(ContainerButton.StylePseudoClassPressed)
-                    .Prop(PDASettingsButton.StylePropertyBgColor, Color.FromHex(PDASettingsButton.PressedColor))
-                    .Prop(PDASettingsButton.StylePropertyFgColor, Color.FromHex(PDASettingsButton.EnabledFgColor)),
+                Element<PdaSettingsButton>().Pseudo(ContainerButton.StylePseudoClassPressed)
+                    .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.PressedColor))
+                    .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.EnabledFgColor)),
 
-                Element<PDASettingsButton>().Pseudo(ContainerButton.StylePseudoClassDisabled)
-                    .Prop(PDASettingsButton.StylePropertyBgColor, Color.FromHex(PDASettingsButton.NormalBgColor))
-                    .Prop(PDASettingsButton.StylePropertyFgColor, Color.FromHex(PDASettingsButton.DisabledFgColor)),
+                Element<PdaSettingsButton>().Pseudo(ContainerButton.StylePseudoClassDisabled)
+                    .Prop(PdaSettingsButton.StylePropertyBgColor, Color.FromHex(PdaSettingsButton.NormalBgColor))
+                    .Prop(PdaSettingsButton.StylePropertyFgColor, Color.FromHex(PdaSettingsButton.DisabledFgColor)),
 
-                Element<PDAProgramItem>().Pseudo(ContainerButton.StylePseudoClassNormal)
-                    .Prop(PDAProgramItem.StylePropertyBgColor, Color.FromHex(PDAProgramItem.NormalBgColor)),
+                Element<PdaProgramItem>().Pseudo(ContainerButton.StylePseudoClassNormal)
+                    .Prop(PdaProgramItem.StylePropertyBgColor, Color.FromHex(PdaProgramItem.NormalBgColor)),
 
-                Element<PDAProgramItem>().Pseudo(ContainerButton.StylePseudoClassHover)
-                    .Prop(PDAProgramItem.StylePropertyBgColor, Color.FromHex(PDAProgramItem.HoverColor)),
+                Element<PdaProgramItem>().Pseudo(ContainerButton.StylePseudoClassHover)
+                    .Prop(PdaProgramItem.StylePropertyBgColor, Color.FromHex(PdaProgramItem.HoverColor)),
 
-                Element<PDAProgramItem>().Pseudo(ContainerButton.StylePseudoClassPressed)
-                    .Prop(PDAProgramItem.StylePropertyBgColor, Color.FromHex(PDAProgramItem.HoverColor)),
+                Element<PdaProgramItem>().Pseudo(ContainerButton.StylePseudoClassPressed)
+                    .Prop(PdaProgramItem.StylePropertyBgColor, Color.FromHex(PdaProgramItem.HoverColor)),
 
                 //PDA - Text
-                Element<Label>().Class("PDAContentFooterText")
+                Element<Label>().Class("PdaContentFooterText")
                     .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.FromHex("#757575")),
 
-                Element<Label>().Class("PDAWindowFooterText")
+                Element<Label>().Class("PdaWindowFooterText")
                     .Prop(Label.StylePropertyFont, notoSans10)
                     .Prop(Label.StylePropertyFontColor, Color.FromHex("#333d3b")),
 
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
index d1fafa0d73..71670ffe78 100644
--- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
+++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
@@ -38,7 +38,7 @@ namespace Content.IntegrationTests.Tests
     QuickEquip: false
     slots:
     - idcard
-  - type: PDA
+  - type: Pda
 ";
         [Test]
         public async Task SpawnItemInSlotTest()
diff --git a/Content.Server/Access/Systems/IdExaminableSystem.cs b/Content.Server/Access/Systems/IdExaminableSystem.cs
index 26b6d01ee6..c849cd5aeb 100644
--- a/Content.Server/Access/Systems/IdExaminableSystem.cs
+++ b/Content.Server/Access/Systems/IdExaminableSystem.cs
@@ -47,9 +47,9 @@ public sealed class IdExaminableSystem : EntitySystem
         if (_inventorySystem.TryGetSlotEntity(uid, "id", out var idUid))
         {
             // PDA
-            if (EntityManager.TryGetComponent(idUid, out PDAComponent? pda) && pda.ContainedID is not null)
+            if (EntityManager.TryGetComponent(idUid, out PdaComponent? pda) && pda.ContainedId is not null)
             {
-                return GetNameAndJob(pda.ContainedID);
+                return GetNameAndJob(pda.ContainedId);
             }
             // ID Card
             if (EntityManager.TryGetComponent(idUid, out IdCardComponent? id))
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index d5dd99605f..a9f1f6a8e4 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -105,10 +105,10 @@ namespace Content.Server.Administration.Commands
                     }
                     var equipmentEntity = entityManager.SpawnEntity(gearStr, entityManager.GetComponent<TransformComponent>(target).Coordinates);
                     if (slot.Name == "id" &&
-                        entityManager.TryGetComponent<PDAComponent?>(equipmentEntity, out var pdaComponent) &&
-                        pdaComponent.ContainedID != null)
+                        entityManager.TryGetComponent<PdaComponent?>(equipmentEntity, out var pdaComponent) &&
+                        pdaComponent.ContainedId != null)
                     {
-                        pdaComponent.ContainedID.FullName = entityManager.GetComponent<MetaDataComponent>(target).EntityName;
+                        pdaComponent.ContainedId.FullName = entityManager.GetComponent<MetaDataComponent>(target).EntityName;
                     }
 
                     invSystem.TryEquip(target, equipmentEntity, slot.Name, silent: true, force: true, inventory: inventoryComponent);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index e948f0b47e..5e62c8ca38 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -857,11 +857,11 @@ public sealed partial class AdminVerbSystem
             {
                 return slotEntity.Value;
             }
-            else if (TryComp<PDAComponent>(slotEntity, out var pda))
+            else if (TryComp<PdaComponent>(slotEntity, out var pda))
             {
-                if (pda.ContainedID != null)
+                if (pda.ContainedId != null)
                 {
-                    return pda.ContainedID.Owner;
+                    return pda.ContainedId.Owner;
                 }
             }
         }
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
index 3d82259ad2..a9ca6725ca 100644
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -187,7 +187,7 @@ public sealed class AlertLevelSystem : EntitySystem
 
         RaiseLocalEvent(new AlertLevelChangedEvent(station, level));
 
-        var pdas = EntityQueryEnumerator<PDAComponent>();
+        var pdas = EntityQueryEnumerator<PdaComponent>();
         while (pdas.MoveNext(out var ent, out var comp))
         {
             RaiseLocalEvent(ent,new AlertLevelChangedEvent(station, level));
diff --git a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
index d8a2091793..a7089df4e5 100644
--- a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
+++ b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
@@ -35,7 +35,7 @@ public sealed class CartridgeLoaderSystem : SharedCartridgeLoaderSystem
     /// Because the cartridge loader integrates with the ui of the entity using it, the entities ui state needs to inherit from <see cref="CartridgeLoaderUiState"/>
     /// and use this method to update its state so the cartridge loaders state can be added to it.
     /// </remarks>
-    /// <seealso cref="PDA.PDASystem.UpdatePDAUserInterface"/>
+    /// <seealso cref="PDA.PdaSystem.UpdatePdaUserInterface"/>
     public void UpdateUiState(EntityUid loaderUid, CartridgeLoaderUiState state, IPlayerSession? session = default!, CartridgeLoaderComponent? loader  = default!)
     {
         if (!Resolve(loaderUid, ref loader))
@@ -362,9 +362,9 @@ public sealed class CartridgeLoaderSystem : SharedCartridgeLoaderSystem
 
     /// <summary>
     /// Shortcut for updating the loaders user interface state without passing in a subtype of <see cref="CartridgeLoaderUiState"/>
-    /// like the <see cref="PDA.PDASystem"/> does when updating its ui state
+    /// like the <see cref="PDA.PdaSystem"/> does when updating its ui state
     /// </summary>
-    /// <seealso cref="PDA.PDASystem.UpdatePDAUserInterface"/>
+    /// <seealso cref="PDA.PdaSystem.UpdatePdaUserInterface"/>
     private void UpdateUserInterfaceState(EntityUid loaderUid, CartridgeLoaderComponent loader)
     {
         UpdateUiState(loaderUid, new CartridgeLoaderUiState(), null, loader);
diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs
index a1db7163a0..2f21a42e96 100644
--- a/Content.Server/Entry/IgnoredComponents.cs
+++ b/Content.Server/Entry/IgnoredComponents.cs
@@ -18,7 +18,7 @@ namespace Content.Server.Entry
             "HandheldGPS",
             "CableVisualizer",
             "UIFragment",
-            "PDABorderColor",
+            "PdaBorderColor",
             "InventorySlots",
             "LightFade",
         };
diff --git a/Content.Server/Mind/Commands/RenameCommand.cs b/Content.Server/Mind/Commands/RenameCommand.cs
index 0f92ae7c29..3c28cd191a 100644
--- a/Content.Server/Mind/Commands/RenameCommand.cs
+++ b/Content.Server/Mind/Commands/RenameCommand.cs
@@ -80,9 +80,9 @@ public sealed class RenameCommand : IConsoleCommand
         }
 
         // PDAs
-        if (entSysMan.TryGetEntitySystem<PDASystem>(out var pdaSystem))
+        if (entSysMan.TryGetEntitySystem<PdaSystem>(out var pdaSystem))
         {
-            var query = entMan.EntityQueryEnumerator<PDAComponent>();
+            var query = entMan.EntityQueryEnumerator<PdaComponent>();
             while (query.MoveNext(out var uid, out var pda))
             {
                 if (pda.OwnerName == oldName)
diff --git a/Content.Server/PDA/PDASystem.cs b/Content.Server/PDA/PdaSystem.cs
similarity index 71%
rename from Content.Server/PDA/PDASystem.cs
rename to Content.Server/PDA/PdaSystem.cs
index 7115cff963..b76f20d501 100644
--- a/Content.Server/PDA/PDASystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -16,7 +16,7 @@ using Content.Shared.Light.Component;
 
 namespace Content.Server.PDA
 {
-    public sealed class PDASystem : SharedPDASystem
+    public sealed class PdaSystem : SharedPdaSystem
     {
         [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!;
         [Dependency] private readonly InstrumentSystem _instrument = default!;
@@ -30,20 +30,20 @@ namespace Content.Server.PDA
         {
             base.Initialize();
 
-            SubscribeLocalEvent<PDAComponent, LightToggleEvent>(OnLightToggle);
-            SubscribeLocalEvent<PDAComponent, GridModifiedEvent>(OnGridChanged);
-            SubscribeLocalEvent<PDAComponent, AlertLevelChangedEvent>(OnAlertLevelChanged);
+            SubscribeLocalEvent<PdaComponent, LightToggleEvent>(OnLightToggle);
+            SubscribeLocalEvent<PdaComponent, GridModifiedEvent>(OnGridChanged);
+            SubscribeLocalEvent<PdaComponent, AlertLevelChangedEvent>(OnAlertLevelChanged);
 
             // UI Events:
-            SubscribeLocalEvent<PDAComponent, PDARequestUpdateInterfaceMessage>(OnUiMessage);
-            SubscribeLocalEvent<PDAComponent, PDAToggleFlashlightMessage>(OnUiMessage);
-            SubscribeLocalEvent<PDAComponent, PDAShowRingtoneMessage>(OnUiMessage);
-            SubscribeLocalEvent<PDAComponent, PDAShowMusicMessage>(OnUiMessage);
-            SubscribeLocalEvent<PDAComponent, PDAShowUplinkMessage>(OnUiMessage);
-            SubscribeLocalEvent<PDAComponent, PDALockUplinkMessage>(OnUiMessage);
+            SubscribeLocalEvent<PdaComponent, PdaRequestUpdateInterfaceMessage>(OnUiMessage);
+            SubscribeLocalEvent<PdaComponent, PdaToggleFlashlightMessage>(OnUiMessage);
+            SubscribeLocalEvent<PdaComponent, PdaShowRingtoneMessage>(OnUiMessage);
+            SubscribeLocalEvent<PdaComponent, PdaShowMusicMessage>(OnUiMessage);
+            SubscribeLocalEvent<PdaComponent, PdaShowUplinkMessage>(OnUiMessage);
+            SubscribeLocalEvent<PdaComponent, PdaLockUplinkMessage>(OnUiMessage);
         }
 
-        protected override void OnComponentInit(EntityUid uid, PDAComponent pda, ComponentInit args)
+        protected override void OnComponentInit(EntityUid uid, PdaComponent pda, ComponentInit args)
         {
             base.OnComponentInit(uid, pda, args);
 
@@ -54,31 +54,31 @@ namespace Content.Server.PDA
             UpdateStationName(uid, pda);
         }
 
-        protected override void OnItemInserted(EntityUid uid, PDAComponent pda, EntInsertedIntoContainerMessage args)
+        protected override void OnItemInserted(EntityUid uid, PdaComponent pda, EntInsertedIntoContainerMessage args)
         {
             base.OnItemInserted(uid, pda, args);
             UpdatePdaUi(uid, pda);
         }
 
-        protected override void OnItemRemoved(EntityUid uid, PDAComponent pda, EntRemovedFromContainerMessage args)
+        protected override void OnItemRemoved(EntityUid uid, PdaComponent pda, EntRemovedFromContainerMessage args)
         {
             base.OnItemRemoved(uid, pda, args);
             UpdatePdaUi(uid, pda);
         }
 
-        private void OnLightToggle(EntityUid uid, PDAComponent pda, LightToggleEvent args)
+        private void OnLightToggle(EntityUid uid, PdaComponent pda, LightToggleEvent args)
         {
             pda.FlashlightOn = args.IsOn;
             UpdatePdaUi(uid, pda);
         }
 
-        public void SetOwner(EntityUid uid, PDAComponent pda, string ownerName)
+        public void SetOwner(EntityUid uid, PdaComponent pda, string ownerName)
         {
             pda.OwnerName = ownerName;
             UpdatePdaUi(uid, pda);
         }
 
-        private void OnGridChanged(EntityUid uid, PDAComponent pda, GridModifiedEvent args)
+        private void OnGridChanged(EntityUid uid, PdaComponent pda, GridModifiedEvent args)
         {
             UpdateStationName(uid, pda);
             UpdatePdaUi(uid, pda);
@@ -87,18 +87,18 @@ namespace Content.Server.PDA
         /// <summary>
         /// Send new UI state to clients, call if you modify something like uplink.
         /// </summary>
-        public void UpdatePdaUi(EntityUid uid, PDAComponent pda)
+        public void UpdatePdaUi(EntityUid uid, PdaComponent pda)
         {
-            var ownerInfo = new PDAIdInfoText
+            var ownerInfo = new PdaIdInfoText
             {
                 ActualOwnerName = pda.OwnerName,
-                IdOwner = pda.ContainedID?.FullName,
-                JobTitle = pda.ContainedID?.JobTitle,
+                IdOwner = pda.ContainedId?.FullName,
+                JobTitle = pda.ContainedId?.JobTitle,
                 StationAlertLevel = pda.StationAlertLevel,
                 StationAlertColor = pda.StationAlertColor
             };
 
-            if (!_ui.TryGetUi(uid, PDAUiKey.Key, out var ui))
+            if (!_ui.TryGetUi(uid, PdaUiKey.Key, out var ui))
                 return;
 
             var address = GetDeviceNetAddress(uid);
@@ -110,7 +110,7 @@ namespace Content.Server.PDA
             // TODO: Update the level and name of the station with each call to UpdatePdaUi is only needed for latejoin players.
             // TODO: If someone can implement changing the level and name of the station when changing the PDA grid, this can be removed.
 
-            var state = new PDAUpdateState(
+            var state = new PdaUpdateState(
                 pda.FlashlightOn,
                 pda.PenSlot.HasItem,
                 ownerInfo,
@@ -122,44 +122,44 @@ namespace Content.Server.PDA
             _cartridgeLoader?.UpdateUiState(uid, state);
         }
 
-        private void OnUiMessage(EntityUid uid, PDAComponent pda, PDARequestUpdateInterfaceMessage msg)
+        private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaRequestUpdateInterfaceMessage msg)
         {
-            if (!PDAUiKey.Key.Equals(msg.UiKey))
+            if (!PdaUiKey.Key.Equals(msg.UiKey))
                 return;
 
             UpdatePdaUi(uid, pda);
         }
 
-        private void OnUiMessage(EntityUid uid, PDAComponent pda, PDAToggleFlashlightMessage msg)
+        private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaToggleFlashlightMessage msg)
         {
-            if (!PDAUiKey.Key.Equals(msg.UiKey))
+            if (!PdaUiKey.Key.Equals(msg.UiKey))
                 return;
 
             if (TryComp<UnpoweredFlashlightComponent>(uid, out var flashlight))
                 _unpoweredFlashlight.ToggleLight(uid, flashlight);
         }
 
-        private void OnUiMessage(EntityUid uid, PDAComponent pda, PDAShowRingtoneMessage msg)
+        private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaShowRingtoneMessage msg)
         {
-            if (!PDAUiKey.Key.Equals(msg.UiKey))
+            if (!PdaUiKey.Key.Equals(msg.UiKey))
                 return;
 
             if (HasComp<RingerComponent>(uid))
                 _ringer.ToggleRingerUI(uid, (IPlayerSession) msg.Session);
         }
 
-        private void OnUiMessage(EntityUid uid, PDAComponent pda, PDAShowMusicMessage msg)
+        private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaShowMusicMessage msg)
         {
-            if (!PDAUiKey.Key.Equals(msg.UiKey))
+            if (!PdaUiKey.Key.Equals(msg.UiKey))
                 return;
 
             if (TryComp<InstrumentComponent>(uid, out var instrument))
                 _instrument.ToggleInstrumentUi(uid, (IPlayerSession) msg.Session, instrument);
         }
 
-        private void OnUiMessage(EntityUid uid, PDAComponent pda, PDAShowUplinkMessage msg)
+        private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaShowUplinkMessage msg)
         {
-            if (!PDAUiKey.Key.Equals(msg.UiKey))
+            if (!PdaUiKey.Key.Equals(msg.UiKey))
                 return;
 
             // check if its locked again to prevent malicious clients opening locked uplinks
@@ -167,9 +167,9 @@ namespace Content.Server.PDA
                 _store.ToggleUi(msg.Session.AttachedEntity!.Value, uid, store);
         }
 
-        private void OnUiMessage(EntityUid uid, PDAComponent pda, PDALockUplinkMessage msg)
+        private void OnUiMessage(EntityUid uid, PdaComponent pda, PdaLockUplinkMessage msg)
         {
-            if (!PDAUiKey.Key.Equals(msg.UiKey))
+            if (!PdaUiKey.Key.Equals(msg.UiKey))
                 return;
 
             if (TryComp<RingerUplinkComponent>(uid, out var uplink))
@@ -184,19 +184,19 @@ namespace Content.Server.PDA
             return !TryComp<RingerUplinkComponent>(uid, out var uplink) || uplink.Unlocked;
         }
 
-        private void UpdateStationName(EntityUid uid, PDAComponent pda)
+        private void UpdateStationName(EntityUid uid, PdaComponent pda)
         {
             var station = _station.GetOwningStation(uid);
             pda.StationName = station is null ? null : Name(station.Value);
         }
 
-        private void OnAlertLevelChanged(EntityUid uid, PDAComponent pda, AlertLevelChangedEvent args)
+        private void OnAlertLevelChanged(EntityUid uid, PdaComponent pda, AlertLevelChangedEvent args)
         {
             UpdateAlertLevel(uid, pda);
             UpdatePdaUi(uid, pda);
         }
 
-        private void UpdateAlertLevel(EntityUid uid, PDAComponent pda)
+        private void UpdateAlertLevel(EntityUid uid, PdaComponent pda)
         {
             var station = _station.GetOwningStation(uid);
             if (!TryComp(station, out AlertLevelComponent? alertComp) ||
diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index fd171c369f..0682566469 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -15,7 +15,7 @@ namespace Content.Server.PDA.Ringer
 {
     public sealed class RingerSystem : SharedRingerSystem
     {
-        [Dependency] private readonly PDASystem _pda = default!;
+        [Dependency] private readonly PdaSystem _pda = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly UserInterfaceSystem _ui = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
@@ -74,7 +74,7 @@ namespace Content.Server.PDA.Ringer
             if (uplink.Code.SequenceEqual(args.Ringtone) && HasComp<StoreComponent>(uid))
             {
                 uplink.Unlocked = !uplink.Unlocked;
-                if (TryComp<PDAComponent>(uid, out var pda))
+                if (TryComp<PdaComponent>(uid, out var pda))
                     _pda.UpdatePdaUi(uid, pda);
 
                 // can't keep store open after locking it
diff --git a/Content.Server/Sandbox/SandboxSystem.cs b/Content.Server/Sandbox/SandboxSystem.cs
index 23da6f4ef7..dc96eb9d43 100644
--- a/Content.Server/Sandbox/SandboxSystem.cs
+++ b/Content.Server/Sandbox/SandboxSystem.cs
@@ -128,9 +128,9 @@ namespace Content.Server.Sandbox
                 {
                     UpgradeId(slotEntity.Value);
                 }
-                else if (TryComp<PDAComponent>(slotEntity, out var pda))
+                else if (TryComp<PdaComponent>(slotEntity, out var pda))
                 {
-                    if (pda.ContainedID == null)
+                    if (pda.ContainedId == null)
                     {
                         var newID = CreateFreshId();
                         if (TryComp<ItemSlotsComponent>(pda.Owner, out var itemSlots))
@@ -140,7 +140,7 @@ namespace Content.Server.Sandbox
                     }
                     else
                     {
-                        UpgradeId(pda.ContainedID.Owner);
+                        UpgradeId(pda.ContainedId.Owner);
                     }
                 }
             }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 0e53a04d48..583a325fd7 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -41,7 +41,7 @@ public sealed class StationSpawningSystem : EntitySystem
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
     [Dependency] private readonly IdCardSystem _cardSystem = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
-    [Dependency] private readonly PDASystem _pdaSystem = default!;
+    [Dependency] private readonly PdaSystem _pdaSystem = default!;
     [Dependency] private readonly SharedAccessSystem _accessSystem = default!;
     [Dependency] private readonly IdentitySystem _identity = default!;
 
@@ -211,10 +211,10 @@ public sealed class StationSpawningSystem : EntitySystem
         if (!_inventorySystem.TryGetSlotEntity(entity, "id", out var idUid))
             return;
 
-        if (!EntityManager.TryGetComponent(idUid, out PDAComponent? pdaComponent) || pdaComponent.ContainedID == null)
+        if (!EntityManager.TryGetComponent(idUid, out PdaComponent? pdaComponent) || pdaComponent.ContainedId == null)
             return;
 
-        var card = pdaComponent.ContainedID;
+        var card = pdaComponent.ContainedId;
         var cardId = card.Owner;
         _cardSystem.TryChangeFullName(cardId, characterName, card);
         _cardSystem.TryChangeJobTitle(cardId, jobPrototype.LocalizedName, card);
diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
index 17dfca4d0f..973ff67f3c 100644
--- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
+++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
@@ -137,7 +137,7 @@ public sealed class StationRecordsSystem : EntitySystem
         if (idUid != null)
         {
             var keyStorageEntity = idUid;
-            if (TryComp(idUid, out PDAComponent? pdaComponent) && pdaComponent.ContainedID != null)
+            if (TryComp(idUid, out PdaComponent? pdaComponent) && pdaComponent.ContainedId != null)
             {
                 keyStorageEntity = pdaComponent.IdSlot.Item;
             }
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
index 6d2f3cd20c..ed81288887 100644
--- a/Content.Server/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -74,7 +74,7 @@ namespace Content.Server.Traitor.Uplink
                 {
                     if (!pdaUid.ContainedEntity.HasValue) continue;
 
-                    if (HasComp<PDAComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
+                    if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value))
                         return pdaUid.ContainedEntity.Value;
                 }
             }
@@ -82,7 +82,7 @@ namespace Content.Server.Traitor.Uplink
             // Also check hands
             foreach (var item in _handsSystem.EnumerateHeld(user))
             {
-                if (HasComp<PDAComponent>(item) || HasComp<StoreComponent>(item))
+                if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item))
                     return item;
             }
 
diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs
index 2ebd55f2a1..39cfb8972a 100644
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Access.Components
 {
     [RegisterComponent, NetworkedComponent]
     [AutoGenerateComponentState]
-    [Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
+    [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem), Other = AccessPermissions.ReadWrite)]
     public sealed partial class IdCardComponent : Component
     {
         [DataField("fullName")]
@@ -17,7 +17,7 @@ namespace Content.Shared.Access.Components
 
         [DataField("jobTitle")]
         [AutoNetworkedField]
-        [Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem),
+        [Access(typeof(SharedIdCardSystem), typeof(SharedPdaSystem), typeof(SharedAgentIdCardSystem),
             Other = AccessPermissions.ReadWrite)]
         public string? JobTitle;
     }
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 501ef590ec..7c848c1aa7 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -256,8 +256,8 @@ namespace Content.Shared.Access.Systems
                 return true;
             }
 
-            if (TryComp(uid, out PDAComponent? pda) &&
-                pda.ContainedID?.Owner is {Valid: true} id)
+            if (TryComp(uid, out PdaComponent? pda) &&
+                pda.ContainedId?.Owner is {Valid: true} id)
             {
                 tags = EntityManager.GetComponent<AccessComponent>(id).Tags;
                 return true;
@@ -279,8 +279,8 @@ namespace Content.Shared.Access.Systems
                 return true;
             }
 
-            if (TryComp<PDAComponent>(uid, out var pda) &&
-                pda.ContainedID?.Owner is {Valid: true} id)
+            if (TryComp<PdaComponent>(uid, out var pda) &&
+                pda.ContainedId?.Owner is {Valid: true} id)
             {
                 if (TryComp<StationRecordKeyStorageComponent>(id, out var pdastorage) && pdastorage.Key != null)
                 {
diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
index 9d8fa64f3e..02cfd016ec 100644
--- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs
+++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs
@@ -39,16 +39,16 @@ public abstract class SharedIdCardSystem : EntitySystem
 
     /// <summary>
     ///     Attempt to get an id card component from an entity, either by getting it directly from the entity, or by
-    ///     getting the contained id from a <see cref="PDAComponent"/>.
+    ///     getting the contained id from a <see cref="PdaComponent"/>.
     /// </summary>
     public bool TryGetIdCard(EntityUid uid, [NotNullWhen(true)] out IdCardComponent? idCard)
     {
         if (EntityManager.TryGetComponent(uid, out idCard))
             return true;
 
-        if (EntityManager.TryGetComponent(uid, out PDAComponent? pda) && pda.ContainedID != null)
+        if (EntityManager.TryGetComponent(uid, out PdaComponent? pda) && pda.ContainedId != null)
         {
-            idCard = pda.ContainedID;
+            idCard = pda.ContainedId;
             return true;
         }
 
diff --git a/Content.Shared/PDA/PDAMessagesUI.cs b/Content.Shared/PDA/PDAMessagesUI.cs
deleted file mode 100644
index 486c7e8101..0000000000
--- a/Content.Shared/PDA/PDAMessagesUI.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.PDA;
-
-[Serializable, NetSerializable]
-public sealed class PDAToggleFlashlightMessage : BoundUserInterfaceMessage
-{
-    public PDAToggleFlashlightMessage() { }
-}
-
-[Serializable, NetSerializable]
-public sealed class PDAShowRingtoneMessage : BoundUserInterfaceMessage
-{
-    public PDAShowRingtoneMessage() { }
-}
-
-[Serializable, NetSerializable]
-public sealed class PDAShowUplinkMessage : BoundUserInterfaceMessage
-{
-    public PDAShowUplinkMessage() { }
-}
-
-[Serializable, NetSerializable]
-public sealed class PDALockUplinkMessage : BoundUserInterfaceMessage
-{
-    public PDALockUplinkMessage() { }
-}
-
-[Serializable, NetSerializable]
-public sealed class PDAShowMusicMessage : BoundUserInterfaceMessage
-{
-    public PDAShowMusicMessage() { }
-}
-
-[Serializable, NetSerializable]
-public sealed class PDARequestUpdateInterfaceMessage : BoundUserInterfaceMessage
-{
-    public PDARequestUpdateInterfaceMessage() { }
-}
diff --git a/Content.Shared/PDA/PDAComponent.cs b/Content.Shared/PDA/PdaComponent.cs
similarity index 85%
rename from Content.Shared/PDA/PDAComponent.cs
rename to Content.Shared/PDA/PdaComponent.cs
index 7a319b77a1..1cd81c0fcf 100644
--- a/Content.Shared/PDA/PDAComponent.cs
+++ b/Content.Shared/PDA/PdaComponent.cs
@@ -7,10 +7,10 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Shared.PDA
 {
     [RegisterComponent, NetworkedComponent]
-    public sealed class PDAComponent : Component
+    public sealed class PdaComponent : Component
     {
-        public const string PDAIdSlotId = "PDA-id";
-        public const string PDAPenSlotId = "PDA-pen";
+        public const string PdaIdSlotId = "PDA-id";
+        public const string PdaPenSlotId = "PDA-pen";
 
         /// <summary>
         /// The base PDA sprite state, eg. "pda", "pda-clown"
@@ -30,7 +30,7 @@ namespace Content.Shared.PDA
         [DataField("id", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string? IdCard;
 
-        [ViewVariables] public IdCardComponent? ContainedID;
+        [ViewVariables] public IdCardComponent? ContainedId;
         [ViewVariables] public bool FlashlightOn;
 
         [ViewVariables] public string? OwnerName;
diff --git a/Content.Shared/PDA/PdaMessagesUi.cs b/Content.Shared/PDA/PdaMessagesUi.cs
new file mode 100644
index 0000000000..00d29e1e1a
--- /dev/null
+++ b/Content.Shared/PDA/PdaMessagesUi.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.PDA;
+
+[Serializable, NetSerializable]
+public sealed class PdaToggleFlashlightMessage : BoundUserInterfaceMessage
+{
+    public PdaToggleFlashlightMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class PdaShowRingtoneMessage : BoundUserInterfaceMessage
+{
+    public PdaShowRingtoneMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class PdaShowUplinkMessage : BoundUserInterfaceMessage
+{
+    public PdaShowUplinkMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class PdaLockUplinkMessage : BoundUserInterfaceMessage
+{
+    public PdaLockUplinkMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class PdaShowMusicMessage : BoundUserInterfaceMessage
+{
+    public PdaShowMusicMessage() { }
+}
+
+[Serializable, NetSerializable]
+public sealed class PdaRequestUpdateInterfaceMessage : BoundUserInterfaceMessage
+{
+    public PdaRequestUpdateInterfaceMessage() { }
+}
diff --git a/Content.Shared/PDA/PDAUpdateState.cs b/Content.Shared/PDA/PdaUpdateState.cs
similarity index 77%
rename from Content.Shared/PDA/PDAUpdateState.cs
rename to Content.Shared/PDA/PdaUpdateState.cs
index 20002e277e..053527a868 100644
--- a/Content.Shared/PDA/PDAUpdateState.cs
+++ b/Content.Shared/PDA/PdaUpdateState.cs
@@ -5,23 +5,23 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.PDA
 {
     [Serializable, NetSerializable]
-    public sealed class PDAUpdateState : CartridgeLoaderUiState
+    public sealed class PdaUpdateState : CartridgeLoaderUiState
     {
         public bool FlashlightEnabled;
         public bool HasPen;
-        public PDAIdInfoText PDAOwnerInfo;
+        public PdaIdInfoText PdaOwnerInfo;
         public string? StationName;
         public bool HasUplink;
         public bool CanPlayMusic;
         public string? Address;
 
-        public PDAUpdateState(bool flashlightEnabled, bool hasPen, PDAIdInfoText pdaOwnerInfo,
+        public PdaUpdateState(bool flashlightEnabled, bool hasPen, PdaIdInfoText pdaOwnerInfo,
             string? stationName, bool hasUplink = false,
             bool canPlayMusic = false, string? address = null)
         {
             FlashlightEnabled = flashlightEnabled;
             HasPen = hasPen;
-            PDAOwnerInfo = pdaOwnerInfo;
+            PdaOwnerInfo = pdaOwnerInfo;
             HasUplink = hasUplink;
             CanPlayMusic = canPlayMusic;
             StationName = stationName;
@@ -30,7 +30,7 @@ namespace Content.Shared.PDA
     }
 
     [Serializable, NetSerializable]
-    public struct PDAIdInfoText
+    public struct PdaIdInfoText
     {
         public string? ActualOwnerName;
         public string? IdOwner;
diff --git a/Content.Shared/PDA/PDAVisuals.cs b/Content.Shared/PDA/PdaVisuals.cs
similarity index 70%
rename from Content.Shared/PDA/PDAVisuals.cs
rename to Content.Shared/PDA/PdaVisuals.cs
index 5abc340494..56039cf0d2 100644
--- a/Content.Shared/PDA/PDAVisuals.cs
+++ b/Content.Shared/PDA/PdaVisuals.cs
@@ -3,13 +3,13 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.PDA
 {
     [Serializable, NetSerializable]
-    public enum PDAVisuals
+    public enum PdaVisuals
     {
-        IDCardInserted
+        IdCardInserted
     }
 
     [Serializable, NetSerializable]
-    public enum PDAUiKey
+    public enum PdaUiKey
     {
         Key
     }
diff --git a/Content.Shared/PDA/SharedPDASystem.cs b/Content.Shared/PDA/SharedPdaSystem.cs
similarity index 53%
rename from Content.Shared/PDA/SharedPDASystem.cs
rename to Content.Shared/PDA/SharedPdaSystem.cs
index ec2d98f41c..7f7ab5c877 100644
--- a/Content.Shared/PDA/SharedPDASystem.cs
+++ b/Content.Shared/PDA/SharedPdaSystem.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Containers;
 
 namespace Content.Shared.PDA
 {
-    public abstract class SharedPDASystem : EntitySystem
+    public abstract class SharedPdaSystem : EntitySystem
     {
         [Dependency] protected readonly ItemSlotsSystem ItemSlotsSystem = default!;
         [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
@@ -13,49 +13,49 @@ namespace Content.Shared.PDA
         {
             base.Initialize();
 
-            SubscribeLocalEvent<PDAComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<PDAComponent, ComponentRemove>(OnComponentRemove);
+            SubscribeLocalEvent<PdaComponent, ComponentInit>(OnComponentInit);
+            SubscribeLocalEvent<PdaComponent, ComponentRemove>(OnComponentRemove);
 
-            SubscribeLocalEvent<PDAComponent, EntInsertedIntoContainerMessage>(OnItemInserted);
-            SubscribeLocalEvent<PDAComponent, EntRemovedFromContainerMessage>(OnItemRemoved);
+            SubscribeLocalEvent<PdaComponent, EntInsertedIntoContainerMessage>(OnItemInserted);
+            SubscribeLocalEvent<PdaComponent, EntRemovedFromContainerMessage>(OnItemRemoved);
         }
 
-        protected virtual void OnComponentInit(EntityUid uid, PDAComponent pda, ComponentInit args)
+        protected virtual void OnComponentInit(EntityUid uid, PdaComponent pda, ComponentInit args)
         {
             if (pda.IdCard != null)
                 pda.IdSlot.StartingItem = pda.IdCard;
 
-            ItemSlotsSystem.AddItemSlot(uid, PDAComponent.PDAIdSlotId, pda.IdSlot);
-            ItemSlotsSystem.AddItemSlot(uid, PDAComponent.PDAPenSlotId, pda.PenSlot);
+            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaIdSlotId, pda.IdSlot);
+            ItemSlotsSystem.AddItemSlot(uid, PdaComponent.PdaPenSlotId, pda.PenSlot);
 
             UpdatePdaAppearance(uid, pda);
         }
 
-        private void OnComponentRemove(EntityUid uid, PDAComponent pda, ComponentRemove args)
+        private void OnComponentRemove(EntityUid uid, PdaComponent pda, ComponentRemove args)
         {
             ItemSlotsSystem.RemoveItemSlot(uid, pda.IdSlot);
             ItemSlotsSystem.RemoveItemSlot(uid, pda.PenSlot);
         }
 
-        protected virtual void OnItemInserted(EntityUid uid, PDAComponent pda, EntInsertedIntoContainerMessage args)
+        protected virtual void OnItemInserted(EntityUid uid, PdaComponent pda, EntInsertedIntoContainerMessage args)
         {
-            if (args.Container.ID == PDAComponent.PDAIdSlotId)
-                pda.ContainedID = CompOrNull<IdCardComponent>(args.Entity);
+            if (args.Container.ID == PdaComponent.PdaIdSlotId)
+                pda.ContainedId = CompOrNull<IdCardComponent>(args.Entity);
 
             UpdatePdaAppearance(uid, pda);
         }
 
-        protected virtual void OnItemRemoved(EntityUid uid, PDAComponent pda, EntRemovedFromContainerMessage args)
+        protected virtual void OnItemRemoved(EntityUid uid, PdaComponent pda, EntRemovedFromContainerMessage args)
         {
             if (args.Container.ID == pda.IdSlot.ID)
-                pda.ContainedID = null;
+                pda.ContainedId = null;
 
             UpdatePdaAppearance(uid, pda);
         }
 
-        private void UpdatePdaAppearance(EntityUid uid, PDAComponent pda)
+        private void UpdatePdaAppearance(EntityUid uid, PdaComponent pda)
         {
-            Appearance.SetData(uid, PDAVisuals.IDCardInserted, pda.ContainedID != null);
+            Appearance.SetData(uid, PdaVisuals.IdCardInserted, pda.ContainedId != null);
         }
     }
 }
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index cfe1d91675..5e2a1935a4 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -111,7 +111,7 @@
     capacity: 60
     whitelist:
       components:
-      - PDA
+      - Pda
 
 - type: entity
   name: ID card box
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index ae8abd0f1c..7da719ed8a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -9,19 +9,19 @@
   - type: Sprite
     sprite: Objects/Devices/pda.rsi
     layers:
-    - map: [ "enum.PDAVisualLayers.Base" ]
+    - map: [ "enum.PdaVisualLayers.Base" ]
     - state: "light_overlay"
-      map: [ "enum.PDAVisualLayers.Flashlight" ]
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
       shader: "unshaded"
       visible: false
     - state: "id_overlay"
-      map: [ "enum.PDAVisualLayers.IDLight" ]
+      map: [ "enum.PdaVisualLayers.IdLight" ]
       shader: "unshaded"
       visible: false
   - type: Icon
     sprite: Objects/Devices/pda.rsi
     state: pda
-  - type: PDA
+  - type: Pda
     state: pda
     penSlot:
       startingItem: Pen
@@ -70,7 +70,7 @@
   - type: WirelessNetworkConnection
     range: 500
   - type: CartridgeLoader
-    uiKey: enum.PDAUiKey.Key
+    uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
     cartridgeSlot:
@@ -82,13 +82,13 @@
         components:
           - Cartridge
   - type: ActivatableUI
-    key: enum.PDAUiKey.Key
+    key: enum.PdaUiKey.Key
     singleUser: true
     closeOnHandDeselect: false
   - type: UserInterface
     interfaces:
-    - key: enum.PDAUiKey.Key
-      type: PDABoundUserInterface
+    - key: enum.PdaUiKey.Key
+      type: PdaBoundUserInterface
     - key: enum.StoreUiKey.Key
       type: StoreBoundUserInterface
     - key: enum.RingerUiKey.Key
@@ -111,10 +111,10 @@
   name: passenger PDA
   description: Why isn't it gray?
   components:
-  - type: PDA
+  - type: Pda
     id: PassengerIDCard
     state: pda
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#717059"
 
 - type: entity
@@ -123,7 +123,7 @@
   name: technical assistant PDA
   description: Why isn't it yellow?
   components:
-  - type: PDA
+  - type: Pda
     id: TechnicalAssistantIDCard
     state: pda-interntech
   - type: Icon
@@ -135,7 +135,7 @@
   name: medical intern PDA
   description: Why isn't it white? Has a built-in health analyzer.
   components:
-  - type: PDA
+  - type: Pda
     id: MedicalInternIDCard
     state: pda-internmed
   - type: Icon
@@ -154,7 +154,7 @@
   name: security cadet PDA
   description: Why isn't it red?
   components:
-  - type: PDA
+  - type: Pda
     id: SecurityCadetIDCard
     state: pda-interncadet
   - type: Icon
@@ -166,7 +166,7 @@
   name: research assistant PDA
   description: Why isn't it purple?
   components:
-  - type: PDA
+  - type: Pda
     id: ResearchAssistantIDCard
     state: pda-internsci
   - type: Icon
@@ -178,7 +178,7 @@
   name: service worker PDA
   description: Why isn't it gray?
   components:
-  - type: PDA
+  - type: Pda
     id: ServiceWorkerIDCard
     state: pda-internservice
   - type: Icon
@@ -190,10 +190,10 @@
   name: chef PDA
   description: Covered in grease and flour.
   components:
-  - type: PDA
+  - type: Pda
     id: ChefIDCard
     state: pda-cook
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#d7d7d0"
   - type: Icon
     state: pda-cook
@@ -204,7 +204,7 @@
   name: botanist PDA
   description: Has an earthy scent.
   components:
-  - type: PDA
+  - type: Pda
     id: BotanistIDCard
     state: pda-hydro
   - type: Icon
@@ -216,7 +216,7 @@
   name: clown PDA
   description: Looks can be deceiving.
   components:
-  - type: PDA
+  - type: Pda
     id: ClownIDCard
     state: pda-clown
     penSlot:
@@ -227,7 +227,7 @@
       whitelist:
         tags:
         - Write
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#C18199"
   - type: Icon
     state: pda-clown
@@ -262,7 +262,7 @@
   name: mime PDA
   description: Suprisingly not on mute.
   components:
-  - type: PDA
+  - type: Pda
     id: MimeIDCard
     state: pda-mime
     idSlot:
@@ -279,10 +279,10 @@
   id: ChaplainPDA
   description: God's chosen PDA.
   components:
-  - type: PDA
+  - type: Pda
     id: ChaplainIDCard
     state: pda-chaplain
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#333333"
   - type: Icon
     state: pda-chaplain
@@ -293,7 +293,7 @@
   id: QuartermasterPDA
   description: PDA for the guy that orders the guns.
   components:
-  - type: PDA
+  - type: Pda
     id: QuartermasterIDCard
     state: pda-qm
   - type: Icon
@@ -305,7 +305,7 @@
   name: cargo PDA
   description: PDA for the guys that order the pizzas.
   components:
-  - type: PDA
+  - type: Pda
     id: CargoIDCard
     state: pda-cargo
   - type: Icon
@@ -317,7 +317,7 @@
   name: salvage PDA
   description: Smells like ash.
   components:
-  - type: PDA
+  - type: Pda
     id: SalvageIDCard
     state: pda-miner
   - type: Icon
@@ -329,7 +329,7 @@
   name: bartender PDA
   description: Smells like beer.
   components:
-  - type: PDA
+  - type: Pda
     id: BartenderIDCard
     state: pda-bartender
   - type: Icon
@@ -341,7 +341,7 @@
   name: librarian PDA
   description: Smells like books.
   components:
-  - type: PDA
+  - type: Pda
     id: LibrarianIDCard
     state: pda-library
   - type: Icon
@@ -353,7 +353,7 @@
   name: lawyer PDA
   description: For lawyers to poach dubious clients.
   components:
-  - type: PDA
+  - type: Pda
     id: LawyerIDCard
     state: pda-lawyer
   - type: Icon
@@ -365,10 +365,10 @@
   name: janitor PDA
   description: Smells like bleach.
   components:
-  - type: PDA
+  - type: Pda
     id: JanitorIDCard
     state: pda-janitor
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#5D2D56"
   - type: Icon
     state: pda-janitor
@@ -379,7 +379,7 @@
   name: captain PDA
   description: Surprisingly no different from your PDA.
   components:
-  - type: PDA
+  - type: Pda
     id: CaptainIDCard
     state: pda-captain
     penSlot:
@@ -388,7 +388,7 @@
       whitelist:
         tags:
         - Write
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#7C5D00"
   - type: Icon
     state: pda-captain
@@ -399,7 +399,7 @@
   name: head of personnel PDA
   description: Looks like it's been chewed on.
   components:
-  - type: PDA
+  - type: Pda
     id: HoPIDCard
     state: pda-hop
     penSlot:
@@ -417,10 +417,10 @@
   name: chief engineer PDA
   description: Looks like it's barely been used.
   components:
-  - type: PDA
+  - type: Pda
     id: CEIDCard
     state: pda-ce
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#949137"
     accentHColor: "#447987"
   - type: Icon
@@ -432,7 +432,7 @@
   name: engineer PDA
   description: Rugged and well-worn.
   components:
-  - type: PDA
+  - type: Pda
     id: EngineeringIDCard
     state: pda-engineer
   - type: Icon
@@ -444,10 +444,10 @@
   name: chief medical officer PDA
   description: Extraordinarily shiny and sterile. Has a built-in health analyzer.
   components:
-  - type: PDA
+  - type: Pda
     id: CMOIDCard
     state: pda-cmo
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentHColor: "#447987"
     accentVColor: "#447987"
@@ -464,10 +464,10 @@
   name: medical PDA
   description: Shiny and sterile. Has a built-in health analyzer.
   components:
-  - type: PDA
+  - type: Pda
     id: MedicalIDCard
     state: pda-medical
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#447987"
   - type: Icon
@@ -486,10 +486,10 @@
   name: paramedic PDA
   description: Shiny and sterile. Has a built-in rapid health analyzer.
   components:
-  - type: PDA
+  - type: Pda
     id: ParamedicIDCard
     state: pda-paramedic
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#2a4b5b"
   - type: Icon
@@ -505,10 +505,10 @@
   name: chemistry PDA
   description: It has a few discolored blotches here and there.
   components:
-  - type: PDA
+  - type: Pda
     id: ChemistIDCard
     state: pda-chemistry
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#B34200"
   - type: Icon
@@ -520,7 +520,7 @@
   name: research director PDA
   description: It appears surprisingly ordinary.
   components:
-  - type: PDA
+  - type: Pda
     id: RDIDCard
     state: pda-rd
   - type: Icon
@@ -532,7 +532,7 @@
   name: science PDA
   description: It's covered with an unknown gooey substance.
   components:
-  - type: PDA
+  - type: Pda
     id: ResearchIDCard
     state: pda-science
   - type: Icon
@@ -544,10 +544,10 @@
   name: head of security PDA
   description: Whosoever bears this PDA is the law.
   components:
-  - type: PDA
+  - type: Pda
     id: HoSIDCard
     state: pda-hos
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#447987"
   - type: Icon
@@ -559,7 +559,7 @@
   name: warden PDA
   description: The OS appears to have been jailbroken.
   components:
-  - type: PDA
+  - type: Pda
     id: WardenIDCard
     state: pda-warden
   - type: Icon
@@ -571,7 +571,7 @@
   name: security PDA
   description: Red to hide the stains of passenger blood.
   components:
-  - type: PDA
+  - type: Pda
     id: SecurityIDCard
     state: pda-security
   - type: Icon
@@ -583,7 +583,7 @@
   name: CentCom PDA
   description: Light green sign of walking bureaucracy.
   components:
-  - type: PDA
+  - type: Pda
     id: CentcomIDCardSyndie
     state: pda-centcom
     penSlot:
@@ -591,7 +591,7 @@
       whitelist:
         tags:
         - Write
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#32CD32"
   - type: Icon
     state: pda-centcom
@@ -602,7 +602,7 @@
   name: musician PDA
   description: It fills you with inspiration.
   components:
-  - type: PDA
+  - type: Pda
     id: MusicianIDCard
     state: pda-musician
   - type: Instrument
@@ -617,7 +617,7 @@
   name: atmos PDA
   description: Still smells like plasma.
   components:
-  - type: PDA
+  - type: Pda
     id: AtmosIDCard
     state: pda-atmos
   - type: Icon
@@ -629,7 +629,7 @@
   name: clear PDA
   description: 99 and 44/100ths percent pure plastic.
   components:
-  - type: PDA
+  - type: Pda
     id: PassengerIDCard
     state: pda-clear
   - type: Icon
@@ -641,7 +641,7 @@
   name: syndicate PDA
   description: Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people!
   components:
-  - type: PDA
+  - type: Pda
     id: SyndicateIDCard
     state: pda-syndi
   - type: Icon
@@ -653,10 +653,10 @@
   name: ERT PDA
   description: Red for firepower.
   components:
-  - type: PDA
+  - type: Pda
     id: ERTLeaderIDCard
     state: pda-ert
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#447987"
   - type: Icon
@@ -668,10 +668,10 @@
   name: CBURN PDA
   description: Smells like rotten flesh.
   components:
-  - type: PDA
+  - type: Pda
     id: CBURNIDcard
     state: pda-ert
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#447987"
 
@@ -681,10 +681,10 @@
   name: psychologist PDA
   description: Looks immaculately cleaned.
   components:
-  - type: PDA
+  - type: Pda
     id: PsychologistIDCard
     state: pda-medical
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#d7d7d0"
     accentVColor: "#447987"
   - type: Icon
@@ -696,7 +696,7 @@
   name: reporter PDA
   description: Smells like freshly printed press.
   components:
-  - type: PDA
+  - type: Pda
     id: ReporterIDCard
     state: pda-reporter
   - type: Icon
@@ -708,7 +708,7 @@
   name: zookeeper PDA
   description: Made with genuine synthetic leather. Crikey!
   components:
-  - type: PDA
+  - type: Pda
     id: ZookeeperIDCard
     state: pda-zookeeper
   - type: Icon
@@ -720,10 +720,10 @@
   name: boxer PDA
   description: Float like a butterfly, ringtone like a bee.
   components:
-  - type: PDA
+  - type: Pda
     id: BoxerIDCard
     state: pda-boxer
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#333333"
     borderVColor: "#390504"
   - type: Icon
@@ -735,10 +735,10 @@
   name: detective PDA
   description: Smells like rain... pouring down the rooftops...
   components:
-  - type: PDA
+  - type: Pda
     id: DetectiveIDCard
     state: pda-detective
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#774705"
   - type: Icon
     state: pda-detective
@@ -749,10 +749,10 @@
   name: brigmedic PDA
   description: I wonder whose pulse is on the screen? I hope he doesnt stop... PDA has a built-in health analyzer.
   components:
-  - type: PDA
+  - type: Pda
     id: BrigmedicIDCard
     state: pda-brigmedic
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#A32D26"
     accentHColor: "#d7d7d0"
     accentVColor: "#d7d7d0"
@@ -770,10 +770,10 @@
   suffix: Unremoveable
   description: Cursed cluwne PDA.
   components:
-  - type: PDA
+  - type: Pda
     id: CluwneIDCard
     state: pda-cluwne
-  - type: PDABorderColor
+  - type: PdaBorderColor
     borderColor: "#1c8f4d"
   - type: Icon
     state: pda-cluwne
diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
index a995af95cb..d6efa81f92 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
@@ -72,7 +72,7 @@
     blacklist:
       components:
       - Material
-      - PDA
+      - Pda
       - IdCard
       tags:
       - HighRiskItem
diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
index 3b36fdda97..abe591509b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -94,7 +94,7 @@
     blacklist:
       components:
       - Material
-      - PDA
+      - Pda
       - IdCard
       - HumanoidAppearance
       tags: