trying to get some sort of consistent naming