make naming more consistent