CLIMATE-542: Change from camelcase to snakecase