diff --git a/Resources/Maps/Salvage/medium-1.yml b/Resources/Maps/Salvage/medium-1.yml
index bf7082ccc7..f9614e57e2 100644
--- a/Resources/Maps/Salvage/medium-1.yml
+++ b/Resources/Maps/Salvage/medium-1.yml
@@ -1363,7 +1363,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 114
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 1.5,2.5
     parent: 0
diff --git a/Resources/Maps/Salvage/small-4.yml b/Resources/Maps/Salvage/small-4.yml
index d7b7da1a2d..657552fe28 100644
--- a/Resources/Maps/Salvage/small-4.yml
+++ b/Resources/Maps/Salvage/small-4.yml
@@ -829,7 +829,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 53
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,-3.5
     parent: 0
diff --git a/Resources/Maps/Salvage/small-ai-survey-drone.yml b/Resources/Maps/Salvage/small-ai-survey-drone.yml
index 09576d8841..ee060bb535 100644
--- a/Resources/Maps/Salvage/small-ai-survey-drone.yml
+++ b/Resources/Maps/Salvage/small-ai-survey-drone.yml
@@ -755,7 +755,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 56
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: -2.5,0.5
     parent: 0
diff --git a/Resources/Maps/Test/singularity.yml b/Resources/Maps/Test/singularity.yml
index 0646655162..96b65d2412 100644
--- a/Resources/Maps/Test/singularity.yml
+++ b/Resources/Maps/Test/singularity.yml
@@ -1333,7 +1333,7 @@ entities:
     pos: 3.5,16.5
     type: Transform
 - uid: 149
-  type: SalternApc
+  type: SalternAPC
   components:
   - parent: 0
     pos: 3.5,17.5
diff --git a/Resources/Maps/dart.yml b/Resources/Maps/dart.yml
index 74ede263ad..fdb2c05114 100644
--- a/Resources/Maps/dart.yml
+++ b/Resources/Maps/dart.yml
@@ -1350,7 +1350,7 @@ entities:
     parent: 28
     type: Transform
 - uid: 108
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 0.5,-7.5
     parent: 28
@@ -1957,7 +1957,7 @@ entities:
     parent: 28
     type: Transform
 - uid: 190
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 4.5,-7.5
     parent: 28
@@ -2037,7 +2037,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 199
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 2.5,-3.5
     parent: 28
@@ -2049,7 +2049,7 @@ entities:
     currentSupply: 7730
     type: PowerNetworkBattery
 - uid: 200
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 2.5,2.5
     parent: 28
@@ -3832,7 +3832,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 380
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 0.5,4.5
     parent: 28
diff --git a/Resources/Maps/knightship.yml b/Resources/Maps/knightship.yml
index 142898a80c..d7fa6eefb9 100644
--- a/Resources/Maps/knightship.yml
+++ b/Resources/Maps/knightship.yml
@@ -2121,7 +2121,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 152
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -1.5,-3.5
     parent: 0
@@ -2419,7 +2419,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 186
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,0.5
     parent: 0
@@ -2864,7 +2864,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 241
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 6.5,-9.5
     parent: 0
@@ -3166,7 +3166,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 281
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 7.5,2.5
     parent: 0
@@ -3473,7 +3473,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 317
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 4.5,-1.5
     parent: 0
@@ -3801,7 +3801,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 355
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 5.5,-3.5
     parent: 0
@@ -5211,7 +5211,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 509
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 4.5,-16.5
     parent: 0
diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml
index b9510e429e..6bd311749d 100644
--- a/Resources/Maps/packedstation.yml
+++ b/Resources/Maps/packedstation.yml
@@ -19545,7 +19545,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 362
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 0.5,-3.5
     parent: 0
@@ -19560,7 +19560,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 364
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,-11.5
     parent: 0
@@ -19782,7 +19782,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 398
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 16.5,-6.5
     parent: 0
@@ -20233,7 +20233,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 461
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,15.5
     parent: 0
@@ -20430,7 +20430,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 488
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 10.5,11.5
     parent: 0
@@ -21414,7 +21414,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 626
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 19.5,-13.5
     parent: 0
@@ -21909,7 +21909,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 703
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 12.5,-17.5
     parent: 0
@@ -21939,7 +21939,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 707
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 20.5,-14.5
     parent: 0
@@ -22345,7 +22345,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 773
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 8.5,-26.5
     parent: 0
@@ -22499,7 +22499,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 798
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 17.5,-23.5
     parent: 0
@@ -22705,7 +22705,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 825
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 18.5,-23.5
     parent: 0
@@ -23795,7 +23795,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 969
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 9.5,-35.5
     parent: 0
@@ -24416,7 +24416,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1065
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 26.5,-37.5
     parent: 0
@@ -24887,7 +24887,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1133
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 21.5,5.5
     parent: 0
@@ -26596,7 +26596,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1394
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 5.5,-35.5
     parent: 0
@@ -27640,7 +27640,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1561
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 37.485016,-2.5795918
     parent: 0
@@ -27871,7 +27871,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1591
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 29.5,-37.5
     parent: 0
@@ -28211,7 +28211,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1636
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 40.5,-11.5
     parent: 0
@@ -28560,7 +28560,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 1681
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 42.5,-11.5
     parent: 0
@@ -28823,7 +28823,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1710
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 39.5,-15.5
     parent: 0
@@ -29252,13 +29252,13 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1770
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 34.5,-15.5
     parent: 0
     type: Transform
 - uid: 1771
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 41.5,-21.5
     parent: 0
@@ -29789,7 +29789,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1837
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 41.5,21.5
     parent: 0
@@ -30632,7 +30632,7 @@ entities:
       ItemCabinet: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1970
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 36.5,29.5
     parent: 0
@@ -33623,7 +33623,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 2400
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 37.5,25.5
     parent: 0
@@ -33826,7 +33826,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 2426
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 43.5,26.5
     parent: 0
@@ -34444,7 +34444,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 2503
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 20.5,34.5
     parent: 0
@@ -36085,7 +36085,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 2743
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 68.5,-15.5
     parent: 0
@@ -37386,7 +37386,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 2924
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 69.5,47.5
     parent: 0
@@ -40465,7 +40465,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 3427
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 71.5,44.5
     parent: 0
@@ -40477,7 +40477,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 3429
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 0.5,-8.5
     parent: 0
@@ -44354,7 +44354,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4042
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 10.5,-4.5
     parent: 0
@@ -44632,7 +44632,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4076
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 22.5,-13.5
     parent: 0
@@ -45115,7 +45115,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4130
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 11.5,-15.5
     parent: 0
@@ -45161,7 +45161,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4136
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -4.5,-2.5
     parent: 0
@@ -45183,7 +45183,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4139
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,16.5
     parent: 0
@@ -45778,7 +45778,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4209
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,7.5
     parent: 0
@@ -47324,7 +47324,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4348
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 10.311251,18.586544
     parent: 0
@@ -48500,7 +48500,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4478
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 3.5,-27.5
     parent: 0
@@ -49665,7 +49665,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4610
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 33.5,7.5
     parent: 0
@@ -50741,7 +50741,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 4726
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 40.5,-1.5
     parent: 0
@@ -51794,7 +51794,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 4838
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 16.5,23.5
     parent: 0
@@ -51888,7 +51888,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4850
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 16.5,25.5
     parent: 0
@@ -51902,7 +51902,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4852
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,35.5
     parent: 0
@@ -52420,7 +52420,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4906
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 15.5,34.5
     parent: 0
@@ -52440,7 +52440,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4909
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 25.5,43.5
     parent: 0
@@ -52737,13 +52737,13 @@ entities:
       PaperLabel: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 4941
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 20.5,40.5
     parent: 0
     type: Transform
 - uid: 4942
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 43.5,2.5
     parent: 0
@@ -53523,7 +53523,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5036
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 52.5,-8.5
     parent: 0
@@ -53539,7 +53539,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5038
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 66.5,-0.5
     parent: 0
@@ -54182,7 +54182,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5111
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 75.5,-2.5
     parent: 0
@@ -54553,13 +54553,13 @@ entities:
       morgue_tray: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 5152
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 75.5,-4.5
     parent: 0
     type: Transform
 - uid: 5153
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 73.5,-7.5
     parent: 0
@@ -54571,7 +54571,7 @@ entities:
     supplyRampPosition: 1.6666667
     type: PowerNetworkBattery
 - uid: 5154
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 58.5,-8.5
     parent: 0
@@ -54764,7 +54764,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5178
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 74.5,9.5
     parent: 0
@@ -55196,7 +55196,7 @@ entities:
   - enabled: False
     type: AmbientSound
 - uid: 5224
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 64.5,11.5
     parent: 0
