struct host_if_wep_attr {
        u8 *key;
        u8 key_len;
-       u8 u8Wepidx;
+       u8 index;
        u8 u8mode;
        enum AUTHTYPE tenuAuth_type;
 };
                if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY_AP) {
 
                        PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
-                       PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx));
+                       PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", (pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index));
                        strWIDList[0].id = (u16)WID_11I_MODE;
                        strWIDList[0].type = WID_CHAR;
                        strWIDList[0].size = sizeof(char);
                        strWIDList[2].id = (u16)WID_KEY_ID;
                        strWIDList[2].type = WID_CHAR;
 
-                       strWIDList[2].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx));
+                       strWIDList[2].val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index));
                        strWIDList[2].size = sizeof(char);
 
 
                                PRINT_ER("No buffer to send Key\n");
                                return -1;
                        }
-                       pu8keybuf[0] = pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx;
+                       pu8keybuf[0] = pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index;
 
                        memcpy(pu8keybuf + 1, &pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.key_len, 1);
 
                        strWID.id = (u16)WID_REMOVE_WEP_KEY;
                        strWID.type = WID_STR;
 
-                       s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx;
+                       s8idxarray[0] = (s8)pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index;
                        strWID.val = s8idxarray;
                        strWID.size = 1;
 
                } else {
                        strWID.id = (u16)WID_KEY_ID;
                        strWID.type = WID_CHAR;
-                       strWID.val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.u8Wepidx));
+                       strWID.val = (s8 *)(&(pstrHostIFkeyAttr->uniHostIFkeyAttr.wep.index));
                        strWID.size = sizeof(char);
 
                        PRINT_D(HOSTINF_DBG, "Setting default key index\n");
        msg.body.key_info.enuKeyType = WEP;
        msg.body.key_info.u8KeyAction = REMOVEKEY;
        msg.drv = hif_drv;
-       msg.body.key_info.uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = index;
+       msg.body.key_info.uniHostIFkeyAttr.wep.index = index;
 
        /* send the message */
        result = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
        msg.drv = hif_drv;
 
 
-       msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8Index;
+       msg.body.key_info.uniHostIFkeyAttr.wep.index = u8Index;
 
        /* send the message */
        s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
 
        msg.body.key_info.uniHostIFkeyAttr.wep.key_len = (u8WepKeylen);
 
-       msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8Keyidx;
+       msg.body.key_info.uniHostIFkeyAttr.wep.index = u8Keyidx;
 
        /* send the message */
        s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
 
        msg.body.key_info.uniHostIFkeyAttr.wep.key_len = (u8WepKeylen);
 
-       msg.body.key_info.uniHostIFkeyAttr.wep.u8Wepidx = u8Keyidx;
+       msg.body.key_info.uniHostIFkeyAttr.wep.index = u8Keyidx;
 
        msg.body.key_info.uniHostIFkeyAttr.wep.u8mode = u8mode;