diff --git a/UnleashedRecomp/api/CSD/Manager/csdmNode.inl b/UnleashedRecomp/api/CSD/Manager/csdmNode.inl
index c420167..ffefcce 100644
--- a/UnleashedRecomp/api/CSD/Manager/csdmNode.inl
+++ b/UnleashedRecomp/api/CSD/Manager/csdmNode.inl
@@ -9,41 +9,41 @@ namespace Chao::CSD
 
     inline void CNode::SetText(const char* in_pText)
     {
-        GuestToHostFunction<int>(0x830BF640, this, in_pText);
+        GuestToHostFunction<int>(sub_830BF640, this, in_pText);
     }
 
     inline void CNode::SetText(const wchar_t* in_pText)
     {
-        GuestToHostFunction<int>(0x830BF640, this, in_pText);
+        GuestToHostFunction<int>(sub_830BF640, this, in_pText);
     }
 
     inline void CNode::GetPosition(Hedgehog::Math::CVector2& out_rResult) const
     {
-        GuestToHostFunction<void>(0x830BF008, &out_rResult, this);
+        GuestToHostFunction<void>(sub_830BF008, &out_rResult, this);
     }
 
     inline void CNode::SetPosition(float in_X, float in_Y)
     {
-        GuestToHostFunction<int>(0x830BF078, this, in_X, in_Y);
+        GuestToHostFunction<int>(sub_830BF078, this, in_X, in_Y);
     }
 
     inline void CNode::SetHideFlag(uint32_t in_HideFlag)
     {
-        GuestToHostFunction<int>(0x830BF080, this, in_HideFlag);
+        GuestToHostFunction<int>(sub_830BF080, this, in_HideFlag);
     }
 
     inline void CNode::SetRotation(float in_Rotation)
     {
-        GuestToHostFunction<int>(0x830BF088, this, in_Rotation);
+        GuestToHostFunction<int>(sub_830BF088, this, in_Rotation);
     }
 
     inline void CNode::SetScale(float in_X, float in_Y)
     {
-        GuestToHostFunction<int>(0x830BF090, this, in_X, in_Y);
+        GuestToHostFunction<int>(sub_830BF090, this, in_X, in_Y);
     }
 
     inline void CNode::SetPatternIndex(uint32_t in_PatternIndex)
     {
-        GuestToHostFunction<int>(0x830BF300, this, in_PatternIndex);
+        GuestToHostFunction<int>(sub_830BF300, this, in_PatternIndex);
     }
 }
diff --git a/UnleashedRecomp/api/CSD/Manager/csdmProject.inl b/UnleashedRecomp/api/CSD/Manager/csdmProject.inl
index c579789..d106fa4 100644
--- a/UnleashedRecomp/api/CSD/Manager/csdmProject.inl
+++ b/UnleashedRecomp/api/CSD/Manager/csdmProject.inl
@@ -5,20 +5,20 @@ namespace Chao::CSD
     inline RCPtr<CScene> CProject::CreateScene(const char* in_pName) const
     {
         RCPtr<CScene> rcScene;
-        GuestToHostFunction<void>(0x830BEE00, this, rcScene, in_pName, nullptr);
+        GuestToHostFunction<void>(sub_830BEE00, this, rcScene, in_pName, nullptr);
         return rcScene;
     }
 
     inline RCPtr<CScene> CProject::CreateScene(const char* in_pName, const char* in_pMotionName) const
     {
         RCPtr<CScene> rcScene;
-        GuestToHostFunction<void>(0x830BECE0, this, rcScene, in_pName, in_pMotionName, nullptr);
+        GuestToHostFunction<void>(sub_830BECE0, this, rcScene, in_pName, in_pMotionName, nullptr);
         return rcScene;
     }
 
     inline void CProject::DestroyScene(CScene* in_pScene)
     {
-        GuestToHostFunction<void>(0x830BE298, this, in_pScene);
+        GuestToHostFunction<void>(sub_830BE298, this, in_pScene);
     }
 
     inline void CProject::DestroyScene(RCPtr<CScene>& inout_rcScene)
diff --git a/UnleashedRecomp/api/CSD/Manager/csdmRCObject.inl b/UnleashedRecomp/api/CSD/Manager/csdmRCObject.inl
index 6090997..9a9bb56 100644
--- a/UnleashedRecomp/api/CSD/Manager/csdmRCObject.inl
+++ b/UnleashedRecomp/api/CSD/Manager/csdmRCObject.inl
@@ -30,6 +30,6 @@ namespace Chao::CSD
 
     inline void RCPtrAbs::RCObject::Release()
     {
-        GuestToHostFunction<void>(0x830BA068, this);
+        GuestToHostFunction<void>(sub_830BA068, this);
     }
 }
diff --git a/UnleashedRecomp/api/CSD/Manager/csdmRCPtrAbs.inl b/UnleashedRecomp/api/CSD/Manager/csdmRCPtrAbs.inl
index 2925fc5..4374bc1 100644
--- a/UnleashedRecomp/api/CSD/Manager/csdmRCPtrAbs.inl
+++ b/UnleashedRecomp/api/CSD/Manager/csdmRCPtrAbs.inl
@@ -27,12 +27,12 @@ namespace Chao::CSD
 
     inline void RCPtrAbs::AttachAbs(void* in_pMemory)
     {
-        GuestToHostFunction<void>(0x830BA298, this, in_pMemory);
+        GuestToHostFunction<void>(sub_830BA298, this, in_pMemory);
     }
 
     inline void RCPtrAbs::SetAbs(const RCPtrAbs& in_rPtr)
     {
-        GuestToHostFunction<void>(0x830BA328, this, in_rPtr);
+        GuestToHostFunction<void>(sub_830BA328, this, in_rPtr);
     }
 
     inline void* RCPtrAbs::operator*() const
