diff --git a/.github/workflows/clang_tidy_1D.yml b/.github/workflows/clang_tidy_1D.yml
index 50f63260275..7164f1a8b2f 100644
--- a/.github/workflows/clang_tidy_1D.yml
+++ b/.github/workflows/clang_tidy_1D.yml
@@ -1,4 +1,4 @@
-name: 🧹 clang-tidy
+name: 🧹 clang-tidy-1D
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   run_clang_tidy:
-    name: clang-tidy
+    name: clang-tidy-1D
     runs-on: ubuntu-22.04
     if: github.event.pull_request.draft == false
     steps:
@@ -35,19 +35,19 @@ jobs:
         export CXX=$(which clang++-15)
         export CC=$(which clang-15)
 
-        cmake -S . -B build_clang_tidy \
-          -DCMAKE_VERBOSE_MAKEFILE=ON  \
-          -DWarpX_DIMS="1"             \
-          -DWarpX_MPI=ON               \
-          -DWarpX_COMPUTE=OMP          \
-          -DWarpX_PSATD=ON             \
-          -DWarpX_QED=ON               \
-          -DWarpX_QED_TABLE_GEN=ON     \
-          -DWarpX_OPENPMD=ON           \
-          -DWarpX_PRECISION=SINGLE     \
+        cmake -S . -B build_clang_tidy_1D \
+          -DCMAKE_VERBOSE_MAKEFILE=ON     \
+          -DWarpX_DIMS="1"                \
+          -DWarpX_MPI=ON                  \
+          -DWarpX_COMPUTE=OMP             \
+          -DWarpX_PSATD=ON                \
+          -DWarpX_QED=ON                  \
+          -DWarpX_QED_TABLE_GEN=ON        \
+          -DWarpX_OPENPMD=ON              \
+          -DWarpX_PRECISION=SINGLE        \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-        cmake --build build_clang_tidy -j 4
+        cmake --build build_clang_tidy_1D -j 4
 
         ${{github.workspace}}/.github/workflows/source/makeMakefileForClangTidy.py --input ${{github.workspace}}/ccache.log.txt
         make -j4 --keep-going -f clang-tidy-ccache-misses.mak \
diff --git a/.github/workflows/clang_tidy_2D.yml b/.github/workflows/clang_tidy_2D.yml
index 459092e2e75..d3dfe85f728 100644
--- a/.github/workflows/clang_tidy_2D.yml
+++ b/.github/workflows/clang_tidy_2D.yml
@@ -1,4 +1,4 @@
-name: 🧹 clang-tidy
+name: 🧹 clang-tidy-2D
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   run_clang_tidy:
-    name: clang-tidy
+    name: clang-tidy-2D
     runs-on: ubuntu-22.04
     if: github.event.pull_request.draft == false
     steps:
@@ -35,19 +35,19 @@ jobs:
         export CXX=$(which clang++-15)
         export CC=$(which clang-15)
 
-        cmake -S . -B build_clang_tidy \
-          -DCMAKE_VERBOSE_MAKEFILE=ON  \
-          -DWarpX_DIMS="2"             \
-          -DWarpX_MPI=ON               \
-          -DWarpX_COMPUTE=OMP          \
-          -DWarpX_PSATD=ON             \
-          -DWarpX_QED=ON               \
-          -DWarpX_QED_TABLE_GEN=ON     \
-          -DWarpX_OPENPMD=ON           \
-          -DWarpX_PRECISION=SINGLE     \
+        cmake -S . -B build_clang_tidy_2D \
+          -DCMAKE_VERBOSE_MAKEFILE=ON     \
+          -DWarpX_DIMS="2"                \
+          -DWarpX_MPI=ON                  \
+          -DWarpX_COMPUTE=OMP             \
+          -DWarpX_PSATD=ON                \
+          -DWarpX_QED=ON                  \
+          -DWarpX_QED_TABLE_GEN=ON        \
+          -DWarpX_OPENPMD=ON              \
+          -DWarpX_PRECISION=SINGLE        \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-        cmake --build build_clang_tidy -j 4
+        cmake --build build_clang_tidy_2D -j 4
 
         ${{github.workspace}}/.github/workflows/source/makeMakefileForClangTidy.py --input ${{github.workspace}}/ccache.log.txt
         make -j4 --keep-going -f clang-tidy-ccache-misses.mak \
