more name tweaks