Renaming to deal with case insensitivity, part 1.
Renaming to deal with case insensitivity, part 2.