clean up names ordering