More consistent class names.