OSX non-case-sensitivity fix part 1
OSX non-case-sensitivity fix part 2