tweak some names