Renamed some devices to fit the display :)