Fix a few more snake_case things