small name changes to make tests read nicer