cleanup shape class names