Until it's the German bureaucrats that ruin your day.

This is an international issue and a national answer doesn't solve it.

For what it's worth my first name is also not accepted correctly (it contains a hyphen) and I never had a problem so far. But every time an airline asks me to put my name exactly as in the passport I cringe.