diff --git a/config/eur/arm9/overlays/ov032/delinks.txt b/config/eur/arm9/overlays/ov032/delinks.txt
index 9f0e3a1f..0887bd2a 100644
--- a/config/eur/arm9/overlays/ov032/delinks.txt
+++ b/config/eur/arm9/overlays/ov032/delinks.txt
@@ -5,7 +5,7 @@
     .data       start:0x02122160 end:0x02122818 kind:data align:32
     .bss        start:0x02122820 end:0x02122bc0 kind:bss align:32
 
-src/032_MapA1/Actor/ActorUnkKURI.cpp:
+src/032_MapA1/Actor/ActorSpinut.cpp:
     .text       start:0x02118fc0 end:0x0211b6cc
     .init       start:0x02121f34 end:0x02121fa0
     .ctor       start:0x0212212c end:0x02122130
diff --git a/config/eur/arm9/overlays/ov032/symbols.txt b/config/eur/arm9/overlays/ov032/symbols.txt
index d0aacdba..cc23fc69 100644
--- a/config/eur/arm9/overlays/ov032/symbols.txt
+++ b/config/eur/arm9/overlays/ov032/symbols.txt
@@ -1,63 +1,63 @@
-_ZN19ActorProfileUnkKURI10GetProfileEv kind:function(arm,size=0xc) addr:0x02118fc0
-_ZN19ActorProfileUnkKURI6CreateEv kind:function(arm,size=0x24) addr:0x02118fcc
-_ZN19ActorProfileUnkKURIC1Ev kind:function(arm,size=0x5c) addr:0x02118ff0
-_ZN12ActorUnkKURIC1Ev kind:function(arm,size=0x1fc) addr:0x0211904c
-_ZN16ActorUnkKURI_110D1Ev kind:function(arm,size=0x14) addr:0x02119248
-_ZN16ActorUnkKURI_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211925c
-_ZN12ActorUnkKURID1Ev kind:function(arm,size=0x8c) addr:0x02119270
-_ZN12ActorUnkKURID0Ev kind:function(arm,size=0x94) addr:0x021192fc
-_ZN12ActorUnkKURI8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x02119390
-_ZN12ActorUnkKURI8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119458
-_ZN12ActorUnkKURI19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x021194dc
-_ZN12ActorUnkKURI8SetStateEs kind:function(arm,size=0x48) addr:0x0211953c
-_ZN12ActorUnkKURI8vfunc_20Ev kind:function(arm,size=0x358) addr:0x02119584
-_ZN12ActorUnkKURI8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x021198dc
-_ZN12ActorUnkKURI19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119990
-_ZN12ActorUnkKURI19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x02119a0c
-_ZN12ActorUnkKURI19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119be8
-_ZN12ActorUnkKURI19func_ov032_02119c80Ev kind:function(arm,size=0xfc) addr:0x02119c80
-_ZN12ActorUnkKURI19func_ov032_02119d7cEv kind:function(arm,size=0x78) addr:0x02119d7c
-_ZN12ActorUnkKURI19func_ov032_02119df4Ev kind:function(arm,size=0x9c) addr:0x02119df4
-_ZN12ActorUnkKURI19func_ov032_02119e90Ev kind:function(arm,size=0xb0) addr:0x02119e90
-_ZN12ActorUnkKURI19func_ov032_02119f40Ev kind:function(arm,size=0x200) addr:0x02119f40
-_ZN12ActorUnkKURI19func_ov032_0211a140Ev kind:function(arm,size=0xcc) addr:0x0211a140
-_ZN12ActorUnkKURI19func_ov032_0211a20cEv kind:function(arm,size=0x278) addr:0x0211a20c
-_ZN12ActorUnkKURI19func_ov032_0211a484Ev kind:function(arm,size=0xa8) addr:0x0211a484
-_ZN12ActorUnkKURI19func_ov032_0211a52cEv kind:function(arm,size=0x28c) addr:0x0211a52c
-_ZN12ActorUnkKURI19func_ov032_0211a7b8Ev kind:function(arm,size=0xb4) addr:0x0211a7b8
-_ZN12ActorUnkKURI19func_ov032_0211a86cEv kind:function(arm,size=0xe4) addr:0x0211a86c
-_ZN12ActorUnkKURI19func_ov032_0211a950Ev kind:function(arm,size=0x78) addr:0x0211a950
-_ZN12ActorUnkKURI19func_ov032_0211a9c8Ev kind:function(arm,size=0x78) addr:0x0211a9c8
-_ZN12ActorUnkKURI19func_ov032_0211aa40Ev kind:function(arm,size=0x88) addr:0x0211aa40
-_ZN12ActorUnkKURI19func_ov032_0211aac8Ev kind:function(arm,size=0x58) addr:0x0211aac8
-_ZN12ActorUnkKURI19func_ov032_0211ab20Ev kind:function(arm,size=0xa0) addr:0x0211ab20
-_ZN12ActorUnkKURI19func_ov032_0211abc0Ev kind:function(arm,size=0x60) addr:0x0211abc0
-_ZN12ActorUnkKURI19func_ov032_0211ac20Ev kind:function(arm,size=0x74) addr:0x0211ac20
-_ZN12ActorUnkKURI19func_ov032_0211ac94Ev kind:function(arm,size=0xac) addr:0x0211ac94
-_ZN12ActorUnkKURI19func_ov032_0211ad40Ev kind:function(arm,size=0xb4) addr:0x0211ad40
-_ZN12ActorUnkKURI19func_ov032_0211adf4Ev kind:function(arm,size=0x230) addr:0x0211adf4
-_ZN12ActorUnkKURI19func_ov032_0211b024Ev kind:function(arm,size=0x40) addr:0x0211b024
-_ZN12ActorUnkKURI19func_ov032_0211b064Ei kind:function(arm,size=0xb0) addr:0x0211b064
-_ZN12ActorUnkKURI19func_ov032_0211b114Ev kind:function(arm,size=0x68) addr:0x0211b114
-_ZN12ActorUnkKURI19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211b17c
-_ZN12ActorUnkKURI19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211b190
-_ZN12ActorUnkKURI19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211b1e0
-_ZN12ActorUnkKURI19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211b298
-_ZN12ActorUnkKURI19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211b37c
-_ZN12ActorUnkKURI19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211b3b0
-_ZN12ActorUnkKURI8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b408
-_ZN16ActorUnkKURI_268C1Ev kind:function(arm,size=0x30) addr:0x0211b570
-_ZN16ActorUnkKURI_268D1Ev kind:function(arm,size=0x14) addr:0x0211b5a0
-_ZN16ActorUnkKURI_268D0Ev kind:function(arm,size=0x1c) addr:0x0211b5b4
-_ZN16ActorUnkKURI_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211b5d0
-_ZN16ActorUnkKURI_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b5f4
-_ZN16ActorUnkKURI_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211b618
-_ZN16ActorUnkKURI_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211b628
-_ZN16ActorUnkKURI_1108vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b630
-_ZN16ActorUnkKURI_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211b654
-_ZN16ActorUnkKURI_110D0Ev kind:function(arm,size=0x1c) addr:0x0211b680
-_ZN16ActorUnkKURI_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211b69c
-_ZN19ActorProfileUnkKURID1Ev kind:function(arm,size=0x14) addr:0x0211b6b8
+_ZN18ActorProfileSpinut10GetProfileEv kind:function(arm,size=0xc) addr:0x02118fc0
+_ZN18ActorProfileSpinut6CreateEv kind:function(arm,size=0x24) addr:0x02118fcc
+_ZN18ActorProfileSpinutC1Ev kind:function(arm,size=0x5c) addr:0x02118ff0
+_ZN11ActorSpinutC1Ev kind:function(arm,size=0x1fc) addr:0x0211904c
+_ZN15ActorSpinut_110D1Ev kind:function(arm,size=0x14) addr:0x02119248
+_ZN15ActorSpinut_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211925c
+_ZN11ActorSpinutD1Ev kind:function(arm,size=0x8c) addr:0x02119270
+_ZN11ActorSpinutD0Ev kind:function(arm,size=0x94) addr:0x021192fc
+_ZN11ActorSpinut8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x02119390
+_ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x02119458
+_ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x021194dc
+_ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211953c
+_ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x02119584
+_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x021198dc
+_ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x02119990
+_ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x02119a0c
+_ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x02119be8
+_ZN11ActorSpinut19func_ov032_02119c80Ev kind:function(arm,size=0xfc) addr:0x02119c80
+_ZN11ActorSpinut19func_ov032_02119d7cEv kind:function(arm,size=0x78) addr:0x02119d7c
+_ZN11ActorSpinut19func_ov032_02119df4Ev kind:function(arm,size=0x9c) addr:0x02119df4
+_ZN11ActorSpinut19func_ov032_02119e90Ev kind:function(arm,size=0xb0) addr:0x02119e90
+_ZN11ActorSpinut19func_ov032_02119f40Ev kind:function(arm,size=0x200) addr:0x02119f40
+_ZN11ActorSpinut19func_ov032_0211a140Ev kind:function(arm,size=0xcc) addr:0x0211a140
+_ZN11ActorSpinut19func_ov032_0211a20cEv kind:function(arm,size=0x278) addr:0x0211a20c
+_ZN11ActorSpinut19func_ov032_0211a484Ev kind:function(arm,size=0xa8) addr:0x0211a484
+_ZN11ActorSpinut19func_ov032_0211a52cEv kind:function(arm,size=0x28c) addr:0x0211a52c
+_ZN11ActorSpinut19func_ov032_0211a7b8Ev kind:function(arm,size=0xb4) addr:0x0211a7b8
+_ZN11ActorSpinut19func_ov032_0211a86cEv kind:function(arm,size=0xe4) addr:0x0211a86c
+_ZN11ActorSpinut19func_ov032_0211a950Ev kind:function(arm,size=0x78) addr:0x0211a950
+_ZN11ActorSpinut19func_ov032_0211a9c8Ev kind:function(arm,size=0x78) addr:0x0211a9c8
+_ZN11ActorSpinut19func_ov032_0211aa40Ev kind:function(arm,size=0x88) addr:0x0211aa40
+_ZN11ActorSpinut19func_ov032_0211aac8Ev kind:function(arm,size=0x58) addr:0x0211aac8
+_ZN11ActorSpinut19func_ov032_0211ab20Ev kind:function(arm,size=0xa0) addr:0x0211ab20
+_ZN11ActorSpinut19func_ov032_0211abc0Ev kind:function(arm,size=0x60) addr:0x0211abc0
+_ZN11ActorSpinut19func_ov032_0211ac20Ev kind:function(arm,size=0x74) addr:0x0211ac20
+_ZN11ActorSpinut19func_ov032_0211ac94Ev kind:function(arm,size=0xac) addr:0x0211ac94
+_ZN11ActorSpinut19func_ov032_0211ad40Ev kind:function(arm,size=0xb4) addr:0x0211ad40
+_ZN11ActorSpinut19func_ov032_0211adf4Ev kind:function(arm,size=0x230) addr:0x0211adf4
+_ZN11ActorSpinut19func_ov032_0211b024Ev kind:function(arm,size=0x40) addr:0x0211b024
+_ZN11ActorSpinut19func_ov032_0211b064Ei kind:function(arm,size=0xb0) addr:0x0211b064
+_ZN11ActorSpinut19func_ov032_0211b114Ev kind:function(arm,size=0x68) addr:0x0211b114
+_ZN11ActorSpinut19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211b17c
+_ZN11ActorSpinut19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211b190
+_ZN11ActorSpinut19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211b1e0
+_ZN11ActorSpinut19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211b298
+_ZN11ActorSpinut19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211b37c
+_ZN11ActorSpinut19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211b3b0
+_ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211b408
+_ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211b570
+_ZN15ActorSpinut_268D1Ev kind:function(arm,size=0x14) addr:0x0211b5a0
+_ZN15ActorSpinut_268D0Ev kind:function(arm,size=0x1c) addr:0x0211b5b4
+_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211b5d0
+_ZN15ActorSpinut_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b5f4
+_ZN15ActorSpinut_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211b618
+_ZN15ActorSpinut_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211b628
+_ZN15ActorSpinut_1108vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211b630
+_ZN15ActorSpinut_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211b654
+_ZN15ActorSpinut_110D0Ev kind:function(arm,size=0x1c) addr:0x0211b680
+_ZN15ActorSpinut_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211b69c
+_ZN18ActorProfileSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211b6b8
 _ZN19ActorProfileUnkMKUR10GetProfileEv kind:function(arm,size=0xc) addr:0x0211b6cc
 _ZN19ActorProfileUnkMKUR6CreateEv kind:function(arm,size=0x24) addr:0x0211b6d8
 _ZN19ActorProfileUnkMKURC1Ev kind:function(arm,size=0x4c) addr:0x0211b6fc
