Modify userspace to use device names [2/3]