SAK-25514 renaming variables

git-svn-id: https://source.sakaiproject.org/svn/reference/trunk@316217 66ffb92e-73f9-0310-93c1-f5514f145a0a