diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc
index 8c8ebcc34..1f236c5e2 100644
--- a/ld/gamefiles.ntsc-beta.inc
+++ b/ld/gamefiles.ntsc-beta.inc
@@ -29,8 +29,8 @@
 	build/ROMID/game/game_0108d0.o (section); \
 	build/ROMID/game/objectives/setup.o (section); \
 	build/ROMID/game/casing/reset.o (section); \
-	build/ROMID/game/game_010b20.o (section); \
-	build/ROMID/game/game_011110.o (section); \
+	build/ROMID/game/bondguninit.o (section); \
+	build/ROMID/game/playerinit.o (section); \
 	build/ROMID/game/inventory/init.o (section); \
 	build/ROMID/game/game_0125a0.o (section); \
 	build/ROMID/game/game_012aa0.o (section); \
diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc
index fddb57ab4..e9f7cc28a 100644
--- a/ld/gamefiles.ntsc-final.inc
+++ b/ld/gamefiles.ntsc-final.inc
@@ -29,8 +29,8 @@
 	build/ROMID/game/game_0108d0.o (section); \
 	build/ROMID/game/objectives/setup.o (section); \
 	build/ROMID/game/casing/reset.o (section); \
-	build/ROMID/game/game_010b20.o (section); \
-	build/ROMID/game/game_011110.o (section); \
+	build/ROMID/game/bondguninit.o (section); \
+	build/ROMID/game/playerinit.o (section); \
 	build/ROMID/game/inventory/init.o (section); \
 	build/ROMID/game/game_0125a0.o (section); \
 	build/ROMID/game/game_012aa0.o (section); \
diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc
index fddb57ab4..e9f7cc28a 100644
--- a/ld/gamefiles.pal-final.inc
+++ b/ld/gamefiles.pal-final.inc
@@ -29,8 +29,8 @@
 	build/ROMID/game/game_0108d0.o (section); \
 	build/ROMID/game/objectives/setup.o (section); \
 	build/ROMID/game/casing/reset.o (section); \
-	build/ROMID/game/game_010b20.o (section); \
-	build/ROMID/game/game_011110.o (section); \
+	build/ROMID/game/bondguninit.o (section); \
+	build/ROMID/game/playerinit.o (section); \
 	build/ROMID/game/inventory/init.o (section); \
 	build/ROMID/game/game_0125a0.o (section); \
 	build/ROMID/game/game_012aa0.o (section); \
diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index f7bbfaad7..2ee8d779e 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -8499,7 +8499,7 @@ void bgun0f09ce8c(void)
 	bgun0f0a1528();
 }
 
-void bgun0f09ceac(void)
+void bgunInitHandAnims(void)
 {
 	struct hand *hand;
 	s32 i;
@@ -8511,7 +8511,7 @@ void bgun0f09ceac(void)
 			hand = &g_Vars.currentplayer->hands[0];
 		}
 
-		hand->ganstarot = 0;
+		hand->gangstarot = 0;
 		hand->state = HANDSTATE_IDLE;
 		hand->animload = -1;
 		hand->animmode = HANDANIMMODE_IDLE;
@@ -15379,7 +15379,7 @@ void bgun0f0a1528(void)
 				player->hands[i].gset.weaponnum = ctrl->weaponnum;
 
 				player->hands[i].gset.unk0639 = (ctrl->upgradewant >> (i * 4)) & 0xf;
-				player->hands[i].ganstarot = 0.0f;
+				player->hands[i].gangstarot = 0.0f;
 
 				bgun0f0abd30(i);
 
diff --git a/src/game/game_010b20.c b/src/game/bondguninit.c
similarity index 99%
rename from src/game/game_010b20.c
rename to src/game/bondguninit.c
index 567982840..eb020b992 100644
--- a/src/game/game_010b20.c
+++ b/src/game/bondguninit.c
@@ -10,7 +10,7 @@
 
 extern u32 var800700ac;
 
-void func0f010bb0(void)
+void bgunInit(void)
 {
 	s32 i;
 
@@ -262,5 +262,5 @@ void func0f010bb0(void)
 		g_Weapons[WEAPON_EYESPY]->flags |= (WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN);
 	}
 
-	bgun0f09ceac();
+	bgunInitHandAnims();
 }
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index a0dba9a38..d37a95f1d 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -8,7 +8,7 @@
 #include "game/chr/chraicommands.h"
 #include "game/debug.h"
 #include "game/dlights.h"
-#include "game/game_011110.h"
+#include "game/playerinit.h"
 #include "game/title.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c
index 586c3eabb..6e25cbf0f 100644
--- a/src/game/game_00b820.c
+++ b/src/game/game_00b820.c
@@ -3,7 +3,7 @@
 #include "game/cheats.h"
 #include "game/chr/chrai.h"
 #include "game/game_00b820.h"
