+ fix device name choice

Change-Id: If77e2e6396c68e1fc78fe9fe11810d9bbc3816dc