Bug 13465: Correct the field prefix ambiguity