Renamed a number of variables and methods.
Authored by: bugman 2008-06-22
Parent: [r6420]
Child: [r6422]