diff --git a/asm/non_matchings/unknown_003260/audioNewThread.s b/asm/non_matchings/unknown_003260/audioNewThread.s
index dd9a6460..d66d5b25 100644
--- a/asm/non_matchings/unknown_003260/audioNewThread.s
+++ b/asm/non_matchings/unknown_003260/audioNewThread.s
@@ -11,8 +11,8 @@ glabel audioNewThread
 /* 003284 80002684 AC265F90 */  sw    $a2, %lo(D_80115F90)($at)
 /* 003288 80002688 8C8E0014 */  lw    $t6, 0x14($a0)
 /* 00328C 8000268C 3C018011 */  lui   $at, %hi(D_80115F94) # $at, 0x8011
-/* 003290 80002690 3C0F8000 */  lui   $t7, %hi(D_80003008) # $t7, 0x8000
-/* 003294 80002694 25EF3008 */  addiu $t7, %lo(D_80003008) # addiu $t7, $t7, 0x3008
+/* 003290 80002690 3C0F8000 */  lui   $t7, %hi(func_80003008) # $t7, 0x8000
+/* 003294 80002694 25EF3008 */  addiu $t7, %lo(func_80003008) # addiu $t7, $t7, 0x3008
 /* 003298 80002698 AC2E5F94 */  sw    $t6, %lo(D_80115F94)($at)
 /* 00329C 8000269C 00809825 */  move  $s3, $a0
 /* 0032A0 800026A0 AC8F0010 */  sw    $t7, 0x10($a0)
diff --git a/asm/non_matchings/unknown_003260/D_80002E38.s b/asm/non_matchings/unknown_003260/func_80002E38.s
similarity index 99%
rename from asm/non_matchings/unknown_003260/D_80002E38.s
rename to asm/non_matchings/unknown_003260/func_80002E38.s
index aadd9e7c..85f3c18e 100644
--- a/asm/non_matchings/unknown_003260/D_80002E38.s
+++ b/asm/non_matchings/unknown_003260/func_80002E38.s
@@ -1,4 +1,4 @@
-glabel D_80002E38
+glabel func_80002E38
 /* 003A38 80002E38 3C098012 */  lui   $t1, %hi(D_80119230) # $t1, 0x8012
 /* 003A3C 80002E3C 25299230 */  addiu $t1, %lo(D_80119230) # addiu $t1, $t1, -0x6dd0
 /* 003A40 80002E40 27BDFFB0 */  addiu $sp, $sp, -0x50
diff --git a/asm/non_matchings/unknown_003260/D_80003008.s b/asm/non_matchings/unknown_003260/func_80003008.s
similarity index 79%
rename from asm/non_matchings/unknown_003260/D_80003008.s
rename to asm/non_matchings/unknown_003260/func_80003008.s
index 52e2ee95..6e563ea9 100644
--- a/asm/non_matchings/unknown_003260/D_80003008.s
+++ b/asm/non_matchings/unknown_003260/func_80003008.s
@@ -1,10 +1,10 @@
-glabel D_80003008
+glabel func_80003008
 /* 003C08 80003008 3C038012 */  lui   $v1, %hi(D_80119230) # $v1, 0x8012
 /* 003C0C 8000300C 24639230 */  addiu $v1, %lo(D_80119230) # addiu $v1, $v1, -0x6dd0
 /* 003C10 80003010 906E0000 */  lbu   $t6, ($v1)
-/* 003C14 80003014 3C028000 */  lui   $v0, %hi(D_80002E38) # $v0, 0x8000
+/* 003C14 80003014 3C028000 */  lui   $v0, %hi(func_80002E38) # $v0, 0x8000
 /* 003C18 80003018 15C00007 */  bnez  $t6, .L80003038
-/* 003C1C 8000301C 24422E38 */   addiu $v0, %lo(D_80002E38) # addiu $v0, $v0, 0x2e38
+/* 003C1C 8000301C 24422E38 */   addiu $v0, %lo(func_80002E38) # addiu $v0, $v0, 0x2e38
 /* 003C20 80003020 3C0F8012 */  lui   $t7, %hi(D_80119240) # $t7, 0x8012
 /* 003C24 80003024 25EF9240 */  addiu $t7, %lo(D_80119240) # addiu $t7, $t7, -0x6dc0
 /* 003C28 80003028 24180001 */  li    $t8, 1
