more consistent class names