diff --git a/fuzzers/010-lutinit/Makefile b/fuzzers/010-clb-lutinit/Makefile
similarity index 100%
rename from fuzzers/010-lutinit/Makefile
rename to fuzzers/010-clb-lutinit/Makefile
diff --git a/fuzzers/010-lutinit/generate.py b/fuzzers/010-clb-lutinit/generate.py
similarity index 100%
rename from fuzzers/010-lutinit/generate.py
rename to fuzzers/010-clb-lutinit/generate.py
diff --git a/fuzzers/010-lutinit/generate.sh b/fuzzers/010-clb-lutinit/generate.sh
similarity index 100%
rename from fuzzers/010-lutinit/generate.sh
rename to fuzzers/010-clb-lutinit/generate.sh
diff --git a/fuzzers/010-lutinit/generate.tcl b/fuzzers/010-clb-lutinit/generate.tcl
similarity index 100%
rename from fuzzers/010-lutinit/generate.tcl
rename to fuzzers/010-clb-lutinit/generate.tcl
diff --git a/fuzzers/010-lutinit/top.v b/fuzzers/010-clb-lutinit/top.v
similarity index 100%
rename from fuzzers/010-lutinit/top.v
rename to fuzzers/010-clb-lutinit/top.v
diff --git a/fuzzers/011-ffconfig/Makefile b/fuzzers/011-clb-ffconfig/Makefile
similarity index 100%
rename from fuzzers/011-ffconfig/Makefile
rename to fuzzers/011-clb-ffconfig/Makefile
diff --git a/fuzzers/011-ffconfig/README.md b/fuzzers/011-clb-ffconfig/README.md
similarity index 100%
rename from fuzzers/011-ffconfig/README.md
rename to fuzzers/011-clb-ffconfig/README.md
diff --git a/fuzzers/011-ffconfig/generate.py b/fuzzers/011-clb-ffconfig/generate.py
similarity index 100%
rename from fuzzers/011-ffconfig/generate.py
rename to fuzzers/011-clb-ffconfig/generate.py
diff --git a/fuzzers/011-ffconfig/generate.sh b/fuzzers/011-clb-ffconfig/generate.sh
similarity index 100%
rename from fuzzers/011-ffconfig/generate.sh
rename to fuzzers/011-clb-ffconfig/generate.sh
diff --git a/fuzzers/011-ffconfig/generate.tcl b/fuzzers/011-clb-ffconfig/generate.tcl
similarity index 100%
rename from fuzzers/011-ffconfig/generate.tcl
rename to fuzzers/011-clb-ffconfig/generate.tcl
diff --git a/fuzzers/011-ffconfig/prims.py b/fuzzers/011-clb-ffconfig/prims.py
similarity index 100%
rename from fuzzers/011-ffconfig/prims.py
rename to fuzzers/011-clb-ffconfig/prims.py
diff --git a/fuzzers/011-ffconfig/top.py b/fuzzers/011-clb-ffconfig/top.py
similarity index 100%
rename from fuzzers/011-ffconfig/top.py
rename to fuzzers/011-clb-ffconfig/top.py
diff --git a/fuzzers/012-clbn5ffmux/Makefile b/fuzzers/012-clb-n5ffmux/Makefile
similarity index 100%
rename from fuzzers/012-clbn5ffmux/Makefile
rename to fuzzers/012-clb-n5ffmux/Makefile
diff --git a/fuzzers/012-clbn5ffmux/README.md b/fuzzers/012-clb-n5ffmux/README.md
similarity index 100%
rename from fuzzers/012-clbn5ffmux/README.md
rename to fuzzers/012-clb-n5ffmux/README.md
diff --git a/fuzzers/012-clbn5ffmux/generate.py b/fuzzers/012-clb-n5ffmux/generate.py
similarity index 100%
rename from fuzzers/012-clbn5ffmux/generate.py
rename to fuzzers/012-clb-n5ffmux/generate.py
diff --git a/fuzzers/012-clbn5ffmux/generate.sh b/fuzzers/012-clb-n5ffmux/generate.sh
similarity index 100%
rename from fuzzers/012-clbn5ffmux/generate.sh
rename to fuzzers/012-clb-n5ffmux/generate.sh
diff --git a/fuzzers/012-clbn5ffmux/generate.tcl b/fuzzers/012-clb-n5ffmux/generate.tcl
similarity index 100%
rename from fuzzers/012-clbn5ffmux/generate.tcl
rename to fuzzers/012-clb-n5ffmux/generate.tcl
diff --git a/fuzzers/012-clbn5ffmux/top.py b/fuzzers/012-clb-n5ffmux/top.py
similarity index 100%
rename from fuzzers/012-clbn5ffmux/top.py
rename to fuzzers/012-clb-n5ffmux/top.py
diff --git a/fuzzers/013-clbncy0/Makefile b/fuzzers/013-clb-ncy0/Makefile
similarity index 100%
rename from fuzzers/013-clbncy0/Makefile
rename to fuzzers/013-clb-ncy0/Makefile
diff --git a/fuzzers/013-clbncy0/README.md b/fuzzers/013-clb-ncy0/README.md
similarity index 100%
rename from fuzzers/013-clbncy0/README.md
rename to fuzzers/013-clb-ncy0/README.md
diff --git a/fuzzers/013-clbncy0/generate.py b/fuzzers/013-clb-ncy0/generate.py
similarity index 100%
rename from fuzzers/013-clbncy0/generate.py
rename to fuzzers/013-clb-ncy0/generate.py
diff --git a/fuzzers/013-clbncy0/generate.sh b/fuzzers/013-clb-ncy0/generate.sh
similarity index 100%
rename from fuzzers/013-clbncy0/generate.sh
rename to fuzzers/013-clb-ncy0/generate.sh
diff --git a/fuzzers/013-clbncy0/generate.tcl b/fuzzers/013-clb-ncy0/generate.tcl
similarity index 100%
rename from fuzzers/013-clbncy0/generate.tcl
rename to fuzzers/013-clb-ncy0/generate.tcl
diff --git a/fuzzers/013-clbncy0/top.py b/fuzzers/013-clb-ncy0/top.py
similarity index 100%
rename from fuzzers/013-clbncy0/top.py
rename to fuzzers/013-clb-ncy0/top.py
diff --git a/fuzzers/014-ffsrcemux/Makefile b/fuzzers/014-clb-ffsrcemux/Makefile
similarity index 100%
rename from fuzzers/014-ffsrcemux/Makefile
rename to fuzzers/014-clb-ffsrcemux/Makefile
diff --git a/fuzzers/014-ffsrcemux/README.md b/fuzzers/014-clb-ffsrcemux/README.md
similarity index 100%
rename from fuzzers/014-ffsrcemux/README.md
rename to fuzzers/014-clb-ffsrcemux/README.md
diff --git a/fuzzers/014-ffsrcemux/generate.py b/fuzzers/014-clb-ffsrcemux/generate.py
similarity index 100%
rename from fuzzers/014-ffsrcemux/generate.py
rename to fuzzers/014-clb-ffsrcemux/generate.py
diff --git a/fuzzers/014-ffsrcemux/generate.sh b/fuzzers/014-clb-ffsrcemux/generate.sh
similarity index 100%
rename from fuzzers/014-ffsrcemux/generate.sh
rename to fuzzers/014-clb-ffsrcemux/generate.sh
diff --git a/fuzzers/014-ffsrcemux/generate.tcl b/fuzzers/014-clb-ffsrcemux/generate.tcl
similarity index 100%
rename from fuzzers/014-ffsrcemux/generate.tcl
rename to fuzzers/014-clb-ffsrcemux/generate.tcl
diff --git a/fuzzers/014-ffsrcemux/top.py b/fuzzers/014-clb-ffsrcemux/top.py
similarity index 100%
rename from fuzzers/014-ffsrcemux/top.py
rename to fuzzers/014-clb-ffsrcemux/top.py
diff --git a/fuzzers/015-clbnffmux/Makefile b/fuzzers/015-clb-nffmux/Makefile
similarity index 100%
rename from fuzzers/015-clbnffmux/Makefile
rename to fuzzers/015-clb-nffmux/Makefile
diff --git a/fuzzers/015-clbnffmux/README.md b/fuzzers/015-clb-nffmux/README.md
similarity index 100%
rename from fuzzers/015-clbnffmux/README.md
rename to fuzzers/015-clb-nffmux/README.md
diff --git a/fuzzers/015-clbnffmux/bits.dbf b/fuzzers/015-clb-nffmux/bits.dbf
similarity index 100%
rename from fuzzers/015-clbnffmux/bits.dbf
rename to fuzzers/015-clb-nffmux/bits.dbf
diff --git a/fuzzers/015-clbnffmux/generate.py b/fuzzers/015-clb-nffmux/generate.py
similarity index 100%
rename from fuzzers/015-clbnffmux/generate.py
rename to fuzzers/015-clb-nffmux/generate.py
diff --git a/fuzzers/015-clbnffmux/generate.sh b/fuzzers/015-clb-nffmux/generate.sh
similarity index 100%
rename from fuzzers/015-clbnffmux/generate.sh
rename to fuzzers/015-clb-nffmux/generate.sh
diff --git a/fuzzers/015-clbnffmux/generate.tcl b/fuzzers/015-clb-nffmux/generate.tcl
similarity index 100%
rename from fuzzers/015-clbnffmux/generate.tcl
rename to fuzzers/015-clb-nffmux/generate.tcl
diff --git a/fuzzers/015-clbnffmux/top.py b/fuzzers/015-clb-nffmux/top.py
similarity index 100%
rename from fuzzers/015-clbnffmux/top.py
rename to fuzzers/015-clb-nffmux/top.py
diff --git a/fuzzers/016-clbnoutmux/Makefile b/fuzzers/016-clb-noutmux/Makefile
similarity index 100%
rename from fuzzers/016-clbnoutmux/Makefile
rename to fuzzers/016-clb-noutmux/Makefile
diff --git a/fuzzers/016-clbnoutmux/README.md b/fuzzers/016-clb-noutmux/README.md
similarity index 100%
rename from fuzzers/016-clbnoutmux/README.md
rename to fuzzers/016-clb-noutmux/README.md
diff --git a/fuzzers/016-clbnoutmux/bits.dbf b/fuzzers/016-clb-noutmux/bits.dbf
similarity index 100%
rename from fuzzers/016-clbnoutmux/bits.dbf
rename to fuzzers/016-clb-noutmux/bits.dbf
diff --git a/fuzzers/016-clbnoutmux/generate.py b/fuzzers/016-clb-noutmux/generate.py
similarity index 100%
rename from fuzzers/016-clbnoutmux/generate.py
rename to fuzzers/016-clb-noutmux/generate.py
diff --git a/fuzzers/016-clbnoutmux/generate.sh b/fuzzers/016-clb-noutmux/generate.sh
similarity index 100%
rename from fuzzers/016-clbnoutmux/generate.sh
rename to fuzzers/016-clb-noutmux/generate.sh
diff --git a/fuzzers/016-clbnoutmux/generate.tcl b/fuzzers/016-clb-noutmux/generate.tcl
similarity index 100%
rename from fuzzers/016-clbnoutmux/generate.tcl
rename to fuzzers/016-clb-noutmux/generate.tcl
diff --git a/fuzzers/016-clbnoutmux/minitest/.gitignore b/fuzzers/016-clb-noutmux/minitest/.gitignore
similarity index 100%
rename from fuzzers/016-clbnoutmux/minitest/.gitignore
rename to fuzzers/016-clb-noutmux/minitest/.gitignore
diff --git a/fuzzers/016-clbnoutmux/minitest/Makefile b/fuzzers/016-clb-noutmux/minitest/Makefile
similarity index 100%
rename from fuzzers/016-clbnoutmux/minitest/Makefile
rename to fuzzers/016-clb-noutmux/minitest/Makefile
diff --git a/fuzzers/016-clbnoutmux/minitest/README.md b/fuzzers/016-clb-noutmux/minitest/README.md
similarity index 100%
rename from fuzzers/016-clbnoutmux/minitest/README.md
rename to fuzzers/016-clb-noutmux/minitest/README.md
diff --git a/fuzzers/016-clbnoutmux/minitest/top.v b/fuzzers/016-clb-noutmux/minitest/top.v
similarity index 100%
rename from fuzzers/016-clbnoutmux/minitest/top.v
rename to fuzzers/016-clb-noutmux/minitest/top.v
diff --git a/fuzzers/016-clbnoutmux/top.py b/fuzzers/016-clb-noutmux/top.py
similarity index 100%
rename from fuzzers/016-clbnoutmux/top.py
rename to fuzzers/016-clb-noutmux/top.py
diff --git a/fuzzers/017-clbprecyinit/Makefile b/fuzzers/017-clb-precyinit/Makefile
similarity index 100%
rename from fuzzers/017-clbprecyinit/Makefile
rename to fuzzers/017-clb-precyinit/Makefile
diff --git a/fuzzers/017-clbprecyinit/README.md b/fuzzers/017-clb-precyinit/README.md
similarity index 100%
rename from fuzzers/017-clbprecyinit/README.md
rename to fuzzers/017-clb-precyinit/README.md
diff --git a/fuzzers/017-clbprecyinit/bits.dbf b/fuzzers/017-clb-precyinit/bits.dbf
similarity index 100%
rename from fuzzers/017-clbprecyinit/bits.dbf
rename to fuzzers/017-clb-precyinit/bits.dbf
diff --git a/fuzzers/017-clbprecyinit/generate.py b/fuzzers/017-clb-precyinit/generate.py
similarity index 100%
rename from fuzzers/017-clbprecyinit/generate.py
rename to fuzzers/017-clb-precyinit/generate.py
diff --git a/fuzzers/017-clbprecyinit/generate.sh b/fuzzers/017-clb-precyinit/generate.sh
similarity index 100%
rename from fuzzers/017-clbprecyinit/generate.sh
rename to fuzzers/017-clb-precyinit/generate.sh
diff --git a/fuzzers/017-clbprecyinit/generate.tcl b/fuzzers/017-clb-precyinit/generate.tcl
similarity index 100%
rename from fuzzers/017-clbprecyinit/generate.tcl
rename to fuzzers/017-clb-precyinit/generate.tcl
diff --git a/fuzzers/017-clbprecyinit/top.py b/fuzzers/017-clb-precyinit/top.py
similarity index 100%
rename from fuzzers/017-clbprecyinit/top.py
rename to fuzzers/017-clb-precyinit/top.py
diff --git a/fuzzers/018-clbram/Makefile b/fuzzers/018-clb-ram/Makefile
similarity index 100%
rename from fuzzers/018-clbram/Makefile
rename to fuzzers/018-clb-ram/Makefile
diff --git a/fuzzers/018-clbram/README.md b/fuzzers/018-clb-ram/README.md
similarity index 100%
rename from fuzzers/018-clbram/README.md
rename to fuzzers/018-clb-ram/README.md
diff --git a/fuzzers/018-clbram/generate.py b/fuzzers/018-clb-ram/generate.py
similarity index 100%
rename from fuzzers/018-clbram/generate.py
rename to fuzzers/018-clb-ram/generate.py
diff --git a/fuzzers/018-clbram/generate.sh b/fuzzers/018-clb-ram/generate.sh
similarity index 100%
rename from fuzzers/018-clbram/generate.sh
rename to fuzzers/018-clb-ram/generate.sh
diff --git a/fuzzers/018-clbram/generate.tcl b/fuzzers/018-clb-ram/generate.tcl
similarity index 100%
rename from fuzzers/018-clbram/generate.tcl
rename to fuzzers/018-clb-ram/generate.tcl
diff --git a/fuzzers/018-clbram/top.py b/fuzzers/018-clb-ram/top.py
similarity index 100%
rename from fuzzers/018-clbram/top.py
rename to fuzzers/018-clb-ram/top.py
diff --git a/fuzzers/019-ndi1mux/Makefile b/fuzzers/019-clb-ndi1mux/Makefile
similarity index 100%
rename from fuzzers/019-ndi1mux/Makefile
rename to fuzzers/019-clb-ndi1mux/Makefile
diff --git a/fuzzers/019-ndi1mux/README.md b/fuzzers/019-clb-ndi1mux/README.md
similarity index 100%
rename from fuzzers/019-ndi1mux/README.md
rename to fuzzers/019-clb-ndi1mux/README.md
diff --git a/fuzzers/019-ndi1mux/generate.py b/fuzzers/019-clb-ndi1mux/generate.py
similarity index 100%
rename from fuzzers/019-ndi1mux/generate.py
rename to fuzzers/019-clb-ndi1mux/generate.py
diff --git a/fuzzers/019-ndi1mux/generate.sh b/fuzzers/019-clb-ndi1mux/generate.sh
similarity index 100%
rename from fuzzers/019-ndi1mux/generate.sh
rename to fuzzers/019-clb-ndi1mux/generate.sh
diff --git a/fuzzers/019-ndi1mux/generate.tcl b/fuzzers/019-clb-ndi1mux/generate.tcl
similarity index 100%
rename from fuzzers/019-ndi1mux/generate.tcl
rename to fuzzers/019-clb-ndi1mux/generate.tcl
diff --git a/fuzzers/019-ndi1mux/top.py b/fuzzers/019-clb-ndi1mux/top.py
similarity index 100%
rename from fuzzers/019-ndi1mux/top.py
rename to fuzzers/019-clb-ndi1mux/top.py
diff --git a/fuzzers/031-mmcm/Makefile b/fuzzers/031-cmt-mmcm/Makefile
similarity index 100%
rename from fuzzers/031-mmcm/Makefile
rename to fuzzers/031-cmt-mmcm/Makefile
diff --git a/fuzzers/031-mmcm/README.md b/fuzzers/031-cmt-mmcm/README.md
similarity index 100%
rename from fuzzers/031-mmcm/README.md
rename to fuzzers/031-cmt-mmcm/README.md
diff --git a/fuzzers/031-mmcm/bits.dbf b/fuzzers/031-cmt-mmcm/bits.dbf
similarity index 100%
rename from fuzzers/031-mmcm/bits.dbf
rename to fuzzers/031-cmt-mmcm/bits.dbf
diff --git a/fuzzers/031-mmcm/generate.py b/fuzzers/031-cmt-mmcm/generate.py
similarity index 100%
rename from fuzzers/031-mmcm/generate.py
rename to fuzzers/031-cmt-mmcm/generate.py
diff --git a/fuzzers/031-mmcm/generate.sh b/fuzzers/031-cmt-mmcm/generate.sh
similarity index 100%
rename from fuzzers/031-mmcm/generate.sh
rename to fuzzers/031-cmt-mmcm/generate.sh
diff --git a/fuzzers/031-mmcm/generate.tcl b/fuzzers/031-cmt-mmcm/generate.tcl
similarity index 100%
rename from fuzzers/031-mmcm/generate.tcl
rename to fuzzers/031-cmt-mmcm/generate.tcl
diff --git a/fuzzers/031-mmcm/top.py b/fuzzers/031-cmt-mmcm/top.py
similarity index 100%
rename from fuzzers/031-mmcm/top.py
rename to fuzzers/031-cmt-mmcm/top.py
diff --git a/fuzzers/032-pll/Makefile b/fuzzers/032-cmt-pll/Makefile
similarity index 100%
rename from fuzzers/032-pll/Makefile
rename to fuzzers/032-cmt-pll/Makefile
diff --git a/fuzzers/032-pll/README.md b/fuzzers/032-cmt-pll/README.md
similarity index 100%
rename from fuzzers/032-pll/README.md
rename to fuzzers/032-cmt-pll/README.md
diff --git a/fuzzers/032-pll/bits.dbf b/fuzzers/032-cmt-pll/bits.dbf
similarity index 100%
rename from fuzzers/032-pll/bits.dbf
rename to fuzzers/032-cmt-pll/bits.dbf
diff --git a/fuzzers/032-pll/generate.py b/fuzzers/032-cmt-pll/generate.py
similarity index 100%
rename from fuzzers/032-pll/generate.py
rename to fuzzers/032-cmt-pll/generate.py
diff --git a/fuzzers/032-pll/generate.sh b/fuzzers/032-cmt-pll/generate.sh
similarity index 100%
rename from fuzzers/032-pll/generate.sh
rename to fuzzers/032-cmt-pll/generate.sh
diff --git a/fuzzers/032-pll/generate.tcl b/fuzzers/032-cmt-pll/generate.tcl
similarity index 100%
rename from fuzzers/032-pll/generate.tcl
rename to fuzzers/032-cmt-pll/generate.tcl
diff --git a/fuzzers/032-pll/top.py b/fuzzers/032-cmt-pll/top.py
similarity index 100%
rename from fuzzers/032-pll/top.py
rename to fuzzers/032-cmt-pll/top.py
diff --git a/fuzzers/033-xadc/Makefile b/fuzzers/033-mon-xadc/Makefile
similarity index 100%
rename from fuzzers/033-xadc/Makefile
rename to fuzzers/033-mon-xadc/Makefile
diff --git a/fuzzers/033-xadc/README.md b/fuzzers/033-mon-xadc/README.md
similarity index 100%
rename from fuzzers/033-xadc/README.md
rename to fuzzers/033-mon-xadc/README.md
diff --git a/fuzzers/033-xadc/bits.dbf b/fuzzers/033-mon-xadc/bits.dbf
similarity index 100%
rename from fuzzers/033-xadc/bits.dbf
rename to fuzzers/033-mon-xadc/bits.dbf
diff --git a/fuzzers/033-xadc/generate.py b/fuzzers/033-mon-xadc/generate.py
similarity index 100%
rename from fuzzers/033-xadc/generate.py
rename to fuzzers/033-mon-xadc/generate.py
diff --git a/fuzzers/033-xadc/generate.sh b/fuzzers/033-mon-xadc/generate.sh
similarity index 100%
rename from fuzzers/033-xadc/generate.sh
rename to fuzzers/033-mon-xadc/generate.sh
diff --git a/fuzzers/033-xadc/generate.tcl b/fuzzers/033-mon-xadc/generate.tcl
similarity index 100%
rename from fuzzers/033-xadc/generate.tcl
rename to fuzzers/033-mon-xadc/generate.tcl
diff --git a/fuzzers/033-xadc/top.py b/fuzzers/033-mon-xadc/top.py
similarity index 100%
rename from fuzzers/033-xadc/top.py
rename to fuzzers/033-mon-xadc/top.py
diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-pip-seed/Makefile
similarity index 100%
rename from fuzzers/050-intpips/Makefile
rename to fuzzers/050-pip-seed/Makefile
diff --git a/fuzzers/050-intpips/README.md b/fuzzers/050-pip-seed/README.md
similarity index 100%
rename from fuzzers/050-intpips/README.md
rename to fuzzers/050-pip-seed/README.md
diff --git a/fuzzers/050-intpips/generate.py b/fuzzers/050-pip-seed/generate.py
similarity index 100%
rename from fuzzers/050-intpips/generate.py
rename to fuzzers/050-pip-seed/generate.py
diff --git a/fuzzers/050-intpips/generate.sh b/fuzzers/050-pip-seed/generate.sh
similarity index 100%
rename from fuzzers/050-intpips/generate.sh
rename to fuzzers/050-pip-seed/generate.sh
diff --git a/fuzzers/050-intpips/generate.tcl b/fuzzers/050-pip-seed/generate.tcl
similarity index 100%
rename from fuzzers/050-intpips/generate.tcl
rename to fuzzers/050-pip-seed/generate.tcl
diff --git a/fuzzers/050-intpips/picorv32.v b/fuzzers/050-pip-seed/picorv32.v
similarity index 100%
rename from fuzzers/050-intpips/picorv32.v
rename to fuzzers/050-pip-seed/picorv32.v
diff --git a/fuzzers/050-intpips/top.v b/fuzzers/050-pip-seed/top.v
similarity index 100%
rename from fuzzers/050-intpips/top.v
rename to fuzzers/050-pip-seed/top.v
diff --git a/fuzzers/051-imuxlout/Makefile b/fuzzers/051-pip-imuxlout/Makefile
similarity index 100%
rename from fuzzers/051-imuxlout/Makefile
rename to fuzzers/051-pip-imuxlout/Makefile
diff --git a/fuzzers/051-imuxlout/README.md b/fuzzers/051-pip-imuxlout/README.md
similarity index 100%
rename from fuzzers/051-imuxlout/README.md
rename to fuzzers/051-pip-imuxlout/README.md
diff --git a/fuzzers/051-imuxlout/generate.py b/fuzzers/051-pip-imuxlout/generate.py
similarity index 100%
rename from fuzzers/051-imuxlout/generate.py
rename to fuzzers/051-pip-imuxlout/generate.py
diff --git a/fuzzers/051-imuxlout/generate.sh b/fuzzers/051-pip-imuxlout/generate.sh
similarity index 100%
rename from fuzzers/051-imuxlout/generate.sh
rename to fuzzers/051-pip-imuxlout/generate.sh
diff --git a/fuzzers/051-imuxlout/generate.tcl b/fuzzers/051-pip-imuxlout/generate.tcl
similarity index 100%
rename from fuzzers/051-imuxlout/generate.tcl
rename to fuzzers/051-pip-imuxlout/generate.tcl
diff --git a/fuzzers/051-imuxlout/top.v b/fuzzers/051-pip-imuxlout/top.v
similarity index 100%
rename from fuzzers/051-imuxlout/top.v
rename to fuzzers/051-pip-imuxlout/top.v
diff --git a/fuzzers/052-clkin/Makefile b/fuzzers/052-pip-clkin/Makefile
similarity index 100%
rename from fuzzers/052-clkin/Makefile
rename to fuzzers/052-pip-clkin/Makefile
diff --git a/fuzzers/052-clkin/README.md b/fuzzers/052-pip-clkin/README.md
similarity index 100%
rename from fuzzers/052-clkin/README.md
rename to fuzzers/052-pip-clkin/README.md
diff --git a/fuzzers/052-clkin/generate.py b/fuzzers/052-pip-clkin/generate.py
similarity index 100%
rename from fuzzers/052-clkin/generate.py
rename to fuzzers/052-pip-clkin/generate.py
diff --git a/fuzzers/052-clkin/generate.sh b/fuzzers/052-pip-clkin/generate.sh
similarity index 100%
rename from fuzzers/052-clkin/generate.sh
rename to fuzzers/052-pip-clkin/generate.sh
diff --git a/fuzzers/052-clkin/generate.tcl b/fuzzers/052-pip-clkin/generate.tcl
similarity index 100%
rename from fuzzers/052-clkin/generate.tcl
rename to fuzzers/052-pip-clkin/generate.tcl
diff --git a/fuzzers/052-clkin/top.v b/fuzzers/052-pip-clkin/top.v
similarity index 100%
rename from fuzzers/052-clkin/top.v
rename to fuzzers/052-pip-clkin/top.v
diff --git a/fuzzers/053-ctrlin/Makefile b/fuzzers/053-pip-ctrlin/Makefile
similarity index 100%
rename from fuzzers/053-ctrlin/Makefile
rename to fuzzers/053-pip-ctrlin/Makefile
diff --git a/fuzzers/053-ctrlin/README.md b/fuzzers/053-pip-ctrlin/README.md
similarity index 100%
rename from fuzzers/053-ctrlin/README.md
rename to fuzzers/053-pip-ctrlin/README.md
diff --git a/fuzzers/053-ctrlin/generate.py b/fuzzers/053-pip-ctrlin/generate.py
similarity index 100%
rename from fuzzers/053-ctrlin/generate.py
rename to fuzzers/053-pip-ctrlin/generate.py
diff --git a/fuzzers/053-ctrlin/generate.sh b/fuzzers/053-pip-ctrlin/generate.sh
similarity index 100%
rename from fuzzers/053-ctrlin/generate.sh
rename to fuzzers/053-pip-ctrlin/generate.sh
diff --git a/fuzzers/053-ctrlin/generate.tcl b/fuzzers/053-pip-ctrlin/generate.tcl
similarity index 100%
rename from fuzzers/053-ctrlin/generate.tcl
rename to fuzzers/053-pip-ctrlin/generate.tcl
diff --git a/fuzzers/053-ctrlin/top.v b/fuzzers/053-pip-ctrlin/top.v
similarity index 100%
rename from fuzzers/053-ctrlin/top.v
rename to fuzzers/053-pip-ctrlin/top.v
diff --git a/fuzzers/054-gfan/Makefile b/fuzzers/054-pip-gfan/Makefile
similarity index 100%
rename from fuzzers/054-gfan/Makefile
rename to fuzzers/054-pip-gfan/Makefile
diff --git a/fuzzers/054-gfan/README.md b/fuzzers/054-pip-gfan/README.md
similarity index 100%
rename from fuzzers/054-gfan/README.md
rename to fuzzers/054-pip-gfan/README.md
diff --git a/fuzzers/054-gfan/generate.py b/fuzzers/054-pip-gfan/generate.py
similarity index 100%
rename from fuzzers/054-gfan/generate.py
rename to fuzzers/054-pip-gfan/generate.py
diff --git a/fuzzers/054-gfan/generate.sh b/fuzzers/054-pip-gfan/generate.sh
similarity index 100%
rename from fuzzers/054-gfan/generate.sh
rename to fuzzers/054-pip-gfan/generate.sh
diff --git a/fuzzers/054-gfan/generate.tcl b/fuzzers/054-pip-gfan/generate.tcl
similarity index 100%
rename from fuzzers/054-gfan/generate.tcl
rename to fuzzers/054-pip-gfan/generate.tcl
diff --git a/fuzzers/054-gfan/top.v b/fuzzers/054-pip-gfan/top.v
similarity index 100%
rename from fuzzers/054-gfan/top.v
rename to fuzzers/054-pip-gfan/top.v
diff --git a/fuzzers/055-gnd/Makefile b/fuzzers/055-pip-gnd/Makefile
similarity index 100%
rename from fuzzers/055-gnd/Makefile
rename to fuzzers/055-pip-gnd/Makefile
diff --git a/fuzzers/055-gnd/README.md b/fuzzers/055-pip-gnd/README.md
similarity index 100%
rename from fuzzers/055-gnd/README.md
rename to fuzzers/055-pip-gnd/README.md
diff --git a/fuzzers/055-gnd/generate.py b/fuzzers/055-pip-gnd/generate.py
similarity index 100%
rename from fuzzers/055-gnd/generate.py
rename to fuzzers/055-pip-gnd/generate.py
diff --git a/fuzzers/055-gnd/generate.sh b/fuzzers/055-pip-gnd/generate.sh
similarity index 100%
rename from fuzzers/055-gnd/generate.sh
rename to fuzzers/055-pip-gnd/generate.sh
diff --git a/fuzzers/055-gnd/generate.tcl b/fuzzers/055-pip-gnd/generate.tcl
similarity index 100%
rename from fuzzers/055-gnd/generate.tcl
rename to fuzzers/055-pip-gnd/generate.tcl
diff --git a/fuzzers/055-gnd/top.v b/fuzzers/055-pip-gnd/top.v
similarity index 100%
rename from fuzzers/055-gnd/top.v
rename to fuzzers/055-pip-gnd/top.v
diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-pip-rem/Makefile
similarity index 100%
rename from fuzzers/056-rempips/Makefile
rename to fuzzers/056-pip-rem/Makefile
diff --git a/fuzzers/056-rempips/README.md b/fuzzers/056-pip-rem/README.md
similarity index 100%
rename from fuzzers/056-rempips/README.md
rename to fuzzers/056-pip-rem/README.md
diff --git a/fuzzers/056-rempips/generate.py b/fuzzers/056-pip-rem/generate.py
similarity index 100%
rename from fuzzers/056-rempips/generate.py
rename to fuzzers/056-pip-rem/generate.py
diff --git a/fuzzers/056-rempips/generate.sh b/fuzzers/056-pip-rem/generate.sh
similarity index 100%
rename from fuzzers/056-rempips/generate.sh
rename to fuzzers/056-pip-rem/generate.sh
diff --git a/fuzzers/056-rempips/generate.tcl b/fuzzers/056-pip-rem/generate.tcl
similarity index 100%
rename from fuzzers/056-rempips/generate.tcl
rename to fuzzers/056-pip-rem/generate.tcl
diff --git a/fuzzers/056-rempips/top.v b/fuzzers/056-pip-rem/top.v
similarity index 100%
rename from fuzzers/056-rempips/top.v
rename to fuzzers/056-pip-rem/top.v
diff --git a/fuzzers/057-bipips/Makefile b/fuzzers/057-pip-bi/Makefile
similarity index 100%
rename from fuzzers/057-bipips/Makefile
rename to fuzzers/057-pip-bi/Makefile
diff --git a/fuzzers/057-bipips/README.md b/fuzzers/057-pip-bi/README.md
similarity index 100%
rename from fuzzers/057-bipips/README.md
rename to fuzzers/057-pip-bi/README.md
diff --git a/fuzzers/057-bipips/bipiplist.tcl b/fuzzers/057-pip-bi/bipiplist.tcl
similarity index 100%
rename from fuzzers/057-bipips/bipiplist.tcl
rename to fuzzers/057-pip-bi/bipiplist.tcl
diff --git a/fuzzers/057-bipips/generate.py b/fuzzers/057-pip-bi/generate.py
similarity index 100%
rename from fuzzers/057-bipips/generate.py
rename to fuzzers/057-pip-bi/generate.py
diff --git a/fuzzers/057-bipips/generate.sh b/fuzzers/057-pip-bi/generate.sh
similarity index 100%
rename from fuzzers/057-bipips/generate.sh
rename to fuzzers/057-pip-bi/generate.sh
diff --git a/fuzzers/057-bipips/generate.tcl b/fuzzers/057-pip-bi/generate.tcl
similarity index 100%
rename from fuzzers/057-bipips/generate.tcl
rename to fuzzers/057-pip-bi/generate.tcl
diff --git a/fuzzers/057-bipips/top.v b/fuzzers/057-pip-bi/top.v
similarity index 100%
rename from fuzzers/057-bipips/top.v
rename to fuzzers/057-pip-bi/top.v
diff --git a/fuzzers/058-hclkpips/.gitignore b/fuzzers/058-pip-hclk/.gitignore
similarity index 100%
rename from fuzzers/058-hclkpips/.gitignore
rename to fuzzers/058-pip-hclk/.gitignore
diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-pip-hclk/Makefile
similarity index 100%
rename from fuzzers/058-hclkpips/Makefile
rename to fuzzers/058-pip-hclk/Makefile
diff --git a/fuzzers/058-hclkpips/README.md b/fuzzers/058-pip-hclk/README.md
similarity index 100%
rename from fuzzers/058-hclkpips/README.md
rename to fuzzers/058-pip-hclk/README.md
diff --git a/fuzzers/058-hclkpips/generate.py b/fuzzers/058-pip-hclk/generate.py
similarity index 100%
rename from fuzzers/058-hclkpips/generate.py
rename to fuzzers/058-pip-hclk/generate.py
diff --git a/fuzzers/058-hclkpips/generate.sh b/fuzzers/058-pip-hclk/generate.sh
similarity index 100%
rename from fuzzers/058-hclkpips/generate.sh
rename to fuzzers/058-pip-hclk/generate.sh
diff --git a/fuzzers/058-hclkpips/generate.tcl b/fuzzers/058-pip-hclk/generate.tcl
similarity index 100%
rename from fuzzers/058-hclkpips/generate.tcl
rename to fuzzers/058-pip-hclk/generate.tcl
diff --git a/fuzzers/058-hclkpips/top.v b/fuzzers/058-pip-hclk/top.v
similarity index 100%
rename from fuzzers/058-hclkpips/top.v
rename to fuzzers/058-pip-hclk/top.v
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index 132f8dde..480f92fd 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -24,29 +24,29 @@ all:: 005-tilegrid/run.ok
 	touch 005-tilegrid/run.ok
 endif
 
