diff --git a/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x1.rst b/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x1.rst
index 16bd888..dfa2fce 100644
--- a/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x1.rst
+++ b/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__addf_x1
+gf180mcu_fd_sc_mcu7t5v0__addf_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__addf_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__addf_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__addf_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_1 layout
 
 
 
diff --git a/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x2.rst b/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x2.rst
index 13f8fae..d5c9319 100644
--- a/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x2.rst
+++ b/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__addf_x2
+gf180mcu_fd_sc_mcu7t5v0__addf_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__addf_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__addf_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__addf_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_2 layout
 
 
 
diff --git a/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x4.rst b/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x4.rst
index 288952e..8e964a2 100644
--- a/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x4.rst
+++ b/cells/addf/gf180mcu_fd_sc_mcu7t5v0__addf_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__addf_x4
+gf180mcu_fd_sc_mcu7t5v0__addf_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__addf_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__addf_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__addf_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__addf_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addf_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addf_4 layout
 
 
 
diff --git a/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x1.rst b/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x1.rst
index 74bf957..512647d 100644
--- a/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x1.rst
+++ b/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__addh_x1
+gf180mcu_fd_sc_mcu7t5v0__addh_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__addh_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__addh_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__addh_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_1 layout
 
 
 
diff --git a/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x2.rst b/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x2.rst
index 4ecc5aa..db13e17 100644
--- a/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x2.rst
+++ b/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__addh_x2
+gf180mcu_fd_sc_mcu7t5v0__addh_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__addh_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__addh_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__addh_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_2 layout
 
 
 
diff --git a/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x4.rst b/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x4.rst
index e815375..ceb4127 100644
--- a/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x4.rst
+++ b/cells/addh/gf180mcu_fd_sc_mcu7t5v0__addh_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__addh_x4
+gf180mcu_fd_sc_mcu7t5v0__addh_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__addh_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__addh_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__addh_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__addh_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__addh_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__addh_4 layout
 
 
 
diff --git a/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x1.rst b/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x1.rst
index b93f51b..8a839c6 100644
--- a/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x1.rst
+++ b/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and2_x1
+gf180mcu_fd_sc_mcu7t5v0__and2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_1 layout
 
 
 
diff --git a/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x2.rst b/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x2.rst
index 813494f..c8a01fc 100644
--- a/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x2.rst
+++ b/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and2_x2
+gf180mcu_fd_sc_mcu7t5v0__and2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_2 layout
 
 
 
diff --git a/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x4.rst b/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x4.rst
index b43df40..4ba990a 100644
--- a/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x4.rst
+++ b/cells/and2/gf180mcu_fd_sc_mcu7t5v0__and2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and2_x4
+gf180mcu_fd_sc_mcu7t5v0__and2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and2_4 layout
 
 
 
diff --git a/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x1.rst b/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x1.rst
index db34baa..3a9996c 100644
--- a/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x1.rst
+++ b/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and3_x1
+gf180mcu_fd_sc_mcu7t5v0__and3_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and3_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and3_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and3_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_1 layout
 
 
 
diff --git a/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x2.rst b/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x2.rst
index d06865b..96c620f 100644
--- a/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x2.rst
+++ b/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and3_x2
+gf180mcu_fd_sc_mcu7t5v0__and3_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and3_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and3_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and3_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_2 layout
 
 
 
diff --git a/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x4.rst b/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x4.rst
index efdfba5..5e27461 100644
--- a/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x4.rst
+++ b/cells/and3/gf180mcu_fd_sc_mcu7t5v0__and3_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and3_x4
+gf180mcu_fd_sc_mcu7t5v0__and3_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and3_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and3_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and3_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and3_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and3_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and3_4 layout
 
 
 
diff --git a/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x1.rst b/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x1.rst
index bf4da41..0285eef 100644
--- a/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x1.rst
+++ b/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and4_x1
+gf180mcu_fd_sc_mcu7t5v0__and4_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and4_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and4_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and4_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_1 layout
 
 
 
diff --git a/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x2.rst b/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x2.rst
index e7e7a90..0a94dad 100644
--- a/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x2.rst
+++ b/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and4_x2
+gf180mcu_fd_sc_mcu7t5v0__and4_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and4_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and4_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and4_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_2 layout
 
 
 
diff --git a/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x4.rst b/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x4.rst
index 62b791c..ed056b6 100644
--- a/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x4.rst
+++ b/cells/and4/gf180mcu_fd_sc_mcu7t5v0__and4_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__and4_x4
+gf180mcu_fd_sc_mcu7t5v0__and4_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__and4_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__and4_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__and4_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__and4_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__and4_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__and4_4 layout
 
 
 
diff --git a/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x1.rst b/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x1.rst
index 8a92674..5b6d2bf 100644
--- a/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x1.rst
+++ b/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi21_x1
+gf180mcu_fd_sc_mcu7t5v0__aoi21_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_1 layout
 
 
 
diff --git a/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x2.rst b/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x2.rst
index 3fd41c3..56607db 100644
--- a/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x2.rst
+++ b/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi21_x2
+gf180mcu_fd_sc_mcu7t5v0__aoi21_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_2 layout
 
 
 
diff --git a/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x4.rst b/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x4.rst
index 95b4959..27c2558 100644
--- a/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x4.rst
+++ b/cells/aoi21/gf180mcu_fd_sc_mcu7t5v0__aoi21_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi21_x4
+gf180mcu_fd_sc_mcu7t5v0__aoi21_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi21_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi21_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi21_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi21_4 layout
 
 
 
diff --git a/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x1.rst b/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x1.rst
index 02a823f..927b357 100644
--- a/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x1.rst
+++ b/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi211_x1
+gf180mcu_fd_sc_mcu7t5v0__aoi211_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_1 layout
 
 
 
diff --git a/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x2.rst b/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x2.rst
index d087b9e..c88e366 100644
--- a/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x2.rst
+++ b/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi211_x2
+gf180mcu_fd_sc_mcu7t5v0__aoi211_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_2 layout
 
 
 
diff --git a/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x4.rst b/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x4.rst
index 17450b9..1e42648 100644
--- a/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x4.rst
+++ b/cells/aoi211/gf180mcu_fd_sc_mcu7t5v0__aoi211_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi211_x4
+gf180mcu_fd_sc_mcu7t5v0__aoi211_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi211_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi211_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi211_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi211_4 layout
 
 
 
diff --git a/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x1.rst b/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x1.rst
index 8a4fdc2..eb85d95 100644
--- a/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x1.rst
+++ b/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi22_x1
+gf180mcu_fd_sc_mcu7t5v0__aoi22_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_1 layout
 
 
 
diff --git a/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x2.rst b/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x2.rst
index 842f267..89a1b68 100644
--- a/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x2.rst
+++ b/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi22_x2
+gf180mcu_fd_sc_mcu7t5v0__aoi22_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_2 layout
 
 
 
diff --git a/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x4.rst b/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x4.rst
index e7c3342..a32625b 100644
--- a/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x4.rst
+++ b/cells/aoi22/gf180mcu_fd_sc_mcu7t5v0__aoi22_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi22_x4
+gf180mcu_fd_sc_mcu7t5v0__aoi22_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi22_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi22_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi22_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi22_4 layout
 
 
 
