diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 455c000a1..000000000
--- a/.flake8
+++ /dev/null
@@ -1,23 +0,0 @@
-[flake8]
-max-line-length = 88
-max-complexity = 18
-select = B,C,E,F,W,T4,B9
-ignore = E203, E266, E501, W503, F403, F401, B950
-
-exclude =
-    # No need to traverse our git directory
-    .git,
-    # There's no value in checking cache directories
-    __pycache__,
-    # The conf file is mostly autogenerated, ignore it
-    docs/source/conf.py,
-    # The old directory contains Flake8 2.0
-    old,
-    # This contains our built documentation
-    build,
-    # This contains builds of flake8 that we don't want to check
-    dist,
-    .ipynb_checkpoints,
-    .tox,
-    extra,
-    deprecated,
diff --git a/docs/_config.yml b/docs/_config.yml
index 6117075b0..9775b42e2 100755
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -47,7 +47,6 @@ sphinx:
     - "sphinx.ext.napoleon"
     - "sphinx.ext.viewcode"
     - "matplotlib.sphinxext.plot_directive"
-    - "sphinxcontrib.autodoc_pydantic"
   config:
     #autodoc_typehints: description
     autodoc_type_aliases:
diff --git a/pyproject.toml b/pyproject.toml
index 57963ea4d..d6bfc2ecb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory[cad]==7.3.0",
+  "gdsfactory[cad]==7.8.17",
   "PySpice"
 ]
 description = "skywater130 pdk"
@@ -30,10 +30,10 @@ version = "0.8.0"
 dev = [
   "pytest",
   "pytest-cov",
-  "pytest_regressions"
+  "pytest_regressions",
+  "pre-commit"
 ]
 docs = [
-  "autodoc_pydantic",
   "jupytext",
   "jupyter-book==0.15.1"
 ]
@@ -80,6 +80,7 @@ python_files = ["sky130/*.py", "tests/*.py"]
 testpaths = ["sky130", "tests"]
 
 [tool.ruff]
