Fixed case sensitivity issues