-#include "game/game_011110.h"
+#include "game/playerinit.h"
 #include "game/game_02cde0.h"
 #include "game/game_091e10.h"
 #include "bss.h"
diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c
index 32cecd88e..f94a43cc9 100644
--- a/src/game/game_00c490.c
+++ b/src/game/game_00c490.c
@@ -5,7 +5,7 @@
 #include "game/game_00b820.h"
 #include "game/game_00c490.h"
 #include "game/objectives.h"
-#include "game/game_011110.h"
+#include "game/playerinit.h"
 #include "game/inventory/init.h"
 #include "game/game_0125a0.h"
 #include "game/game_012d50.h"
diff --git a/src/game/lv.c b/src/game/lv.c
index 70990e6a0..0b11b2a26 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -18,7 +18,7 @@
 #include "game/game_0108d0.h"
 #include "game/objectives.h"
 #include "game/casing.h"
-#include "game/game_011110.h"
+#include "game/playerinit.h"
 #include "game/inventory/init.h"
 #include "game/game_0125a0.h"
 #include "game/explosions/init.h"
@@ -434,7 +434,7 @@ void lvInit(s32 stagenum)
 			menuInit();
 			amInit();
 			invInitGunsHeld();
-			func0f010bb0();
+			bgunInit();
 			playerLoadDefaults();
 			playerInit();
 			playerSpawn();
diff --git a/src/game/game_011110.c b/src/game/playerinit.c
similarity index 99%
rename from src/game/game_011110.c
rename to src/game/playerinit.c
index a5320022d..8721329d5 100644
--- a/src/game/game_011110.c
+++ b/src/game/playerinit.c
@@ -4,7 +4,7 @@
 #include "game/bondmove.h"
 #include "game/cheats.h"
 #include "game/inventory/items.h"
-#include "game/game_011110.h"
+#include "game/playerinit.h"
 #include "game/chr/chr.h"
 #include "game/game_02cde0.h"
 #include "game/prop.h"
diff --git a/src/game/propobj.c b/src/game/propobj.c
index 303b42a0d..8d0acfffa 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -8,7 +8,7 @@
 #include "game/debug.h"
 #include "game/dlights.h"
 #include "game/nbomb.h"
-#include "game/game_011110.h"
+#include "game/playerinit.h"
 #include "game/chr/chr.h"
 #include "game/prop.h"
 #include "game/game_091e10.h"
diff --git a/src/include/game/bondgun.h b/src/include/game/bondgun.h
index 451a746e6..716424c8b 100644
--- a/src/include/game/bondgun.h
+++ b/src/include/game/bondgun.h
@@ -50,7 +50,7 @@ s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate);
 bool bgunSetState(s32 handnum, s32 state);
 void bgunTick(s32 handnum);
 void bgun0f09ce8c(void);
-void bgun0f09ceac(void);
+void bgunInitHandAnims(void);
 f32 bgunGetNoiseRadius(s32 handnum);
 void bgunDecreaseNoiseRadius(void);
 void bgunCalculateBlend(s32 hand);
diff --git a/src/include/game/bondguninit.h b/src/include/game/bondguninit.h
new file mode 100644
index 000000000..3f9010cc3
--- /dev/null
+++ b/src/include/game/bondguninit.h
@@ -0,0 +1,9 @@
+#ifndef _IN_GAME_BONDGUNINIT_H
+#define _IN_GAME_BONDGUNINIT_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void bgunInit(void);
+
+#endif
diff --git a/src/include/game/game_010b20.h b/src/include/game/game_010b20.h
deleted file mode 100644
index cd2ef7a76..000000000
--- a/src/include/game/game_010b20.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_GAME_010B20_H
-#define _IN_GAME_GAME_010B20_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void func0f010bb0(void);
-
-#endif
diff --git a/src/include/game/game_011110.h b/src/include/game/playerinit.h
similarity index 81%
rename from src/include/game/game_011110.h
rename to src/include/game/playerinit.h
index 08f3b9fcc..a8cd182f2 100644
--- a/src/include/game/game_011110.h
+++ b/src/include/game/playerinit.h
@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_011110_H
-#define IN_GAME_GAME_011110_H
+#ifndef IN_GAME_PLAYERINIT_H
+#define IN_GAME_PLAYERINIT_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
diff --git a/src/include/types.h b/src/include/types.h
index 0242629ff..dbf31831f 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -2401,7 +2401,7 @@ struct hand {
 	/*0x0cec*/ ubool unk0cec;
 	/*0x0cf0*/ struct coord unk0cf0;
 	/*0x0cfc*/ struct coord unk0cfc;
-	/*0x0d08*/ f32 ganstarot;
+	/*0x0d08*/ f32 gangstarot;
 	/*0x0d0c*/ s16 primetimer;
 	/*0x0d0e*/ u8 unk0d0e_00 : 4;
 	/*0x0d0e*/ u8 unk0d0e_04 : 3;