@@ -55559,7 +55559,7 @@ entities:
   - color: '#0000FFFF'
     type: AtmosPipeColor
 - uid: 5259
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 56.5,11.5
     parent: 0
@@ -55861,19 +55861,19 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5292
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 53.5,21.5
     parent: 0
     type: Transform
 - uid: 5293
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 51.5,22.5
     parent: 0
     type: Transform
 - uid: 5294
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 33.5,44.5
     parent: 0
@@ -56121,7 +56121,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5322
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 66.488266,17.465452
     parent: 0
@@ -57245,7 +57245,7 @@ entities:
   - enabled: False
     type: AmbientSound
 - uid: 5450
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 2.5,-4.5
     parent: 0
@@ -58968,7 +58968,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5671
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 68.47836,41.729954
     parent: 0
@@ -59332,7 +59332,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5712
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 69.5,9.5
     parent: 0
@@ -62176,7 +62176,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6028
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 78.5,-14.5
     parent: 0
@@ -62287,7 +62287,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 6038
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 6.5,-10.5
     parent: 0
@@ -62377,7 +62377,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 6048
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,-19.5
     parent: 0
@@ -62596,7 +62596,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6070
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,33.5
     parent: 0
@@ -63061,7 +63061,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6118
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,9.5
     parent: 0
@@ -63095,7 +63095,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6122
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 43.5,12.5
     parent: 0
@@ -63571,7 +63571,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6183
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 22.5,11.5
     parent: 0
@@ -63701,7 +63701,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6197
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 66.5,45.5
     parent: 0
@@ -65179,7 +65179,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6367
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 54.5,4.5
     parent: 0
@@ -65333,7 +65333,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6383
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 50.5,-14.5
     parent: 0
@@ -66005,7 +66005,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6452
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 65.5,23.5
     parent: 0
@@ -66917,7 +66917,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 6547
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 39.5,-18.5
     parent: 0
@@ -68542,7 +68542,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6722
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 11.5,2.5
     parent: 0
@@ -68720,7 +68720,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6743
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 7.5,3.5
     parent: 0
@@ -70072,7 +70072,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6899
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 47.5,28.5
     parent: 0
@@ -70930,7 +70930,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6986
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 22.5,-22.5
     parent: 0
@@ -85777,7 +85777,7 @@ entities:
   - color: '#0000FFFF'
     type: AtmosPipeColor
 - uid: 8426
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 38.500893,-33.65727
     parent: 0
@@ -87825,7 +87825,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 8623
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 30.480644,38.38934
     parent: 0
@@ -90884,7 +90884,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 9040
-  type: SalternSmes
+  type: SalternSMES
   components:
   - rot: -1.5707963267948966 rad
     pos: 112.5,-17.5
@@ -91056,7 +91056,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 9058
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: -1.5707963267948966 rad
     pos: 110.5,-14.5
@@ -105302,7 +105302,7 @@ entities:
   - color: '#FF0000FF'
     type: AtmosPipeColor
 - uid: 10263
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 16.5,-23.5
     parent: 0
@@ -112403,7 +112403,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 10894
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 3.5,-34.5
     parent: 0
@@ -116686,7 +116686,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 11447
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 55.5,37.5
     parent: 0
@@ -116694,7 +116694,7 @@ entities:
   - startingCharge: 12000
     type: Battery
 - uid: 11448
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 56.5,38.5
     parent: 0
diff --git a/Resources/Maps/packedstationxmas.yml b/Resources/Maps/packedstationxmas.yml
index 0dc5468137..1e87d02e0f 100644
--- a/Resources/Maps/packedstationxmas.yml
+++ b/Resources/Maps/packedstationxmas.yml
@@ -19547,7 +19547,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 362
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 0.5,-3.5
     parent: 0
@@ -19562,7 +19562,7 @@ entities:
       stash: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 364
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,-11.5
     parent: 0
@@ -19784,7 +19784,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 398
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 16.5,-6.5
     parent: 0
@@ -20235,7 +20235,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 461
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,15.5
     parent: 0
@@ -20432,7 +20432,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 488
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 10.5,11.5
     parent: 0
@@ -21416,7 +21416,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 626
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 19.5,-13.5
     parent: 0
@@ -21911,7 +21911,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 703
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 12.5,-17.5
     parent: 0
@@ -21941,7 +21941,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 707
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 20.5,-14.5
     parent: 0
@@ -22347,7 +22347,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 773
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 8.5,-26.5
     parent: 0
@@ -22501,7 +22501,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 798
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 17.5,-23.5
     parent: 0
@@ -22707,7 +22707,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 825
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 18.5,-23.5
     parent: 0
@@ -23797,7 +23797,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 969
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 9.5,-35.5
     parent: 0
@@ -24418,7 +24418,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1065
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 26.5,-37.5
     parent: 0
@@ -24885,7 +24885,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1133
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 21.5,5.5
     parent: 0
@@ -26595,7 +26595,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1394
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 5.5,-35.5
     parent: 0
@@ -27639,7 +27639,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1561
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 37.485016,-2.5795918
     parent: 0
@@ -27870,7 +27870,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1591
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 29.5,-37.5
     parent: 0
@@ -28210,7 +28210,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1636
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 40.5,-11.5
     parent: 0
@@ -28559,7 +28559,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 1681
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 42.5,-11.5
     parent: 0
@@ -28822,7 +28822,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1710
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 39.5,-15.5
     parent: 0
@@ -29251,13 +29251,13 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1770
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 34.5,-15.5
     parent: 0
     type: Transform
 - uid: 1771
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 41.5,-21.5
     parent: 0
@@ -29788,7 +29788,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1837
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 41.5,21.5
     parent: 0
@@ -30631,7 +30631,7 @@ entities:
       ItemCabinet: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1970
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 36.5,29.5
     parent: 0
@@ -33621,7 +33621,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 2400
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 37.5,25.5
     parent: 0
@@ -33824,7 +33824,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 2426
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 43.5,26.5
     parent: 0
@@ -34442,7 +34442,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 2503
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 20.5,34.5
     parent: 0
@@ -36082,7 +36082,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 2743
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 68.5,-15.5
     parent: 0
@@ -37386,7 +37386,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 2924
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 69.5,47.5
     parent: 0
@@ -40465,7 +40465,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 3427
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 71.5,44.5
     parent: 0
@@ -40477,7 +40477,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 3429
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 0.5,-8.5
     parent: 0
@@ -44354,7 +44354,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4042
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 10.5,-4.5
     parent: 0
@@ -44632,7 +44632,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4076
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 22.5,-13.5
     parent: 0
@@ -45115,7 +45115,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4130
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 11.5,-15.5
     parent: 0
@@ -45161,7 +45161,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4136
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -4.5,-2.5
     parent: 0
@@ -45183,7 +45183,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4139
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,16.5
     parent: 0
@@ -45778,7 +45778,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4209
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,7.5
     parent: 0
@@ -47324,7 +47324,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4348
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 10.311251,18.586544
     parent: 0
@@ -48500,7 +48500,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4478
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 3.5,-27.5
     parent: 0
@@ -49665,7 +49665,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4610
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 33.5,7.5
     parent: 0
@@ -50741,7 +50741,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 4726
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 40.5,-1.5
     parent: 0
@@ -51794,7 +51794,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 4838
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 16.5,23.5
     parent: 0
@@ -51888,7 +51888,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4850
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 16.5,25.5
     parent: 0
@@ -51902,7 +51902,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4852
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,35.5
     parent: 0
@@ -52420,7 +52420,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4906
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 15.5,34.5
     parent: 0
@@ -52440,7 +52440,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 4909
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 25.5,43.5
     parent: 0
@@ -52737,13 +52737,13 @@ entities:
       PaperLabel: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 4941
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 20.5,40.5
     parent: 0
     type: Transform
 - uid: 4942
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 43.5,2.5
     parent: 0
@@ -53523,7 +53523,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5036
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 52.5,-8.5
     parent: 0
@@ -53539,7 +53539,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5038
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 66.5,-0.5
     parent: 0
@@ -54182,7 +54182,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5111
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 75.5,-2.5
     parent: 0
@@ -54553,13 +54553,13 @@ entities:
       morgue_tray: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 5152
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 75.5,-4.5
     parent: 0
     type: Transform
 - uid: 5153
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 73.5,-7.5
     parent: 0
@@ -54571,7 +54571,7 @@ entities:
     supplyRampPosition: 1.6666667
     type: PowerNetworkBattery
 - uid: 5154
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 58.5,-8.5
     parent: 0
@@ -54764,7 +54764,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5178
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 74.5,9.5
     parent: 0
@@ -55196,7 +55196,7 @@ entities:
   - enabled: False
     type: AmbientSound
 - uid: 5224
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 64.5,11.5
     parent: 0