diff --git a/UnleashedRecomp/api/CSD/Manager/csdmScene.inl b/UnleashedRecomp/api/CSD/Manager/csdmScene.inl
index a44a6cd..25a5ad6 100644
--- a/UnleashedRecomp/api/CSD/Manager/csdmScene.inl
+++ b/UnleashedRecomp/api/CSD/Manager/csdmScene.inl
@@ -22,7 +22,7 @@ namespace Chao::CSD
 
     inline bool CScene::SetMotion(const char* in_pName)
     {
-        return GuestToHostFunction<bool>(0x830BA760, this, in_pName);
+        return GuestToHostFunction<bool>(sub_830BA760, this, in_pName);
     }
 
     inline void CScene::SetMotionFrame(float in_MotionFrame)
@@ -33,21 +33,21 @@ namespace Chao::CSD
 
     inline void CScene::SetPosition(float in_X, float in_Y)
     {
-        GuestToHostFunction<void>(0x830BB550, this, in_X, in_Y);
+        GuestToHostFunction<void>(sub_830BB550, this, in_X, in_Y);
     }
 
     inline void CScene::SetHideFlag(uint32_t in_HideFlag)
     {
-        GuestToHostFunction<void>(0x830BB378, this, in_HideFlag);
+        GuestToHostFunction<void>(sub_830BB378, this, in_HideFlag);
     }
 
     inline void CScene::SetRotation(float in_Angle)
     {
-        GuestToHostFunction<void>(0x830BB5F8, this, in_Angle);
+        GuestToHostFunction<void>(sub_830BB5F8, this, in_Angle);
     }
 
     inline void CScene::SetScale(float in_X, float in_Y)
     {
-        GuestToHostFunction<void>(0x830BB650, this, in_X, in_Y);
+        GuestToHostFunction<void>(sub_830BB650, this, in_X, in_Y);
     }
 }
diff --git a/UnleashedRecomp/api/SWA/CSD/CsdDatabaseWrapper.inl b/UnleashedRecomp/api/SWA/CSD/CsdDatabaseWrapper.inl
index 414c646..70c7945 100644
--- a/UnleashedRecomp/api/SWA/CSD/CsdDatabaseWrapper.inl
+++ b/UnleashedRecomp/api/SWA/CSD/CsdDatabaseWrapper.inl
@@ -3,7 +3,7 @@ namespace SWA
     inline boost::shared_ptr<CCsdProject> CCsdDatabaseWrapper::GetCsdProject(const Hedgehog::Base::CSharedString& in_rName)
     {
         boost::shared_ptr<CCsdProject> spCsdProject;
-        GuestToHostFunction<void>(0x825E2B40, &in_rName, this, &spCsdProject, 0);
+        GuestToHostFunction<void>(sub_825E2B40, &in_rName, this, &spCsdProject, 0);
         return spCsdProject;
     }
 }
diff --git a/UnleashedRecomp/patches/ui/CHudPause_patches.cpp b/UnleashedRecomp/patches/ui/CHudPause_patches.cpp
index dbc1b47..887c1c8 100644
--- a/UnleashedRecomp/patches/ui/CHudPause_patches.cpp
+++ b/UnleashedRecomp/patches/ui/CHudPause_patches.cpp
@@ -19,7 +19,7 @@ void CHudPauseAddOptionsItemMidAsmHook(PPCRegister& pThis)
     guest_stack_var<Hedgehog::Base::CSharedString> menu("TopMenu");
     guest_stack_var<Hedgehog::Base::CSharedString> name("option");
 
-    GuestToHostFunction<int>(0x824AE690, pThis.u32, menu.get(), name.get());
+    GuestToHostFunction<int>(sub_824AE690, pThis.u32, menu.get(), name.get());
 }
 
 bool InjectMenuBehaviour(uint32_t pThis, uint32_t count)
@@ -125,7 +125,7 @@ PPC_FUNC(sub_824B0930)
         // Re-open pause menu after achievement menu closes with delay.
         if (g_achievementMenuOutroTime >= g_achievementMenuOutroThreshold)
         {
-            GuestToHostFunction<int>(0x824AFD28, pHudPause, 0, 1, 0, 0);
+            GuestToHostFunction<int>(sub_824AFD28, pHudPause, 0, 1, 0, 0);
 
             g_achievementMenuOutroTime = 0;
             g_isAchievementMenuOutro = false;
@@ -152,7 +152,7 @@ PPC_FUNC(sub_824B0930)
         {
             OptionsMenu::Close();
 
-            GuestToHostFunction<int>(0x824AFD28, pHudPause, 0, 0, 0, 1);
+            GuestToHostFunction<int>(sub_824AFD28, pHudPause, 0, 0, 0, 1);
         }
     }
     else