diff --git a/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x1.rst b/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x1.rst
index c50f31d..f931ac2 100644
--- a/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x1.rst
+++ b/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi221_x1
+gf180mcu_fd_sc_mcu7t5v0__aoi221_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_1 layout
 
 
 
diff --git a/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x2.rst b/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x2.rst
index fbf532f..0e5ca1d 100644
--- a/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x2.rst
+++ b/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi221_x2
+gf180mcu_fd_sc_mcu7t5v0__aoi221_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_2 layout
 
 
 
diff --git a/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x4.rst b/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x4.rst
index 216aafe..6f3720a 100644
--- a/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x4.rst
+++ b/cells/aoi221/gf180mcu_fd_sc_mcu7t5v0__aoi221_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi221_x4
+gf180mcu_fd_sc_mcu7t5v0__aoi221_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi221_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi221_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi221_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi221_4 layout
 
 
 
diff --git a/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x1.rst b/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x1.rst
index b6a3c16..5eeecd4 100644
--- a/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x1.rst
+++ b/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi222_x1
+gf180mcu_fd_sc_mcu7t5v0__aoi222_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_1 layout
 
 
 
diff --git a/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x2.rst b/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x2.rst
index 1454f78..7be6000 100644
--- a/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x2.rst
+++ b/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi222_x2
+gf180mcu_fd_sc_mcu7t5v0__aoi222_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_2 layout
 
 
 
diff --git a/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x4.rst b/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x4.rst
index 77a16ae..4acaed5 100644
--- a/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x4.rst
+++ b/cells/aoi222/gf180mcu_fd_sc_mcu7t5v0__aoi222_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__aoi222_x4
+gf180mcu_fd_sc_mcu7t5v0__aoi222_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__aoi222_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__aoi222_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__aoi222_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__aoi222_4 layout
 
 
 
diff --git a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x1.rst b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x1.rst
index bc143e9..f0d57c2 100644
--- a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x1.rst
+++ b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__buf_x1
+gf180mcu_fd_sc_mcu7t5v0__buf_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__buf_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__buf_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__buf_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_1 layout
 
 
 
diff --git a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x2.rst b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x2.rst
index 8b837a4..4c79204 100644
--- a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x2.rst
+++ b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__buf_x2
+gf180mcu_fd_sc_mcu7t5v0__buf_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__buf_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__buf_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__buf_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_2 layout
 
 
 
diff --git a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x3.rst b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x3.rst
index eb987a9..ba9d3cc 100644
--- a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x3.rst
+++ b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x3.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__buf_x3
+gf180mcu_fd_sc_mcu7t5v0__buf_3
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x3 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__buf_3 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_3.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x3 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_3 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x3 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__buf_3 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_3.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x3 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_3 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x3 layout**
+**gf180mcu_fd_sc_mcu7t5v0__buf_3 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_3.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x3 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_3 layout
 
 
 
diff --git a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x4.rst b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x4.rst
index d0da409..5b04e7d 100644
--- a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x4.rst
+++ b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__buf_x4
+gf180mcu_fd_sc_mcu7t5v0__buf_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__buf_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__buf_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__buf_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_4 layout
 
 
 
diff --git a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x8.rst b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x8.rst
index 2a8a091..f5f49f1 100644
--- a/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x8.rst
+++ b/cells/buf/gf180mcu_fd_sc_mcu7t5v0__buf_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__buf_x8
+gf180mcu_fd_sc_mcu7t5v0__buf_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__buf_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__buf_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__buf_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__buf_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__buf_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__buf_8 layout
 
 
 
diff --git a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x1.rst b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x1.rst
index b348c48..78e9c55 100644
--- a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x1.rst
+++ b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__bufz_x1
+gf180mcu_fd_sc_mcu7t5v0__bufz_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_1 layout
 
 
 
diff --git a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x2.rst b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x2.rst
index b752826..e7db427 100644
--- a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x2.rst
+++ b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__bufz_x2
+gf180mcu_fd_sc_mcu7t5v0__bufz_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_2 layout
 
 
 
diff --git a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x3.rst b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x3.rst
index 8277476..250af2c 100644
--- a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x3.rst
+++ b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x3.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__bufz_x3
+gf180mcu_fd_sc_mcu7t5v0__bufz_3
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x3 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_3 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_3.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x3 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_3 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x3 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_3 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_3.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x3 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_3 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x3 layout**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_3 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_3.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x3 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_3 layout
 
 
 
diff --git a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x4.rst b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x4.rst
index fa6477c..dde33fe 100644
--- a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x4.rst
+++ b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__bufz_x4
+gf180mcu_fd_sc_mcu7t5v0__bufz_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_4 layout
 
 
 
diff --git a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x8.rst b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x8.rst
index a22a2bc..4507dd4 100644
--- a/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x8.rst
+++ b/cells/bufz/gf180mcu_fd_sc_mcu7t5v0__bufz_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__bufz_x8
+gf180mcu_fd_sc_mcu7t5v0__bufz_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__bufz_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__bufz_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__bufz_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__bufz_8 layout
 
 
 
diff --git a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1.rst b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1.rst
index 329e455..7683e83 100644
--- a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1.rst
+++ b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1
+gf180mcu_fd_sc_mcu7t5v0__clkbuf_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_1 layout
 
 
 
diff --git a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2.rst b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2.rst
index 626ba20..4ff6d26 100644
--- a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2.rst
+++ b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2
+gf180mcu_fd_sc_mcu7t5v0__clkbuf_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_2 layout
 
 
 
diff --git a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3.rst b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3.rst
index 2b1d6c4..1842a8b 100644
--- a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3.rst
+++ b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3
+gf180mcu_fd_sc_mcu7t5v0__clkbuf_3
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_3 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_3.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_3 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_3 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_3.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_3 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_3 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_3.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x3 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_3 layout
 
 
 
diff --git a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4.rst b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4.rst
index 0d8886d..654c48c 100644
--- a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4.rst
+++ b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4
+gf180mcu_fd_sc_mcu7t5v0__clkbuf_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_4 layout
 
 
 
diff --git a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8.rst b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8.rst
index 7e47736..ed7eece 100644
--- a/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8.rst
+++ b/cells/clkbuf/gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8
+gf180mcu_fd_sc_mcu7t5v0__clkbuf_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkbuf_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkbuf_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkbuf_8 layout
 
 
 
diff --git a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x1.rst b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x1.rst
index be65ecd..564ee8d 100644
--- a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x1.rst
+++ b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkinv_x1
+gf180mcu_fd_sc_mcu7t5v0__clkinv_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_1 layout
 
 
 
diff --git a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x2.rst b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x2.rst
index ef9dcde..e56a400 100644
--- a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x2.rst
+++ b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkinv_x2
+gf180mcu_fd_sc_mcu7t5v0__clkinv_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_2 layout
 
 
 
diff --git a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x3.rst b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x3.rst
index 052a176..0949049 100644
--- a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x3.rst
+++ b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x3.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkinv_x3
+gf180mcu_fd_sc_mcu7t5v0__clkinv_3
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x3 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_3 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_3.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x3 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_3 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x3 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_3 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_3.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x3 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_3 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x3 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_3 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_3.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x3 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_3 layout
 
 
 
