Update example geometries

- Simplify
- Ensure complete containment
- Use consistent naming scheme