Rename more variables to use "area".