minor cleanup of names tweak