diff --git a/CMakeLists.txt b/CMakeLists.txt
index acefc10196..9357f31fbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,10 +142,10 @@ set(PYBIND11_HEADERS
     include/pybind11/cast.h
     include/pybind11/chrono.h
     include/pybind11/common.h
-    include/pybind11/compat/pybind11_conduit_v1.h
-    include/pybind11/compat/pybind11_platform_abi_id.h
-    include/pybind11/compat/wrap_include_python_h.h
     include/pybind11/complex.h
+    include/pybind11/conduit/pybind11_conduit_v1.h
+    include/pybind11/conduit/pybind11_platform_abi_id.h
+    include/pybind11/conduit/wrap_include_python_h.h
     include/pybind11/options.h
     include/pybind11/eigen.h
     include/pybind11/eigen/common.h
diff --git a/include/pybind11/compat/README.txt b/include/pybind11/conduit/README.txt
similarity index 100%
rename from include/pybind11/compat/README.txt
rename to include/pybind11/conduit/README.txt
diff --git a/include/pybind11/compat/pybind11_conduit_v1.h b/include/pybind11/conduit/pybind11_conduit_v1.h
similarity index 100%
rename from include/pybind11/compat/pybind11_conduit_v1.h
rename to include/pybind11/conduit/pybind11_conduit_v1.h
diff --git a/include/pybind11/compat/pybind11_platform_abi_id.h b/include/pybind11/conduit/pybind11_platform_abi_id.h
similarity index 100%
rename from include/pybind11/compat/pybind11_platform_abi_id.h
rename to include/pybind11/conduit/pybind11_platform_abi_id.h
diff --git a/include/pybind11/compat/wrap_include_python_h.h b/include/pybind11/conduit/wrap_include_python_h.h
similarity index 100%
rename from include/pybind11/compat/wrap_include_python_h.h
rename to include/pybind11/conduit/wrap_include_python_h.h
diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h
index 2f97279158..310c3c3947 100644
--- a/include/pybind11/detail/common.h
+++ b/include/pybind11/detail/common.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <pybind11/compat/wrap_include_python_h.h>
+#include <pybind11/conduit/wrap_include_python_h.h>
 #if PY_VERSION_HEX < 0x03080000
 #    error "PYTHON < 3.8 IS UNSUPPORTED. pybind11 v2.13 was the last to support Python 3.7."
 #endif
diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h
index bb101a725a..278f35bbaa 100644
--- a/include/pybind11/detail/internals.h
+++ b/include/pybind11/detail/internals.h
@@ -15,7 +15,7 @@
 #    include <pybind11/gil.h>
 #endif
 
-#include <pybind11/compat/pybind11_platform_abi_id.h>
+#include <pybind11/conduit/pybind11_platform_abi_id.h>
 #include <pybind11/pytypes.h>
 
 #include <exception>
diff --git a/tests/exo_planet_c_api.cpp b/tests/exo_planet_c_api.cpp
index d37d6bb8fc..1510107175 100644
--- a/tests/exo_planet_c_api.cpp
+++ b/tests/exo_planet_c_api.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // THIS MUST STAY AT THE TOP!
-#include <pybind11/compat/pybind11_conduit_v1.h> // VERY light-weight dependency.
+#include <pybind11/conduit/pybind11_conduit_v1.h> // VERY light-weight dependency.
 
 #include "test_cpp_conduit_traveler_types.h"
 
diff --git a/tests/extra_python_package/test_files.py b/tests/extra_python_package/test_files.py
index d926c9fe33..977db75c63 100644
--- a/tests/extra_python_package/test_files.py
+++ b/tests/extra_python_package/test_files.py
@@ -50,11 +50,11 @@
     "include/pybind11/warnings.h",
 }
 
