There, clean up names.