diff --git a/src/finn/transformation/fpgadataflow/codegen_ipgen.py b/src/finn/transformation/fpgadataflow/codegen_ipgen.py
index ab3b4e820e04ff1f0a02b6b95254b5fe8b45de91..45db9db04f17325cafe04aad1016580054daf554 100644
--- a/src/finn/transformation/fpgadataflow/codegen_ipgen.py
+++ b/src/finn/transformation/fpgadataflow/codegen_ipgen.py
@@ -46,7 +46,7 @@ def _codegen_single_node(node, model, fpgapart, clk):
         # ensure that there is a directory
         if code_gen_dir == "" or not os.path.isdir(code_gen_dir):
             code_gen_dir = make_build_dir(
-                prefix="code_gen_ipgen_" + str(node.op_type) + "_"
+                prefix="code_gen_ipgen_" + str(node.name) + "_"
             )
             inst.set_nodeattr("code_gen_dir_ipgen", code_gen_dir)
         # ensure that there is generated code inside the dir
diff --git a/src/finn/transformation/fpgadataflow/codegen_npysim.py b/src/finn/transformation/fpgadataflow/codegen_npysim.py
index d2862d82cf76f62bc236ace9d44c607dd2ab86ff..fe758ec28d67bd2f46edc864574d2edddfe6e3a3 100644
--- a/src/finn/transformation/fpgadataflow/codegen_npysim.py
+++ b/src/finn/transformation/fpgadataflow/codegen_npysim.py
@@ -46,7 +46,7 @@ def _codegen_single_node(node, model):
         # ensure that there is a directory
         if code_gen_dir == "" or not os.path.isdir(code_gen_dir):
             code_gen_dir = make_build_dir(
-                prefix="code_gen_npysim_" + str(node.op_type) + "_"
+                prefix="code_gen_npysim_" + str(node.name) + "_"
             )
             inst.set_nodeattr("code_gen_dir_npysim", code_gen_dir)
         # ensure that there is generated code inside the dir