diff --git a/fuzzers/101-bram-config/minitest/.gitignore b/fuzzers/025-bram-config/.gitignore
similarity index 100%
rename from fuzzers/101-bram-config/minitest/.gitignore
rename to fuzzers/025-bram-config/.gitignore
diff --git a/fuzzers/101-bram-config/Makefile b/fuzzers/025-bram-config/Makefile
similarity index 59%
rename from fuzzers/101-bram-config/Makefile
rename to fuzzers/025-bram-config/Makefile
index 6fb1f91c..6f0526aa 100644
--- a/fuzzers/101-bram-config/Makefile
+++ b/fuzzers/025-bram-config/Makefile
@@ -4,11 +4,11 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
-	${XRAY_SEGMATCH} -o build/seg_bramx.block_ram.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -o build/seg_bramx.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
 
 pushdb:
-	${XRAY_MERGEDB} bram_l.block_ram build/seg_bramx.block_ram.segbits
-	${XRAY_MERGEDB} bram_r.block_ram build/seg_bramx.block_ram.segbits
+	${XRAY_MERGEDB} bram_l build/seg_bramx.segbits
+	${XRAY_MERGEDB} bram_r build/seg_bramx.segbits
 
 build:
 	mkdir build
diff --git a/fuzzers/101-bram-config/README.md b/fuzzers/025-bram-config/README.md
similarity index 100%
rename from fuzzers/101-bram-config/README.md
rename to fuzzers/025-bram-config/README.md
diff --git a/fuzzers/101-bram-config/generate.py b/fuzzers/025-bram-config/generate.py
similarity index 98%
rename from fuzzers/101-bram-config/generate.py
rename to fuzzers/025-bram-config/generate.py
index cb17c458..9c0dfe5b 100644
--- a/fuzzers/101-bram-config/generate.py
+++ b/fuzzers/025-bram-config/generate.py
@@ -86,7 +86,7 @@ def write_mode_tags(segmk, ps, site):
 
 def run():
 
-    segmk = Segmaker("design.bits", verbose=True)
+    segmk = Segmaker("design.bits")
     #segmk.set_def_bt('BLOCK_RAM')
 
     print("Loading tags")
diff --git a/fuzzers/101-bram-config/generate.sh b/fuzzers/025-bram-config/generate.sh
similarity index 100%
rename from fuzzers/101-bram-config/generate.sh
rename to fuzzers/025-bram-config/generate.sh
diff --git a/fuzzers/101-bram-config/generate.tcl b/fuzzers/025-bram-config/generate.tcl
similarity index 100%
rename from fuzzers/101-bram-config/generate.tcl
rename to fuzzers/025-bram-config/generate.tcl
diff --git a/fuzzers/102-bram-data/.gitignore b/fuzzers/025-bram-config/minitest/.gitignore
similarity index 100%
rename from fuzzers/102-bram-data/.gitignore
rename to fuzzers/025-bram-config/minitest/.gitignore
diff --git a/fuzzers/101-bram-config/minitest/Makefile b/fuzzers/025-bram-config/minitest/Makefile
similarity index 100%
rename from fuzzers/101-bram-config/minitest/Makefile
rename to fuzzers/025-bram-config/minitest/Makefile
diff --git a/fuzzers/101-bram-config/minitest/README.md b/fuzzers/025-bram-config/minitest/README.md
similarity index 100%
rename from fuzzers/101-bram-config/minitest/README.md
rename to fuzzers/025-bram-config/minitest/README.md
diff --git a/fuzzers/101-bram-config/minitest/diff.mk b/fuzzers/025-bram-config/minitest/diff.mk
similarity index 100%
rename from fuzzers/101-bram-config/minitest/diff.mk
rename to fuzzers/025-bram-config/minitest/diff.mk
diff --git a/fuzzers/101-bram-config/minitest/env.sh b/fuzzers/025-bram-config/minitest/env.sh
similarity index 100%
rename from fuzzers/101-bram-config/minitest/env.sh
rename to fuzzers/025-bram-config/minitest/env.sh
diff --git a/fuzzers/101-bram-config/minitest/runme.sh b/fuzzers/025-bram-config/minitest/runme.sh
similarity index 100%
rename from fuzzers/101-bram-config/minitest/runme.sh
rename to fuzzers/025-bram-config/minitest/runme.sh
diff --git a/fuzzers/101-bram-config/minitest/runme.tcl b/fuzzers/025-bram-config/minitest/runme.tcl
similarity index 100%
rename from fuzzers/101-bram-config/minitest/runme.tcl
rename to fuzzers/025-bram-config/minitest/runme.tcl
diff --git a/fuzzers/101-bram-config/minitest/top.v b/fuzzers/025-bram-config/minitest/top.v
similarity index 100%
rename from fuzzers/101-bram-config/minitest/top.v
rename to fuzzers/025-bram-config/minitest/top.v
diff --git a/fuzzers/101-bram-config/top.py b/fuzzers/025-bram-config/top.py
similarity index 97%
rename from fuzzers/101-bram-config/top.py
rename to fuzzers/025-bram-config/top.py
index c030673e..4425454d 100644
--- a/fuzzers/101-bram-config/top.py
+++ b/fuzzers/025-bram-config/top.py
@@ -32,15 +32,7 @@ def gen_brams():
     '''
     Correctly assign a site to either bram36 or 2x bram18
     '''
