Rename some things in generator