Strip out left-over name prefixes when we have a source without them

Especially when not cleanly separated we cannot be sure it's actually
a badly placed prefix, but a second source without it is a pretty strong
indicator.