Fix multi name

This fixes the #9704 issue from redmine. The multi-instance circuitry is a quite tricky part! Please review carefully, probably nice for the 1.4 release.