Switching from underscore to CamelCase for the exported class names