Move to standard names

Change-Id: I4bb90715e688d5eda479fed377b2ba1d4a7e514c