Various name tweaks.