diff --git a/orchestrator/taste-orchestrator.py b/orchestrator/taste-orchestrator.py
index 234385b24e195205fe0f93eff13bf8d00f74da2b..c9d18f93ae32d1825e9dc5595c866b8c07048d37 100644
--- a/orchestrator/taste-orchestrator.py
+++ b/orchestrator/taste-orchestrator.py
@@ -2686,8 +2686,8 @@ def ZynQSynthesis(bNoBitfile):
                 status = pipe.read().strip()
             # Following check is ugly and error prone, since it inspects Vivado log. Change to check command return code instead using something like 'subprocess.check_call'
             # Extract return code out of make? or avoid using Makefiles and call directly Vivado etc.
-            if ("Generating bitstream of project succeed" not in status) and ("Now we would call Vivado" not in status):
-                panic('Bitfile synthesis failed in "%s"' % os.getcwd())
+            if ("Generating bitstream of project succeed" not in status) and ("Now we would call vivado" not in status):
+                panic('ZynQSynthesis: Bitfile synthesis failed in "%s"' % os.getcwd())
         os.chdir(savedDir)
     os.chdir(savedDir)
 
@@ -2779,7 +2779,6 @@ def CallBambuForZynQ(bNoBitfile):
             bambu_cmd.append('-funroll-loops')
             bambu_cmd.append('-fno-inline')
             bambu_cmd.append('--speculative-sdc-scheduling')
-            bambu_cmd.append('--device-name=nx1h35S')
             bambu_cmd.append('../' + os.path.basename(bambuFile)[:-1])
             bambu_cmd.append('-I../../../auto-src/')
             bambu_cmd.append('-I../../../' + fBlockName + '/' + fBlockName + '/')