revert: Use correct USB & machine names