@@ -55559,7 +55559,7 @@ entities:
   - color: '#0000FFFF'
     type: AtmosPipeColor
 - uid: 5259
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 56.5,11.5
     parent: 0
@@ -55861,19 +55861,19 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5292
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 53.5,21.5
     parent: 0
     type: Transform
 - uid: 5293
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 51.5,22.5
     parent: 0
     type: Transform
 - uid: 5294
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 33.5,44.5
     parent: 0
@@ -56121,7 +56121,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 5322
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 66.488266,17.465452
     parent: 0
@@ -57242,7 +57242,7 @@ entities:
   - enabled: False
     type: AmbientSound
 - uid: 5450
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 2.5,-4.5
     parent: 0
@@ -58966,7 +58966,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5671
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 68.47836,41.729954
     parent: 0
@@ -59330,7 +59330,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 5712
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 69.5,9.5
     parent: 0
@@ -62168,7 +62168,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6028
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 78.5,-14.5
     parent: 0
@@ -62279,7 +62279,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 6038
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 6.5,-10.5
     parent: 0
@@ -62369,7 +62369,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 6048
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,-19.5
     parent: 0
@@ -62588,7 +62588,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6070
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,33.5
     parent: 0
@@ -63053,7 +63053,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6118
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 28.5,9.5
     parent: 0
@@ -63087,7 +63087,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6122
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 43.5,12.5
     parent: 0
@@ -63563,7 +63563,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6183
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 22.5,11.5
     parent: 0
@@ -63693,7 +63693,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6197
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 66.5,45.5
     parent: 0
@@ -65171,7 +65171,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6367
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 54.5,4.5
     parent: 0
@@ -65325,7 +65325,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6383
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 50.5,-14.5
     parent: 0
@@ -65997,7 +65997,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6452
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 65.5,23.5
     parent: 0
@@ -66909,7 +66909,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 6547
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 39.5,-18.5
     parent: 0
@@ -68534,7 +68534,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6722
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 11.5,2.5
     parent: 0
@@ -68712,7 +68712,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6743
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 7.5,3.5
     parent: 0
@@ -70064,7 +70064,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6899
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 47.5,28.5
     parent: 0
@@ -70922,7 +70922,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6986
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 22.5,-22.5
     parent: 0
@@ -85604,7 +85604,7 @@ entities:
   - color: '#0000FFFF'
     type: AtmosPipeColor
 - uid: 8426
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 38.500893,-33.65727
     parent: 0
@@ -87653,7 +87653,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 8623
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 30.480644,38.38934
     parent: 0
@@ -90693,7 +90693,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 9040
-  type: SalternSmes
+  type: SalternSMES
   components:
   - rot: -1.5707963267948966 rad
     pos: 112.5,-17.5
@@ -90865,7 +90865,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 9058
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: -1.5707963267948966 rad
     pos: 110.5,-14.5
@@ -105109,7 +105109,7 @@ entities:
   - color: '#FF0000FF'
     type: AtmosPipeColor
 - uid: 10263
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 16.5,-23.5
     parent: 0
@@ -112201,7 +112201,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 10894
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 3.5,-34.5
     parent: 0
@@ -116493,7 +116493,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 11447
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 55.5,37.5
     parent: 0
@@ -116501,7 +116501,7 @@ entities:
   - startingCharge: 12000
     type: Battery
 - uid: 11448
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 56.5,38.5
     parent: 0
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 8ead2c9f39..f9719ccfce 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -1277,7 +1277,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 151
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 7.5,-18.5
     parent: 853
@@ -21247,7 +21247,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 1239
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -5.5,-7.5
     parent: 853
@@ -30660,7 +30660,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2504
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,27.5
@@ -30669,7 +30669,7 @@ entities:
   - startingCharge: 11999.634
     type: Battery
 - uid: 2505
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -2.5,27.5
@@ -30678,7 +30678,7 @@ entities:
   - startingCharge: 11999.3
     type: Battery
 - uid: 2506
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 9.5,22.5
@@ -30687,7 +30687,7 @@ entities:
   - startingCharge: 11999.066
     type: Battery
 - uid: 2507
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 24.5,14.5
@@ -30696,7 +30696,7 @@ entities:
   - startingCharge: 11999.733
     type: Battery
 - uid: 2508
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 28.5,14.5
@@ -30705,7 +30705,7 @@ entities:
   - startingCharge: 11999.483
     type: Battery
 - uid: 2509
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 47.5,-1.5
@@ -30714,7 +30714,7 @@ entities:
   - startingCharge: 11991.15
     type: Battery
 - uid: 2510
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 31.5,1.5
@@ -30723,7 +30723,7 @@ entities:
   - startingCharge: 11999.15
     type: Battery
 - uid: 2511
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 43.5,10.5
@@ -30732,7 +30732,7 @@ entities:
   - startingCharge: 11999.384
     type: Battery
 - uid: 2512
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 12.5,13.5
@@ -30747,7 +30747,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2514
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 22.5,-3.5
@@ -30756,7 +30756,7 @@ entities:
   - startingCharge: 11999.066
     type: Battery
 - uid: 2515
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 16.5,2.5
@@ -30778,7 +30778,7 @@ entities:
       PaperLabel: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 2517
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -3.5,15.5
@@ -30787,7 +30787,7 @@ entities:
   - startingCharge: 11999.483
     type: Battery
 - uid: 2518
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -28.5,12.5
@@ -30796,7 +30796,7 @@ entities:
   - startingCharge: 11999.4
     type: Battery
 - uid: 2519
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -39.5,11.5
@@ -30805,7 +30805,7 @@ entities:
   - startingCharge: 11999.4
     type: Battery
 - uid: 2520
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -11.5,2.5
@@ -30820,7 +30820,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2522
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -20.5,-12.5
@@ -30844,7 +30844,7 @@ entities:
     parent: 853
     type: Transform
 - uid: 2525
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -1.5,-18.5
@@ -30853,7 +30853,7 @@ entities:
   - startingCharge: 11999.083
     type: Battery
 - uid: 2526
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -9.5,-21.5
@@ -30862,7 +30862,7 @@ entities:
   - startingCharge: 11996.233
     type: Battery
 - uid: 2527
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -14.5,-16.5
@@ -33625,7 +33625,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 2789
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -15.5,-9.5
@@ -38968,7 +38968,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 3295
-  type: SalternSmes
+  type: SalternSMES
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 42.5,5.5
@@ -38981,7 +38981,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 3296
-  type: SalternSmes
+  type: SalternSMES
   components:
   - rot: 4.371139006309477E-08 rad
     pos: 40.5,5.5
@@ -39764,7 +39764,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 3380
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,-23.5
     parent: 853
@@ -40907,7 +40907,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 3505
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -16.5,17.5
     parent: 853
@@ -45300,7 +45300,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 3921
-  type: SalternApc
+  type: SalternAPC
   components:
   - rot: 4.371139006309477E-08 rad
     pos: -12.5,12.5
@@ -46950,7 +46950,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4111
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -30.5,-3.5
     parent: 853
@@ -48967,7 +48967,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4355
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 45.5,-11.5
     parent: 853
@@ -49061,7 +49061,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4366
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: -22.5,25.5
     parent: 853
@@ -49691,7 +49691,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4443
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 53.5,-11.5
     parent: 853
@@ -50030,7 +50030,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 4479
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: 14.5,-28.5
     parent: 853
@@ -73907,7 +73907,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 6922
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 37.329857,13.460722
     parent: 853
diff --git a/Resources/Maps/ssreach.yml b/Resources/Maps/ssreach.yml
index 66bf03a9e1..6db378e732 100644
--- a/Resources/Maps/ssreach.yml
+++ b/Resources/Maps/ssreach.yml
@@ -3182,7 +3182,7 @@ entities:
   - radius: 2.2553093
     type: PointLight
 - uid: 16
-  type: SalternSmes
+  type: SalternSMES
   components:
   - pos: -14.5,-3.5
     parent: 4
@@ -6332,7 +6332,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 456
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -4.5,2.5
     parent: 4
@@ -6345,7 +6345,7 @@ entities:
     supplyRampPosition: 3464.4934
     type: PowerNetworkBattery
 - uid: 457
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 4.5,-3.5
     parent: 4
@@ -6358,7 +6358,7 @@ entities:
     supplyRampPosition: 3464.4934
     type: PowerNetworkBattery
 - uid: 458
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,-2.5
     parent: 4
@@ -6371,7 +6371,7 @@ entities:
     supplyRampPosition: 3464.4934
     type: PowerNetworkBattery
 - uid: 459
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 25.5,-2.5
     parent: 4
@@ -6384,7 +6384,7 @@ entities:
     supplyRampPosition: 3464.4934
     type: PowerNetworkBattery
 - uid: 460
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 27.5,2.5
     parent: 4
