Some terminology changes.