torwaechter: try to unify different namings