struct op_mode mode;
        struct set_mac_addr set_mac_info;
        struct get_mac_addr get_mac_info;
-       struct ba_session_info strHostIfBASessionInfo;
+       struct ba_session_info session_info;
        struct remain_ch strHostIfRemainOnChan;
        struct reg_frame strHostIfRegisterFrame;
        char *pUserData;
                        break;
 
                case HOST_IF_MSG_ADD_BA_SESSION:
-                       Handle_AddBASession(msg.drvHandler, &msg.body.strHostIfBASessionInfo);
+                       Handle_AddBASession(msg.drvHandler, &msg.body.session_info);
                        break;
 
                case HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS:
-                       Handle_DelAllRxBASessions(msg.drvHandler, &msg.body.strHostIfBASessionInfo);
+                       Handle_DelAllRxBASessions(msg.drvHandler, &msg.body.session_info);
                        break;
 
                case HOST_IF_MSG_DEL_ALL_STA:
        s32 s32Error = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        struct host_if_msg msg;
-       struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+       struct ba_session_info *pBASessionInfo = &msg.body.session_info;
 
        if (pstrWFIDrv == NULL) {
                PRINT_ER("driver is null\n");
        s32 s32Error = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        struct host_if_msg msg;
-       struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+       struct ba_session_info *pBASessionInfo = &msg.body.session_info;
 
        if (pstrWFIDrv == NULL) {
                PRINT_ER("driver is null\n");
        s32 s32Error = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        struct host_if_msg msg;
-       struct ba_session_info *pBASessionInfo = &msg.body.strHostIfBASessionInfo;
+       struct ba_session_info *pBASessionInfo = &msg.body.session_info;
 
        if (pstrWFIDrv == NULL) {
                PRINT_ER("driver is null\n");