Fix non_snake_case warnings