-$(eval $(call fuzzer,010-lutinit,005-tilegrid))
-$(eval $(call fuzzer,011-ffconfig,005-tilegrid))
-$(eval $(call fuzzer,012-clbn5ffmux,005-tilegrid))
-$(eval $(call fuzzer,013-clbncy0,005-tilegrid))
-$(eval $(call fuzzer,014-ffsrcemux,005-tilegrid))
-$(eval $(call fuzzer,015-clbnffmux,005-tilegrid))
-$(eval $(call fuzzer,016-clbnoutmux,005-tilegrid))
-$(eval $(call fuzzer,017-clbprecyinit,005-tilegrid))
-$(eval $(call fuzzer,018-clbram,005-tilegrid))
-$(eval $(call fuzzer,019-ndi1mux,005-tilegrid))
+$(eval $(call fuzzer,010-clb-lutinit,005-tilegrid))
+$(eval $(call fuzzer,011-clb-ffconfig,005-tilegrid))
+$(eval $(call fuzzer,012-clb-n5ffmux,005-tilegrid))
+$(eval $(call fuzzer,013-clb-ncy0,005-tilegrid))
+$(eval $(call fuzzer,014-clb-ffsrcemux,005-tilegrid))
+$(eval $(call fuzzer,015-clb-nffmux,005-tilegrid))
+$(eval $(call fuzzer,016-clb-noutmux,005-tilegrid))
+$(eval $(call fuzzer,017-clb-precyinit,005-tilegrid))
+$(eval $(call fuzzer,018-clb-ram,005-tilegrid))
+$(eval $(call fuzzer,019-clb-ndi1mux,005-tilegrid))
 $(eval $(call fuzzer,025-bram-config,005-tilegrid))
 $(eval $(call fuzzer,026-bram-data,005-tilegrid))
