Rename more boat variables