Revert "Rename device name"

This reverts commit f8a6014eaaebc467bcea422a5c8fdbf15f65d866.
Revert "Rename device name"

This reverts commit d8440420da6ba71073aad5003cd157b7b99e8a3f.