Some more case sensitivity changes in build