Use snake case for strings and convert to camel for directory / PSR shit
Merge branch 'refs/heads/2.3/develop' into 3.0/develop