diff --git a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x4.rst b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x4.rst
index 2dc12bb..86a1f0d 100644
--- a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x4.rst
+++ b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkinv_x4
+gf180mcu_fd_sc_mcu7t5v0__clkinv_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_4 layout
 
 
 
diff --git a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x8.rst b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x8.rst
index cc20bfd..7d27e1b 100644
--- a/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x8.rst
+++ b/cells/clkinv/gf180mcu_fd_sc_mcu7t5v0__clkinv_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__clkinv_x8
+gf180mcu_fd_sc_mcu7t5v0__clkinv_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__clkinv_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__clkinv_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__clkinv_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__clkinv_8 layout
 
 
 
diff --git a/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x1.rst b/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x1.rst
index 7cce416..23c1528 100644
--- a/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x1.rst
+++ b/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_1 layout
 
 
 
diff --git a/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x2.rst b/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x2.rst
index e09fae4..8547ef6 100644
--- a/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x2.rst
+++ b/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_2 layout
 
 
 
diff --git a/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x4.rst b/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x4.rst
index 7d84674..1aa38eb 100644
--- a/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x4.rst
+++ b/cells/dffnq/gf180mcu_fd_sc_mcu7t5v0__dffnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnq_4 layout
 
 
 
diff --git a/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1.rst b/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1.rst
index 84c1dc4..52ff437 100644
--- a/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1.rst
+++ b/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_1 layout
 
 
 
diff --git a/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2.rst b/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2.rst
index 0b7faa2..d7b316b 100644
--- a/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2.rst
+++ b/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_2 layout
 
 
 
diff --git a/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4.rst b/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4.rst
index 763b840..9e1cb8d 100644
--- a/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4.rst
+++ b/cells/dffnrnq/gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrnq_4 layout
 
 
 
diff --git a/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1.rst b/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1.rst
index 86688b1..54ad762 100644
--- a/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1.rst
+++ b/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_1 layout
 
 
 
diff --git a/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2.rst b/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2.rst
index 496ca51..f5ac5fd 100644
--- a/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2.rst
+++ b/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_2 layout
 
 
 
diff --git a/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4.rst b/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4.rst
index 47b5a51..4e947df 100644
--- a/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4.rst
+++ b/cells/dffnrsnq/gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnrsnq_4 layout
 
 
 
diff --git a/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1.rst b/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1.rst
index ba32b38..2ab81b8 100644
--- a/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1.rst
+++ b/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_1 layout
 
 
 
diff --git a/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2.rst b/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2.rst
index 7bf6291..1afbeec 100644
--- a/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2.rst
+++ b/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_2 layout
 
 
 
diff --git a/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4.rst b/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4.rst
index 68adc6a..3d10417 100644
--- a/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4.rst
+++ b/cells/dffnsnq/gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffnsnq_4 layout
 
 
 
diff --git a/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x1.rst b/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x1.rst
index 8eec3ae..10fa415 100644
--- a/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x1.rst
+++ b/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_1 layout
 
 
 
diff --git a/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x2.rst b/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x2.rst
index 3bc61c4..6cf5a2e 100644
--- a/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x2.rst
+++ b/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_2 layout
 
 
 
diff --git a/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x4.rst b/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x4.rst
index 416e4b7..5b642bd 100644
--- a/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x4.rst
+++ b/cells/dffq/gf180mcu_fd_sc_mcu7t5v0__dffq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffq_4 layout
 
 
 
diff --git a/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1.rst b/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1.rst
index d7c939d..e22b1fd 100644
--- a/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1.rst
+++ b/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffrnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_1 layout
 
 
 
diff --git a/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2.rst b/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2.rst
index 33e851a..ed21540 100644
--- a/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2.rst
+++ b/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffrnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_2 layout
 
 
 
diff --git a/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4.rst b/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4.rst
index 50c7025..484701d 100644
--- a/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4.rst
+++ b/cells/dffrnq/gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffrnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffrnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrnq_4 layout
 
 
 
diff --git a/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1.rst b/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1.rst
index 69403f4..7428112 100644
--- a/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1.rst
+++ b/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_1 layout
 
 
 
diff --git a/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2.rst b/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2.rst
index 6055b03..efe6da1 100644
--- a/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2.rst
+++ b/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_2 layout
 
 
 
diff --git a/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4.rst b/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4.rst
index 4a73dc5..0b3755c 100644
--- a/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4.rst
+++ b/cells/dffrsnq/gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffrsnq_4 layout
 
 
 
diff --git a/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1.rst b/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1.rst
index 85f0131..8d44528 100644
--- a/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1.rst
+++ b/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__dffsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_1 layout
 
 
 
diff --git a/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2.rst b/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2.rst
index ac0ed4b..96e2791 100644
--- a/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2.rst
+++ b/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__dffsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_2 layout
 
 
 
diff --git a/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4.rst b/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4.rst
index 0ef43ff..2f455f0 100644
--- a/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4.rst
+++ b/cells/dffsnq/gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__dffsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dffsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dffsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dffsnq_4 layout
 
 
 
diff --git a/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x1.rst b/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x1.rst
index 830e304..6010ec9 100644
--- a/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x1.rst
+++ b/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlya_x1
+gf180mcu_fd_sc_mcu7t5v0__dlya_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_1 layout
 
 
 
diff --git a/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x2.rst b/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x2.rst
index 2cc7408..f0d97f4 100644
--- a/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x2.rst
+++ b/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlya_x2
+gf180mcu_fd_sc_mcu7t5v0__dlya_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_2 layout
 
 
 
diff --git a/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x4.rst b/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x4.rst
index 6210ee2..c88afce 100644
--- a/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x4.rst
+++ b/cells/dlya/gf180mcu_fd_sc_mcu7t5v0__dlya_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlya_x4
+gf180mcu_fd_sc_mcu7t5v0__dlya_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlya_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlya_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlya_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlya_4 layout
 
 
 
diff --git a/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x1.rst b/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x1.rst
index c6294ed..02fe4dc 100644
--- a/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x1.rst
+++ b/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyb_x1
+gf180mcu_fd_sc_mcu7t5v0__dlyb_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_1 layout
 
 
 
diff --git a/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x2.rst b/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x2.rst
index 9585684..a587c99 100644
--- a/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x2.rst
+++ b/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyb_x2
+gf180mcu_fd_sc_mcu7t5v0__dlyb_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_2 layout
 
 
 
diff --git a/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x4.rst b/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x4.rst
index 8433081..3a8368f 100644
--- a/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x4.rst
+++ b/cells/dlyb/gf180mcu_fd_sc_mcu7t5v0__dlyb_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyb_x4
+gf180mcu_fd_sc_mcu7t5v0__dlyb_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyb_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyb_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyb_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyb_4 layout
 
 
 
diff --git a/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x1.rst b/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x1.rst
index 2f175fa..2c9cf99 100644
--- a/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x1.rst
+++ b/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyc_x1
+gf180mcu_fd_sc_mcu7t5v0__dlyc_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_1 layout
 
 
 
