Merge pull request #9680 from s0undt3ch/develop

Use the `__virtualname__` attribute
Let's not require these for now.