Main and camelCase fix