changing to more consistent device naming
update