diff --git a/exosphere/src/fuse.c b/exosphere/src/fuse.c
index ae083433d..3a05a34cf 100644
--- a/exosphere/src/fuse.c
+++ b/exosphere/src/fuse.c
@@ -284,7 +284,7 @@ uint32_t fuse_get_expected_fuse_version(uint32_t target_firmware) {
     if (fuse_get_retail_type() != 0)
         return expected_versions[target_firmware];
     else
-        return (target_firmware > 2) ? 1 : 0;
+        return (target_firmware > ATMOSPHERE_TARGET_FIRMWARE_200) ? 1 : 0;
 }
 
 /* Check for RCM bug patches. */
diff --git a/exosphere/src/masterkey.c b/exosphere/src/masterkey.c
index e6c2efa77..79888e7a6 100644
--- a/exosphere/src/masterkey.c
+++ b/exosphere/src/masterkey.c
@@ -44,7 +44,8 @@ static const uint8_t mkey_vectors_dev[MASTERKEY_REVISION_MAX][0x10] =
     {0x37, 0xAF, 0xAB, 0x35, 0x79, 0x09, 0xD9, 0x48, 0x29, 0xD2, 0xDB, 0xA5, 0xA5, 0xF5, 0x30, 0x19}, /* Master key 06 encrypted with Master key 07. */
     {0xEC, 0xE1, 0x46, 0x89, 0x37, 0xFD, 0xD2, 0x15, 0x8C, 0x3F, 0x24, 0x82, 0xEF, 0x49, 0x68, 0x04}, /* Master key 07 encrypted with Master key 08. */
     {0x43, 0x3D, 0xC5, 0x3B, 0xEF, 0x91, 0x02, 0x21, 0x61, 0x54, 0x63, 0x8A, 0x35, 0xE7, 0xCA, 0xEE}, /* Master key 08 encrypted with Master key 09. */
-    {0x6C, 0x2E, 0xCD, 0xB3, 0x34, 0x61, 0x77, 0xF5, 0xF9, 0xB1, 0xDD, 0x61, 0x98, 0x19, 0x3E, 0xD4}, /* Master key 09 encrypted with Master key 0A. */ };
+    {0x6C, 0x2E, 0xCD, 0xB3, 0x34, 0x61, 0x77, 0xF5, 0xF9, 0xB1, 0xDD, 0x61, 0x98, 0x19, 0x3E, 0xD4}, /* Master key 09 encrypted with Master key 0A. */
+};
 
 /* Retail unit keys. */
 static const uint8_t mkey_vectors[MASTERKEY_REVISION_MAX][0x10] =
diff --git a/fusee/fusee-secondary/Makefile b/fusee/fusee-secondary/Makefile
index c932cc117..2f6f4e630 100644
--- a/fusee/fusee-secondary/Makefile
+++ b/fusee/fusee-secondary/Makefile
@@ -100,7 +100,7 @@ KIPFILES 	:=	loader.kip pm.kip sm.kip ams_mitm.kip spl.kip boot.kip
 BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) fusee-primary.bin \
 				exosphere.bin lp0fw.bin rebootstub.bin thermosphere.bin splash_screen.bmp \
 				sept-primary.bin sept-secondary_00.enc sept-secondary_01.enc emummc.kip \
-				sept-secondary_dev00.enc sept-secondary_dev01.enc kernel_ldr.bin $(KIPFILES)
+				sept-secondary_dev_00.enc sept-secondary_dev_01.enc kernel_ldr.bin $(KIPFILES)
 
 #---------------------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
@@ -222,12 +222,12 @@ sept_secondary_01.enc.o	sept_secondary_01_enc.h:	sept-secondary_01.enc
 	@echo $(notdir $<)
 	@$(_bin2o)
 	
-sept_secondary_dev00.enc.o	sept_secondary_dev00_enc.h:	sept-secondary_dev00.enc
+sept_secondary_dev_00.enc.o	sept_secondary_dev_00_enc.h:	sept-secondary_dev_00.enc
 #---------------------------------------------------------------------------------
 	@echo $(notdir $<)
 	@$(_bin2o)
 	
-sept_secondary_dev01.enc.o	sept_secondary_dev01_enc.h:	sept-secondary_dev01.enc
+sept_secondary_dev_01.enc.o	sept_secondary_dev_01_enc.h:	sept-secondary_dev_01.enc
 #---------------------------------------------------------------------------------
 	@echo $(notdir $<)
 	@$(_bin2o)
diff --git a/fusee/fusee-secondary/src/nxboot.c b/fusee/fusee-secondary/src/nxboot.c
index 5a2faa244..cbae0a30e 100644
--- a/fusee/fusee-secondary/src/nxboot.c
+++ b/fusee/fusee-secondary/src/nxboot.c
@@ -56,8 +56,8 @@
 #include "exosphere_bin.h"
 #include "sept_secondary_00_enc.h"
 #include "sept_secondary_01_enc.h"
