fixing terminology issues