diff --git a/src/KingSystem/Physics/System/physInstanceSet.cpp b/src/KingSystem/Physics/System/physInstanceSet.cpp
index ccfc3062..6be16311 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.cpp
+++ b/src/KingSystem/Physics/System/physInstanceSet.cpp
@@ -1,5 +1,7 @@
 #include "KingSystem/Physics/System/physInstanceSet.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodySet.h"
+#include "KingSystem/Physics/System/physCollisionInfo.h"
+#include "KingSystem/Physics/System/physContactPointInfo.h"
 #include "KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h"
 
 namespace ksys::phys {
@@ -154,8 +156,8 @@ void* InstanceSet::sub_7100FBBC28(const sead::SafeString& name) const {
 
 s32 InstanceSet::sub_7100FBBC78(const sead::SafeString& name) const {
     s32 idx = 0;
-    for (auto& info : mContactInfos) {
-        if (name == info.mName)
+    for (auto& info : mContactPointInfo) {
+        if (name == info.getName())
             return idx;
         idx++;
     }
@@ -164,8 +166,8 @@ s32 InstanceSet::sub_7100FBBC78(const sead::SafeString& name) const {
 
 s32 InstanceSet::sub_7100FBBD9C(const sead::SafeString& name) const {
     s32 idx = 0;
-    for (auto& info : mCollisionInfos) {
-        if (name == info.mName)
+    for (auto& info : mCollisionInfo) {
+        if (name == info.getName())
             return idx;
         idx++;
     }
diff --git a/src/KingSystem/Physics/System/physInstanceSet.h b/src/KingSystem/Physics/System/physInstanceSet.h
index 0f65245f..5c78088d 100644
--- a/src/KingSystem/Physics/System/physInstanceSet.h
+++ b/src/KingSystem/Physics/System/physInstanceSet.h
@@ -18,6 +18,8 @@ class RagdollConfigList;
 
 namespace ksys::phys {
 
+class CollisionInfo;
+class ContactPointInfo;
 class ParamSet;
 class RigidBodySet;
 class SystemGroupHandler;
@@ -38,16 +40,6 @@ public:
     void enableCollisionMaybe_0(ContactLayer);
 };
 
-struct CollisionInfoBase {
-    u8 filler[0x50];
-    sead::SafeString mName;
-};
-
-struct ContactInfo {
-    u8 filler[0x8];
-    sead::SafeString mName;
-};
-
 class InstanceSet : public sead::hostio::Node {
 public:
     enum class Flag : u32 {
@@ -96,8 +88,8 @@ private:
     f32 mScale;
     u8 _34[0x40 - 0x34];
     sead::PtrArray<RigidBodySet> mRigidBodySets;
-    sead::PtrArray<CollisionInfoBase> mCollisionInfos;
-    sead::PtrArray<ContactInfo> mContactInfos;
+    sead::PtrArray<CollisionInfo> mCollisionInfo;
+    sead::PtrArray<ContactPointInfo> mContactPointInfo;
 
     u8 _70[0x10];
     CollisionController* mCollisionController;