Changed the DeviceName and DeviceId to be settable outside of the constructor.