Disambiguate core patches