diff --git a/src/boot/boot.c b/src/boot/boot.c
index ffcf55235..b894aabac 100644
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -661,16 +661,16 @@ glabel func000016cc
 /*     1820:	ac80fffc */ 	sw	$zero,-0x4($a0)
 /*     1824:	1462fffc */ 	bne	$v1,$v0,.L00001818
 /*     1828:	ac60fffc */ 	sw	$zero,-0x4($v1)
-/*     182c:	0c0016d8 */ 	jal	func00005b60
+/*     182c:	0c0016d8 */ 	jal	osInitialize
 /*     1830:	00000000 */ 	sll	$zero,$zero,0x0
 /*     1834:	0c012048 */ 	jal	func00048120
 /*     1838:	00000000 */ 	sll	$zero,$zero,0x0
 /*     183c:	3c048000 */ 	lui	$a0,0x8000
-/*     1840:	0c012054 */ 	jal	func00048150
+/*     1840:	0c012054 */ 	jal	osInvalICache
 /*     1844:	24054000 */ 	addiu	$a1,$zero,0x4000
 /*     1848:	0c012074 */ 	jal	func000481d0
 /*     184c:	00000000 */ 	sll	$zero,$zero,0x0
-/*     1850:	0c012078 */ 	jal	func000481e0
+/*     1850:	0c012078 */ 	jal	__osSetFpcCsr
 /*     1854:	34440e80 */ 	ori	$a0,$v0,0xe80
 /*     1858:	24040003 */ 	addiu	$a0,$zero,0x3
 /*     185c:	0c00062b */ 	jal	func000018ac
@@ -2284,7 +2284,7 @@ glabel func00002f70
 );
 
 GLOBAL_ASM(
-glabel func00002ff0
+glabel osMapTLBRdb
 /*     2ff0:	40085000 */ 	mfc0	$t0,$10
 /*     2ff4:	24090001 */ 	addiu	$t1,$zero,0x1
 /*     2ff8:	40890000 */ 	mtc0	$t1,$0
diff --git a/src/include/boot/boot.h b/src/include/boot/boot.h
index 056c1355f..9db85d0e8 100644
--- a/src/include/boot/boot.h
+++ b/src/include/boot/boot.h
@@ -14,6 +14,6 @@ s32 func00002078(void);
 s32 func00002148(void);
 s32 func00002148(void);
 s32 func000022e0(void);
-s32 func00002ff0(void);
+void osMapTLBRdb(void);
 
 #endif
diff --git a/src/include/lib/lib_04a80.h b/src/include/lib/lib_04a80.h
index fdad08a33..7a2db6be8 100644
--- a/src/include/lib/lib_04a80.h
+++ b/src/include/lib/lib_04a80.h
@@ -15,7 +15,7 @@ u32 func00005a60(void);
 u32 func00005a7c(void);
 u32 func00005b18(void);
 u32 func00005b30(void);
-u32 func00005b60(void);
+void osInitialize(void);
 u32 func00005dc0(void);
 
 #endif
diff --git a/src/include/lib/lib_48150.h b/src/include/lib/lib_48150.h
index fe39bab1c..ccc60e9ea 100644
--- a/src/include/lib/lib_48150.h
+++ b/src/include/lib/lib_48150.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func00048150(void);
+void osInvalICache(void *vaddr, s32 nbytes);
 
 #endif
diff --git a/src/include/lib/lib_481e0.h b/src/include/lib/lib_481e0.h
index fa6a6bc37..02b2d6f83 100644
--- a/src/include/lib/lib_481e0.h
+++ b/src/include/lib/lib_481e0.h
@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-void func000481e0(void);
+void __osSetFpcCsr(void);
 void osStartThread(OSThread *thread);
 void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msgBuf, s32 count);
 void osStopThread(OSThread *thread);
diff --git a/src/include/lib/lib_4acc0.h b/src/include/lib/lib_4acc0.h
index bfb1a7ede..053ef64b9 100644
--- a/src/include/lib/lib_4acc0.h
+++ b/src/include/lib/lib_4acc0.h
@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0004acc0(void);
-u32 func0004acd0(void);
+u32 __osSetSR(void);
+u32 __osGetSR(void);
 
 #endif
