Fix the case sensitive bugs