diff --git a/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x2.rst b/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x2.rst
index 0563bf2..66ee369 100644
--- a/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x2.rst
+++ b/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyc_x2
+gf180mcu_fd_sc_mcu7t5v0__dlyc_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_2 layout
 
 
 
diff --git a/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x4.rst b/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x4.rst
index 3c572fc..c81414f 100644
--- a/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x4.rst
+++ b/cells/dlyc/gf180mcu_fd_sc_mcu7t5v0__dlyc_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyc_x4
+gf180mcu_fd_sc_mcu7t5v0__dlyc_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyc_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyc_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyc_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyc_4 layout
 
 
 
diff --git a/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x1.rst b/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x1.rst
index d1dfe41..42724f2 100644
--- a/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x1.rst
+++ b/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyd_x1
+gf180mcu_fd_sc_mcu7t5v0__dlyd_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_1 layout
 
 
 
diff --git a/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x2.rst b/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x2.rst
index bfcd951..c12665f 100644
--- a/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x2.rst
+++ b/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyd_x2
+gf180mcu_fd_sc_mcu7t5v0__dlyd_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_2 layout
 
 
 
diff --git a/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x4.rst b/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x4.rst
index 7fe65aa..d635188 100644
--- a/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x4.rst
+++ b/cells/dlyd/gf180mcu_fd_sc_mcu7t5v0__dlyd_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__dlyd_x4
+gf180mcu_fd_sc_mcu7t5v0__dlyd_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__dlyd_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__dlyd_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__dlyd_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__dlyd_4 layout
 
 
 
diff --git a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x1.rst b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x1.rst
index 7efbd2c..153c35a 100644
--- a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x1.rst
+++ b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__fill_x1
+gf180mcu_fd_sc_mcu7t5v0__fill_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__fill_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__fill_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__fill_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_1 layout
 
 
 
diff --git a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x2.rst b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x2.rst
index 71bb766..041fed8 100644
--- a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x2.rst
+++ b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__fill_x2
+gf180mcu_fd_sc_mcu7t5v0__fill_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__fill_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__fill_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__fill_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_2 layout
 
 
 
diff --git a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x4.rst b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x4.rst
index 603a050..2d70c42 100644
--- a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x4.rst
+++ b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__fill_x4
+gf180mcu_fd_sc_mcu7t5v0__fill_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__fill_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__fill_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__fill_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_4 layout
 
 
 
diff --git a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x8.rst b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x8.rst
index 388eee2..6646b38 100644
--- a/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x8.rst
+++ b/cells/fill/gf180mcu_fd_sc_mcu7t5v0__fill_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__fill_x8
+gf180mcu_fd_sc_mcu7t5v0__fill_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__fill_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__fill_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__fill_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__fill_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fill_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fill_8 layout
 
 
 
diff --git a/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x4.rst b/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x4.rst
index 91fdaa8..53db5b5 100644
--- a/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x4.rst
+++ b/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__fillcap_x4
+gf180mcu_fd_sc_mcu7t5v0__fillcap_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__fillcap_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__fillcap_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fillcap_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__fillcap_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__fillcap_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fillcap_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__fillcap_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__fillcap_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fillcap_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_4 layout
 
 
 
diff --git a/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x8.rst b/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x8.rst
index d6bea28..51a02a5 100644
--- a/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x8.rst
+++ b/cells/fillcap/gf180mcu_fd_sc_mcu7t5v0__fillcap_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__fillcap_x8
+gf180mcu_fd_sc_mcu7t5v0__fillcap_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__fillcap_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__fillcap_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fillcap_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__fillcap_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__fillcap_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fillcap_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__fillcap_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__fillcap_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__fillcap_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__fillcap_8 layout
 
 
 
diff --git a/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x1.rst b/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x1.rst
index 7471508..2b6144f 100644
--- a/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x1.rst
+++ b/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__icgtn_x1
+gf180mcu_fd_sc_mcu7t5v0__icgtn_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_1 layout
 
 
 
diff --git a/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x2.rst b/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x2.rst
index 49bcd41..b112995 100644
--- a/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x2.rst
+++ b/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__icgtn_x2
+gf180mcu_fd_sc_mcu7t5v0__icgtn_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_2 layout
 
 
 
diff --git a/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x4.rst b/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x4.rst
index b4bef33..4f59ecd 100644
--- a/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x4.rst
+++ b/cells/icgtn/gf180mcu_fd_sc_mcu7t5v0__icgtn_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__icgtn_x4
+gf180mcu_fd_sc_mcu7t5v0__icgtn_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtn_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__icgtn_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtn_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtn_4 layout
 
 
 
diff --git a/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x1.rst b/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x1.rst
index 5df4e03..c2408ca 100644
--- a/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x1.rst
+++ b/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__icgtp_x1
+gf180mcu_fd_sc_mcu7t5v0__icgtp_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_1 layout
 
 
 
diff --git a/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x2.rst b/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x2.rst
index 27f1c51..70fab0a 100644
--- a/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x2.rst
+++ b/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__icgtp_x2
+gf180mcu_fd_sc_mcu7t5v0__icgtp_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_2 layout
 
 
 
diff --git a/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x4.rst b/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x4.rst
index f2ee7e3..e729f3e 100644
--- a/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x4.rst
+++ b/cells/icgtp/gf180mcu_fd_sc_mcu7t5v0__icgtp_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__icgtp_x4
+gf180mcu_fd_sc_mcu7t5v0__icgtp_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__icgtp_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__icgtp_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__icgtp_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__icgtp_4 layout
 
 
 
diff --git a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x1.rst b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x1.rst
index 2318242..9a64a0d 100644
--- a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x1.rst
+++ b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__inv_x1
+gf180mcu_fd_sc_mcu7t5v0__inv_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__inv_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__inv_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__inv_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_1 layout
 
 
 
diff --git a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x2.rst b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x2.rst
index e7d92e4..4c3c484 100644
--- a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x2.rst
+++ b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__inv_x2
+gf180mcu_fd_sc_mcu7t5v0__inv_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__inv_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__inv_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__inv_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_2 layout
 
 
 
diff --git a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x3.rst b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x3.rst
index 0a3a485..e7af924 100644
--- a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x3.rst
+++ b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x3.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__inv_x3
+gf180mcu_fd_sc_mcu7t5v0__inv_3
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x3 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__inv_3 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_3.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x3 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_3 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x3 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__inv_3 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_3.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x3 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_3 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x3 layout**
+**gf180mcu_fd_sc_mcu7t5v0__inv_3 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_3.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x3 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_3 layout
 
 
 
diff --git a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x4.rst b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x4.rst
index 355f20b..2eee8c3 100644
--- a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x4.rst
+++ b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__inv_x4
+gf180mcu_fd_sc_mcu7t5v0__inv_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__inv_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__inv_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__inv_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_4 layout
 
 
 
diff --git a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x8.rst b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x8.rst
index 072a5eb..ae6dfe6 100644
--- a/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x8.rst
+++ b/cells/inv/gf180mcu_fd_sc_mcu7t5v0__inv_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__inv_x8
+gf180mcu_fd_sc_mcu7t5v0__inv_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__inv_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__inv_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__inv_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__inv_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__inv_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__inv_8 layout
 
 
 
