Fix awkward naming conflict.