Rename more things and rebuild