Renaming to resolve ambiguities.