Use snake_case across the board