-#include "sept_secondary_dev00_enc.h"
-#include "sept_secondary_dev01_enc.h"
+#include "sept_secondary_dev_00_enc.h"
+#include "sept_secondary_dev_01_enc.h"
 #include "lp0fw_bin.h"
 #include "emummc_kip.h"
 #undef u8
@@ -609,20 +609,20 @@ uint32_t nxboot_main(void) {
         }
 
         if (tsec_fw_size == 0x3000) {
-            if (!fuse_get_retail_type()) {
-                sept_secondary_enc = sept_secondary_dev00_enc;
-                sept_secondary_enc_size = sept_secondary_dev00_enc_size;
-            } else {
+            if (fuse_get_retail_type() != 0) {
                 sept_secondary_enc = sept_secondary_00_enc;
                 sept_secondary_enc_size = sept_secondary_00_enc_size;
+            } else {
+                sept_secondary_enc = sept_secondary_dev_00_enc;
+                sept_secondary_enc_size = sept_secondary_dev_00_enc_size;
             }
         } else if (tsec_fw_size == 0x3300) {
-            if (!fuse_get_retail_type()) {
-                sept_secondary_enc = sept_secondary_dev01_enc;
-                sept_secondary_enc_size = sept_secondary_dev01_enc_size;
-            } else {
+            if (fuse_get_retail_type() != 0) {
                 sept_secondary_enc = sept_secondary_01_enc;
                 sept_secondary_enc_size = sept_secondary_01_enc_size;
+            } else {
+                sept_secondary_enc = sept_secondary_dev_01_enc;
+                sept_secondary_enc_size = sept_secondary_dev_01_enc_size;
             }
         } else {
             fatal_error("[NXBOOT] Unable to identify sept revision to run.");
@@ -632,21 +632,21 @@ uint32_t nxboot_main(void) {
             fatal_error("[NXBOOT] Failed to read the TSEC firmware from Package1loader!\n");
         }
         if (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_810) {
-            if (!fuse_get_retail_type()) {
-                sept_secondary_enc = sept_secondary_dev01_enc;
-                sept_secondary_enc_size = sept_secondary_dev01_enc_size;
-            } else {
+            if (fuse_get_retail_type() != 0) {
                 sept_secondary_enc = sept_secondary_01_enc;
                 sept_secondary_enc_size = sept_secondary_01_enc_size;
+            } else {
+                sept_secondary_enc = sept_secondary_dev_01_enc;
+                sept_secondary_enc_size = sept_secondary_dev_01_enc_size;
             }
             tsec_fw_size = 0x3300;
         } else if (target_firmware >= ATMOSPHERE_TARGET_FIRMWARE_700) {
-            if (!fuse_get_retail_type()) {
-                sept_secondary_enc = sept_secondary_dev00_enc;
-                sept_secondary_enc_size = sept_secondary_dev00_enc_size;
-            } else {
+            if (fuse_get_retail_type() != 0) {
                 sept_secondary_enc = sept_secondary_00_enc;
                 sept_secondary_enc_size = sept_secondary_00_enc_size;
+            } else {
+                sept_secondary_enc = sept_secondary_dev_00_enc;
+                sept_secondary_enc_size = sept_secondary_dev_00_enc_size;
             }
             tsec_fw_size = 0x3000;
         } else if (target_firmware == ATMOSPHERE_TARGET_FIRMWARE_620) {
diff --git a/sept/sept-secondary/sept_sign.py b/sept/sept-secondary/sept_sign.py
index ed6f3c7b2..428ee8b68 100644
--- a/sept/sept-secondary/sept_sign.py
+++ b/sept/sept-secondary/sept_sign.py
@@ -75,7 +75,7 @@ def main(argc, argv):
     for key in range(KEYS.NUM_KEYS):
         with open(fn + ('_%02X' % key) + fext, 'wb') as f:
             f.write(sign_encrypt_code(code, KEYS.HOVI_SIG_KEY_PRD[key], KEYS.HOVI_ENC_KEY_PRD[key], KEYS.IV[key], b'THANKS_NVIDIA_<3', key))
-        with open(fn + ('_dev%02X' % key) + fext, 'wb') as f:
+        with open(fn + ('_dev_%02X' % key) + fext, 'wb') as f:
             f.write(sign_encrypt_code(code, KEYS.HOVI_SIG_KEY_DEV[key], KEYS.HOVI_ENC_KEY_DEV[key], KEYS.IV_DEV[key], b'THANKS_NVIDIA_<3', key))
     return 0