diff --git a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x1.rst b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x1.rst
index 789f6d8..25a0f81 100644
--- a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x1.rst
+++ b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__invz_x1
+gf180mcu_fd_sc_mcu7t5v0__invz_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__invz_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__invz_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__invz_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_1 layout
 
 
 
diff --git a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x2.rst b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x2.rst
index 006616c..eed3326 100644
--- a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x2.rst
+++ b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__invz_x2
+gf180mcu_fd_sc_mcu7t5v0__invz_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__invz_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__invz_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__invz_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_2 layout
 
 
 
diff --git a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x3.rst b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x3.rst
index 03f2cba..d85590f 100644
--- a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x3.rst
+++ b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x3.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__invz_x3
+gf180mcu_fd_sc_mcu7t5v0__invz_3
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x3 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__invz_3 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_3.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x3 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_3 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x3 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__invz_3 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_3.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x3 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_3 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x3 layout**
+**gf180mcu_fd_sc_mcu7t5v0__invz_3 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_3.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x3 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_3 layout
 
 
 
diff --git a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x4.rst b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x4.rst
index b80df8d..4901fdb 100644
--- a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x4.rst
+++ b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__invz_x4
+gf180mcu_fd_sc_mcu7t5v0__invz_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__invz_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__invz_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__invz_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_4 layout
 
 
 
diff --git a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x8.rst b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x8.rst
index d79ade8..b70516a 100644
--- a/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x8.rst
+++ b/cells/invz/gf180mcu_fd_sc_mcu7t5v0__invz_x8.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__invz_x8
+gf180mcu_fd_sc_mcu7t5v0__invz_8
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x8 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__invz_8 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_8.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x8 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_8 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x8 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__invz_8 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_8.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x8 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_8 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__invz_x8 layout**
+**gf180mcu_fd_sc_mcu7t5v0__invz_8 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__invz_8.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_x8 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__invz_8 layout
 
 
 
diff --git a/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x1.rst b/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x1.rst
index 3d17464..db8e664 100644
--- a/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x1.rst
+++ b/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latq_x1
+gf180mcu_fd_sc_mcu7t5v0__latq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_1 layout
 
 
 
diff --git a/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x2.rst b/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x2.rst
index 0382720..2bde8b4 100644
--- a/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x2.rst
+++ b/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latq_x2
+gf180mcu_fd_sc_mcu7t5v0__latq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_2 layout
 
 
 
diff --git a/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x4.rst b/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x4.rst
index 21df5fd..80c22d0 100644
--- a/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x4.rst
+++ b/cells/latq/gf180mcu_fd_sc_mcu7t5v0__latq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latq_x4
+gf180mcu_fd_sc_mcu7t5v0__latq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latq_4 layout
 
 
 
diff --git a/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x1.rst b/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x1.rst
index bea1e21..36d0e0e 100644
--- a/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x1.rst
+++ b/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latrnq_x1
+gf180mcu_fd_sc_mcu7t5v0__latrnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_1 layout
 
 
 
diff --git a/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x2.rst b/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x2.rst
index f41349d..5d730dc 100644
--- a/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x2.rst
+++ b/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latrnq_x2
+gf180mcu_fd_sc_mcu7t5v0__latrnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_2 layout
 
 
 
diff --git a/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x4.rst b/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x4.rst
index 12e4a20..4398a08 100644
--- a/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x4.rst
+++ b/cells/latrnq/gf180mcu_fd_sc_mcu7t5v0__latrnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latrnq_x4
+gf180mcu_fd_sc_mcu7t5v0__latrnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latrnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latrnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrnq_4 layout
 
 
 
diff --git a/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1.rst b/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1.rst
index e89f3b8..6e33b40 100644
--- a/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1.rst
+++ b/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__latrsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_1 layout
 
 
 
diff --git a/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2.rst b/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2.rst
index 14c0dac..18242d7 100644
--- a/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2.rst
+++ b/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__latrsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_2 layout
 
 
 
diff --git a/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4.rst b/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4.rst
index 1fc5821..e6e3119 100644
--- a/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4.rst
+++ b/cells/latrsnq/gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__latrsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latrsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latrsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latrsnq_4 layout
 
 
 
diff --git a/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x1.rst b/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x1.rst
index cd19de5..7b19f48 100644
--- a/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x1.rst
+++ b/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__latsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_1 layout
 
 
 
diff --git a/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x2.rst b/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x2.rst
index b25a096..168fb2f 100644
--- a/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x2.rst
+++ b/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__latsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_2 layout
 
 
 
diff --git a/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x4.rst b/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x4.rst
index c8ef3ff..6220de8 100644
--- a/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x4.rst
+++ b/cells/latsnq/gf180mcu_fd_sc_mcu7t5v0__latsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__latsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__latsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__latsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__latsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__latsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__latsnq_4 layout
 
 
 
diff --git a/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x1.rst b/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x1.rst
index 316dadd..0896b68 100644
--- a/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x1.rst
+++ b/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__mux2_x1
+gf180mcu_fd_sc_mcu7t5v0__mux2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_1 layout
 
 
 
diff --git a/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x2.rst b/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x2.rst
index dc2e231..13f4bcf 100644
--- a/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x2.rst
+++ b/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__mux2_x2
+gf180mcu_fd_sc_mcu7t5v0__mux2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_2 layout
 
 
 
diff --git a/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x4.rst b/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x4.rst
index 3072324..555c4b3 100644
--- a/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x4.rst
+++ b/cells/mux2/gf180mcu_fd_sc_mcu7t5v0__mux2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__mux2_x4
+gf180mcu_fd_sc_mcu7t5v0__mux2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__mux2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__mux2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux2_4 layout
 
 
 
diff --git a/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x1.rst b/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x1.rst
index b02736d..9d58b7e 100644
--- a/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x1.rst
+++ b/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__mux4_x1
+gf180mcu_fd_sc_mcu7t5v0__mux4_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_1 layout
 
 
 
diff --git a/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x2.rst b/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x2.rst
index 1c0bf98..54f4a3f 100644
--- a/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x2.rst
+++ b/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__mux4_x2
+gf180mcu_fd_sc_mcu7t5v0__mux4_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_2 layout
 
 
 
diff --git a/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x4.rst b/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x4.rst
index 6cda68a..a8ed5c5 100644
--- a/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x4.rst
+++ b/cells/mux4/gf180mcu_fd_sc_mcu7t5v0__mux4_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__mux4_x4
+gf180mcu_fd_sc_mcu7t5v0__mux4_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__mux4_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__mux4_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__mux4_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__mux4_4 layout
 
 
 
diff --git a/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x1.rst b/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x1.rst
index 2b5efb4..8f38b9e 100644
--- a/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x1.rst
+++ b/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand2_x1
+gf180mcu_fd_sc_mcu7t5v0__nand2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_1 layout
 
 
 
diff --git a/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x2.rst b/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x2.rst
index e242a3a..09af960 100644
--- a/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x2.rst
+++ b/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand2_x2
+gf180mcu_fd_sc_mcu7t5v0__nand2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_2 layout
 
 
 
