make one diagnostic message make more sense
and use the right toolnames in the diagnostics