Adjust for recent name changes.