Fix DEVKIT-840 + improve cammel case cases