This is more consistent with the rest of the LLVM project, and the resulting names are closer to the types defined in each of the headers.