more sensible class names