more name tweaking