diff --git a/common/src/test/scala/game/DisplayedAwardMessageTest.scala b/common/src/test/scala/game/DisplayedAwardMessageTest.scala
index 2c8a58517..cbe6d5650 100644
--- a/common/src/test/scala/game/DisplayedAwardMessageTest.scala
+++ b/common/src/test/scala/game/DisplayedAwardMessageTest.scala
@@ -14,7 +14,7 @@ class DisplayedAwardMessageTest extends Specification {
     PacketCoding.DecodePacket(string).require match {
       case DisplayedAwardMessage(player_guid, ribbon, bar) =>
         player_guid mustEqual PlanetSideGUID(1695)
-        ribbon mustEqual MeritCommendation.TwoYearTR
+        ribbon mustEqual MeritCommendation.TwoYearVS
         bar mustEqual RibbonBarsSlot.TermOfService
       case _ =>
         ko
@@ -22,7 +22,7 @@ class DisplayedAwardMessageTest extends Specification {
   }
 
   "encode" in {
-    val msg = DisplayedAwardMessage(PlanetSideGUID(1695), MeritCommendation.TwoYearTR, RibbonBarsSlot.TermOfService)
+    val msg = DisplayedAwardMessage(PlanetSideGUID(1695), MeritCommendation.TwoYearVS, RibbonBarsSlot.TermOfService)
     val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
 
     pkt mustEqual string
diff --git a/common/src/test/scala/game/ObjectCreateMessageTest.scala b/common/src/test/scala/game/ObjectCreateMessageTest.scala
index af4d8df26..76b8669eb 100644
--- a/common/src/test/scala/game/ObjectCreateMessageTest.scala
+++ b/common/src/test/scala/game/ObjectCreateMessageTest.scala
@@ -691,10 +691,10 @@ class ObjectCreateMessageTest extends Specification {
         pc.appearance.is_cloaking mustEqual false
         pc.appearance.charging_pose mustEqual false
         pc.appearance.on_zipline mustEqual false
-        pc.appearance.ribbons.upper mustEqual MeritCommendation.Loser4
-        pc.appearance.ribbons.middle mustEqual MeritCommendation.HeavyInfantry3
-        pc.appearance.ribbons.lower mustEqual MeritCommendation.TankBuster6
-        pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearNC
+        pc.appearance.ribbons.upper mustEqual MeritCommendation.MarkovVeteran
+        pc.appearance.ribbons.middle mustEqual MeritCommendation.HeavyInfantry4
+        pc.appearance.ribbons.lower mustEqual MeritCommendation.TankBuster7
+        pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearTR
         pc.health mustEqual 255
         pc.armor mustEqual 253
         pc.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
@@ -787,10 +787,10 @@ class ObjectCreateMessageTest extends Specification {
         pc.appearance.is_cloaking mustEqual false
         pc.appearance.charging_pose mustEqual false
         pc.appearance.on_zipline mustEqual false
-        pc.appearance.ribbons.upper mustEqual MeritCommendation.Jacking
-        pc.appearance.ribbons.middle mustEqual MeritCommendation.ScavengerTR6
+        pc.appearance.ribbons.upper mustEqual MeritCommendation.Jacking2
+        pc.appearance.ribbons.middle mustEqual MeritCommendation.ScavengerVS1
         pc.appearance.ribbons.lower mustEqual MeritCommendation.AMSSupport4
-        pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearTR
+        pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearVS
         pc.health mustEqual 0
         pc.armor mustEqual 0
         pc.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
@@ -1115,10 +1115,10 @@ class ObjectCreateMessageTest extends Specification {
         GrenadeState.None,
         false, false, false,
         RibbonBars(
-          MeritCommendation.Loser4,
-          MeritCommendation.HeavyInfantry3,
-          MeritCommendation.TankBuster6,
-          MeritCommendation.SixYearNC
+          MeritCommendation.MarkovVeteran,
+          MeritCommendation.HeavyInfantry4,
+          MeritCommendation.TankBuster7,
+          MeritCommendation.SixYearTR
         )
       ),
       255, 253,
@@ -1172,10 +1172,10 @@ class ObjectCreateMessageTest extends Specification {
         GrenadeState.None,
         false, false, false,
         RibbonBars(
-          MeritCommendation.Jacking,
-          MeritCommendation.ScavengerTR6,
+          MeritCommendation.Jacking2,
+          MeritCommendation.ScavengerVS1,
           MeritCommendation.AMSSupport4,
-          MeritCommendation.SixYearTR
+          MeritCommendation.SixYearVS
         )
       ),
       0, 0,