Move to standard names

Change-Id: Ia0e7c29fbba9c4f045d5839eaf73ae31e4ccab5d