diff --git a/fuzzers/050-pip-seed/generate.py b/fuzzers/050-pip-seed/generate.py
index 29a98666..0c4d3fbf 100644
--- a/fuzzers/050-pip-seed/generate.py
+++ b/fuzzers/050-pip-seed/generate.py
@@ -61,5 +61,5 @@ for tile, pips_srcs_dsts in tiledata.items():
         elif src_dst[1] not in dsts:
             segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0)
 
-segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_PART'), 'INT'))
+segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_DATABASE'), 'INT'))
 segmk.write()
diff --git a/fuzzers/055-pip-gnd/generate.py b/fuzzers/055-pip-gnd/generate.py
index 8b667e06..fd499ecd 100644
--- a/fuzzers/055-pip-gnd/generate.py
+++ b/fuzzers/055-pip-gnd/generate.py
@@ -55,5 +55,5 @@ for tile, pips_srcs_dsts in tiledata.items():
         elif src_dst[1] not in dsts:
             segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0)
 
-segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_PART'), 'INT'))
+segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_DATABASE'), 'INT'))
 segmk.write()
diff --git a/fuzzers/int_generate.py b/fuzzers/int_generate.py
index f728e184..d073b949 100644
--- a/fuzzers/int_generate.py
+++ b/fuzzers/int_generate.py
@@ -86,5 +86,5 @@ for tile, pips_srcs_dsts in tiledata.items():
         elif src_dst[1] not in dsts:
             segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0)
 
-segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_PART'), 'INT'))
+segmk.compile(bitfilter=get_bitfilter(os.getenv('XRAY_DATABASE'), 'INT'))
 segmk.write()
diff --git a/prjxray/bitfilter.py b/prjxray/bitfilter.py
index 4cd94a22..a9a0d699 100644
--- a/prjxray/bitfilter.py
+++ b/prjxray/bitfilter.py
@@ -39,4 +39,8 @@ def get_bitfilter(part, tile):
     Either returns bitfilter to specified part and tile type, or the default
     bitfilter, which includes all bits.
     """
-    return BITFILTERS.get((part, tile), None)
+    key = (part, tile)
+    if key in BITFILTERS:
+        return BITFILTERS[key].filter
+    else:
+        return None