Rename some things, delete some things