Renamed devices to be more specific and meet conventions