-$(eval $(call fuzzer,050-intpips,005-tilegrid))
-$(eval $(call fuzzer,051-imuxlout,050-intpips))
-$(eval $(call fuzzer,052-clkin,050-intpips))
-$(eval $(call fuzzer,053-ctrlin,050-intpips))
-$(eval $(call fuzzer,054-gfan,050-intpips))
-$(eval $(call fuzzer,055-gnd,050-intpips))
-$(eval $(call fuzzer,056-rempips,051-imuxlout 052-clkin 053-ctrlin 054-gfan 055-gnd))
-$(eval $(call fuzzer,057-bipips,056-rempips))
+$(eval $(call fuzzer,050-pip-seed,005-tilegrid))
+$(eval $(call fuzzer,051-pip-imuxlout,050-pip-seed))
+$(eval $(call fuzzer,052-pip-clkin,050-pip-seed))
+$(eval $(call fuzzer,053-pip-ctrlin,050-pip-seed))
+$(eval $(call fuzzer,054-pip-gfan,050-pip-seed))
+$(eval $(call fuzzer,055-pip-gnd,050-pip-seed))
+$(eval $(call fuzzer,056-pip-rem,051-pip-imuxlout 052-pip-clkin 053-pip-ctrlin 054-pip-gfan 055-pip-gnd))
+$(eval $(call fuzzer,057-pip-bi,056-pip-rem))
 ifneq ($(QUICK),Y)
-$(eval $(call fuzzer,058-hclkpips,056-rempips))
-$(eval $(call fuzzer,071-ppips,057-bipips 058-hclkpips))
+$(eval $(call fuzzer,058-pip-hclk,056-pip-rem))
+$(eval $(call fuzzer,071-ppips,057-pip-bi 058-pip-hclk))
 ifneq ($(BITONLY),Y)
 $(eval $(call fuzzer,072-ordered_wires,))
 $(eval $(call fuzzer,073-get_counts,))