CMS-98: Case sensitivity issue