Added support for device name loading