diff --git a/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x4.rst b/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x4.rst
index 6d6091b..6272cac 100644
--- a/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x4.rst
+++ b/cells/nand2/gf180mcu_fd_sc_mcu7t5v0__nand2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand2_x4
+gf180mcu_fd_sc_mcu7t5v0__nand2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand2_4 layout
 
 
 
diff --git a/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x1.rst b/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x1.rst
index 34a6a6f..e724b50 100644
--- a/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x1.rst
+++ b/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand3_x1
+gf180mcu_fd_sc_mcu7t5v0__nand3_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_1 layout
 
 
 
diff --git a/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x2.rst b/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x2.rst
index 3db4be6..8588ce1 100644
--- a/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x2.rst
+++ b/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand3_x2
+gf180mcu_fd_sc_mcu7t5v0__nand3_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_2 layout
 
 
 
diff --git a/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x4.rst b/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x4.rst
index 2560a05..4ae60e4 100644
--- a/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x4.rst
+++ b/cells/nand3/gf180mcu_fd_sc_mcu7t5v0__nand3_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand3_x4
+gf180mcu_fd_sc_mcu7t5v0__nand3_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand3_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand3_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand3_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand3_4 layout
 
 
 
diff --git a/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x1.rst b/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x1.rst
index b06dcc3..ed0796e 100644
--- a/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x1.rst
+++ b/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand4_x1
+gf180mcu_fd_sc_mcu7t5v0__nand4_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_1 layout
 
 
 
diff --git a/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x2.rst b/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x2.rst
index c95660b..f2b31b4 100644
--- a/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x2.rst
+++ b/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand4_x2
+gf180mcu_fd_sc_mcu7t5v0__nand4_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_2 layout
 
 
 
diff --git a/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x4.rst b/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x4.rst
index 99d8bf1..69de9b2 100644
--- a/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x4.rst
+++ b/cells/nand4/gf180mcu_fd_sc_mcu7t5v0__nand4_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nand4_x4
+gf180mcu_fd_sc_mcu7t5v0__nand4_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nand4_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nand4_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nand4_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nand4_4 layout
 
 
 
diff --git a/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x1.rst b/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x1.rst
index d9bfb46..9ffce93 100644
--- a/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x1.rst
+++ b/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor2_x1
+gf180mcu_fd_sc_mcu7t5v0__nor2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_1 layout
 
 
 
diff --git a/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x2.rst b/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x2.rst
index e2e9efc..14ac2ce 100644
--- a/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x2.rst
+++ b/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor2_x2
+gf180mcu_fd_sc_mcu7t5v0__nor2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_2 layout
 
 
 
diff --git a/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x4.rst b/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x4.rst
index 68d7e08..b467cab 100644
--- a/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x4.rst
+++ b/cells/nor2/gf180mcu_fd_sc_mcu7t5v0__nor2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor2_x4
+gf180mcu_fd_sc_mcu7t5v0__nor2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor2_4 layout
 
 
 
diff --git a/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x1.rst b/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x1.rst
index 49aec6b..21ed84b 100644
--- a/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x1.rst
+++ b/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor3_x1
+gf180mcu_fd_sc_mcu7t5v0__nor3_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_1 layout
 
 
 
diff --git a/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x2.rst b/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x2.rst
index 2666ab5..41d7138 100644
--- a/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x2.rst
+++ b/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor3_x2
+gf180mcu_fd_sc_mcu7t5v0__nor3_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_2 layout
 
 
 
diff --git a/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x4.rst b/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x4.rst
index 84c5e38..11cbae5 100644
--- a/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x4.rst
+++ b/cells/nor3/gf180mcu_fd_sc_mcu7t5v0__nor3_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor3_x4
+gf180mcu_fd_sc_mcu7t5v0__nor3_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor3_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor3_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor3_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor3_4 layout
 
 
 
diff --git a/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x1.rst b/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x1.rst
index f04c8be..30ba82e 100644
--- a/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x1.rst
+++ b/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor4_x1
+gf180mcu_fd_sc_mcu7t5v0__nor4_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_1 layout
 
 
 
diff --git a/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x2.rst b/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x2.rst
index 027e624..f70306a 100644
--- a/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x2.rst
+++ b/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor4_x2
+gf180mcu_fd_sc_mcu7t5v0__nor4_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_2 layout
 
 
 
diff --git a/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x4.rst b/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x4.rst
index 2a3f315..46dbf84 100644
--- a/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x4.rst
+++ b/cells/nor4/gf180mcu_fd_sc_mcu7t5v0__nor4_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__nor4_x4
+gf180mcu_fd_sc_mcu7t5v0__nor4_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__nor4_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__nor4_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__nor4_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__nor4_4 layout
 
 
 
diff --git a/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x1.rst b/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x1.rst
index 66c830a..1321b87 100644
--- a/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x1.rst
+++ b/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai21_x1
+gf180mcu_fd_sc_mcu7t5v0__oai21_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_1 layout
 
 
 
diff --git a/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x2.rst b/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x2.rst
index cc8997e..91cdc27 100644
--- a/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x2.rst
+++ b/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai21_x2
+gf180mcu_fd_sc_mcu7t5v0__oai21_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_2 layout
 
 
 
diff --git a/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x4.rst b/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x4.rst
index 0e9952b..6053edc 100644
--- a/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x4.rst
+++ b/cells/oai21/gf180mcu_fd_sc_mcu7t5v0__oai21_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai21_x4
+gf180mcu_fd_sc_mcu7t5v0__oai21_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai21_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai21_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai21_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai21_4 layout
 
 
 
diff --git a/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x1.rst b/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x1.rst
index aa026f9..5d272a7 100644
--- a/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x1.rst
+++ b/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai211_x1
+gf180mcu_fd_sc_mcu7t5v0__oai211_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_1 layout
 
 
 
diff --git a/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x2.rst b/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x2.rst
index 3888f2c..a2555aa 100644
--- a/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x2.rst
+++ b/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai211_x2
+gf180mcu_fd_sc_mcu7t5v0__oai211_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_2 layout
 
 
 
diff --git a/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x4.rst b/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x4.rst
index fbde773..a85de81 100644
--- a/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x4.rst
+++ b/cells/oai211/gf180mcu_fd_sc_mcu7t5v0__oai211_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai211_x4
+gf180mcu_fd_sc_mcu7t5v0__oai211_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai211_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai211_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai211_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai211_4 layout
 
 
 
diff --git a/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x1.rst b/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x1.rst
index 562c8c9..b840e72 100644
--- a/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x1.rst
+++ b/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai22_x1
+gf180mcu_fd_sc_mcu7t5v0__oai22_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_1 layout
 
 
 
diff --git a/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x2.rst b/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x2.rst
index 4b2ed18..ba72c0a 100644
--- a/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x2.rst
+++ b/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai22_x2
+gf180mcu_fd_sc_mcu7t5v0__oai22_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_2 layout
 
 
 
diff --git a/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x4.rst b/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x4.rst
index 6f57a9d..fa3457e 100644
--- a/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x4.rst
+++ b/cells/oai22/gf180mcu_fd_sc_mcu7t5v0__oai22_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai22_x4
+gf180mcu_fd_sc_mcu7t5v0__oai22_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai22_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai22_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai22_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai22_4 layout
 
 
 
