diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index ed4fe15e..c94fae63 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -95,7 +95,7 @@ static BOOL isTwlModeLoad(void);
 static HotSwState ReadSecureModeCardData(void);
 static void ClearCardFlgs(void);
 
-static void FinalizeHotSw(HotSwCardState type);
+static void FinalizeHotSw(HotSwCardState state);
 static void ForceNitroModeToFinalize(void);
 static void ForceNormalModeToFinalize(void);
 static BOOL ChangeGameMode(void);
@@ -1563,7 +1563,7 @@ static void HotSwThread(void *arg)
         }
 
         if( msg->finalize == TRUE && msg->ctrl == FALSE) {
-            FinalizeHotSw( msg->apli );
+            FinalizeHotSw( msg->state );
         }
 
 #ifdef USE_WRAM_LOAD
@@ -2101,17 +2101,17 @@ static void InterruptCallbackPxi(PXIFifoTag tag, u32 data, BOOL err)
 
 #ifndef USE_WRAM_LOAD
 	OS_TPrintf("... Pxi Message - value:%x  ctrl:%x  finalize:%x  bootType:%x\n",
-               					d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.bootType);
+               					d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.cardState);
 #else
 	OS_TPrintf("... Pxi Message - value:%x  ctrl:%x  finalize:%x  read:%x  bootType:%x\n",
-               					d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.read, d.msg.bootType);
+               					d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.read, d.msg.cardState);
 
     HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].read	 	= (d.msg.read) ? TRUE : FALSE;
 #endif
 	HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].ctrl  	= (d.msg.ctrl) ? TRUE : FALSE;
 	HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].finalize 	= (d.msg.finalize) ? TRUE : FALSE;
 	HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].value 	= d.msg.value;
-	HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].apli  	= (HotSwCardState)d.msg.bootType;
+	HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].state  	= (HotSwCardState)d.msg.cardState;
     
 	// メッセージ送信
 	OS_SendMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl], OS_MESSAGE_NOBLOCK);
diff --git a/build/libraries_sysmenu/hotsw/ARM9/src/hotsw_ctrl.c b/build/libraries_sysmenu/hotsw/ARM9/src/hotsw_ctrl.c
index 13f5c494..101c9344 100644
--- a/build/libraries_sysmenu/hotsw/ARM9/src/hotsw_ctrl.c
+++ b/build/libraries_sysmenu/hotsw/ARM9/src/hotsw_ctrl.c
@@ -181,7 +181,7 @@ void HOTSW_InvalidHotSW( void )
   
   Description:  PXI通信でARM7に活線挿抜Finalize処理を通知
  *---------------------------------------------------------------------------*/
-void HOTSW_FinalizeHotSWAsync( HotSwCardState apliType )
+void HOTSW_FinalizeHotSWAsync( HotSwCardState cardState )
 {
 	HotSwPxiMessageForArm7 msg;
 
@@ -189,7 +189,7 @@ void HOTSW_FinalizeHotSWAsync( HotSwCardState apliType )
     
     msg.msg.finalize = TRUE;
     msg.msg.ctrl     = FALSE;
-    msg.msg.bootType = (u8)apliType;
+    msg.msg.cardState= (u8)cardState;
     
 	while (PXI_SendWordByFifo(PXI_FIFO_TAG_HOTSW, msg.data, FALSE) != PXI_FIFO_SUCCESS)
     {
diff --git a/include/sysmenu/hotsw/common/hotsw.h b/include/sysmenu/hotsw/common/hotsw.h
index d8be5fef..63e21010 100644
--- a/include/sysmenu/hotsw/common/hotsw.h
+++ b/include/sysmenu/hotsw/common/hotsw.h
@@ -51,11 +51,11 @@ typedef enum HotSwCardState{
 // PXI用メッセージ
 typedef union HotSwPxiMessageForArm7{
     struct {
-    	u32		value	:1;
-    	u32		ctrl	:1;
-        u32		finalize:1;
-        u32		read	:1;
-        u32		bootType:8;
+    	u32		value	 :1;
+    	u32		ctrl	 :1;
+        u32		finalize :1;
+        u32		read	 :1;
+        u32		cardState:8;
     	u32		:20;
     } msg;
     u32 data;
@@ -81,7 +81,7 @@ typedef struct HotSwMessageForArm7{
     BOOL			 finalize;
     BOOL			 read;
 	HotSwMessageType type;
-    HotSwCardState   apli;
+    HotSwCardState   state;
 } HotSwMessageForArm7;
 
 typedef struct HotSwMessageForArm9{
@@ -109,7 +109,7 @@ void HOTSW_InvalidHotSWAsync( void );
 void HOTSW_InvalidHotSW( void );
 
 // PXI通信でARM7に活線挿抜Finalize処理を通知
-void HOTSW_FinalizeHotSWAsync( HotSwCardState apliType );
+void HOTSW_FinalizeHotSWAsync( HotSwCardState cardState );
 
 // 活線挿抜の許可/抑制の状態を返す
 BOOL HOTSW_isEnableHotSW(void);