diff --git a/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs b/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs
index 5f186801ca..9cf0df0d4a 100644
--- a/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs
+++ b/Content.Server/Atmos/Components/AtmosPlaqueComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos.Components
 {
-    [RegisterComponent, ComponentProtoName("AtmosPlaque")]
+    [RegisterComponent]
     public sealed class AtmosPlaqueComponent : Component
     {
         [DataField("plaqueType")] public PlaqueType Type = PlaqueType.Unset;
diff --git a/Content.Server/Bible/Components/BibleComponent.cs b/Content.Server/Bible/Components/BibleComponent.cs
index 3d922a8c19..8b2dde5262 100644
--- a/Content.Server/Bible/Components/BibleComponent.cs
+++ b/Content.Server/Bible/Components/BibleComponent.cs
@@ -9,7 +9,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Bible.Components
 {
-    [RegisterComponent, ComponentProtoName("Bible")]
+    [RegisterComponent]
     public sealed class BibleComponent : Component
     {
 
diff --git a/Content.Server/Bible/Components/BibleUserComponent.cs b/Content.Server/Bible/Components/BibleUserComponent.cs
index e9cc7913cb..269d47f61f 100644
--- a/Content.Server/Bible/Components/BibleUserComponent.cs
+++ b/Content.Server/Bible/Components/BibleUserComponent.cs
@@ -3,6 +3,6 @@ using Robust.Shared.Analyzers;
 
 namespace Content.Server.Bible.Components
 {
-    [RegisterComponent, ComponentProtoName("BibleUser")]
+    [RegisterComponent]
     public sealed class BibleUserComponent : Component {}
 }
diff --git a/Content.Server/Body/Components/ThermalRegulatorComponent.cs b/Content.Server/Body/Components/ThermalRegulatorComponent.cs
index bb7f6aed83..6314883df1 100644
--- a/Content.Server/Body/Components/ThermalRegulatorComponent.cs
+++ b/Content.Server/Body/Components/ThermalRegulatorComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Systems;
+using Content.Server.Body.Systems;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -6,7 +6,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Body.Components;
 
-[RegisterComponent, ComponentProtoName("ThermalRegulator")]
+[RegisterComponent]
 [Friend(typeof(ThermalRegulatorSystem))]
 public class ThermalRegulatorComponent : Component
 {
diff --git a/Content.Server/Climbing/Components/GlassTableComponent.cs b/Content.Server/Climbing/Components/GlassTableComponent.cs
index 9283bed861..c32cc61ab8 100644
--- a/Content.Server/Climbing/Components/GlassTableComponent.cs
+++ b/Content.Server/Climbing/Components/GlassTableComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -11,7 +11,6 @@ namespace Content.Server.Climbing.Components;
 ///     not very generalized with regards to naming.
 /// </summary>
 [RegisterComponent, Friend(typeof(ClimbSystem))]
-[ComponentProtoName("GlassTable")]
 public class GlassTableComponent : Component
 {
     /// <summary>
diff --git a/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs b/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs
index 17e6d8d938..68ffcc69a9 100644
--- a/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs
+++ b/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs
@@ -7,8 +7,8 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.DeviceNetwork.Components
 {
     [RegisterComponent]
-    [ComponentProtoName("ApcNetworkConnection")]
     [Friend(typeof(ApcNetworkSystem))]
+    [ComponentProtoName("ApcNetworkConnection")]
     public class ApcNetworkComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Explosion/Components/ClusterGrenadeComponent.cs b/Content.Server/Explosion/Components/ClusterGrenadeComponent.cs
index c7c6abe241..e21a41cd44 100644
--- a/Content.Server/Explosion/Components/ClusterGrenadeComponent.cs
+++ b/Content.Server/Explosion/Components/ClusterGrenadeComponent.cs
@@ -9,7 +9,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Explosion.Components
 {
-    [RegisterComponent, ComponentProtoName("ClusterGrenade"), Friend(typeof(ClusterGrenadeSystem))]
+    [RegisterComponent, Friend(typeof(ClusterGrenadeSystem))]
     public sealed class ClusterGrenadeComponent : Component
     {
         public Container GrenadesContainer = default!;
diff --git a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
index 9fb4bc398a..47912dfdb4 100644
--- a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
+++ b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
@@ -1,9 +1,9 @@
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Explosion.Components
 {
-    [RegisterComponent, ComponentProtoName("OnUseTimerTrigger")]
+    [RegisterComponent]
     public class OnUseTimerTriggerComponent : Component
     {
         [DataField("delay")] public float Delay = 0f;
diff --git a/Content.Server/Guardian/CanHostGuardianComponent.cs b/Content.Server/Guardian/CanHostGuardianComponent.cs
index 05c9216a4c..06e06a34b6 100644
--- a/Content.Server/Guardian/CanHostGuardianComponent.cs
+++ b/Content.Server/Guardian/CanHostGuardianComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.GameObjects;
 
 namespace Content.Server.Guardian;
 
-[RegisterComponent, ComponentProtoName("CanHostGuardian")]
+[RegisterComponent]
 public class CanHostGuardianComponent : Component
 {
 }
diff --git a/Content.Server/Guardian/GuardianComponent.cs b/Content.Server/Guardian/GuardianComponent.cs
index a8ebedf22c..be8fc5b889 100644
--- a/Content.Server/Guardian/GuardianComponent.cs
+++ b/Content.Server/Guardian/GuardianComponent.cs
@@ -8,7 +8,6 @@ namespace Content.Server.Guardian
     /// Given to guardians to monitor their link with the host
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("Guardian")]
     public class GuardianComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Guardian/GuardianCreatorComponent.cs b/Content.Server/Guardian/GuardianCreatorComponent.cs
index d581ddc351..3e64ee0d10 100644
--- a/Content.Server/Guardian/GuardianCreatorComponent.cs
+++ b/Content.Server/Guardian/GuardianCreatorComponent.cs
@@ -10,7 +10,6 @@ namespace Content.Server.Guardian
     /// Creates a GuardianComponent attached to the user's GuardianHost.
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("GuardianCreator")]
     public sealed class GuardianCreatorComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Guardian/GuardianHostComponent.cs b/Content.Server/Guardian/GuardianHostComponent.cs
index e9aecdae2a..9771087e21 100644
--- a/Content.Server/Guardian/GuardianHostComponent.cs
+++ b/Content.Server/Guardian/GuardianHostComponent.cs
@@ -8,7 +8,6 @@ namespace Content.Server.Guardian
     /// Given to guardian users upon establishing a guardian link with the entity
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("GuardianHost")]
     public sealed class GuardianHostComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
index 1378bae68b..068b4947a2 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Shared.Inventory;
 using Content.Shared.Medical.SuitSensor;
 using Robust.Shared.Analyzers;
@@ -13,7 +13,6 @@ namespace Content.Server.Medical.SuitSensors
     /// </summary>
     [RegisterComponent]
     [Friend(typeof(SuitSensorSystem))]
-    [ComponentProtoName("SuitSensor")]
     public sealed class SuitSensorComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs
index d03481be51..6cb6c9a167 100644
--- a/Content.Server/Mind/Components/MindComponent.cs
+++ b/Content.Server/Mind/Components/MindComponent.cs
@@ -18,7 +18,7 @@ namespace Content.Server.Mind.Components
     /// <summary>
     ///     Stores a <see cref="Server.Mind.Mind"/> on a mob.
     /// </summary>
-    [RegisterComponent, ComponentProtoName("Mind"), Friend(typeof(MindSystem))]
+    [RegisterComponent, Friend(typeof(MindSystem))]
     public class MindComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Mining/Components/MineableComponent.cs b/Content.Server/Mining/Components/MineableComponent.cs
index 498939c8bf..a112c2e00c 100644
--- a/Content.Server/Mining/Components/MineableComponent.cs
+++ b/Content.Server/Mining/Components/MineableComponent.cs
@@ -1,9 +1,9 @@
-using Robust.Shared.Analyzers;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.Mining.Components;
 
-[RegisterComponent, ComponentProtoName("Mineable")]
+[RegisterComponent]
 [Friend(typeof(MineableSystem))]
 public class MineableComponent : Component
 {
diff --git a/Content.Server/Mining/Components/PickaxeComponent.cs b/Content.Server/Mining/Components/PickaxeComponent.cs
index 2242e4d953..1a34b349f4 100644
--- a/Content.Server/Mining/Components/PickaxeComponent.cs
+++ b/Content.Server/Mining/Components/PickaxeComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Mining.Components
 {
-    [RegisterComponent, ComponentProtoName("Pickaxe")]
+    [RegisterComponent]
     public class PickaxeComponent : Component
     {
         [DataField("sound")]
diff --git a/Content.Server/Plants/Components/RandomPottedPlantComponent.cs b/Content.Server/Plants/Components/RandomPottedPlantComponent.cs
index 2252c0a24e..dfb99378b9 100644
--- a/Content.Server/Plants/Components/RandomPottedPlantComponent.cs
+++ b/Content.Server/Plants/Components/RandomPottedPlantComponent.cs
@@ -8,7 +8,6 @@ namespace Content.Server.Plants.Components
 {
     [RegisterComponent]
     [Friend(typeof(RandomPottedPlantSystem))]
-    [ComponentProtoName("RandomPottedPlant")]
     public class RandomPottedPlantComponent : Component
     {
         [ViewVariables(VVAccess.ReadOnly)]
diff --git a/Content.Server/Power/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs
index 3e5953b45d..064dddfb26 100644
--- a/Content.Server/Power/Components/ApcComponent.cs
+++ b/Content.Server/Power/Components/ApcComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Server.Power.Components;
 
 [RegisterComponent]
 [Friend(typeof(ApcSystem))]
-[ComponentProtoName("Apc")]
 public class ApcComponent : BaseApcNetComponent
 {
     [DataField("onReceiveMessageSound")]
diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs
index 4691c04b75..d82fbbfec7 100644
--- a/Content.Server/Power/Components/CableComponent.cs
+++ b/Content.Server/Power/Components/CableComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Server.Power.Components
     /// </summary>
     [RegisterComponent]
     [Friend(typeof(CableSystem))]
-    [ComponentProtoName("Cable")]
     public class CableComponent : Component
     {
         [DataField("cableDroppedOnCutPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
diff --git a/Content.Server/Power/Components/CablePlacerComponent.cs b/Content.Server/Power/Components/CablePlacerComponent.cs
index de80a1df4d..f29225dc12 100644
--- a/Content.Server/Power/Components/CablePlacerComponent.cs
+++ b/Content.Server/Power/Components/CablePlacerComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Power.Components
 {
-    [RegisterComponent, ComponentProtoName("CablePlacer")]
+    [RegisterComponent]
     public sealed class CablePlacerComponent : Component
     {
         [ViewVariables]
diff --git a/Content.Server/Radar/RadarConsoleComponent.cs b/Content.Server/Radar/RadarConsoleComponent.cs
index 2fa6d38d5b..747c53ec1d 100644
--- a/Content.Server/Radar/RadarConsoleComponent.cs
+++ b/Content.Server/Radar/RadarConsoleComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Radar;
 
-[RegisterComponent, ComponentProtoName("RadarConsole")]
+[RegisterComponent]
 public class RadarConsoleComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/RandomAppearance/RandomAppearanceComponent.cs b/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
index 7a41d6fdd3..78454df421 100644
--- a/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
+++ b/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Analyzers;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.RandomAppearance;
 
-[RegisterComponent, ComponentProtoName("RandomAppearance")]
+[RegisterComponent]
 [Friend(typeof(RandomAppearanceSystem))]
 public class RandomAppearanceComponent : Component, ISerializationHooks
 {
diff --git a/Content.Server/Salvage/SalvageMagnetComponent.cs b/Content.Server/Salvage/SalvageMagnetComponent.cs
index bcb20e1357..ff9cb037e3 100644
--- a/Content.Server/Salvage/SalvageMagnetComponent.cs
+++ b/Content.Server/Salvage/SalvageMagnetComponent.cs
@@ -10,7 +10,6 @@ namespace Content.Server.Salvage
     ///     A salvage magnet.
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("SalvageMagnet")]
     public class SalvageMagnetComponent : Component
     {
         /// <summary>
diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
index d74e832f1e..9fce84395c 100644
--- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Spawners.Components
 {
-    [RegisterComponent, ComponentProtoName("ConditionalSpawner")]
+    [RegisterComponent]
     public class ConditionalSpawnerComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
index 7c99a1e1ac..11facff804 100644
--- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Spawners.Components
 {
-    [RegisterComponent, ComponentProtoName("RandomSpawner")]
+    [RegisterComponent]
     public class RandomSpawnerComponent : ConditionalSpawnerComponent
     {
         [ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/Speech/Components/MonkeyAccentComponent.cs b/Content.Server/Speech/Components/MonkeyAccentComponent.cs
index 0e1e510396..53f7604432 100644
--- a/Content.Server/Speech/Components/MonkeyAccentComponent.cs
+++ b/Content.Server/Speech/Components/MonkeyAccentComponent.cs
@@ -3,5 +3,4 @@ using Robust.Shared.GameObjects;
 namespace Content.Server.Speech.Components;
 
 [RegisterComponent]
-[ComponentProtoName("MonkeyAccent")]
 public sealed class MonkeyAccentComponent : Component {}
diff --git a/Content.Server/Speech/Components/ReplacementAccentComponent.cs b/Content.Server/Speech/Components/ReplacementAccentComponent.cs
index ef63a558a7..8000e82110 100644
--- a/Content.Server/Speech/Components/ReplacementAccentComponent.cs
+++ b/Content.Server/Speech/Components/ReplacementAccentComponent.cs
@@ -21,7 +21,6 @@ namespace Content.Server.Speech.Components
     /// Replaces any spoken sentences with a random word.
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("ReplacementAccent")]
     public class ReplacementAccentComponent : Component
     {
         [DataField("accent", customTypeSerializer: typeof(PrototypeIdSerializer<ReplacementAccentPrototype>), required: true)]
diff --git a/Content.Server/Speech/Components/RussianAccentComponent.cs b/Content.Server/Speech/Components/RussianAccentComponent.cs
index fdf644cd94..c3752eed25 100644
--- a/Content.Server/Speech/Components/RussianAccentComponent.cs
+++ b/Content.Server/Speech/Components/RussianAccentComponent.cs
@@ -3,5 +3,4 @@ using Robust.Shared.GameObjects;
 namespace Content.Server.Speech.Components;
 
 [RegisterComponent]
-[ComponentProtoName("RussianAccent")]
 public sealed class RussianAccentComponent : Component {}
diff --git a/Content.Server/Sprite/Components/RandomSpriteColorComponent.cs b/Content.Server/Sprite/Components/RandomSpriteColorComponent.cs
index b453d3fe6f..0f02b7c95d 100644
--- a/Content.Server/Sprite/Components/RandomSpriteColorComponent.cs
+++ b/Content.Server/Sprite/Components/RandomSpriteColorComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Sprite.Components
 {
-    [RegisterComponent, ComponentProtoName("RandomSpriteColor")]
+    [RegisterComponent]
     public class RandomSpriteColorComponent : Component
     {
         // This should handle random states + colors for layers.
diff --git a/Content.Server/Sprite/Components/RandomSpriteStateComponent.cs b/Content.Server/Sprite/Components/RandomSpriteStateComponent.cs
index d6bc037b3f..00224c7956 100644
--- a/Content.Server/Sprite/Components/RandomSpriteStateComponent.cs
+++ b/Content.Server/Sprite/Components/RandomSpriteStateComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Sprite.Components
 {
-    [RegisterComponent, ComponentProtoName("RandomSpriteState")]
+    [RegisterComponent]
     public class RandomSpriteStateComponent : Component
     {
         [DataField("spriteStates")] public List<string>? SpriteStates;
diff --git a/Content.Server/Station/Components/BecomesStationComponent.cs b/Content.Server/Station/Components/BecomesStationComponent.cs
index 36432234d1..afd58da400 100644
--- a/Content.Server/Station/Components/BecomesStationComponent.cs
+++ b/Content.Server/Station/Components/BecomesStationComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -9,7 +9,7 @@ namespace Content.Server.Station;
 /// <summary>
 ///     Added to grids saved in maps to designate that they are the 'main station' grid.
 /// </summary>
-[RegisterComponent, ComponentProtoName("BecomesStation")]
+[RegisterComponent]
 [Friend(typeof(GameTicker))]
 public class BecomesStationComponent : Component
 {
diff --git a/Content.Server/Station/Components/PartOfStationComponent.cs b/Content.Server/Station/Components/PartOfStationComponent.cs
index d6cfcc9472..af0599b37e 100644
--- a/Content.Server/Station/Components/PartOfStationComponent.cs
+++ b/Content.Server/Station/Components/PartOfStationComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -10,7 +10,7 @@ namespace Content.Server.Station;
 ///     Added to grids saved in maps to designate them as 'part of a station' and not main grids. I.e. ancillary
 ///     shuttles for multi-grid stations.
 /// </summary>
-[RegisterComponent, ComponentProtoName("PartOfStation")]
+[RegisterComponent]
 [Friend(typeof(GameTicker))]
 public class PartOfStationComponent : Component
 {
diff --git a/Content.Server/Storage/Components/StorageFillComponent.cs b/Content.Server/Storage/Components/StorageFillComponent.cs
index c78f9cceb5..695b046641 100644
--- a/Content.Server/Storage/Components/StorageFillComponent.cs
+++ b/Content.Server/Storage/Components/StorageFillComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Storage.Components
 {
-    [RegisterComponent, ComponentProtoName("StorageFill"), Friend(typeof(StorageSystem))]
+    [RegisterComponent, Friend(typeof(StorageSystem))]
     public sealed class StorageFillComponent : Component
     {
         [DataField("contents")] public List<EntitySpawnEntry> Contents = new();
diff --git a/Content.Server/Toilet/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs
index 5d66ccacbe..560d6dfd5f 100644
--- a/Content.Server/Toilet/ToiletComponent.cs
+++ b/Content.Server/Toilet/ToiletComponent.cs
@@ -9,7 +9,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Toilet
 {
     [RegisterComponent]
-    [ComponentProtoName("Toilet")]
     public sealed class ToiletComponent : Component, ISuicideAct
     {
         [DataField("pryLidTime")]
diff --git a/Content.Server/Tools/Components/TilePryingComponent.cs b/Content.Server/Tools/Components/TilePryingComponent.cs
index 353ee9d9a2..dafb33b59b 100644
--- a/Content.Server/Tools/Components/TilePryingComponent.cs
+++ b/Content.Server/Tools/Components/TilePryingComponent.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using Content.Shared.Tools;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -7,7 +7,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Tools.Components
 {
-    [RegisterComponent, ComponentProtoName("TilePrying")]
+    [RegisterComponent]
     public sealed class TilePryingComponent : Component
     {
         [ViewVariables]
diff --git a/Content.Server/Warps/WarpPointComponent.cs b/Content.Server/Warps/WarpPointComponent.cs
index f2d6382869..3c7d61595f 100644
--- a/Content.Server/Warps/WarpPointComponent.cs
+++ b/Content.Server/Warps/WarpPointComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Warps
     /// <summary>
     /// Allows ghosts etc to warp to this entity by name.
     /// </summary>
-    [RegisterComponent, ComponentProtoName("WarpPoint")]
+    [RegisterComponent]
     public sealed class WarpPointComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)] [DataField("location")] public string? Location { get; set; }
diff --git a/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs b/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
index 4950fee69d..91624df34d 100644
--- a/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
+++ b/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Weapon.Melee.EnergySword
 {
-    [RegisterComponent, ComponentProtoName("EnergySword")]
+    [RegisterComponent]
     internal class EnergySwordComponent : Component
     {
         public Color BladeColor = Color.DodgerBlue;
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
index 7c1c35a3cf..d2aa511885 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
@@ -12,7 +12,6 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
     /// Stores ammo and can quickly transfer ammo into a magazine.
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("AmmoBox")]
     [Friend(typeof(GunSystem))]
     public sealed class AmmoBoxComponent : Component
     {
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
index 0b80668bc5..e383a9f239 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
@@ -25,7 +25,6 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
     /// Generally used for bullets but can be used for other things like bananas
     /// </summary>
     [RegisterComponent]
-    [ComponentProtoName("Ammo")]
     [Friend(typeof(GunSystem))]
     public sealed class AmmoComponent : Component, ISerializationHooks
     {
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
index 5457fda0fa..3ba6000545 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
-    [RegisterComponent, ComponentProtoName("RangedMagazine")]
+    [RegisterComponent]
     public class RangedMagazineComponent : Component
     {
         public readonly Stack<EntityUid> SpawnedAmmo = new();
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
index e61c88cef8..bacbe786a4 100644
--- a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
     /// <summary>
     /// Used to load certain ranged weapons quickly
     /// </summary>
-    [RegisterComponent, ComponentProtoName("SpeedLoader")]
+    [RegisterComponent]
     public class SpeedLoaderComponent : Component
     {
         [DataField("caliber")] public BallisticCaliber Caliber = BallisticCaliber.Unspecified;
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs
index 93e44cd215..1b1b3298ac 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs
@@ -10,7 +10,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
-    [RegisterComponent, NetworkedComponent, ComponentProtoName("BatteryBarrel"), ComponentReference(typeof(ServerRangedBarrelComponent))]
+    [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))]
     public sealed class BatteryBarrelComponent : ServerRangedBarrelComponent
     {
         // The minimum change we need before we can fire
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
index 39e45bf460..4e49ec940f 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
@@ -16,7 +16,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
     /// <summary>
     /// Shotguns mostly
     /// </summary>
-    [RegisterComponent, NetworkedComponent, ComponentProtoName("BoltActionBarrel"), ComponentReference(typeof(ServerRangedBarrelComponent))]
+    [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))]
     public sealed class BoltActionBarrelComponent : ServerRangedBarrelComponent
     {
         // Originally I had this logic shared with PumpBarrel and used a couple of variables to control things
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs
index db462f9670..1aa8336de2 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs
@@ -14,7 +14,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
-    [RegisterComponent, NetworkedComponent, ComponentProtoName("MagazineBarrel"), ComponentReference(typeof(ServerRangedBarrelComponent))]
+    [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))]
     public sealed class MagazineBarrelComponent : ServerRangedBarrelComponent
     {
         [Dependency] private readonly IEntityManager _entities = default!;
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
index 5dea7f4210..eb6d645dd2 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
@@ -15,7 +15,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
     /// <summary>
     /// Bolt-action rifles
     /// </summary>
-    [RegisterComponent, NetworkedComponent, ComponentProtoName("PumpBarrel"), ComponentReference(typeof(ServerRangedBarrelComponent))]
+    [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))]
     public sealed class PumpBarrelComponent : ServerRangedBarrelComponent, ISerializationHooks
     {
         public override int ShotsLeft
diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
index 60aacee87e..1ef82b944f 100644
--- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
@@ -15,7 +15,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
-    [RegisterComponent, ComponentProtoName("RevolverBarrel"), NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))]
+    [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))]
     public sealed class RevolverBarrelComponent : ServerRangedBarrelComponent, ISerializationHooks
     {
         [ViewVariables]
diff --git a/Content.Shared/Alert/AlertsComponent.cs b/Content.Shared/Alert/AlertsComponent.cs
index a1d16de665..a21e498e0f 100644
--- a/Content.Shared/Alert/AlertsComponent.cs
+++ b/Content.Shared/Alert/AlertsComponent.cs
@@ -11,7 +11,6 @@ namespace Content.Shared.Alert;
 /// </summary>
 [RegisterComponent]
 [NetworkedComponent]
-[ComponentProtoName("Alerts")]
 public class AlertsComponent : Component
 {
     [ViewVariables] public Dictionary<AlertKey, AlertState> Alerts = new();
diff --git a/Content.Shared/Camera/CameraRecoilComponent.cs b/Content.Shared/Camera/CameraRecoilComponent.cs
index 924591680f..e15a0ac300 100644
--- a/Content.Shared/Camera/CameraRecoilComponent.cs
+++ b/Content.Shared/Camera/CameraRecoilComponent.cs
@@ -6,7 +6,6 @@ namespace Content.Shared.Camera;
 
 [RegisterComponent]
 [NetworkedComponent]
-[ComponentProtoName("CameraRecoil")]
 public class CameraRecoilComponent : Component
 {
     public Vector2 CurrentKick { get; set; }
diff --git a/Content.Shared/Follower/Components/FollowedComponent.cs b/Content.Shared/Follower/Components/FollowedComponent.cs
index 013af41302..cd4862a007 100644
--- a/Content.Shared/Follower/Components/FollowedComponent.cs
+++ b/Content.Shared/Follower/Components/FollowedComponent.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
@@ -7,7 +7,7 @@ namespace Content.Shared.Follower.Components;
 /// <summary>
 ///     Attached to entities that are currently being followed by a ghost.
 /// </summary>
-[RegisterComponent, ComponentProtoName("Followed"), Friend(typeof(FollowerSystem))]
+[RegisterComponent, Friend(typeof(FollowerSystem))]
 public class FollowedComponent : Component
 {
     public HashSet<EntityUid> Following = new();
diff --git a/Content.Shared/Follower/Components/FollowerComponent.cs b/Content.Shared/Follower/Components/FollowerComponent.cs
index c1f204d2a4..8913e74e9d 100644
--- a/Content.Shared/Follower/Components/FollowerComponent.cs
+++ b/Content.Shared/Follower/Components/FollowerComponent.cs
@@ -1,9 +1,9 @@
-using Robust.Shared.Analyzers;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.Follower.Components;
 
-[RegisterComponent, ComponentProtoName("Follower")]
+[RegisterComponent]
 [Friend(typeof(FollowerSystem))]
 public class FollowerComponent : Component
 {
diff --git a/Content.Shared/Light/Component/RgbLightControllerComponent.cs b/Content.Shared/Light/Component/RgbLightControllerComponent.cs
index 9cca0c898f..f18445243c 100644
--- a/Content.Shared/Light/Component/RgbLightControllerComponent.cs
+++ b/Content.Shared/Light/Component/RgbLightControllerComponent.cs
@@ -14,7 +14,6 @@ namespace Content.Shared.Light.Component;
 /// </summary>
 [NetworkedComponent]
 [RegisterComponent]
-[ComponentProtoName("RgbLightController")]
 [Friend(typeof(SharedRgbLightControllerSystem))]
 public sealed class RgbLightControllerComponent : Robust.Shared.GameObjects.Component
 {
diff --git a/Content.Shared/Light/Component/SharedHandheldLightComponent.cs b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
index e8a309ef28..7f15efc399 100644
--- a/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
+++ b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
@@ -6,7 +6,6 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Light.Component
 {
     [NetworkedComponent]
-    [ComponentProtoName("HandheldLight")]
     public abstract class SharedHandheldLightComponent : Robust.Shared.GameObjects.Component
     {
         public const int StatusLevels = 6;
diff --git a/Content.Shared/PowerCell/Components/PowerCellComponent.cs b/Content.Shared/PowerCell/Components/PowerCellComponent.cs
index f045281b58..ecff220927 100644
--- a/Content.Shared/PowerCell/Components/PowerCellComponent.cs
+++ b/Content.Shared/PowerCell/Components/PowerCellComponent.cs
@@ -13,7 +13,6 @@ namespace Content.Shared.PowerCell;
 /// </summary>
 [NetworkedComponent]
 [RegisterComponent]
-[ComponentProtoName("PowerCell")]
 public sealed class PowerCellComponent : Component
 {
     public const string SolutionName = "powerCell";
diff --git a/Content.Shared/Timing/UseDelayComponent.cs b/Content.Shared/Timing/UseDelayComponent.cs
index c6e73732a0..5827daef39 100644
--- a/Content.Shared/Timing/UseDelayComponent.cs
+++ b/Content.Shared/Timing/UseDelayComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Timing
     /// <summary>
     /// Timer that creates a cooldown each time an object is activated/used
     /// </summary>
-    [RegisterComponent, ComponentProtoName("UseDelay")]
+    [RegisterComponent]
     public sealed class UseDelayComponent : Component
     {
         [ViewVariables]