Renamed device related classes to hopefully be more clear and representative of their function.