Used type synonyms where appropriate