Improve class names