renamed some vars, which had dangerously similar names to some other vars
Authored by: "kifer" 2016-12-21
Parent: [r8901]
Child: [r8903]
