Device Name Change

Change-Id: I30cbf4a51ee8749743df6fbaba6cb8fef0a85df3