@@ -12156,7 +12156,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1135
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 4.5,-8.5
     parent: 4
@@ -13545,7 +13545,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 1293
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 13.5,15.5
     parent: 4
@@ -14417,7 +14417,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 1391
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 14.5,-17.5
     parent: 4
@@ -20274,7 +20274,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 1964
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 4.5,11.5
     parent: 4
@@ -21096,7 +21096,7 @@ entities:
   - enabled: False
     type: AmbientSound
 - uid: 2061
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: 11.5,9.5
     parent: 4
@@ -21560,7 +21560,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 2114
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -8.5,-2.5
     parent: 4
diff --git a/Resources/Maps/syndipuddle.yml b/Resources/Maps/syndipuddle.yml
index 82b2cb894e..38af687742 100644
--- a/Resources/Maps/syndipuddle.yml
+++ b/Resources/Maps/syndipuddle.yml
@@ -868,7 +868,7 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 53
-  type: SalternApc
+  type: SalternAPC
   components:
   - pos: -0.5,-3.5
     parent: 0
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 8eaa746d15..e24ecc6606 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -40,7 +40,7 @@
     outputs:
     - floor_glass
   - type: Construction
-    graph: glass
+    graph: Glass
     node: SheetGlass
 
 - type: entity
@@ -81,7 +81,7 @@
     outputs:
     - floor_rglass
   - type: Construction
-    graph: glass
+    graph: Glass
     node: SheetRGlass
 
 - type: entity
@@ -119,7 +119,7 @@
       - pglass_2
       - pglass_3
   - type: Construction
-    graph: glass
+    graph: Glass
     node: SheetPGlass
 
 - type: entity
@@ -157,7 +157,7 @@
       - rpglass_2
       - rpglass_3
   - type: Construction
-    graph: glass
+    graph: Glass
     node: SheetRPGlass
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index f8add04dce..42322c05e3 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -24,7 +24,7 @@
 #  - type: Item
 #    HeldPrefix: rods
   - type: Construction
-    graph: metalRod
+    graph: MetalRod
     node: MetalRod
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/torch.yml b/Resources/Prototypes/Entities/Objects/Misc/torch.yml
index d0e78cfd95..15e6c775a8 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/torch.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/torch.yml
@@ -31,7 +31,7 @@
       sprite: Objects/Misc/torch.rsi
       HeldPrefix: unlit
     - type: Construction
-      graph: lightTorch
+      graph: LightTorch
       node: torch
     - type: Appearance
       visuals:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 7c0bc711a3..1a7e0401e7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -28,7 +28,7 @@
     Slots:
     - back
   - type: Construction
-    graph: spear
+    graph: Spear
     node: spear
   - type: ItemCooldown
   - type: MeleeChemicalInjector
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index cfc5790086..32c6bc8c67 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -17,5 +17,5 @@
     stunAmount: 1
     knockdownAmount: 3
   - type: Construction
-    graph: bola
+    graph: Bola
     node: bola
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index b396bc5437..124d8fba28 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -12,7 +12,7 @@
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index d122905e2f..1105a1c3fb 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -37,7 +37,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Construction
-    graph: airlock
+    graph: Airlock
     node: assembly
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index fe8791ec73..683ae5ef5d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -76,7 +76,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Construction
-    graph: airlock
+    graph: Airlock
     node: airlock
   - type: IconSmooth
     key: walls
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
index 57ca7feb8f..ccb0a345e7 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -40,7 +40,7 @@
             min: 1
             max: 3
   - type: Construction
-    graph: windoor
+    graph: Windoor
     node: assembly
   placement:
     mode: SnapgridCenter
@@ -71,6 +71,6 @@
             min: 1
             max: 2
   - type: Construction
-    graph: windoor
+    graph: Windoor
     node: assemblySecure
 
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 17c8d861d6..a04b87a06d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -100,7 +100,7 @@
     airBlockedDirection:
       - South
   - type: Construction
-    graph: windoor
+    graph: Windoor
     node: windoor
 
 - type: entity
@@ -149,5 +149,5 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: windoor
+    graph: Windoor
     node: windoorSecure
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 4569814297..bc375d0fc8 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -41,7 +41,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TableFrame
 
 - type: entity
@@ -74,7 +74,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: Table
 
 - type: entity
@@ -104,7 +104,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TableReinforced
 
 - type: entity
@@ -143,7 +143,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TableGlass
 
 - type: entity
@@ -185,7 +185,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TableReinforcedGlass
 
 - type: entity
@@ -227,7 +227,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TablePlasmaGlass
 
 - type: entity
@@ -259,7 +259,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TableWood
   - type: Tag
     tags:
@@ -297,7 +297,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: table
+    graph: Table
     node: TableCarpet
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 57ffdeb95e..eb3fc7ed4b 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -53,7 +53,7 @@
   - type: Sprite
     state: chair
   - type: Construction
-    graph: seat
+    graph: Seat
     node: chair
 
 - type: entity
@@ -66,7 +66,7 @@
   - type: Sprite
     state: stool
   - type: Construction
-    graph: seat
+    graph: Seat
     node: stool
 
 - type: entity
@@ -82,7 +82,7 @@
   - type: Sprite
     state: bar
   - type: Construction
-    graph: seat
+    graph: Seat
     node: stoolBar
 
 - type: entity
@@ -95,7 +95,7 @@
   - type: Sprite
     state: office-white
   - type: Construction
-    graph: seat
+    graph: Seat
     node: chairOffice
 
 - type: entity
@@ -106,7 +106,7 @@
   - type: Sprite
     state: office-dark
   - type: Construction
-    graph: seat
+    graph: Seat
     node: chairOfficeDark
 
 - type: entity
@@ -121,7 +121,7 @@
   - type: Sprite
     state: comfy
   - type: Construction
-    graph: seat
+    graph: Seat
     node: chairComfy
 
 - type: entity
@@ -133,7 +133,7 @@
     state: wooden
   - type: Rotatable
   - type: Construction
-    graph: seat
+    graph: Seat
     node: chairWood
   - type: Damageable
     damageModifierSet: Wood
@@ -182,7 +182,7 @@
   - type: Sprite
     state: ritual
   - type: Construction
-    graph: ritualseat
+    graph: RitualSeat
     node: chairRitual
 
 - type: entity
@@ -209,5 +209,5 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Voice/Human/womanlaugh.ogg
-    graph: ritualseat
+    graph: RitualSeat
     node: chairCursed
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index ad961c353b..bacce5ec45 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -18,7 +18,7 @@
       toilet:
         maxVol: 250
   - type: Construction
-    graph: toilet
+    graph: Toilet
     node: toilet
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
index 3aa6a0466e..61fec8d279 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -7,7 +7,7 @@
     mode: SnapgridCenter
   components:
   - type: Construction
-    graph: computer
+    graph: Computer
     node: computer
   - type: Computer
   - type: ApcPowerReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
index b0e80cff7e..73b709730c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -23,7 +23,7 @@
   - type: Rotatable
   - type: Anchorable
   - type: Construction
-    graph: computer
+    graph: Computer
     node: frameUnsecured
   - type: Sprite
     sprite: Structures/Machines/parts.rsi
@@ -52,7 +52,7 @@
   description: This computer has seen better days.
   components:
   - type: Construction
-    graph: computer
+    graph: Computer
     node: monitorBroken
   - type: Sprite
     sprite: Structures/Machines/computers.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index 3baec8f082..d3129a2140 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -56,6 +56,6 @@
     board: ChemMasterMachineCircuitboard
   - type: MaterialStorage
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
 
diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index 3a9a1b4613..65ed4d8bed 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -24,7 +24,7 @@
       mask:
       - MobMask
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
index f51b4aea23..90337ff8d1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -31,7 +31,7 @@
     - type: Rotatable
     - type: Pullable
     - type: Construction
-      graph: machine
+      graph: Machine
       node: missingWires
     - type: Damageable
       damageContainer: Inorganic
@@ -82,7 +82,7 @@
     - type: Rotatable
     - type: Pullable
     - type: Construction
-      graph: machine
+      graph: Machine
       node: machineFrame
     - type: Damageable
       damageContainer: Inorganic
@@ -117,7 +117,7 @@
     - type: Transform
       anchored: true
     - type: Construction
-      graph: machine
+      graph: Machine
       node: destroyedMachineFrame
     - type: Damageable
       damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 9aac30f988..26aaf460a2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -32,7 +32,7 @@
       - Opaque
       - MobImpassable
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
@@ -111,7 +111,7 @@
       - MobImpassable
   - type: ResearchClient
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index 177fa0d7f4..e981d14b43 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -28,7 +28,7 @@
       mask:
       - MobMask
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
index f4d6ba5f2b..ca95eecbcf 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -29,7 +29,7 @@
     - type: Anchorable
     - type: Pullable
     - type: Construction
