Revert "Revert "Fixed Case-Sensitive issues with OS X""

This reverts commit 647e1a3ef8b1ba605f1bec5963132a09887e6000.