Update for current naming conventions.

I will change identifyFileType to use a StringRef in the next patch.