-      graph: disposalMachine
+      graph: DisposalMachine
       node: frame
     - type: Damageable
       damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 311a018096..b05773226d 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -74,7 +74,7 @@
   name: disposal unit
   components:
   - type: Construction
-    graph: disposalMachine
+    graph: DisposalMachine
     node: disposal_unit
   - type: DisposalUnit
     flushTime: 2
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
index 4549a54d38..847e57a343 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml
@@ -21,7 +21,7 @@
     - type: ExtensionCableReceiver
     - type: ParticleAcceleratorControlBox
     - type: Construction
-      graph: particleAcceleratorControlBox
+      graph: ParticleAcceleratorControlBox
       node: completed
     - type: UserInterface
       interfaces:
@@ -48,6 +48,6 @@
       sprite: Structures/Power/Generation/PA/control_box.rsi
       state: box
     - type: Construction
-      graph: particleAcceleratorControlBox
+      graph: ParticleAcceleratorControlBox
       node: start
       defaultTarget: completed
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
index 930fa0a1f4..866799892a 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
@@ -20,7 +20,7 @@
     - type: ParticleAcceleratorEmitter
       emitterType: Left
     - type: Construction
-      graph: particleAcceleratorEmitterLeft
+      graph: ParticleAcceleratorEmitterLeft
       node: completed
 
 - type: entity
@@ -45,7 +45,7 @@
     - type: ParticleAcceleratorEmitter
       emitterType: Center
     - type: Construction
-      graph: particleAcceleratorEmitterCenter
+      graph: ParticleAcceleratorEmitterCenter
       node: completed
 
 - type: entity
@@ -70,7 +70,7 @@
     - type: ParticleAcceleratorEmitter
       emitterType: Right
     - type: Construction
-      graph: particleAcceleratorEmitterRight
+      graph: ParticleAcceleratorEmitterRight
       node: completed
 
 # Unfinished
@@ -88,7 +88,7 @@
       sprite: Structures/Power/Generation/PA/emitter_left.rsi
       state: left
     - type: Construction
-      graph: particleAcceleratorEmitterLeft
+      graph: ParticleAcceleratorEmitterLeft
       node: start
       defaultTarget: completed
 
@@ -105,7 +105,7 @@
       sprite: Structures/Power/Generation/PA/emitter_center.rsi
       state: center
     - type: Construction
-      graph: particleAcceleratorEmitterCenter
+      graph: ParticleAcceleratorEmitterCenter
       node: start
       defaultTarget: completed
 
@@ -122,6 +122,6 @@
       sprite: Structures/Power/Generation/PA/emitter_right.rsi
       state: right
     - type: Construction
-      graph: particleAcceleratorEmitterRight
+      graph: ParticleAcceleratorEmitterRight
       node: start
       defaultTarget: completed
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
index 76b5967d7b..d28a4c05e3 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
@@ -9,7 +9,7 @@
       state: capc
     - type: ParticleAcceleratorEndCap
     - type: Construction
-      graph: particleAcceleratorEndCap
+      graph: ParticleAcceleratorEndCap
       node: completed
 
 # Unfinished
@@ -27,6 +27,6 @@
       sprite: Structures/Power/Generation/PA/end_cap.rsi
       state: cap
     - type: Construction
-      graph: particleAcceleratorEndCap
+      graph: ParticleAcceleratorEndCap
       node: start
       defaultTarget: completed
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
index 160feea36f..bb97ee2ae7 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
@@ -19,7 +19,7 @@
           baseState: unlit
     - type: ParticleAcceleratorFuelChamber
     - type: Construction
-      graph: particleAcceleratorFuelChamber
+      graph: ParticleAcceleratorFuelChamber
       node: completed
 
 # Unfinished
@@ -37,6 +37,6 @@
       sprite: Structures/Power/Generation/PA/fuel_chamber.rsi
       state: chamber
     - type: Construction
-      graph: particleAcceleratorFuelChamber
+      graph: ParticleAcceleratorFuelChamber
       node: start
       defaultTarget: completed
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
index ccb9ae55e2..6ff51a893a 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
@@ -27,7 +27,7 @@
           !type:CableDeviceNode
           nodeGroupID: HVPower
     - type: Construction
-      graph: particleAcceleratorPowerBox
+      graph: ParticleAcceleratorPowerBox
       node: completed
 
 - type: entity
@@ -43,6 +43,6 @@
       sprite: Structures/Power/Generation/PA/power_box.rsi
       state: box
     - type: Construction
-      graph: particleAcceleratorPowerBox
+      graph: ParticleAcceleratorPowerBox
       node: start
       defaultTarget: completed
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
index 284f7af998..ec894ed702 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -151,5 +151,5 @@
     visuals:
     - type: AMEVisualizer
   - type: Construction
-    graph: ameShielding
+    graph: AMEShielding
     node: ameShielding
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 1f0b0d6485..5daa6316da 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -65,7 +65,7 @@
       - !type:DoActsBehavior
         acts: ["Breakage"]
   - type: Construction
-    graph: solarpanel
+    graph: SolarPanel
     node: solarpanel
 
 - type: entity
@@ -96,7 +96,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Construction
-    graph: solarpanel
+    graph: SolarPanel
     node: solarpanel_broken
 
 - type: entity
@@ -139,7 +139,7 @@
   - type: Anchorable
   - type: Pullable
   - type: Construction
-    graph: solarpanel
+    graph: SolarPanel
     node: solarassembly
 
 - type: entity
@@ -186,5 +186,5 @@
   - type: Anchorable
   - type: Pullable
   - type: Construction
-    graph: solarpanel
+    graph: SolarPanel
     node: solartracker
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index facf36ff18..3176592296 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  id: BaseApc
+  id: BaseAPC
   name: APC
   description: A control terminal for the area's electrical systems.
   placement:
@@ -68,7 +68,7 @@
     singleUser: true
     key: enum.ApcUiKey.Key
   - type: Construction
-    graph: apc
+    graph: APC
     node: apc
   - type: PowerNetworkBattery
     maxSupply: 10000
diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
index 4747ae5ddb..0268d9e61e 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -34,7 +34,7 @@
               acts: ["Destruction"]
     - type: SubFloorHide
     - type: Construction
-      graph: cable_terminal
+      graph: CableTerminal
       node: cable_terminal
     - type: NodeContainer
       nodes:
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index 5c304701d9..73cc8eb790 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -117,8 +117,8 @@
   - type: Anchorable
 
 - type: entity
-  id: DebugSmes
-  parent: BaseSmes
+  id: DebugSMES
+  parent: BaseSMES
   suffix: DEBUG
   components:
   - type: Tag
@@ -135,8 +135,8 @@
       - Debug
 
 - type: entity
-  id: DebugApc
-  parent: BaseApc
+  id: DebugAPC
+  parent: BaseAPC
   suffix: DEBUG
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Structures/Power/saltern_power.yml b/Resources/Prototypes/Entities/Structures/Power/saltern_power.yml
index e77d366021..2bd7f4b94d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/saltern_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/saltern_power.yml
@@ -6,8 +6,8 @@
     supplyRate: 3000
 
 - type: entity
-  parent: BaseSmes
-  id: SalternSmes
+  parent: BaseSMES
+  id: SalternSMES
   components:
   - type: Battery
     maxCharge: 10000000
@@ -22,8 +22,8 @@
     startingCharge: 4000000
 
 - type: entity
-  parent: BaseApc
-  id: SalternApc
+  parent: BaseAPC
+  id: SalternAPC
   components:
   - type: Battery
     maxCharge: 12000
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 72d6d735aa..ea8eb6ede2 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  id: BaseSmes
+  id: BaseSMES
   parent: BaseMachine
   name: SMES
   description: A high-capacity superconducting magnetic energy storage (SMES) unit.
@@ -50,7 +50,7 @@
       color: "#c9c042"
       castShadows: false
     - type: Construction
-      graph: machine
+      graph: Machine
       node: machine
     - type: Wires
       BoardName: "SMES"
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 9efb25f9d1..63b457c624 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -43,7 +43,7 @@
     supplyRampTolerance: 5000
     supplyRampRate: 1000
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index 6a327bd0f4..0cd27481f1 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -64,7 +64,7 @@
   - type: Transform
     anchored: true
   - type: Construction
-    graph: air_alarm
+    graph: AirAlarm
     node: air_alarm
   placement:
     mode: SnapgridCenter
@@ -82,7 +82,7 @@
     sprite: Structures/Wallmounts/air_monitors.rsi
     state: alarm_b1
   - type: Construction
-    graph: air_alarm
+    graph: AirAlarm
     node: assembly
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
index 52e0fb1a4a..0996102d5f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -47,7 +47,7 @@
   - type: Transform
     anchored: true
   - type: Construction
-    graph: fire_alarm
+    graph: FireAlarm
     node: fire_alarm
   placement:
     mode: SnapgridCenter
@@ -65,7 +65,7 @@
     sprite: Structures/Wallmounts/air_monitors.rsi
     state: fire_b1
   - type: Construction
-    graph: fire_alarm
+    graph: FireAlarm
     node: assembly
   placement:
     mode: SnapgridCenter
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
index 9d0467319c..3c4691ec98 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml
@@ -9,7 +9,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Construction
-    graph: lightFixture
+    graph: LightFixture
     node: tubeLight
   - type: Physics
     canCollide: false
@@ -152,7 +152,7 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
     - type: Construction
-      graph: lightFixture
+      graph: LightFixture
       node: bulbLight
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 9f7f6cf6b9..6d84bbeb86 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -61,7 +61,7 @@
       state: on
     - type: Rotatable
     - type: Construction
-      graph: lightSwitch
+      graph: LightSwitch
       node: lightSwitch
     - type: ExtensionCableReceiver
     - type: DeviceNetworkComponent
diff --git a/Resources/Prototypes/Entities/Structures/Walls/barricades.yml b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
index 6ae63a0b3d..5c1ab1a037 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/barricades.yml
@@ -5,7 +5,7 @@
   components:
   - type: InteractionOutline
   - type: Construction
-    graph: barricade
+    graph: Barricade
     node: barricadewooden
   - type: Sprite
     sprite: Structures/Walls/barricades.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Walls/girder.yml b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
index 149162c4bf..96e5823364 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girder.yml
@@ -20,7 +20,7 @@
       - VaultImpassable
   - type: InteractionOutline
   - type: Construction
-    graph: girder
+    graph: Girder
     node: girder
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 91bf83b81d..b61c89fff4 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -17,7 +17,7 @@
       sprite: Structures/Walls/grille.rsi
       state: grille
     - type: Construction
-      graph: grille
+      graph: Grille
       node: grille
       deconstructionTarget: start
     - type: Damageable
@@ -88,7 +88,7 @@
       tags:
         - RCDDeconstructWhitelist
     - type: Construction
-      graph: grille
+      graph: Grille
       node: grilleBroken
       deconstructionTarget: start
     - type: Fixtures # overwrite BaseStructure parent.
diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index 534ff116e5..f763e0fadd 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -47,7 +47,7 @@
         acts: [ "Destruction" ]
   - type: Climbable
   - type: Construction
-    graph: railing
+    graph: Railing
     node: railing
 
 - type: entity
@@ -107,7 +107,7 @@
         acts: [ "Destruction" ]
   - type: Climbable
   - type: Construction
-    graph: railing
+    graph: Railing
     node: railingCorner
 
 - type: entity
@@ -159,6 +159,6 @@
         acts: [ "Destruction" ]
   - type: Climbable
   - type: Construction
-    graph: railing
+    graph: Railing
     node: railingCornerSmall
 
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 9384af5fe6..0d612acc96 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -342,7 +342,7 @@
     sprite: Structures/Walls/solid.rsi
     state: rgeneric
   - type: Construction
-    graph: girder
+    graph: Girder
     node: reinforcedWall
   - type: Destructible
     thresholds:
@@ -471,7 +471,7 @@
   - type: Sprite
     sprite: Structures/Walls/solid.rsi
   - type: Construction
-    graph: girder
+    graph: Girder
     node: wall
   - type: Icon
     sprite: Structures/Walls/solid.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index af09cdf537..77e714dd92 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -30,7 +30,7 @@
   - type: IconSmooth
     base: pwindow
   - type: Construction
-    graph: window
+    graph: Window
     node: plasmaWindow
   - type: Appearance
     visuals:
@@ -60,7 +60,7 @@
     sprite: Structures/Windows/directional.rsi
     state: plasma_window
   - type: Construction
-    graph: windowDirectional
+    graph: WindowDirectional
     node: plasmaWindowDirectional
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index 04d5b847f9..8cfd062ab0 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -36,7 +36,7 @@
   - type: IconSmooth
     base: rwindow
   - type: Construction
-    graph: window
+    graph: Window
     node: reinforcedWindow
   - type: Appearance
     visuals:
@@ -66,7 +66,7 @@
     sprite: Structures/Windows/directional.rsi
     state: reinforced_window
   - type: Construction
-    graph: windowDirectional
+    graph: WindowDirectional
     node: windowReinforcedDirectional
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index 38dd07e183..28f6c4fa7c 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -33,7 +33,7 @@
   - type: IconSmooth
     base: rpwindow
   - type: Construction
-    graph: window
+    graph: Window
     node: reinforcedPlasmaWindow
   - type: Appearance
     visuals:
@@ -63,7 +63,7 @@
     sprite: Structures/Windows/directional.rsi
     state: plasma_reinforced_window
   - type: Construction
-    graph: windowDirectional
+    graph: WindowDirectional
     node: plasmaReinforcedWindowDirectional
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index a15585e426..cd38e9ec26 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -64,7 +64,7 @@
     base: window
   - type: Window
   - type: Construction
-    graph: window
+    graph: Window
     node: window
   - type: Appearance
     visuals:
@@ -134,7 +134,7 @@
     - South
   - type: Window
   - type: Construction
-    graph: windowDirectional
+    graph: WindowDirectional
     node: windowDirectional
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
index 626cca545b..e901582856 100644
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -85,5 +85,5 @@
           state_off: switch-off
           state_reversed: switch-rev
     - type: Construction
-      graph: leverGraph
+      graph: LeverGraph
       node: lever
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index fa628f3e93..ed8ac3c5d3 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -21,7 +21,7 @@
   - type: PlantHolder
     drawWarnings: true
   - type: Construction
-    graph: machine
+    graph: Machine
     node: machine
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
index 96dcf2e1d5..5ebba6a616 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: ritualseat
+  id: RitualSeat
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
index 3652262ecd..331b9e336e 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: seat
+  id: Seat
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index 9299319cb7..b7393effc2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: table
+  id: Table
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
index 1e9b4e70f0..548b2d0a7a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: toilet
+  id: Toilet
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
index 1a19bcb024..611da0a753 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: computer
+  id: Computer
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
index c3d62547dd..322feb6892 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: machine
+  id: Machine
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/turing.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/turing.yml
index 9a57fb78e6..149cce74b3 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/turing.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/turing.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: turing
+  id: Turing
   start: a0
   graph:
     - node: a0
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
index a604b4752e..7238a6a822 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: glass
+  id: Glass
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml
index 21905f1309..0c36c0da23 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/materials/metal_rod.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: metalRod
+  id: MetalRod
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
index 9642326a0e..7bdeee72ce 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: airlock
+  id: Airlock
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml
index 0743717e92..152ad1e846 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/barricades.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: barricade
+  id: Barricade
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
index bb3c343a40..3a9b986c93 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
@@ -31,7 +31,7 @@
               doAfter: 3
 
 - type: constructionGraph
-  id: leverGraph
+  id: LeverGraph
   start: start
   graph:
   - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
index aced558d85..fe64f13fa8 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: girder
+  id: Girder
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille.yml
index 0b91d50353..3a1840cc01 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: grille
+  id: Grille
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
index 4dc9959ac4..e8c174ba4f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: lightFixture
+  id: LightFixture
   start: start
   graph:
     - node: start
@@ -46,7 +46,7 @@
             - !type:DeleteEntity {}
 
 - type: constructionGraph
-  id: lightSwitch
+  id: LightSwitch
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
index 21a7d89bbc..897685fd4a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/railing.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: railing
+  id: Railing
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
index f947fdd414..957616c133 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: windoor
+  id: Windoor
   start: start
   graph:
   - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
index 5354d98101..296e073edb 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: window
+  id: Window
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
index d332e75f98..fdc45ff08c 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: windowDirectional
+  id: WindowDirectional
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml
index 1f5f049df1..9c52fa3ba5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/torch.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: lightTorch
+  id: LightTorch
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
index 4fd859a07d..2f38cd1848 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: apc
+  id: APC
   start: start
   graph:
     - node: start
@@ -10,4 +10,4 @@
               amount: 3
 
     - node: apc
-      entity: BaseApc
+      entity: BaseAPC
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/air_alarms.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
similarity index 98%
rename from Resources/Prototypes/Recipes/Construction/Graphs/air_alarms.yml
rename to Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
index 098a110a19..d7384aa80b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/air_alarms.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: air_alarm
+  id: AirAlarm
   start: start
   graph:
   - node: start
