Resolve case sensitivity issues