--- a/.github/workflows/build_bundles.yml	Thu May 19 21:58:09 2022 +0200
+++ b/.github/workflows/build_bundles.yml	Fri May 20 08:04:52 2022 +0200
@@ -4,7 +4,7 @@
 env:
     beremiz_revisionid: 9fb2ded4f1988440faf546488ee83373825330f4
     matiec_revisionid: 2a25f4dbf4e2b1e017a3a583db7dede4771fe523
-    CanFestival-3_revisionid: 12a05e422666c738d1312259703f80150c747cb5
+    canfestival_revisionid: 12a05e422666c738d1312259703f80150c747cb5
 
 on:
   push:
@@ -36,20 +36,20 @@
 
     - uses: actions/checkout@v3
       with:
-          repository: beremiz/CanFestival-3
-          ref: ${{ env.CanFestival-3_revisionid }}
-          path: build/sources/CanFestival-3_${{ env.CanFestival-3_revisionid }}
+          repository: beremiz/canfestival
+          ref: ${{ env.canfestival_revisionid }}
+          path: build/sources/canfestival_${{ env.canfestival_revisionid }}
 
     - name: Touch expected Makfile targets to shortcut HG checkout
       run: |
         touch build/sources/beremiz_src
         touch build/sources/matiec_src
-        touch build/sources/CanFestival-3_src
+        touch build/sources/canfestival_src
         cat >> build/revisions.txt <<EOF
         beremiz_public_dist ${{ github.sha }}
         beremiz ${{ env.beremiz_revisionid }}
         matiec ${{ env.matiec_revisionid }}
-        CanFestival-3 ${{ env.CanFestival-3_revisionid }}
+        canfestival ${{ env.canfestival_revisionid }}
         EOF
 
     # TODO: cache docker image, find files to hash for a key
@@ -66,7 +66,10 @@
     - name: Run build in docker
       run: |
         cd beremiz_public_dist
-        beremiz_revisionid=${{ env.beremiz_revisionid }} matiec_revisionid=${{ env.matiec_revisionid }} CanFestival-3_revisionid=${{ env.CanFestival-3_revisionid }} ./build_in_docker.sh
+        beremiz_revisionid=${{ env.beremiz_revisionid }} \
+        matiec_revisionid=${{ env.matiec_revisionid }} \
+        canfestival_revisionid=${{ env.canfestival_revisionid }} \
+        ./build_in_docker.sh
 
     - name: Upload built artifact
       uses: actions/upload-artifact@v3

--- a/win32.mk	Thu May 19 21:58:09 2022 +0200
+++ b/win32.mk	Fri May 20 08:04:52 2022 +0200
@@ -1,23 +1,23 @@
 # Win32 only distribution
 
-OWN_PROJECTS_EX=CanFestival-3
+OWN_PROJECTS_EX=canfestival
 
 ide_targets_from_dist: canfestival
 	touch $@
 
-CanFestival-3_dir = installer/CanFestival-3
-CanFestival-3: $(CanFestival-3_dir)/.stamp
-$(CanFestival-3_dir)/.stamp: sources/CanFestival-3_src | installer
-canfestival: $(CanFestival-3_dir)/.stamp
-	rm -rf $(CanFestival-3_dir)
-	cp -a sources/CanFestival-3 $(CanFestival-3_dir)
-	cd $(CanFestival-3_dir); \
+canfestival_dir = installer/canfestival
+canfestival: $(canfestival_dir)/.stamp
+$(canfestival_dir)/.stamp: sources/canfestival_src | installer
+canfestival: $(canfestival_dir)/.stamp
+	rm -rf $(canfestival_dir)
+	cp -a sources/canfestival $(canfestival_dir)
+	cd $(canfestival_dir); \
 	./configure --can=tcp_win32 \
 				--cc=$(CC) \
 				--cxx=$(CXX) \
 				--target=win32 \
 				--wx=0
-	$(MAKE) -C $(CanFestival-3_dir)
-	cd $(CanFestival-3_dir); find . -name "*.o" -exec rm {} ';' #remove object files only
+	$(MAKE) -C $(canfestival_dir)
+	cd $(canfestival_dir); find . -name "*.o" -exec rm {} ';' #remove object files only
 	touch $@