-compat_headers = {
-    "include/pybind11/compat/README.txt",
-    "include/pybind11/compat/pybind11_conduit_v1.h",
-    "include/pybind11/compat/pybind11_platform_abi_id.h",
-    "include/pybind11/compat/wrap_include_python_h.h",
+conduit_headers = {
+    "include/pybind11/conduit/README.txt",
+    "include/pybind11/conduit/pybind11_conduit_v1.h",
+    "include/pybind11/conduit/pybind11_platform_abi_id.h",
+    "include/pybind11/conduit/wrap_include_python_h.h",
 }
 
 detail_headers = {
@@ -104,7 +104,7 @@
     "setup_helpers.py",
 }
 
-headers = main_headers | compat_headers | detail_headers | eigen_headers | stl_headers
+headers = main_headers | conduit_headers | detail_headers | eigen_headers | stl_headers
 src_files = headers | cmake_files | pkgconfig_files
 all_files = src_files | py_files
 
@@ -113,7 +113,7 @@
     "pybind11",
     "pybind11/include",
     "pybind11/include/pybind11",
-    "pybind11/include/pybind11/compat",
+    "pybind11/include/pybind11/conduit",
     "pybind11/include/pybind11/detail",
     "pybind11/include/pybind11/eigen",
     "pybind11/include/pybind11/stl",
diff --git a/tools/setup_global.py.in b/tools/setup_global.py.in
index 2c88c7dea8..99b8a2b29e 100644
--- a/tools/setup_global.py.in
+++ b/tools/setup_global.py.in
@@ -26,14 +26,14 @@ class InstallHeadersNested(install_headers):
 
 
 main_headers = glob.glob("pybind11/include/pybind11/*.h")
-compat_headers = sum([glob.glob(f"pybind11/include/pybind11/compat/*.{ext}")
-                      for ext in ("h", "txt")], [])
+conduit_headers = sum([glob.glob(f"pybind11/include/pybind11/conduit/*.{ext}")
+                       for ext in ("h", "txt")], [])
 detail_headers = glob.glob("pybind11/include/pybind11/detail/*.h")
 eigen_headers = glob.glob("pybind11/include/pybind11/eigen/*.h")
 stl_headers = glob.glob("pybind11/include/pybind11/stl/*.h")
 cmake_files = glob.glob("pybind11/share/cmake/pybind11/*.cmake")
 pkgconfig_files = glob.glob("pybind11/share/pkgconfig/*.pc")
-headers = main_headers + compat_headers + detail_headers + eigen_headers + stl_headers
+headers = main_headers + conduit_headers + detail_headers + eigen_headers + stl_headers
 
 cmdclass = {"install_headers": InstallHeadersNested}
 $extra_cmd
@@ -57,7 +57,7 @@ setup(
         (base + "share/cmake/pybind11", cmake_files),
         (base + "share/pkgconfig", pkgconfig_files),
         (base + "include/pybind11", main_headers),
-        (base + "include/pybind11/compat", compat_headers),
+        (base + "include/pybind11/conduit", conduit_headers),
         (base + "include/pybind11/detail", detail_headers),
         (base + "include/pybind11/eigen", eigen_headers),
         (base + "include/pybind11/stl", stl_headers),
diff --git a/tools/setup_main.py.in b/tools/setup_main.py.in
index 446812947b..eb7b84ed6a 100644
--- a/tools/setup_main.py.in
+++ b/tools/setup_main.py.in
@@ -14,7 +14,7 @@ setup(
     packages=[
         "pybind11",
         "pybind11.include.pybind11",
-        "pybind11.include.pybind11.compat",
+        "pybind11.include.pybind11.conduit",
         "pybind11.include.pybind11.detail",
         "pybind11.include.pybind11.eigen",
         "pybind11.include.pybind11.stl",
@@ -24,7 +24,7 @@ setup(
     package_data={
         "pybind11": ["py.typed"],
         "pybind11.include.pybind11": ["*.h"],
-        "pybind11.include.pybind11.compat": ["*.h", "*.txt"],
+        "pybind11.include.pybind11.conduit": ["*.h", "*.txt"],
         "pybind11.include.pybind11.detail": ["*.h"],
         "pybind11.include.pybind11.eigen": ["*.h"],
         "pybind11.include.pybind11.stl": ["*.h"],