Update Devicename to match CM10.1 naming scheme

Change-Id: I206e6e56355ed296901bb2b86c9364fe896baaae