Update class names to help with shift away from cube specific shapes.
Update class names to help with shift away from cube specific shapes.