align with new terminology