Changes to some names