While up to personal taste to a certain extent, in general it is more
appropriate to use dashes instead of spaces to to combine related but
distinct terms.

This commit introduces dashes, so called Durchkopplungsbindestriche, to
some of the terms, were found more suiting.