Change some names and other things