diff --git a/asm/non_matchings/unknown_0255E0/D_80024D54.s b/asm/non_matchings/unknown_0255E0/func_80024D54.s
similarity index 99%
rename from asm/non_matchings/unknown_0255E0/D_80024D54.s
rename to asm/non_matchings/unknown_0255E0/func_80024D54.s
index 8c4441d2..d209319f 100644
--- a/asm/non_matchings/unknown_0255E0/D_80024D54.s
+++ b/asm/non_matchings/unknown_0255E0/func_80024D54.s
@@ -1,4 +1,4 @@
-glabel D_80024D54
+glabel func_80024D54
 /* 025954 80024D54 27BDFF70 */  addiu $sp, $sp, -0x90
 /* 025958 80024D58 AFB10020 */  sw    $s1, 0x20($sp)
 /* 02595C 80024D5C AFBF002C */  sw    $ra, 0x2c($sp)
diff --git a/asm/non_matchings/unknown_05F690/func_8005F850.s b/asm/non_matchings/unknown_05F690/func_8005F850.s
index 75f1551f..789a6921 100644
--- a/asm/non_matchings/unknown_05F690/func_8005F850.s
+++ b/asm/non_matchings/unknown_05F690/func_8005F850.s
@@ -65,8 +65,8 @@ glabel func_8005F850
 /* 060544 8005F944 00002025 */  move  $a0, $zero
 /* 060548 8005F948 18A00009 */  blez  $a1, .L8005F970
 /* 06054C 8005F94C 00001825 */   move  $v1, $zero
-/* 060550 8005F950 3C028002 */  lui   $v0, %hi(D_80024D54) # $v0, 0x8002
-/* 060554 8005F954 24424D54 */  addiu $v0, %lo(D_80024D54) # addiu $v0, $v0, 0x4d54
+/* 060550 8005F950 3C028002 */  lui   $v0, %hi(func_80024D54) # $v0, 0x8002
+/* 060554 8005F954 24424D54 */  addiu $v0, %lo(func_80024D54) # addiu $v0, $v0, 0x4d54
 .L8005F958:
 /* 060558 8005F958 00436021 */  addu  $t4, $v0, $v1
 /* 06055C 8005F95C 918D0000 */  lbu   $t5, ($t4)
diff --git a/asm/non_matchings/unknown_0667D0/func_80065D98.s b/asm/non_matchings/unknown_0667D0/func_80065D98.s
index 9384d9ef..bd7cad23 100644
--- a/asm/non_matchings/unknown_0667D0/func_80065D98.s
+++ b/asm/non_matchings/unknown_0667D0/func_80065D98.s
@@ -6,10 +6,10 @@ glabel D_80065D98
 /* 0669A8 80065DA8 3C0E8012 */  lui   $t6, %hi(D_8011F758) # $t6, 0x8012
 /* 0669AC 80065DAC 25CEF758 */  addiu $t6, %lo(D_8011F758) # addiu $t6, $t6, -0x8a8
 /* 0669B0 80065DB0 3C048012 */  lui   $a0, %hi(D_8011F910) # $a0, 0x8012
-/* 0669B4 80065DB4 3C068007 */  lui   $a2, %hi(D_8006C330) # $a2, 0x8007
+/* 0669B4 80065DB4 3C068007 */  lui   $a2, %hi(func_8006C330) # $a2, 0x8007
 /* 0669B8 80065DB8 240F000A */  li    $t7, 10
 /* 0669BC 80065DBC AFAF0014 */  sw    $t7, 0x14($sp)
-/* 0669C0 80065DC0 24C6C330 */  addiu $a2, %lo(D_8006C330) # addiu $a2, $a2, -0x3cd0
+/* 0669C0 80065DC0 24C6C330 */  addiu $a2, %lo(func_8006C330) # addiu $a2, $a2, -0x3cd0
 /* 0669C4 80065DC4 2484F910 */  addiu $a0, %lo(D_8011F910) # addiu $a0, $a0, -0x6f0
 /* 0669C8 80065DC8 AFAE0010 */  sw    $t6, 0x10($sp)
 /* 0669CC 80065DCC 24050003 */  li    $a1, 3
