Fix compilation on OSX

Fixes a naming conflict and stops clang's whining.