Fixed the rest of the case insensitivity problems