Update Device name to match 'cm' naming scheme