Changed some possibly confusing naming/explanations.