diff --git a/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x1.rst b/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x1.rst
index 3dca5ac..0046357 100644
--- a/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x1.rst
+++ b/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai221_x1
+gf180mcu_fd_sc_mcu7t5v0__oai221_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_1 layout
 
 
 
diff --git a/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x2.rst b/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x2.rst
index 9a9c4e2..f9122d0 100644
--- a/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x2.rst
+++ b/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai221_x2
+gf180mcu_fd_sc_mcu7t5v0__oai221_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_2 layout
 
 
 
diff --git a/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x4.rst b/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x4.rst
index a27c034..78b16e0 100644
--- a/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x4.rst
+++ b/cells/oai221/gf180mcu_fd_sc_mcu7t5v0__oai221_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai221_x4
+gf180mcu_fd_sc_mcu7t5v0__oai221_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai221_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai221_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai221_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai221_4 layout
 
 
 
diff --git a/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x1.rst b/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x1.rst
index 8fc9f0d..72e69a3 100644
--- a/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x1.rst
+++ b/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai222_x1
+gf180mcu_fd_sc_mcu7t5v0__oai222_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_1 layout
 
 
 
diff --git a/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x2.rst b/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x2.rst
index b41a5f5..7438f5a 100644
--- a/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x2.rst
+++ b/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai222_x2
+gf180mcu_fd_sc_mcu7t5v0__oai222_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_2 layout
 
 
 
diff --git a/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x4.rst b/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x4.rst
index d383adf..a165741 100644
--- a/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x4.rst
+++ b/cells/oai222/gf180mcu_fd_sc_mcu7t5v0__oai222_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai222_x4
+gf180mcu_fd_sc_mcu7t5v0__oai222_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai222_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai222_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai222_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai222_4 layout
 
 
 
diff --git a/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x1.rst b/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x1.rst
index b46419f..102376f 100644
--- a/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x1.rst
+++ b/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai31_x1
+gf180mcu_fd_sc_mcu7t5v0__oai31_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_1 layout
 
 
 
diff --git a/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x2.rst b/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x2.rst
index 66aceb5..0432eb8 100644
--- a/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x2.rst
+++ b/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai31_x2
+gf180mcu_fd_sc_mcu7t5v0__oai31_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_2 layout
 
 
 
diff --git a/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x4.rst b/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x4.rst
index a7ea4c7..2980410 100644
--- a/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x4.rst
+++ b/cells/oai31/gf180mcu_fd_sc_mcu7t5v0__oai31_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai31_x4
+gf180mcu_fd_sc_mcu7t5v0__oai31_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai31_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai31_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai31_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai31_4 layout
 
 
 
diff --git a/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x1.rst b/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x1.rst
index d878f58..ac0b3ae 100644
--- a/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x1.rst
+++ b/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai32_x1
+gf180mcu_fd_sc_mcu7t5v0__oai32_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_1 layout
 
 
 
diff --git a/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x2.rst b/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x2.rst
index 16782f7..71bf976 100644
--- a/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x2.rst
+++ b/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai32_x2
+gf180mcu_fd_sc_mcu7t5v0__oai32_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_2 layout
 
 
 
diff --git a/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x4.rst b/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x4.rst
index 0b4fb0b..35c82ed 100644
--- a/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x4.rst
+++ b/cells/oai32/gf180mcu_fd_sc_mcu7t5v0__oai32_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai32_x4
+gf180mcu_fd_sc_mcu7t5v0__oai32_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai32_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai32_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai32_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai32_4 layout
 
 
 
diff --git a/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x1.rst b/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x1.rst
index 197e50c..a1b7a62 100644
--- a/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x1.rst
+++ b/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai33_x1
+gf180mcu_fd_sc_mcu7t5v0__oai33_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_1 layout
 
 
 
diff --git a/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x2.rst b/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x2.rst
index e1bccf9..744ad3d 100644
--- a/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x2.rst
+++ b/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai33_x2
+gf180mcu_fd_sc_mcu7t5v0__oai33_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_2 layout
 
 
 
diff --git a/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x4.rst b/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x4.rst
index a21383a..1c57750 100644
--- a/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x4.rst
+++ b/cells/oai33/gf180mcu_fd_sc_mcu7t5v0__oai33_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__oai33_x4
+gf180mcu_fd_sc_mcu7t5v0__oai33_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__oai33_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__oai33_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__oai33_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__oai33_4 layout
 
 
 
diff --git a/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x1.rst b/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x1.rst
index 34b1c19..5bf4057 100644
--- a/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x1.rst
+++ b/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or2_x1
+gf180mcu_fd_sc_mcu7t5v0__or2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_1 layout
 
 
 
diff --git a/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x2.rst b/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x2.rst
index 375668a..069f72a 100644
--- a/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x2.rst
+++ b/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or2_x2
+gf180mcu_fd_sc_mcu7t5v0__or2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_2 layout
 
 
 
diff --git a/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x4.rst b/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x4.rst
index 35c2807..2259528 100644
--- a/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x4.rst
+++ b/cells/or2/gf180mcu_fd_sc_mcu7t5v0__or2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or2_x4
+gf180mcu_fd_sc_mcu7t5v0__or2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or2_4 layout
 
 
 
diff --git a/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x1.rst b/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x1.rst
index b002f7c..8f99ba9 100644
--- a/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x1.rst
+++ b/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or3_x1
+gf180mcu_fd_sc_mcu7t5v0__or3_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or3_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or3_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or3_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_1 layout
 
 
 
diff --git a/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x2.rst b/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x2.rst
index 7daf502..f6c81b2 100644
--- a/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x2.rst
+++ b/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or3_x2
+gf180mcu_fd_sc_mcu7t5v0__or3_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or3_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or3_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or3_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_2 layout
 
 
 
diff --git a/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x4.rst b/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x4.rst
index cdd9471..7aab8fc 100644
--- a/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x4.rst
+++ b/cells/or3/gf180mcu_fd_sc_mcu7t5v0__or3_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or3_x4
+gf180mcu_fd_sc_mcu7t5v0__or3_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or3_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or3_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or3_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or3_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or3_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or3_4 layout
 
 
 
diff --git a/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x1.rst b/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x1.rst
index 7ef44db..cc0a47e 100644
--- a/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x1.rst
+++ b/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or4_x1
+gf180mcu_fd_sc_mcu7t5v0__or4_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or4_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or4_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or4_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_1 layout
 
 
 
diff --git a/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x2.rst b/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x2.rst
index 34b789f..ddfefc2 100644
--- a/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x2.rst
+++ b/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or4_x2
+gf180mcu_fd_sc_mcu7t5v0__or4_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or4_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or4_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or4_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_2 layout
 
 
 
diff --git a/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x4.rst b/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x4.rst
index d078557..6748fc4 100644
--- a/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x4.rst
+++ b/cells/or4/gf180mcu_fd_sc_mcu7t5v0__or4_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__or4_x4
+gf180mcu_fd_sc_mcu7t5v0__or4_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__or4_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__or4_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__or4_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__or4_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__or4_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__or4_4 layout
 
 
 
