diff --git a/umi/__init__.py b/umi/__init__.py
index d742e6a..77a0b61 100644
--- a/umi/__init__.py
+++ b/umi/__init__.py
@@ -1,4 +1,4 @@
-from umi import umi, lumi
+from umi import sumi, lumi
 
 
 __version__ = "0.1.2"
@@ -6,6 +6,6 @@
 
 def setup(chip):
     return [
-        umi.setup(chip),
+        sumi.setup(chip),
         lumi.setup(chip)
     ]
diff --git a/umi/lumi/__init__.py b/umi/lumi/__init__.py
index 944d14f..3ba64f5 100644
--- a/umi/lumi/__init__.py
+++ b/umi/lumi/__init__.py
@@ -1,5 +1,5 @@
 from siliconcompiler import Library
-from umi import umi
+from umi import sumi
 from lambdalib import auxlib, ramlib
 
 
diff --git a/umi/lumi/rtl/lumi.v b/umi/lumi/rtl/lumi.v
index 930888d..79fb11d 100644
--- a/umi/lumi/rtl/lumi.v
+++ b/umi/lumi/rtl/lumi.v
@@ -127,7 +127,7 @@ module lumi
    wire [RW-1:0]        cb2fifo_data;
    wire [AW-1:0]        cb2fifo_dstaddr;
    wire                 cb2fifo_ready;
-   wire [AW-1:0]        cb2fifo_srcaddr;
+     wire [AW-1:0]        cb2fifo_srcaddr;
    wire                 cb2fifo_valid;
    wire [CW-1:0]        cb2regs_cmd;
    wire [RW-1:0]        cb2regs_data;
diff --git a/umi/umi/__init__.py b/umi/sumi/__init__.py
similarity index 68%
rename from umi/umi/__init__.py
rename to umi/sumi/__init__.py
index bb9fd60..5049d2b 100644
--- a/umi/umi/__init__.py
+++ b/umi/sumi/__init__.py
@@ -1,13 +1,12 @@
 from siliconcompiler import Library
 from lambdalib import auxlib, ramlib, vectorlib
 
-
 def setup(chip):
-    lib = Library(chip, "umi", package="umi", auto_enable=True)
+    lib = Library(chip, "sumi", package="umi", auto_enable=True)
     lib.register_source("umi", "python://umi")
 
-    lib.add("option", "idir", "umi/rtl")
-    lib.add("option", "ydir", "umi/rtl")
+    lib.add("option", "idir", "sumi/rtl")
+    lib.add("option", "ydir", "sumi/rtl")
 
     lib.add("option", "idir", "utils/rtl")
     lib.add("option", "ydir", "utils/rtl")