@@ -222,12 +222,12 @@ data_ov032_02121ef4 kind:data(any) addr:0x02121ef4
 data_ov032_02121f04 kind:data(any) addr:0x02121f04
 data_ov032_02121f14 kind:data(any) addr:0x02121f14
 data_ov032_02121f24 kind:data(any) addr:0x02121f24
-__sinit_ActorUnkKURI.cpp kind:function(arm,size=0x6c) addr:0x02121f34
+__sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02121f34
 __sinit_ActorUnkMKUR.cpp kind:function(arm,size=0x80) addr:0x02121fa0
 __sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02122020
 __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x0212208c
 __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021220dc
-.p__sinit_ActorUnkKURI.cpp kind:data(word) addr:0x0212212c
+.p__sinit_ActorSpinut.cpp kind:data(word) addr:0x0212212c
 .p__sinit_ActorUnkMKUR.cpp kind:data(word) addr:0x02122130
 .p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x02122134
 .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02122138
@@ -236,12 +236,12 @@ data_ov032_02122160 kind:data(any) addr:0x02122160
 data_ov032_0212216c kind:data(any) addr:0x0212216c
 data_ov032_02122184 kind:data(any) addr:0x02122184
 data_ov032_0212219c kind:data(any) addr:0x0212219c
-_ZTV16ActorUnkKURI_268 kind:data(any) addr:0x021221b4
-_ZTV19ActorProfileUnkKURI kind:data(any) addr:0x021221d0
-_ZTV16ActorUnkKURI_1BC kind:data(any) addr:0x021221f4
-_ZTV16ActorUnkKURI_110 kind:data(any) addr:0x0212223c
+_ZTV15ActorSpinut_268 kind:data(any) addr:0x021221b4
+_ZTV18ActorProfileSpinut kind:data(any) addr:0x021221d0
+_ZTV15ActorSpinut_1BC kind:data(any) addr:0x021221f4
+_ZTV15ActorSpinut_110 kind:data(any) addr:0x0212223c
 data_ov032_02122288 kind:data(any) addr:0x02122288
-_ZTV12ActorUnkKURI kind:data(any) addr:0x021222e8
+_ZTV11ActorSpinut kind:data(any) addr:0x021222e8
 data_ov032_02122348 kind:data(any) addr:0x02122348
 data_ov032_021223a8 kind:data(any) addr:0x021223a8
 data_ov032_021223b4 kind:data(any) addr:0x021223b4
@@ -271,9 +271,9 @@ _ZTV28MapObjectProfileUnkSWSW_Base kind:data(any) addr:0x02122760
 _ZTV17MapObject_10_SWSW kind:data(any) addr:0x0212277c
 _ZTV19MapObjectUnkSWSW_40 kind:data(any) addr:0x021227a4
 _ZTV16MapObjectUnkSWSW kind:data(any) addr:0x021227d0
-_ZGVN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02122820
+_ZGVN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02122820
 @11136 kind:bss addr:0x02122824
-_ZN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02122830
+_ZN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02122830
 data_ov032_02122908 kind:bss addr:0x02122908
 data_ov032_0212290c kind:bss addr:0x0212290c
 _ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x02122918
diff --git a/config/jp/arm9/overlays/ov032/delinks.txt b/config/jp/arm9/overlays/ov032/delinks.txt
index 3d6ad75e..0adddb0a 100644
--- a/config/jp/arm9/overlays/ov032/delinks.txt
+++ b/config/jp/arm9/overlays/ov032/delinks.txt
@@ -5,7 +5,7 @@
     .data       start:0x02124120 end:0x021247f4 kind:data align:32
     .bss        start:0x02124800 end:0x02124ba0 kind:bss align:32
 
-src/032_MapA1/Actor/ActorUnkKURI.cpp:
+src/032_MapA1/Actor/ActorSpinut.cpp:
     .text       start:0x0211ad60 end:0x0211d46c
     .init       start:0x02123f0c end:0x02123f78
     .ctor       start:0x02124104 end:0x02124108