diff --git a/asm/non_matchings/unknown_066AA0/D_8006C330.s b/asm/non_matchings/unknown_066AA0/func_8006C330.s
similarity index 99%
rename from asm/non_matchings/unknown_066AA0/D_8006C330.s
rename to asm/non_matchings/unknown_066AA0/func_8006C330.s
index 7eb2bcd2..931a2c07 100644
--- a/asm/non_matchings/unknown_066AA0/D_8006C330.s
+++ b/asm/non_matchings/unknown_066AA0/func_8006C330.s
@@ -1,4 +1,4 @@
-glabel D_8006C330
+glabel func_8006C330
 /* 06CF30 8006C330 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 06CF34 8006C334 AFBF0014 */  sw    $ra, 0x14($sp)
 /* 06CF38 8006C338 0C01B0F8 */  jal   func_8006C3E0
diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s
index 362f0859..ac4028c8 100644
--- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s
+++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s
@@ -142,7 +142,7 @@ glabel func_8006CCF0
 /* 06DAD8 8006CED8 24C61218 */  addiu $a2, %lo(D_80121218) # addiu $a2, $a2, 0x1218
 /* 06DADC 8006CEDC 24A51208 */  addiu $a1, %lo(D_80121208) # addiu $a1, $a1, 0x1208
 /* 06DAE0 8006CEE0 248411F8 */  addiu $a0, %lo(D_801211F8) # addiu $a0, $a0, 0x11f8
-/* 06DAE4 8006CEE4 0C009355 */  jal   D_80024D54
+/* 06DAE4 8006CEE4 0C009355 */  jal   func_80024D54
 /* 06DAE8 8006CEE8 AFB90010 */   sw    $t9, 0x10($sp)
 /* 06DAEC 8006CEEC 3C098012 */  lui   $t1, %hi(D_801234EC) # $t1, 0x8012
 /* 06DAF0 8006CEF0 8D2934EC */  lw    $t1, %lo(D_801234EC)($t1)
diff --git a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s
index c8d8d8be..6434e582 100644
--- a/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s
+++ b/asm/non_matchings/unknown_080500/MenuTrackSelectInit.s
@@ -309,10 +309,10 @@ glabel MenuTrackSelectInit
 /* 08F84C 8008EC4C 1420FFDA */  bnez  $at, .L8008EBB8
 /* 08F850 8008EC50 00001025 */   move  $v0, $zero
 /* 08F854 8008EC54 3C018012 */  lui   $at, %hi(D_80126924) # $at, 0x8012
-/* 08F858 8008EC58 3C048009 */  lui   $a0, %hi(D_8008F618) # $a0, 0x8009
+/* 08F858 8008EC58 3C048009 */  lui   $a0, %hi(func_8008F618) # $a0, 0x8009
 /* 08F85C 8008EC5C AC206924 */  sw    $zero, %lo(D_80126924)($at)
 /* 08F860 8008EC60 0C01E2AB */  jal   func_80078AAC
-/* 08F864 8008EC64 2484F618 */   addiu $a0, %lo(D_8008F618) # addiu $a0, $a0, -0x9e8
+/* 08F864 8008EC64 2484F618 */   addiu $a0, %lo(func_8008F618) # addiu $a0, $a0, -0x9e8
 /* 08F868 8008EC68 8FC20000 */  lw    $v0, ($fp)
 /* 08F86C 8008EC6C 00002025 */  move  $a0, $zero
 /* 08F870 8008EC70 00021843 */  sra   $v1, $v0, 1
diff --git a/asm/non_matchings/unknown_080500/D_8008F618.s b/asm/non_matchings/unknown_080500/func_8008F618.s
similarity index 99%
rename from asm/non_matchings/unknown_080500/D_8008F618.s
rename to asm/non_matchings/unknown_080500/func_8008F618.s
index e4c4bd40..1f0e0fbc 100644
--- a/asm/non_matchings/unknown_080500/D_8008F618.s
+++ b/asm/non_matchings/unknown_080500/func_8008F618.s
@@ -1,4 +1,4 @@
-glabel D_8008F618
+glabel func_8008F618
 /* 090218 8008F618 27BDFF80 */  addiu $sp, $sp, -0x80
 /* 09021C 8008F61C AFB60030 */  sw    $s6, 0x30($sp)
 /* 090220 8008F620 AFB00018 */  sw    $s0, 0x18($sp)
