Removed ambiguity from proxy names.