Remove underscore in class name.