Revert "Rename device name"

This reverts commit 9ad454592aeca2eae448150173220eb78c88222e.