Adapt to upstream core library terminology changes.