Fixed up a few names and references for clarification.