made an other ctor in the decorators an some name changes

Signed-off-by: kschmidi <kschmidi@hsr.ch>