Renamed Devices

Please keep the lists sorted alphabetically.