use more consistent terminology