diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53f77f1a..c7b41ea6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - toolset: gcc-12
+          - toolset: gcc-12 # Do not remove! It is the only toolset that tests misc/strip_boost_namespace.sh
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-22.04
             cxxflags: "cxxflags=--coverage -fsanitize=address,leak,undefined -fno-sanitize-recover=undefined"
@@ -94,7 +94,7 @@ jobs:
           dist/bin/inspect libs/$LIBRARY
 
       - name: Test boost namespace stripping
-        if: ${{matrix.toolset == 'gcc-9'}}
+        if: ${{matrix.toolset == 'gcc-12'}}
         run: ../boost-root/libs/$LIBRARY/misc/strip_boost_namespace.sh
 
       - name: Prepare coverage data
diff --git a/include/boost/pfr/core_name.hpp b/include/boost/pfr/core_name.hpp
index 21123110..e5feb557 100644
--- a/include/boost/pfr/core_name.hpp
+++ b/include/boost/pfr/core_name.hpp
@@ -46,7 +46,7 @@ constexpr auto names_as_array() noexcept {
 }
 
 
-}}
+}} // namespace boost::pfr
 
 #endif // BOOST_PFR_CORE_NAME_HPP 
 
diff --git a/include/boost/pfr/detail/core_name14_disabled.hpp b/include/boost/pfr/detail/core_name14_disabled.hpp
index 40cf5ce5..b9271e50 100644
--- a/include/boost/pfr/detail/core_name14_disabled.hpp
+++ b/include/boost/pfr/detail/core_name14_disabled.hpp
@@ -43,7 +43,7 @@ constexpr auto tie_as_names_tuple() noexcept {
     return detail::make_sequence_tuple(); 
 }
 
-}}}
+}}} // namespace boost::pfr::detail
 
 #endif // BOOST_PFR_DETAIL_CORE_NAME14_DISABLED_HPP
 
diff --git a/include/boost/pfr/detail/core_name20_static.hpp b/include/boost/pfr/detail/core_name20_static.hpp
index 4a061ad2..2fd5b0d5 100644
--- a/include/boost/pfr/detail/core_name20_static.hpp
+++ b/include/boost/pfr/detail/core_name20_static.hpp
@@ -88,7 +88,7 @@ constexpr auto tie_as_names_tuple() noexcept {
     return tie_as_names_tuple_impl<T>(detail::make_index_sequence<detail::fields_count<T>()>{});
 }
 
-}}}
+}}} // namespace boost::pfr::detail
 
 #endif // BOOST_PFR_DETAIL_CORE_NAME20_STATIC_HPP
 
diff --git a/include/boost/pfr/detail/stdarray.hpp b/include/boost/pfr/detail/stdarray.hpp
index 01e860be..3c09eed9 100644
--- a/include/boost/pfr/detail/stdarray.hpp
+++ b/include/boost/pfr/detail/stdarray.hpp
@@ -29,7 +29,7 @@ constexpr auto make_stdarray_from_tietuple(const T& t, std::index_sequence<I...>
     );
 }
 
-}}}
+}}} // namespace boost::pfr::detail
 
 #endif // BOOST_PFR_DETAIL_STDARRAY_HPP
 
diff --git a/misc/strip_boost_namespace.sh b/misc/strip_boost_namespace.sh
index 9134ca17..28cc3a0b 100755
--- a/misc/strip_boost_namespace.sh
+++ b/misc/strip_boost_namespace.sh
@@ -39,20 +39,26 @@ find ${TARGET_PATH}/doc -type f | xargs sed -i 's|Boost.PFR|PFR|g'
 sed -i  's|# \[Boost.PFR\](https://boost.org/libs/pfr)|# [PFR](https://apolukhin.github.io/pfr_non_boost/)|g' ${TARGET_PATH}/README.md
 
 echo -n "***** Testing: "
-if g++-9 -std=c++17 -DPFR_USE_LOOPHOLE=0 -DPFR_USE_CPP17=1 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/motivating_example0.cpp && ./a.out > /dev/null; then
+if g++-12 -std=c++2a -DPFR_USE_LOOPHOLE=0 -DPFR_USE_CPP17=1 -DPFR_ENABLE_GETTING_NAMES=1 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/motivating_example0.cpp && ./a.out > /dev/null; then
     echo -n "OK"
 else
     echo -n "FAIL"
     exit 2
 fi
-if g++-9 -std=c++17 -DPFR_USE_LOOPHOLE=1 -DPFR_USE_CPP17=0 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/motivating_example0.cpp && ./a.out > /dev/null; then
+if g++-12 -std=c++2a -DPFR_USE_LOOPHOLE=0 -DPFR_USE_CPP17=1 -DPFR_ENABLE_GETTING_NAMES=0 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/motivating_example0.cpp && ./a.out > /dev/null; then
+    echo -n "OK"
+else
+    echo -n "FAIL"
+    exit 2
+fi
+if g++-12 -std=c++2a -DPFR_USE_LOOPHOLE=1 -DPFR_USE_CPP17=0 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/motivating_example0.cpp && ./a.out > /dev/null; then
     echo -n ", OK"
 else
     echo -n ", FAIL"
     exit 3
 fi
 
-if g++-9 -std=c++17 -DPFR_USE_LOOPHOLE=0 -DPFR_USE_CPP17=0 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/get.cpp && ./a.out > /dev/null; then
+if g++-12 -std=c++2a -DPFR_USE_LOOPHOLE=0 -DPFR_USE_CPP17=0 -I ${TARGET_PATH}/include/ ${TARGET_PATH}/example/get.cpp && ./a.out > /dev/null; then
     echo -e ", OK"
 else
     echo -e ", FAIL"