adjusted class names