Fix compilation errors on OS X.
Minor renaming.