switch terminology to make it more sematic