Remove underscore, I don't believe we've used them in class names elsewhere (something for the style guide?)