Device Name Change

Change-Id: I7b60977da53b83d1ea7b4e33f386469f8a55d7f1