change names to reflect more mainstream usage