Minor variable naming changes.