diff --git a/applications/apertif/commissioning/apertif_synthesize_all.sh b/applications/apertif/commissioning/apertif_synthesize_all.sh
index b2ec00dced53dab496995612f71e7bf42cb9b1bf..a1c6a10bdb128b2f60078cf9bf6b833e5e81a0a2 100755
--- a/applications/apertif/commissioning/apertif_synthesize_all.sh
+++ b/applications/apertif/commissioning/apertif_synthesize_all.sh
@@ -111,17 +111,17 @@ if [ "$MMM" == "1" ]; then
         run_sopc unb1 $design
       fi
     fi
-    if [ "${design:0:32}" == "apertif_unb1_fn_beamformer_trans" ]; then
+    if [ "${design:0:26}" == "apertif_unb1_fn_beamformer" ]; then
       echo ">>> Create SOPC: $design" >> $LOG_FILE
       if [ "$DEMO_RUN" == "0" ]; then
         run_sopc unb1 $design
       fi
     fi
-    if [ "${design:0:28}" == "apertif_unb1_correlator_full" ]; then
+    if [ "${design:0:23}" == "apertif_unb1_correlator" ]; then
       echo ">>> Create QSYS: $design" >> $LOG_FILE
       if [ "$DEMO_RUN" == "0" ]; then
         run_qsys unb1 $design
-        cd $RADIOHDL/applications/apertif/designs/$design/revisions/$design
+        cd $RADIOHDL/applications/apertif/designs/${design:0:23}/revisions/$design
         ./qsys_delete_duplicates_full.sh
         cd $RADIOHDL
       fi
@@ -140,14 +140,14 @@ if [ "$SYNTHESIS" == "1" ]; then
         run_rbf unb1 $design
       fi
     fi
-    if [ "${design:0:32}" == "apertif_unb1_fn_beamformer_trans" ]; then
+    if [ "${design:0:26}" == "apertif_unb1_fn_beamformer" ]; then
       echo ">>> Do synthesis and create rbf: $design" >> $LOG_FILE
       if [ "$DEMO_RUN" == "0" ]; then
         run_qcomp unb1 $design --seed=1 --clk=pll_afi_clk
         run_rbf unb1 $design
       fi
     fi
-    if [ "${design:0:28}" == "apertif_unb1_correlator_full" ]; then
+    if [ "${design:0:23}" == "apertif_unb1_correlator" ]; then
       echo ">>> Do synthesis: $design" >> $LOG_FILE
       if [ "$DEMO_RUN" == "0" ]; then
         run_qcomp unb1 $design --seed=1,2,3,4,5 --clk=unb1_board_clk200