Case-sensitivity fix, part 1
Case-sensitivity fix, part 2