clean up names for at