Change default names to avoid collision but still be legal.

tbsetup/ns2ir/sim.tcl.in

+# -*- tcl -*-
 #
 # EMULAB-COPYRIGHT
 # Copyright (c) 2000-2002 University of Utah and the Flux Group.
@@ -82,7 +83,7 @@ Simulator instproc node {args} {
 	punsup "Arguments for node: $args"
     }
     
-    set curnode node_n[incr id_counter]
+    set curnode tbnode-n[incr id_counter]
     Node $curnode $self
 
     # not adding simulated nodes to the node_list
@@ -108,7 +109,7 @@ Simulator instproc nsenode {args} {
 	punsup "Arguments for node: $args"
     }
     
-    set curnode nsenode_n[incr id_counter]
+    set curnode tbnsenode-n[incr id_counter]
     NSENode $curnode $self
 
     # not adding simulated nodes to the node_list
@@ -186,7 +187,7 @@ Simulator instproc duplex-link {n1 n2 bw delay type args} {
 	return ""
     }
 
-    set curlink link_l[incr id_counter]
+    set curlink tblink-l[incr id_counter]
 
     Link $curlink $self "$n1node $n2node" $rbw $rdelay $type	
     set lanlink_list($curlink) {}
@@ -250,7 +251,7 @@ Simulator instproc make-lan {nodelist bw delay args} {
 	    return ""
 	}
 
-	set curlan lan_l[incr id_counter]
+	set curlan tblan-lan[incr id_counter]
 	
 	# Convert bandwidth and delay
 	set rbw [parse_bw $bw]
@@ -702,7 +703,7 @@ Simulator instproc rtproto {type args} {
 Simulator instproc unknown {m args} {
     $self instvar id_counter
     punsup "Object $m"
-    NullClass null_n[incr id_counter] $m
+    NullClass tbnull-null[incr id_counter] $m
 }
 
 # rename_* <old> <new>