The 'barrier' namespace is only referred to in the two places Niels listed: 'test_adl_barrier.cpp' tests that boost::swap isn't ambiguous when called on types declared in namespace boost - so we can rename it 'boost_type_ambiguity.cpp', or something similar. The comment inside the test file can be altered accordingly as well. 'swap.html' contains the phrase ''for the idea to use a barrier namespace, enabling the function to have the name 'swap' without introducing ambiguity or infinite recursion". We can just replace that with ''for the idea to make boost::swap less specialized than std::swap, thereby allowing the function to have the name 'swap' without introducing ambiguity." If nobody objects to the phrasing, I'll make the change later today. Joe.