diff --git a/source/firm.c b/source/firm.c
index b9cfdd2..69a0885 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -227,8 +227,8 @@ void main(void)
             patchNativeFirm(firmVersion, nandType, emuHeader, isA9lh);
             break;
         case SAFE_FIRM:
-        case NATIVE_FIRM2X:
-            if(isA9lh) patch2xNativeAndSafeFirm();
+        case NATIVE_FIRM1X2X:
+            if(isA9lh) patch1x2xNativeAndSafeFirm();
             break;
         default:
             //Skip patching on unsupported O3DS AGB/TWL FIRMs
@@ -262,10 +262,10 @@ static inline u32 loadFirm(FirmwareType *firmType, FirmwareSource firmSource)
             //We can't boot < 2.x SysNANDs and < 3.x EmuNANDs
             if(firmVersion < 0x18)
             {
-                if(firmSource != FIRMWARE_SYSNAND || firmVersion < 9) 
-                    error("An old unsupported NAND has been detected.\nLuma3DS is unable to boot it");
+                if(firmSource != FIRMWARE_SYSNAND) 
+                    error("An old unsupported EmuNAND has been detected.\nLuma3DS is unable to boot it");
 
-                if(BOOTCONFIG(5, 1)) error("SAFE_MODE is not supported on 2.x FIRM");
+                if(BOOTCONFIG(5, 1)) error("SAFE_MODE is not supported on 1.x/2.x FIRM");
 
                 *firmType = NATIVE_FIRM2X;
             }
@@ -399,7 +399,7 @@ static inline void patchLegacyFirm(FirmwareType firmType)
     if(firmType == TWL_FIRM && CONFIG(5)) patchTwlBg((u8 *)firm + section[1].offset);
 }
 
-static inline void patch2xNativeAndSafeFirm(void)
+static inline void patch1x2xNativeAndSafeFirm(void)
 {
     u8 *arm9Section = (u8 *)firm + section[2].offset;
 
diff --git a/source/firm.h b/source/firm.h
index 9a6724d..655fe9c 100644
--- a/source/firm.h
+++ b/source/firm.h
@@ -50,6 +50,6 @@ typedef struct firmHeader {
 static inline u32 loadFirm(FirmwareType *firmType, FirmwareSource firmSource);
 static inline void patchNativeFirm(u32 firmVersion, FirmwareSource nandType, u32 emuHeader, bool isA9lh);
 static inline void patchLegacyFirm(FirmwareType firmType);
-static inline void patch2xNativeAndSafeFirm(void);
+static inline void patch1x2xNativeAndSafeFirm(void);
 static inline void copySection0AndInjectSystemModules(FirmwareType firmType);
 static inline void launchFirm(FirmwareType firmType);
\ No newline at end of file
diff --git a/source/types.h b/source/types.h
index 223d38c..d5fd269 100644
--- a/source/types.h
+++ b/source/types.h
@@ -50,5 +50,5 @@ typedef enum FirmwareType
     TWL_FIRM = 1,
     AGB_FIRM = 2,
     SAFE_FIRM = 3,
-    NATIVE_FIRM2X = 4
+    NATIVE_FIRM1X2X = 4
 } FirmwareType;
\ No newline at end of file