move things around to a more consistent naming (sorry collaborators)