Fix more case-sensitive cases