diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 33a9641..54bb89a 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -20,13 +20,13 @@ jobs:
         branch: origin/main
 
     - name: compress archive
-      run: 7z a FluCoMa-CLI-Windows-nightly.zip FluidCorpusManipulation
+      run: 7z a FluCoMa-CLI-Windows-x64-nightly.zip FluidCorpusManipulation
       working-directory: release-packaging
 
     - uses: actions/upload-artifact@v4.3.6
       with:
         name: winbuild
-        path: release-packaging/FluCoMa-CLI-Windows-nightly.zip
+        path: release-packaging/FluCoMa-CLI-Windows-x64-nightly.zip
     
   macos:
     runs-on: macos-latest
@@ -57,7 +57,7 @@ jobs:
           path: release-packaging/FluCoMa-CLI-Mac-nightly.dmg
       
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: flucoma/actions/env@main
@@ -66,16 +66,16 @@ jobs:
           branch: origin/main
 
       - name: compress archive
-        run: tar -zcvf FluCoMa-CLI-Linux-nightly.tar.gz FluidCorpusManipulation
+        run: tar -zcvf FluCoMa-CLI-Linux-x64-nightly.tar.gz FluidCorpusManipulation
         working-directory: release-packaging 
         
       - uses: actions/upload-artifact@v4.3.6
         with:
           name: linuxbuild
-          path: release-packaging/FluCoMa-CLI-Linux-nightly.tar.gz
+          path: release-packaging/FluCoMa-CLI-Linux-x64-nightly.tar.gz
       
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [windows, linux, macos]
     steps:
       - uses: actions/download-artifact@v4.1.7
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cfb1d96..4593c77 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,13 +13,13 @@ jobs:
           branch: origin/${{ github.ref_name }}
           
       - name: compress archive
-        run: 7z a FluCoMa-CLI-Windows.zip FluidCorpusManipulation
+        run: 7z a FluCoMa-CLI-Windows-x64.zip FluidCorpusManipulation
         working-directory: release-packaging
 
       - uses: actions/upload-artifact@v4.3.6
         with:
           name: winbuild
-          path: release-packaging/FluCoMa-CLI-Windows.zip
+          path: release-packaging/FluCoMa-CLI-Windows-x64.zip
 
   mac:
     runs-on: macos-latest
@@ -50,7 +50,7 @@ jobs:
           path: release-packaging/FluCoMa-CLI-Mac.dmg
   
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       version: ${{ steps.get-version.outputs.version }}
     steps:
@@ -61,13 +61,13 @@ jobs:
           branch: origin/${{ github.ref_name }}
 
       - name: compress archive
-        run: tar -zcvf FluCoMa-CLI-Linux.tar.gz FluidCorpusManipulation
+        run: tar -zcvf FluCoMa-CLI-Linux-x64.tar.gz FluidCorpusManipulation
         working-directory: release-packaging 
         
       - uses: actions/upload-artifact@v4.3.6
         with:
           name: linuxbuild
-          path: release-packaging/FluCoMa-CLI-Linux.tar.gz
+          path: release-packaging/FluCoMa-CLI-Linux-x64.tar.gz
           
       - run: ls -r
 
@@ -76,7 +76,7 @@ jobs:
         working-directory: build/_deps/flucoma-core-src
 
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [mac, windows, linux]
 
     steps:
diff --git a/include/FluidCLIWrapper.hpp b/include/FluidCLIWrapper.hpp
index 5a19865..15b6e15 100644
--- a/include/FluidCLIWrapper.hpp
+++ b/include/FluidCLIWrapper.hpp
@@ -10,14 +10,15 @@ under the European Union’s Horizon 2020 research and innovation programme
 
 #pragma once
 
+#include <flucoma/clients/common/FluidBaseClient.hpp>
+#include <flucoma/clients/common/OfflineClient.hpp>
+#include <flucoma/clients/common/ParameterSet.hpp>
+#include <flucoma/clients/common/ParameterTypes.hpp>
+#include <flucoma/data/FluidMemory.hpp>
+#include <flucoma/FluidVersion.hpp>
+
 #include <audio_file/in_file.hpp>
 #include <audio_file/out_file.hpp>
-#include <clients/common/FluidBaseClient.hpp>
-#include <clients/common/OfflineClient.hpp>
-#include <clients/common/ParameterSet.hpp>
-#include <clients/common/ParameterTypes.hpp>
-#include <data/FluidMemory.hpp>
-#include <FluidVersion.hpp>
 #include <cctype>
 #include <chrono>
 #include <iomanip>