Added devce name setting code