Allow clients to use alternative name ordering.

Change-Id: I3d1020ca1365eb6935195c1711e52877d9483f10