Move to standard names

Change-Id: Ife735176e5f9407fd982ad6f806d5577cdb1cf90