fix handling of equivalent names