Device Name Change

Change-Id: I4fb68601aeac045557b85c9cd48b7009555b6880