johan playground change; some internal renamings
Authored by: vsp_nagel 2014-09-11
Parent: [r30257]
Child: [r30259]