+fix = true
 ignore = [
   "E501",  # line too long, handled by black
   "B008",  # do not perform function calls in argument defaults
diff --git a/sky130/components.py b/sky130/components.py
index 54d5a09c5..e8aaae812 100644
--- a/sky130/components.py
+++ b/sky130/components.py
@@ -1,6 +1,7 @@
 from functools import partial
 
 import gdsfactory as gf
+from gdsfactory.cell import cell
 
 from sky130.config import PATH
 from sky130.layers import LAYER
@@ -43,7 +44,7 @@
 import_gds = partial(gf.import_gds, gdsdir=gdsdir, decorator=add_ports)
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111o_1 fixed cell.
 
@@ -58,7 +59,7 @@ def sky130_fd_sc_hd__a2111o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111o_2 fixed cell.
 
@@ -73,7 +74,7 @@ def sky130_fd_sc_hd__a2111o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111o_4 fixed cell.
 
@@ -88,7 +89,7 @@ def sky130_fd_sc_hd__a2111o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111oi_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111oi_0 fixed cell.
 
@@ -103,7 +104,7 @@ def sky130_fd_sc_hd__a2111oi_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111oi_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111oi_1 fixed cell.
 
@@ -118,7 +119,7 @@ def sky130_fd_sc_hd__a2111oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111oi_2 fixed cell.
 
@@ -133,7 +134,7 @@ def sky130_fd_sc_hd__a2111oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2111oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2111oi_4 fixed cell.
 
@@ -148,7 +149,7 @@ def sky130_fd_sc_hd__a2111oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2111oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a211o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a211o_1 fixed cell.
 
@@ -163,7 +164,7 @@ def sky130_fd_sc_hd__a211o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a211o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a211o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a211o_2 fixed cell.
 
@@ -178,7 +179,7 @@ def sky130_fd_sc_hd__a211o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a211o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a211o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a211o_4 fixed cell.
 
@@ -193,7 +194,7 @@ def sky130_fd_sc_hd__a211o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a211o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a211oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a211oi_1 fixed cell.
 
@@ -208,7 +209,7 @@ def sky130_fd_sc_hd__a211oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a211oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a211oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a211oi_2 fixed cell.
 
@@ -223,7 +224,7 @@ def sky130_fd_sc_hd__a211oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a211oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a211oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a211oi_4 fixed cell.
 
@@ -238,7 +239,7 @@ def sky130_fd_sc_hd__a211oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a211oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21bo_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21bo_1 fixed cell.
 
@@ -253,7 +254,7 @@ def sky130_fd_sc_hd__a21bo_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21bo_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21bo_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21bo_2 fixed cell.
 
@@ -268,7 +269,7 @@ def sky130_fd_sc_hd__a21bo_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21bo_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21bo_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21bo_4 fixed cell.
 
@@ -283,7 +284,7 @@ def sky130_fd_sc_hd__a21bo_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21bo_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21boi_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21boi_0 fixed cell.
 
@@ -298,7 +299,7 @@ def sky130_fd_sc_hd__a21boi_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21boi_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21boi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21boi_1 fixed cell.
 
@@ -313,7 +314,7 @@ def sky130_fd_sc_hd__a21boi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21boi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21boi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21boi_2 fixed cell.
 
@@ -328,7 +329,7 @@ def sky130_fd_sc_hd__a21boi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21boi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21boi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21boi_4 fixed cell.
 
@@ -343,7 +344,7 @@ def sky130_fd_sc_hd__a21boi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21boi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21o_1 fixed cell.
 
@@ -358,7 +359,7 @@ def sky130_fd_sc_hd__a21o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21o_2 fixed cell.
 
@@ -373,7 +374,7 @@ def sky130_fd_sc_hd__a21o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21o_4 fixed cell.
 
@@ -388,7 +389,7 @@ def sky130_fd_sc_hd__a21o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21oi_1 fixed cell.
 
@@ -403,7 +404,7 @@ def sky130_fd_sc_hd__a21oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21oi_2 fixed cell.
 
@@ -418,7 +419,7 @@ def sky130_fd_sc_hd__a21oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a21oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a21oi_4 fixed cell.
 
@@ -433,7 +434,7 @@ def sky130_fd_sc_hd__a21oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a21oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a221o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a221o_1 fixed cell.
 
@@ -448,7 +449,7 @@ def sky130_fd_sc_hd__a221o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a221o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a221o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a221o_2 fixed cell.
 
@@ -463,7 +464,7 @@ def sky130_fd_sc_hd__a221o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a221o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a221o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a221o_4 fixed cell.
 
@@ -478,7 +479,7 @@ def sky130_fd_sc_hd__a221o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a221o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a221oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a221oi_1 fixed cell.
 
@@ -493,7 +494,7 @@ def sky130_fd_sc_hd__a221oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a221oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a221oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a221oi_2 fixed cell.
 
@@ -508,7 +509,7 @@ def sky130_fd_sc_hd__a221oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a221oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a221oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a221oi_4 fixed cell.
 
@@ -523,7 +524,7 @@ def sky130_fd_sc_hd__a221oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a221oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a222oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a222oi_1 fixed cell.
 
@@ -538,7 +539,7 @@ def sky130_fd_sc_hd__a222oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a222oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a22o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a22o_1 fixed cell.
 
@@ -553,7 +554,7 @@ def sky130_fd_sc_hd__a22o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a22o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a22o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a22o_2 fixed cell.
 
@@ -568,7 +569,7 @@ def sky130_fd_sc_hd__a22o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a22o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a22o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a22o_4 fixed cell.
 
@@ -583,7 +584,7 @@ def sky130_fd_sc_hd__a22o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a22o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a22oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a22oi_1 fixed cell.
 
@@ -598,7 +599,7 @@ def sky130_fd_sc_hd__a22oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a22oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a22oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a22oi_2 fixed cell.
 
@@ -613,7 +614,7 @@ def sky130_fd_sc_hd__a22oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a22oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a22oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a22oi_4 fixed cell.
 
@@ -628,7 +629,7 @@ def sky130_fd_sc_hd__a22oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a22oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2bb2o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2bb2o_1 fixed cell.
 
@@ -643,7 +644,7 @@ def sky130_fd_sc_hd__a2bb2o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2bb2o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2bb2o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2bb2o_2 fixed cell.
 
@@ -658,7 +659,7 @@ def sky130_fd_sc_hd__a2bb2o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2bb2o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2bb2o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2bb2o_4 fixed cell.
 
@@ -673,7 +674,7 @@ def sky130_fd_sc_hd__a2bb2o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2bb2o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2bb2oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2bb2oi_1 fixed cell.
 
@@ -688,7 +689,7 @@ def sky130_fd_sc_hd__a2bb2oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2bb2oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2bb2oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2bb2oi_2 fixed cell.
 
@@ -703,7 +704,7 @@ def sky130_fd_sc_hd__a2bb2oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2bb2oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a2bb2oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a2bb2oi_4 fixed cell.
 
@@ -718,7 +719,7 @@ def sky130_fd_sc_hd__a2bb2oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a2bb2oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a311o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a311o_1 fixed cell.
 
@@ -733,7 +734,7 @@ def sky130_fd_sc_hd__a311o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a311o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a311o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a311o_2 fixed cell.
 
@@ -748,7 +749,7 @@ def sky130_fd_sc_hd__a311o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a311o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a311o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a311o_4 fixed cell.
 
@@ -763,7 +764,7 @@ def sky130_fd_sc_hd__a311o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a311o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a311oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a311oi_1 fixed cell.
 
@@ -778,7 +779,7 @@ def sky130_fd_sc_hd__a311oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a311oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a311oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a311oi_2 fixed cell.
 
@@ -793,7 +794,7 @@ def sky130_fd_sc_hd__a311oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a311oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a311oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a311oi_4 fixed cell.
 
@@ -808,7 +809,7 @@ def sky130_fd_sc_hd__a311oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a311oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a31o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a31o_1 fixed cell.
 
@@ -823,7 +824,7 @@ def sky130_fd_sc_hd__a31o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a31o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a31o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a31o_2 fixed cell.
 
@@ -838,7 +839,7 @@ def sky130_fd_sc_hd__a31o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a31o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a31o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a31o_4 fixed cell.
 
@@ -853,7 +854,7 @@ def sky130_fd_sc_hd__a31o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a31o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a31oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a31oi_1 fixed cell.
 
@@ -868,7 +869,7 @@ def sky130_fd_sc_hd__a31oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a31oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a31oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a31oi_2 fixed cell.
 
@@ -883,7 +884,7 @@ def sky130_fd_sc_hd__a31oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a31oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a31oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a31oi_4 fixed cell.
 
@@ -898,7 +899,7 @@ def sky130_fd_sc_hd__a31oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a31oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a32o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a32o_1 fixed cell.
 
@@ -913,7 +914,7 @@ def sky130_fd_sc_hd__a32o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a32o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a32o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a32o_2 fixed cell.
 
@@ -928,7 +929,7 @@ def sky130_fd_sc_hd__a32o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a32o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a32o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a32o_4 fixed cell.
 
@@ -943,7 +944,7 @@ def sky130_fd_sc_hd__a32o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a32o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a32oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a32oi_1 fixed cell.
 
@@ -958,7 +959,7 @@ def sky130_fd_sc_hd__a32oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a32oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a32oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a32oi_2 fixed cell.
 
@@ -973,7 +974,7 @@ def sky130_fd_sc_hd__a32oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a32oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a32oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a32oi_4 fixed cell.
 
@@ -988,7 +989,7 @@ def sky130_fd_sc_hd__a32oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a32oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a41o_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a41o_1 fixed cell.
 
@@ -1003,7 +1004,7 @@ def sky130_fd_sc_hd__a41o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a41o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a41o_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a41o_2 fixed cell.
 
@@ -1018,7 +1019,7 @@ def sky130_fd_sc_hd__a41o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a41o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a41o_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a41o_4 fixed cell.
 
@@ -1033,7 +1034,7 @@ def sky130_fd_sc_hd__a41o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a41o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a41oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__a41oi_1 fixed cell.
 
@@ -1048,7 +1049,7 @@ def sky130_fd_sc_hd__a41oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a41oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a41oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__a41oi_2 fixed cell.
 
@@ -1063,7 +1064,7 @@ def sky130_fd_sc_hd__a41oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a41oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__a41oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__a41oi_4 fixed cell.
 
@@ -1078,7 +1079,7 @@ def sky130_fd_sc_hd__a41oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__a41oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2_0 fixed cell.
 
@@ -1093,7 +1094,7 @@ def sky130_fd_sc_hd__and2_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2_1 fixed cell.
 
@@ -1108,7 +1109,7 @@ def sky130_fd_sc_hd__and2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2_2 fixed cell.
 
@@ -1123,7 +1124,7 @@ def sky130_fd_sc_hd__and2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2_4 fixed cell.
 
@@ -1138,7 +1139,7 @@ def sky130_fd_sc_hd__and2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2b_1 fixed cell.
 
@@ -1153,7 +1154,7 @@ def sky130_fd_sc_hd__and2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2b_2 fixed cell.
 
@@ -1168,7 +1169,7 @@ def sky130_fd_sc_hd__and2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and2b_4 fixed cell.
 
@@ -1183,7 +1184,7 @@ def sky130_fd_sc_hd__and2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and3_1 fixed cell.
 
@@ -1198,7 +1199,7 @@ def sky130_fd_sc_hd__and3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and3_2 fixed cell.
 
@@ -1213,7 +1214,7 @@ def sky130_fd_sc_hd__and3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and3_4 fixed cell.
 
@@ -1228,7 +1229,7 @@ def sky130_fd_sc_hd__and3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and3b_1 fixed cell.
 
@@ -1243,7 +1244,7 @@ def sky130_fd_sc_hd__and3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and3b_2 fixed cell.
 
@@ -1258,7 +1259,7 @@ def sky130_fd_sc_hd__and3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and3b_4 fixed cell.
 
@@ -1273,7 +1274,7 @@ def sky130_fd_sc_hd__and3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4_1 fixed cell.
 
@@ -1288,7 +1289,7 @@ def sky130_fd_sc_hd__and4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4_2 fixed cell.
 
@@ -1303,7 +1304,7 @@ def sky130_fd_sc_hd__and4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4_4 fixed cell.
 
@@ -1318,7 +1319,7 @@ def sky130_fd_sc_hd__and4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4b_1 fixed cell.
 
@@ -1333,7 +1334,7 @@ def sky130_fd_sc_hd__and4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4b_2 fixed cell.
 
@@ -1348,7 +1349,7 @@ def sky130_fd_sc_hd__and4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4b_4 fixed cell.
 
@@ -1363,7 +1364,7 @@ def sky130_fd_sc_hd__and4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4bb_1 fixed cell.
 
@@ -1378,7 +1379,7 @@ def sky130_fd_sc_hd__and4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4bb_2 fixed cell.
 
@@ -1393,7 +1394,7 @@ def sky130_fd_sc_hd__and4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__and4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__and4bb_4 fixed cell.
 
@@ -1408,7 +1409,7 @@ def sky130_fd_sc_hd__and4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__and4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_1 fixed cell.
 
@@ -1423,7 +1424,7 @@ def sky130_fd_sc_hd__buf_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_12() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_12 fixed cell.
 
@@ -1438,7 +1439,7 @@ def sky130_fd_sc_hd__buf_12() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_12.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_16 fixed cell.
 
@@ -1453,7 +1454,7 @@ def sky130_fd_sc_hd__buf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_2 fixed cell.
 
@@ -1468,7 +1469,7 @@ def sky130_fd_sc_hd__buf_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_4 fixed cell.
 
@@ -1483,7 +1484,7 @@ def sky130_fd_sc_hd__buf_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_6() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_6 fixed cell.
 
@@ -1498,7 +1499,7 @@ def sky130_fd_sc_hd__buf_6() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_6.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__buf_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__buf_8 fixed cell.
 
@@ -1513,7 +1514,7 @@ def sky130_fd_sc_hd__buf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__buf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__bufbuf_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__bufbuf_16 fixed cell.
 
@@ -1528,7 +1529,7 @@ def sky130_fd_sc_hd__bufbuf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__bufbuf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__bufbuf_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__bufbuf_8 fixed cell.
 
@@ -1543,7 +1544,7 @@ def sky130_fd_sc_hd__bufbuf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__bufbuf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__bufinv_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__bufinv_16 fixed cell.
 
@@ -1558,7 +1559,7 @@ def sky130_fd_sc_hd__bufinv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__bufinv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__bufinv_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__bufinv_8 fixed cell.
 
@@ -1573,7 +1574,7 @@ def sky130_fd_sc_hd__bufinv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__bufinv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkbuf_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkbuf_1 fixed cell.
 
@@ -1588,7 +1589,7 @@ def sky130_fd_sc_hd__clkbuf_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkbuf_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkbuf_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkbuf_16 fixed cell.
 
@@ -1603,7 +1604,7 @@ def sky130_fd_sc_hd__clkbuf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkbuf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkbuf_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkbuf_2 fixed cell.
 
@@ -1618,7 +1619,7 @@ def sky130_fd_sc_hd__clkbuf_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkbuf_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkbuf_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkbuf_4 fixed cell.
 
@@ -1633,7 +1634,7 @@ def sky130_fd_sc_hd__clkbuf_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkbuf_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkbuf_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkbuf_8 fixed cell.
 
@@ -1648,7 +1649,7 @@ def sky130_fd_sc_hd__clkbuf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkbuf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s15_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s15_1 fixed cell.
 
@@ -1663,7 +1664,7 @@ def sky130_fd_sc_hd__clkdlybuf4s15_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s15_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s15_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s15_2 fixed cell.
 
@@ -1678,7 +1679,7 @@ def sky130_fd_sc_hd__clkdlybuf4s15_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s15_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s18_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s18_1 fixed cell.
 
@@ -1693,7 +1694,7 @@ def sky130_fd_sc_hd__clkdlybuf4s18_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s18_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s18_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s18_2 fixed cell.
 
@@ -1708,7 +1709,7 @@ def sky130_fd_sc_hd__clkdlybuf4s18_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s18_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s25_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s25_1 fixed cell.
 
@@ -1723,7 +1724,7 @@ def sky130_fd_sc_hd__clkdlybuf4s25_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s25_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s25_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s25_2 fixed cell.
 
@@ -1738,7 +1739,7 @@ def sky130_fd_sc_hd__clkdlybuf4s25_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s25_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s50_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s50_1 fixed cell.
 
@@ -1753,7 +1754,7 @@ def sky130_fd_sc_hd__clkdlybuf4s50_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s50_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkdlybuf4s50_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkdlybuf4s50_2 fixed cell.
 
@@ -1768,7 +1769,7 @@ def sky130_fd_sc_hd__clkdlybuf4s50_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkdlybuf4s50_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinv_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinv_1 fixed cell.
 
@@ -1783,7 +1784,7 @@ def sky130_fd_sc_hd__clkinv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinv_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinv_16 fixed cell.
 
@@ -1798,7 +1799,7 @@ def sky130_fd_sc_hd__clkinv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinv_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinv_2 fixed cell.
 
@@ -1813,7 +1814,7 @@ def sky130_fd_sc_hd__clkinv_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinv_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinv_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinv_4 fixed cell.
 
@@ -1828,7 +1829,7 @@ def sky130_fd_sc_hd__clkinv_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinv_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinv_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinv_8 fixed cell.
 
@@ -1843,7 +1844,7 @@ def sky130_fd_sc_hd__clkinv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinvlp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinvlp_2 fixed cell.
 
@@ -1858,7 +1859,7 @@ def sky130_fd_sc_hd__clkinvlp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinvlp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__clkinvlp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__clkinvlp_4 fixed cell.
 
@@ -1873,7 +1874,7 @@ def sky130_fd_sc_hd__clkinvlp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__clkinvlp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__conb_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__conb_1 fixed cell.
 
@@ -1888,7 +1889,7 @@ def sky130_fd_sc_hd__conb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__conb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__decap_12() -> gf.Component:
     """Returns sky130_fd_sc_hd__decap_12 fixed cell.
 
@@ -1903,7 +1904,7 @@ def sky130_fd_sc_hd__decap_12() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__decap_12.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__decap_3() -> gf.Component:
     """Returns sky130_fd_sc_hd__decap_3 fixed cell.
 
@@ -1918,7 +1919,7 @@ def sky130_fd_sc_hd__decap_3() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__decap_3.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__decap_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__decap_4 fixed cell.
 
@@ -1933,7 +1934,7 @@ def sky130_fd_sc_hd__decap_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__decap_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__decap_6() -> gf.Component:
     """Returns sky130_fd_sc_hd__decap_6 fixed cell.
 
@@ -1948,7 +1949,7 @@ def sky130_fd_sc_hd__decap_6() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__decap_6.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__decap_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__decap_8 fixed cell.
 
@@ -1963,7 +1964,7 @@ def sky130_fd_sc_hd__decap_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__decap_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfbbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfbbn_1 fixed cell.
 
@@ -1978,7 +1979,7 @@ def sky130_fd_sc_hd__dfbbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfbbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfbbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfbbn_2 fixed cell.
 
@@ -1993,7 +1994,7 @@ def sky130_fd_sc_hd__dfbbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfbbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfbbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfbbp_1 fixed cell.
 
@@ -2008,7 +2009,7 @@ def sky130_fd_sc_hd__dfbbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfbbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfrbp_1 fixed cell.
 
@@ -2023,7 +2024,7 @@ def sky130_fd_sc_hd__dfrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfrbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfrbp_2 fixed cell.
 
@@ -2038,7 +2039,7 @@ def sky130_fd_sc_hd__dfrbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfrbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfrtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfrtn_1 fixed cell.
 
@@ -2053,7 +2054,7 @@ def sky130_fd_sc_hd__dfrtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfrtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfrtp_1 fixed cell.
 
@@ -2068,7 +2069,7 @@ def sky130_fd_sc_hd__dfrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfrtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfrtp_2 fixed cell.
 
@@ -2083,7 +2084,7 @@ def sky130_fd_sc_hd__dfrtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfrtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfrtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfrtp_4 fixed cell.
 
@@ -2098,7 +2099,7 @@ def sky130_fd_sc_hd__dfrtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfrtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfsbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfsbp_1 fixed cell.
 
@@ -2113,7 +2114,7 @@ def sky130_fd_sc_hd__dfsbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfsbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfsbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfsbp_2 fixed cell.
 
@@ -2128,7 +2129,7 @@ def sky130_fd_sc_hd__dfsbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfsbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfstp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfstp_1 fixed cell.
 
@@ -2143,7 +2144,7 @@ def sky130_fd_sc_hd__dfstp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfstp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfstp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfstp_2 fixed cell.
 
@@ -2158,7 +2159,7 @@ def sky130_fd_sc_hd__dfstp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfstp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfstp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfstp_4 fixed cell.
 
@@ -2173,7 +2174,7 @@ def sky130_fd_sc_hd__dfstp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfstp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfxbp_1 fixed cell.
 
@@ -2188,7 +2189,7 @@ def sky130_fd_sc_hd__dfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfxbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfxbp_2 fixed cell.
 
@@ -2203,7 +2204,7 @@ def sky130_fd_sc_hd__dfxbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfxbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfxtp_1 fixed cell.
 
@@ -2218,7 +2219,7 @@ def sky130_fd_sc_hd__dfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfxtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfxtp_2 fixed cell.
 
@@ -2233,7 +2234,7 @@ def sky130_fd_sc_hd__dfxtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfxtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dfxtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dfxtp_4 fixed cell.
 
@@ -2248,7 +2249,7 @@ def sky130_fd_sc_hd__dfxtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dfxtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__diode_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__diode_2 fixed cell.
 
@@ -2263,7 +2264,7 @@ def sky130_fd_sc_hd__diode_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__diode_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlclkp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlclkp_1 fixed cell.
 
@@ -2278,7 +2279,7 @@ def sky130_fd_sc_hd__dlclkp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlclkp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlclkp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlclkp_2 fixed cell.
 
@@ -2293,7 +2294,7 @@ def sky130_fd_sc_hd__dlclkp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlclkp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlclkp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlclkp_4 fixed cell.
 
@@ -2308,7 +2309,7 @@ def sky130_fd_sc_hd__dlclkp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlclkp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrbn_1 fixed cell.
 
@@ -2323,7 +2324,7 @@ def sky130_fd_sc_hd__dlrbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrbn_2 fixed cell.
 
@@ -2338,7 +2339,7 @@ def sky130_fd_sc_hd__dlrbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrbp_1 fixed cell.
 
@@ -2353,7 +2354,7 @@ def sky130_fd_sc_hd__dlrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrbp_2 fixed cell.
 
@@ -2368,7 +2369,7 @@ def sky130_fd_sc_hd__dlrbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrtn_1 fixed cell.
 
@@ -2383,7 +2384,7 @@ def sky130_fd_sc_hd__dlrtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrtn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrtn_2 fixed cell.
 
@@ -2398,7 +2399,7 @@ def sky130_fd_sc_hd__dlrtn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrtn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrtn_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrtn_4 fixed cell.
 
@@ -2413,7 +2414,7 @@ def sky130_fd_sc_hd__dlrtn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrtn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrtp_1 fixed cell.
 
@@ -2428,7 +2429,7 @@ def sky130_fd_sc_hd__dlrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrtp_2 fixed cell.
 
@@ -2443,7 +2444,7 @@ def sky130_fd_sc_hd__dlrtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlrtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlrtp_4 fixed cell.
 
@@ -2458,7 +2459,7 @@ def sky130_fd_sc_hd__dlrtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlrtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxbn_1 fixed cell.
 
@@ -2473,7 +2474,7 @@ def sky130_fd_sc_hd__dlxbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxbn_2 fixed cell.
 
@@ -2488,7 +2489,7 @@ def sky130_fd_sc_hd__dlxbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxbp_1 fixed cell.
 
@@ -2503,7 +2504,7 @@ def sky130_fd_sc_hd__dlxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxtn_1 fixed cell.
 
@@ -2518,7 +2519,7 @@ def sky130_fd_sc_hd__dlxtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxtn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxtn_2 fixed cell.
 
@@ -2533,7 +2534,7 @@ def sky130_fd_sc_hd__dlxtn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxtn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxtn_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxtn_4 fixed cell.
 
@@ -2548,7 +2549,7 @@ def sky130_fd_sc_hd__dlxtn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxtn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlxtp_1 fixed cell.
 
@@ -2563,7 +2564,7 @@ def sky130_fd_sc_hd__dlxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlygate4sd1_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlygate4sd1_1 fixed cell.
 
@@ -2578,7 +2579,7 @@ def sky130_fd_sc_hd__dlygate4sd1_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlygate4sd1_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlygate4sd2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlygate4sd2_1 fixed cell.
 
@@ -2593,7 +2594,7 @@ def sky130_fd_sc_hd__dlygate4sd2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlygate4sd2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlygate4sd3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlygate4sd3_1 fixed cell.
 
@@ -2608,7 +2609,7 @@ def sky130_fd_sc_hd__dlygate4sd3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlygate4sd3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlymetal6s2s_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlymetal6s2s_1 fixed cell.
 
@@ -2623,7 +2624,7 @@ def sky130_fd_sc_hd__dlymetal6s2s_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlymetal6s2s_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlymetal6s4s_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlymetal6s4s_1 fixed cell.
 
@@ -2638,7 +2639,7 @@ def sky130_fd_sc_hd__dlymetal6s4s_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlymetal6s4s_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__dlymetal6s6s_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__dlymetal6s6s_1 fixed cell.
 
@@ -2653,7 +2654,7 @@ def sky130_fd_sc_hd__dlymetal6s6s_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__dlymetal6s6s_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ebufn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__ebufn_1 fixed cell.
 
@@ -2668,7 +2669,7 @@ def sky130_fd_sc_hd__ebufn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ebufn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ebufn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__ebufn_2 fixed cell.
 
@@ -2683,7 +2684,7 @@ def sky130_fd_sc_hd__ebufn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ebufn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ebufn_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__ebufn_4 fixed cell.
 
@@ -2698,7 +2699,7 @@ def sky130_fd_sc_hd__ebufn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ebufn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ebufn_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__ebufn_8 fixed cell.
 
@@ -2713,7 +2714,7 @@ def sky130_fd_sc_hd__ebufn_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ebufn_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__edfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__edfxbp_1 fixed cell.
 
@@ -2728,7 +2729,7 @@ def sky130_fd_sc_hd__edfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__edfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__edfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__edfxtp_1 fixed cell.
 
@@ -2743,7 +2744,7 @@ def sky130_fd_sc_hd__edfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__edfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvn_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvn_0 fixed cell.
 
@@ -2758,7 +2759,7 @@ def sky130_fd_sc_hd__einvn_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvn_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvn_1 fixed cell.
 
@@ -2773,7 +2774,7 @@ def sky130_fd_sc_hd__einvn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvn_2 fixed cell.
 
@@ -2788,7 +2789,7 @@ def sky130_fd_sc_hd__einvn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvn_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvn_4 fixed cell.
 
@@ -2803,7 +2804,7 @@ def sky130_fd_sc_hd__einvn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvn_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvn_8 fixed cell.
 
@@ -2818,7 +2819,7 @@ def sky130_fd_sc_hd__einvn_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvn_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvp_1 fixed cell.
 
@@ -2833,7 +2834,7 @@ def sky130_fd_sc_hd__einvp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvp_2 fixed cell.
 
@@ -2848,7 +2849,7 @@ def sky130_fd_sc_hd__einvp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvp_4 fixed cell.
 
@@ -2863,7 +2864,7 @@ def sky130_fd_sc_hd__einvp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__einvp_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__einvp_8 fixed cell.
 
@@ -2878,7 +2879,7 @@ def sky130_fd_sc_hd__einvp_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__einvp_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fa_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__fa_1 fixed cell.
 
@@ -2893,7 +2894,7 @@ def sky130_fd_sc_hd__fa_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fa_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fa_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__fa_2 fixed cell.
 
@@ -2908,7 +2909,7 @@ def sky130_fd_sc_hd__fa_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fa_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fa_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__fa_4 fixed cell.
 
@@ -2923,7 +2924,7 @@ def sky130_fd_sc_hd__fa_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fa_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fah_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__fah_1 fixed cell.
 
@@ -2938,7 +2939,7 @@ def sky130_fd_sc_hd__fah_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fah_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fahcin_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__fahcin_1 fixed cell.
 
@@ -2953,7 +2954,7 @@ def sky130_fd_sc_hd__fahcin_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fahcin_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fahcon_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__fahcon_1 fixed cell.
 
@@ -2968,7 +2969,7 @@ def sky130_fd_sc_hd__fahcon_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fahcon_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fill_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__fill_1 fixed cell.
 
@@ -2983,7 +2984,7 @@ def sky130_fd_sc_hd__fill_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fill_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fill_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__fill_2 fixed cell.
 
@@ -2998,7 +2999,7 @@ def sky130_fd_sc_hd__fill_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fill_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fill_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__fill_4 fixed cell.
 
@@ -3013,7 +3014,7 @@ def sky130_fd_sc_hd__fill_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fill_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__fill_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__fill_8 fixed cell.
 
@@ -3028,7 +3029,7 @@ def sky130_fd_sc_hd__fill_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__fill_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ha_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__ha_1 fixed cell.
 
@@ -3043,7 +3044,7 @@ def sky130_fd_sc_hd__ha_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ha_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ha_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__ha_2 fixed cell.
 
@@ -3058,7 +3059,7 @@ def sky130_fd_sc_hd__ha_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ha_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__ha_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__ha_4 fixed cell.
 
@@ -3073,7 +3074,7 @@ def sky130_fd_sc_hd__ha_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__ha_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_1 fixed cell.
 
@@ -3088,7 +3089,7 @@ def sky130_fd_sc_hd__inv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_12() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_12 fixed cell.
 
@@ -3103,7 +3104,7 @@ def sky130_fd_sc_hd__inv_12() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_12.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_16 fixed cell.
 
@@ -3118,7 +3119,7 @@ def sky130_fd_sc_hd__inv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_2 fixed cell.
 
@@ -3133,7 +3134,7 @@ def sky130_fd_sc_hd__inv_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_4 fixed cell.
 
@@ -3148,7 +3149,7 @@ def sky130_fd_sc_hd__inv_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_6() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_6 fixed cell.
 
@@ -3163,7 +3164,7 @@ def sky130_fd_sc_hd__inv_6() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_6.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__inv_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__inv_8 fixed cell.
 
@@ -3178,7 +3179,7 @@ def sky130_fd_sc_hd__inv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__inv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_bleeder_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_bleeder_1 fixed cell.
 
@@ -3193,7 +3194,7 @@ def sky130_fd_sc_hd__lpflow_bleeder_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_bleeder_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkbufkapwr_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkbufkapwr_1 fixed cell.
 
@@ -3208,7 +3209,7 @@ def sky130_fd_sc_hd__lpflow_clkbufkapwr_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkbufkapwr_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkbufkapwr_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkbufkapwr_16 fixed cell.
 
@@ -3223,7 +3224,7 @@ def sky130_fd_sc_hd__lpflow_clkbufkapwr_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkbufkapwr_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkbufkapwr_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkbufkapwr_2 fixed cell.
 
@@ -3238,7 +3239,7 @@ def sky130_fd_sc_hd__lpflow_clkbufkapwr_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkbufkapwr_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkbufkapwr_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkbufkapwr_4 fixed cell.
 
@@ -3253,7 +3254,7 @@ def sky130_fd_sc_hd__lpflow_clkbufkapwr_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkbufkapwr_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkbufkapwr_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkbufkapwr_8 fixed cell.
 
@@ -3268,7 +3269,7 @@ def sky130_fd_sc_hd__lpflow_clkbufkapwr_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkbufkapwr_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkinvkapwr_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkinvkapwr_1 fixed cell.
 
@@ -3283,7 +3284,7 @@ def sky130_fd_sc_hd__lpflow_clkinvkapwr_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkinvkapwr_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkinvkapwr_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkinvkapwr_16 fixed cell.
 
@@ -3298,7 +3299,7 @@ def sky130_fd_sc_hd__lpflow_clkinvkapwr_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkinvkapwr_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkinvkapwr_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkinvkapwr_2 fixed cell.
 
@@ -3313,7 +3314,7 @@ def sky130_fd_sc_hd__lpflow_clkinvkapwr_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkinvkapwr_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkinvkapwr_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkinvkapwr_4 fixed cell.
 
@@ -3328,7 +3329,7 @@ def sky130_fd_sc_hd__lpflow_clkinvkapwr_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkinvkapwr_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_clkinvkapwr_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_clkinvkapwr_8 fixed cell.
 
@@ -3343,7 +3344,7 @@ def sky130_fd_sc_hd__lpflow_clkinvkapwr_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_clkinvkapwr_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_decapkapwr_12() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_decapkapwr_12 fixed cell.
 
@@ -3358,7 +3359,7 @@ def sky130_fd_sc_hd__lpflow_decapkapwr_12() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_decapkapwr_12.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_decapkapwr_3() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_decapkapwr_3 fixed cell.
 
@@ -3373,7 +3374,7 @@ def sky130_fd_sc_hd__lpflow_decapkapwr_3() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_decapkapwr_3.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_decapkapwr_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_decapkapwr_4 fixed cell.
 
@@ -3388,7 +3389,7 @@ def sky130_fd_sc_hd__lpflow_decapkapwr_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_decapkapwr_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_decapkapwr_6() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_decapkapwr_6 fixed cell.
 
@@ -3403,7 +3404,7 @@ def sky130_fd_sc_hd__lpflow_decapkapwr_6() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_decapkapwr_6.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_decapkapwr_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_decapkapwr_8 fixed cell.
 
@@ -3418,7 +3419,7 @@ def sky130_fd_sc_hd__lpflow_decapkapwr_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_decapkapwr_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_inputiso0n_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_inputiso0n_1 fixed cell.
 
@@ -3433,7 +3434,7 @@ def sky130_fd_sc_hd__lpflow_inputiso0n_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_inputiso0n_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_inputiso0p_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_inputiso0p_1 fixed cell.
 
@@ -3448,7 +3449,7 @@ def sky130_fd_sc_hd__lpflow_inputiso0p_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_inputiso0p_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_inputiso1n_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_inputiso1n_1 fixed cell.
 
@@ -3463,7 +3464,7 @@ def sky130_fd_sc_hd__lpflow_inputiso1n_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_inputiso1n_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_inputiso1p_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_inputiso1p_1 fixed cell.
 
@@ -3478,7 +3479,7 @@ def sky130_fd_sc_hd__lpflow_inputiso1p_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_inputiso1p_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_inputisolatch_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_inputisolatch_1 fixed cell.
 
@@ -3493,7 +3494,7 @@ def sky130_fd_sc_hd__lpflow_inputisolatch_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_inputisolatch_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_isobufsrc_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_isobufsrc_1 fixed cell.
 
@@ -3508,7 +3509,7 @@ def sky130_fd_sc_hd__lpflow_isobufsrc_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_isobufsrc_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_isobufsrc_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_isobufsrc_16 fixed cell.
 
@@ -3523,7 +3524,7 @@ def sky130_fd_sc_hd__lpflow_isobufsrc_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_isobufsrc_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_isobufsrc_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_isobufsrc_2 fixed cell.
 
@@ -3538,7 +3539,7 @@ def sky130_fd_sc_hd__lpflow_isobufsrc_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_isobufsrc_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_isobufsrc_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_isobufsrc_4 fixed cell.
 
@@ -3553,7 +3554,7 @@ def sky130_fd_sc_hd__lpflow_isobufsrc_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_isobufsrc_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_isobufsrc_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_isobufsrc_8 fixed cell.
 
@@ -3568,7 +3569,7 @@ def sky130_fd_sc_hd__lpflow_isobufsrc_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_isobufsrc_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_isobufsrckapwr_16() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_isobufsrckapwr_16 fixed cell.
 
@@ -3583,7 +3584,7 @@ def sky130_fd_sc_hd__lpflow_isobufsrckapwr_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1 fixed cell.
 
@@ -3598,7 +3599,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2 fixed cell.
 
@@ -3613,7 +3614,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4 fixed cell.
 
@@ -3628,7 +3629,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4 fixed cell.
 
@@ -3643,7 +3644,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1 fixed cell.
 
@@ -3658,7 +3659,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2 fixed cell.
 
@@ -3673,7 +3674,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4 fixed cell.
 
@@ -3688,7 +3689,7 @@ def sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__macro_sparecell() -> gf.Component:
     """Returns sky130_fd_sc_hd__macro_sparecell fixed cell.
 
@@ -3703,7 +3704,7 @@ def sky130_fd_sc_hd__macro_sparecell() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__macro_sparecell.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__maj3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__maj3_1 fixed cell.
 
@@ -3718,7 +3719,7 @@ def sky130_fd_sc_hd__maj3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__maj3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__maj3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__maj3_2 fixed cell.
 
@@ -3733,7 +3734,7 @@ def sky130_fd_sc_hd__maj3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__maj3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__maj3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__maj3_4 fixed cell.
 
@@ -3748,7 +3749,7 @@ def sky130_fd_sc_hd__maj3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__maj3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2_1 fixed cell.
 
@@ -3763,7 +3764,7 @@ def sky130_fd_sc_hd__mux2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2_2 fixed cell.
 
@@ -3778,7 +3779,7 @@ def sky130_fd_sc_hd__mux2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2_4 fixed cell.
 
@@ -3793,7 +3794,7 @@ def sky130_fd_sc_hd__mux2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2_8 fixed cell.
 
@@ -3808,7 +3809,7 @@ def sky130_fd_sc_hd__mux2_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2i_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2i_1 fixed cell.
 
@@ -3823,7 +3824,7 @@ def sky130_fd_sc_hd__mux2i_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2i_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2i_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2i_2 fixed cell.
 
@@ -3838,7 +3839,7 @@ def sky130_fd_sc_hd__mux2i_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2i_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux2i_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux2i_4 fixed cell.
 
@@ -3853,7 +3854,7 @@ def sky130_fd_sc_hd__mux2i_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux2i_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux4_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux4_1 fixed cell.
 
@@ -3868,7 +3869,7 @@ def sky130_fd_sc_hd__mux4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux4_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux4_2 fixed cell.
 
@@ -3883,7 +3884,7 @@ def sky130_fd_sc_hd__mux4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__mux4_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__mux4_4 fixed cell.
 
@@ -3898,7 +3899,7 @@ def sky130_fd_sc_hd__mux4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__mux4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2_1 fixed cell.
 
@@ -3913,7 +3914,7 @@ def sky130_fd_sc_hd__nand2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2_2 fixed cell.
 
@@ -3928,7 +3929,7 @@ def sky130_fd_sc_hd__nand2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2_4 fixed cell.
 
@@ -3943,7 +3944,7 @@ def sky130_fd_sc_hd__nand2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2_8 fixed cell.
 
@@ -3958,7 +3959,7 @@ def sky130_fd_sc_hd__nand2_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2b_1 fixed cell.
 
@@ -3973,7 +3974,7 @@ def sky130_fd_sc_hd__nand2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2b_2 fixed cell.
 
@@ -3988,7 +3989,7 @@ def sky130_fd_sc_hd__nand2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand2b_4 fixed cell.
 
@@ -4003,7 +4004,7 @@ def sky130_fd_sc_hd__nand2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand3_1 fixed cell.
 
@@ -4018,7 +4019,7 @@ def sky130_fd_sc_hd__nand3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand3_2 fixed cell.
 
@@ -4033,7 +4034,7 @@ def sky130_fd_sc_hd__nand3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand3_4 fixed cell.
 
@@ -4048,7 +4049,7 @@ def sky130_fd_sc_hd__nand3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand3b_1 fixed cell.
 
@@ -4063,7 +4064,7 @@ def sky130_fd_sc_hd__nand3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand3b_2 fixed cell.
 
@@ -4078,7 +4079,7 @@ def sky130_fd_sc_hd__nand3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand3b_4 fixed cell.
 
@@ -4093,7 +4094,7 @@ def sky130_fd_sc_hd__nand3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4_1 fixed cell.
 
@@ -4108,7 +4109,7 @@ def sky130_fd_sc_hd__nand4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4_2 fixed cell.
 
@@ -4123,7 +4124,7 @@ def sky130_fd_sc_hd__nand4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4_4 fixed cell.
 
@@ -4138,7 +4139,7 @@ def sky130_fd_sc_hd__nand4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4b_1 fixed cell.
 
@@ -4153,7 +4154,7 @@ def sky130_fd_sc_hd__nand4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4b_2 fixed cell.
 
@@ -4168,7 +4169,7 @@ def sky130_fd_sc_hd__nand4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4b_4 fixed cell.
 
@@ -4183,7 +4184,7 @@ def sky130_fd_sc_hd__nand4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4bb_1 fixed cell.
 
@@ -4198,7 +4199,7 @@ def sky130_fd_sc_hd__nand4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4bb_2 fixed cell.
 
@@ -4213,7 +4214,7 @@ def sky130_fd_sc_hd__nand4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nand4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nand4bb_4 fixed cell.
 
@@ -4228,7 +4229,7 @@ def sky130_fd_sc_hd__nand4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nand4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2_1 fixed cell.
 
@@ -4243,7 +4244,7 @@ def sky130_fd_sc_hd__nor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2_2 fixed cell.
 
@@ -4258,7 +4259,7 @@ def sky130_fd_sc_hd__nor2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2_4 fixed cell.
 
@@ -4273,7 +4274,7 @@ def sky130_fd_sc_hd__nor2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2_8 fixed cell.
 
@@ -4288,7 +4289,7 @@ def sky130_fd_sc_hd__nor2_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2b_1 fixed cell.
 
@@ -4303,7 +4304,7 @@ def sky130_fd_sc_hd__nor2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2b_2 fixed cell.
 
@@ -4318,7 +4319,7 @@ def sky130_fd_sc_hd__nor2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor2b_4 fixed cell.
 
@@ -4333,7 +4334,7 @@ def sky130_fd_sc_hd__nor2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor3_1 fixed cell.
 
@@ -4348,7 +4349,7 @@ def sky130_fd_sc_hd__nor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor3_2 fixed cell.
 
@@ -4363,7 +4364,7 @@ def sky130_fd_sc_hd__nor3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor3_4 fixed cell.
 
@@ -4378,7 +4379,7 @@ def sky130_fd_sc_hd__nor3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor3b_1 fixed cell.
 
@@ -4393,7 +4394,7 @@ def sky130_fd_sc_hd__nor3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor3b_2 fixed cell.
 
@@ -4408,7 +4409,7 @@ def sky130_fd_sc_hd__nor3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor3b_4 fixed cell.
 
@@ -4423,7 +4424,7 @@ def sky130_fd_sc_hd__nor3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4_1 fixed cell.
 
@@ -4438,7 +4439,7 @@ def sky130_fd_sc_hd__nor4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4_2 fixed cell.
 
@@ -4453,7 +4454,7 @@ def sky130_fd_sc_hd__nor4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4_4 fixed cell.
 
@@ -4468,7 +4469,7 @@ def sky130_fd_sc_hd__nor4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4b_1 fixed cell.
 
@@ -4483,7 +4484,7 @@ def sky130_fd_sc_hd__nor4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4b_2 fixed cell.
 
@@ -4498,7 +4499,7 @@ def sky130_fd_sc_hd__nor4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4b_4 fixed cell.
 
@@ -4513,7 +4514,7 @@ def sky130_fd_sc_hd__nor4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4bb_1 fixed cell.
 
@@ -4528,7 +4529,7 @@ def sky130_fd_sc_hd__nor4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4bb_2 fixed cell.
 
@@ -4543,7 +4544,7 @@ def sky130_fd_sc_hd__nor4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__nor4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__nor4bb_4 fixed cell.
 
@@ -4558,7 +4559,7 @@ def sky130_fd_sc_hd__nor4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__nor4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2111a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2111a_1 fixed cell.
 
@@ -4573,7 +4574,7 @@ def sky130_fd_sc_hd__o2111a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2111a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2111a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2111a_2 fixed cell.
 
@@ -4588,7 +4589,7 @@ def sky130_fd_sc_hd__o2111a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2111a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2111a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2111a_4 fixed cell.
 
@@ -4603,7 +4604,7 @@ def sky130_fd_sc_hd__o2111a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2111a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2111ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2111ai_1 fixed cell.
 
@@ -4618,7 +4619,7 @@ def sky130_fd_sc_hd__o2111ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2111ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2111ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2111ai_2 fixed cell.
 
@@ -4633,7 +4634,7 @@ def sky130_fd_sc_hd__o2111ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2111ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2111ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2111ai_4 fixed cell.
 
@@ -4648,7 +4649,7 @@ def sky130_fd_sc_hd__o2111ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2111ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o211a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o211a_1 fixed cell.
 
@@ -4663,7 +4664,7 @@ def sky130_fd_sc_hd__o211a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o211a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o211a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o211a_2 fixed cell.
 
@@ -4678,7 +4679,7 @@ def sky130_fd_sc_hd__o211a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o211a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o211a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o211a_4 fixed cell.
 
@@ -4693,7 +4694,7 @@ def sky130_fd_sc_hd__o211a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o211a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o211ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o211ai_1 fixed cell.
 
@@ -4708,7 +4709,7 @@ def sky130_fd_sc_hd__o211ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o211ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o211ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o211ai_2 fixed cell.
 
@@ -4723,7 +4724,7 @@ def sky130_fd_sc_hd__o211ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o211ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o211ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o211ai_4 fixed cell.
 
@@ -4738,7 +4739,7 @@ def sky130_fd_sc_hd__o211ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o211ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21a_1 fixed cell.
 
@@ -4753,7 +4754,7 @@ def sky130_fd_sc_hd__o21a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21a_2 fixed cell.
 
@@ -4768,7 +4769,7 @@ def sky130_fd_sc_hd__o21a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21a_4 fixed cell.
 
@@ -4783,7 +4784,7 @@ def sky130_fd_sc_hd__o21a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ai_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ai_0 fixed cell.
 
@@ -4798,7 +4799,7 @@ def sky130_fd_sc_hd__o21ai_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ai_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ai_1 fixed cell.
 
@@ -4813,7 +4814,7 @@ def sky130_fd_sc_hd__o21ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ai_2 fixed cell.
 
@@ -4828,7 +4829,7 @@ def sky130_fd_sc_hd__o21ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ai_4 fixed cell.
 
@@ -4843,7 +4844,7 @@ def sky130_fd_sc_hd__o21ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ba_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ba_1 fixed cell.
 
@@ -4858,7 +4859,7 @@ def sky130_fd_sc_hd__o21ba_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ba_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ba_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ba_2 fixed cell.
 
@@ -4873,7 +4874,7 @@ def sky130_fd_sc_hd__o21ba_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ba_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21ba_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21ba_4 fixed cell.
 
@@ -4888,7 +4889,7 @@ def sky130_fd_sc_hd__o21ba_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21ba_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21bai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21bai_1 fixed cell.
 
@@ -4903,7 +4904,7 @@ def sky130_fd_sc_hd__o21bai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21bai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21bai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21bai_2 fixed cell.
 
@@ -4918,7 +4919,7 @@ def sky130_fd_sc_hd__o21bai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21bai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o21bai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o21bai_4 fixed cell.
 
@@ -4933,7 +4934,7 @@ def sky130_fd_sc_hd__o21bai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o21bai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o221a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o221a_1 fixed cell.
 
@@ -4948,7 +4949,7 @@ def sky130_fd_sc_hd__o221a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o221a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o221a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o221a_2 fixed cell.
 
@@ -4963,7 +4964,7 @@ def sky130_fd_sc_hd__o221a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o221a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o221a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o221a_4 fixed cell.
 
@@ -4978,7 +4979,7 @@ def sky130_fd_sc_hd__o221a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o221a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o221ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o221ai_1 fixed cell.
 
@@ -4993,7 +4994,7 @@ def sky130_fd_sc_hd__o221ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o221ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o221ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o221ai_2 fixed cell.
 
@@ -5008,7 +5009,7 @@ def sky130_fd_sc_hd__o221ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o221ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o221ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o221ai_4 fixed cell.
 
@@ -5023,7 +5024,7 @@ def sky130_fd_sc_hd__o221ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o221ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o22a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o22a_1 fixed cell.
 
@@ -5038,7 +5039,7 @@ def sky130_fd_sc_hd__o22a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o22a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o22a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o22a_2 fixed cell.
 
@@ -5053,7 +5054,7 @@ def sky130_fd_sc_hd__o22a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o22a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o22a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o22a_4 fixed cell.
 
@@ -5068,7 +5069,7 @@ def sky130_fd_sc_hd__o22a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o22a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o22ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o22ai_1 fixed cell.
 
@@ -5083,7 +5084,7 @@ def sky130_fd_sc_hd__o22ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o22ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o22ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o22ai_2 fixed cell.
 
@@ -5098,7 +5099,7 @@ def sky130_fd_sc_hd__o22ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o22ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o22ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o22ai_4 fixed cell.
 
@@ -5113,7 +5114,7 @@ def sky130_fd_sc_hd__o22ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o22ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2bb2a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2bb2a_1 fixed cell.
 
@@ -5128,7 +5129,7 @@ def sky130_fd_sc_hd__o2bb2a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2bb2a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2bb2a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2bb2a_2 fixed cell.
 
@@ -5143,7 +5144,7 @@ def sky130_fd_sc_hd__o2bb2a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2bb2a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2bb2a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2bb2a_4 fixed cell.
 
@@ -5158,7 +5159,7 @@ def sky130_fd_sc_hd__o2bb2a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2bb2a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2bb2ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2bb2ai_1 fixed cell.
 
@@ -5173,7 +5174,7 @@ def sky130_fd_sc_hd__o2bb2ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2bb2ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2bb2ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2bb2ai_2 fixed cell.
 
@@ -5188,7 +5189,7 @@ def sky130_fd_sc_hd__o2bb2ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2bb2ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o2bb2ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o2bb2ai_4 fixed cell.
 
@@ -5203,7 +5204,7 @@ def sky130_fd_sc_hd__o2bb2ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o2bb2ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311a_1 fixed cell.
 
@@ -5218,7 +5219,7 @@ def sky130_fd_sc_hd__o311a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311a_2 fixed cell.
 
@@ -5233,7 +5234,7 @@ def sky130_fd_sc_hd__o311a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311a_4 fixed cell.
 
@@ -5248,7 +5249,7 @@ def sky130_fd_sc_hd__o311a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311ai_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311ai_0 fixed cell.
 
@@ -5263,7 +5264,7 @@ def sky130_fd_sc_hd__o311ai_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311ai_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311ai_1 fixed cell.
 
@@ -5278,7 +5279,7 @@ def sky130_fd_sc_hd__o311ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311ai_2 fixed cell.
 
@@ -5293,7 +5294,7 @@ def sky130_fd_sc_hd__o311ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o311ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o311ai_4 fixed cell.
 
@@ -5308,7 +5309,7 @@ def sky130_fd_sc_hd__o311ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o311ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o31a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o31a_1 fixed cell.
 
@@ -5323,7 +5324,7 @@ def sky130_fd_sc_hd__o31a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o31a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o31a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o31a_2 fixed cell.
 
@@ -5338,7 +5339,7 @@ def sky130_fd_sc_hd__o31a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o31a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o31a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o31a_4 fixed cell.
 
@@ -5353,7 +5354,7 @@ def sky130_fd_sc_hd__o31a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o31a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o31ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o31ai_1 fixed cell.
 
@@ -5368,7 +5369,7 @@ def sky130_fd_sc_hd__o31ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o31ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o31ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o31ai_2 fixed cell.
 
@@ -5383,7 +5384,7 @@ def sky130_fd_sc_hd__o31ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o31ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o31ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o31ai_4 fixed cell.
 
@@ -5398,7 +5399,7 @@ def sky130_fd_sc_hd__o31ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o31ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o32a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o32a_1 fixed cell.
 
@@ -5413,7 +5414,7 @@ def sky130_fd_sc_hd__o32a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o32a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o32a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o32a_2 fixed cell.
 
@@ -5428,7 +5429,7 @@ def sky130_fd_sc_hd__o32a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o32a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o32a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o32a_4 fixed cell.
 
@@ -5443,7 +5444,7 @@ def sky130_fd_sc_hd__o32a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o32a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o32ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o32ai_1 fixed cell.
 
@@ -5458,7 +5459,7 @@ def sky130_fd_sc_hd__o32ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o32ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o32ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o32ai_2 fixed cell.
 
@@ -5473,7 +5474,7 @@ def sky130_fd_sc_hd__o32ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o32ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o32ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o32ai_4 fixed cell.
 
@@ -5488,7 +5489,7 @@ def sky130_fd_sc_hd__o32ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o32ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o41a_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o41a_1 fixed cell.
 
@@ -5503,7 +5504,7 @@ def sky130_fd_sc_hd__o41a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o41a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o41a_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o41a_2 fixed cell.
 
@@ -5518,7 +5519,7 @@ def sky130_fd_sc_hd__o41a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o41a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o41a_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o41a_4 fixed cell.
 
@@ -5533,7 +5534,7 @@ def sky130_fd_sc_hd__o41a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o41a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o41ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__o41ai_1 fixed cell.
 
@@ -5548,7 +5549,7 @@ def sky130_fd_sc_hd__o41ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o41ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o41ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__o41ai_2 fixed cell.
 
@@ -5563,7 +5564,7 @@ def sky130_fd_sc_hd__o41ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o41ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__o41ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__o41ai_4 fixed cell.
 
@@ -5578,7 +5579,7 @@ def sky130_fd_sc_hd__o41ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__o41ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2_0() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2_0 fixed cell.
 
@@ -5593,7 +5594,7 @@ def sky130_fd_sc_hd__or2_0() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2_0.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2_1 fixed cell.
 
@@ -5608,7 +5609,7 @@ def sky130_fd_sc_hd__or2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2_2 fixed cell.
 
@@ -5623,7 +5624,7 @@ def sky130_fd_sc_hd__or2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2_4 fixed cell.
 
@@ -5638,7 +5639,7 @@ def sky130_fd_sc_hd__or2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2b_1 fixed cell.
 
@@ -5653,7 +5654,7 @@ def sky130_fd_sc_hd__or2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2b_2 fixed cell.
 
@@ -5668,7 +5669,7 @@ def sky130_fd_sc_hd__or2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or2b_4 fixed cell.
 
@@ -5683,7 +5684,7 @@ def sky130_fd_sc_hd__or2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or3_1 fixed cell.
 
@@ -5698,7 +5699,7 @@ def sky130_fd_sc_hd__or3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or3_2 fixed cell.
 
@@ -5713,7 +5714,7 @@ def sky130_fd_sc_hd__or3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or3_4 fixed cell.
 
@@ -5728,7 +5729,7 @@ def sky130_fd_sc_hd__or3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or3b_1 fixed cell.
 
@@ -5743,7 +5744,7 @@ def sky130_fd_sc_hd__or3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or3b_2 fixed cell.
 
@@ -5758,7 +5759,7 @@ def sky130_fd_sc_hd__or3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or3b_4 fixed cell.
 
@@ -5773,7 +5774,7 @@ def sky130_fd_sc_hd__or3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4_1 fixed cell.
 
@@ -5788,7 +5789,7 @@ def sky130_fd_sc_hd__or4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4_2 fixed cell.
 
@@ -5803,7 +5804,7 @@ def sky130_fd_sc_hd__or4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4_4 fixed cell.
 
@@ -5818,7 +5819,7 @@ def sky130_fd_sc_hd__or4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4b_1 fixed cell.
 
@@ -5833,7 +5834,7 @@ def sky130_fd_sc_hd__or4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4b_2 fixed cell.
 
@@ -5848,7 +5849,7 @@ def sky130_fd_sc_hd__or4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4b_4 fixed cell.
 
@@ -5863,7 +5864,7 @@ def sky130_fd_sc_hd__or4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4bb_1 fixed cell.
 
@@ -5878,7 +5879,7 @@ def sky130_fd_sc_hd__or4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4bb_2 fixed cell.
 
@@ -5893,7 +5894,7 @@ def sky130_fd_sc_hd__or4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__or4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__or4bb_4 fixed cell.
 
@@ -5908,7 +5909,7 @@ def sky130_fd_sc_hd__or4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__or4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__probe_p_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__probe_p_8 fixed cell.
 
@@ -5923,7 +5924,7 @@ def sky130_fd_sc_hd__probe_p_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__probe_p_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__probec_p_8() -> gf.Component:
     """Returns sky130_fd_sc_hd__probec_p_8 fixed cell.
 
@@ -5938,7 +5939,7 @@ def sky130_fd_sc_hd__probec_p_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__probec_p_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfbbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfbbn_1 fixed cell.
 
@@ -5953,7 +5954,7 @@ def sky130_fd_sc_hd__sdfbbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfbbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfbbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfbbn_2 fixed cell.
 
@@ -5968,7 +5969,7 @@ def sky130_fd_sc_hd__sdfbbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfbbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfbbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfbbp_1 fixed cell.
 
@@ -5983,7 +5984,7 @@ def sky130_fd_sc_hd__sdfbbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfbbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfrbp_1 fixed cell.
 
@@ -5998,7 +5999,7 @@ def sky130_fd_sc_hd__sdfrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfrbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfrbp_2 fixed cell.
 
@@ -6013,7 +6014,7 @@ def sky130_fd_sc_hd__sdfrbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfrbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfrtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfrtn_1 fixed cell.
 
@@ -6028,7 +6029,7 @@ def sky130_fd_sc_hd__sdfrtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfrtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfrtp_1 fixed cell.
 
@@ -6043,7 +6044,7 @@ def sky130_fd_sc_hd__sdfrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfrtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfrtp_2 fixed cell.
 
@@ -6058,7 +6059,7 @@ def sky130_fd_sc_hd__sdfrtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfrtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfrtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfrtp_4 fixed cell.
 
@@ -6073,7 +6074,7 @@ def sky130_fd_sc_hd__sdfrtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfrtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfsbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfsbp_1 fixed cell.
 
@@ -6088,7 +6089,7 @@ def sky130_fd_sc_hd__sdfsbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfsbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfsbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfsbp_2 fixed cell.
 
@@ -6103,7 +6104,7 @@ def sky130_fd_sc_hd__sdfsbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfsbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfstp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfstp_1 fixed cell.
 
@@ -6118,7 +6119,7 @@ def sky130_fd_sc_hd__sdfstp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfstp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfstp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfstp_2 fixed cell.
 
@@ -6133,7 +6134,7 @@ def sky130_fd_sc_hd__sdfstp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfstp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfstp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfstp_4 fixed cell.
 
@@ -6148,7 +6149,7 @@ def sky130_fd_sc_hd__sdfstp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfstp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfxbp_1 fixed cell.
 
@@ -6163,7 +6164,7 @@ def sky130_fd_sc_hd__sdfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfxbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfxbp_2 fixed cell.
 
@@ -6178,7 +6179,7 @@ def sky130_fd_sc_hd__sdfxbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfxbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfxtp_1 fixed cell.
 
@@ -6193,7 +6194,7 @@ def sky130_fd_sc_hd__sdfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfxtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfxtp_2 fixed cell.
 
@@ -6208,7 +6209,7 @@ def sky130_fd_sc_hd__sdfxtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfxtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdfxtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdfxtp_4 fixed cell.
 
@@ -6223,7 +6224,7 @@ def sky130_fd_sc_hd__sdfxtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdfxtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdlclkp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdlclkp_1 fixed cell.
 
@@ -6238,7 +6239,7 @@ def sky130_fd_sc_hd__sdlclkp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdlclkp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdlclkp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdlclkp_2 fixed cell.
 
@@ -6253,7 +6254,7 @@ def sky130_fd_sc_hd__sdlclkp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdlclkp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sdlclkp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__sdlclkp_4 fixed cell.
 
@@ -6268,7 +6269,7 @@ def sky130_fd_sc_hd__sdlclkp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sdlclkp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sedfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sedfxbp_1 fixed cell.
 
@@ -6283,7 +6284,7 @@ def sky130_fd_sc_hd__sedfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sedfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sedfxbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sedfxbp_2 fixed cell.
 
@@ -6298,7 +6299,7 @@ def sky130_fd_sc_hd__sedfxbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sedfxbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sedfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__sedfxtp_1 fixed cell.
 
@@ -6313,7 +6314,7 @@ def sky130_fd_sc_hd__sedfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sedfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sedfxtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__sedfxtp_2 fixed cell.
 
@@ -6328,7 +6329,7 @@ def sky130_fd_sc_hd__sedfxtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sedfxtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__sedfxtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__sedfxtp_4 fixed cell.
 
@@ -6343,7 +6344,7 @@ def sky130_fd_sc_hd__sedfxtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__sedfxtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__tap_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__tap_1 fixed cell.
 
@@ -6358,7 +6359,7 @@ def sky130_fd_sc_hd__tap_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__tap_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__tap_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__tap_2 fixed cell.
 
@@ -6373,7 +6374,7 @@ def sky130_fd_sc_hd__tap_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__tap_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__tapvgnd2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__tapvgnd2_1 fixed cell.
 
@@ -6388,7 +6389,7 @@ def sky130_fd_sc_hd__tapvgnd2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__tapvgnd2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__tapvgnd_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__tapvgnd_1 fixed cell.
 
@@ -6403,7 +6404,7 @@ def sky130_fd_sc_hd__tapvgnd_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__tapvgnd_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__tapvpwrvgnd_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__tapvpwrvgnd_1 fixed cell.
 
@@ -6418,7 +6419,7 @@ def sky130_fd_sc_hd__tapvpwrvgnd_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__tapvpwrvgnd_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xnor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__xnor2_1 fixed cell.
 
@@ -6433,7 +6434,7 @@ def sky130_fd_sc_hd__xnor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xnor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xnor2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__xnor2_2 fixed cell.
 
@@ -6448,7 +6449,7 @@ def sky130_fd_sc_hd__xnor2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xnor2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xnor2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__xnor2_4 fixed cell.
 
@@ -6463,7 +6464,7 @@ def sky130_fd_sc_hd__xnor2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xnor2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xnor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__xnor3_1 fixed cell.
 
@@ -6478,7 +6479,7 @@ def sky130_fd_sc_hd__xnor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xnor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xnor3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__xnor3_2 fixed cell.
 
@@ -6493,7 +6494,7 @@ def sky130_fd_sc_hd__xnor3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xnor3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xnor3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__xnor3_4 fixed cell.
 
@@ -6508,7 +6509,7 @@ def sky130_fd_sc_hd__xnor3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xnor3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__xor2_1 fixed cell.
 
@@ -6523,7 +6524,7 @@ def sky130_fd_sc_hd__xor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xor2_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__xor2_2 fixed cell.
 
@@ -6538,7 +6539,7 @@ def sky130_fd_sc_hd__xor2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xor2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xor2_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__xor2_4 fixed cell.
 
@@ -6553,7 +6554,7 @@ def sky130_fd_sc_hd__xor2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xor2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hd__xor3_1 fixed cell.
 
@@ -6568,7 +6569,7 @@ def sky130_fd_sc_hd__xor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xor3_2() -> gf.Component:
     """Returns sky130_fd_sc_hd__xor3_2 fixed cell.
 
@@ -6583,7 +6584,7 @@ def sky130_fd_sc_hd__xor3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xor3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hd__xor3_4() -> gf.Component:
     """Returns sky130_fd_sc_hd__xor3_4 fixed cell.
 
@@ -6598,7 +6599,7 @@ def sky130_fd_sc_hd__xor3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hd__xor3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2111o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2111o_1 fixed cell.
 
@@ -6613,7 +6614,7 @@ def sky130_fd_sc_hs__a2111o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2111o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2111o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2111o_2 fixed cell.
 
@@ -6628,7 +6629,7 @@ def sky130_fd_sc_hs__a2111o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2111o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2111o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2111o_4 fixed cell.
 
@@ -6643,7 +6644,7 @@ def sky130_fd_sc_hs__a2111o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2111o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2111oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2111oi_1 fixed cell.
 
@@ -6658,7 +6659,7 @@ def sky130_fd_sc_hs__a2111oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2111oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2111oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2111oi_2 fixed cell.
 
@@ -6673,7 +6674,7 @@ def sky130_fd_sc_hs__a2111oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2111oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2111oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2111oi_4 fixed cell.
 
@@ -6688,7 +6689,7 @@ def sky130_fd_sc_hs__a2111oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2111oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a211o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a211o_1 fixed cell.
 
@@ -6703,7 +6704,7 @@ def sky130_fd_sc_hs__a211o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a211o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a211o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a211o_2 fixed cell.
 
@@ -6718,7 +6719,7 @@ def sky130_fd_sc_hs__a211o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a211o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a211o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a211o_4 fixed cell.
 
@@ -6733,7 +6734,7 @@ def sky130_fd_sc_hs__a211o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a211o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a211oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a211oi_1 fixed cell.
 
@@ -6748,7 +6749,7 @@ def sky130_fd_sc_hs__a211oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a211oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a211oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a211oi_2 fixed cell.
 
@@ -6763,7 +6764,7 @@ def sky130_fd_sc_hs__a211oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a211oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a211oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a211oi_4 fixed cell.
 
@@ -6778,7 +6779,7 @@ def sky130_fd_sc_hs__a211oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a211oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21bo_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21bo_1 fixed cell.
 
@@ -6793,7 +6794,7 @@ def sky130_fd_sc_hs__a21bo_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21bo_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21bo_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21bo_2 fixed cell.
 
@@ -6808,7 +6809,7 @@ def sky130_fd_sc_hs__a21bo_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21bo_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21bo_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21bo_4 fixed cell.
 
@@ -6823,7 +6824,7 @@ def sky130_fd_sc_hs__a21bo_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21bo_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21boi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21boi_1 fixed cell.
 
@@ -6838,7 +6839,7 @@ def sky130_fd_sc_hs__a21boi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21boi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21boi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21boi_2 fixed cell.
 
@@ -6853,7 +6854,7 @@ def sky130_fd_sc_hs__a21boi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21boi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21boi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21boi_4 fixed cell.
 
@@ -6868,7 +6869,7 @@ def sky130_fd_sc_hs__a21boi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21boi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21o_1 fixed cell.
 
@@ -6883,7 +6884,7 @@ def sky130_fd_sc_hs__a21o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21o_2 fixed cell.
 
@@ -6898,7 +6899,7 @@ def sky130_fd_sc_hs__a21o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21o_4 fixed cell.
 
@@ -6913,7 +6914,7 @@ def sky130_fd_sc_hs__a21o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21oi_1 fixed cell.
 
@@ -6928,7 +6929,7 @@ def sky130_fd_sc_hs__a21oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21oi_2 fixed cell.
 
@@ -6943,7 +6944,7 @@ def sky130_fd_sc_hs__a21oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a21oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a21oi_4 fixed cell.
 
@@ -6958,7 +6959,7 @@ def sky130_fd_sc_hs__a21oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a21oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a221o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a221o_1 fixed cell.
 
@@ -6973,7 +6974,7 @@ def sky130_fd_sc_hs__a221o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a221o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a221o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a221o_2 fixed cell.
 
@@ -6988,7 +6989,7 @@ def sky130_fd_sc_hs__a221o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a221o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a221o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a221o_4 fixed cell.
 
@@ -7003,7 +7004,7 @@ def sky130_fd_sc_hs__a221o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a221o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a221oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a221oi_1 fixed cell.
 
@@ -7018,7 +7019,7 @@ def sky130_fd_sc_hs__a221oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a221oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a221oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a221oi_2 fixed cell.
 
@@ -7033,7 +7034,7 @@ def sky130_fd_sc_hs__a221oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a221oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a221oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a221oi_4 fixed cell.
 
@@ -7048,7 +7049,7 @@ def sky130_fd_sc_hs__a221oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a221oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a222o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a222o_1 fixed cell.
 
@@ -7063,7 +7064,7 @@ def sky130_fd_sc_hs__a222o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a222o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a222o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a222o_2 fixed cell.
 
@@ -7078,7 +7079,7 @@ def sky130_fd_sc_hs__a222o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a222o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a222oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a222oi_1 fixed cell.
 
@@ -7093,7 +7094,7 @@ def sky130_fd_sc_hs__a222oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a222oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a222oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a222oi_2 fixed cell.
 
@@ -7108,7 +7109,7 @@ def sky130_fd_sc_hs__a222oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a222oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a22o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a22o_1 fixed cell.
 
@@ -7123,7 +7124,7 @@ def sky130_fd_sc_hs__a22o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a22o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a22o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a22o_2 fixed cell.
 
@@ -7138,7 +7139,7 @@ def sky130_fd_sc_hs__a22o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a22o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a22o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a22o_4 fixed cell.
 
@@ -7153,7 +7154,7 @@ def sky130_fd_sc_hs__a22o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a22o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a22oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a22oi_1 fixed cell.
 
@@ -7168,7 +7169,7 @@ def sky130_fd_sc_hs__a22oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a22oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a22oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a22oi_2 fixed cell.
 
@@ -7183,7 +7184,7 @@ def sky130_fd_sc_hs__a22oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a22oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a22oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a22oi_4 fixed cell.
 
@@ -7198,7 +7199,7 @@ def sky130_fd_sc_hs__a22oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a22oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2bb2o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2bb2o_1 fixed cell.
 
@@ -7213,7 +7214,7 @@ def sky130_fd_sc_hs__a2bb2o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2bb2o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2bb2o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2bb2o_2 fixed cell.
 
@@ -7228,7 +7229,7 @@ def sky130_fd_sc_hs__a2bb2o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2bb2o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2bb2o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2bb2o_4 fixed cell.
 
@@ -7243,7 +7244,7 @@ def sky130_fd_sc_hs__a2bb2o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2bb2o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2bb2oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2bb2oi_1 fixed cell.
 
@@ -7258,7 +7259,7 @@ def sky130_fd_sc_hs__a2bb2oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2bb2oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2bb2oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2bb2oi_2 fixed cell.
 
@@ -7273,7 +7274,7 @@ def sky130_fd_sc_hs__a2bb2oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2bb2oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a2bb2oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a2bb2oi_4 fixed cell.
 
@@ -7288,7 +7289,7 @@ def sky130_fd_sc_hs__a2bb2oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a2bb2oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a311o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a311o_1 fixed cell.
 
@@ -7303,7 +7304,7 @@ def sky130_fd_sc_hs__a311o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a311o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a311o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a311o_2 fixed cell.
 
@@ -7318,7 +7319,7 @@ def sky130_fd_sc_hs__a311o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a311o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a311o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a311o_4 fixed cell.
 
@@ -7333,7 +7334,7 @@ def sky130_fd_sc_hs__a311o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a311o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a311oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a311oi_1 fixed cell.
 
@@ -7348,7 +7349,7 @@ def sky130_fd_sc_hs__a311oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a311oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a311oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a311oi_2 fixed cell.
 
@@ -7363,7 +7364,7 @@ def sky130_fd_sc_hs__a311oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a311oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a311oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a311oi_4 fixed cell.
 
@@ -7378,7 +7379,7 @@ def sky130_fd_sc_hs__a311oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a311oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a31o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a31o_1 fixed cell.
 
@@ -7393,7 +7394,7 @@ def sky130_fd_sc_hs__a31o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a31o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a31o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a31o_2 fixed cell.
 
@@ -7408,7 +7409,7 @@ def sky130_fd_sc_hs__a31o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a31o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a31o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a31o_4 fixed cell.
 
@@ -7423,7 +7424,7 @@ def sky130_fd_sc_hs__a31o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a31o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a31oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a31oi_1 fixed cell.
 
@@ -7438,7 +7439,7 @@ def sky130_fd_sc_hs__a31oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a31oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a31oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a31oi_2 fixed cell.
 
@@ -7453,7 +7454,7 @@ def sky130_fd_sc_hs__a31oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a31oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a31oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a31oi_4 fixed cell.
 
@@ -7468,7 +7469,7 @@ def sky130_fd_sc_hs__a31oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a31oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a32o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a32o_1 fixed cell.
 
@@ -7483,7 +7484,7 @@ def sky130_fd_sc_hs__a32o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a32o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a32o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a32o_2 fixed cell.
 
@@ -7498,7 +7499,7 @@ def sky130_fd_sc_hs__a32o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a32o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a32o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a32o_4 fixed cell.
 
@@ -7513,7 +7514,7 @@ def sky130_fd_sc_hs__a32o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a32o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a32oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a32oi_1 fixed cell.
 
@@ -7528,7 +7529,7 @@ def sky130_fd_sc_hs__a32oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a32oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a32oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a32oi_2 fixed cell.
 
@@ -7543,7 +7544,7 @@ def sky130_fd_sc_hs__a32oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a32oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a32oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a32oi_4 fixed cell.
 
@@ -7558,7 +7559,7 @@ def sky130_fd_sc_hs__a32oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a32oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a41o_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a41o_1 fixed cell.
 
@@ -7573,7 +7574,7 @@ def sky130_fd_sc_hs__a41o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a41o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a41o_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a41o_2 fixed cell.
 
@@ -7588,7 +7589,7 @@ def sky130_fd_sc_hs__a41o_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a41o_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a41o_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a41o_4 fixed cell.
 
@@ -7603,7 +7604,7 @@ def sky130_fd_sc_hs__a41o_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a41o_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a41oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__a41oi_1 fixed cell.
 
@@ -7618,7 +7619,7 @@ def sky130_fd_sc_hs__a41oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a41oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a41oi_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__a41oi_2 fixed cell.
 
@@ -7633,7 +7634,7 @@ def sky130_fd_sc_hs__a41oi_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a41oi_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__a41oi_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__a41oi_4 fixed cell.
 
@@ -7648,7 +7649,7 @@ def sky130_fd_sc_hs__a41oi_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__a41oi_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and2_1 fixed cell.
 
@@ -7663,7 +7664,7 @@ def sky130_fd_sc_hs__and2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and2_2 fixed cell.
 
@@ -7678,7 +7679,7 @@ def sky130_fd_sc_hs__and2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and2_4 fixed cell.
 
@@ -7693,7 +7694,7 @@ def sky130_fd_sc_hs__and2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and2b_1 fixed cell.
 
@@ -7708,7 +7709,7 @@ def sky130_fd_sc_hs__and2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and2b_2 fixed cell.
 
@@ -7723,7 +7724,7 @@ def sky130_fd_sc_hs__and2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and2b_4 fixed cell.
 
@@ -7738,7 +7739,7 @@ def sky130_fd_sc_hs__and2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and3_1 fixed cell.
 
@@ -7753,7 +7754,7 @@ def sky130_fd_sc_hs__and3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and3_2 fixed cell.
 
@@ -7768,7 +7769,7 @@ def sky130_fd_sc_hs__and3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and3_4 fixed cell.
 
@@ -7783,7 +7784,7 @@ def sky130_fd_sc_hs__and3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and3b_1 fixed cell.
 
@@ -7798,7 +7799,7 @@ def sky130_fd_sc_hs__and3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and3b_2 fixed cell.
 
@@ -7813,7 +7814,7 @@ def sky130_fd_sc_hs__and3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and3b_4 fixed cell.
 
@@ -7828,7 +7829,7 @@ def sky130_fd_sc_hs__and3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4_1 fixed cell.
 
@@ -7843,7 +7844,7 @@ def sky130_fd_sc_hs__and4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4_2 fixed cell.
 
@@ -7858,7 +7859,7 @@ def sky130_fd_sc_hs__and4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4_4 fixed cell.
 
@@ -7873,7 +7874,7 @@ def sky130_fd_sc_hs__and4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4b_1 fixed cell.
 
@@ -7888,7 +7889,7 @@ def sky130_fd_sc_hs__and4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4b_2 fixed cell.
 
@@ -7903,7 +7904,7 @@ def sky130_fd_sc_hs__and4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4b_4 fixed cell.
 
@@ -7918,7 +7919,7 @@ def sky130_fd_sc_hs__and4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4bb_1 fixed cell.
 
@@ -7933,7 +7934,7 @@ def sky130_fd_sc_hs__and4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4bb_2 fixed cell.
 
@@ -7948,7 +7949,7 @@ def sky130_fd_sc_hs__and4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__and4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__and4bb_4 fixed cell.
 
@@ -7963,7 +7964,7 @@ def sky130_fd_sc_hs__and4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__and4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__buf_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__buf_1 fixed cell.
 
@@ -7978,7 +7979,7 @@ def sky130_fd_sc_hs__buf_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__buf_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__buf_16() -> gf.Component:
     """Returns sky130_fd_sc_hs__buf_16 fixed cell.
 
@@ -7993,7 +7994,7 @@ def sky130_fd_sc_hs__buf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__buf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__buf_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__buf_2 fixed cell.
 
@@ -8008,7 +8009,7 @@ def sky130_fd_sc_hs__buf_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__buf_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__buf_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__buf_4 fixed cell.
 
@@ -8023,7 +8024,7 @@ def sky130_fd_sc_hs__buf_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__buf_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__buf_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__buf_8 fixed cell.
 
@@ -8038,7 +8039,7 @@ def sky130_fd_sc_hs__buf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__buf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__bufbuf_16() -> gf.Component:
     """Returns sky130_fd_sc_hs__bufbuf_16 fixed cell.
 
@@ -8053,7 +8054,7 @@ def sky130_fd_sc_hs__bufbuf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__bufbuf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__bufbuf_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__bufbuf_8 fixed cell.
 
@@ -8068,7 +8069,7 @@ def sky130_fd_sc_hs__bufbuf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__bufbuf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__bufinv_16() -> gf.Component:
     """Returns sky130_fd_sc_hs__bufinv_16 fixed cell.
 
@@ -8083,7 +8084,7 @@ def sky130_fd_sc_hs__bufinv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__bufinv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__bufinv_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__bufinv_8 fixed cell.
 
@@ -8098,7 +8099,7 @@ def sky130_fd_sc_hs__bufinv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__bufinv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkbuf_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkbuf_1 fixed cell.
 
@@ -8113,7 +8114,7 @@ def sky130_fd_sc_hs__clkbuf_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkbuf_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkbuf_16() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkbuf_16 fixed cell.
 
@@ -8128,7 +8129,7 @@ def sky130_fd_sc_hs__clkbuf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkbuf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkbuf_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkbuf_2 fixed cell.
 
@@ -8143,7 +8144,7 @@ def sky130_fd_sc_hs__clkbuf_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkbuf_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkbuf_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkbuf_4 fixed cell.
 
@@ -8158,7 +8159,7 @@ def sky130_fd_sc_hs__clkbuf_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkbuf_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkbuf_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkbuf_8 fixed cell.
 
@@ -8173,7 +8174,7 @@ def sky130_fd_sc_hs__clkbuf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkbuf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkdlyinv3sd1_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkdlyinv3sd1_1 fixed cell.
 
@@ -8188,7 +8189,7 @@ def sky130_fd_sc_hs__clkdlyinv3sd1_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkdlyinv3sd1_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkdlyinv3sd2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkdlyinv3sd2_1 fixed cell.
 
@@ -8203,7 +8204,7 @@ def sky130_fd_sc_hs__clkdlyinv3sd2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkdlyinv3sd2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkdlyinv3sd3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkdlyinv3sd3_1 fixed cell.
 
@@ -8218,7 +8219,7 @@ def sky130_fd_sc_hs__clkdlyinv3sd3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkdlyinv3sd3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkdlyinv5sd1_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkdlyinv5sd1_1 fixed cell.
 
@@ -8233,7 +8234,7 @@ def sky130_fd_sc_hs__clkdlyinv5sd1_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkdlyinv5sd1_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkdlyinv5sd2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkdlyinv5sd2_1 fixed cell.
 
@@ -8248,7 +8249,7 @@ def sky130_fd_sc_hs__clkdlyinv5sd2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkdlyinv5sd2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkdlyinv5sd3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkdlyinv5sd3_1 fixed cell.
 
@@ -8263,7 +8264,7 @@ def sky130_fd_sc_hs__clkdlyinv5sd3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkdlyinv5sd3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkinv_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkinv_1 fixed cell.
 
@@ -8278,7 +8279,7 @@ def sky130_fd_sc_hs__clkinv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkinv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkinv_16() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkinv_16 fixed cell.
 
@@ -8293,7 +8294,7 @@ def sky130_fd_sc_hs__clkinv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkinv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkinv_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkinv_2 fixed cell.
 
@@ -8308,7 +8309,7 @@ def sky130_fd_sc_hs__clkinv_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkinv_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkinv_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkinv_4 fixed cell.
 
@@ -8323,7 +8324,7 @@ def sky130_fd_sc_hs__clkinv_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkinv_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__clkinv_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__clkinv_8 fixed cell.
 
@@ -8338,7 +8339,7 @@ def sky130_fd_sc_hs__clkinv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__clkinv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__conb_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__conb_1 fixed cell.
 
@@ -8353,7 +8354,7 @@ def sky130_fd_sc_hs__conb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__conb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__decap_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__decap_4 fixed cell.
 
@@ -8368,7 +8369,7 @@ def sky130_fd_sc_hs__decap_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__decap_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__decap_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__decap_8 fixed cell.
 
@@ -8383,7 +8384,7 @@ def sky130_fd_sc_hs__decap_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__decap_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfbbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfbbn_1 fixed cell.
 
@@ -8398,7 +8399,7 @@ def sky130_fd_sc_hs__dfbbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfbbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfbbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfbbn_2 fixed cell.
 
@@ -8413,7 +8414,7 @@ def sky130_fd_sc_hs__dfbbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfbbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfbbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfbbp_1 fixed cell.
 
@@ -8428,7 +8429,7 @@ def sky130_fd_sc_hs__dfbbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfbbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfrbp_1 fixed cell.
 
@@ -8443,7 +8444,7 @@ def sky130_fd_sc_hs__dfrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfrbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfrbp_2 fixed cell.
 
@@ -8458,7 +8459,7 @@ def sky130_fd_sc_hs__dfrbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfrbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfrtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfrtn_1 fixed cell.
 
@@ -8473,7 +8474,7 @@ def sky130_fd_sc_hs__dfrtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfrtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfrtp_1 fixed cell.
 
@@ -8488,7 +8489,7 @@ def sky130_fd_sc_hs__dfrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfrtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfrtp_2 fixed cell.
 
@@ -8503,7 +8504,7 @@ def sky130_fd_sc_hs__dfrtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfrtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfrtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfrtp_4 fixed cell.
 
@@ -8518,7 +8519,7 @@ def sky130_fd_sc_hs__dfrtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfrtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfsbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfsbp_1 fixed cell.
 
@@ -8533,7 +8534,7 @@ def sky130_fd_sc_hs__dfsbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfsbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfsbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfsbp_2 fixed cell.
 
@@ -8548,7 +8549,7 @@ def sky130_fd_sc_hs__dfsbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfsbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfstp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfstp_1 fixed cell.
 
@@ -8563,7 +8564,7 @@ def sky130_fd_sc_hs__dfstp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfstp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfstp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfstp_2 fixed cell.
 
@@ -8578,7 +8579,7 @@ def sky130_fd_sc_hs__dfstp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfstp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfstp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfstp_4 fixed cell.
 
@@ -8593,7 +8594,7 @@ def sky130_fd_sc_hs__dfstp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfstp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfxbp_1 fixed cell.
 
@@ -8608,7 +8609,7 @@ def sky130_fd_sc_hs__dfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfxbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfxbp_2 fixed cell.
 
@@ -8623,7 +8624,7 @@ def sky130_fd_sc_hs__dfxbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfxbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfxtp_1 fixed cell.
 
@@ -8638,7 +8639,7 @@ def sky130_fd_sc_hs__dfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfxtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfxtp_2 fixed cell.
 
@@ -8653,7 +8654,7 @@ def sky130_fd_sc_hs__dfxtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfxtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dfxtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dfxtp_4 fixed cell.
 
@@ -8668,7 +8669,7 @@ def sky130_fd_sc_hs__dfxtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dfxtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__diode_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__diode_2 fixed cell.
 
@@ -8683,7 +8684,7 @@ def sky130_fd_sc_hs__diode_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__diode_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlclkp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlclkp_1 fixed cell.
 
@@ -8698,7 +8699,7 @@ def sky130_fd_sc_hs__dlclkp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlclkp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlclkp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlclkp_2 fixed cell.
 
@@ -8713,7 +8714,7 @@ def sky130_fd_sc_hs__dlclkp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlclkp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlclkp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlclkp_4 fixed cell.
 
@@ -8728,7 +8729,7 @@ def sky130_fd_sc_hs__dlclkp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlclkp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrbn_1 fixed cell.
 
@@ -8743,7 +8744,7 @@ def sky130_fd_sc_hs__dlrbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrbn_2 fixed cell.
 
@@ -8758,7 +8759,7 @@ def sky130_fd_sc_hs__dlrbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrbp_1 fixed cell.
 
@@ -8773,7 +8774,7 @@ def sky130_fd_sc_hs__dlrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrbp_2 fixed cell.
 
@@ -8788,7 +8789,7 @@ def sky130_fd_sc_hs__dlrbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrtn_1 fixed cell.
 
@@ -8803,7 +8804,7 @@ def sky130_fd_sc_hs__dlrtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrtn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrtn_2 fixed cell.
 
@@ -8818,7 +8819,7 @@ def sky130_fd_sc_hs__dlrtn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrtn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrtn_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrtn_4 fixed cell.
 
@@ -8833,7 +8834,7 @@ def sky130_fd_sc_hs__dlrtn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrtn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrtp_1 fixed cell.
 
@@ -8848,7 +8849,7 @@ def sky130_fd_sc_hs__dlrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrtp_2 fixed cell.
 
@@ -8863,7 +8864,7 @@ def sky130_fd_sc_hs__dlrtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlrtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlrtp_4 fixed cell.
 
@@ -8878,7 +8879,7 @@ def sky130_fd_sc_hs__dlrtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlrtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxbn_1 fixed cell.
 
@@ -8893,7 +8894,7 @@ def sky130_fd_sc_hs__dlxbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxbn_2 fixed cell.
 
@@ -8908,7 +8909,7 @@ def sky130_fd_sc_hs__dlxbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxbp_1 fixed cell.
 
@@ -8923,7 +8924,7 @@ def sky130_fd_sc_hs__dlxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxtn_1 fixed cell.
 
@@ -8938,7 +8939,7 @@ def sky130_fd_sc_hs__dlxtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxtn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxtn_2 fixed cell.
 
@@ -8953,7 +8954,7 @@ def sky130_fd_sc_hs__dlxtn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxtn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxtn_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxtn_4 fixed cell.
 
@@ -8968,7 +8969,7 @@ def sky130_fd_sc_hs__dlxtn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxtn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlxtp_1 fixed cell.
 
@@ -8983,7 +8984,7 @@ def sky130_fd_sc_hs__dlxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlygate4sd1_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlygate4sd1_1 fixed cell.
 
@@ -8998,7 +8999,7 @@ def sky130_fd_sc_hs__dlygate4sd1_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlygate4sd1_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlygate4sd2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlygate4sd2_1 fixed cell.
 
@@ -9013,7 +9014,7 @@ def sky130_fd_sc_hs__dlygate4sd2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlygate4sd2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlygate4sd3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlygate4sd3_1 fixed cell.
 
@@ -9028,7 +9029,7 @@ def sky130_fd_sc_hs__dlygate4sd3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlygate4sd3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlymetal6s2s_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlymetal6s2s_1 fixed cell.
 
@@ -9043,7 +9044,7 @@ def sky130_fd_sc_hs__dlymetal6s2s_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlymetal6s2s_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlymetal6s4s_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlymetal6s4s_1 fixed cell.
 
@@ -9058,7 +9059,7 @@ def sky130_fd_sc_hs__dlymetal6s4s_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlymetal6s4s_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__dlymetal6s6s_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__dlymetal6s6s_1 fixed cell.
 
@@ -9073,7 +9074,7 @@ def sky130_fd_sc_hs__dlymetal6s6s_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__dlymetal6s6s_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ebufn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__ebufn_1 fixed cell.
 
@@ -9088,7 +9089,7 @@ def sky130_fd_sc_hs__ebufn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ebufn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ebufn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__ebufn_2 fixed cell.
 
@@ -9103,7 +9104,7 @@ def sky130_fd_sc_hs__ebufn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ebufn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ebufn_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__ebufn_4 fixed cell.
 
@@ -9118,7 +9119,7 @@ def sky130_fd_sc_hs__ebufn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ebufn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ebufn_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__ebufn_8 fixed cell.
 
@@ -9133,7 +9134,7 @@ def sky130_fd_sc_hs__ebufn_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ebufn_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__edfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__edfxbp_1 fixed cell.
 
@@ -9148,7 +9149,7 @@ def sky130_fd_sc_hs__edfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__edfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__edfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__edfxtp_1 fixed cell.
 
@@ -9163,7 +9164,7 @@ def sky130_fd_sc_hs__edfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__edfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvn_1 fixed cell.
 
@@ -9178,7 +9179,7 @@ def sky130_fd_sc_hs__einvn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvn_2 fixed cell.
 
@@ -9193,7 +9194,7 @@ def sky130_fd_sc_hs__einvn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvn_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvn_4 fixed cell.
 
@@ -9208,7 +9209,7 @@ def sky130_fd_sc_hs__einvn_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvn_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvn_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvn_8 fixed cell.
 
@@ -9223,7 +9224,7 @@ def sky130_fd_sc_hs__einvn_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvn_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvp_1 fixed cell.
 
@@ -9238,7 +9239,7 @@ def sky130_fd_sc_hs__einvp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvp_2 fixed cell.
 
@@ -9253,7 +9254,7 @@ def sky130_fd_sc_hs__einvp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvp_4 fixed cell.
 
@@ -9268,7 +9269,7 @@ def sky130_fd_sc_hs__einvp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__einvp_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__einvp_8 fixed cell.
 
@@ -9283,7 +9284,7 @@ def sky130_fd_sc_hs__einvp_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__einvp_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fa_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__fa_1 fixed cell.
 
@@ -9298,7 +9299,7 @@ def sky130_fd_sc_hs__fa_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fa_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fa_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__fa_2 fixed cell.
 
@@ -9313,7 +9314,7 @@ def sky130_fd_sc_hs__fa_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fa_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fa_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__fa_4 fixed cell.
 
@@ -9328,7 +9329,7 @@ def sky130_fd_sc_hs__fa_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fa_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fah_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__fah_1 fixed cell.
 
@@ -9343,7 +9344,7 @@ def sky130_fd_sc_hs__fah_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fah_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fah_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__fah_2 fixed cell.
 
@@ -9358,7 +9359,7 @@ def sky130_fd_sc_hs__fah_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fah_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fah_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__fah_4 fixed cell.
 
@@ -9373,7 +9374,7 @@ def sky130_fd_sc_hs__fah_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fah_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fahcin_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__fahcin_1 fixed cell.
 
@@ -9388,7 +9389,7 @@ def sky130_fd_sc_hs__fahcin_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fahcin_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fahcon_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__fahcon_1 fixed cell.
 
@@ -9403,7 +9404,7 @@ def sky130_fd_sc_hs__fahcon_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fahcon_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_1 fixed cell.
 
@@ -9418,7 +9419,7 @@ def sky130_fd_sc_hs__fill_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_2 fixed cell.
 
@@ -9433,7 +9434,7 @@ def sky130_fd_sc_hs__fill_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_4 fixed cell.
 
@@ -9448,7 +9449,7 @@ def sky130_fd_sc_hs__fill_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_8 fixed cell.
 
@@ -9463,7 +9464,7 @@ def sky130_fd_sc_hs__fill_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_diode_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_diode_2 fixed cell.
 
@@ -9478,7 +9479,7 @@ def sky130_fd_sc_hs__fill_diode_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_diode_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_diode_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_diode_4 fixed cell.
 
@@ -9493,7 +9494,7 @@ def sky130_fd_sc_hs__fill_diode_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_diode_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__fill_diode_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__fill_diode_8 fixed cell.
 
@@ -9508,7 +9509,7 @@ def sky130_fd_sc_hs__fill_diode_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__fill_diode_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ha_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__ha_1 fixed cell.
 
@@ -9523,7 +9524,7 @@ def sky130_fd_sc_hs__ha_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ha_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ha_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__ha_2 fixed cell.
 
@@ -9538,7 +9539,7 @@ def sky130_fd_sc_hs__ha_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ha_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__ha_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__ha_4 fixed cell.
 
@@ -9553,7 +9554,7 @@ def sky130_fd_sc_hs__ha_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__ha_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__inv_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__inv_1 fixed cell.
 
@@ -9568,7 +9569,7 @@ def sky130_fd_sc_hs__inv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__inv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__inv_16() -> gf.Component:
     """Returns sky130_fd_sc_hs__inv_16 fixed cell.
 
@@ -9583,7 +9584,7 @@ def sky130_fd_sc_hs__inv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__inv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__inv_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__inv_2 fixed cell.
 
@@ -9598,7 +9599,7 @@ def sky130_fd_sc_hs__inv_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__inv_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__inv_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__inv_4 fixed cell.
 
@@ -9613,7 +9614,7 @@ def sky130_fd_sc_hs__inv_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__inv_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__inv_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__inv_8 fixed cell.
 
@@ -9628,7 +9629,7 @@ def sky130_fd_sc_hs__inv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__inv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__maj3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__maj3_1 fixed cell.
 
@@ -9643,7 +9644,7 @@ def sky130_fd_sc_hs__maj3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__maj3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__maj3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__maj3_2 fixed cell.
 
@@ -9658,7 +9659,7 @@ def sky130_fd_sc_hs__maj3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__maj3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__maj3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__maj3_4 fixed cell.
 
@@ -9673,7 +9674,7 @@ def sky130_fd_sc_hs__maj3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__maj3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux2_1 fixed cell.
 
@@ -9688,7 +9689,7 @@ def sky130_fd_sc_hs__mux2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux2_2 fixed cell.
 
@@ -9703,7 +9704,7 @@ def sky130_fd_sc_hs__mux2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux2_4 fixed cell.
 
@@ -9718,7 +9719,7 @@ def sky130_fd_sc_hs__mux2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux2i_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux2i_1 fixed cell.
 
@@ -9733,7 +9734,7 @@ def sky130_fd_sc_hs__mux2i_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux2i_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux2i_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux2i_2 fixed cell.
 
@@ -9748,7 +9749,7 @@ def sky130_fd_sc_hs__mux2i_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux2i_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux2i_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux2i_4 fixed cell.
 
@@ -9763,7 +9764,7 @@ def sky130_fd_sc_hs__mux2i_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux2i_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux4_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux4_1 fixed cell.
 
@@ -9778,7 +9779,7 @@ def sky130_fd_sc_hs__mux4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux4_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux4_2 fixed cell.
 
@@ -9793,7 +9794,7 @@ def sky130_fd_sc_hs__mux4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__mux4_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__mux4_4 fixed cell.
 
@@ -9808,7 +9809,7 @@ def sky130_fd_sc_hs__mux4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__mux4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2_1 fixed cell.
 
@@ -9823,7 +9824,7 @@ def sky130_fd_sc_hs__nand2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2_2 fixed cell.
 
@@ -9838,7 +9839,7 @@ def sky130_fd_sc_hs__nand2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2_4 fixed cell.
 
@@ -9853,7 +9854,7 @@ def sky130_fd_sc_hs__nand2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2_8 fixed cell.
 
@@ -9868,7 +9869,7 @@ def sky130_fd_sc_hs__nand2_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2b_1 fixed cell.
 
@@ -9883,7 +9884,7 @@ def sky130_fd_sc_hs__nand2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2b_2 fixed cell.
 
@@ -9898,7 +9899,7 @@ def sky130_fd_sc_hs__nand2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand2b_4 fixed cell.
 
@@ -9913,7 +9914,7 @@ def sky130_fd_sc_hs__nand2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand3_1 fixed cell.
 
@@ -9928,7 +9929,7 @@ def sky130_fd_sc_hs__nand3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand3_2 fixed cell.
 
@@ -9943,7 +9944,7 @@ def sky130_fd_sc_hs__nand3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand3_4 fixed cell.
 
@@ -9958,7 +9959,7 @@ def sky130_fd_sc_hs__nand3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand3b_1 fixed cell.
 
@@ -9973,7 +9974,7 @@ def sky130_fd_sc_hs__nand3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand3b_2 fixed cell.
 
@@ -9988,7 +9989,7 @@ def sky130_fd_sc_hs__nand3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand3b_4 fixed cell.
 
@@ -10003,7 +10004,7 @@ def sky130_fd_sc_hs__nand3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4_1 fixed cell.
 
@@ -10018,7 +10019,7 @@ def sky130_fd_sc_hs__nand4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4_2 fixed cell.
 
@@ -10033,7 +10034,7 @@ def sky130_fd_sc_hs__nand4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4_4 fixed cell.
 
@@ -10048,7 +10049,7 @@ def sky130_fd_sc_hs__nand4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4b_1 fixed cell.
 
@@ -10063,7 +10064,7 @@ def sky130_fd_sc_hs__nand4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4b_2 fixed cell.
 
@@ -10078,7 +10079,7 @@ def sky130_fd_sc_hs__nand4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4b_4 fixed cell.
 
@@ -10093,7 +10094,7 @@ def sky130_fd_sc_hs__nand4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4bb_1 fixed cell.
 
@@ -10108,7 +10109,7 @@ def sky130_fd_sc_hs__nand4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4bb_2 fixed cell.
 
@@ -10123,7 +10124,7 @@ def sky130_fd_sc_hs__nand4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nand4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nand4bb_4 fixed cell.
 
@@ -10138,7 +10139,7 @@ def sky130_fd_sc_hs__nand4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nand4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2_1 fixed cell.
 
@@ -10153,7 +10154,7 @@ def sky130_fd_sc_hs__nor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2_2 fixed cell.
 
@@ -10168,7 +10169,7 @@ def sky130_fd_sc_hs__nor2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2_4 fixed cell.
 
@@ -10183,7 +10184,7 @@ def sky130_fd_sc_hs__nor2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2_8() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2_8 fixed cell.
 
@@ -10198,7 +10199,7 @@ def sky130_fd_sc_hs__nor2_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2b_1 fixed cell.
 
@@ -10213,7 +10214,7 @@ def sky130_fd_sc_hs__nor2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2b_2 fixed cell.
 
@@ -10228,7 +10229,7 @@ def sky130_fd_sc_hs__nor2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor2b_4 fixed cell.
 
@@ -10243,7 +10244,7 @@ def sky130_fd_sc_hs__nor2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor3_1 fixed cell.
 
@@ -10258,7 +10259,7 @@ def sky130_fd_sc_hs__nor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor3_2 fixed cell.
 
@@ -10273,7 +10274,7 @@ def sky130_fd_sc_hs__nor3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor3_4 fixed cell.
 
@@ -10288,7 +10289,7 @@ def sky130_fd_sc_hs__nor3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor3b_1 fixed cell.
 
@@ -10303,7 +10304,7 @@ def sky130_fd_sc_hs__nor3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor3b_2 fixed cell.
 
@@ -10318,7 +10319,7 @@ def sky130_fd_sc_hs__nor3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor3b_4 fixed cell.
 
@@ -10333,7 +10334,7 @@ def sky130_fd_sc_hs__nor3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4_1 fixed cell.
 
@@ -10348,7 +10349,7 @@ def sky130_fd_sc_hs__nor4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4_2 fixed cell.
 
@@ -10363,7 +10364,7 @@ def sky130_fd_sc_hs__nor4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4_4 fixed cell.
 
@@ -10378,7 +10379,7 @@ def sky130_fd_sc_hs__nor4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4b_1 fixed cell.
 
@@ -10393,7 +10394,7 @@ def sky130_fd_sc_hs__nor4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4b_2 fixed cell.
 
@@ -10408,7 +10409,7 @@ def sky130_fd_sc_hs__nor4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4b_4 fixed cell.
 
@@ -10423,7 +10424,7 @@ def sky130_fd_sc_hs__nor4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4bb_1 fixed cell.
 
@@ -10438,7 +10439,7 @@ def sky130_fd_sc_hs__nor4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4bb_2 fixed cell.
 
@@ -10453,7 +10454,7 @@ def sky130_fd_sc_hs__nor4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__nor4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__nor4bb_4 fixed cell.
 
@@ -10468,7 +10469,7 @@ def sky130_fd_sc_hs__nor4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__nor4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2111a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2111a_1 fixed cell.
 
@@ -10483,7 +10484,7 @@ def sky130_fd_sc_hs__o2111a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2111a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2111a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2111a_2 fixed cell.
 
@@ -10498,7 +10499,7 @@ def sky130_fd_sc_hs__o2111a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2111a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2111a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2111a_4 fixed cell.
 
@@ -10513,7 +10514,7 @@ def sky130_fd_sc_hs__o2111a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2111a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2111ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2111ai_1 fixed cell.
 
@@ -10528,7 +10529,7 @@ def sky130_fd_sc_hs__o2111ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2111ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2111ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2111ai_2 fixed cell.
 
@@ -10543,7 +10544,7 @@ def sky130_fd_sc_hs__o2111ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2111ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2111ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2111ai_4 fixed cell.
 
@@ -10558,7 +10559,7 @@ def sky130_fd_sc_hs__o2111ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2111ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o211a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o211a_1 fixed cell.
 
@@ -10573,7 +10574,7 @@ def sky130_fd_sc_hs__o211a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o211a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o211a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o211a_2 fixed cell.
 
@@ -10588,7 +10589,7 @@ def sky130_fd_sc_hs__o211a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o211a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o211a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o211a_4 fixed cell.
 
@@ -10603,7 +10604,7 @@ def sky130_fd_sc_hs__o211a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o211a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o211ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o211ai_1 fixed cell.
 
@@ -10618,7 +10619,7 @@ def sky130_fd_sc_hs__o211ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o211ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o211ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o211ai_2 fixed cell.
 
@@ -10633,7 +10634,7 @@ def sky130_fd_sc_hs__o211ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o211ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o211ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o211ai_4 fixed cell.
 
@@ -10648,7 +10649,7 @@ def sky130_fd_sc_hs__o211ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o211ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21a_1 fixed cell.
 
@@ -10663,7 +10664,7 @@ def sky130_fd_sc_hs__o21a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21a_2 fixed cell.
 
@@ -10678,7 +10679,7 @@ def sky130_fd_sc_hs__o21a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21a_4 fixed cell.
 
@@ -10693,7 +10694,7 @@ def sky130_fd_sc_hs__o21a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21ai_1 fixed cell.
 
@@ -10708,7 +10709,7 @@ def sky130_fd_sc_hs__o21ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21ai_2 fixed cell.
 
@@ -10723,7 +10724,7 @@ def sky130_fd_sc_hs__o21ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21ai_4 fixed cell.
 
@@ -10738,7 +10739,7 @@ def sky130_fd_sc_hs__o21ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21ba_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21ba_1 fixed cell.
 
@@ -10753,7 +10754,7 @@ def sky130_fd_sc_hs__o21ba_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21ba_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21ba_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21ba_2 fixed cell.
 
@@ -10768,7 +10769,7 @@ def sky130_fd_sc_hs__o21ba_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21ba_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21ba_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21ba_4 fixed cell.
 
@@ -10783,7 +10784,7 @@ def sky130_fd_sc_hs__o21ba_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21ba_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21bai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21bai_1 fixed cell.
 
@@ -10798,7 +10799,7 @@ def sky130_fd_sc_hs__o21bai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21bai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21bai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21bai_2 fixed cell.
 
@@ -10813,7 +10814,7 @@ def sky130_fd_sc_hs__o21bai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21bai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o21bai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o21bai_4 fixed cell.
 
@@ -10828,7 +10829,7 @@ def sky130_fd_sc_hs__o21bai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o21bai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o221a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o221a_1 fixed cell.
 
@@ -10843,7 +10844,7 @@ def sky130_fd_sc_hs__o221a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o221a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o221a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o221a_2 fixed cell.
 
@@ -10858,7 +10859,7 @@ def sky130_fd_sc_hs__o221a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o221a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o221a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o221a_4 fixed cell.
 
@@ -10873,7 +10874,7 @@ def sky130_fd_sc_hs__o221a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o221a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o221ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o221ai_1 fixed cell.
 
@@ -10888,7 +10889,7 @@ def sky130_fd_sc_hs__o221ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o221ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o221ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o221ai_2 fixed cell.
 
@@ -10903,7 +10904,7 @@ def sky130_fd_sc_hs__o221ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o221ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o221ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o221ai_4 fixed cell.
 
@@ -10918,7 +10919,7 @@ def sky130_fd_sc_hs__o221ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o221ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o22a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o22a_1 fixed cell.
 
@@ -10933,7 +10934,7 @@ def sky130_fd_sc_hs__o22a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o22a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o22a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o22a_2 fixed cell.
 
@@ -10948,7 +10949,7 @@ def sky130_fd_sc_hs__o22a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o22a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o22a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o22a_4 fixed cell.
 
@@ -10963,7 +10964,7 @@ def sky130_fd_sc_hs__o22a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o22a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o22ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o22ai_1 fixed cell.
 
@@ -10978,7 +10979,7 @@ def sky130_fd_sc_hs__o22ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o22ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o22ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o22ai_2 fixed cell.
 
@@ -10993,7 +10994,7 @@ def sky130_fd_sc_hs__o22ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o22ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o22ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o22ai_4 fixed cell.
 
@@ -11008,7 +11009,7 @@ def sky130_fd_sc_hs__o22ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o22ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2bb2a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2bb2a_1 fixed cell.
 
@@ -11023,7 +11024,7 @@ def sky130_fd_sc_hs__o2bb2a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2bb2a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2bb2a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2bb2a_2 fixed cell.
 
@@ -11038,7 +11039,7 @@ def sky130_fd_sc_hs__o2bb2a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2bb2a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2bb2a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2bb2a_4 fixed cell.
 
@@ -11053,7 +11054,7 @@ def sky130_fd_sc_hs__o2bb2a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2bb2a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2bb2ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2bb2ai_1 fixed cell.
 
@@ -11068,7 +11069,7 @@ def sky130_fd_sc_hs__o2bb2ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2bb2ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2bb2ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2bb2ai_2 fixed cell.
 
@@ -11083,7 +11084,7 @@ def sky130_fd_sc_hs__o2bb2ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2bb2ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o2bb2ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o2bb2ai_4 fixed cell.
 
@@ -11098,7 +11099,7 @@ def sky130_fd_sc_hs__o2bb2ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o2bb2ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o311a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o311a_1 fixed cell.
 
@@ -11113,7 +11114,7 @@ def sky130_fd_sc_hs__o311a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o311a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o311a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o311a_2 fixed cell.
 
@@ -11128,7 +11129,7 @@ def sky130_fd_sc_hs__o311a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o311a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o311a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o311a_4 fixed cell.
 
@@ -11143,7 +11144,7 @@ def sky130_fd_sc_hs__o311a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o311a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o311ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o311ai_1 fixed cell.
 
@@ -11158,7 +11159,7 @@ def sky130_fd_sc_hs__o311ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o311ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o311ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o311ai_2 fixed cell.
 
@@ -11173,7 +11174,7 @@ def sky130_fd_sc_hs__o311ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o311ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o311ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o311ai_4 fixed cell.
 
@@ -11188,7 +11189,7 @@ def sky130_fd_sc_hs__o311ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o311ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o31a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o31a_1 fixed cell.
 
@@ -11203,7 +11204,7 @@ def sky130_fd_sc_hs__o31a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o31a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o31a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o31a_2 fixed cell.
 
@@ -11218,7 +11219,7 @@ def sky130_fd_sc_hs__o31a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o31a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o31a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o31a_4 fixed cell.
 
@@ -11233,7 +11234,7 @@ def sky130_fd_sc_hs__o31a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o31a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o31ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o31ai_1 fixed cell.
 
@@ -11248,7 +11249,7 @@ def sky130_fd_sc_hs__o31ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o31ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o31ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o31ai_2 fixed cell.
 
@@ -11263,7 +11264,7 @@ def sky130_fd_sc_hs__o31ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o31ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o31ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o31ai_4 fixed cell.
 
@@ -11278,7 +11279,7 @@ def sky130_fd_sc_hs__o31ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o31ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o32a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o32a_1 fixed cell.
 
@@ -11293,7 +11294,7 @@ def sky130_fd_sc_hs__o32a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o32a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o32a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o32a_2 fixed cell.
 
@@ -11308,7 +11309,7 @@ def sky130_fd_sc_hs__o32a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o32a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o32a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o32a_4 fixed cell.
 
@@ -11323,7 +11324,7 @@ def sky130_fd_sc_hs__o32a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o32a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o32ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o32ai_1 fixed cell.
 
@@ -11338,7 +11339,7 @@ def sky130_fd_sc_hs__o32ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o32ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o32ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o32ai_2 fixed cell.
 
@@ -11353,7 +11354,7 @@ def sky130_fd_sc_hs__o32ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o32ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o32ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o32ai_4 fixed cell.
 
@@ -11368,7 +11369,7 @@ def sky130_fd_sc_hs__o32ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o32ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o41a_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o41a_1 fixed cell.
 
@@ -11383,7 +11384,7 @@ def sky130_fd_sc_hs__o41a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o41a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o41a_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o41a_2 fixed cell.
 
@@ -11398,7 +11399,7 @@ def sky130_fd_sc_hs__o41a_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o41a_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o41a_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o41a_4 fixed cell.
 
@@ -11413,7 +11414,7 @@ def sky130_fd_sc_hs__o41a_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o41a_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o41ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__o41ai_1 fixed cell.
 
@@ -11428,7 +11429,7 @@ def sky130_fd_sc_hs__o41ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o41ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o41ai_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__o41ai_2 fixed cell.
 
@@ -11443,7 +11444,7 @@ def sky130_fd_sc_hs__o41ai_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o41ai_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__o41ai_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__o41ai_4 fixed cell.
 
@@ -11458,7 +11459,7 @@ def sky130_fd_sc_hs__o41ai_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__o41ai_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or2_1 fixed cell.
 
@@ -11473,7 +11474,7 @@ def sky130_fd_sc_hs__or2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or2_2 fixed cell.
 
@@ -11488,7 +11489,7 @@ def sky130_fd_sc_hs__or2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or2_4 fixed cell.
 
@@ -11503,7 +11504,7 @@ def sky130_fd_sc_hs__or2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or2b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or2b_1 fixed cell.
 
@@ -11518,7 +11519,7 @@ def sky130_fd_sc_hs__or2b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or2b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or2b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or2b_2 fixed cell.
 
@@ -11533,7 +11534,7 @@ def sky130_fd_sc_hs__or2b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or2b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or2b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or2b_4 fixed cell.
 
@@ -11548,7 +11549,7 @@ def sky130_fd_sc_hs__or2b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or2b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or3_1 fixed cell.
 
@@ -11563,7 +11564,7 @@ def sky130_fd_sc_hs__or3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or3_2 fixed cell.
 
@@ -11578,7 +11579,7 @@ def sky130_fd_sc_hs__or3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or3_4 fixed cell.
 
@@ -11593,7 +11594,7 @@ def sky130_fd_sc_hs__or3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or3b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or3b_1 fixed cell.
 
@@ -11608,7 +11609,7 @@ def sky130_fd_sc_hs__or3b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or3b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or3b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or3b_2 fixed cell.
 
@@ -11623,7 +11624,7 @@ def sky130_fd_sc_hs__or3b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or3b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or3b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or3b_4 fixed cell.
 
@@ -11638,7 +11639,7 @@ def sky130_fd_sc_hs__or3b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or3b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4_1 fixed cell.
 
@@ -11653,7 +11654,7 @@ def sky130_fd_sc_hs__or4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4_2 fixed cell.
 
@@ -11668,7 +11669,7 @@ def sky130_fd_sc_hs__or4_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4_4 fixed cell.
 
@@ -11683,7 +11684,7 @@ def sky130_fd_sc_hs__or4_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4b_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4b_1 fixed cell.
 
@@ -11698,7 +11699,7 @@ def sky130_fd_sc_hs__or4b_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4b_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4b_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4b_2 fixed cell.
 
@@ -11713,7 +11714,7 @@ def sky130_fd_sc_hs__or4b_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4b_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4b_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4b_4 fixed cell.
 
@@ -11728,7 +11729,7 @@ def sky130_fd_sc_hs__or4b_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4b_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4bb_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4bb_1 fixed cell.
 
@@ -11743,7 +11744,7 @@ def sky130_fd_sc_hs__or4bb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4bb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4bb_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4bb_2 fixed cell.
 
@@ -11758,7 +11759,7 @@ def sky130_fd_sc_hs__or4bb_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4bb_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__or4bb_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__or4bb_4 fixed cell.
 
@@ -11773,7 +11774,7 @@ def sky130_fd_sc_hs__or4bb_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__or4bb_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfbbn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfbbn_1 fixed cell.
 
@@ -11788,7 +11789,7 @@ def sky130_fd_sc_hs__sdfbbn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfbbn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfbbn_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfbbn_2 fixed cell.
 
@@ -11803,7 +11804,7 @@ def sky130_fd_sc_hs__sdfbbn_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfbbn_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfbbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfbbp_1 fixed cell.
 
@@ -11818,7 +11819,7 @@ def sky130_fd_sc_hs__sdfbbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfbbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfrbp_1 fixed cell.
 
@@ -11833,7 +11834,7 @@ def sky130_fd_sc_hs__sdfrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfrbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfrbp_2 fixed cell.
 
@@ -11848,7 +11849,7 @@ def sky130_fd_sc_hs__sdfrbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfrbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfrtn_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfrtn_1 fixed cell.
 
@@ -11863,7 +11864,7 @@ def sky130_fd_sc_hs__sdfrtn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfrtn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfrtp_1 fixed cell.
 
@@ -11878,7 +11879,7 @@ def sky130_fd_sc_hs__sdfrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfrtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfrtp_2 fixed cell.
 
@@ -11893,7 +11894,7 @@ def sky130_fd_sc_hs__sdfrtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfrtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfrtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfrtp_4 fixed cell.
 
@@ -11908,7 +11909,7 @@ def sky130_fd_sc_hs__sdfrtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfrtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfsbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfsbp_1 fixed cell.
 
@@ -11923,7 +11924,7 @@ def sky130_fd_sc_hs__sdfsbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfsbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfsbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfsbp_2 fixed cell.
 
@@ -11938,7 +11939,7 @@ def sky130_fd_sc_hs__sdfsbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfsbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfstp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfstp_1 fixed cell.
 
@@ -11953,7 +11954,7 @@ def sky130_fd_sc_hs__sdfstp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfstp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfstp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfstp_2 fixed cell.
 
@@ -11968,7 +11969,7 @@ def sky130_fd_sc_hs__sdfstp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfstp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfstp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfstp_4 fixed cell.
 
@@ -11983,7 +11984,7 @@ def sky130_fd_sc_hs__sdfstp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfstp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfxbp_1 fixed cell.
 
@@ -11998,7 +11999,7 @@ def sky130_fd_sc_hs__sdfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfxbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfxbp_2 fixed cell.
 
@@ -12013,7 +12014,7 @@ def sky130_fd_sc_hs__sdfxbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfxbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfxtp_1 fixed cell.
 
@@ -12028,7 +12029,7 @@ def sky130_fd_sc_hs__sdfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfxtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfxtp_2 fixed cell.
 
@@ -12043,7 +12044,7 @@ def sky130_fd_sc_hs__sdfxtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfxtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdfxtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdfxtp_4 fixed cell.
 
@@ -12058,7 +12059,7 @@ def sky130_fd_sc_hs__sdfxtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdfxtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdlclkp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdlclkp_1 fixed cell.
 
@@ -12073,7 +12074,7 @@ def sky130_fd_sc_hs__sdlclkp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdlclkp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdlclkp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdlclkp_2 fixed cell.
 
@@ -12088,7 +12089,7 @@ def sky130_fd_sc_hs__sdlclkp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdlclkp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sdlclkp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__sdlclkp_4 fixed cell.
 
@@ -12103,7 +12104,7 @@ def sky130_fd_sc_hs__sdlclkp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sdlclkp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sedfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sedfxbp_1 fixed cell.
 
@@ -12118,7 +12119,7 @@ def sky130_fd_sc_hs__sedfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sedfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sedfxbp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sedfxbp_2 fixed cell.
 
@@ -12133,7 +12134,7 @@ def sky130_fd_sc_hs__sedfxbp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sedfxbp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sedfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__sedfxtp_1 fixed cell.
 
@@ -12148,7 +12149,7 @@ def sky130_fd_sc_hs__sedfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sedfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sedfxtp_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__sedfxtp_2 fixed cell.
 
@@ -12163,7 +12164,7 @@ def sky130_fd_sc_hs__sedfxtp_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sedfxtp_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__sedfxtp_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__sedfxtp_4 fixed cell.
 
@@ -12178,7 +12179,7 @@ def sky130_fd_sc_hs__sedfxtp_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__sedfxtp_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__tap_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__tap_1 fixed cell.
 
@@ -12193,7 +12194,7 @@ def sky130_fd_sc_hs__tap_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__tap_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__tap_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__tap_2 fixed cell.
 
@@ -12208,7 +12209,7 @@ def sky130_fd_sc_hs__tap_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__tap_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__tapmet1_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__tapmet1_2 fixed cell.
 
@@ -12223,7 +12224,7 @@ def sky130_fd_sc_hs__tapmet1_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__tapmet1_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__tapvgnd2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__tapvgnd2_1 fixed cell.
 
@@ -12238,7 +12239,7 @@ def sky130_fd_sc_hs__tapvgnd2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__tapvgnd2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__tapvgnd_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__tapvgnd_1 fixed cell.
 
@@ -12253,7 +12254,7 @@ def sky130_fd_sc_hs__tapvgnd_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__tapvgnd_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__tapvpwrvgnd_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__tapvpwrvgnd_1 fixed cell.
 
@@ -12268,7 +12269,7 @@ def sky130_fd_sc_hs__tapvpwrvgnd_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__tapvpwrvgnd_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xnor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__xnor2_1 fixed cell.
 
@@ -12283,7 +12284,7 @@ def sky130_fd_sc_hs__xnor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xnor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xnor2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__xnor2_2 fixed cell.
 
@@ -12298,7 +12299,7 @@ def sky130_fd_sc_hs__xnor2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xnor2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xnor2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__xnor2_4 fixed cell.
 
@@ -12313,7 +12314,7 @@ def sky130_fd_sc_hs__xnor2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xnor2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xnor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__xnor3_1 fixed cell.
 
@@ -12328,7 +12329,7 @@ def sky130_fd_sc_hs__xnor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xnor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xnor3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__xnor3_2 fixed cell.
 
@@ -12343,7 +12344,7 @@ def sky130_fd_sc_hs__xnor3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xnor3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xnor3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__xnor3_4 fixed cell.
 
@@ -12358,7 +12359,7 @@ def sky130_fd_sc_hs__xnor3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xnor3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__xor2_1 fixed cell.
 
@@ -12373,7 +12374,7 @@ def sky130_fd_sc_hs__xor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xor2_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__xor2_2 fixed cell.
 
@@ -12388,7 +12389,7 @@ def sky130_fd_sc_hs__xor2_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xor2_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xor2_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__xor2_4 fixed cell.
 
@@ -12403,7 +12404,7 @@ def sky130_fd_sc_hs__xor2_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xor2_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hs__xor3_1 fixed cell.
 
@@ -12418,7 +12419,7 @@ def sky130_fd_sc_hs__xor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xor3_2() -> gf.Component:
     """Returns sky130_fd_sc_hs__xor3_2 fixed cell.
 
@@ -12433,7 +12434,7 @@ def sky130_fd_sc_hs__xor3_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xor3_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hs__xor3_4() -> gf.Component:
     """Returns sky130_fd_sc_hs__xor3_4 fixed cell.
 
@@ -12448,7 +12449,7 @@ def sky130_fd_sc_hs__xor3_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hs__xor3_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__a21o_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__a21o_1 fixed cell.
 
@@ -12463,7 +12464,7 @@ def sky130_fd_sc_hvl__a21o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__a21o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__a21oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__a21oi_1 fixed cell.
 
@@ -12478,7 +12479,7 @@ def sky130_fd_sc_hvl__a21oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__a21oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__a22o_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__a22o_1 fixed cell.
 
@@ -12493,7 +12494,7 @@ def sky130_fd_sc_hvl__a22o_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__a22o_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__a22oi_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__a22oi_1 fixed cell.
 
@@ -12508,7 +12509,7 @@ def sky130_fd_sc_hvl__a22oi_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__a22oi_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__and2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__and2_1 fixed cell.
 
@@ -12523,7 +12524,7 @@ def sky130_fd_sc_hvl__and2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__and2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__and3_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__and3_1 fixed cell.
 
@@ -12538,7 +12539,7 @@ def sky130_fd_sc_hvl__and3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__and3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__buf_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__buf_1 fixed cell.
 
@@ -12553,7 +12554,7 @@ def sky130_fd_sc_hvl__buf_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__buf_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__buf_16() -> gf.Component:
     """Returns sky130_fd_sc_hvl__buf_16 fixed cell.
 
@@ -12568,7 +12569,7 @@ def sky130_fd_sc_hvl__buf_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__buf_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__buf_2() -> gf.Component:
     """Returns sky130_fd_sc_hvl__buf_2 fixed cell.
 
@@ -12583,7 +12584,7 @@ def sky130_fd_sc_hvl__buf_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__buf_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__buf_32() -> gf.Component:
     """Returns sky130_fd_sc_hvl__buf_32 fixed cell.
 
@@ -12598,7 +12599,7 @@ def sky130_fd_sc_hvl__buf_32() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__buf_32.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__buf_4() -> gf.Component:
     """Returns sky130_fd_sc_hvl__buf_4 fixed cell.
 
@@ -12613,7 +12614,7 @@ def sky130_fd_sc_hvl__buf_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__buf_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__buf_8() -> gf.Component:
     """Returns sky130_fd_sc_hvl__buf_8 fixed cell.
 
@@ -12628,7 +12629,7 @@ def sky130_fd_sc_hvl__buf_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__buf_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__conb_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__conb_1 fixed cell.
 
@@ -12643,7 +12644,7 @@ def sky130_fd_sc_hvl__conb_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__conb_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__decap_4() -> gf.Component:
     """Returns sky130_fd_sc_hvl__decap_4 fixed cell.
 
@@ -12658,7 +12659,7 @@ def sky130_fd_sc_hvl__decap_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__decap_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__decap_8() -> gf.Component:
     """Returns sky130_fd_sc_hvl__decap_8 fixed cell.
 
@@ -12673,7 +12674,7 @@ def sky130_fd_sc_hvl__decap_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__decap_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dfrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dfrbp_1 fixed cell.
 
@@ -12688,7 +12689,7 @@ def sky130_fd_sc_hvl__dfrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dfrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dfrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dfrtp_1 fixed cell.
 
@@ -12703,7 +12704,7 @@ def sky130_fd_sc_hvl__dfrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dfrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dfsbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dfsbp_1 fixed cell.
 
@@ -12718,7 +12719,7 @@ def sky130_fd_sc_hvl__dfsbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dfsbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dfstp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dfstp_1 fixed cell.
 
@@ -12733,7 +12734,7 @@ def sky130_fd_sc_hvl__dfstp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dfstp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dfxbp_1 fixed cell.
 
@@ -12748,7 +12749,7 @@ def sky130_fd_sc_hvl__dfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dfxtp_1 fixed cell.
 
@@ -12763,7 +12764,7 @@ def sky130_fd_sc_hvl__dfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__diode_2() -> gf.Component:
     """Returns sky130_fd_sc_hvl__diode_2 fixed cell.
 
@@ -12778,7 +12779,7 @@ def sky130_fd_sc_hvl__diode_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__diode_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dlclkp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dlclkp_1 fixed cell.
 
@@ -12793,7 +12794,7 @@ def sky130_fd_sc_hvl__dlclkp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dlclkp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dlrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dlrtp_1 fixed cell.
 
@@ -12808,7 +12809,7 @@ def sky130_fd_sc_hvl__dlrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dlrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__dlxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__dlxtp_1 fixed cell.
 
@@ -12823,7 +12824,7 @@ def sky130_fd_sc_hvl__dlxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__dlxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__einvn_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__einvn_1 fixed cell.
 
@@ -12838,7 +12839,7 @@ def sky130_fd_sc_hvl__einvn_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__einvn_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__einvp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__einvp_1 fixed cell.
 
@@ -12853,7 +12854,7 @@ def sky130_fd_sc_hvl__einvp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__einvp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__fill_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__fill_1 fixed cell.
 
@@ -12868,7 +12869,7 @@ def sky130_fd_sc_hvl__fill_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__fill_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__fill_2() -> gf.Component:
     """Returns sky130_fd_sc_hvl__fill_2 fixed cell.
 
@@ -12883,7 +12884,7 @@ def sky130_fd_sc_hvl__fill_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__fill_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__fill_4() -> gf.Component:
     """Returns sky130_fd_sc_hvl__fill_4 fixed cell.
 
@@ -12898,7 +12899,7 @@ def sky130_fd_sc_hvl__fill_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__fill_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__fill_8() -> gf.Component:
     """Returns sky130_fd_sc_hvl__fill_8 fixed cell.
 
@@ -12913,7 +12914,7 @@ def sky130_fd_sc_hvl__fill_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__fill_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__inv_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__inv_1 fixed cell.
 
@@ -12928,7 +12929,7 @@ def sky130_fd_sc_hvl__inv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__inv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__inv_16() -> gf.Component:
     """Returns sky130_fd_sc_hvl__inv_16 fixed cell.
 
@@ -12943,7 +12944,7 @@ def sky130_fd_sc_hvl__inv_16() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__inv_16.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__inv_2() -> gf.Component:
     """Returns sky130_fd_sc_hvl__inv_2 fixed cell.
 
@@ -12958,7 +12959,7 @@ def sky130_fd_sc_hvl__inv_2() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__inv_2.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__inv_4() -> gf.Component:
     """Returns sky130_fd_sc_hvl__inv_4 fixed cell.
 
@@ -12973,7 +12974,7 @@ def sky130_fd_sc_hvl__inv_4() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__inv_4.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__inv_8() -> gf.Component:
     """Returns sky130_fd_sc_hvl__inv_8 fixed cell.
 
@@ -12988,7 +12989,7 @@ def sky130_fd_sc_hvl__inv_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__inv_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbufhv2hv_hl_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbufhv2hv_hl_1 fixed cell.
 
@@ -13003,7 +13004,7 @@ def sky130_fd_sc_hvl__lsbufhv2hv_hl_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbufhv2hv_hl_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbufhv2hv_lh_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbufhv2hv_lh_1 fixed cell.
 
@@ -13018,7 +13019,7 @@ def sky130_fd_sc_hvl__lsbufhv2hv_lh_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbufhv2hv_lh_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbufhv2lv_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbufhv2lv_1 fixed cell.
 
@@ -13033,7 +13034,7 @@ def sky130_fd_sc_hvl__lsbufhv2lv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbufhv2lv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbufhv2lv_simple_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbufhv2lv_simple_1 fixed cell.
 
@@ -13048,7 +13049,7 @@ def sky130_fd_sc_hvl__lsbufhv2lv_simple_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbufhv2lv_simple_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbuflv2hv_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbuflv2hv_1 fixed cell.
 
@@ -13063,7 +13064,7 @@ def sky130_fd_sc_hvl__lsbuflv2hv_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbuflv2hv_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3 fixed cell.
 
@@ -13078,7 +13079,7 @@ def sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1 fixed cell.
 
@@ -13093,7 +13094,7 @@ def sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1 fixed cell.
 
@@ -13108,7 +13109,7 @@ def sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__mux2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__mux2_1 fixed cell.
 
@@ -13123,7 +13124,7 @@ def sky130_fd_sc_hvl__mux2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__mux2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__mux4_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__mux4_1 fixed cell.
 
@@ -13138,7 +13139,7 @@ def sky130_fd_sc_hvl__mux4_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__mux4_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__nand2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__nand2_1 fixed cell.
 
@@ -13153,7 +13154,7 @@ def sky130_fd_sc_hvl__nand2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__nand2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__nand3_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__nand3_1 fixed cell.
 
@@ -13168,7 +13169,7 @@ def sky130_fd_sc_hvl__nand3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__nand3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__nor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__nor2_1 fixed cell.
 
@@ -13183,7 +13184,7 @@ def sky130_fd_sc_hvl__nor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__nor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__nor3_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__nor3_1 fixed cell.
 
@@ -13198,7 +13199,7 @@ def sky130_fd_sc_hvl__nor3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__nor3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__o21a_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__o21a_1 fixed cell.
 
@@ -13213,7 +13214,7 @@ def sky130_fd_sc_hvl__o21a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__o21a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__o21ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__o21ai_1 fixed cell.
 
@@ -13228,7 +13229,7 @@ def sky130_fd_sc_hvl__o21ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__o21ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__o22a_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__o22a_1 fixed cell.
 
@@ -13243,7 +13244,7 @@ def sky130_fd_sc_hvl__o22a_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__o22a_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__o22ai_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__o22ai_1 fixed cell.
 
@@ -13258,7 +13259,7 @@ def sky130_fd_sc_hvl__o22ai_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__o22ai_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__or2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__or2_1 fixed cell.
 
@@ -13273,7 +13274,7 @@ def sky130_fd_sc_hvl__or2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__or2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__or3_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__or3_1 fixed cell.
 
@@ -13288,7 +13289,7 @@ def sky130_fd_sc_hvl__or3_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__or3_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__probe_p_8() -> gf.Component:
     """Returns sky130_fd_sc_hvl__probe_p_8 fixed cell.
 
@@ -13303,7 +13304,7 @@ def sky130_fd_sc_hvl__probe_p_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__probe_p_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__probec_p_8() -> gf.Component:
     """Returns sky130_fd_sc_hvl__probec_p_8 fixed cell.
 
@@ -13318,7 +13319,7 @@ def sky130_fd_sc_hvl__probec_p_8() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__probec_p_8.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__schmittbuf_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__schmittbuf_1 fixed cell.
 
@@ -13333,7 +13334,7 @@ def sky130_fd_sc_hvl__schmittbuf_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__schmittbuf_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdfrbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdfrbp_1 fixed cell.
 
@@ -13348,7 +13349,7 @@ def sky130_fd_sc_hvl__sdfrbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdfrbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdfrtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdfrtp_1 fixed cell.
 
@@ -13363,7 +13364,7 @@ def sky130_fd_sc_hvl__sdfrtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdfrtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdfsbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdfsbp_1 fixed cell.
 
@@ -13378,7 +13379,7 @@ def sky130_fd_sc_hvl__sdfsbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdfsbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdfstp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdfstp_1 fixed cell.
 
@@ -13393,7 +13394,7 @@ def sky130_fd_sc_hvl__sdfstp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdfstp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdfxbp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdfxbp_1 fixed cell.
 
@@ -13408,7 +13409,7 @@ def sky130_fd_sc_hvl__sdfxbp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdfxbp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdfxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdfxtp_1 fixed cell.
 
@@ -13423,7 +13424,7 @@ def sky130_fd_sc_hvl__sdfxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdfxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdlclkp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdlclkp_1 fixed cell.
 
@@ -13438,7 +13439,7 @@ def sky130_fd_sc_hvl__sdlclkp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdlclkp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__sdlxtp_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__sdlxtp_1 fixed cell.
 
@@ -13453,7 +13454,7 @@ def sky130_fd_sc_hvl__sdlxtp_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__sdlxtp_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__xnor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__xnor2_1 fixed cell.
 
@@ -13468,7 +13469,7 @@ def sky130_fd_sc_hvl__xnor2_1() -> gf.Component:
     return import_gds("sky130_fd_sc_hvl__xnor2_1.gds")
 
 
-@gf.cell
+@cell
 def sky130_fd_sc_hvl__xor2_1() -> gf.Component:
     """Returns sky130_fd_sc_hvl__xor2_1 fixed cell.
 
diff --git a/sky130/tech.py b/sky130/tech.py
index afe1b148c..68cd65e15 100644
--- a/sky130/tech.py
+++ b/sky130/tech.py
@@ -1,15 +1,19 @@
-""" technology definitions."""
+""" Technology definitions."""
 import sys
 
 import gdsfactory as gf
-from gdsfactory.cross_section import get_cross_section_factories, metal1
+from gdsfactory.cross_section import get_cross_sections, metal1
 
 from sky130.layers import LAYER
 
-xs_metal1 = gf.partial(metal1, layer=LAYER.met1drawing, width=0.2)
-xs_metal2 = gf.partial(metal1, layer=LAYER.met2drawing, width=0.2)
-strip = xs_metal1
-cross_sections = get_cross_section_factories(sys.modules[__name__])
+xf_metal1 = gf.partial(metal1, layer=LAYER.met1drawing, width=0.2)
+xf_metal2 = gf.partial(metal1, layer=LAYER.met2drawing, width=0.2)
+
+
+xs_metal1 = xf_metal1()
+xs_metal2 = xf_metal2()
+
+cross_sections = get_cross_sections(sys.modules[__name__])
 
 
 if __name__ == "__main__":
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_bleeder_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_bleeder_1_.yml
index 08a9a1032..8599dfb93 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_bleeder_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_bleeder_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_41126d4c
+name: sky130_fd_sc_hd__lpflow_bleeder_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_41126d4c
+  name: sky130_fd_sc_hd__lpflow_bleeder_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_16_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_16_.yml
index e5e6d5f1d..3e1e97540 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_16_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_16_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_db725387
+name: sky130_fd_sc_hd__lpflow_clkbufkapwr_16
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_db725387
+  name: sky130_fd_sc_hd__lpflow_clkbufkapwr_16
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_1_.yml
index 5acd3edbf..aa08b7e65 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_3e37e51c
+name: sky130_fd_sc_hd__lpflow_clkbufkapwr_1
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_3e37e51c
+  name: sky130_fd_sc_hd__lpflow_clkbufkapwr_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_2_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_2_.yml
index da2a88cef..36b42d9e4 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_2_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_2_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_45c8e42c
+name: sky130_fd_sc_hd__lpflow_clkbufkapwr_2
 ports:
   KAPWR:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_45c8e42c
+  name: sky130_fd_sc_hd__lpflow_clkbufkapwr_2
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_4_.yml
index b7c43e22b..675bbd373 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_40aa3dad
+name: sky130_fd_sc_hd__lpflow_clkbufkapwr_4
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_40aa3dad
+  name: sky130_fd_sc_hd__lpflow_clkbufkapwr_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_8_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_8_.yml
index d5c0becca..bb0f099d0 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_8_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkbufkapwr_8_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_d31d8da7
+name: sky130_fd_sc_hd__lpflow_clkbufkapwr_8
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_d31d8da7
+  name: sky130_fd_sc_hd__lpflow_clkbufkapwr_8
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_16_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_16_.yml
index 1b7297282..ba0e84dd8 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_16_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_16_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_3599d5cc
+name: sky130_fd_sc_hd__lpflow_clkinvkapwr_16
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_3599d5cc
+  name: sky130_fd_sc_hd__lpflow_clkinvkapwr_16
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_1_.yml
index 1ea33ff84..da328e001 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_faeb8393
+name: sky130_fd_sc_hd__lpflow_clkinvkapwr_1
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_faeb8393
+  name: sky130_fd_sc_hd__lpflow_clkinvkapwr_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_2_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_2_.yml
index 771e3b493..263bb8453 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_2_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_2_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_200ed9c3
+name: sky130_fd_sc_hd__lpflow_clkinvkapwr_2
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_200ed9c3
+  name: sky130_fd_sc_hd__lpflow_clkinvkapwr_2
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_4_.yml
index 32259c389..25605b343 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_46b6af24
+name: sky130_fd_sc_hd__lpflow_clkinvkapwr_4
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_46b6af24
+  name: sky130_fd_sc_hd__lpflow_clkinvkapwr_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_8_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_8_.yml
index ec7e339ef..bc5befb9b 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_8_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_clkinvkapwr_8_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_3c00b33a
+name: sky130_fd_sc_hd__lpflow_clkinvkapwr_8
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_3c00b33a
+  name: sky130_fd_sc_hd__lpflow_clkinvkapwr_8
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_12_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_12_.yml
index 385e42504..67432aec6 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_12_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_12_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_e63bdc33
+name: sky130_fd_sc_hd__lpflow_decapkapwr_12
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_e63bdc33
+  name: sky130_fd_sc_hd__lpflow_decapkapwr_12
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_3_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_3_.yml
index a108b0d35..67f5c511c 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_3_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_3_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_f55976bd
+name: sky130_fd_sc_hd__lpflow_decapkapwr_3
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_f55976bd
+  name: sky130_fd_sc_hd__lpflow_decapkapwr_3
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_4_.yml
index d645416b9..9b4b64baf 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_78ef90e9
+name: sky130_fd_sc_hd__lpflow_decapkapwr_4
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_78ef90e9
+  name: sky130_fd_sc_hd__lpflow_decapkapwr_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_6_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_6_.yml
index 5f289a0e5..684014c39 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_6_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_6_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_ddf23a3a
+name: sky130_fd_sc_hd__lpflow_decapkapwr_6
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_ddf23a3a
+  name: sky130_fd_sc_hd__lpflow_decapkapwr_6
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_8_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_8_.yml
index bd8dc25b9..05f33f985 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_8_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_decapkapwr_8_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_5c0dc2c8
+name: sky130_fd_sc_hd__lpflow_decapkapwr_8
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_5c0dc2c8
+  name: sky130_fd_sc_hd__lpflow_decapkapwr_8
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0n_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0n_1_.yml
index 0190b8d00..3adf72e85 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0n_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0n_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_c672cf10
+name: sky130_fd_sc_hd__lpflow_inputiso0n_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_c672cf10
+  name: sky130_fd_sc_hd__lpflow_inputiso0n_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0p_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0p_1_.yml
index 7f4284df7..0a9e664dc 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0p_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso0p_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_4800bb04
+name: sky130_fd_sc_hd__lpflow_inputiso0p_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_4800bb04
+  name: sky130_fd_sc_hd__lpflow_inputiso0p_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1n_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1n_1_.yml
index 2ac0f59fc..62c347bad 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1n_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1n_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_65381e59
+name: sky130_fd_sc_hd__lpflow_inputiso1n_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_65381e59
+  name: sky130_fd_sc_hd__lpflow_inputiso1n_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1p_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1p_1_.yml
index 620d69d64..ca1a053d5 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1p_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputiso1p_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_4ca8539f
+name: sky130_fd_sc_hd__lpflow_inputiso1p_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_4ca8539f
+  name: sky130_fd_sc_hd__lpflow_inputiso1p_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputisolatch_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputisolatch_1_.yml
index 006d27c10..2ffb49edb 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputisolatch_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_inputisolatch_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_4570cc5b
+name: sky130_fd_sc_hd__lpflow_inputisolatch_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_4570cc5b
+  name: sky130_fd_sc_hd__lpflow_inputisolatch_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_16_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_16_.yml
index 13d7b0ec4..af3b293c6 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_16_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_16_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_d1109c0c
+name: sky130_fd_sc_hd__lpflow_isobufsrc_16
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_d1109c0c
+  name: sky130_fd_sc_hd__lpflow_isobufsrc_16
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_1_.yml
index ab136418e..9f984dabf 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_a1a5b130
+name: sky130_fd_sc_hd__lpflow_isobufsrc_1
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_a1a5b130
+  name: sky130_fd_sc_hd__lpflow_isobufsrc_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_2_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_2_.yml
index 34934d497..b4d0b0667 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_2_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_2_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_ac6cd163
+name: sky130_fd_sc_hd__lpflow_isobufsrc_2
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_ac6cd163
+  name: sky130_fd_sc_hd__lpflow_isobufsrc_2
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_4_.yml
index 89e99b49f..2e3891640 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_756c854e
+name: sky130_fd_sc_hd__lpflow_isobufsrc_4
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_756c854e
+  name: sky130_fd_sc_hd__lpflow_isobufsrc_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_8_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_8_.yml
index 5c82510de..43a08585f 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_8_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrc_8_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_931c62dd
+name: sky130_fd_sc_hd__lpflow_isobufsrc_8
 ports:
   VGND:
     center:
@@ -33,4 +33,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_931c62dd
+  name: sky130_fd_sc_hd__lpflow_isobufsrc_8
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrckapwr_16_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrckapwr_16_.yml
index d86f31b1b..1600691ca 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrckapwr_16_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_isobufsrckapwr_16_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_e0e933ba
+name: sky130_fd_sc_hd__lpflow_isobufsrckapwr_16
 ports:
   KAPWR:
     center:
@@ -45,4 +45,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_e0e933ba
+  name: sky130_fd_sc_hd__lpflow_isobufsrckapwr_16
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1_.yml
index de4c886b7..0c9b7911b 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_de91181d
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
 ports:
   VGND:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_de91181d
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2_.yml
index 729b4766a..92fa3d816 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_de704594
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
 ports:
   VGND:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_de704594
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4_.yml
index b6f54a161..f8768009d 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_de089951
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
 ports:
   VGND:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_de089951
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4_.yml
index 1917f0780..844437190 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_0b3b7fa2
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
 ports:
   LOWLVPWR:
     center:
@@ -57,4 +57,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_0b3b7fa2
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1_.yml
index 658d95cec..6cc671108 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_c8ddb2bc
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
 ports:
   LOWLVPWR:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_c8ddb2bc
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2_.yml
index cc303c63d..6650aafa9 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_e793b2d8
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
 ports:
   LOWLVPWR:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_e793b2d8
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4_.yml
index 8a7b476d8..59caf0efc 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hd__lpflow_b70e4e50
+name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4
 ports:
   LOWLVPWR:
     center:
@@ -69,4 +69,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hd__lpflow_b70e4e50
+  name: sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_hl_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_hl_1_.yml
index 673c20fd1..81bec75c7 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_hl_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_hl_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hvl__lsbuf_5fbd7ea7
+name: sky130_fd_sc_hvl__lsbufhv2hv_hl_1
 ports:
   LOWHVPWR:
     center:
@@ -105,4 +105,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hvl__lsbuf_5fbd7ea7
+  name: sky130_fd_sc_hvl__lsbufhv2hv_hl_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_lh_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_lh_1_.yml
index fa40e66ac..c1c6aa752 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_lh_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2hv_lh_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hvl__lsbuf_0e3579e0
+name: sky130_fd_sc_hvl__lsbufhv2hv_lh_1
 ports:
   LOWHVPWR:
     center:
@@ -105,4 +105,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hvl__lsbuf_0e3579e0
+  name: sky130_fd_sc_hvl__lsbufhv2hv_lh_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2lv_simple_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2lv_simple_1_.yml
index f19016500..cd0325ab7 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2lv_simple_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbufhv2lv_simple_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hvl__lsbuf_f2142188
+name: sky130_fd_sc_hvl__lsbufhv2lv_simple_1
 ports:
   LVPWR:
     center:
@@ -105,4 +105,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hvl__lsbuf_f2142188
+  name: sky130_fd_sc_hvl__lsbufhv2lv_simple_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3_.yml
index 5468a815c..eedf538ec 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hvl__lsbuf_6224a900
+name: sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3
 ports:
   LVPWR:
     center:
@@ -105,4 +105,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hvl__lsbuf_6224a900
+  name: sky130_fd_sc_hvl__lsbuflv2hv_clkiso_hlkg_3
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1_.yml
index 08a77b154..cfc6ba873 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hvl__lsbuf_8ec80db9
+name: sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1
 ports:
   LVPWR:
     center:
@@ -105,4 +105,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hvl__lsbuf_8ec80db9
+  name: sky130_fd_sc_hvl__lsbuflv2hv_isosrchvaon_1
diff --git a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1_.yml b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1_.yml
index 7ea27aa76..2583ab06c 100644
--- a/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1_.yml
+++ b/tests/test_components/test_pdk_settings_sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1_.yml
@@ -1,4 +1,4 @@
-name: sky130_fd_sc_hvl__lsbuf_277eeb0a
+name: sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1
 ports:
   LVPWR:
     center:
@@ -105,4 +105,4 @@ settings:
   info: {}
   info_version: 2
   module: sky130.components
-  name: sky130_fd_sc_hvl__lsbuf_277eeb0a
+  name: sky130_fd_sc_hvl__lsbuflv2hv_symmetric_1