Roger: fixed small problems with case-sensitivity