CAAERS-7013, spelling fix and added some mixed cases.
Merge branch 'feature/CAAERS-7013' into develop