Fixes #6444 - add support for virtual NICs

I fixed this and added a test covering cross renaming.