clean up names.