Move to standard names

Change-Id: Iec020ccbad3f7e0336ad0e8a31d0dda114b95908