diff --git a/src/include/lib/lib_4ace0.h b/src/include/lib/lib_4ace0.h
index c44e6313b..df2dd01cd 100644
--- a/src/include/lib/lib_4ace0.h
+++ b/src/include/lib/lib_4ace0.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0004ace0(void);
+u32 __osSiRawReadIo(void);
 
 #endif
diff --git a/src/include/lib/lib_4ad30.h b/src/include/lib/lib_4ad30.h
index f2355ba5d..8c2a267c6 100644
--- a/src/include/lib/lib_4ad30.h
+++ b/src/include/lib/lib_4ad30.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0004ad30(void);
+u32 __osSiRawWriteIo(void);
 
 #endif
diff --git a/src/include/lib/lib_4b160.h b/src/include/lib/lib_4b160.h
index e289540b2..243725833 100644
--- a/src/include/lib/lib_4b160.h
+++ b/src/include/lib/lib_4b160.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func0004b160(void);
+u32 __osGetCause(void);
 
 #endif
diff --git a/src/include/lib/lib_51c60.h b/src/include/lib/lib_51c60.h
index 018f93d50..9a0506642 100644
--- a/src/include/lib/lib_51c60.h
+++ b/src/include/lib/lib_51c60.h
@@ -3,7 +3,7 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func00051c60(void);
+u32 __osSiDeviceBusy(void);
 u32 __osProbeTLB(void);
 
 #endif
diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c
index 3ceb0c08d..00c332749 100644
--- a/src/lib/lib_04a80.c
+++ b/src/lib/lib_04a80.c
@@ -1290,31 +1290,31 @@ glabel func00005b30
 );
 
 GLOBAL_ASM(
-glabel func00005b60
+glabel osInitialize
 /*     5b60:	27bdffc8 */ 	addiu	$sp,$sp,-56
 /*     5b64:	afbf001c */ 	sw	$ra,0x1c($sp)
 /*     5b68:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*     5b6c:	3c018009 */ 	lui	$at,%hi(var80090a60)
 /*     5b70:	afb10018 */ 	sw	$s1,0x18($sp)
 /*     5b74:	afb00014 */ 	sw	$s0,0x14($sp)
-/*     5b78:	0c012b34 */ 	jal	func0004acd0
+/*     5b78:	0c012b34 */ 	jal	__osGetSR
 /*     5b7c:	ac2e0a60 */ 	sw	$t6,%lo(var80090a60)($at)
 /*     5b80:	3c012000 */ 	lui	$at,0x2000
-/*     5b84:	0c012b30 */ 	jal	func0004acc0
+/*     5b84:	0c012b30 */ 	jal	__osSetSR
 /*     5b88:	00412025 */ 	or	$a0,$v0,$at
 /*     5b8c:	3c040100 */ 	lui	$a0,0x100
-/*     5b90:	0c012078 */ 	jal	func000481e0
+/*     5b90:	0c012078 */ 	jal	__osSetFpcCsr
 /*     5b94:	34840800 */ 	ori	$a0,$a0,0x800
 /*     5b98:	3c101fc0 */ 	lui	$s0,0x1fc0
 /*     5b9c:	361007fc */ 	ori	$s0,$s0,0x7fc
 /*     5ba0:	27b10034 */ 	addiu	$s1,$sp,0x34
 /*     5ba4:	02202825 */ 	or	$a1,$s1,$zero
-/*     5ba8:	0c012b38 */ 	jal	func0004ace0
+/*     5ba8:	0c012b38 */ 	jal	__osSiRawReadIo
 /*     5bac:	02002025 */ 	or	$a0,$s0,$zero
 /*     5bb0:	10400005 */ 	beqz	$v0,.L00005bc8
 /*     5bb4:	02002025 */ 	or	$a0,$s0,$zero
 .L00005bb8:
-/*     5bb8:	0c012b38 */ 	jal	func0004ace0
+/*     5bb8:	0c012b38 */ 	jal	__osSiRawReadIo
 /*     5bbc:	02202825 */ 	or	$a1,$s1,$zero
 /*     5bc0:	5440fffd */ 	bnezl	$v0,.L00005bb8
 /*     5bc4:	02002025 */ 	or	$a0,$s0,$zero
@@ -1322,7 +1322,7 @@ glabel func00005b60
 /*     5bc8:	8fa50034 */ 	lw	$a1,0x34($sp)
 /*     5bcc:	02002025 */ 	or	$a0,$s0,$zero
 /*     5bd0:	34af0008 */ 	ori	$t7,$a1,0x8
-/*     5bd4:	0c012b4c */ 	jal	func0004ad30
+/*     5bd4:	0c012b4c */ 	jal	__osSiRawWriteIo
 /*     5bd8:	01e02825 */ 	or	$a1,$t7,$zero
 /*     5bdc:	10400008 */ 	beqz	$v0,.L00005c00
 /*     5be0:	00000000 */ 	sll	$zero,$zero,0x0
@@ -1330,7 +1330,7 @@ glabel func00005b60
 .L00005be8:
 /*     5be8:	02002025 */ 	or	$a0,$s0,$zero
 /*     5bec:	34b80008 */ 	ori	$t8,$a1,0x8
-/*     5bf0:	0c012b4c */ 	jal	func0004ad30
+/*     5bf0:	0c012b4c */ 	jal	__osSiRawWriteIo
 /*     5bf4:	03002825 */ 	or	$a1,$t8,$zero
 /*     5bf8:	5440fffb */ 	bnezl	$v0,.L00005be8
 /*     5bfc:	8fa50034 */ 	lw	$a1,0x34($sp)
@@ -1380,11 +1380,11 @@ glabel func00005b60
 /*     5ca8:	0c012b60 */ 	jal	osWritebackDCache
 /*     5cac:	adf9000c */ 	sw	$t9,0xc($t7)
 /*     5cb0:	02002025 */ 	or	$a0,$s0,$zero
-/*     5cb4:	0c012054 */ 	jal	func00048150
+/*     5cb4:	0c012054 */ 	jal	osInvalICache
 /*     5cb8:	24050190 */ 	addiu	$a1,$zero,0x190
 /*     5cbc:	0c001770 */ 	jal	func00005dc0
 /*     5cc0:	00000000 */ 	sll	$zero,$zero,0x0
-/*     5cc4:	0c000bfc */ 	jal	func00002ff0
+/*     5cc4:	0c000bfc */ 	jal	osMapTLBRdb
 /*     5cc8:	00000000 */ 	sll	$zero,$zero,0x0
 /*     5ccc:	3c108006 */ 	lui	$s0,%hi(var8005cf60)
 /*     5cd0:	2610cf60 */ 	addiu	$s0,$s0,%lo(var8005cf60)
@@ -1431,7 +1431,7 @@ glabel func00005b60
 /*     5d68:	3c018006 */ 	lui	$at,0x8006
 /*     5d6c:	ac2bcf68 */ 	sw	$t3,-0x3098($at)
 .L00005d70:
-/*     5d70:	0c012c58 */ 	jal	func0004b160
+/*     5d70:	0c012c58 */ 	jal	__osGetCause
 /*     5d74:	00000000 */ 	sll	$zero,$zero,0x0
 /*     5d78:	304d1000 */ 	andi	$t5,$v0,0x1000
 /*     5d7c:	11a00003 */ 	beqz	$t5,.L00005d8c
diff --git a/src/lib/lib_070d0.c b/src/lib/lib_070d0.c
index 3cbe59ab0..2f3ec5952 100644
--- a/src/lib/lib_070d0.c
+++ b/src/lib/lib_070d0.c
@@ -280,7 +280,7 @@ glabel func000070d0
 /*     74a4:	3c018009 */ 	lui	$at,%hi(var80090afc)
 /*     74a8:	ac200afc */ 	sw	$zero,%lo(var80090afc)($at)
 /*     74ac:	00002025 */ 	or	$a0,$zero,$zero
-/*     74b0:	0c012054 */ 	jal	func00048150
+/*     74b0:	0c012054 */ 	jal	osInvalICache
 /*     74b4:	24054000 */ 	addiu	$a1,$zero,0x4000
 /*     74b8:	8fbf003c */ 	lw	$ra,0x3c($sp)
 /*     74bc:	8fb0001c */ 	lw	$s0,0x1c($sp)
diff --git a/src/lib/lib_48150.c b/src/lib/lib_48150.c
index f27f422f1..dbf0c12b5 100644
--- a/src/lib/lib_48150.c
+++ b/src/lib/lib_48150.c
@@ -10,7 +10,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func00048150
+glabel osInvalICache
 /*    48150:	18a00011 */ 	blez	$a1,.L00048198
 /*    48154:	00000000 */ 	sll	$zero,$zero,0x0
 /*    48158:	240b4000 */ 	addiu	$t3,$zero,0x4000
diff --git a/src/lib/lib_481e0.c b/src/lib/lib_481e0.c
index d4a491321..b47f4858d 100644
--- a/src/lib/lib_481e0.c
+++ b/src/lib/lib_481e0.c
@@ -13,7 +13,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func000481e0
+glabel __osSetFpcCsr
 /*    481e0:	4442f800 */ 	cfc1	$v0,$31
 /*    481e4:	44c4f800 */ 	ctc1	$a0,$31
 /*    481e8:	03e00008 */ 	jr	$ra
diff --git a/src/lib/lib_4acc0.c b/src/lib/lib_4acc0.c
index 5a6a318cd..237b6339e 100644
--- a/src/lib/lib_4acc0.c
+++ b/src/lib/lib_4acc0.c
@@ -10,7 +10,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func0004acc0
+glabel __osSetSR
 /*    4acc0:	40846000 */ 	mtc0	$a0,$12
 /*    4acc4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    4acc8:	03e00008 */ 	jr	$ra
@@ -18,7 +18,7 @@ glabel func0004acc0
 );
 
 GLOBAL_ASM(
-glabel func0004acd0
+glabel __osGetSR
 /*    4acd0:	40026000 */ 	mfc0	$v0,$12
 /*    4acd4:	03e00008 */ 	jr	$ra
 /*    4acd8:	00000000 */ 	sll	$zero,$zero,0x0
diff --git a/src/lib/lib_4ace0.c b/src/lib/lib_4ace0.c
index 46a50e033..d4fb81a38 100644
--- a/src/lib/lib_4ace0.c
+++ b/src/lib/lib_4ace0.c
@@ -11,11 +11,11 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func0004ace0
+glabel __osSiRawReadIo
 /*    4ace0:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*    4ace4:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    4ace8:	afa40018 */ 	sw	$a0,0x18($sp)
-/*    4acec:	0c014718 */ 	jal	func00051c60
+/*    4acec:	0c014718 */ 	jal	__osSiDeviceBusy
 /*    4acf0:	afa5001c */ 	sw	$a1,0x1c($sp)
 /*    4acf4:	10400003 */ 	beqz	$v0,.L0004ad04
 /*    4acf8:	8fae0018 */ 	lw	$t6,0x18($sp)
diff --git a/src/lib/lib_4ad30.c b/src/lib/lib_4ad30.c
index fb2d0e6c9..c596ea8dd 100644
--- a/src/lib/lib_4ad30.c
+++ b/src/lib/lib_4ad30.c
@@ -11,11 +11,11 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func0004ad30
+glabel __osSiRawWriteIo
 /*    4ad30:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*    4ad34:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    4ad38:	afa40018 */ 	sw	$a0,0x18($sp)
-/*    4ad3c:	0c014718 */ 	jal	func00051c60
+/*    4ad3c:	0c014718 */ 	jal	__osSiDeviceBusy
 /*    4ad40:	afa5001c */ 	sw	$a1,0x1c($sp)
 /*    4ad44:	10400003 */ 	beqz	$v0,.L0004ad54
 /*    4ad48:	8fae001c */ 	lw	$t6,0x1c($sp)
diff --git a/src/lib/lib_4b160.c b/src/lib/lib_4b160.c
index a5cb3cf3e..339f4d69b 100644
--- a/src/lib/lib_4b160.c
+++ b/src/lib/lib_4b160.c
@@ -10,7 +10,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func0004b160
+glabel __osGetCause
 /*    4b160:	40026800 */ 	mfc0	$v0,$13
 /*    4b164:	03e00008 */ 	jr	$ra
 /*    4b168:	00000000 */ 	sll	$zero,$zero,0x0
diff --git a/src/lib/lib_51c60.c b/src/lib/lib_51c60.c
index 670d205f7..8b37f230a 100644
--- a/src/lib/lib_51c60.c
+++ b/src/lib/lib_51c60.c
@@ -10,7 +10,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func00051c60
+glabel __osSiDeviceBusy
 /*    51c60:	3c0ea480 */ 	lui	$t6,0xa480
 /*    51c64:	8dc40018 */ 	lw	$a0,0x18($t6)
 /*    51c68:	27bdfff8 */ 	addiu	$sp,$sp,-8