diff --git a/Makefile b/Makefile
index 648ca5a..14231f6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ GAME_TITLE		:=	NAND Title Manager
 GAME_SUBTITLE1	:=	JeffRuLz, Pk11
 
 GAME_CODE		:= HTMA
-GAME_LABEL		:= TITLEMAN
+GAME_LABEL		:= NANDTM
 
 include $(DEVKITARM)/ds_rules
 
diff --git a/arm9/src/rom.c b/arm9/src/rom.c
index 82ae5e1..5b7327d 100644
--- a/arm9/src/rom.c
+++ b/arm9/src/rom.c
@@ -277,5 +277,7 @@ bool isDsiHeader(tDSiHeader* h)
 {
 	if (!h) return false;
 
-	return ( h->tid_low == (unsigned int)((h->ndshdr.gameCode[0] << 24) | (h->ndshdr.gameCode[1] << 16) | (h->ndshdr.gameCode[2] << 8) | h->ndshdr.gameCode[3]) );
+	u16 crc16 = swiCRC16(0xFFFF, h, 0x15E);
+
+	return h->ndshdr.headerCRC16 == crc16;
 }
\ No newline at end of file