diff --git a/include/MetroidPrime/CStateManager.hpp b/include/MetroidPrime/CStateManager.hpp
index 2acf2fc3..293ea630 100644
--- a/include/MetroidPrime/CStateManager.hpp
+++ b/include/MetroidPrime/CStateManager.hpp
@@ -149,10 +149,6 @@ public:
   CEnvFxManager* EnvFxManager() { return x880_envFxManager; }
   const CEnvFxManager* GetEnvFxManager() const { return x880_envFxManager; }
   CRumbleManager* GetRumbleManager() { return x88c_rumbleManager; }
-  CCameraFilterPass& CameraFilterPass(int idx) { return xb84_camFilterPasses[idx]; }
-  const CCameraFilterPass& GetCameraFilterPass(int idx) const { return xb84_camFilterPasses[idx]; }
-  CCameraBlurPass& CameraBlurPass(int idx) { return xd14_camBlurPasses[idx]; }
-  const CCameraBlurPass& GetCameraBlurPass(int idx) const { return xd14_camBlurPasses[idx]; }
 
   CRandom16* GetActiveRandom() const { return x900_random; }
 
@@ -164,6 +160,10 @@ public:
   const CCameraFilterPass& GetCameraFilterPass(ECameraFilterStage stage) const {
     return xb84_camFilterPasses[size_t(stage)];
   }
+  
+  CCameraBlurPass& CameraBlurPass(ECameraFilterStage idx) { return xd14_camBlurPasses[idx]; }
+  
+  const CCameraBlurPass& GetCameraBlurPass(ECameraFilterStage idx) const { return xd14_camBlurPasses[idx]; }
 
   float GetThermalColdScale1() const { return xf24_thermColdScale1; }
   float GetThermalColdScale2() const { return xf28_thermColdScale2; }
diff --git a/src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp b/src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp
index 13646fbe..e3bdc518 100644
--- a/src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp
+++ b/src/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.cpp
@@ -23,12 +23,12 @@ void CScriptCameraBlurKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqu
   switch (msg) {
   case kSM_Increment:
     if (GetActive()) {
-      stateMgr.CameraBlurPass(3).SetBlur(x34_type, x38_amount, x40_timeIn, false);
+      stateMgr.CameraBlurPass(CStateManager::kCFS_Three).SetBlur(x34_type, x38_amount, x40_timeIn, false);
     }
     break;
   case kSM_Decrement:
     if (GetActive()) {
-      stateMgr.CameraBlurPass(3).DisableBlur(x44_timeOut);
+      stateMgr.CameraBlurPass(CStateManager::kCFS_Three).DisableBlur(x44_timeOut);
     }
     break;
   default: