Some renaming and save point to cpBody changes.