diff --git a/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x1.rst b/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x1.rst
index d7e3d6c..af6381e 100644
--- a/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x1.rst
+++ b/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffq_x1
+gf180mcu_fd_sc_mcu7t5v0__sdffq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_1 layout
 
 
 
diff --git a/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x2.rst b/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x2.rst
index 509cdfd..088a94b 100644
--- a/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x2.rst
+++ b/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffq_x2
+gf180mcu_fd_sc_mcu7t5v0__sdffq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_2 layout
 
 
 
diff --git a/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x4.rst b/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x4.rst
index a2420bd..5e8089a 100644
--- a/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x4.rst
+++ b/cells/sdffq/gf180mcu_fd_sc_mcu7t5v0__sdffq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffq_x4
+gf180mcu_fd_sc_mcu7t5v0__sdffq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffq_4 layout
 
 
 
diff --git a/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1.rst b/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1.rst
index 8976d16..56e0e0e 100644
--- a/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1.rst
+++ b/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1
+gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_1 layout
 
 
 
diff --git a/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2.rst b/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2.rst
index d48318f..3403758 100644
--- a/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2.rst
+++ b/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2
+gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_2 layout
 
 
 
diff --git a/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4.rst b/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4.rst
index 80653ba..bdf80f2 100644
--- a/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4.rst
+++ b/cells/sdffrnq/gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4
+gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrnq_4 layout
 
 
 
diff --git a/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1.rst b/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1.rst
index 2a93dd2..36df18f 100644
--- a/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1.rst
+++ b/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_1 layout
 
 
 
diff --git a/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2.rst b/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2.rst
index 15c5284..a5270ae 100644
--- a/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2.rst
+++ b/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_2 layout
 
 
 
diff --git a/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4.rst b/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4.rst
index b133cea..d9627a1 100644
--- a/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4.rst
+++ b/cells/sdffrsnq/gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffrsnq_4 layout
 
 
 
diff --git a/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1.rst b/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1.rst
index c3e3978..03101d6 100644
--- a/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1.rst
+++ b/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1
+gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_1 layout
 
 
 
diff --git a/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2.rst b/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2.rst
index b7a1944..b557482 100644
--- a/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2.rst
+++ b/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2
+gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_2 layout
 
 
 
diff --git a/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4.rst b/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4.rst
index 99dedaa..96f4c93 100644
--- a/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4.rst
+++ b/cells/sdffsnq/gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4
+gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__sdffsnq_4 layout
 
 
 
diff --git a/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x1.rst b/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x1.rst
index 50b65f8..bc9e492 100644
--- a/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x1.rst
+++ b/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xnor2_x1
+gf180mcu_fd_sc_mcu7t5v0__xnor2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_1 layout
 
 
 
diff --git a/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x2.rst b/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x2.rst
index 7b6c8a1..58d2872 100644
--- a/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x2.rst
+++ b/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xnor2_x2
+gf180mcu_fd_sc_mcu7t5v0__xnor2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_2 layout
 
 
 
diff --git a/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x4.rst b/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x4.rst
index 04a91d7..1a4a236 100644
--- a/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x4.rst
+++ b/cells/xnor2/gf180mcu_fd_sc_mcu7t5v0__xnor2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xnor2_x4
+gf180mcu_fd_sc_mcu7t5v0__xnor2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xnor2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor2_4 layout
 
 
 
diff --git a/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x1.rst b/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x1.rst
index b68148d..3754777 100644
--- a/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x1.rst
+++ b/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xnor3_x1
+gf180mcu_fd_sc_mcu7t5v0__xnor3_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_1 layout
 
 
 
diff --git a/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x2.rst b/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x2.rst
index d366c7a..91ee45b 100644
--- a/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x2.rst
+++ b/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xnor3_x2
+gf180mcu_fd_sc_mcu7t5v0__xnor3_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_2 layout
 
 
 
diff --git a/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x4.rst b/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x4.rst
index 9880ac3..faacaae 100644
--- a/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x4.rst
+++ b/cells/xnor3/gf180mcu_fd_sc_mcu7t5v0__xnor3_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xnor3_x4
+gf180mcu_fd_sc_mcu7t5v0__xnor3_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xnor3_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xnor3_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xnor3_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xnor3_4 layout
 
 
 
diff --git a/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x1.rst b/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x1.rst
index 2012f90..985fd4e 100644
--- a/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x1.rst
+++ b/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xor2_x1
+gf180mcu_fd_sc_mcu7t5v0__xor2_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_1 layout
 
 
 
diff --git a/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x2.rst b/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x2.rst
index c1ac17d..11699a8 100644
--- a/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x2.rst
+++ b/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xor2_x2
+gf180mcu_fd_sc_mcu7t5v0__xor2_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_2 layout
 
 
 
diff --git a/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x4.rst b/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x4.rst
index 817e30f..f5659ae 100644
--- a/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x4.rst
+++ b/cells/xor2/gf180mcu_fd_sc_mcu7t5v0__xor2_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xor2_x4
+gf180mcu_fd_sc_mcu7t5v0__xor2_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xor2_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xor2_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor2_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor2_4 layout
 
 
 
diff --git a/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x1.rst b/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x1.rst
index 9ee346b..cd53e6c 100644
--- a/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x1.rst
+++ b/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x1.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xor3_x1
+gf180mcu_fd_sc_mcu7t5v0__xor3_1
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x1 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_1 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_1.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x1 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_1 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x1 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_1 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_1.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x1 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_1 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x1 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_1 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_1.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x1 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_1 layout
 
 
 
diff --git a/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x2.rst b/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x2.rst
index c3d8fe8..9f316b7 100644
--- a/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x2.rst
+++ b/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x2.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xor3_x2
+gf180mcu_fd_sc_mcu7t5v0__xor3_2
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x2 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_2 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_2.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x2 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_2 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x2 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_2 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_2.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x2 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_2 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x2 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_2 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_2.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x2 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_2 layout
 
 
 
diff --git a/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x4.rst b/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x4.rst
index 8a9d6cd..45fcb4d 100644
--- a/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x4.rst
+++ b/cells/xor3/gf180mcu_fd_sc_mcu7t5v0__xor3_x4.rst
@@ -1,30 +1,30 @@
 =======================================
-gf180mcu_fd_sc_mcu7t5v0__xor3_x4
+gf180mcu_fd_sc_mcu7t5v0__xor3_4
 =======================================
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x4 symbol**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_4 symbol**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_4.symbol.png
     :height: 250px
     :width: 400 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x4 symbol
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_4 symbol
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x4 schematic**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_4 schematic**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_4.schematic.png
     :height: 300px
     :width: 500 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x4 schematic
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_4 schematic
 
-**gf180mcu_fd_sc_mcu7t5v0__xor3_x4 layout**
+**gf180mcu_fd_sc_mcu7t5v0__xor3_4 layout**
 
 .. image:: gf180mcu_fd_sc_mcu7t5v0__xor3_4.layout.png
     :height: 400px
     :width: 700 px
     :align: center
-    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_x4 layout
+    :alt: gf180mcu_fd_sc_mcu7t5v0__xor3_4 layout