various name tweaks.