mostly make Iris compatible with name mangling

This fixes most of the remaining cases of Iris depending on auto-generated names (just one in iInv remains that's a bit more tricky to fix).