diff --git a/eive_tmtc/tmtc/acs/star_tracker.py b/eive_tmtc/tmtc/acs/star_tracker.py
index 55254f1..80c82d3 100644
--- a/eive_tmtc/tmtc/acs/star_tracker.py
+++ b/eive_tmtc/tmtc/acs/star_tracker.py
@@ -175,7 +175,8 @@ class PartitionSize:
     STAR_TRACKER_FIRMWARE = 464572
 
 
-class Submode:
+class Submode(enum.IntEnum):
+    DEFAULT = 0
     BOOTLOADER = 1
     FIRMWARE = 2
 
diff --git a/eive_tmtc/tmtc/com/ccsds_handler.py b/eive_tmtc/tmtc/com/ccsds_handler.py
index 5bc1466..380e008 100644
--- a/eive_tmtc/tmtc/com/ccsds_handler.py
+++ b/eive_tmtc/tmtc/com/ccsds_handler.py
@@ -45,7 +45,7 @@ class ActionId(enum.IntEnum):
 
 class Submode(enum.IntEnum):
     # Informative, do not command this.
-    UNSET = 0
+    OFF = 0
     DATARATE_LOW = 1
     DATARATE_HIGH = 2