CAAERS-7013, spelling fix and added some mixed cases.