diff --git a/src/shared/Modules/ValvesViewer/ValvesList.h b/src/shared/Modules/ValvesViewer/ValvesList.h
index c642949d96b94318707fa5ab8d3bbe9a00050b2b..6b2aa9c0b3bd14200cd6709a843af50fb53adadd 100644
--- a/src/shared/Modules/ValvesViewer/ValvesList.h
+++ b/src/shared/Modules/ValvesViewer/ValvesList.h
@@ -28,10 +28,10 @@ namespace ValvesList
 // Valves
 enum class Valve : int
 {
-    N2O_FILLING = 0,
-    N2O_RELEASE,
-    N2O_DETACH,
-    N2O_VENTING,
+    OX_FILLING = 0,
+    OX_RELEASE,
+    OX_DETACH,
+    OX_VENTING,
     N2_FILLING,
     N2_RELEASE,
     N2_DETACH,
@@ -39,14 +39,12 @@ enum class Valve : int
     N2_3WAY,
     MAIN,
     NITROGEN,
-    TARS,
-    IGNITION
+    CHAMBER
 };
 
 // Groundstation labels
 static const QList<QString> valvesLabels{
-    "N2O FILLING", "N2O RELEASE", "N2O DETACH",   "N2O VENTING", "N2 FILLING",
-    "N2 RELEASE",  "N2 DETACH",   "N2 QUENCHING", "N2 3WAY",     "MAIN",
-    "NITROGEN",    "TARS",        "IGNITION"};
-
+    "OX FILLING", "OX RELEASE", "OX DETACH", "OX VENTING",
+    "N2 FILLING", "N2 RELEASE", "N2 DETACH", "N2 QUENCHING",
+    "N2 3WAY",    "MAIN",       "NITROGEN",  "CHAMBER"};
 }  // namespace ValvesList
\ No newline at end of file
diff --git a/src/shared/Modules/ValvesViewer/ValvesViewer.cpp b/src/shared/Modules/ValvesViewer/ValvesViewer.cpp
index 0a66b998e1273fd354ccd7dabfd6f273da42afbc..2f3b3dd18473d87f3bfa28114c286d8e75807be6 100644
--- a/src/shared/Modules/ValvesViewer/ValvesViewer.cpp
+++ b/src/shared/Modules/ValvesViewer/ValvesViewer.cpp
@@ -98,14 +98,14 @@ void ValvesViewer::onMsgReceived(const Message& msg)
 {
     // Couple the valves with their own state
     QMap<ValvesList::Valve, bool> map{
-        {ValvesList::Valve::N2O_FILLING,
-         msg.getField("n2o_filling_valve_state").getUnsignedInteger()},
-        {ValvesList::Valve::N2O_RELEASE,
-         msg.getField("n2o_release_valve_state").getUnsignedInteger()},
-        {ValvesList::Valve::N2O_DETACH,
-         msg.getField("n2o_detach_state").getUnsignedInteger()},
-        {ValvesList::Valve::N2O_VENTING,
-         msg.getField("n2o_venting_valve_state").getUnsignedInteger()},
+        {ValvesList::Valve::OX_FILLING,
+         msg.getField("ox_filling_valve_state").getUnsignedInteger()},
+        {ValvesList::Valve::OX_RELEASE,
+         msg.getField("ox_release_valve_state").getUnsignedInteger()},
+        {ValvesList::Valve::OX_DETACH,
+         msg.getField("ox_detach_state").getUnsignedInteger()},
+        {ValvesList::Valve::OX_VENTING,
+         msg.getField("ox_venting_valve_state").getUnsignedInteger()},
         {ValvesList::Valve::N2_FILLING,
          msg.getField("n2_filling_valve_state").getUnsignedInteger()},
         {ValvesList::Valve::N2_RELEASE,
@@ -120,10 +120,8 @@ void ValvesViewer::onMsgReceived(const Message& msg)
          msg.getField("main_valve_state").getUnsignedInteger()},
         {ValvesList::Valve::NITROGEN,
          msg.getField("nitrogen_valve_state").getUnsignedInteger()},
-        {ValvesList::Valve::IGNITION,
-         msg.getField("ignition_state").getUnsignedInteger()},
-        {ValvesList::Valve::TARS,
-         msg.getField("tars_state").getUnsignedInteger()}};
+        {ValvesList::Valve::CHAMBER,
+         msg.getField("chamber_valve_state").getUnsignedInteger()}};
 
     // Define the "active" and the "not active" look
     QString baseStyle{baseStylesheet};