Fix some names in the wake of my Mach-O changes to LLVM.