Added support for changing name of device