refarctored names, introduced enumeration
Authored by: keidel 2006-06-09
Parent: [r3715]
Child: [r3717]