diff --git a/Makefile b/Makefile
index 6fd12a5dc1..8222810905 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,7 @@ build/decomp_pre_dmadata/ovl_Bg_Ikana_Ray: build/ovl_Bg_Ikana_Ray_pre_dmadata.bi
 disasm:
 	@./tools/disasm.py -d ./asm -u . -l ./tables/files.txt -f ./tables/functions.txt -o ./tables/objects.txt -v ./tables/variables.txt -v ./tables/vrom_variables.txt -v ./tables/pre_boot_variables.txt
 	@while read -r file; do \
-		./tools/split_asm.py ./asm/$$file.asm ./asm/nonmatching/$$file; \
+		./tools/split_asm.py ./asm/$$file.asm ./asm/non_matchings/$$file; \
 	done < ./tables/files_with_nonmatching.txt
 
 # Recipes
diff --git a/src/boot_O2/stackcheck.c b/src/boot_O2/stackcheck.c
index b2e28a34d7..f82267b92b 100644
--- a/src/boot_O2/stackcheck.c
+++ b/src/boot_O2/stackcheck.c
@@ -94,7 +94,7 @@ s32 StackCheck_GetState(StackEntry* entry) {
     return 0;
 }
 #else
-GLOBAL_ASM("asm/nonmatching/stackcheck/StackCheck_GetState.asm")
+GLOBAL_ASM("asm/non_matchings/stackcheck/StackCheck_GetState.asm")
 #endif
 
 u32 StackCheck_CheckAll() {
diff --git a/src/boot_O2_g3/boot_0x800805E0.c b/src/boot_O2_g3/boot_0x800805E0.c
index 81c7e43616..06d9036f00 100644
--- a/src/boot_O2_g3/boot_0x800805E0.c
+++ b/src/boot_O2_g3/boot_0x800805E0.c
@@ -1,8 +1,7 @@
 #include <ultra64.h>
 #include <global.h>
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 UNK_RET func_800805E0(UNK_TYPE a0) {
     if (a0 != 0) {
         switch (osTvType) {
@@ -49,12 +48,8 @@ UNK_RET func_800805E0(UNK_TYPE a0) {
 
     D_80096B24 = a0;
 }
-
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/boot_0x800805E0/func_800805E0.asm")
-
+GLOBAL_ASM("./asm/non_matchings/boot_0x800805E0/func_800805E0.asm")
 #endif
 
 UNK_RET func_80080748(void) {
diff --git a/src/boot_O2_g3/boot_0x800968B0.c b/src/boot_O2_g3/boot_0x800968B0.c
index fd9202f466..29fdf5f7fb 100644
--- a/src/boot_O2_g3/boot_0x800968B0.c
+++ b/src/boot_O2_g3/boot_0x800968B0.c
@@ -1,8 +1,7 @@
 #include <ultra64.h>
 #include <global.h>
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 u32 func_800968B0(const u8* a0, const u8* a1) {
     u8 v0;
     u8 v1;
@@ -16,9 +15,6 @@ u32 func_800968B0(const u8* a0, const u8* a1) {
     } while (v0 != 0);
     return 0;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/boot_0x800968B0/func_800968B0.asm")
-
+GLOBAL_ASM("./asm/non_matchings/boot_0x800968B0/func_800968B0.asm")
 #endif
\ No newline at end of file
diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c
index 8fe2cfe34b..aa43b6cc39 100644
--- a/src/boot_O2_g3/idle.c
+++ b/src/boot_O2_g3/idle.c
@@ -16,7 +16,7 @@ void Idle_InitFramebuffer(u32* ptr, u32 numBytes, u32 value) {
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/idle/Idle_InitFramebuffer.asm")
+GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitFramebuffer.asm")
 #endif
 
 void Idle_InitScreen(void) {
@@ -58,7 +58,7 @@ void Idle_InitCodeAndMemory(void) {
     Idle_ClearMemory(&code_bss_start, &code_bss_end);
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/idle/Idle_InitCodeAndMemory.asm")
+GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitCodeAndMemory.asm")
 #endif
 
 void Idle_MainThreadEntry(void* arg) {
diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c
index 8b4ed863ef..d2bd6cd8e9 100644
--- a/src/boot_O2_g3/z_std_dma.c
+++ b/src/boot_O2_g3/z_std_dma.c
@@ -139,7 +139,7 @@ void Dmamgr_HandleRequest(DmaRequest* a0) {
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_HandleRequest.asm")
+GLOBAL_ASM("./asm/non_matchings/z_std_dma/Dmamgr_HandleRequest.asm")
 #endif
 
 void Dmamgr_ThreadEntry(void* a0) {
@@ -213,7 +213,7 @@ void Dmamgr_Start() {
 	osStartThread(&dmamgrOSThread);
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/z_std_dma/Dmamgr_Start.asm")
+GLOBAL_ASM("./asm/non_matchings/z_std_dma/Dmamgr_Start.asm")
 #endif
 
 void Dmamgr_Stop() {
diff --git a/src/boot_O2_g3_trapuv/fault.c b/src/boot_O2_g3_trapuv/fault.c
index 8fa4a6b1ad..7db9b24597 100644
--- a/src/boot_O2_g3_trapuv/fault.c
+++ b/src/boot_O2_g3_trapuv/fault.c
@@ -45,7 +45,7 @@ end:
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_AddClient.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddClient.asm")
 #endif
 
 void Fault_RemoveClient(FaultClient* client) {
@@ -119,7 +119,7 @@ end:
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_AddAddrConvClient.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddAddrConvClient.asm")
 #endif
 
 void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
@@ -233,7 +233,7 @@ s32 Fault_WaitForInputImpl() {
     return 0;
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_WaitForInputImpl.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_WaitForInputImpl.asm")
 #endif
 
 void Fault_WaitForInput() {
@@ -289,7 +289,7 @@ void Fault_LogFReg(s32 idx, f32* value) {
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_LogFReg.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_LogFReg.asm")
 #endif
 
 void Fault_PrintFPCR(u32 value) {
@@ -574,7 +574,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
     faultCtxt->faultActive = 1;
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_DrawMemDump.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_DrawMemDump.asm")
 #endif
 
 #ifdef NON_MATCHING
@@ -635,7 +635,7 @@ void Fault_FindNextStackCall(u32** sp, u32** pc, u32** ra) {
     *ra = currentRa;
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_FindNextStackCall.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_FindNextStackCall.asm")
 #endif
 
 void Fault_DrawStackTrace(OSThread* t, u32 flags) {
@@ -733,7 +733,7 @@ void Fault_CommitFB() {
     FaultDrawer_SetDrawerFB(fb, 0x140, 0xF0);
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_CommitFB.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_CommitFB.asm")
 #endif
 
 void Fault_ProcessClients(void) {
@@ -788,7 +788,7 @@ void Fault_SetOptionsFromController3(void) {
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault/Fault_SetOptionsFromController3.asm")
+GLOBAL_ASM("./asm/non_matchings/fault/Fault_SetOptionsFromController3.asm")
 #endif
 
 void Fault_SetOptions(void) {
diff --git a/src/boot_O2_g3_trapuv/fault_drawer.c b/src/boot_O2_g3_trapuv/fault_drawer.c
index 65a2da4014..3fee4878f0 100644
--- a/src/boot_O2_g3_trapuv/fault_drawer.c
+++ b/src/boot_O2_g3_trapuv/fault_drawer.c
@@ -24,10 +24,10 @@ void FaultDrawer_DrawRecImpl(s32 xstart, s32 ystart, s32 xend, s32 yend, u16 col
     }
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_DrawRecImpl.asm")
+GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawRecImpl.asm")
 #endif
 
-GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_DrawChar.asm")
+GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawChar.asm")
 
 s32 FaultDrawer_ColorToPrintColor(u16 color) {
     s32 i;
@@ -90,15 +90,15 @@ void FaultDrawer_FillScreen() {
     FaultDrawer_SetCursor(faultDrawContext->xStart, faultDrawContext->yStart);
 }
 
-GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_FormatStringFunc.asm")
+GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_FormatStringFunc.asm")
 
 void FaultDrawer_VPrintf(char* str, char* args) { //va_list
     _Printf((printf_func)FaultDrawer_FormatStringFunc, faultDrawContext, str, args);
 }
 
-GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_Printf.asm")
+GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_Printf.asm")
 
-GLOBAL_ASM("./asm/nonmatching/fault_drawer/FaultDrawer_DrawText.asm")
+GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawText.asm")
 
 void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) {
     faultDrawContext->fb = (u16*)fb;
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 6a8bdfa103..66e246f3c8 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1,263 +1,263 @@
 #include <ultra64.h>
 #include <global.h>
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PrintLists.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PrintLists.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetDrawParams.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetDrawParams.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PostDraw.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PostDraw.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B3FC0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B3FC0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4024.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4024.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4088.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4088.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B40B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B40B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B40E0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B40E0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B42F8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B42F8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4A98.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4A98.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4AEC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4AEC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4B50.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4B50.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4EDC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4EDC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4F40.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4F40.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4F78.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B4F78.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B5040.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5040.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TargetContextInit.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TargetContextInit.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B5208.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5208.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B5814.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B5814.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetSwitchFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_GetSwitchFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetSwitchFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetSwitchFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UnsetSwitchFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UnsetSwitchFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetChestFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_GetChestFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetChestFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetChestFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetAllChestFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetAllChestFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetAllChestFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_GetAllChestFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetRoomCleared.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_GetRoomCleared.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetRoomCleared.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetRoomCleared.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UnsetRoomCleared.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UnsetRoomCleared.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetRoomClearedTemp.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_GetRoomClearedTemp.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetRoomClearedTemp.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetRoomClearedTemp.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UnsetRoomClearedTemp.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UnsetRoomClearedTemp.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetCollectibleFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_GetCollectibleFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetCollectibleFlag.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetCollectibleFlag.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardContextInit.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TitleCardContextInit.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardCreate.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TitleCardCreate.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Nop800B5E50.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Nop800B5E50.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardUpdate.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TitleCardUpdate.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardDraw.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_TitleCardDraw.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6434.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6434.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B645C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B645C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6468.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6468.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6474.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6474.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B648C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B648C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B64FC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B64FC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6584.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6584.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6608.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6608.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6680.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6680.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_MarkForDeath.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_MarkForDeath.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InitCurrPosition.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InitCurrPosition.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetHeight.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetHeight.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetRotationFromDrawRotation.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetRotationFromDrawRotation.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InitDrawRotation.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InitDrawRotation.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetScale.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetScale.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetObjectSegment.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetObjectSegment.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InitToDefaultValues.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InitToDefaultValues.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_FiniActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_FiniActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetMovementScale.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetMovementScale.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_ApplyMovement.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_ApplyMovement.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityYRotationAndGravity.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityYRotationAndGravity.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityAndMoveYRotationAndGravity.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityAndMoveYRotationAndGravity.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityXYRotation.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityXYRotation.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityAndMoveXYRotation.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityAndMoveXYRotation.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityXYRotationReverse.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityXYRotationReverse.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityAndMoveXYRotationReverse.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SetVelocityAndMoveXYRotationReverse.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6C04.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C04.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6C58.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6C58.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YawBetweenActors.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_YawBetweenActors.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YawBetweenActorsTop.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_YawBetweenActorsTop.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YawToPoint.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_YawToPoint.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchBetweenActors.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PitchBetweenActors.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchBetweenActorsTop.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PitchBetweenActorsTop.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchToPoint.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_PitchToPoint.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DistanceBetweenActors.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DistanceBetweenActors.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DistanceToPoint.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DistanceToPoint.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_XZDistanceBetweenActors.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_XZDistanceBetweenActors.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_XZDistanceToPoint.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_XZDistanceToPoint.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_CalcOffsetOrientedToDrawRotation.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_CalcOffsetOrientedToDrawRotation.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YDistance.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_YDistance.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6F20.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6F20.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6FC8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B6FC8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7090.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7090.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7118.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7118.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7128.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7128.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B715C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B715C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7170.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7170.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B71DC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B71DC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7200.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7200.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B722C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B722C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B724C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B724C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7298.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7298.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B72E0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B72E0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B72F8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B72F8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsLinkFacingActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsLinkFacingActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacedByActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacedByActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingLink.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacingLink.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacingActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingActorAndWithinRange.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_IsActorFacingActorAndWithinRange.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B75A0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B75A0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B761C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B761C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7678.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7678.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B78B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B78B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7E04.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7E04.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7FE0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B7FE0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8018.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8018.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8050.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8050.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8118.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8118.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B81E0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B81E0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8214.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8214.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8248.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8248.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B82EC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B82EC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B83BC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B83BC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B83F8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B83F8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B84D0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B84D0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8500.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8500.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B85E0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B85E0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8614.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8614.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B863C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B863C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B867C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B867C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B86C8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B86C8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8708.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8708.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8718.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8718.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B874C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B874C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8804.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8804.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B882C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B882C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B886C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B886C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8898.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8898.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8934.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8934.asm")
 
 u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
     if (actor->parent != NULL) {
@@ -267,221 +267,221 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
     }
 }
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8A1C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8A1C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8B84.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8B84.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8BB0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BB0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8BD0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BD0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8BFC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8BFC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C20.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C20.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C50.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C50.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C78.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C78.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C9C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8C9C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8CEC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8CEC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8D10.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D10.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8D50.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D50.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8D98.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8D98.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8DD4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8DD4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8E1C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8E1C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8E58.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8E58.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8EC8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8EC8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8EF4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8EF4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8F98.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8F98.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8FC0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8FC0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8FE8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B8FE8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9010.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9010.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9038.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9038.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9084.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9084.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9098.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9098.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B90AC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B90AC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B90F4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B90F4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9120.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9120.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Init.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Init.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9334.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9334.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UpdateActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UpdateActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UpdateAll.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_UpdateAll.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9D1C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9D1C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawAllSetup.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawAllSetup.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_RecordUndrawnActor.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_RecordUndrawnActor.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9E84.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9E84.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9EF4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800B9EF4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA2D8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA2D8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA2FC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA2FC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawAll.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_DrawAll.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA6FC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA6FC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA798.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA798.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA8B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA8B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA9B4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BA9B4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InsertIntoTypeList.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_InsertIntoTypeList.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_RemoveFromTypeList.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_RemoveFromTypeList.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_FreeOverlay.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_FreeOverlay.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Spawn.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_Spawn.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_LoadOverlay.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_LoadOverlay.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnWithParentAndCutscene.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnWithParentAndCutscene.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnWithParent.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnWithParent.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnTransitionActors.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//Actor_SpawnTransitionActors.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB2D0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB2D0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB498.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB498.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB59C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB59C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB604.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB604.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB8EC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BB8EC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBA88.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBA88.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBAC0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBAC0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBB74.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBB74.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBC20.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBC20.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBCEC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBCEC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBDAC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBDAC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBFB0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BBFB0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC154.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC154.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC188.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC188.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC1B4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC1B4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC270.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC270.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC444.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC444.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC4EC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC4EC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC5B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC5B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC5EC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC5EC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC620.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC620.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC770.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC770.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC7D8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC7D8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC848.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC848.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC8B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BC8B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCB50.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCB50.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCB70.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCB70.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCBF4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCBF4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCC68.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCC68.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCCDC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BCCDC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD2B4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD2B4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD384.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD384.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD6E4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD6E4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD888.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD888.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD9A0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD9A0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD9E0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BD9E0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDAA0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDAA0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDB6C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDB6C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDC5C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDC5C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDCF4.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDCF4.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDFB0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDFB0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDFC0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BDFC0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE03C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE03C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE0B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE0B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE184.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE184.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE22C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE22C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE258.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE258.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE2B8.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE2B8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE33C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE33C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE3D0.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE3D0.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE504.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE504.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE568.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE568.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE5CC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE5CC.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE63C.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE63C.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE680.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BE680.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_actor//func_800BF7CC.asm")
+GLOBAL_ASM("asm/non_matchings/z_actor//func_800BF7CC.asm")
 
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index 7d3cd3c4eb..96e933715b 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -90,8 +90,7 @@ void EffectSS_ResetLoadedParticleEntry(LoadedParticleEntry* particle) {
 }
 
 // XXX Some regalloc differences and instruction ordering
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) {
     s32 ret = 0;
     s32 i;
@@ -145,11 +144,8 @@ s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) {
 
     return ret;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
 #endif
 
 void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) {
@@ -162,8 +158,7 @@ void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) {
     }
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* initData) {
     u32 index;
     u32 initRet;
@@ -212,11 +207,8 @@ void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* in
         }
     }
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
 #endif
 
 void EffectSS_UpdateParticle(GlobalContext* ctxt, s32 index) {
@@ -285,8 +277,7 @@ void EffectSS_DrawAllParticles(GlobalContext* ctxt) {
     }
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 s16 func_800B096C(s16 a0, s16 a1, s32 a2) {
     s16 ret;
 
@@ -299,11 +290,8 @@ s16 func_800B096C(s16 a0, s16 a1, s32 a2) {
 
     return ret;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_effect_soft_sprite/func_800B096C.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/func_800B096C.asm")
 #endif
 
 s16 func_800B09D0(s16 a0, s16 a1, f32 a2) {
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 5e64d2c8bd..55b040c0b6 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -11,8 +11,7 @@ void* Lib_bcopy(void* dest, void* src, size_t n) {
     return dest;
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void* Lib_memset(u8* a0, u32 a1, u32 a2) {
     u8* v0;
 
@@ -29,11 +28,8 @@ void* Lib_memset(u8* a0, u32 a1, u32 a2) {
 
     return a0;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_memset.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_memset.asm")
 #endif
 
 f32 Lib_cos(s16 angle) {
@@ -135,8 +131,7 @@ s32 Lib_StepTowardsCheck_c(s8* start, s8 target, s8 step) {
     return 0;
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 s32 Lib_StepTowardsCheck_f(f32* start, f32 target, f32 step) {
     if (step != 0) {
         // XXX: regalloc is messed up
@@ -157,15 +152,11 @@ s32 Lib_StepTowardsCheck_f(f32* start, f32 target, f32 step) {
 
     return 0;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_StepTowardsCheck_f.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_StepTowardsCheck_f.asm")
 #endif
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 s32 func_800FF0D0(s16* a0, s16 a1, s16 a2) {
     s32 v0 = *a0;
 
@@ -180,71 +171,49 @@ s32 func_800FF0D0(s16* a0, s16 a1, s16 a2) {
 
     return 0;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/func_800FF0D0.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF0D0.asm")
 #endif
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void func_800FF138() {
 
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/func_800FF138.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF138.asm")
 #endif
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void func_800FF1FC(void) {
 
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/func_800FF1FC.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF1FC.asm")
 #endif
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void func_800FF2A8(void) {
 
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/func_800FF2A8.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2A8.asm")
 #endif
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void func_800FF2F8(void) {
 
 }
 
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/func_800FF2F8.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2F8.asm")
 #endif
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void func_800FF3A0(void) {
 
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/func_800FF3A0.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF3A0.asm")
 #endif
 
 s16 Lib_rand_s(s16 base, s16 range) {
@@ -381,8 +350,7 @@ f32 Lib_DistanceAndDifferenceXZVec3f(Vector3f* a, Vector3f* b, f32* xDiff, f32*
     return sqrtf((*xDiff * *xDiff) + (*zDiff * *zDiff));
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void Lib_PushAwayXZVec3f(Vector3f* start, Vector3f* pusher, f32 distanceToApproach) {
     f32 sp24;
     f32 sp20;
@@ -398,11 +366,8 @@ void Lib_PushAwayXZVec3f(Vector3f* start, Vector3f* pusher, f32 distanceToApproa
     start->x = pusher->x + sp24 * f2;
     start->z = pusher->z + sp20 * f2;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_PushAwayXZVec3f.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_PushAwayXZVec3f.asm")
 #endif
 
 f32 Lib_DistanceYVec3f(Vector3f* a, Vector3f* b) {
@@ -552,16 +517,12 @@ void Lib_Scale_f(f32* start, f32 scale, f32 maxStep) {
   *start = *start - f0;
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 s32 Lib_ScaleMaxMin_s(s16* start, s16 target, s16 scale, s16 maxStep, s16 minStep) {
 
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_ScaleMaxMin_s.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_ScaleMaxMin_s.asm")
 #endif
 
 void Lib_ScaleMax_s(s16* start, s16 target, s16 scale, s16 maxStep) {
@@ -611,19 +572,15 @@ void Lib_TranslateAndRotateYVec3f(Vector3f* translation, s16 rotation, Vector3f*
     dst->z = translation->z + (src->z * sp1C - src->x * f0);
 }
 
-#ifdef NONMATCHING
-
+#ifdef NON_MATCHING
 void Lib_LerpRGB(RGB* a, RGB* b, f32 t, RGB* dst) {
     // XXX regalloc is slightly off
     dst->red = (f32)a->red + ((f32)b->red - (f32)a->red) * t;
     dst->green = (f32)a->green + ((f32)b->green - (f32)a->green) * t;
     dst->blue = (f32)a->blue + ((f32)b->blue - (f32)a->blue) * t;
 }
-
 #else
-
-GLOBAL_ASM("./asm/nonmatching/z_lib/Lib_LerpRGB.asm")
-
+GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_LerpRGB.asm")
 #endif
 
 f32 Lib_PushAwayVec3f(Vector3f* start, Vector3f* pusher, f32 distanceToApproach) {
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index 620edb5066..be530cb364 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -55,7 +55,7 @@ void Lights_MapperInit(LightMapper* mapper, u8 red, u8 green, u8 blue) {
 }
 
 // XXX regalloc
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 void Lights_UploadLights(LightMapper* mapper, GraphicsContext* gCtxt) {
     Light* l;
     s32 i;
@@ -74,7 +74,7 @@ void Lights_UploadLights(LightMapper* mapper, GraphicsContext* gCtxt) {
     gSPLight(gCtxt->polyXlu.append++, &mapper->lights.a, i);
 }
 #else
-GLOBAL_ASM("asm/nonmatching/z_lights/Lights_UploadLights.asm")
+GLOBAL_ASM("asm/non_matchings/z_lights/Lights_UploadLights.asm")
 #endif
 
 Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) {
@@ -85,7 +85,7 @@ Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) {
 }
 
 // XXX regalloc, some reorderings
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 void Lights_MapPositionalWithReference(LightMapper* mapper, LightInfoPositionalParams* params, Vector3f* pos) {
     f32 xDiff;
     f32 yDiff;
@@ -130,11 +130,11 @@ void Lights_MapPositionalWithReference(LightMapper* mapper, LightInfoPositionalP
     }
 }
 #else
-GLOBAL_ASM("asm/nonmatching/z_lights/Lights_MapPositionalWithReference.asm")
+GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositionalWithReference.asm")
 #endif
 
 // This function matches, but uses .rodata. We don't have a good way to match partial .rodata for a file yet.
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 void Lights_MapPositional(LightMapper* mapper, LightInfoPositionalParams* params, GlobalContext* ctxt) {
     Light* light;
     f32 radiusF = params->radius;
@@ -176,7 +176,7 @@ void Lights_MapPositional(LightMapper* mapper, LightInfoPositionalParams* params
     }
 }
 #else
-GLOBAL_ASM("asm/nonmatching/z_lights/Lights_MapPositional.asm")
+GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositional.asm")
 #endif
 
 void Lights_MapDirectional(LightMapper* mapper, LightInfoDirectionalParams* params, GlobalContext* ctxt) {
@@ -361,7 +361,7 @@ LightMapper* Lights_MapperAllocateAndInit(GraphicsContext* gCtxt, u8 red, u8 gre
 }
 
 // XXX regalloc
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 void func_80102880(GlobalContext* ctxt) {
     z_Light* light = ctxt->lightsContext.lightsHead;
     LightInfoPositionalParams* params;
@@ -397,11 +397,11 @@ void func_80102880(GlobalContext* ctxt) {
     }
 }
 #else
-GLOBAL_ASM("asm/nonmatching/z_lights/func_80102880.asm")
+GLOBAL_ASM("asm/non_matchings/z_lights/func_80102880.asm")
 #endif
 
 // XXX regalloc
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 void func_80102A64(GlobalContext* ctxt) {
     Gfx* dl;
     LightInfoPositionalParams* params;
@@ -444,5 +444,5 @@ void func_80102A64(GlobalContext* ctxt) {
     }
 }
 #else
-GLOBAL_ASM("asm/nonmatching/z_lights/func_80102A64.asm")
+GLOBAL_ASM("asm/non_matchings/z_lights/func_80102A64.asm")
 #endif
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 9f7b66e9f1..4499ffa956 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -42,13 +42,13 @@ void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
     }
 }
 
-GLOBAL_ASM("asm/nonmatching/z_room/Room_DrawType2Mesh.asm")
+GLOBAL_ASM("asm/non_matchings/z_room/Room_DrawType2Mesh.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_room/func_8012DEE8.asm")
+GLOBAL_ASM("asm/non_matchings/z_room/func_8012DEE8.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_room/func_8012E254.asm")
+GLOBAL_ASM("asm/non_matchings/z_room/func_8012E254.asm")
 
-GLOBAL_ASM("asm/nonmatching/z_room/func_8012E32C.asm")
+GLOBAL_ASM("asm/non_matchings/z_room/func_8012E32C.asm")
 
 void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
     RoomMeshType1* mesh = &room->mesh->type1;
@@ -72,9 +72,9 @@ void Room_Init(GlobalContext* ctxt, RoomContext* roomCtxt) {
     }
 }
 
-GLOBAL_ASM("asm/nonmatching/z_room/Room_AllocateAndLoad.asm")
+GLOBAL_ASM("asm/non_matchings/z_room/Room_AllocateAndLoad.asm")
 
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 index) {
     u32 size;
 
@@ -99,7 +99,7 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind
     return 0;
 }
 #else
-GLOBAL_ASM("asm/nonmatching/z_room/Room_StartRoomTransition.asm")
+GLOBAL_ASM("asm/non_matchings/z_room/Room_StartRoomTransition.asm")
 #endif
 
 s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) {
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 8e94ed6bc1..a43adc3047 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -1,13 +1,13 @@
 #include <ultra64.h>
 #include <global.h>
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_LoadObject.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_LoadObject.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_Init.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_Init.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_ReloadUnloadedObjects.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_ReloadUnloadedObjects.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_FindSceneObjectIndex.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_FindSceneObjectIndex.asm")
 
 s32 Scene_IsObjectLoaded(SceneContext* iParm1, s32 index) {
     if (iParm1->objects[index].id > 0) {
@@ -17,12 +17,12 @@ s32 Scene_IsObjectLoaded(SceneContext* iParm1, s32 index) {
     }
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_DmaAllObjects.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_DmaAllObjects.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/func_8012F73C.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/func_8012F73C.asm")
 
 // Scene Command 0x00: Link Spawn List
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 // Regalloc differences only
 void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) {
     ActorEntry* linkEntry;
@@ -55,7 +55,7 @@ void Scene_HeaderCommand00(GlobalContext* ctxt, SceneCmd* entry) {
     ctxt->sceneContext.objects[(&ctxt->sceneContext)->unk8].vramAddr = objectVramAddr;
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand00.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand00.asm")
 #endif
 
 // Scene Command 0x01: Actor List
@@ -140,40 +140,40 @@ void Scene_HeaderCommand0A(GlobalContext* ctxt, SceneCmd* entry) {
     ctxt->roomContext.currRoom.mesh = (RoomMesh*)Lib_PtrSegToVirt((void*)entry->base.unk4);
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand0B.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand0B.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand0C.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand0C.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand0D.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand0D.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand0E.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand0E.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/func_8012FEBC.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/func_8012FEBC.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand0F.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand0F.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/func_8012FF10.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/func_8012FF10.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand11.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand11.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand12.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand12.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand10.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand10.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand05.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand05.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand13.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand13.asm")
 
 // Scene Command 0x09: Undefined
 void Scene_HeaderCommand09(GlobalContext* ctxt, SceneCmd* entry) {
 
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand15.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand15.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand16.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand16.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand18.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand18.asm")
 
 // Scene Command 0x17: Cutscene Data
 void Scene_HeaderCommand17(GlobalContext* ctxt, SceneCmd* entry) {
@@ -181,27 +181,27 @@ void Scene_HeaderCommand17(GlobalContext* ctxt, SceneCmd* entry) {
     ctxt->cutsceneList = (CutsceneEntry*)Lib_PtrSegToVirt((void*)entry->base.unk4);
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand1B.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand1B.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand1C.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand1C.asm")
 
 // Scene Command 0x1D: Undefined
 void Scene_HeaderCommand1D(GlobalContext* ctxt, SceneCmd* entry) {
 
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand1E.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand1E.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand19.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand19.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_HeaderCommand1A.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_HeaderCommand1A.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/func_801306A4.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/func_801306A4.asm")
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/Scene_ProcessHeader.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene/Scene_ProcessHeader.asm")
 
 u32 Scene_CreateEntrance(u32 sceneIndex, u32 spawnIndex, u32 offset) {
     return (((sceneIndex << 9) | (spawnIndex << 4)) | offset) & 0xFFFF;
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene/func_80130784.asm")
\ No newline at end of file
+GLOBAL_ASM("./asm/non_matchings/z_scene/func_80130784.asm")
\ No newline at end of file
diff --git a/src/code/z_scene_proc.c b/src/code/z_scene_proc.c
index 1d0730c61f..9b0f98ddba 100644
--- a/src/code/z_scene_proc.c
+++ b/src/code/z_scene_proc.c
@@ -64,7 +64,7 @@ void SceneProc_DrawType1Texture(GlobalContext* ctxt, u32 segment, ScrollingTextu
     }
 }
 
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 // Slight ordering differences at the beginning
 void SceneProc_DrawFlashingTexture(GlobalContext* ctxt, u32 segment, FlashingTexturePrimColor* primColor, RGBA8* envColor) {
     GraphicsContext* gCtxt;
@@ -104,7 +104,7 @@ void SceneProc_DrawFlashingTexture(GlobalContext* ctxt, u32 segment, FlashingTex
     gSPEndDisplayList(dl++);
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
 #endif
 
 void SceneProc_DrawType2Texture(GlobalContext* ctxt, u32 segment, FlashingTextureParams* params) {
@@ -128,7 +128,7 @@ s32 SceneProc_Lerp(s32 a, s32 b, f32 t) {
     return (s32)((b - a) * t) + a;
 }
 
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 // Slight ordering and regalloc differences around t = ...
 void SceneProc_DrawType3Texture(GlobalContext* ctxt, u32 segment, FlashingTextureParams* params) {
     FlashingTextureParams* params2 = params;
@@ -188,10 +188,10 @@ void SceneProc_DrawType3Texture(GlobalContext* ctxt, u32 segment, FlashingTextur
     SceneProc_DrawFlashingTexture(ctxt, segment, &primColorIn, envColorPtrIn);
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/z_scene_proc/SceneProc_DrawType3Texture.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType3Texture.asm")
 #endif
 
-GLOBAL_ASM("./asm/nonmatching/z_scene_proc/SceneProc_Interpolate.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_Interpolate.asm")
 
 u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f32 frame) {
     s32 ret = SceneProc_Interpolate(numKeyFrames, keyFrames, values, frame);
@@ -201,7 +201,7 @@ u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f
                          ret;
 }
 
-GLOBAL_ASM("./asm/nonmatching/z_scene_proc/SceneProc_DrawType4Texture.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType4Texture.asm")
 
 void SceneProc_DrawType5Texture(GlobalContext* ctxt, u32 segment, CyclingTextureParams* params) {
     u8* offsets;
@@ -296,7 +296,7 @@ void SceneProc_DrawSceneConfig1(GlobalContext* ctxt) {
   SceneProc_DrawAllSceneAnimatedTextures(ctxt, ctxt->sceneTextureAnimations);
 }
 
-#ifdef NONMATCHING
+#ifdef NON_MATCHING
 // This function still needs a lot of work
 void SceneProc_DrawSceneConfig3(GlobalContext* ctxt) {
     GraphicsContext* gCtxt = ctxt->common.gCtxt;
@@ -332,7 +332,7 @@ void SceneProc_DrawSceneConfig3(GlobalContext* ctxt) {
     gDPSetEnvColor(gCtxt->polyOpa.append++, 0x80, 0x80, 0x80, 0x80);
 }
 #else
-GLOBAL_ASM("./asm/nonmatching/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
+GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
 #endif
 
 void SceneProc_DrawSceneConfig4(GlobalContext* ctxt) {
diff --git a/tools/rename_sym.sh b/tools/rename_sym.sh
index f5be5b1656..9781ae3b72 100644
--- a/tools/rename_sym.sh
+++ b/tools/rename_sym.sh
@@ -10,4 +10,4 @@ fi
 
 #echo "Replace $1 with $2?"
 #read
-grep -rl "$1" asm/**/*.asm src/**/*.{c,h} include/**/*.h tables/*.py undef.txt | xargs sed -i "s/\b$1\b/$2/g"
\ No newline at end of file
+grep -rl "$1" asm/**/*.asm src/**/*.{c,h} include/**/*.h tables/*.txt undef.txt | xargs sed -i "s/\b$1\b/$2/g"
\ No newline at end of file