more renames: usb -> usb1