Change some names
