further cleanup, renamed some methods according to their new functionality
Authored by: grether 2009-05-21
Parent: [r7049]
Child: [r7051]