arnipetursson, great find. I confirmed sp_setnetname worked and I consider it much cleaner as behind the scene this line does the magic:

EXEC %%LinkedServer ( Name = @server ) . SetDatasource ( Datasource = @netname )

I hope this helps the next person who runs into this situation!

Cheers!