Replaced some snake_case with camelCase