-    # FIXME
-    #yield ('RAMBFIFO36E1', "RAMB36_X0Y20")
-    #return
-
-    #for _tile_name, site_name, _site_type in util.get_roi().gen_tiles():
-
-    #for site in gen_bram36():
-    #    yield ('RAMBFIFO36E1', site)
-
+    # XXX: mix 18 and 36?
     for site in gen_bram18():
         yield ('RAMB18E1', site)
 
@@ -100,6 +92,7 @@ for loci, (site_type, site) in enumerate(brams):
 
         return ('my_RAMB18E1', ports, params)
 
+    '''
     def place_bram36():
         ports = {
             'clk': 'clk',
@@ -121,10 +114,11 @@ for loci, (site_type, site) in enumerate(brams):
             'WRITE_MODE_B': '"WRITE_FIRST"',
         }
         return ('my_RAMB36E1', ports, params)
+    '''
 
     modname, ports, params = {
         'RAMB18E1': place_bram18,
-        'RAMBFIFO36E1': place_bram36,
+        #'RAMBFIFO36E1': place_bram36,
     }[site_type]()
 
     verilog.instance(modname, 'inst_%u' % loci, ports, params=params)
diff --git a/fuzzers/102-bram-data/minitest/.gitignore b/fuzzers/026-bram-data/.gitignore
similarity index 100%
rename from fuzzers/102-bram-data/minitest/.gitignore
rename to fuzzers/026-bram-data/.gitignore
diff --git a/fuzzers/102-bram-data/Makefile b/fuzzers/026-bram-data/Makefile
similarity index 100%
rename from fuzzers/102-bram-data/Makefile
rename to fuzzers/026-bram-data/Makefile
diff --git a/fuzzers/102-bram-data/README.md b/fuzzers/026-bram-data/README.md
similarity index 100%
rename from fuzzers/102-bram-data/README.md
rename to fuzzers/026-bram-data/README.md
diff --git a/fuzzers/102-bram-data/generate.py b/fuzzers/026-bram-data/generate.py
similarity index 92%
rename from fuzzers/102-bram-data/generate.py
rename to fuzzers/026-bram-data/generate.py
index 3c75c3c0..402b0564 100644
--- a/fuzzers/102-bram-data/generate.py
+++ b/fuzzers/026-bram-data/generate.py
@@ -6,7 +6,7 @@ from prjxray.segmaker import Segmaker
 
 c2i = {'0': 0, '1': 1}
 
