Make temporary names locally unique, rather than globally so

2 files changed, 1 insertions, 2 deletions

diff --git a/src/main/scala/Chisel/Builder.scala b/src/main/scala/Chisel/Builder.scala
index 3a6db75e..79d1ab18 100644
--- a/src/main/scala/Chisel/Builder.scala
+++ b/src/main/scala/Chisel/Builder.scala
@@ -36,7 +36,6 @@ private class IdGen {
 
 private[Chisel] trait HasId {
   private[Chisel] val _id = Builder.idGen.next
-  private[Chisel] def setRef() =  Builder.globalRefMap.setRef(this, s"T_${_id}")
   private[Chisel] def setRef(imm: Immediate) = Builder.globalRefMap.setRef(this, imm)
   private[Chisel] def setRef(name: String) = Builder.globalRefMap.setRef(this, name)
   private[Chisel] def setRef(parent: HasId, name: String) = Builder.globalRefMap.setField(parent, this, name)
diff --git a/src/main/scala/Chisel/Core.scala b/src/main/scala/Chisel/Core.scala
index e7dce33a..ccffbc96 100644
--- a/src/main/scala/Chisel/Core.scala
+++ b/src/main/scala/Chisel/Core.scala
@@ -779,7 +779,7 @@ abstract class Module(_clock: Clock = null, _reset: Bool = null) extends HasId {
       case id: HasId => id.setRef(_namespace.name(m.getName))
       case _ =>
     }
-    (_nodes ++ _children).foreach(_.setRef)
+    (_nodes ++ _children).foreach(_.setRef(_namespace.name("T")))
     this
   }