diff --git a/.github/workflows/clang_tidy_3D.yml b/.github/workflows/clang_tidy_3D.yml
index d0fb9ab62dd..b994b62431f 100644
--- a/.github/workflows/clang_tidy_3D.yml
+++ b/.github/workflows/clang_tidy_3D.yml
@@ -1,4 +1,4 @@
-name: 🧹 clang-tidy
+name: 🧹 clang-tidy-3D
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   run_clang_tidy:
-    name: clang-tidy
+    name: clang-tidy-3D
     runs-on: ubuntu-22.04
     if: github.event.pull_request.draft == false
     steps:
@@ -35,19 +35,19 @@ jobs:
         export CXX=$(which clang++-15)
         export CC=$(which clang-15)
 
-        cmake -S . -B build_clang_tidy \
-          -DCMAKE_VERBOSE_MAKEFILE=ON  \
-          -DWarpX_DIMS="3"             \
-          -DWarpX_MPI=ON               \
-          -DWarpX_COMPUTE=OMP          \
-          -DWarpX_PSATD=ON             \
-          -DWarpX_QED=ON               \
-          -DWarpX_QED_TABLE_GEN=ON     \
-          -DWarpX_OPENPMD=ON           \
-          -DWarpX_PRECISION=SINGLE     \
+        cmake -S . -B build_clang_tidy_3D \
+          -DCMAKE_VERBOSE_MAKEFILE=ON     \
+          -DWarpX_DIMS="3"                \
+          -DWarpX_MPI=ON                  \
+          -DWarpX_COMPUTE=OMP             \
+          -DWarpX_PSATD=ON                \
+          -DWarpX_QED=ON                  \
+          -DWarpX_QED_TABLE_GEN=ON        \
+          -DWarpX_OPENPMD=ON              \
+          -DWarpX_PRECISION=SINGLE        \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-        cmake --build build_clang_tidy -j 4
+        cmake --build build_clang_tidy_3D -j 4
 
         ${{github.workspace}}/.github/workflows/source/makeMakefileForClangTidy.py --input ${{github.workspace}}/ccache.log.txt
         make -j4 --keep-going -f clang-tidy-ccache-misses.mak \
diff --git a/.github/workflows/clang_tidy_RZ.yml b/.github/workflows/clang_tidy_RZ.yml
index e97c6a15ca4..b2a57460532 100644
--- a/.github/workflows/clang_tidy_RZ.yml
+++ b/.github/workflows/clang_tidy_RZ.yml
@@ -1,4 +1,4 @@
-name: 🧹 clang-tidy
+name: 🧹 clang-tidy-RZ
 
 on: [push, pull_request]
 
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   run_clang_tidy:
-    name: clang-tidy
+    name: clang-tidy-RZ
     runs-on: ubuntu-22.04
     if: github.event.pull_request.draft == false
     steps:
@@ -35,19 +35,19 @@ jobs:
         export CXX=$(which clang++-15)
         export CC=$(which clang-15)
 
-        cmake -S . -B build_clang_tidy \
-          -DCMAKE_VERBOSE_MAKEFILE=ON  \
-          -DWarpX_DIMS="RZ"            \
-          -DWarpX_MPI=ON               \
-          -DWarpX_COMPUTE=OMP          \
-          -DWarpX_PSATD=ON             \
-          -DWarpX_QED=ON               \
-          -DWarpX_QED_TABLE_GEN=ON     \
-          -DWarpX_OPENPMD=ON           \
-          -DWarpX_PRECISION=SINGLE     \
+        cmake -S . -B build_clang_tidy_RZ \
+          -DCMAKE_VERBOSE_MAKEFILE=ON     \
+          -DWarpX_DIMS="RZ"               \
+          -DWarpX_MPI=ON                  \
+          -DWarpX_COMPUTE=OMP             \
+          -DWarpX_PSATD=ON                \
+          -DWarpX_QED=ON                  \
+          -DWarpX_QED_TABLE_GEN=ON        \
+          -DWarpX_OPENPMD=ON              \
+          -DWarpX_PRECISION=SINGLE        \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
-        cmake --build build_clang_tidy -j 4
+        cmake --build build_clang_tidy_RZ -j 4
 
         ${{github.workspace}}/.github/workflows/source/makeMakefileForClangTidy.py --input ${{github.workspace}}/ccache.log.txt
         make -j4 --keep-going -f clang-tidy-ccache-misses.mak \