Fixed issues with named wire conflicts