diff --git a/umi/umi/rtl/umi_arbiter.v b/umi/sumi/rtl/umi_arbiter.v
similarity index 100%
rename from umi/umi/rtl/umi_arbiter.v
rename to umi/sumi/rtl/umi_arbiter.v
diff --git a/umi/umi/rtl/umi_crossbar.v b/umi/sumi/rtl/umi_crossbar.v
similarity index 100%
rename from umi/umi/rtl/umi_crossbar.v
rename to umi/sumi/rtl/umi_crossbar.v
diff --git a/umi/umi/rtl/umi_decode.v b/umi/sumi/rtl/umi_decode.v
similarity index 100%
rename from umi/umi/rtl/umi_decode.v
rename to umi/sumi/rtl/umi_decode.v
diff --git a/umi/umi/rtl/umi_endpoint.v b/umi/sumi/rtl/umi_endpoint.v
similarity index 100%
rename from umi/umi/rtl/umi_endpoint.v
rename to umi/sumi/rtl/umi_endpoint.v
diff --git a/umi/umi/rtl/umi_fifo.v b/umi/sumi/rtl/umi_fifo.v
similarity index 100%
rename from umi/umi/rtl/umi_fifo.v
rename to umi/sumi/rtl/umi_fifo.v
diff --git a/umi/umi/rtl/umi_fifo_flex.v b/umi/sumi/rtl/umi_fifo_flex.v
similarity index 100%
rename from umi/umi/rtl/umi_fifo_flex.v
rename to umi/sumi/rtl/umi_fifo_flex.v
diff --git a/umi/umi/rtl/umi_isolate.v b/umi/sumi/rtl/umi_isolate.v
similarity index 100%
rename from umi/umi/rtl/umi_isolate.v
rename to umi/sumi/rtl/umi_isolate.v
diff --git a/umi/umi/rtl/umi_mem_agent.v b/umi/sumi/rtl/umi_mem_agent.v
similarity index 100%
rename from umi/umi/rtl/umi_mem_agent.v
rename to umi/sumi/rtl/umi_mem_agent.v
diff --git a/umi/umi/rtl/umi_messages.vh b/umi/sumi/rtl/umi_messages.vh
similarity index 100%
rename from umi/umi/rtl/umi_messages.vh
rename to umi/sumi/rtl/umi_messages.vh
diff --git a/umi/umi/rtl/umi_mux.v b/umi/sumi/rtl/umi_mux.v
similarity index 100%
rename from umi/umi/rtl/umi_mux.v
rename to umi/sumi/rtl/umi_mux.v
diff --git a/umi/umi/rtl/umi_pack.v b/umi/sumi/rtl/umi_pack.v
similarity index 100%
rename from umi/umi/rtl/umi_pack.v
rename to umi/sumi/rtl/umi_pack.v
diff --git a/umi/umi/rtl/umi_pipeline.v b/umi/sumi/rtl/umi_pipeline.v
similarity index 100%
rename from umi/umi/rtl/umi_pipeline.v
rename to umi/sumi/rtl/umi_pipeline.v
diff --git a/umi/umi/rtl/umi_priority.v b/umi/sumi/rtl/umi_priority.v
similarity index 100%
rename from umi/umi/rtl/umi_priority.v
rename to umi/sumi/rtl/umi_priority.v
diff --git a/umi/umi/rtl/umi_ram.v b/umi/sumi/rtl/umi_ram.v
similarity index 100%
rename from umi/umi/rtl/umi_ram.v
rename to umi/sumi/rtl/umi_ram.v
diff --git a/umi/umi/rtl/umi_regif.v b/umi/sumi/rtl/umi_regif.v
similarity index 100%
rename from umi/umi/rtl/umi_regif.v
rename to umi/sumi/rtl/umi_regif.v
diff --git a/umi/umi/rtl/umi_splitter.v b/umi/sumi/rtl/umi_splitter.v
similarity index 100%
rename from umi/umi/rtl/umi_splitter.v
rename to umi/sumi/rtl/umi_splitter.v
diff --git a/umi/umi/rtl/umi_stimulus.v b/umi/sumi/rtl/umi_stimulus.v
similarity index 100%
rename from umi/umi/rtl/umi_stimulus.v
rename to umi/sumi/rtl/umi_stimulus.v
diff --git a/umi/umi/rtl/umi_unpack.v b/umi/sumi/rtl/umi_unpack.v
similarity index 100%
rename from umi/umi/rtl/umi_unpack.v
rename to umi/sumi/rtl/umi_unpack.v
diff --git a/umi/umi/testbench/config.vlt b/umi/sumi/testbench/config.vlt
similarity index 100%
rename from umi/umi/testbench/config.vlt
rename to umi/sumi/testbench/config.vlt
diff --git a/umi/umi/testbench/cpp/umi_testbench.cc b/umi/sumi/testbench/cpp/umi_testbench.cc
similarity index 100%
rename from umi/umi/testbench/cpp/umi_testbench.cc
rename to umi/sumi/testbench/cpp/umi_testbench.cc
diff --git a/umi/umi/testbench/dut_umi_fifo.v b/umi/sumi/testbench/dut_umi_fifo.v
similarity index 100%
rename from umi/umi/testbench/dut_umi_fifo.v
rename to umi/sumi/testbench/dut_umi_fifo.v
diff --git a/umi/umi/testbench/dut_umi_fifo_flex.v b/umi/sumi/testbench/dut_umi_fifo_flex.v
similarity index 100%
rename from umi/umi/testbench/dut_umi_fifo_flex.v
rename to umi/sumi/testbench/dut_umi_fifo_flex.v
diff --git a/umi/umi/testbench/test_crossbar.py b/umi/sumi/testbench/test_crossbar.py
similarity index 100%
rename from umi/umi/testbench/test_crossbar.py
rename to umi/sumi/testbench/test_crossbar.py
diff --git a/umi/umi/testbench/test_fifo.py b/umi/sumi/testbench/test_fifo.py
similarity index 100%
rename from umi/umi/testbench/test_fifo.py
rename to umi/sumi/testbench/test_fifo.py
diff --git a/umi/umi/testbench/test_fifo_flex.py b/umi/sumi/testbench/test_fifo_flex.py
similarity index 100%
rename from umi/umi/testbench/test_fifo_flex.py
rename to umi/sumi/testbench/test_fifo_flex.py
diff --git a/umi/umi/testbench/test_mem_agent.py b/umi/sumi/testbench/test_mem_agent.py
similarity index 100%
rename from umi/umi/testbench/test_mem_agent.py
rename to umi/sumi/testbench/test_mem_agent.py
diff --git a/umi/umi/testbench/test_regif.py b/umi/sumi/testbench/test_regif.py
similarity index 100%
rename from umi/umi/testbench/test_regif.py
rename to umi/sumi/testbench/test_regif.py
diff --git a/umi/umi/testbench/test_umi_ram.py b/umi/sumi/testbench/test_umi_ram.py
similarity index 100%
rename from umi/umi/testbench/test_umi_ram.py
rename to umi/sumi/testbench/test_umi_ram.py
diff --git a/umi/umi/testbench/testbench_crossbar.sv b/umi/sumi/testbench/testbench_crossbar.sv
similarity index 100%
rename from umi/umi/testbench/testbench_crossbar.sv
rename to umi/sumi/testbench/testbench_crossbar.sv
diff --git a/umi/umi/testbench/testbench_fifo.sv b/umi/sumi/testbench/testbench_fifo.sv
similarity index 100%
rename from umi/umi/testbench/testbench_fifo.sv
rename to umi/sumi/testbench/testbench_fifo.sv
diff --git a/umi/umi/testbench/testbench_fifo_flex.sv b/umi/sumi/testbench/testbench_fifo_flex.sv
similarity index 100%
rename from umi/umi/testbench/testbench_fifo_flex.sv
rename to umi/sumi/testbench/testbench_fifo_flex.sv
diff --git a/umi/umi/testbench/testbench_mem_agent.sv b/umi/sumi/testbench/testbench_mem_agent.sv
similarity index 100%
rename from umi/umi/testbench/testbench_mem_agent.sv
rename to umi/sumi/testbench/testbench_mem_agent.sv
diff --git a/umi/umi/testbench/testbench_regif.sv b/umi/sumi/testbench/testbench_regif.sv
similarity index 100%
rename from umi/umi/testbench/testbench_regif.sv
rename to umi/sumi/testbench/testbench_regif.sv
diff --git a/umi/umi/testbench/testbench_umi_ram.sv b/umi/sumi/testbench/testbench_umi_ram.sv
similarity index 100%
rename from umi/umi/testbench/testbench_umi_ram.sv
rename to umi/sumi/testbench/testbench_umi_ram.sv
diff --git a/umi/umi/testbench/umi_testbench.py b/umi/sumi/testbench/umi_testbench.py
similarity index 100%
rename from umi/umi/testbench/umi_testbench.py
rename to umi/sumi/testbench/umi_testbench.py