More consistent naming for concrete classes