fix some names