x |= _EEM1 | _EECS;
        r8712_write8(padapter, EE_9346CR, x);
        shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5);
-       if (padapter->EepromAddressSize == 8)   /*CF+ and SDIO*/
+       if (padapter->eeprom_address_size == 8) /*CF+ and SDIO*/
                shift_out_bits(padapter, 0, 6);
        else    /* USB */
                shift_out_bits(padapter, 0, 4);
         */
        shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3);
        /* select which word in the EEPROM that we are writing to. */
-       shift_out_bits(padapter, reg, padapter->EepromAddressSize);
+       shift_out_bits(padapter, reg, padapter->eeprom_address_size);
        /* write the data to the selected EEPROM word. */
        shift_out_bits(padapter, data, 16);
        if (wait_eeprom_cmd_done(padapter)) {
         * The opcode is 3bits in length, reg is 6 bits long
         */
        shift_out_bits(padapter, EEPROM_READ_OPCODE, 3);
-       shift_out_bits(padapter, reg, padapter->EepromAddressSize);
+       shift_out_bits(padapter, reg, padapter->eeprom_address_size);
        /* Now read the data (16 bits) in from the selected EEPROM word */
        data = shift_in_bits(padapter);
        eeprom_clean(padapter);
 
        struct usb_device *pusbd = pdvobjpriv->pusbdev;
 
        pdvobjpriv->padapter = padapter;
-       padapter->EepromAddressSize = 6;
+       padapter->eeprom_address_size = 6;
        phost_iface = &pintf->altsetting[0];
        piface_desc = &phost_iface->desc;
        pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;