Some minor tweaks to improve names.