Rename ambiguous classes