FIXED wrong item names.

Signed-off-by: Michael Grammling <m.grammling@external.telekom.de>
CHANGED: Minor code improvements.

Signed-off-by: Michael Grammling <m.grammling@external.telekom.de>