Rename variables for consistency with new aggregrid
Rename variables for consistency with new aggregrid

JarvusInnovations/jarvus-aggregrid,JarvusInnovations/jarvus-aggregrid,JarvusInnovations/jarvus-aggregrid