diff --git a/libs/JSystem/include/JSystem/JUtility/JUTFader.h b/libs/JSystem/include/JSystem/JUtility/JUTFader.h
index 6c98a6840f..b85e4a6cd4 100644
--- a/libs/JSystem/include/JSystem/JUtility/JUTFader.h
+++ b/libs/JSystem/include/JSystem/JUtility/JUTFader.h
@@ -11,8 +11,10 @@
 class JUTFader {
 public:
     enum EStatus {
-        UNKSTATUS_M1 = -1,
-        UNKSTATUS_0 = 0,
+        None,
+        Wait,
+        FadeIn,
+        FadeOut,
     };
 
     JUTFader(int, int, int, int, JUtility::TColor);
@@ -29,12 +31,12 @@ public:
     void setColor(JUtility::TColor color) { mColor.set(color); }
 
     /* 0x04 */ s32 mStatus;
-    /* 0x08 */ u16 field_0x8;
-    /* 0x0A */ u16 field_0xa;
+    /* 0x08 */ u16 mDuration;
+    /* 0x0A */ u16 mTimer;
     /* 0x0C */ JUtility::TColor mColor;
     /* 0x10 */ JGeometry::TBox2<f32> mBox;
-    /* 0x20 */ int mEStatus;
-    /* 0x24 */ u32 field_0x24;
+    /* 0x20 */ int mStatusTimer;
+    /* 0x24 */ u32 mNextStatus;
 };
 
 #endif /* JUTFADER_H */