@@ -78,7 +78,7 @@
         doAfter: 1
 
 - type: constructionGraph
-  id: fire_alarm
+  id: FireAlarm
   start: start
   graph:
   - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
index e99ff3149b..bf52bfa8a8 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: ameShielding
+  id: AMEShielding
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml
index dc077f60ed..5b6f1d509b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cable_terminal.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: cable_terminal
+  id: CableTerminal
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
index da3591887c..4179a795fc 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: disposalMachine
+  id: DisposalMachine
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml
index 6c9f668220..053e7b9d3f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/particle_accelerator.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: particleAcceleratorControlBox
+  id: ParticleAcceleratorControlBox
   start: start
   graph:
     - node: start
@@ -51,7 +51,7 @@
 
 
 - type: constructionGraph
-  id: particleAcceleratorPowerBox
+  id: ParticleAcceleratorPowerBox
   start: start
   graph:
     - node: start
@@ -103,7 +103,7 @@
 
 
 - type: constructionGraph
-  id: particleAcceleratorFuelChamber
+  id: ParticleAcceleratorFuelChamber
   start: start
   graph:
     - node: start
@@ -154,7 +154,7 @@
               doAfter: 0.5
 
 - type: constructionGraph
-  id: particleAcceleratorEndCap
+  id: ParticleAcceleratorEndCap
   start: start
   graph:
     - node: start
@@ -205,7 +205,7 @@
               doAfter: 0.5
 
 - type: constructionGraph
-  id: particleAcceleratorEmitterLeft
+  id: ParticleAcceleratorEmitterLeft
   start: start
   graph:
     - node: start
@@ -256,7 +256,7 @@
               doAfter: 0.5
 
 - type: constructionGraph
-  id: particleAcceleratorEmitterCenter
+  id: ParticleAcceleratorEmitterCenter
   start: start
   graph:
     - node: start
@@ -307,7 +307,7 @@
               doAfter: 0.5
 
 - type: constructionGraph
-  id: particleAcceleratorEmitterRight
+  id: ParticleAcceleratorEmitterRight
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
index 2412ca127e..fa1e2ee54e 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: solarpanel
+  id: SolarPanel
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
index 4f3fda405a..10532996bd 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: bola
+  id: Bola
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
index de2f543f29..6d33574191 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: spear
+  id: Spear
   start: start
   graph:
     - node: start
diff --git a/Resources/Prototypes/Recipes/Construction/atmos_alarms.yml b/Resources/Prototypes/Recipes/Construction/atmos_alarms.yml
deleted file mode 100644
index 32c19c1450..0000000000
--- a/Resources/Prototypes/Recipes/Construction/atmos_alarms.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-- type: construction
-  name: air alarm
-  id: AirAlarmFixture
-  graph: air_alarm
-  startNode: start
-  targetNode: air_alarm
-  category: Structures
-  description: An air alarm. Alarms... air?
-  icon:
-    sprite: Structures/Wallmounts/air_monitors.rsi
-    state: alarm0
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition {}
-
-- type: construction
-  name: fire alarm
-  id: FireAlarm
-  graph: fire_alarm
-  startNode: start
-  targetNode: fire_alarm
-  category: Structures
-  description: A fire alarm. Spicy!
-  icon:
-    sprite: Structures/Wallmounts/air_monitors.rsi
-    state: fire0
-  placementMode: SnapgridCenter
-  objectType: Structure
-  canRotate: true
-  canBuildInImpassable: true
-  conditions:
-  - !type:WallmountCondition {}
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 6cdb403311..1c40088225 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -2,7 +2,7 @@
 - type: construction
   name: chair
   id: Chair
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: chair
   category: Furniture
@@ -19,7 +19,7 @@
 - type: construction
   name: stool
   id: Stool
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: stool
   category: Furniture
@@ -36,7 +36,7 @@
 - type: construction
   name: bar stool
   id: StoolBar
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: stoolBar
   category: Furniture
@@ -53,7 +53,7 @@
 - type: construction
   name: office chair
   id: ChairOfficeLight
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: chairOffice
   category: Furniture
@@ -70,7 +70,7 @@
 - type: construction
   name: dark office chair
   id: ChairOfficeDark
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: chairOfficeDark
   category: Furniture
@@ -87,7 +87,7 @@
 - type: construction
   name: comfy chair
   id: ChairComfy
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: chairComfy
   category: Furniture
@@ -104,7 +104,7 @@
 - type: construction
   name: wooden chair
   id: ChairWood
-  graph: seat
+  graph: Seat
   startNode: start
   targetNode: chairWood
   category: Furniture
@@ -121,7 +121,7 @@
 - type: construction
   name: ritual chair
   id: ChairRitual
-  graph: ritualseat
+  graph: RitualSeat
   startNode: start
   targetNode: chairRitual
   category: Furniture
@@ -137,9 +137,9 @@
 
 #tables
 - type: construction
-  name: table
+  name: steel table
   id: Table
-  graph: table
+  graph: Table
   startNode: start
   targetNode: Table
   category: Furniture
@@ -154,9 +154,9 @@
     - !type:TileNotBlocked
 
 - type: construction
-  name: reinforced table
+  name: reinforced steel table
   id: TableReinforced
-  graph: table
+  graph: Table
   startNode: start
   targetNode: TableReinforced
   category: Furniture
@@ -173,7 +173,7 @@
 - type: construction
   name: glass table
   id: TableGlass
-  graph: table
+  graph: Table
   startNode: start
   targetNode: TableGlass
   category: Furniture
@@ -190,7 +190,7 @@
 - type: construction
   name: reinforced glass table
   id: TableReinforcedGlass
-  graph: table
+  graph: Table
   startNode: start
   targetNode: TableReinforcedGlass
   category: Furniture
@@ -207,7 +207,7 @@
 - type: construction
   name: plasma glass table
   id: TablePlasmaGlass
-  graph: table
+  graph: Table
   startNode: start
   targetNode: TablePlasmaGlass
   category: Furniture
@@ -224,7 +224,7 @@
 - type: construction
   name: wood table
   id: TableWood
-  graph: table
+  graph: Table
   startNode: start
   targetNode: TableWood
   category: Furniture
@@ -241,7 +241,7 @@
 - type: construction
   name: poker table
   id: TableCarpet
-  graph: table
+  graph: Table
   startNode: start
   targetNode: TableCarpet
   category: Furniture
@@ -259,7 +259,7 @@
 - type: construction
   name: toilet
   id: ToiletEmpty
-  graph: toilet
+  graph: Toilet
   startNode: start
   targetNode: toilet
   category: Furniture
diff --git a/Resources/Prototypes/Recipes/Construction/machines.yml b/Resources/Prototypes/Recipes/Construction/machines.yml
index 0582a223dd..b4b6667c60 100644
--- a/Resources/Prototypes/Recipes/Construction/machines.yml
+++ b/Resources/Prototypes/Recipes/Construction/machines.yml
@@ -1,7 +1,7 @@
 - type: construction
   name: computer
   id: Computer
-  graph: computer
+  graph: Computer
   startNode: start
   targetNode: computer
   category: Machines
@@ -14,7 +14,7 @@
 - type: construction
   name: machine frame
   id: MachineFrame
-  graph: machine
+  graph: Machine
   startNode: start
   targetNode: machine
   category: Machines
@@ -27,7 +27,7 @@
 - type: construction
   name: destroyed machine frame
   id: MachineFrameDestroyed
-  graph: machine
+  graph: Machine
   startNode: start
   targetNode: destroyedMachineFrame
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml
index 173d82267f..b67abbf7dc 100644
--- a/Resources/Prototypes/Recipes/Construction/materials.yml
+++ b/Resources/Prototypes/Recipes/Construction/materials.yml
@@ -1,7 +1,7 @@
 - type: construction
-  name: Metal Rod
-  id: metalRod
-  graph: metalRod
+  name: metal rod
+  id: MetalRod
+  graph: MetalRod
   startNode: start
   targetNode: MetalRod
   category: Materials
@@ -10,9 +10,9 @@
   objectType: Item
 
 - type: construction
-  name: Reinforced Glass
-  id: sheetRGlass
-  graph: glass
+  name: reinforced glass
+  id: SheetRGlass
+  graph: Glass
   startNode: start
   targetNode: SheetRGlass
   category: Materials
@@ -20,9 +20,9 @@
   objectType: Item
 
 - type: construction
-  name: Plasma Glass
-  id: sheetPGlass
-  graph: glass
+  name: plasma glass
+  id: SheetPGlass
+  graph: Glass
   startNode: start
   targetNode: SheetPGlass
   category: Materials
@@ -30,9 +30,9 @@
   objectType: Item
 
 - type: construction