-segmk = Segmaker("design.bits", verbose=True)
+segmk = Segmaker("design.bits")
 segmk.set_def_bt('BLOCK_RAM')
 
 print("Loading tags")
diff --git a/fuzzers/102-bram-data/generate.sh b/fuzzers/026-bram-data/generate.sh
similarity index 100%
rename from fuzzers/102-bram-data/generate.sh
rename to fuzzers/026-bram-data/generate.sh
diff --git a/fuzzers/102-bram-data/generate.tcl b/fuzzers/026-bram-data/generate.tcl
similarity index 100%
rename from fuzzers/102-bram-data/generate.tcl
rename to fuzzers/026-bram-data/generate.tcl
diff --git a/fuzzers/026-bram-data/minitest/.gitignore b/fuzzers/026-bram-data/minitest/.gitignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/fuzzers/026-bram-data/minitest/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/fuzzers/102-bram-data/minitest/Makefile b/fuzzers/026-bram-data/minitest/Makefile
similarity index 100%
rename from fuzzers/102-bram-data/minitest/Makefile
rename to fuzzers/026-bram-data/minitest/Makefile
diff --git a/fuzzers/102-bram-data/minitest/diff.mk b/fuzzers/026-bram-data/minitest/diff.mk
similarity index 100%
rename from fuzzers/102-bram-data/minitest/diff.mk
rename to fuzzers/026-bram-data/minitest/diff.mk
diff --git a/fuzzers/102-bram-data/minitest/runme.sh b/fuzzers/026-bram-data/minitest/runme.sh
similarity index 100%
rename from fuzzers/102-bram-data/minitest/runme.sh
rename to fuzzers/026-bram-data/minitest/runme.sh
diff --git a/fuzzers/102-bram-data/minitest/runme.tcl b/fuzzers/026-bram-data/minitest/runme.tcl
similarity index 95%
rename from fuzzers/102-bram-data/minitest/runme.tcl
rename to fuzzers/026-bram-data/minitest/runme.tcl
index 6aa1f9eb..83db6f9b 100644
--- a/fuzzers/102-bram-data/minitest/runme.tcl
+++ b/fuzzers/026-bram-data/minitest/runme.tcl
@@ -9,7 +9,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po
 set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do]
 
 create_pblock roi
-set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi]
+
 add_cells_to_pblock [get_pblocks roi] [get_cells roi]
 resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)"
 
diff --git a/fuzzers/102-bram-data/minitest/top.v b/fuzzers/026-bram-data/minitest/top.v
similarity index 100%
rename from fuzzers/102-bram-data/minitest/top.v
rename to fuzzers/026-bram-data/minitest/top.v
diff --git a/fuzzers/102-bram-data/top.py b/fuzzers/026-bram-data/top.py
similarity index 98%
rename from fuzzers/102-bram-data/top.py
rename to fuzzers/026-bram-data/top.py
index 6b029c0c..4adc8c9f 100644
--- a/fuzzers/102-bram-data/top.py
+++ b/fuzzers/026-bram-data/top.py
@@ -9,13 +9,12 @@ import sys
 
 
 def gen_bram36():
-    #yield "RAMB36_X%dY%d" % (x, y)
     for _tile_name, site_name, _site_type in util.get_roi().gen_sites(
         ['RAMBFIFO36E1']):
         yield site_name
 
 
-DUTN = 10
+DUTN = len(list(gen_bram36()))
 DIN_N = DUTN * 8
 DOUT_N = DUTN * 8
 
diff --git a/fuzzers/101-bram-config/.gitignore b/fuzzers/101-bram-config/.gitignore
deleted file mode 100644
index 932efba0..00000000
--- a/fuzzers/101-bram-config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/specimen_[0-9][0-9][0-9]/
-/seg_clbl[lm].segbits
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index e386bcb8..b20e3c70 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -18,6 +18,8 @@ $(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,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))