consistency fixes

also add :term: role