x64-upstream: Fix device names when using --devices