diff --git a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
index 2a05dc25e..c937e7c95 100644
--- a/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
+++ b/common/src/main/scala/net/psforever/objects/GlobalDefinitions.scala
@@ -1530,7 +1530,8 @@ object GlobalDefinitions {
     Standard.ResistanceSplash = 15
     Standard.ResistanceAggravated = 8
 
-    Agile.Name = "agile"
+    Agile.Name = "lite_armor"
+    Agile.Descriptor = "agile"
     Agile.MaxArmor = 100
     Agile.InventoryScale = InventoryTile.Tile99
     Agile.InventoryOffset = 6
@@ -1542,7 +1543,8 @@ object GlobalDefinitions {
     Agile.ResistanceSplash = 25
     Agile.ResistanceAggravated = 10
 
-    Reinforced.Name = "reinforced"
+    Reinforced.Name = "med_armor"
+    Reinforced.Descriptor = "reinforced"
     Reinforced.Permissions = List(CertificationType.ReinforcedExoSuit)
     Reinforced.MaxArmor = 200
     Reinforced.InventoryScale = InventoryTile.Tile1209
@@ -1580,18 +1582,21 @@ object GlobalDefinitions {
     }
 
     CommonMaxConfig(VSMAX)
+    VSMAX.Name = "vshev"
     VSMAX.MaxCapacitor = 50
     VSMAX.CapacitorRechargeDelayMillis = 5000
     VSMAX.CapacitorRechargePerSecond = 3
     VSMAX.CapacitorDrainPerSecond = 20
 
     CommonMaxConfig(TRMAX)
+    TRMAX.Name = "trhev"
     TRMAX.MaxCapacitor = 300
     TRMAX.CapacitorRechargeDelayMillis = 10000
     TRMAX.CapacitorRechargePerSecond = 10
     TRMAX.CapacitorDrainPerSecond = 30
 
     CommonMaxConfig(NCMAX)
+    NCMAX.Name = "nchev"
     NCMAX.MaxCapacitor = 400
     NCMAX.CapacitorRechargeDelayMillis = 10000
     NCMAX.CapacitorRechargePerSecond = 4
diff --git a/common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala b/common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala
index a59f9b33a..44e1175f3 100644
--- a/common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala
+++ b/common/src/main/scala/net/psforever/objects/definition/ExoSuitDefinition.scala
@@ -114,6 +114,7 @@ class ExoSuitDefinition(private val suitType : ExoSuitType.Value) extends BasicD
 
 class SpecialExoSuitDefinition(private val suitType : ExoSuitType.Value) extends ExoSuitDefinition(suitType) {
   Name = "heavy_armor"
+  Descriptor = "heavy_armor"
 
   private var activatedSpecial : SpecialExoSuitDefinition.Mode.Value = SpecialExoSuitDefinition.Mode.Normal
 
diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index 36a2c7224..4033f1dc7 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -7791,7 +7791,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
             sendResponse(PlanetsideAttributeMessage(amenityId, 47, if(silo.LowNtuWarningOn) 1 else 0))
 
             if(silo.ChargeLevel == 0) {
-              sendResponse(PlanetsideAttributeMessage(silo.Owner.asInstanceOf[Building].GUID, 48, 1))
+              sendResponse(PlanetsideAttributeMessage(silo.Owner.GUID, 48, 1))
             }
           case _ => ;
         }