Rename 'Coordinates' to 'Geometry' ...for real this time