Add a simple name for the lookup table.
Add aland and awater because it might be used at some point.