Fix renaming in UniquifyPorts (#930)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/scala/firrtl/passes/Uniquify.scala b/src/main/scala/firrtl/passes/Uniquify.scala
index 73f967f4..2b6fa55d 100644
--- a/src/main/scala/firrtl/passes/Uniquify.scala
+++ b/src/main/scala/firrtl/passes/Uniquify.scala
@@ -355,7 +355,9 @@ object Uniquify extends Transform {
         portTypeMap += (m.name -> uniquePortsType)
 
         ports zip uniquePortsType.fields map { case (p, f) =>
-          renames.rename(p.name, f.name)
+          (Utils.create_exps(p.name, p.tpe) zip Utils.create_exps(f.name, f.tpe)) foreach {
+            case (from, to) => renames.rename(from.serialize, to.serialize)
+          }
           Port(p.info, f.name, p.direction, f.tpe)
         }
       }