diff --git a/config/jp/arm9/overlays/ov032/symbols.txt b/config/jp/arm9/overlays/ov032/symbols.txt
index 6e7d8ee3..4a41182b 100644
--- a/config/jp/arm9/overlays/ov032/symbols.txt
+++ b/config/jp/arm9/overlays/ov032/symbols.txt
@@ -1,63 +1,63 @@
-_ZN19ActorProfileUnkKURI10GetProfileEv kind:function(arm,size=0xc) addr:0x0211ad60
-_ZN19ActorProfileUnkKURI6CreateEv kind:function(arm,size=0x24) addr:0x0211ad6c
-_ZN19ActorProfileUnkKURIC1Ev kind:function(arm,size=0x5c) addr:0x0211ad90
-_ZN12ActorUnkKURIC1Ev kind:function(arm,size=0x1fc) addr:0x0211adec
-_ZN16ActorUnkKURI_110D1Ev kind:function(arm,size=0x14) addr:0x0211afe8
-_ZN16ActorUnkKURI_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211affc
-_ZN12ActorUnkKURID1Ev kind:function(arm,size=0x8c) addr:0x0211b010
-_ZN12ActorUnkKURID0Ev kind:function(arm,size=0x94) addr:0x0211b09c
-_ZN12ActorUnkKURI8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x0211b130
-_ZN12ActorUnkKURI8vfunc_1CEv kind:function(arm,size=0x84) addr:0x0211b1f8
-_ZN12ActorUnkKURI19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x0211b27c
-_ZN12ActorUnkKURI8SetStateEs kind:function(arm,size=0x48) addr:0x0211b2dc
-_ZN12ActorUnkKURI8vfunc_20Ev kind:function(arm,size=0x358) addr:0x0211b324
-_ZN12ActorUnkKURI8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x0211b67c
-_ZN12ActorUnkKURI19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x0211b730
-_ZN12ActorUnkKURI19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x0211b7ac
-_ZN12ActorUnkKURI19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x0211b988
-_ZN12ActorUnkKURI19func_ov032_02119c80Ev kind:function(arm,size=0xfc) addr:0x0211ba20
-_ZN12ActorUnkKURI19func_ov032_02119d7cEv kind:function(arm,size=0x78) addr:0x0211bb1c
-_ZN12ActorUnkKURI19func_ov032_02119df4Ev kind:function(arm,size=0x9c) addr:0x0211bb94
-_ZN12ActorUnkKURI19func_ov032_02119e90Ev kind:function(arm,size=0xb0) addr:0x0211bc30
-_ZN12ActorUnkKURI19func_ov032_02119f40Ev kind:function(arm,size=0x200) addr:0x0211bce0
-_ZN12ActorUnkKURI19func_ov032_0211a140Ev kind:function(arm,size=0xcc) addr:0x0211bee0
-_ZN12ActorUnkKURI19func_ov032_0211a20cEv kind:function(arm,size=0x278) addr:0x0211bfac
-_ZN12ActorUnkKURI19func_ov032_0211a484Ev kind:function(arm,size=0xa8) addr:0x0211c224
-_ZN12ActorUnkKURI19func_ov032_0211a52cEv kind:function(arm,size=0x28c) addr:0x0211c2cc
-_ZN12ActorUnkKURI19func_ov032_0211a7b8Ev kind:function(arm,size=0xb4) addr:0x0211c558
-_ZN12ActorUnkKURI19func_ov032_0211a86cEv kind:function(arm,size=0xe4) addr:0x0211c60c
-_ZN12ActorUnkKURI19func_ov032_0211a950Ev kind:function(arm,size=0x78) addr:0x0211c6f0
-_ZN12ActorUnkKURI19func_ov032_0211a9c8Ev kind:function(arm,size=0x78) addr:0x0211c768
-_ZN12ActorUnkKURI19func_ov032_0211aa40Ev kind:function(arm,size=0x88) addr:0x0211c7e0
-_ZN12ActorUnkKURI19func_ov032_0211aac8Ev kind:function(arm,size=0x58) addr:0x0211c868
-_ZN12ActorUnkKURI19func_ov032_0211ab20Ev kind:function(arm,size=0xa0) addr:0x0211c8c0
-_ZN12ActorUnkKURI19func_ov032_0211abc0Ev kind:function(arm,size=0x60) addr:0x0211c960
-_ZN12ActorUnkKURI19func_ov032_0211ac20Ev kind:function(arm,size=0x74) addr:0x0211c9c0
-_ZN12ActorUnkKURI19func_ov032_0211ac94Ev kind:function(arm,size=0xac) addr:0x0211ca34
-_ZN12ActorUnkKURI19func_ov032_0211ad40Ev kind:function(arm,size=0xb4) addr:0x0211cae0
-_ZN12ActorUnkKURI19func_ov032_0211adf4Ev kind:function(arm,size=0x230) addr:0x0211cb94
-_ZN12ActorUnkKURI19func_ov032_0211b024Ev kind:function(arm,size=0x40) addr:0x0211cdc4
-_ZN12ActorUnkKURI19func_ov032_0211b064Ei kind:function(arm,size=0xb0) addr:0x0211ce04
-_ZN12ActorUnkKURI19func_ov032_0211b114Ev kind:function(arm,size=0x68) addr:0x0211ceb4
-_ZN12ActorUnkKURI19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211cf1c
-_ZN12ActorUnkKURI19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211cf30
-_ZN12ActorUnkKURI19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211cf80
-_ZN12ActorUnkKURI19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211d038
-_ZN12ActorUnkKURI19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211d11c
-_ZN12ActorUnkKURI19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211d150
-_ZN12ActorUnkKURI8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211d1a8
-_ZN16ActorUnkKURI_268C1Ev kind:function(arm,size=0x30) addr:0x0211d310
-_ZN16ActorUnkKURI_268D1Ev kind:function(arm,size=0x14) addr:0x0211d340
-_ZN16ActorUnkKURI_268D0Ev kind:function(arm,size=0x1c) addr:0x0211d354
-_ZN16ActorUnkKURI_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211d370
-_ZN16ActorUnkKURI_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211d394
-_ZN16ActorUnkKURI_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211d3b8
-_ZN16ActorUnkKURI_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211d3c8
-_ZN16ActorUnkKURI_1108vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211d3d0
-_ZN16ActorUnkKURI_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211d3f4
-_ZN16ActorUnkKURI_110D0Ev kind:function(arm,size=0x1c) addr:0x0211d420
-_ZN16ActorUnkKURI_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211d43c
-_ZN19ActorProfileUnkKURID1Ev kind:function(arm,size=0x14) addr:0x0211d458
+_ZN18ActorProfileSpinut10GetProfileEv kind:function(arm,size=0xc) addr:0x0211ad60
+_ZN18ActorProfileSpinut6CreateEv kind:function(arm,size=0x24) addr:0x0211ad6c
+_ZN18ActorProfileSpinutC1Ev kind:function(arm,size=0x5c) addr:0x0211ad90
+_ZN11ActorSpinutC1Ev kind:function(arm,size=0x1fc) addr:0x0211adec
+_ZN15ActorSpinut_110D1Ev kind:function(arm,size=0x14) addr:0x0211afe8
+_ZN15ActorSpinut_1BCD1Ev kind:function(arm,size=0x14) addr:0x0211affc
+_ZN11ActorSpinutD1Ev kind:function(arm,size=0x8c) addr:0x0211b010
+_ZN11ActorSpinutD0Ev kind:function(arm,size=0x94) addr:0x0211b09c
+_ZN11ActorSpinut8vfunc_18Ei kind:function(arm,size=0xc8) addr:0x0211b130
+_ZN11ActorSpinut8vfunc_1CEv kind:function(arm,size=0x84) addr:0x0211b1f8
+_ZN11ActorSpinut19func_ov032_021194dcEs kind:function(arm,size=0x60) addr:0x0211b27c
+_ZN11ActorSpinut8SetStateEs kind:function(arm,size=0x48) addr:0x0211b2dc
+_ZN11ActorSpinut8vfunc_20Ev kind:function(arm,size=0x358) addr:0x0211b324
+_ZN11ActorSpinut8vfunc_2CEi kind:function(arm,size=0xb4) addr:0x0211b67c
+_ZN11ActorSpinut19func_ov032_02119990Ev kind:function(arm,size=0x7c) addr:0x0211b730
+_ZN11ActorSpinut19func_ov032_02119a0cEv kind:function(arm,size=0x1dc) addr:0x0211b7ac
+_ZN11ActorSpinut19func_ov032_02119be8Ev kind:function(arm,size=0x98) addr:0x0211b988
+_ZN11ActorSpinut19func_ov032_02119c80Ev kind:function(arm,size=0xfc) addr:0x0211ba20
+_ZN11ActorSpinut19func_ov032_02119d7cEv kind:function(arm,size=0x78) addr:0x0211bb1c
+_ZN11ActorSpinut19func_ov032_02119df4Ev kind:function(arm,size=0x9c) addr:0x0211bb94
+_ZN11ActorSpinut19func_ov032_02119e90Ev kind:function(arm,size=0xb0) addr:0x0211bc30
+_ZN11ActorSpinut19func_ov032_02119f40Ev kind:function(arm,size=0x200) addr:0x0211bce0
+_ZN11ActorSpinut19func_ov032_0211a140Ev kind:function(arm,size=0xcc) addr:0x0211bee0
+_ZN11ActorSpinut19func_ov032_0211a20cEv kind:function(arm,size=0x278) addr:0x0211bfac
+_ZN11ActorSpinut19func_ov032_0211a484Ev kind:function(arm,size=0xa8) addr:0x0211c224
+_ZN11ActorSpinut19func_ov032_0211a52cEv kind:function(arm,size=0x28c) addr:0x0211c2cc
+_ZN11ActorSpinut19func_ov032_0211a7b8Ev kind:function(arm,size=0xb4) addr:0x0211c558
+_ZN11ActorSpinut19func_ov032_0211a86cEv kind:function(arm,size=0xe4) addr:0x0211c60c
+_ZN11ActorSpinut19func_ov032_0211a950Ev kind:function(arm,size=0x78) addr:0x0211c6f0
+_ZN11ActorSpinut19func_ov032_0211a9c8Ev kind:function(arm,size=0x78) addr:0x0211c768
+_ZN11ActorSpinut19func_ov032_0211aa40Ev kind:function(arm,size=0x88) addr:0x0211c7e0
+_ZN11ActorSpinut19func_ov032_0211aac8Ev kind:function(arm,size=0x58) addr:0x0211c868
+_ZN11ActorSpinut19func_ov032_0211ab20Ev kind:function(arm,size=0xa0) addr:0x0211c8c0
+_ZN11ActorSpinut19func_ov032_0211abc0Ev kind:function(arm,size=0x60) addr:0x0211c960
+_ZN11ActorSpinut19func_ov032_0211ac20Ev kind:function(arm,size=0x74) addr:0x0211c9c0
+_ZN11ActorSpinut19func_ov032_0211ac94Ev kind:function(arm,size=0xac) addr:0x0211ca34
+_ZN11ActorSpinut19func_ov032_0211ad40Ev kind:function(arm,size=0xb4) addr:0x0211cae0
+_ZN11ActorSpinut19func_ov032_0211adf4Ev kind:function(arm,size=0x230) addr:0x0211cb94
+_ZN11ActorSpinut19func_ov032_0211b024Ev kind:function(arm,size=0x40) addr:0x0211cdc4
+_ZN11ActorSpinut19func_ov032_0211b064Ei kind:function(arm,size=0xb0) addr:0x0211ce04
+_ZN11ActorSpinut19func_ov032_0211b114Ev kind:function(arm,size=0x68) addr:0x0211ceb4
+_ZN11ActorSpinut19func_ov032_0211b17cEv kind:function(arm,size=0x14) addr:0x0211cf1c
+_ZN11ActorSpinut19func_ov032_0211b190Eii kind:function(arm,size=0x50) addr:0x0211cf30
+_ZN11ActorSpinut19func_ov032_0211b1e0Ev kind:function(arm,size=0xb8) addr:0x0211cf80
+_ZN11ActorSpinut19func_ov032_0211b298Ev kind:function(arm,size=0xe4) addr:0x0211d038
+_ZN11ActorSpinut19func_ov032_0211b37cEPS_t kind:function(arm,size=0x34) addr:0x0211d11c
+_ZN11ActorSpinut19func_ov032_0211b3b0Ev kind:function(arm,size=0x58) addr:0x0211d150
+_ZN11ActorSpinut8vfunc_54Ei kind:function(arm,size=0x168) addr:0x0211d1a8
+_ZN15ActorSpinut_268C1Ev kind:function(arm,size=0x30) addr:0x0211d310
+_ZN15ActorSpinut_268D1Ev kind:function(arm,size=0x14) addr:0x0211d340
+_ZN15ActorSpinut_268D0Ev kind:function(arm,size=0x1c) addr:0x0211d354
+_ZN15ActorSpinut_2688vfunc_08EPK24UnkStruct_ov031_020f3310 kind:function(arm,size=0x24) addr:0x0211d370
+_ZN15ActorSpinut_1BC8vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211d394
+_ZN15ActorSpinut_1BC8vfunc_38Eii kind:function(arm,size=0x10) addr:0x0211d3b8
+_ZN15ActorSpinut_1BC8vfunc_30Ev kind:function(arm,size=0x8) addr:0x0211d3c8
+_ZN15ActorSpinut_1108vfunc_3CEv kind:function(arm,size=0x24) addr:0x0211d3d0
+_ZN15ActorSpinut_1108vfunc_38Eii kind:function(arm,size=0x2c) addr:0x0211d3f4
+_ZN15ActorSpinut_110D0Ev kind:function(arm,size=0x1c) addr:0x0211d420
+_ZN15ActorSpinut_1BCD0Ev kind:function(arm,size=0x1c) addr:0x0211d43c
+_ZN18ActorProfileSpinutD1Ev kind:function(arm,size=0x14) addr:0x0211d458
 _ZN19ActorProfileUnkMKUR10GetProfileEv kind:function(arm,size=0xc) addr:0x0211d46c
 _ZN19ActorProfileUnkMKUR6CreateEv kind:function(arm,size=0x24) addr:0x0211d478
 _ZN19ActorProfileUnkMKURC1Ev kind:function(arm,size=0x4c) addr:0x0211d49c