diff --git a/asm/non_matchings/unknown_0AEE70/func_800B6F50.s b/asm/non_matchings/unknown_0AEE70/func_800B6F50.s
index 5c453bf5..7a53bc0a 100644
--- a/asm/non_matchings/unknown_0AEE70/func_800B6F50.s
+++ b/asm/non_matchings/unknown_0AEE70/func_800B6F50.s
@@ -4,10 +4,10 @@ glabel func_800B6F50
 /* 0B7B58 800B6F58 AFBF001C */  sw    $ra, 0x1c($sp)
 /* 0B7B5C 800B6F5C 25CE95E0 */  addiu $t6, %lo(D_801295E0) # addiu $t6, $t6, -0x6a20
 /* 0B7B60 800B6F60 3C048013 */  lui   $a0, %hi(D_801295E0) # $a0, 0x8013
-/* 0B7B64 800B6F64 3C06800B */  lui   $a2, %hi(D_800B6FC4) # $a2, 0x800b
+/* 0B7B64 800B6F64 3C06800B */  lui   $a2, %hi(func_800B6FC4) # $a2, 0x800b
 /* 0B7B68 800B6F68 240F00FF */  li    $t7, 255
 /* 0B7B6C 800B6F6C AFAF0014 */  sw    $t7, 0x14($sp)
-/* 0B7B70 800B6F70 24C66FC4 */  addiu $a2, %lo(D_800B6FC4) # addiu $a2, $a2, 0x6fc4
+/* 0B7B70 800B6F70 24C66FC4 */  addiu $a2, %lo(func_800B6FC4) # addiu $a2, $a2, 0x6fc4
 /* 0B7B74 800B6F74 248495E0 */  addiu $a0, %lo(D_801295E0) # addiu $a0, $a0, -0x6a20
 /* 0B7B78 800B6F78 AFAE0010 */  sw    $t6, 0x10($sp)
 /* 0B7B7C 800B6F7C 00002825 */  move  $a1, $zero
diff --git a/asm/non_matchings/unknown_0AEE70/D_800B6FC4.s b/asm/non_matchings/unknown_0AEE70/func_800B6FC4.s
similarity index 99%
rename from asm/non_matchings/unknown_0AEE70/D_800B6FC4.s
rename to asm/non_matchings/unknown_0AEE70/func_800B6FC4.s
index 2028fed9..114215e1 100644
--- a/asm/non_matchings/unknown_0AEE70/D_800B6FC4.s
+++ b/asm/non_matchings/unknown_0AEE70/func_800B6FC4.s
@@ -1,4 +1,4 @@
-glabel D_800B6FC4
+glabel func_800B6FC4
 /* 0B7BC4 800B6FC4 27BDFFC8 */  addiu $sp, $sp, -0x38
 /* 0B7BC8 800B6FC8 AFB40028 */  sw    $s4, 0x28($sp)
 /* 0B7BCC 800B6FCC 3C148013 */  lui   $s4, %hi(D_80129790) # $s4, 0x8013
diff --git a/lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s b/lib/asm/non_matchings/unknown_0CA940/func_800C9D40.s
similarity index 91%
rename from lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s
rename to lib/asm/non_matchings/unknown_0CA940/func_800C9D40.s
index e19996a4..348ec106 100644
--- a/lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s
+++ b/lib/asm/non_matchings/unknown_0CA940/func_800C9D40.s
@@ -1,4 +1,4 @@
-glabel D_800C9D40
+glabel func_800C9D40
 /* 0CA940 800C9D40 AFA40000 */  sw    $a0, ($sp)
 /* 0CA944 800C9D44 AFA50004 */  sw    $a1, 4($sp)
 /* 0CA948 800C9D48 AFA60008 */  sw    $a2, 8($sp)
diff --git a/lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s b/lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s
index 046ecd8a..b513d761 100644
--- a/lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s
+++ b/lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s
@@ -5,8 +5,8 @@ glabel func_800C9D54
 /* 0CA960 800C9D60 AFA50024 */  sw    $a1, 0x24($sp)
 /* 0CA964 800C9D64 AFA60028 */  sw    $a2, 0x28($sp)
 /* 0CA968 800C9D68 AFA7002C */  sw    $a3, 0x2c($sp)
