Refactoring to make names more descriptive...
Authored by: boescpa 2015-05-08
Parent: [r33032]
Child: [r33034]