Changed to CamelCase on main classes