Changed ShapeTypes enum to CamelCase