Changed terminology to make things clearer.