changed names of Geom and Stat objects to not conflict with enums