diff --git a/include/yorel/yomm2/core.hpp b/include/yorel/yomm2/core.hpp
index 9e58597a..9092e5d9 100644
--- a/include/yorel/yomm2/core.hpp
+++ b/include/yorel/yomm2/core.hpp
@@ -143,8 +143,6 @@ struct requires_dynamic_cast_ref_aux<
     B, D, std::void_t<decltype(static_cast<D>(std::declval<B>()))>>
     : std::false_type {};
 
-} // namespace detail
-
 template<class B, class D>
 constexpr bool requires_dynamic_cast =
     detail::requires_dynamic_cast_ref_aux<B, D>::value;
@@ -158,6 +156,8 @@ auto optimal_cast(B&& obj) -> decltype(auto) {
     }
 }
 
+} // namespace detail
+
 // =============================================================================
 // virtual_traits
 
@@ -174,7 +174,7 @@ struct virtual_traits<Policy, T&> {
 
     template<typename D>
     static auto cast(T& obj) -> D& {
-        return optimal_cast<Policy, D&>(obj);
+        return detail::optimal_cast<Policy, D&>(obj);
     }
 };
 
@@ -188,7 +188,7 @@ struct virtual_traits<Policy, T&&> {
 
     template<typename D>
     static auto cast(T&& obj) -> D&& {
-        return optimal_cast<Policy, D&&>(obj);
+        return detail::optimal_cast<Policy, D&&>(obj);
     }
 };
 
@@ -463,7 +463,7 @@ class virtual_ptr {
                 virtual_ptr_traits<Class, Policy>::template cast<Other>(obj);
         } else {
             result.obj =
-                &optimal_cast<Policy, typename Other::element_type&>(*obj);
+                &detail::optimal_cast<Policy, typename Other::element_type&>(*obj);
         }
 
         return result;
@@ -528,11 +528,11 @@ template<class Policy, typename P, typename Q>
 using select_spec_polymorphic_type =
     typename select_spec_polymorphic_type_aux<Policy, P, Q>::type;
 
-template<class Policy, typename MethodArgList, typename SpecArgList>
+template<class Policy, typename MethodParameters, typename OverriderParameters>
 using spec_polymorphic_types = boost::mp11::mp_remove<
     boost::mp11::mp_transform_q<
         boost::mp11::mp_bind_front<select_spec_polymorphic_type, Policy>,
-        MethodArgList, SpecArgList>,
+        MethodParameters, OverriderParameters>,
     void>;
 
 template<class Container, typename = void>
diff --git a/include/yorel/yomm2/virtual_shared_ptr.hpp b/include/yorel/yomm2/virtual_shared_ptr.hpp
index 7082cbb5..1cdbeeea 100644
--- a/include/yorel/yomm2/virtual_shared_ptr.hpp
+++ b/include/yorel/yomm2/virtual_shared_ptr.hpp
@@ -50,7 +50,7 @@ struct virtual_traits<Policy, const std::shared_ptr<T>&> {
     static auto cast(const std::shared_ptr<T>& obj) {
         check_cast<DERIVED>();
 
-        if constexpr (requires_dynamic_cast<T*, DERIVED>) {
+        if constexpr (detail::requires_dynamic_cast<T*, DERIVED>) {
             return std::dynamic_pointer_cast<
                 typename shared_ptr_traits<DERIVED>::polymorphic_type>(obj);
         } else {
@@ -82,7 +82,7 @@ struct virtual_traits<Policy, std::shared_ptr<T>> {
     static auto cast(const std::shared_ptr<T>& obj) {
         check_cast<DERIVED>();
 
-        if constexpr (requires_dynamic_cast<T*, DERIVED>) {
+        if constexpr (detail::requires_dynamic_cast<T*, DERIVED>) {
             return std::dynamic_pointer_cast<
                 typename shared_ptr_traits<DERIVED>::polymorphic_type>(obj);
         } else {
@@ -102,7 +102,7 @@ struct virtual_ptr_traits<std::shared_ptr<Class>, Policy> {
         using OtherPtr = typename std::remove_reference_t<OtherPtrRef>;
         using OtherClass = typename OtherPtr::box_type::element_type;
 
-        if constexpr (requires_dynamic_cast<Class&, OtherClass&>) {
+        if constexpr (detail::requires_dynamic_cast<Class&, OtherClass&>) {
             return std::dynamic_pointer_cast<OtherClass>(ptr);
         } else {
             return std::static_pointer_cast<OtherClass>(ptr);