-/* 0CA96C 800C9D6C 3C04800D */  lui   $a0, %hi(D_800C9D40) # $a0, 0x800d
-/* 0CA970 800C9D70 24849D40 */  addiu $a0, %lo(D_800C9D40) # addiu $a0, $a0, -0x62c0
+/* 0CA96C 800C9D6C 3C04800D */  lui   $a0, %hi(func_800C9D40) # $a0, 0x800d
+/* 0CA970 800C9D70 24849D40 */  addiu $a0, %lo(func_800C9D40) # addiu $a0, $a0, -0x62c0
 /* 0CA974 800C9D74 27A70024 */  addiu $a3, $sp, 0x24
 /* 0CA978 800C9D78 8FA60020 */  lw    $a2, 0x20($sp)
 /* 0CA97C 800C9D7C 0C034FC4 */  jal   _Printf
diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s b/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s
index 801b7b1d..aa0018ad 100644
--- a/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s
+++ b/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s
@@ -17,7 +17,7 @@ glabel alLoadParam
 /* 0CC17C 800CB57C 8CE20028 */   lw    $v0, 0x28($a3)
 /* 0CC180 800CB580 24040001 */  li    $a0, 1
 /* 0CC184 800CB584 10440034 */  beq   $v0, $a0, .L800CB658
-/* 0CC188 800CB588 3C08800D */   lui   $t0, %hi(D_800CB714) # $t0, 0x800d
+/* 0CC188 800CB588 3C08800D */   lui   $t0, %hi(func_800CB714) # $t0, 0x800d
 /* 0CC18C 800CB58C 1000005E */  b     .L800CB708
 /* 0CC190 800CB590 8FBF0014 */   lw    $ra, 0x14($sp)
 /* 0CC194 800CB594 8CE20028 */  lw    $v0, 0x28($a3)
@@ -75,7 +75,7 @@ glabel alLoadParam
 /* 0CC254 800CB654 ACE0001C */   sw    $zero, 0x1c($a3)
 .L800CB658:
 /* 0CC258 800CB658 8CE20028 */  lw    $v0, 0x28($a3)
-/* 0CC25C 800CB65C 2508B714 */  addiu $t0, %lo(D_800CB714) # addiu $t0, $t0, -0x48ec
+/* 0CC25C 800CB65C 2508B714 */  addiu $t0, %lo(func_800CB714) # addiu $t0, $t0, -0x48ec
 /* 0CC260 800CB660 ACE80004 */  sw    $t0, 4($a3)
 /* 0CC264 800CB664 8C43000C */  lw    $v1, 0xc($v0)
 /* 0CC268 800CB668 5060000B */  beql  $v1, $zero, .L800CB698
diff --git a/lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s
similarity index 99%
rename from lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s
rename to lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s
index ef04c510..fa090490 100644
--- a/lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s
+++ b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s
@@ -1,4 +1,4 @@
-glabel D_800CB714
+glabel func_800CB714
 /* 0CC314 800CB714 27BDFFB0 */  addiu $sp, $sp, -0x50
 /* 0CC318 800CB718 8FA80060 */  lw    $t0, 0x60($sp)
 /* 0CC31C 800CB71C AFB30020 */  sw    $s3, 0x20($sp)
diff --git a/lib/src/unknown_0CA940.c b/lib/src/unknown_0CA940.c
index 94f2b719..3467b96d 100644
--- a/lib/src/unknown_0CA940.c
+++ b/lib/src/unknown_0CA940.c
@@ -4,5 +4,5 @@
 #include "types.h"
 #include "macros.h"
 
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA940/D_800C9D40.s")
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA940/func_800C9D40.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA940/func_800C9D54.s")
diff --git a/lib/src/unknown_0CA9A0.c b/lib/src/unknown_0CA9A0.c
index 38ba6f31..607a5007 100644
--- a/lib/src/unknown_0CA9A0.c
+++ b/lib/src/unknown_0CA9A0.c
@@ -11,7 +11,7 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB498.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s")
-GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s")
+GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alLoadPull.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s")
diff --git a/src/unknown_003260.c b/src/unknown_003260.c
index 9a2f5eb5..2f924e78 100644
--- a/src/unknown_003260.c
+++ b/src/unknown_003260.c
@@ -14,7 +14,7 @@
 #define AL_SNDP_FX_EVT (1 << 8)
 
 extern void func_80002A98(void*);
-extern u32 D_80003008;
+extern u32 func_80003008;
 
 /************ .bss ************/
 
