Added uppercase/lowercase letters criteries criteria.
Fix class names.