Feature/cfy 780 camelcase to underscore