diff --git a/libs/JSystem/src/JFramework/JFWDisplay.cpp b/libs/JSystem/src/JFramework/JFWDisplay.cpp
index c35b283419..64b0fedcf2 100644
--- a/libs/JSystem/src/JFramework/JFWDisplay.cpp
+++ b/libs/JSystem/src/JFramework/JFWDisplay.cpp
@@ -219,7 +219,7 @@ void JFWDisplay::endGX() {
         if (dusk::frame_interp::get_ui_tick_pending()) {
             mFader->advance();
         }
-        if (mFader->getStatus() != 1) {
+        if (mFader->getStatus() != JUTFader::Wait) {
             mFader->draw();
         }
 #else
diff --git a/libs/JSystem/src/JUtility/JUTFader.cpp b/libs/JSystem/src/JUtility/JUTFader.cpp
index f7fa963e63..599ae22720 100644
--- a/libs/JSystem/src/JUtility/JUTFader.cpp
+++ b/libs/JSystem/src/JUtility/JUTFader.cpp
@@ -10,51 +10,51 @@
 
 JUTFader::JUTFader(int x, int y, int width, int height, JUtility::TColor pColor)
     : mColor(pColor), mBox(x, y, x + width, y + height) {
-    mStatus = 0;
-    field_0x8 = 0;
-    field_0xa = 0;
-    field_0x24 = 0;
-    mEStatus = UNKSTATUS_M1;
+    mStatus = None;
+    mDuration = 0;
+    mTimer = 0;
+    mNextStatus = 0;
+    mStatusTimer = -1;
 }
 
 void JUTFader::advance() {
-    if (0 <= mEStatus && mEStatus-- == 0) {
-        mStatus = field_0x24;
+    if (0 <= mStatusTimer && mStatusTimer-- == 0) {
+        mStatus = mNextStatus;
     }
 
-    if (mStatus == 1) {
+    if (mStatus == Wait) {
         return;
     }
 
     switch (mStatus) {
-    case 0:
+    case None:
         mColor.a = 0xFF;
         break;
-    case 2:
+    case FadeIn:
 #if AVOID_UB
-        if (field_0x8 == 0) {
-            mStatus = 1;
+        if (mDuration == 0) {
+            mStatus = Wait;
             break;
         }
 #endif
-        mColor.a = 0xFF - ((++field_0xa * 0xFF) / field_0x8);
+        mColor.a = 0xFF - ((++mTimer * 0xFF) / mDuration);
 
-        if (field_0xa >= field_0x8) {
-            mStatus = 1;
+        if (mTimer >= mDuration) {
+            mStatus = Wait;
         }
 
         break;
-    case 3:
+    case FadeOut:
 #if AVOID_UB
-        if (field_0x8 == 0) {
-            mStatus = 0;
+        if (mDuration == 0) {
+            mStatus = None;
             break;
         }
 #endif
-        mColor.a = ((++field_0xa * 0xFF) / field_0x8);
+        mColor.a = ((++mTimer * 0xFF) / mDuration);
 
-        if (field_0xa >= field_0x8) {
-            mStatus = 0;
+        if (mTimer >= mDuration) {
+            mStatus = None;
         }
 
         break;
@@ -77,53 +77,53 @@ void JUTFader::draw() {
     }
 }
 
-bool JUTFader::startFadeIn(int param_0) {
+bool JUTFader::startFadeIn(int duration) {
     bool statusCheck = mStatus == 0;
 
     if (statusCheck) {
-        mStatus = 2;
-        field_0xa = 0;
-        field_0x8 = param_0;
+        mStatus = FadeIn;
+        mTimer = 0;
+        mDuration = duration;
     }
 
     return statusCheck;
 }
 
-bool JUTFader::startFadeOut(int param_0) {
+bool JUTFader::startFadeOut(int duration) {
     bool statusCheck = mStatus == 1;
 
     if (statusCheck) {
-        mStatus = 3;
-        field_0xa = 0;
-        field_0x8 = param_0;
+        mStatus = FadeOut;
+        mTimer = 0;
+        mDuration = duration;
     }
 
     return statusCheck;
 }
 
-void JUTFader::setStatus(JUTFader::EStatus i_status, int param_1) {
+void JUTFader::setStatus(JUTFader::EStatus i_status, int timer) {
     switch (i_status) {
-    case 0: 
-        if (param_1 != 0) {
-            field_0x24 = 0;
-            mEStatus = param_1;
+    case None: 
+        if (timer != 0) {
+            mNextStatus = None;
+            mStatusTimer = timer;
             break;
         }
 
-        mStatus = 0;
-        field_0x24 = 0;
-        mEStatus = 0;
+        mStatus = None;
+        mNextStatus = None;
+        mStatusTimer = 0;
         break;
-    case 1: 
-        if (param_1 != 0) {
-            field_0x24 = 1;
-            mEStatus = param_1;
+    case Wait:
+        if (timer != 0) {
+            mNextStatus = Wait;
+            mStatusTimer = timer;
             break;
         }
 
-        mStatus = 1;
-        field_0x24 = 1;
-        mEStatus = 0;
+        mStatus = Wait;
+        mNextStatus = Wait;
+        mStatusTimer = 0;
         break;
     }
 }
diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp
index 6d424466e5..7f76f807df 100644
--- a/src/d/d_menu_window.cpp
+++ b/src/d/d_menu_window.cpp
@@ -699,7 +699,7 @@ void dMw_c::collect_open_proc() {
         dMeter2Info_set2DVibrationM();
     }
 
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         mMenuProc = COLLECT_MOVE;
     }
 }
@@ -914,7 +914,7 @@ void dMw_c::collect_letter_move_proc() {
 }
 
 void dMw_c::collect_letter_close_proc() {
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         mMenuProc = COLLECT_MOVE;
     }
 }
@@ -946,7 +946,7 @@ void dMw_c::collect_fishing_move_proc() {
 }
 
 void dMw_c::collect_fishing_close_proc() {
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         mMenuProc = COLLECT_MOVE;
     }
 }
@@ -977,7 +977,7 @@ void dMw_c::collect_skill_move_proc() {
 }
 
 void dMw_c::collect_skill_close_proc() {
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         mMenuProc = COLLECT_MOVE;
     }
 }
@@ -1008,13 +1008,13 @@ void dMw_c::collect_insect_move_proc() {
 }
 
 void dMw_c::collect_insect_close_proc() {
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         mMenuProc = COLLECT_MOVE;
     }
 }
 
 void dMw_c::insect_open_proc() {
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         field_0x152 = 0;
         dComIfGp_setHeapLockFlag(1);
         dMw_insect_create(1);
@@ -1050,7 +1050,7 @@ void dMw_c::insect_move_proc() {
 }
 
 void dMw_c::insect_close_proc() {
-    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
+    if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::None) {
         mMenuProc = NO_MENU;
     }
 }
diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp
index 1ae49ab74a..43732cf4be 100644
--- a/src/d/d_ovlp_fade.cpp
+++ b/src/d/d_ovlp_fade.cpp
@@ -26,8 +26,8 @@ static void dOvlpFd_startFadeIn(int param_0) {
     JUTFader* fader = JFWDisplay::getManager()->getFader();
     JUT_ASSERT(0, fader != NULL);
 
-    fader->setStatus(JUTFader::UNKSTATUS_0, 0);
-    fader->setStatus(JUTFader::UNKSTATUS_0, -1);
+    fader->setStatus(JUTFader::None, 0);
+    fader->setStatus(JUTFader::None, -1);
     fader->startFadeIn(param_0);
 }