REFACTORING Mensch ohne _

Change-Id: I19f402c284e9201349ad11df5b60438f4edcb561
Signed-off-by: Martika <Martika@MC2>