Changed the Device attribute names.