make naming more consistent with the average american theme