Harmonize & update usb mapping names
Harmonize & update usb mapping names