Some name tweaks