Finally fix case-sensitivity issues