Revert "Rename to Device"

This reverts commit b99221d2449fd5a6389a1e5848376e1a962aa76e.