implemented rest of margreet's terminology changes