final internal naming change to align with #23