renaming back to device make for proper naming convention