Revert "Revert "Updating generator not to camelize everything""

This reverts commit 510dd7c25cab9e402ccab14cfd14791a2a94c44a.