Fix for case sensitivity issue

Finally figured out the squashed commits. Hope this works.