Some tweaks to names.