Fixed some terminology issues.