changing some names