changed some variable and method names to more descriptive ones
Authored by: heiko 2013-01-05
Parent: [r301]
Child: [r303]