@@ -226,12 +226,12 @@ data_ov032_02121ef4 kind:data(any) addr:0x02123ecc
 data_ov032_02121f04 kind:data(any) addr:0x02123edc
 data_ov032_02121f14 kind:data(any) addr:0x02123eec
 data_ov032_02121f24 kind:data(any) addr:0x02123efc
-__sinit_ActorUnkKURI.cpp kind:function(arm,size=0x6c) addr:0x02123f0c
+__sinit_ActorSpinut.cpp kind:function(arm,size=0x6c) addr:0x02123f0c
 __sinit_ActorUnkMKUR.cpp kind:function(arm,size=0x80) addr:0x02123f78
 __sinit_ActorUnkKETH.cpp kind:function(arm,size=0x6c) addr:0x02123ff8
 __sinit_ActorUnkNSSW.cpp kind:function(arm,size=0x50) addr:0x02124064
 __sinit_MapObjectUnkSWSW.cpp kind:function(arm,size=0x50) addr:0x021240b4
-.p__sinit_ActorUnkKURI.cpp kind:data(word) addr:0x02124104
+.p__sinit_ActorSpinut.cpp kind:data(word) addr:0x02124104
 .p__sinit_ActorUnkMKUR.cpp kind:data(word) addr:0x02124108
 .p__sinit_ActorUnkKETH.cpp kind:data(word) addr:0x0212410c
 .p__sinit_ActorUnkNSSW.cpp kind:data(word) addr:0x02124110
@@ -240,12 +240,12 @@ data_ov032_02122160 kind:data(any) addr:0x02124120
 data_ov032_0212216c kind:data(any) addr:0x0212412c
 data_ov032_02122184 kind:data(any) addr:0x02124144
 data_ov032_0212219c kind:data(any) addr:0x0212415c
-_ZTV16ActorUnkKURI_268 kind:data(any) addr:0x02124174
-_ZTV19ActorProfileUnkKURI kind:data(any) addr:0x02124190
-_ZTV16ActorUnkKURI_1BC kind:data(any) addr:0x021241b4
-_ZTV16ActorUnkKURI_110 kind:data(any) addr:0x021241fc
+_ZTV15ActorSpinut_268 kind:data(any) addr:0x02124174
+_ZTV18ActorProfileSpinut kind:data(any) addr:0x02124190
+_ZTV15ActorSpinut_1BC kind:data(any) addr:0x021241b4
+_ZTV15ActorSpinut_110 kind:data(any) addr:0x021241fc
 data_ov032_02122288 kind:data(any) addr:0x02124248
-_ZTV12ActorUnkKURI kind:data(any) addr:0x021242a8
+_ZTV11ActorSpinut kind:data(any) addr:0x021242a8
 data_ov032_02122348 kind:data(any) addr:0x02124308
 data_ov032_02124368 kind:data(any) addr:0x02124368
 data_ov032_02124374 kind:data(any) addr:0x02124374
@@ -275,9 +275,9 @@ _ZTV28MapObjectProfileUnkSWSW_Base kind:data(any) addr:0x0212473c
 _ZTV17MapObject_10_SWSW kind:data(any) addr:0x02124758
 _ZTV19MapObjectUnkSWSW_40 kind:data(any) addr:0x02124780
 _ZTV16MapObjectUnkSWSW kind:data(any) addr:0x021247ac
-_ZGVN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02124800
+_ZGVN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02124800
 @31136 kind:bss addr:0x02124804
-_ZN15ProfileInstanceI19ActorProfileUnkKURIE8sProfileE kind:bss addr:0x02124810
+_ZN15ProfileInstanceI18ActorProfileSpinutE8sProfileE kind:bss addr:0x02124810
 data_ov032_021248e8 kind:bss addr:0x021248e8
 data_ov032_021248ec kind:bss addr:0x021248ec
 _ZGVN15ProfileInstanceI19ActorProfileUnkMKURE8sProfileE kind:bss addr:0x021248f8
diff --git a/include/Actor/ActorUnkKURI.hpp b/include/Actor/ActorSpinut.hpp
similarity index 76%
rename from include/Actor/ActorUnkKURI.hpp
rename to include/Actor/ActorSpinut.hpp
index cf69f1cf..74b3f6e5 100644
--- a/include/Actor/ActorUnkKURI.hpp
+++ b/include/Actor/ActorSpinut.hpp
@@ -15,37 +15,37 @@ public:
     /* 0C */ virtual void vfunc_0C() override;
 };
 
