Move to standard names

Change-Id: Ic40939ffbbddd2b2a9c50a0a82119e5ec95420d9