-  name: Reinforced Plasma Glass
-  id: sheetRPGlass
-  graph: glass
+  name: reinforced plasma glass
+  id: SheetRPGlass
+  graph: Glass
   startNode: start
   targetNode: SheetRPGlass
   category: Materials
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index dc01e95c6e..6692612953 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -1,7 +1,7 @@
 - type: construction
   name: girder
-  id: girder
-  graph: girder
+  id: Girder
+  graph: Girder
   startNode: start
   targetNode: girder
   category: Structures
@@ -18,8 +18,8 @@
 
 - type: construction
   name: wall
-  id: wall
-  graph: girder
+  id: Wall
+  graph: Girder
   startNode: start
   targetNode: wall
   category: Structures
@@ -36,8 +36,8 @@
 
 - type: construction
   name: reinforced wall
-  id: reinforcedWall
-  graph: girder
+  id: ReinforcedWall
+  graph: Girder
   startNode: start
   targetNode: reinforcedWall
   category: Structures
@@ -55,7 +55,7 @@
 - type: construction
   name: grille
   id: Grille
-  graph: grille
+  graph: Grille
   startNode: start
   targetNode: grille
   category: Structures
@@ -72,7 +72,7 @@
 - type: construction
   name: window
   id: Window
-  graph: window
+  graph: Window
   startNode: start
   targetNode: window
   category: Structures
@@ -91,7 +91,7 @@
 - type: construction
   name: reinforced window
   id: ReinforcedWindow
-  graph: window
+  graph: Window
   startNode: start
   targetNode: reinforcedWindow
   category: Structures
@@ -110,7 +110,7 @@
 - type: construction
   name: plasma window
   id: PlasmaWindow
-  graph: window
+  graph: Window
   startNode: start
   targetNode: plasmaWindow
   category: Structures
@@ -129,7 +129,7 @@
 - type: construction
   name: reinforced plasma window
   id: ReinforcedPlasmaWindow
-  graph: window
+  graph: Window
   startNode: start
   targetNode: reinforcedPlasmaWindow
   category: Structures
@@ -148,7 +148,7 @@
 - type: construction
   name: directional window
   id: WindowDirectional
-  graph: windowDirectional
+  graph: WindowDirectional
   startNode: start
   targetNode: windowDirectional
   category: Structures
@@ -166,7 +166,7 @@
 - type: construction
   name: directional reinforced window
   id: WindowReinforcedDirectional
-  graph: windowDirectional
+  graph: WindowDirectional
   startNode: start
   targetNode: windowReinforcedDirectional
   category: Structures
@@ -184,7 +184,7 @@
 - type: construction
   name: directional plasma window
   id: PlasmaWindowDirectional
-  graph: windowDirectional
+  graph: WindowDirectional
   startNode: start
   targetNode: plasmaWindowDirectional
   category: Structures
@@ -202,7 +202,7 @@
 - type: construction
   name: directional reinforced plasma window
   id: PlasmaReinforcedWindowDirectional
-  graph: windowDirectional
+  graph: WindowDirectional
   startNode: start
   targetNode: plasmaReinforcedWindowDirectional
   category: Structures
@@ -259,7 +259,7 @@
 - type: construction
   name: wooden barricade
   id: Barricade
-  graph: barricade
+  graph: Barricade
   startNode: start
   targetNode: barricadewooden
   category: Structures
@@ -276,7 +276,7 @@
 - type: construction
   name: railing
   id: Railing
-  graph: railing
+  graph: Railing
   startNode: start
   targetNode: railing
   category: Structures
@@ -293,7 +293,7 @@
 - type: construction
   name: railing corner
   id: RailingCorner
-  graph: railing
+  graph: Railing
   startNode: start
   targetNode: railingCorner
   category: Structures
@@ -310,7 +310,7 @@
 - type: construction
   name: railing corner small
   id: RailingCornerSmall	
-  graph: railing
+  graph: Railing
   startNode: start
   targetNode: railingCornerSmall
   category: Structures
@@ -326,8 +326,8 @@
 
 - type: construction
   name: airlock
-  id: airlock
-  graph: airlock
+  id: Airlock
+  graph: Airlock
   startNode: start
   targetNode: airlock
   category: Structures
@@ -343,8 +343,8 @@
 
 - type: construction
   name: windoor
-  id: windoor
-  graph: windoor
+  id: Windoor
+  graph: Windoor
   startNode: start
   targetNode: windoor
   category: Structures
@@ -360,8 +360,8 @@
 
 - type: construction
   name: secure windoor
-  id: secureWindoor
-  graph: windoor
+  id: SecureWindoor
+  graph: Windoor
   startNode: start
   targetNode: windoorSecure
   category: Structures
@@ -380,7 +380,7 @@
 - type: construction
   name: wall light
   id: LightTubeFixture
-  graph: lightFixture
+  graph: LightFixture
   startNode: start
   targetNode: tubeLight
   category: Structures
@@ -400,7 +400,7 @@
 - type: construction
   name: small wall light
   id: LightSmallFixture
-  graph: lightFixture
+  graph: LightFixture
   startNode: start
   targetNode: bulbLight
   category: Structures
@@ -419,7 +419,7 @@
 - type: construction
   name: light switch
   id: LightSwitchRecipe
-  graph: lightSwitch
+  graph: LightSwitch
   startNode: start
   targetNode: lightSwitch
   category: Structures
@@ -438,7 +438,7 @@
 #conveyor
 - type: construction
   name: conveyor belt
-  id: conveyorbelt
+  id: ConveyorBelt
   graph: ConveyorGraph
   startNode: start
   targetNode: entity
@@ -455,8 +455,8 @@
 
 - type: construction
   name: two-way lever
-  id: twowaylever
-  graph: leverGraph
+  id: TwoWayLever
+  graph: LeverGraph
   startNode: start
   targetNode: lever
   category: Structures
diff --git a/Resources/Prototypes/Recipes/Construction/tools.yml b/Resources/Prototypes/Recipes/Construction/tools.yml
index 4a7b0fcd2b..3dd62a9d5c 100644
--- a/Resources/Prototypes/Recipes/Construction/tools.yml
+++ b/Resources/Prototypes/Recipes/Construction/tools.yml
@@ -1,7 +1,7 @@
 - type: construction
   name: torch
   id: LightTorch
-  graph: lightTorch
+  graph: LightTorch
   startNode: start
   targetNode: torch
   category: Tools
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index 75e1c79792..5b04376db3 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -1,8 +1,8 @@
 # POWER
 - type: construction
   name: APC
-  id: apc
-  graph: apc
+  id: APC
+  graph: APC
   startNode: start
   targetNode: apc
   category: Utilities
@@ -17,7 +17,7 @@
 - type: construction
   name: solar assembly
   id: SolarPanel
-  graph: solarpanel
+  graph: SolarPanel
   startNode: start
   targetNode: solarpanel
   category: Utilities
@@ -33,8 +33,8 @@
 
 - type: construction
   name: cable terminal
-  id: cableTerminal
-  graph: cable_terminal
+  id: CableTerminal
+  graph: CableTerminal
   startNode: start
   targetNode: cable_terminal
   category: Utilities
@@ -51,7 +51,7 @@
 - type: construction
   name: disposal unit
   id: DisposalUnit
-  graph: disposalMachine
+  graph: DisposalMachine
   startNode: start
   targetNode: disposal_unit
   category: Utilities
@@ -153,3 +153,38 @@
     state: conpipe-c
 
 # ATMOS
+- type: construction
+  name: air alarm
+  id: AirAlarmFixture
+  graph: AirAlarm
+  startNode: start
+  targetNode: air_alarm
+  category: Structures
+  description: An air alarm. Alarms... air?
+  icon:
+    sprite: Structures/Wallmounts/air_monitors.rsi
+    state: alarm0
+  placementMode: SnapgridCenter
+  objectType: Structure
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+  - !type:WallmountCondition {}
+
+- type: construction
+  name: fire alarm
+  id: FireAlarm
+  graph: FireAlarm
+  startNode: start
+  targetNode: fire_alarm
+  category: Structures
+  description: A fire alarm. Spicy!
+  icon:
+    sprite: Structures/Wallmounts/air_monitors.rsi
+    state: fire0
+  placementMode: SnapgridCenter
+  objectType: Structure
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+  - !type:WallmountCondition {}
diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 1c3c1d9113..b8517ca579 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -1,7 +1,7 @@
 - type: construction
   name: crude spear
-  id: spear
-  graph: spear
+  id: Spear
+  graph: Spear
   startNode: start
   targetNode: spear
   category: Weapons
@@ -11,8 +11,8 @@
 
 - type: construction
   name: makeshift bola
-  id: bola
-  graph: bola
+  id: Bola
+  graph: Bola
   startNode: start
   targetNode: bola
   category: Weapons