Rename variables for consistency
Rename variables for consistency

twpayne/gogeom,ctessum/geom,twpayne/gogeom,foobaz/geom,ctessum/geom,owcm/geom,ctessum/geom,owcm/geom,foobaz/geom,owcm/geom,ctessum/geom,owcm/geom