refactor to make naming consistant