diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index ee4707c7..7686317d 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -83275,7 +83275,7 @@ Address,Quality,Size,Name
 0x0000007100f99180,O,000188,_ZN4ksys4phys16RigidBodyFactory12createSphereEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
 0x0000007100f9923c,O,000188,_ZN4ksys4phys16RigidBodyFactory13createCapsuleEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
 0x0000007100f992f8,O,000188,_ZN4ksys4phys16RigidBodyFactory14createCylinderEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
-0x0000007100f993b4,O,000188,_ZN4ksys4phys16RigidBodyFactory19createWaterCylinderEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
+0x0000007100f993b4,O,000188,_ZN4ksys4phys16RigidBodyFactory19createCylinderWaterEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
 0x0000007100f99470,O,000188,_ZN4ksys4phys16RigidBodyFactory9createBoxEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
 0x0000007100f9952c,U,000188,
 0x0000007100f995e8,U,000188,
diff --git a/src/KingSystem/Physics/CMakeLists.txt b/src/KingSystem/Physics/CMakeLists.txt
index 0458f14b..4db8ebb6 100644
--- a/src/KingSystem/Physics/CMakeLists.txt
+++ b/src/KingSystem/Physics/CMakeLists.txt
@@ -48,6 +48,8 @@ target_sources(uking PRIVATE
   RigidBody/Shape/physCharacterPrismShape.h
   RigidBody/Shape/physCylinderShape.cpp
   RigidBody/Shape/physCylinderShape.h
+  RigidBody/Shape/physCylinderWaterShape.cpp
+  RigidBody/Shape/physCylinderWaterShape.h
   RigidBody/Shape/physPolytopeShape.cpp
   RigidBody/Shape/physPolytopeShape.h
   RigidBody/Shape/physShape.h
@@ -55,8 +57,6 @@ target_sources(uking PRIVATE
   RigidBody/Shape/physShapeParamObj.h
   RigidBody/Shape/physSphereShape.cpp
   RigidBody/Shape/physSphereShape.h
-  RigidBody/Shape/physWaterCylinderShape.cpp
-  RigidBody/Shape/physWaterCylinderShape.h
 
   RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
   RigidBody/TeraMesh/physTeraMeshRigidBody.h
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.cpp b/src/KingSystem/Physics/RigidBody/Shape/physCylinderWaterShape.cpp
similarity index 100%
rename from src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.cpp
rename to src/KingSystem/Physics/RigidBody/Shape/physCylinderWaterShape.cpp
diff --git a/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h b/src/KingSystem/Physics/RigidBody/Shape/physCylinderWaterShape.h
similarity index 59%
rename from src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h
rename to src/KingSystem/Physics/RigidBody/Shape/physCylinderWaterShape.h
index f9051548..e9d26b13 100644
--- a/src/KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h
+++ b/src/KingSystem/Physics/RigidBody/Shape/physCylinderWaterShape.h
@@ -5,20 +5,20 @@
 
 namespace ksys::phys {
 
-class WaterCylinderParam;
+class CylinderWaterParam;
 
-struct WaterCylinderShape {
-    virtual ~WaterCylinderShape();
+struct CylinderWaterShape {
+    virtual ~CylinderWaterShape();
 
     RigidBody* createBody(bool flag, const RigidBodyInstanceParam& params, sead::Heap* heap);
 };
 
 struct WaterCylinderShapeParam {
-    WaterCylinderShape* createShape(sead::Heap* heap);
+    CylinderWaterShape* createShape(sead::Heap* heap);
 };
 
-class WaterCylinderParam : public RigidBodyInstanceParam {
-    SEAD_RTTI_OVERRIDE(WaterCylinderParam, RigidBodyInstanceParam)
+class CylinderWaterParam : public RigidBodyInstanceParam {
+    SEAD_RTTI_OVERRIDE(CylinderWaterParam, RigidBodyInstanceParam)
 public:
     u8 _90;
     float _94;
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp
index 54b574a4..13d552cb 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.cpp
@@ -3,8 +3,8 @@
 #include "KingSystem/Physics/RigidBody/Shape/physBoxShape.h"
 #include "KingSystem/Physics/RigidBody/Shape/physCapsuleShape.h"
 #include "KingSystem/Physics/RigidBody/Shape/physCylinderShape.h"
+#include "KingSystem/Physics/RigidBody/Shape/physCylinderWaterShape.h"
 #include "KingSystem/Physics/RigidBody/Shape/physSphereShape.h"
-#include "KingSystem/Physics/RigidBody/Shape/physWaterCylinderShape.h"
 
 namespace ksys::phys {
 
@@ -35,11 +35,11 @@ RigidBody* RigidBodyFactory::createCylinder(RigidBodyInstanceParam* params, sead
     return shape->createBody(true, *params, heap);
 }
 
-RigidBody* RigidBodyFactory::createWaterCylinder(RigidBodyInstanceParam* params, sead::Heap* heap) {
+RigidBody* RigidBodyFactory::createCylinderWater(RigidBodyInstanceParam* params, sead::Heap* heap) {
     if (params->isDynamicSensor())
         params->motion_type = MotionType::Keyframed;
 
-    auto* v = sead::DynamicCast<WaterCylinderParam>(params);
+    auto* v = sead::DynamicCast<CylinderWaterParam>(params);
     auto* shape = v->shape.createShape(heap);
     return shape->createBody(true, *params, heap);
 }
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.h b/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.h
index 1a14d3cc..d4e61915 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.h
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFactory.h
@@ -16,7 +16,7 @@ public:
     static RigidBody* createSphere(RigidBodyInstanceParam* params, sead::Heap* heap);
     static RigidBody* createCapsule(RigidBodyInstanceParam* params, sead::Heap* heap);
     static RigidBody* createCylinder(RigidBodyInstanceParam* params, sead::Heap* heap);
-    static RigidBody* createWaterCylinder(RigidBodyInstanceParam* params, sead::Heap* heap);
+    static RigidBody* createCylinderWater(RigidBodyInstanceParam* params, sead::Heap* heap);
     static RigidBody* createBox(RigidBodyInstanceParam* params, sead::Heap* heap);
     static RigidBody* createWaterBox(RigidBodyInstanceParam* params, sead::Heap* heap);
     static RigidBody* createPolytope(RigidBodyInstanceParam* params, sead::Heap* heap);