@@ -104,7 +104,7 @@ void audioNewThread(ALSynConfig* c, OSPri p, s32 arg2){
     s32 i;
     D_80115F90 = arg2;
     D_80115F94 = c->heap;
-    c->dmaproc = &D_80003008;
+    c->dmaproc = &func_80003008;
     c->outputRate = func_800C8600(22050);
     D_8011962C = (((f32) c->outputRate)*2.0f)/D_80126170;
     if(D_8011962C < 0){
@@ -153,8 +153,8 @@ void audioStopThread(void) {
 GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80002A98.s")
 GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80002C00.s")
 GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80002DF8.s")
-GLOBAL_ASM("asm/non_matchings/unknown_003260/D_80002E38.s")
-GLOBAL_ASM("asm/non_matchings/unknown_003260/D_80003008.s")
+GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80002E38.s")
+GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80003008.s")
 GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80003040.s")
 
 void sfxSetVolumeSlider(u32 arg0) {
diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c
index 1c88bdeb..b44db8b6 100644
--- a/src/unknown_0255E0.c
+++ b/src/unknown_0255E0.c
@@ -310,7 +310,7 @@ void func_800249F0(u32 arg0, u32 arg1, s32 arg2, u32 arg3, u32 arg4, u32 arg5, u
 #endif
 
 
-GLOBAL_ASM("asm/non_matchings/unknown_0255E0/D_80024D54.s")
+GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80024D54.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80025510.s")
 
 void func_800257D0(void) {
diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c
index f677640a..55cfcfb8 100644
--- a/src/unknown_06B2B0.c
+++ b/src/unknown_06B2B0.c
@@ -681,7 +681,7 @@ s32 func_8006C300(void) {
 }
 
 #if 1
-GLOBAL_ASM("asm/non_matchings/unknown_066AA0/D_8006C330.s")
+GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C330.s")
 #else
 void func_8006C330(s32 arg0) {
     func_8006C3E0();
@@ -961,7 +961,7 @@ void func_8006DC58(s32 arg0) {
         func_80010994(arg0);
         particlePtrList_flush();
         func_8001BF20();
-        D_80024D54(&D_801211F8, &D_80121208, &D_80121218, &D_80121228, arg0);
+        func_80024D54(&D_801211F8, &D_80121208, &D_80121218, &D_80121228, arg0);
         func_800C3440(arg0);
         func_80078054(&D_801211F8);
         func_80077050(&D_801211F8);
diff --git a/src/unknown_080500.c b/src/unknown_080500.c
index 7718a5ff..f2b7eec6 100644
--- a/src/unknown_080500.c
+++ b/src/unknown_080500.c
@@ -3237,7 +3237,7 @@ void func_8008F534(void) {
     func_8006F564(0);
 }
 
-GLOBAL_ASM("asm/non_matchings/unknown_080500/D_8008F618.s")
+GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008F618.s")
 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008FA54.s")
 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_8008FF1C.s")
 GLOBAL_ASM("asm/non_matchings/unknown_080500/func_800904E8.s")
diff --git a/src/unknown_0B7A50.c b/src/unknown_0B7A50.c
index deab665b..381421ab 100644
--- a/src/unknown_0B7A50.c
+++ b/src/unknown_0B7A50.c
@@ -36,7 +36,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B6EE0.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B6F04.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B6F40.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B6F50.s")
-GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/D_800B6FC4.s")
+GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B6FC4.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B70D0.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B7144.s")
 GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B71B0.s")
diff --git a/tools/python/calc_func_checksums.py b/tools/python/calc_func_checksums.py
index f26d5a25..86530d13 100644
--- a/tools/python/calc_func_checksums.py
+++ b/tools/python/calc_func_checksums.py
@@ -11,10 +11,10 @@ MAP_FILEPATH = BUILD_DIR + '/dkr.map'
 ROM_FILEPATH = BUILD_DIR + '/dkr.z64'
 
 FUNCTIONS_TO_CALC = [
-    ('func_8003B4BC', 'D_800DCDD0'),
-    ('func_80068158', 'D_800DD320'),
     ('func_80019808', 'D_800DC690'),
-    ('D_80024D54', 'D_800DCEA0')
+    ('func_80024D54', 'D_800DCEA0'),
+    ('func_8003B4BC', 'D_800DCDD0'),
+    ('func_80068158', 'D_800DD320')
 ]
 
 def getMatches(string, regex):