diff --git a/compiler/base/design.py b/compiler/base/design.py
index c8bf3070..080a9168 100644
--- a/compiler/base/design.py
+++ b/compiler/base/design.py
@@ -57,6 +57,12 @@ class design(hierarchy_design):
                                                   self.cell_name,
                                                   GDS["unit"])
 
+            # Convert names back to the original names
+            # so that copying will use the new names
+            for pin_name in self.pin_map:
+                for index1, pin in enumerate(self.pin_map[pin_name]):
+                    self.pin_map[pin_name][index1].name = self.get_original_pin_name(pin.name)
+
             self.width = width
             self.height = height
 
diff --git a/compiler/tests/20_sram_1bank_2mux_1rw_1r_test.py b/compiler/tests/20_sram_1bank_2mux_1rw_1r_test.py
index b8d90ad0..bac2fd5f 100755
--- a/compiler/tests/20_sram_1bank_2mux_1rw_1r_test.py
+++ b/compiler/tests/20_sram_1bank_2mux_1rw_1r_test.py
@@ -23,7 +23,6 @@ class sram_1bank_2mux_1rw_1r_test(openram_test):
         globals.init_openram(config_file)
         from sram_config import sram_config
 
-        OPTS.route_supplies = False
         OPTS.num_rw_ports = 1
         OPTS.num_r_ports = 1
         OPTS.num_w_ports = 0
diff --git a/compiler/tests/20_sram_1bank_2mux_global_test.py b/compiler/tests/20_sram_1bank_2mux_global_test.py
index 93caeb86..008cdece 100755
--- a/compiler/tests/20_sram_1bank_2mux_global_test.py
+++ b/compiler/tests/20_sram_1bank_2mux_global_test.py
@@ -23,7 +23,6 @@ class sram_1bank_2mux_global_test(openram_test):
         globals.init_openram(config_file)
         from sram_config import sram_config
         OPTS.local_array_size = 8
-        OPTS.route_supplies = False
         c = sram_config(word_size=8,
                         num_words=32,
                         num_banks=1)
diff --git a/compiler/tests/22_sram_1bank_2mux_global_func_test.py b/compiler/tests/22_sram_1bank_2mux_global_func_test.py
index e815c826..67ae2a25 100755
--- a/compiler/tests/22_sram_1bank_2mux_global_func_test.py
+++ b/compiler/tests/22_sram_1bank_2mux_global_func_test.py
@@ -33,7 +33,6 @@ class sram_1bank_2mux_func_test(openram_test):
         from characterizer import functional
         from sram_config import sram_config
         OPTS.local_array_size = 8
-        OPTS.route_supplies = False
         c = sram_config(word_size=8,
                         num_words=32,
                         num_banks=1)