diff --git a/asm/non_matchings/unknown_005740/func_800120C8.s b/asm/non_matchings/unknown_005740/func_800120C8.s
index 11761d04..ed8f39eb 100644
--- a/asm/non_matchings/unknown_005740/func_800120C8.s
+++ b/asm/non_matchings/unknown_005740/func_800120C8.s
@@ -460,7 +460,7 @@ glabel func_800120C8
 /* 01336C 8001276C 81CF0053 */  lb    $t7, 0x53($t6)
 /* 013370 80012770 8FB900B4 */  lw    $t9, 0xb4($sp)
 /* 013374 80012774 15E10003 */  bne   $t7, $at, .L80012784
-/* 013378 80012778 3C0D8000 */   lui   $t5, %hi(D_80000310) # $t5, 0x8000
+/* 013378 80012778 3C0D8000 */   lui   $t5, %hi(osCicId) # $t5, 0x8000
 /* 01337C 8001277C 10000002 */  b     .L80012788
 /* 013380 80012780 2409010A */   li    $t1, 266
 .L80012784:
@@ -471,7 +471,7 @@ glabel func_800120C8
 /* 013390 80012790 35380004 */   ori   $t8, $t1, 4
 /* 013394 80012794 03004825 */  move  $t1, $t8
 .L80012798:
-/* 013398 80012798 8DAD0310 */  lw    $t5, %lo(D_80000310)($t5)
+/* 013398 80012798 8DAD0310 */  lw    $t5, %lo(osCicId)($t5)
 /* 01339C 8001279C 240117D7 */  li    $at, 6103
 /* 0133A0 800127A0 11A10002 */  beq   $t5, $at, .L800127AC
 /* 0133A4 800127A4 00000000 */   nop   
diff --git a/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s b/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s
index fe8cdad4..fe2cf382 100644
--- a/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s
+++ b/asm/non_matchings/unknown_0CCF90/func_800CC5A0.s
@@ -129,14 +129,14 @@ glabel func_800CC5A0
 /* 0CD388 800CC788 24060000 */  li    $a2, 0
 /* 0CD38C 800CC78C 0C033AB2 */  jal   __ull_div
 /* 0CD390 800CC790 24070004 */   li    $a3, 4
-/* 0CD394 800CC794 3C098000 */  lui   $t1, %hi(D_8000030C) # $t1, 0x8000
-/* 0CD398 800CC798 8D29030C */  lw    $t1, %lo(D_8000030C)($t1)
+/* 0CD394 800CC794 3C098000 */  lui   $t1, %hi(osResetType) # $t1, 0x8000
+/* 0CD398 800CC798 8D29030C */  lw    $t1, %lo(osResetType)($t1)
 /* 0CD39C 800CC79C 3C01800E */  lui   $at, %hi(D_800E38A4) # $at, 0x800e
 /* 0CD3A0 800CC7A0 AC2238A0 */  sw    $v0, %lo(D_800E38A0)($at)
 /* 0CD3A4 800CC7A4 15200005 */  bnez  $t1, .L800CC7BC
 /* 0CD3A8 800CC7A8 AC2338A4 */   sw    $v1, %lo(D_800E38A4)($at)
-/* 0CD3AC 800CC7AC 3C048000 */  lui   $a0, %hi(D_8000031C) # $a0, 0x8000
-/* 0CD3B0 800CC7B0 2484031C */  addiu $a0, %lo(D_8000031C) # addiu $a0, $a0, 0x31c
+/* 0CD3AC 800CC7AC 3C048000 */  lui   $a0, %hi(osAppNMIBuffer) # $a0, 0x8000
+/* 0CD3B0 800CC7B0 2484031C */  addiu $a0, %lo(osAppNMIBuffer) # addiu $a0, $a0, 0x31c
 /* 0CD3B4 800CC7B4 0C034138 */  jal   func_800D04E0
 /* 0CD3B8 800CC7B8 24050040 */   li    $a1, 64
 .L800CC7BC:
diff --git a/asm/non_matchings/unknown_0D3020/D_800D25A0.s b/asm/non_matchings/unknown_0D3020/D_800D25A0.s
index e5e195de..ddcf58ca 100644
--- a/asm/non_matchings/unknown_0D3020/D_800D25A0.s
+++ b/asm/non_matchings/unknown_0D3020/D_800D25A0.s
@@ -23,8 +23,8 @@ glabel D_800D25A0
 /* 0D31EC 800D25EC 8FA40030 */   lw    $a0, 0x30($sp)
 /* 0D31F0 800D25F0 3C08A460 */  lui   $t0, 0xa460
 /* 0D31F4 800D25F4 AD020000 */  sw    $v0, ($t0)
-/* 0D31F8 800D25F8 3C098000 */  lui   $t1, %hi(D_80000308) # $t1, 0x8000
-/* 0D31FC 800D25FC 8D290308 */  lw    $t1, %lo(D_80000308)($t1)
+/* 0D31F8 800D25F8 3C098000 */  lui   $t1, %hi(osRomBase) # $t1, 0x8000
+/* 0D31FC 800D25FC 8D290308 */  lw    $t1, %lo(osRomBase)($t1)
 /* 0D3200 800D2600 8FAA002C */  lw    $t2, 0x2c($sp)
 /* 0D3204 800D2604 3C011FFF */  lui   $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff
 /* 0D3208 800D2608 3421FFFF */  ori   $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff
diff --git a/asm/non_matchings/unknown_0D3020/func_800D4790.s b/asm/non_matchings/unknown_0D3020/func_800D4790.s
index 4658f8b4..b5ef0b58 100644
--- a/asm/non_matchings/unknown_0D3020/func_800D4790.s
+++ b/asm/non_matchings/unknown_0D3020/func_800D4790.s
@@ -12,8 +12,8 @@ glabel func_800D4790
 /* 0D53B4 800D47B4 1720FFFC */  bnez  $t9, .L800D47A8
 /* 0D53B8 800D47B8 00000000 */   nop   
 .L800D47BC:
-/* 0D53BC 800D47BC 3C088000 */  lui   $t0, %hi(D_80000308) # $t0, 0x8000
-/* 0D53C0 800D47C0 8D080308 */  lw    $t0, %lo(D_80000308)($t0)
+/* 0D53BC 800D47BC 3C088000 */  lui   $t0, %hi(osRomBase) # $t0, 0x8000
+/* 0D53C0 800D47C0 8D080308 */  lw    $t0, %lo(osRomBase)($t0)
 /* 0D53C4 800D47C4 3C01A000 */  lui   $at, 0xa000
 /* 0D53C8 800D47C8 00001025 */  move  $v0, $zero
 /* 0D53CC 800D47CC 01044825 */  or    $t1, $t0, $a0
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 55d47685..f7e466f1 100755
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -23,10 +23,10 @@ D_80000010 = 0x80000010;
 D_80000018 = 0x80000018;
 D_80000020 = 0x80000020;
 osTvType = 0x80000300;
-D_80000308 = 0x80000308;
-D_8000030C = 0x8000030C;
-D_80000310 = 0x80000310;
-D_8000031C = 0x8000031C;
+osRomBase = 0x80000308;
+osResetType = 0x8000030C;
+osCicId = 0x80000310;
+osAppNMIBuffer = 0x8000031C;
 D_80002A98 = 0x80002A98;
 D_80002E38 = 0x80002E38;
 D_80003008 = 0x80003008;