improve device name

Change-Id: Ib030983545f2950cefb5ae7f5fbc3c7c4e9600b8