diff --git a/include/pybind11/detail/descr.h b/include/pybind11/detail/descr.h
index fca4a60d6..eb0b2b501 100644
--- a/include/pybind11/detail/descr.h
+++ b/include/pybind11/detail/descr.h
@@ -122,7 +122,7 @@ struct int_to_str : int_to_str<Rem / 10, Rem % 10, Digits...> {};
 template <size_t... Digits>
 struct int_to_str<0, Digits...> {
     // WARNING: This only works with C++17 or higher.
-    // src_loc not tracked (irrelevant in this situation, at least at the moment).
+    // src_loc not tracked (not needed in this situation, at least at the moment).
     static constexpr auto digits
         = descr<sizeof...(Digits)>(src_loc{nullptr, 0}, ('0' + Digits)...);
 };
@@ -150,7 +150,7 @@ constexpr enable_if_t<!B, T2> const_name(const T1 &, const T2 &d) {
 
 template <size_t Size>
 auto constexpr const_name() -> remove_cv_t<decltype(int_to_str<Size / 10, Size % 10>::digits)> {
-    // src_loc not tracked (irrelevant in this situation, at least at the moment).
+    // src_loc not tracked (not needed in this situation, at least at the moment).
     return int_to_str<Size / 10, Size % 10>::digits;
 }
 
@@ -190,7 +190,7 @@ constexpr enable_if_t<!B, T2> _(const T1 &d1, const T2 &d2) {
 
 template <size_t Size>
 auto constexpr _() -> remove_cv_t<decltype(int_to_str<Size / 10, Size % 10>::digits)> {
-    // src_loc not tracked (irrelevant in this situation, at least at the moment).
+    // src_loc not tracked (not needed in this situation, at least at the moment).
     return const_name<Size>();
 }
 template <typename Type>
diff --git a/include/pybind11/detail/type_caster_odr_guard.h b/include/pybind11/detail/type_caster_odr_guard.h
index 4d36b3f0d..327193bfc 100644
--- a/include/pybind11/detail/type_caster_odr_guard.h
+++ b/include/pybind11/detail/type_caster_odr_guard.h
@@ -58,8 +58,8 @@ inline std::string source_file_line_basename(const char *sfl) {
     return std::string(sfl + i_base);
 }
 
-#    ifndef PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED
-#        define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED false
+#    ifndef PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_THROW_DISABLED
+#        define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_THROW_DISABLED false
 #    endif
 
 inline void type_caster_odr_guard_impl(const std::type_info &intrinsic_type_info,
@@ -129,7 +129,7 @@ tu_local_no_data_always_false
     = []() {
           type_caster_odr_guard_impl(typeid(IntrinsicType),
                                      TypeCasterType::name.sloc,
-                                     PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED);
+                                     PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_THROW_DISABLED);
           return tu_local_no_data_always_false();
       }();
 
diff --git a/tests/test_type_caster_odr_guard_1.cpp b/tests/test_type_caster_odr_guard_1.cpp
index 2deaf1754..908ccc0f4 100644
--- a/tests/test_type_caster_odr_guard_1.cpp
+++ b/tests/test_type_caster_odr_guard_1.cpp
@@ -1,4 +1,4 @@
-#define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED true
+#define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_THROW_DISABLED true
 #include "pybind11_tests.h"
 
 // For test of real-world issue.
diff --git a/tests/test_type_caster_odr_guard_2.cpp b/tests/test_type_caster_odr_guard_2.cpp
index e255f2a23..e0d5054df 100644
--- a/tests/test_type_caster_odr_guard_2.cpp
+++ b/tests/test_type_caster_odr_guard_2.cpp
@@ -1,4 +1,4 @@
-#define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_IMPL_THROW_DISABLED true
+#define PYBIND11_DETAIL_TYPE_CASTER_ODR_GUARD_THROW_DISABLED true
 #include "pybind11_tests.h"
 
 // For test of real-world issue.