optimized some geometries
renamed class
Revert "renamed class"

This reverts commit 4deeb7e27ffed2af478990bc5457a813cfe5c001.
renamed class