DeviceSettings: Update more with new class name for DeviceSettings