Update names for core changes.