Use correct USB & machine names