-enum ActorUnkKURIState_ {
-    ActorUnkKURIState_0  = 0,
-    ActorUnkKURIState_1  = 1,
-    ActorUnkKURIState_2  = 2,
-    ActorUnkKURIState_3  = 3,
-    ActorUnkKURIState_4  = 4,
-    ActorUnkKURIState_5  = 5,
-    ActorUnkKURIState_6  = 6,
-    ActorUnkKURIState_7  = 7,
-    ActorUnkKURIState_8  = 8,
-    ActorUnkKURIState_9  = 9,
-    ActorUnkKURIState_10 = 10,
-    ActorUnkKURIState_11 = 11,
-    ActorUnkKURIState_Max
+enum ActorSpinutState_ {
+    ActorSpinutState_0  = 0,
+    ActorSpinutState_1  = 1,
+    ActorSpinutState_2  = 2,
+    ActorSpinutState_3  = 3,
+    ActorSpinutState_4  = 4,
+    ActorSpinutState_5  = 5,
+    ActorSpinutState_6  = 6,
+    ActorSpinutState_7  = 7,
+    ActorSpinutState_8  = 8,
+    ActorSpinutState_9  = 9,
+    ActorSpinutState_10 = 10,
+    ActorSpinutState_11 = 11,
+    ActorSpinutState_Max
 };
 
-class ActorUnkKURI_268 : public UnkStruct_ov031_Items_00 {
+class ActorSpinut_268 : public UnkStruct_ov031_Items_00 {
 public:
     /* 00 (base) */
     /* 04 */ STRUCT_PAD(0x04, 0x08);
     /* 08 */ VecFx32 mUnk_08;
     /* 14 */
 
-    ActorUnkKURI_268();
+    ActorSpinut_268();
 
     // data_ov032_021221bc
-    /* 00 */ virtual ~ActorUnkKURI_268();
+    /* 00 */ virtual ~ActorSpinut_268();
     /* 08 */ virtual bool vfunc_08(const UnkStruct_ov031_020f3310 *param1) override;
 };
 
-class ActorUnkKURI_110 : public UnkStruct_ov000_020b31f0 {
+class ActorSpinut_110 : public UnkStruct_ov000_020b31f0 {
 public:
     /* 00 (base) */
     /* 2C */ UnkSystem5 mUnk_2C;
@@ -55,7 +55,7 @@ public:
     /* 8C */ unk32 mUnk_8C;
     /* 90 */
 
-    ActorUnkKURI_110(ModelRender *param3, UnkActorFileSystem2 *param4) :
+    ActorSpinut_110(ModelRender *param3, UnkActorFileSystem2 *param4) :
         UnkStruct_ov000_020b31f0(&this->mUnk_2C, &this->mUnk_6C, param3, param4),
         mUnk_2C(&this->mUnk_4C, NULL),
         mUnk_6C(&this->mUnk_8C, NULL) {
@@ -70,14 +70,14 @@ public:
     /* 3C */ virtual void vfunc_3C() override;
 };
 
-class ActorUnkKURI_1BC : public UnkStruct_ov000_020b31a8 {
+class ActorSpinut_1BC : public UnkStruct_ov000_020b31a8 {
 public:
     /* 00 (base) */
     /* 1C */ UnkSystem5 mUnk_1C;
     /* 3C */ unk32 mUnk_3C;
     /* 40 */
 
-    ActorUnkKURI_1BC(ModelRender *param2, UnkActorFileSystem2 *param3) :
+    ActorSpinut_1BC(ModelRender *param2, UnkActorFileSystem2 *param3) :
         UnkStruct_ov000_020b31a8(&this->mUnk_1C, param2, param3),
         mUnk_1C(&this->mUnk_3C, NULL) {
         if (param3 != NULL) {
@@ -91,14 +91,14 @@ public:
     /* 3C */ virtual void vfunc_3C() override;
 };
 
-class ActorUnkKURI : public Actor_Derived2 {
+class ActorSpinut : public Actor_Derived2 {
 public:
     /* 000 (base) */
     /* 0AE */ STRUCT_PAD(0x0AE, 0x0B0);
     /* 0B0 */ ModelRender_ov000_020b1a1c mUnk_0B0;
-    /* 110 */ ActorUnkKURI_110 mUnk_110;
+    /* 110 */ ActorSpinut_110 mUnk_110;
     /* 1A0 */ STRUCT_PAD(0x1A0, 0x1BC);
-    /* 1BC */ ActorUnkKURI_1BC mUnk_1BC;
+    /* 1BC */ ActorSpinut_1BC mUnk_1BC;
     /* 1FC */ STRUCT_PAD(0x1FC, 0x218);
     /* 218 */ unk16 mUnk_218;
     /* 21C */ unk32 mUnk_21C;
@@ -108,7 +108,7 @@ public:
     /* 248 */ UnkStruct_ActorUnkCANS_224 mUnk_248;
     /* 258 */ Actor_Derived1_94 mUnk_258;
     /* 264 */ unk32 mUnk_264;
-    /* 268 */ ActorUnkKURI_268 mUnk_268;
+    /* 268 */ ActorSpinut_268 mUnk_268;
     /* 27C */ VecFx32 mUnk_27C;
     /* 288 */ VecFx32 mUnk_288;
     /* 294 */ bool mUnk_294;
@@ -116,7 +116,7 @@ public:
     /* 298 */ u16 mUnk_298;
     /* 29A */
 
-    ActorUnkKURI();
+    ActorSpinut();
 
     bool IsInternalTimerOut() {
         if (this->mUnk_296 < this->mUnk_298) {
@@ -131,7 +131,7 @@ public:
     /* 1C */ virtual void vfunc_1C() override;
     /* 20 */ virtual void vfunc_20() override;
     /* 2C */ virtual void vfunc_2C(unk32 param1) override;
-    /* 4C */ virtual ~ActorUnkKURI() override;
+    /* 4C */ virtual ~ActorSpinut() override;
     /* 54 */ virtual void vfunc_54(unk32 param1) override;
 
     void func_ov032_021194dc(ActorState state);
@@ -167,17 +167,17 @@ public:
     void func_ov032_0211b190(s32 param1, s32 param2);
     void func_ov032_0211b1e0();
     void func_ov032_0211b298();
-    static void func_ov032_0211b37c(ActorUnkKURI *, u16 param1);
+    static void func_ov032_0211b37c(ActorSpinut *, u16 param1);
     void func_ov032_0211b3b0();
 };
 
-class ActorProfileUnkKURI : public ActorProfile_Derived1 {
+class ActorProfileSpinut : public ActorProfile_Derived1 {
 public:
     /* 00 (base) */
 
-    ActorProfileUnkKURI();
+    ActorProfileSpinut();
 
     /* 0C */ virtual Actor *Create();
 
-    static ActorProfileUnkKURI *GetProfile();
+    static ActorProfileSpinut *GetProfile();
 };
diff --git a/src/032_MapA1/Actor/ActorUnkKURI.cpp b/src/032_MapA1/Actor/ActorSpinut.cpp
similarity index 78%
rename from src/032_MapA1/Actor/ActorUnkKURI.cpp
rename to src/032_MapA1/Actor/ActorSpinut.cpp
index b808bca4..f60c3449 100644
--- a/src/032_MapA1/Actor/ActorUnkKURI.cpp
+++ b/src/032_MapA1/Actor/ActorSpinut.cpp
@@ -1,6 +1,6 @@
 #define VECFX32_CTORS
 
-#include "Actor/ActorUnkKURI.hpp"
+#include "Actor/ActorSpinut.hpp"
 
 #include "Actor/ActorManager.hpp"
 #include "Actor/Actor_Derived1.hpp"
@@ -35,55 +35,55 @@ extern "C" void func_ov017_020c2438(unk32 *, unk32, VecFx32 *, unk32, unk32);
 extern "C" void func_ov017_020c26f8(unk32, VecFx32 *, unk32, unk32);
 
 static const VecFx32 data_ov032_02122160(FLOAT_TO_FX32(1.7f), FLOAT_TO_FX32(0.5f), FLOAT_TO_FX32(1.7f));
-static ActorUnkZLSL_AnimationTag data_ov032_02122184                 = {.index = 0, .name = "walk", .unknown = 0x0};
-static ActorUnkZLSL_AnimationTag data_ov032_0212219c                 = {.index = 1, .name = "discover", .unknown = 0x1};
-static ActorUnkZLSL_AnimationTag data_ov032_0212216c                 = {.index = 0, .name = "KURI", .unknown = 0x1};
-static PTMF<ActorUnkKURI> data_ov032_02122288[ActorUnkKURIState_Max] = {
-    ActorUnkKURI::func_ov032_02119a0c, // ActorUnkKURIState_0
-    ActorUnkKURI::func_ov032_02119c80, // ActorUnkKURIState_1
-    ActorUnkKURI::func_ov032_02119df4, // ActorUnkKURIState_2
-    ActorUnkKURI::func_ov032_02119f40, // ActorUnkKURIState_3
-    ActorUnkKURI::func_ov032_0211a20c, // ActorUnkKURIState_4
-    ActorUnkKURI::func_ov032_0211a52c, // ActorUnkKURIState_5
-    ActorUnkKURI::func_ov032_0211a86c, // ActorUnkKURIState_6
-    ActorUnkKURI::func_ov032_0211aac8, // ActorUnkKURIState_7
-    ActorUnkKURI::func_ov032_0211abc0, // ActorUnkKURIState_8
-    ActorUnkKURI::func_ov032_0211a9c8, // ActorUnkKURIState_9
-    ActorUnkKURI::func_ov032_0211ac94, // ActorUnkKURIState_10
-    ActorUnkKURI::func_ov032_0211adf4  // ActorUnkKURIState_11
+static ActorUnkZLSL_AnimationTag data_ov032_02122184               = {.index = 0, .name = "walk", .unknown = 0x0};
+static ActorUnkZLSL_AnimationTag data_ov032_0212219c               = {.index = 1, .name = "discover", .unknown = 0x1};
+static ActorUnkZLSL_AnimationTag data_ov032_0212216c               = {.index = 0, .name = "KURI", .unknown = 0x1};
+static PTMF<ActorSpinut> data_ov032_02122288[ActorSpinutState_Max] = {
+    ActorSpinut::func_ov032_02119a0c, // ActorSpinutState_0
+    ActorSpinut::func_ov032_02119c80, // ActorSpinutState_1
+    ActorSpinut::func_ov032_02119df4, // ActorSpinutState_2
+    ActorSpinut::func_ov032_02119f40, // ActorSpinutState_3
+    ActorSpinut::func_ov032_0211a20c, // ActorSpinutState_4
+    ActorSpinut::func_ov032_0211a52c, // ActorSpinutState_5
+    ActorSpinut::func_ov032_0211a86c, // ActorSpinutState_6
+    ActorSpinut::func_ov032_0211aac8, // ActorSpinutState_7
+    ActorSpinut::func_ov032_0211abc0, // ActorSpinutState_8
+    ActorSpinut::func_ov032_0211a9c8, // ActorSpinutState_9
+    ActorSpinut::func_ov032_0211ac94, // ActorSpinutState_10
+    ActorSpinut::func_ov032_0211adf4  // ActorSpinutState_11
 };
-static PTMF<ActorUnkKURI> data_ov032_02122348[ActorUnkKURIState_Max] = {
-    ActorUnkKURI::func_ov032_02119990, // ActorUnkKURIState_0
-    ActorUnkKURI::func_ov032_02119be8, // ActorUnkKURIState_1
-    ActorUnkKURI::func_ov032_02119d7c, // ActorUnkKURIState_2
-    ActorUnkKURI::func_ov032_02119e90, // ActorUnkKURIState_3
-    ActorUnkKURI::func_ov032_0211a140, // ActorUnkKURIState_4
-    ActorUnkKURI::func_ov032_0211a484, // ActorUnkKURIState_5
-    ActorUnkKURI::func_ov032_0211a7b8, // ActorUnkKURIState_6
-    ActorUnkKURI::func_ov032_0211aa40, // ActorUnkKURIState_7
-    ActorUnkKURI::func_ov032_0211ab20, // ActorUnkKURIState_8
-    ActorUnkKURI::func_ov032_0211a950, // ActorUnkKURIState_9
-    ActorUnkKURI::func_ov032_0211ac20, // ActorUnkKURIState_10
-    ActorUnkKURI::func_ov032_0211ad40  // ActorUnkKURIState_11
+static PTMF<ActorSpinut> data_ov032_02122348[ActorSpinutState_Max] = {
+    ActorSpinut::func_ov032_02119990, // ActorSpinutState_0
+    ActorSpinut::func_ov032_02119be8, // ActorSpinutState_1
+    ActorSpinut::func_ov032_02119d7c, // ActorSpinutState_2
+    ActorSpinut::func_ov032_02119e90, // ActorSpinutState_3
+    ActorSpinut::func_ov032_0211a140, // ActorSpinutState_4
+    ActorSpinut::func_ov032_0211a484, // ActorSpinutState_5
+    ActorSpinut::func_ov032_0211a7b8, // ActorSpinutState_6
+    ActorSpinut::func_ov032_0211aa40, // ActorSpinutState_7
+    ActorSpinut::func_ov032_0211ab20, // ActorSpinutState_8
+    ActorSpinut::func_ov032_0211a950, // ActorSpinutState_9
+    ActorSpinut::func_ov032_0211ac20, // ActorSpinutState_10
+    ActorSpinut::func_ov032_0211ad40  // ActorSpinutState_11
 };
 
-DECL_PROFILE(ActorProfileUnkKURI);
+DECL_PROFILE(ActorProfileSpinut);
 
-Actor *ActorProfileUnkKURI::Create() {
-    return new(HeapIndex_2) ActorUnkKURI();
+Actor *ActorProfileSpinut::Create() {
+    return new(HeapIndex_2) ActorSpinut();
 }
 
-ActorProfileUnkKURI::ActorProfileUnkKURI() :
+ActorProfileSpinut::ActorProfileSpinut() :
     ActorProfile_Derived1(ActorId_KURI) {
     this->mUnk_04.Init(FLOAT_TO_FX32(0.4f));
     this->vfunc_04()->mUnk_15 = true;
 }
 
 // non-matching
-ActorUnkKURI::ActorUnkKURI() :
-    mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileUnkKURI)->vfunc_04()->mUnk_50)),
-    mUnk_110(&this->mUnk_0B0, GET_PROFILE(ActorProfileUnkKURI)->vfunc_04()),
-    mUnk_1BC(&this->mUnk_0B0, GET_PROFILE(ActorProfileUnkKURI)->vfunc_04()),
+ActorSpinut::ActorSpinut() :
+    mUnk_0B0(G3d_GetModelPtr(GET_PROFILE(ActorProfileSpinut)->vfunc_04()->mUnk_50)),
+    mUnk_110(&this->mUnk_0B0, GET_PROFILE(ActorProfileSpinut)->vfunc_04()),
+    mUnk_1BC(&this->mUnk_0B0, GET_PROFILE(ActorProfileSpinut)->vfunc_04()),
     mUnk_218(0x0),
     mUnk_21C(0x0),
     mUnk_220(0x7B),
@@ -112,9 +112,9 @@ ActorUnkKURI::ActorUnkKURI() :
     this->mUnk_A4 = &data_ov032_02122160;
 }
 
-ActorUnkKURI::~ActorUnkKURI() {}
+ActorSpinut::~ActorSpinut() {}
 
-bool ActorUnkKURI::vfunc_18(unk32 param1) {
+bool ActorSpinut::vfunc_18(unk32 param1) {
     if (this->Actor::func_ov000_02098a60(0x1)) {
         this->func_ov000_020984d0();
         return true;
@@ -131,33 +131,33 @@ bool ActorUnkKURI::vfunc_18(unk32 param1) {
 }
 
 // non-matching
-void ActorUnkKURI::vfunc_1C() {
+void ActorSpinut::vfunc_1C() {
     if (this->mUnk_5C.mParams[0] == 0x2) {
         this->mUnk_294 = false;
         Actor *actor   = func_02016fbc(ActorId_Soldier, &this->mPos, 0x0);
         if (actor == NULL) {
-            this->SetState(ActorUnkKURIState_0);
+            this->SetState(ActorSpinutState_0);
             return;
         }
         fx32 deltaZ  = actor->mPos.z - this->mPos.z;
         fx32 deltaX  = actor->mPos.x - this->mPos.x;
         this->mAngle = func_01ffbbe0(deltaX, deltaZ);
-        this->SetState(ActorUnkKURIState_11);
+        this->SetState(ActorSpinutState_11);
         return;
     }
-    this->SetState(ActorUnkKURIState_0);
+    this->SetState(ActorSpinutState_0);
 }
 
-void ActorUnkKURI::func_ov032_021194dc(ActorState state) {
+void ActorSpinut::func_ov032_021194dc(ActorState state) {
     this->mUnk_2C  = data_ov000_020aecf8;
     this->mUnk_218 = 0x0;
 
-    if (this->mState != ActorUnkKURIState_11) {
+    if (this->mState != ActorSpinutState_11) {
         return;
     }
 
     unk32 param2 = 0xA;
-    if (state == ActorUnkKURIState_1) {
+    if (state == ActorSpinutState_1) {
         param2 = 0x10;
     }
 
@@ -165,21 +165,21 @@ void ActorUnkKURI::func_ov032_021194dc(ActorState state) {
         return;
     }
 
-    gpActorManager->func_01fff2fc((void (*)(Actor *, u16)) &ActorUnkKURI::func_ov032_0211b37c, param2);
+    gpActorManager->func_01fff2fc((void (*)(Actor *, u16)) &ActorSpinut::func_ov032_0211b37c, param2);
 }
 
-void ActorUnkKURI::SetState(ActorState state) {
+void ActorSpinut::SetState(ActorState state) {
     this->func_ov032_021194dc(state);
     this->mState = state;
 
-    CALL_PTMF(PTMF<ActorUnkKURI>, data_ov032_02122348[this->mState]);
+    CALL_PTMF(PTMF<ActorSpinut>, data_ov032_02122348[this->mState]);
 }
 
-void ActorUnkKURI::vfunc_20() {
+void ActorSpinut::vfunc_20() {
     if (!this->Actor_Derived2::func_ov017_020bef4c(0x4000) && mUnk_48 != 0) {
         bool var_r1 = true;
         bool var_r2 = true;
-        if (this->mState != ActorUnkKURIState_8 && this->mState != ActorUnkKURIState_7) {
+        if (this->mState != ActorSpinutState_8 && this->mState != ActorSpinutState_7) {
             var_r2 = false;
         }
         if (var_r2 == 0 && this->mUnk_5C.mParams[0] != 2) {
@@ -191,7 +191,7 @@ void ActorUnkKURI::vfunc_20() {
     }
 
     this->mUnk_3C = &this->mUnk_228;
-    CALL_PTMF(PTMF<ActorUnkKURI>, data_ov032_02122288[this->mState]);
+    CALL_PTMF(PTMF<ActorSpinut>, data_ov032_02122288[this->mState]);
 
     this->Actor_Derived2::func_ov017_020bf894(&this->mUnk_248);
     this->Actor::func_ov000_02098838();
@@ -223,19 +223,19 @@ void ActorUnkKURI::vfunc_20() {
                 }
             case 0xF:
                 this->Actor_Derived2::func_ov000_020990c0(&this->mUnk_228, 0, 0);
-                this->SetState(ActorUnkKURIState_6);
+                this->SetState(ActorSpinutState_6);
                 break;
 
             case 0xC:
                 this->Actor_Derived2::func_ov017_020bf178(&this->mUnk_228, 1);
                 data_027e09a8->func_ov000_02071b30(0x983C, &this->mPos, 0x0);
                 this->mUnk_248.func_ov000_02099a0c();
-                this->SetState(ActorUnkKURIState_7);
+                this->SetState(ActorSpinutState_7);
                 break;
 
             case 0x4:
                 if (data_027e0d38->func_ov031_020d9c04(0x1, 0x0, 0x0)) {
-                    this->SetState(ActorUnkKURIState_8);
+                    this->SetState(ActorSpinutState_8);
                 }
                 break;
 
@@ -243,12 +243,12 @@ void ActorUnkKURI::vfunc_20() {
                 this->mUnk_48 -= this->mUnk_228.mUnk_1E;
                 this->Actor_Derived2::func_ov000_020990c0(&this->mUnk_228, 0x0, 0x0);
                 data_027e09a8->func_ov000_02071b30(0x983C, &this->mPos, 0x0);
-                this->SetState(ActorUnkKURIState_6);
+                this->SetState(ActorSpinutState_6);
                 break;
         }
     }
-    if (var && (this->Actor::func_ov000_02098ab4(0x2, 0x0, 0x1, NULL) & 1) && (this->mState == ActorUnkKURIState_3)) {
-        this->SetState(ActorUnkKURIState_5);
+    if (var && (this->Actor::func_ov000_02098ab4(0x2, 0x0, 0x1, NULL) & 1) && (this->mState == ActorSpinutState_3)) {
+        this->SetState(ActorSpinutState_5);
     }
 
     if (GET_FLAG(this->mFlags, ActorFlag_14)) {
@@ -273,7 +273,7 @@ void ActorUnkKURI::vfunc_20() {
     data_027e09c0->func_ov000_0207de98(this->mRef, &stack, this->mUnk_38);
 }
 
-void ActorUnkKURI::vfunc_2C(unk32 param1) {
+void ActorSpinut::vfunc_2C(unk32 param1) {
     if (!this->Actor::func_01fff5d0(param1, 0x0)) {
         return;
     }
@@ -287,7 +287,7 @@ void ActorUnkKURI::vfunc_2C(unk32 param1) {
     func_01ffc634(&this->mUnk_0B0, &sp14, this->mAngleStruct, &sp08);
 }
 
-void ActorUnkKURI::func_ov032_02119990() {
+void ActorSpinut::func_ov032_02119990() {
     this->mVel.x   = FLOAT_TO_FX32(0.0f);
     this->mVel.z   = FLOAT_TO_FX32(0.0f);
     this->mUnk_264 = 0x3800;
@@ -297,7 +297,7 @@ void ActorUnkKURI::func_ov032_02119990() {
 }
 
 // non-matching (regalloc)
-void ActorUnkKURI::func_ov032_02119a0c() {
+void ActorSpinut::func_ov032_02119a0c() {
     switch (this->mUnk_218) {
         case 0x0:
             unk32 var;
@@ -323,12 +323,12 @@ void ActorUnkKURI::func_ov032_02119a0c() {
                 this->mVel.z = MUL_FX32(COS(angle), this->mUnk_220);
 
                 if (this->func_ov032_0211b064(0x0)) {
-                    this->SetState(ActorUnkKURIState_1);
+                    this->SetState(ActorSpinutState_1);
                     break;
                 }
 
                 if (this->IsTimerOut()) {
-                    this->SetState(ActorUnkKURIState_0);
+                    this->SetState(ActorSpinutState_0);
                 }
             }
             break;
@@ -340,7 +340,7 @@ void ActorUnkKURI::func_ov032_02119a0c() {
     this->func_ov032_0211b1e0();
 }
 
-void ActorUnkKURI::func_ov032_02119be8() {
+void ActorSpinut::func_ov032_02119be8() {
     this->mUnk_264 = 0x4800;
     this->mUnk_110.vfunc_1C(data_ov032_0212219c, 0x14CD, 0x19A, 0x0);
 
@@ -351,7 +351,7 @@ void ActorUnkKURI::func_ov032_02119be8() {
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_02119c80() {
+void ActorSpinut::func_ov032_02119c80() {
     UnkStruct_PlayerGet_50 *playerGet50 = this->mUnk_110.vfunc_28();
 
     fx32 val = func_01ffb428(playerGet50->mUnk_10 - playerGet50->mUnk_08, 0x14CD);
@@ -372,14 +372,14 @@ void ActorUnkKURI::func_ov032_02119c80() {
     data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0);
 
     if (this->mUnk_5C.mParams[0] == 0x1 && !this->func_ov032_0211b114()) {
-        this->SetState(ActorUnkKURIState_4);
+        this->SetState(ActorSpinutState_4);
         return;
     }
 
-    this->SetState(ActorUnkKURIState_3);
+    this->SetState(ActorSpinutState_3);
 }
 
-void ActorUnkKURI::func_ov032_02119d7c() {
+void ActorSpinut::func_ov032_02119d7c() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
     this->mUnk_52 = 0x14;
     this->mUnk_50 = 0x00;
@@ -388,7 +388,7 @@ void ActorUnkKURI::func_ov032_02119d7c() {
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_02119df4() {
+void ActorSpinut::func_ov032_02119df4() {
     s16 var;
     s16 delta = this->mUnk_52 - this->mUnk_50;
     func_ov000_020986b4(&var, this, 0x0);
@@ -399,13 +399,13 @@ void ActorUnkKURI::func_ov032_02119df4() {
     }
 
     if (this->IsTimerOut()) {
-        this->SetState(ActorUnkKURIState_3);
+        this->SetState(ActorSpinutState_3);
     }
     this->func_ov032_0211b1e0();
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_02119e90() {
+void ActorSpinut::func_ov032_02119e90() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
 
     this->mUnk_288.x = func_01ffb66c(0x1800, func_01ffb428(0x148, 0x14) >> 0xC);
@@ -425,13 +425,13 @@ void ActorUnkKURI::func_ov032_02119e90() {
 }
 
 // non-matching (case 1)
-void ActorUnkKURI::func_ov032_02119f40() {
+void ActorSpinut::func_ov032_02119f40() {
     if (this->IsTimerOut()) {
         this->mUnk_218 = 0x2;
     }
 
     switch (this->mUnk_218) {
-        case 0x0:
+        case 0x0: {
             this->mUnk_220 += 0x14;
             fx32 newValAdd                     = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x;
             this->mUnk_110.vfunc_28()->mUnk_04 = newValAdd;
@@ -444,8 +444,9 @@ void ActorUnkKURI::func_ov032_02119f40() {
             this->mUnk_110.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(2.5f);
             ++this->mUnk_218;
             break;
+        }
 
-        case 0x1:
+        case 0x1: {
             s16 var;
             s16 *r5 = &var;
             func_ov000_020986b4(r5, this, 0x0);
@@ -455,8 +456,9 @@ void ActorUnkKURI::func_ov032_02119f40() {
                 ++this->mUnk_218;
             }
             break;
+        }
 
-        case 0x2:
+        case 0x2: {
             fx32 newValSub                     = this->mUnk_110.vfunc_28()->mUnk_04 - this->mUnk_288.x;
             this->mUnk_110.vfunc_28()->mUnk_04 = newValSub;
             this->mUnk_220 -= 0x14;
@@ -468,8 +470,9 @@ void ActorUnkKURI::func_ov032_02119f40() {
             this->mUnk_220                     = 0x0;
             this->mUnk_110.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(1.0f);
 
-            this->SetState(ActorUnkKURIState_9);
+            this->SetState(ActorSpinutState_9);
             break;
+        }
 
         default:
             _OS_Panic();
@@ -483,7 +486,7 @@ void ActorUnkKURI::func_ov032_02119f40() {
     this->func_ov032_0211b1e0();
 }
 
-void ActorUnkKURI::func_ov032_0211a140() {
+void ActorSpinut::func_ov032_0211a140() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x2000, 0x19A, 0x0);
     this->mUnk_220 = 0x11F;
     this->mUnk_264 = 0x4800;
@@ -504,18 +507,18 @@ void ActorUnkKURI::func_ov032_0211a140() {
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_0211a20c() {}
+void ActorSpinut::func_ov032_0211a20c() {}
 
-void ActorUnkKURI::func_ov032_0211a484() {
+void ActorSpinut::func_ov032_0211a484() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, this->mUnk_110.vfunc_28()->mUnk_04, 0x19A, 0x0);
     fx32 val         = func_01ffb428(this->mUnk_220, 0x14);
     this->mUnk_288.x = func_01ffb66c(0x1000 - this->mUnk_110.vfunc_28()->mUnk_04, val >> 0xC);
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_0211a52c() {
+void ActorSpinut::func_ov032_0211a52c() {
     switch (this->mUnk_218) {
-        case 0x0:
+        case 0x0: {
             this->mUnk_110.vfunc_28()->mUnk_04 = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x;
 
             unk32 val      = this->mUnk_220 - 0x14;
@@ -537,6 +540,7 @@ void ActorUnkKURI::func_ov032_0211a52c() {
             this->mUnk_110.vfunc_28()->mUnk_04 = FLOAT_TO_FX32(1.0f);
             ++this->mUnk_218;
             break;
+        }
 
         case 0x1:
             this->mUnk_110.vfunc_1C(data_ov032_0212219c, 0x1000, 0x19A, 0x0);
@@ -574,7 +578,7 @@ void ActorUnkKURI::func_ov032_0211a52c() {
     }
 }
 
-void ActorUnkKURI::func_ov032_0211a7b8() {
+void ActorSpinut::func_ov032_0211a7b8() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, this->mUnk_110.vfunc_28()->mUnk_04, 0x19A, 0x0);
 
     this->mUnk_288.x = func_01ffb66c(0x1000 - this->mUnk_110.vfunc_28()->mUnk_04, data_ov000_020aecf4[0]);
@@ -585,7 +589,7 @@ void ActorUnkKURI::func_ov032_0211a7b8() {
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_0211a86c() {
+void ActorSpinut::func_ov032_0211a86c() {
     fx32 sum                           = this->mUnk_110.vfunc_28()->mUnk_04 + this->mUnk_288.x;
     this->mUnk_110.vfunc_28()->mUnk_04 = sum;
 
@@ -603,7 +607,7 @@ void ActorUnkKURI::func_ov032_0211a86c() {
     }
 
     if (this->mUnk_248.mUnk_08 < this->mUnk_248.mUnk_0A) {
-        this->SetState(ActorUnkKURIState_7);
+        this->SetState(ActorSpinutState_7);
         return;
     }
 
@@ -611,10 +615,10 @@ void ActorUnkKURI::func_ov032_0211a86c() {
         this->func_ov032_0211b024();
         return;
     }
-    this->SetState(ActorUnkKURIState_0);
+    this->SetState(ActorSpinutState_0);
 }
 
-void ActorUnkKURI::func_ov032_0211a950() {
+void ActorSpinut::func_ov032_0211a950() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
 
     this->mUnk_52 = 0x14;
@@ -623,12 +627,12 @@ void ActorUnkKURI::func_ov032_0211a950() {
     this->mVel.z  = FLOAT_TO_FX32(0.0f);
 }
 
-void ActorUnkKURI::func_ov032_0211a9c8() {
+void ActorSpinut::func_ov032_0211a9c8() {
     if (this->IsTimerOut()) {
         if (this->func_ov032_0211b064(0x0) || this->mUnk_5C.mParams[0] == 0x2) {
-            this->SetState(ActorUnkKURIState_1);
+            this->SetState(ActorSpinutState_1);
         } else {
-            this->SetState(ActorUnkKURIState_0);
+            this->SetState(ActorSpinutState_0);
         }
     }
     this->func_ov032_0211b1e0();
@@ -636,7 +640,7 @@ void ActorUnkKURI::func_ov032_0211a9c8() {
 
 extern "C" u16 data_ov000_020aecf0;
 
-void ActorUnkKURI::func_ov032_0211aa40() {
+void ActorSpinut::func_ov032_0211aa40() {
     this->Actor_Derived2::func_ov000_02099450(&this->mUnk_248, &this->mUnk_228.mUnk_10, 0x0, data_ov000_020aecf0);
 
     this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x0, 0x19A, 0x0);
@@ -644,7 +648,7 @@ void ActorUnkKURI::func_ov032_0211aa40() {
     this->mUnk_228.func_ov000_02097bec();
 }
 
-void ActorUnkKURI::func_ov032_0211aac8() {
+void ActorSpinut::func_ov032_0211aac8() {
     this->Actor_Derived2::func_ov000_020994a0();
 
     if (!GET_FLAG(this->mFlags, ActorFlag_5)) {
@@ -656,10 +660,10 @@ void ActorUnkKURI::func_ov032_0211aac8() {
         return;
     }
 
-    this->SetState(ActorUnkKURIState_0);
+    this->SetState(ActorSpinutState_0);
 }
 
-void ActorUnkKURI::func_ov032_0211ab20() {
+void ActorSpinut::func_ov032_0211ab20() {
     this->Actor_Derived2::func_ov000_02098f34(&this->mUnk_228.mUnk_10);
 
     this->vfunc_40();
@@ -672,7 +676,7 @@ void ActorUnkKURI::func_ov032_0211ab20() {
     this->mUnk_228.func_ov000_02097bec();
 }
 
-void ActorUnkKURI::func_ov032_0211abc0() {
+void ActorSpinut::func_ov032_0211abc0() {
     this->vfunc_44();
 
     if (!GET_FLAG(this->mFlags, ActorFlag_5)) {
@@ -684,12 +688,12 @@ void ActorUnkKURI::func_ov032_0211abc0() {
 
     this->mUnk_248.func_ov000_02099a0c();
 
-    this->SetState(ActorUnkKURIState_7);
+    this->SetState(ActorSpinutState_7);
 
     *((s16 *) &this->mUnk_44) |= 0x20;
 }
 
-void ActorUnkKURI::func_ov032_0211ac20() {
+void ActorSpinut::func_ov032_0211ac20() {
     this->mVel.x = FLOAT_TO_FX32(0.0f);
     this->mVel.z = FLOAT_TO_FX32(0.0f);
 
@@ -699,7 +703,7 @@ void ActorUnkKURI::func_ov032_0211ac20() {
     this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
 }
 
-void ActorUnkKURI::func_ov032_0211ac94() {
+void ActorSpinut::func_ov032_0211ac94() {
     this->mUnk_27C.y -= 0x199;
 
     if (!this->IsTimerOut()) {
@@ -718,7 +722,7 @@ void ActorUnkKURI::func_ov032_0211ac94() {
     this->Actor_Derived2::func_ov000_020997c4(0x0);
 }
 
-void ActorUnkKURI::func_ov032_0211ad40() {
+void ActorSpinut::func_ov032_0211ad40() {
     this->mVel.x = FLOAT_TO_FX32(0.0f);
     this->mVel.z = FLOAT_TO_FX32(0.0f);
 
@@ -729,7 +733,7 @@ void ActorUnkKURI::func_ov032_0211ad40() {
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_0211adf4() {
+void ActorSpinut::func_ov032_0211adf4() {
     this->IsTimerOut();
     switch (this->mUnk_218) {
         case 0x0:
@@ -742,7 +746,7 @@ void ActorUnkKURI::func_ov032_0211adf4() {
             data_027e09a8->func_ov000_02071b30(0x9836, &this->mPos, 0x0);
             break;
 
-        case 0x1:
+        case 0x1: {
             if (this->mUnk_110.vfunc_28()->func_01ff8fa8() == 0x0) {
                 break;
             }
@@ -750,7 +754,7 @@ void ActorUnkKURI::func_ov032_0211adf4() {
             data_027e0cec->func_ov000_0209feac(0x880, &this->mPos, 0x2, 0x0, 0x0);
             this->mUnk_110.vfunc_1C(data_ov032_02122184, 0x1000, 0x19A, 0x0);
             if (this->func_ov032_0211b064(0x0) || (this->mUnk_294 && this->mUnk_50 >= this->mUnk_52)) {
-                this->SetState(ActorUnkKURIState_1);
+                this->SetState(ActorSpinutState_1);
                 return;
             }
             u16 random     = gRandom.Next32(0);
@@ -758,22 +762,23 @@ void ActorUnkKURI::func_ov032_0211adf4() {
             this->mUnk_296 = 0x0;
             this->mUnk_218 = 0x0;
             break;
+        }
 
         default:
             break;
     }
 }
 
-void ActorUnkKURI::func_ov032_0211b024() {
+void ActorSpinut::func_ov032_0211b024() {
     if (this->mUnk_5C.mParams[0] == 0x1 && !this->func_ov032_0211b114()) {
-        this->SetState(ActorUnkKURIState_4);
+        this->SetState(ActorSpinutState_4);
         return;
     }
-    this->SetState(ActorUnkKURIState_2);
+    this->SetState(ActorSpinutState_2);
 }
 
 // non-matching
-bool ActorUnkKURI::func_ov032_0211b064(unk32 param1) {
+bool ActorSpinut::func_ov032_0211b064(unk32 param1) {
     VecFx32 *vec = data_027e0ce0->func_01fff148(0x0);
     bool ret     = false;
     if (func_ov000_0205adfc(vec, &this->mPos) &&
@@ -793,16 +798,16 @@ bool ActorUnkKURI::func_ov032_0211b064(unk32 param1) {
 }
 
 // non-matching
-bool ActorUnkKURI::func_ov032_0211b114() {}
+bool ActorSpinut::func_ov032_0211b114() {}
 
-bool ActorUnkKURI::func_ov032_0211b17c() {
-    return this->mState == ActorUnkKURIState_10;
+bool ActorSpinut::func_ov032_0211b17c() {
+    return this->mState == ActorSpinutState_10;
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_0211b190(s32 param1, s32 param2) {}
+void ActorSpinut::func_ov032_0211b190(s32 param1, s32 param2) {}
 
-void ActorUnkKURI::func_ov032_0211b1e0() {
+void ActorSpinut::func_ov032_0211b1e0() {
     if (this->mUnk_110.vfunc_30() != 0x0 || !GET_FLAG(this->mFlags, ActorFlag_14)) {
         return;
     }
@@ -819,7 +824,7 @@ void ActorUnkKURI::func_ov032_0211b1e0() {
 }
 
 // non-matching
-void ActorUnkKURI::func_ov032_0211b298() {
+void ActorSpinut::func_ov032_0211b298() {
     if (this->mUnk_110.vfunc_30() != 0x1) {
         if (this->mUnk_288.y <= FLOAT_TO_FX32(0.0f)) {
             this->mUnk_288.z = FLOAT_TO_FX32(0.0f);
@@ -843,7 +848,7 @@ void ActorUnkKURI::func_ov032_0211b298() {
     this->mUnk_288.y = FLOAT_TO_FX32(0.0f);
 }
 
-void ActorUnkKURI::func_ov032_0211b37c(ActorUnkKURI *thisx, u16 param1) {
+void ActorSpinut::func_ov032_0211b37c(ActorSpinut *thisx, u16 param1) {
     if (thisx->GetActorId() == ActorId_KURI) {
         thisx->mUnk_294 = true;
         thisx->mUnk_52  = param1;
@@ -851,7 +856,7 @@ void ActorUnkKURI::func_ov032_0211b37c(ActorUnkKURI *thisx, u16 param1) {
     }
 }
 
-void ActorUnkKURI::func_ov032_0211b3b0() {
+void ActorSpinut::func_ov032_0211b3b0() {
     if (this->mUnk_5C.mUnk_1A[1] != 0x0) {
         UNSET_FLAG(this->mFlags, ActorFlag_Alive);
     } else {
@@ -866,7 +871,7 @@ void ActorUnkKURI::func_ov032_0211b3b0() {
     this->Actor::func_ov000_020984d0();
 }
 
-void ActorUnkKURI::vfunc_54(unk32 param1) {
+void ActorSpinut::vfunc_54(unk32 param1) {
     switch (param1) {
         case 0x0:
             data_027e09a8->func_ov000_02071b30(0x983D, &this->mPos, 0x0);
@@ -905,36 +910,36 @@ void ActorUnkKURI::vfunc_54(unk32 param1) {
     }
 }
 
-ActorUnkKURI_268::ActorUnkKURI_268() {
+ActorSpinut_268::ActorSpinut_268() {
     VecFx32_Init(FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), FLOAT_TO_FX32(0.0f), &this->mUnk_08);
 }
 
-ActorUnkKURI_268::~ActorUnkKURI_268() {}
+ActorSpinut_268::~ActorSpinut_268() {}
 
 // non-matching
-bool ActorUnkKURI_268::vfunc_08(const UnkStruct_ov031_020f3310 *param1) {
+bool ActorSpinut_268::vfunc_08(const UnkStruct_ov031_020f3310 *param1) {
     VecFx16_Copy2VecFx32(&param1->mUnk_08, &this->mUnk_08);
     this->UnkStruct_ov031_Items_00::vfunc_08(param1);
 }
 
-void ActorUnkKURI_1BC::vfunc_3C() {
+void ActorSpinut_1BC::vfunc_3C() {
     this->mUnk_08->func_ov000_02057c98(this->vfunc_10());
 }
 
-void ActorUnkKURI_1BC::vfunc_38(unk32 param1, unk32 param2) {
+void ActorSpinut_1BC::vfunc_38(unk32 param1, unk32 param2) {
     this->mUnk_04->func_ov000_020578a4(param1, param2);
 }
 
-s8 ActorUnkKURI_1BC::vfunc_30() {
+s8 ActorSpinut_1BC::vfunc_30() {
     return this->mUnk_18;
 }
 
-void ActorUnkKURI_110::vfunc_3C() {
+void ActorSpinut_110::vfunc_3C() {
     this->mUnk_08->func_ov000_02057c98(this->mUnk_04);
     this->mUnk_08->func_ov000_02057c98(this->mUnk_1C);
 }
 
-void ActorUnkKURI_110::vfunc_38(unk32 param1, unk32 param2) {
+void ActorSpinut_110::vfunc_38(unk32 param1, unk32 param2) {
     this->mUnk_04->func_ov000_020578a4(param1, param2);
     this->mUnk_1C->func_ov000_020578a4(param1, param2);
 }
diff --git a/tools/configure.py b/tools/configure.py
index 941998f5..6c089ba5 100755
--- a/tools/configure.py
+++ b/tools/configure.py
@@ -598,7 +598,7 @@ config.libs = [
         "Overlay 32",
         [
             Object("032_MapA1/Actor/ActorUnkKETH.cpp"),
-            Object("032_MapA1/Actor/ActorUnkKURI.cpp"),
+            Object("032_MapA1/Actor/ActorSpinut.cpp"),
             Object("032_MapA1/Actor/ActorUnkMKUR.cpp"),
             Object("032_MapA1/Actor/ActorUnkNSSW.cpp"),
             Object("032_MapA1/MapObject/MapObjectUnkSWSW.cpp"),