make naming consistent