diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cfb36c8c32e18d..66ed5b5d3d284e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -187,13 +187,13 @@ jobs:
     if: needs.check_source.outputs.run_tests == 'true'
     uses: ./.github/workflows/reusable-windows.yml
 
-  build_windows_free_threaded:
-    name: 'Windows (free-threaded)'
+  build_windows_free_threading:
+    name: 'Windows (free-threading)'
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     uses: ./.github/workflows/reusable-windows.yml
     with:
-      free-threaded: true
+      free-threading: true
 
   build_macos:
     name: 'macOS'
@@ -203,14 +203,14 @@ jobs:
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
 
-  build_macos_free_threaded:
-    name: 'macOS (free-threaded)'
+  build_macos_free_threading:
+    name: 'macOS (free-threading)'
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     uses: ./.github/workflows/reusable-macos.yml
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
-      free-threaded: true
+      free-threading: true
 
   build_ubuntu:
     name: 'Ubuntu'
@@ -225,8 +225,8 @@ jobs:
           --with-pydebug \
           --with-openssl=$OPENSSL_DIR
 
-  build_ubuntu_free_threaded:
-    name: 'Ubuntu (free-threaded)'
+  build_ubuntu_free_threading:
+    name: 'Ubuntu (free-threading)'
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
     uses: ./.github/workflows/reusable-ubuntu.yml
@@ -504,12 +504,12 @@ jobs:
     - check-docs
     - check_generated_files
     - build_macos
-    - build_macos_free_threaded
+    - build_macos_free_threading
     - build_ubuntu
-    - build_ubuntu_free_threaded
+    - build_ubuntu_free_threading
     - build_ubuntu_ssltests
     - build_windows
-    - build_windows_free_threaded
+    - build_windows_free_threading
     - test_hypothesis
     - build_asan
     - cifuzz
@@ -537,12 +537,12 @@ jobs:
             && '
             check_generated_files,
             build_macos,
-            build_macos_free_threaded,
+            build_macos_free_threading,
             build_ubuntu,
-            build_ubuntu_free_threaded,
+            build_ubuntu_free_threading,
             build_ubuntu_ssltests,
             build_windows,
-            build_windows_free_threaded,
+            build_windows_free_threading,
             build_asan,
             '
             || ''
diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
index 22f46d18e1b43a..c24b6e963ddfd6 100644
--- a/.github/workflows/reusable-macos.yml
+++ b/.github/workflows/reusable-macos.yml
@@ -4,7 +4,7 @@ on:
       config_hash:
         required: true
         type: string
-      free-threaded:
+      free-threading:
         required: false
         type: boolean
         default: false
@@ -35,7 +35,7 @@ jobs:
         ./configure \
           --config-cache \
           --with-pydebug \
-          ${{ inputs.free-threaded && '--disable-gil' || '' }} \
+          ${{ inputs.free-threading && '--disable-gil' || '' }} \
           --prefix=/opt/python-dev \
           --with-openssl="$(brew --prefix openssl@3.0)"
     - name: Build CPython
diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
index 47a3c10d2ca4c1..ae27c108d8368c 100644
--- a/.github/workflows/reusable-windows.yml
+++ b/.github/workflows/reusable-windows.yml
@@ -1,7 +1,7 @@
 on:
   workflow_call:
     inputs:
-      free-threaded:
+      free-threading:
         required: false
         type: boolean
         default: false
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Build CPython
-      run: .\PCbuild\build.bat -e -d -v -p Win32 ${{ inputs.free-threaded && '--disable-gil' || '' }}
+      run: .\PCbuild\build.bat -e -d -v -p Win32 ${{ inputs.free-threading && '--disable-gil' || '' }}
     - name: Display build info
       run: .\python.bat -m test.pythoninfo
     - name: Tests
@@ -33,7 +33,7 @@ jobs:
     - name: Register MSVC problem matcher
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"
     - name: Build CPython
-      run: .\PCbuild\build.bat -e -d -v -p x64 ${{ inputs.free-threaded && '--disable-gil' || '' }}
+      run: .\PCbuild\build.bat -e -d -v -p x64 ${{ inputs.free-threading && '--disable-gil' || '' }}
     - name: Display build info
       run: .\python.bat -m test.pythoninfo
     - name: Tests
@@ -50,4 +50,4 @@ jobs:
     - name: Register MSVC problem matcher
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"
     - name: Build CPython
-      run: .\PCbuild\build.bat -e -d -v -p arm64 ${{ inputs.free-threaded && '--disable-gil' || '' }}
+      run: .\PCbuild\build.bat -e -d -v -p arm64 ${{ inputs.free-threading && '--disable-gil' || '' }}