From 5e11f978edb440183b510ee5ead717a03d6fcc6a Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 12 Sep 2007 23:06:27 +0000 Subject: [PATCH] *: Change namespace pb_ds to __gnu_pbds. 2007-09-12 Benjamin Kosnik * include/ext/pb_ds/*: Change namespace pb_ds to __gnu_pbds. * docs/html/ext/pb_ds/*: Same. * testsuite/ext/pb_ds/*: Same. * testsuite/performance/ext/pb_ds/*: Same. * testsuite/util/*: Same. From-SVN: r128448 --- libstdc++-v3/ChangeLog | 8 + libstdc++-v3/docs/html/ext/pb_ds/ds_gen.html | 2 +- .../docs/html/ext/pb_ds/pq_design.html | 8 +- .../pb_ds/string_trie_e_access_traits.html | 2 +- .../pb_ds/trie_prefix_search_node_update.html | 2 +- .../include/ext/pb_ds/assoc_container.hpp | 6 +- .../basic_tree_policy_base.hpp | 4 +- .../basic_tree_policy/null_node_metadata.hpp | 4 +- .../pb_ds/detail/basic_tree_policy/traits.hpp | 4 +- .../include/ext/pb_ds/detail/basic_types.hpp | 4 +- .../bin_search_tree_/bin_search_tree_.hpp | 4 +- .../bin_search_tree_/node_iterators.hpp | 4 +- .../bin_search_tree_/point_iterators.hpp | 4 +- .../pb_ds/detail/bin_search_tree_/traits.hpp | 8 +- .../detail/binary_heap_/binary_heap_.hpp | 6 +- .../detail/binary_heap_/const_iterator.hpp | 4 +- .../binary_heap_/const_point_iterator.hpp | 4 +- .../pb_ds/detail/binary_heap_/entry_cmp.hpp | 4 +- .../pb_ds/detail/binary_heap_/entry_pred.hpp | 4 +- .../detail/binary_heap_/resize_policy.hpp | 4 +- .../detail/binomial_heap_/binomial_heap_.hpp | 4 +- .../binomial_heap_base_.hpp | 4 +- .../detail/cc_hash_table_map_/cc_ht_map_.hpp | 6 +- .../cond_key_dtor_entry_dealtor.hpp | 4 +- .../include/ext/pb_ds/detail/cond_dealtor.hpp | 4 +- .../pb_ds/detail/container_base_dispatch.hpp | 4 +- .../ext/pb_ds/detail/debug_map_base.hpp | 4 +- .../ext/pb_ds/detail/eq_fn/eq_by_less.hpp | 4 +- .../ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp | 4 +- .../detail/gp_hash_table_map_/gp_ht_map_.hpp | 6 +- .../gp_hash_table_map_/standard_policies.hpp | 10 +- .../hash_fn/mask_based_range_hashing.hpp | 4 +- .../hash_fn/mod_based_range_hashing.hpp | 4 +- .../pb_ds/detail/hash_fn/probe_fn_base.hpp | 4 +- .../pb_ds/detail/hash_fn/ranged_hash_fn.hpp | 4 +- .../pb_ds/detail/hash_fn/ranged_probe_fn.hpp | 4 +- .../const_iterator.hpp | 4 +- .../const_point_iterator.hpp | 4 +- .../left_child_next_sibling_heap_.hpp | 4 +- .../left_child_next_sibling_heap_/node.hpp | 4 +- .../null_metadata.hpp | 4 +- .../list_update_map_/entry_metadata_base.hpp | 4 +- .../pb_ds/detail/list_update_map_/lu_map_.hpp | 4 +- .../counter_lu_metadata.hpp | 4 +- .../detail/ov_tree_map_/node_iterators.hpp | 4 +- .../detail/ov_tree_map_/ov_tree_map_.hpp | 4 +- .../ext/pb_ds/detail/ov_tree_map_/traits.hpp | 8 +- .../detail/pairing_heap_/pairing_heap_.hpp | 4 +- .../ext/pb_ds/detail/pat_trie_/head.hpp | 4 +- .../pb_ds/detail/pat_trie_/internal_node.hpp | 4 +- .../ext/pb_ds/detail/pat_trie_/leaf.hpp | 4 +- .../ext/pb_ds/detail/pat_trie_/node_base.hpp | 4 +- .../pb_ds/detail/pat_trie_/node_iterators.hpp | 4 +- .../detail/pat_trie_/node_metadata_base.hpp | 4 +- .../ext/pb_ds/detail/pat_trie_/pat_trie_.hpp | 4 +- .../detail/pat_trie_/point_iterators.hpp | 4 +- .../pb_ds/detail/pat_trie_/rotate_fn_imps.hpp | 4 +- .../pat_trie_/synth_e_access_traits.hpp | 4 +- .../ext/pb_ds/detail/pat_trie_/traits.hpp | 12 +- .../detail/priority_queue_base_dispatch.hpp | 4 +- .../ext/pb_ds/detail/rb_tree_map_/node.hpp | 4 +- .../pb_ds/detail/rb_tree_map_/rb_tree_.hpp | 4 +- .../ext/pb_ds/detail/rb_tree_map_/traits.hpp | 4 +- .../ext/pb_ds/detail/rc_binomial_heap_/rc.hpp | 4 +- .../rc_binomial_heap_/rc_binomial_heap_.hpp | 4 +- ...sh_load_check_resize_trigger_size_base.hpp | 4 +- .../resize_policy/sample_resize_trigger.hpp | 2 +- .../ext/pb_ds/detail/splay_tree_/node.hpp | 4 +- .../pb_ds/detail/splay_tree_/splay_tree_.hpp | 4 +- .../ext/pb_ds/detail/splay_tree_/traits.hpp | 4 +- .../ext/pb_ds/detail/standard_policies.hpp | 26 +-- .../pb_ds/detail/thin_heap_/thin_heap_.hpp | 4 +- .../tree_policy/node_metadata_selector.hpp | 4 +- .../ext/pb_ds/detail/tree_trace_base.hpp | 4 +- .../trie_policy/node_metadata_selector.hpp | 4 +- .../detail/trie_policy/trie_policy_base.hpp | 4 +- .../include/ext/pb_ds/detail/type_utils.hpp | 6 +- .../include/ext/pb_ds/detail/types_traits.hpp | 4 +- libstdc++-v3/include/ext/pb_ds/exception.hpp | 6 +- .../include/ext/pb_ds/hash_policy.hpp | 4 +- .../include/ext/pb_ds/list_update_policy.hpp | 4 +- .../include/ext/pb_ds/priority_queue.hpp | 4 +- .../include/ext/pb_ds/tag_and_trait.hpp | 6 +- .../include/ext/pb_ds/tree_policy.hpp | 4 +- .../include/ext/pb_ds/trie_policy.hpp | 4 +- .../pb_ds/example/assoc_container_traits.cc | 3 +- .../testsuite/ext/pb_ds/example/basic_map.cc | 3 +- .../ext/pb_ds/example/basic_multimap.cc | 2 +- .../ext/pb_ds/example/basic_multiset.cc | 2 +- .../ext/pb_ds/example/basic_priority_queue.cc | 13 +- .../testsuite/ext/pb_ds/example/basic_set.cc | 3 +- .../testsuite/ext/pb_ds/example/erase_if.cc | 3 +- .../ext/pb_ds/example/hash_find_neg.cc | 2 +- .../ext/pb_ds/example/hash_illegal_resize.cc | 4 +- .../ext/pb_ds/example/hash_initial_size.cc | 2 +- .../ext/pb_ds/example/hash_load_set_change.cc | 2 +- .../testsuite/ext/pb_ds/example/hash_mod.cc | 2 +- .../ext/pb_ds/example/hash_resize.cc | 2 +- .../ext/pb_ds/example/hash_resize_neg.cc | 2 +- .../ext/pb_ds/example/hash_shift_mask.cc | 2 +- .../priority_queue_container_traits.cc | 13 +- .../pb_ds/example/priority_queue_dijkstra.cc | 5 +- .../pb_ds/example/priority_queue_erase_if.cc | 5 +- .../example/priority_queue_split_join.cc | 7 +- .../ext/pb_ds/example/priority_queue_xref.cc | 5 +- .../ext/pb_ds/example/ranged_hash.cc | 3 +- .../testsuite/ext/pb_ds/example/store_hash.cc | 2 +- .../ext/pb_ds/example/tree_intervals.cc | 3 +- .../testsuite/ext/pb_ds/example/tree_join.cc | 15 +- .../pb_ds/example/tree_order_statistics.cc | 3 +- .../example/tree_order_statistics_join.cc | 12 +- .../testsuite/ext/pb_ds/example/trie_dna.cc | 2 +- .../ext/pb_ds/example/trie_prefix_search.cc | 3 +- .../testsuite/ext/pb_ds/example/trie_split.cc | 2 +- .../regression/associative_containers.cc | 2 +- .../pb_ds/regression/hash_data_map_rand.cc | 2 +- .../pb_ds/regression/hash_no_data_map_rand.cc | 2 +- .../regression/list_update_data_map_rand.cc | 2 +- .../list_update_no_data_map_rand.cc | 2 +- .../pb_ds/regression/priority_queue_rand.cc | 2 +- .../ext/pb_ds/regression/priority_queues.cc | 24 +-- .../pb_ds/regression/tree_data_map_rand.cc | 2 +- .../pb_ds/regression/tree_no_data_map_rand.cc | 2 +- .../pb_ds/regression/trie_data_map_rand.cc | 2 +- .../pb_ds/regression/trie_no_data_map_rand.cc | 2 +- .../pb_ds/hash_random_int_erase_mem_usage.cc | 4 +- .../pb_ds/hash_zlob_random_int_find_timing.cc | 2 +- .../ext/pb_ds/multimap_text_find_timing.hpp | 2 +- .../pb_ds/multimap_text_insert_mem_usage.hpp | 2 +- .../ext/pb_ds/multimap_text_insert_timing.hpp | 2 +- ...iority_queue_random_int_push_pop_timing.cc | 2 +- .../priority_queue_random_int_push_timing.cc | 2 +- .../pb_ds/priority_queue_text_join_timing.cc | 2 +- .../priority_queue_text_modify_timing.hpp | 2 +- .../priority_queue_text_pop_mem_usage.cc | 2 +- .../priority_queue_text_push_pop_timing.cc | 2 +- .../pb_ds/priority_queue_text_push_timing.cc | 2 +- .../ext/pb_ds/random_int_find_timing.cc | 2 +- .../pb_ds/random_int_subscript_find_timing.cc | 2 +- .../random_int_subscript_insert_timing.cc | 2 +- .../performance/ext/pb_ds/text_find_timing.cc | 2 +- .../ext/pb_ds/tree_order_statistics_timing.cc | 4 +- .../ext/pb_ds/tree_split_join_timing.cc | 4 +- .../ext/pb_ds/tree_text_insert_timing.cc | 2 +- .../ext/pb_ds/tree_text_lor_find_timing.cc | 2 +- .../util/common_type/assoc/common_type.hpp | 180 +++++++++--------- .../assoc/detail/comb_hash_fn_string_form.hpp | 4 +- .../assoc/detail/ds_string_form.hpp | 18 +- .../detail/list_update_policy_string_form.hpp | 4 +- .../assoc/detail/probe_fn_string_form.hpp | 6 +- .../detail/resize_policy_string_form.hpp | 6 +- .../assoc/detail/size_policy_string_form.hpp | 8 +- .../assoc/detail/store_hash_string_form.hpp | 4 +- .../detail/tree_supports_order_statistics.hpp | 8 +- .../detail/trie_supports_order_statistics.hpp | 8 +- .../detail/trie_supports_prefix_search.hpp | 8 +- .../detail/trigger_policy_string_form.hpp | 8 +- .../util/common_type/assoc/native_set.hpp | 4 +- .../util/common_type/assoc/string_form.hpp | 8 +- .../common_type/assoc/template_policy.hpp | 34 ++-- .../priority_queue/common_type.hpp | 14 +- .../priority_queue/detail/ds_string_form.hpp | 14 +- .../priority_queue/string_form.hpp | 4 +- .../testsuite/util/hash_fn/dna_str_limit.hpp | 4 +- .../util/hash_fn/limit_string_hash_fn.hpp | 4 +- .../testsuite/util/hash_fn/string_hash_fn.hpp | 4 +- .../util/hash_fn/string_ranged_hash_fn.hpp | 4 +- .../util/hash_fn/string_ranged_probe_fn.hpp | 4 +- .../testsuite/util/io/illegal_input_error.hpp | 4 +- libstdc++-v3/testsuite/util/io/prog_bar.cc | 4 +- libstdc++-v3/testsuite/util/io/prog_bar.hpp | 4 +- .../testsuite/util/io/text_populate.hpp | 12 +- .../util/io/verified_cmd_line_input.cc | 4 +- .../util/io/verified_cmd_line_input.hpp | 4 +- libstdc++-v3/testsuite/util/io/xml.hpp | 4 +- .../testsuite/util/io/xml_test_formatter.hpp | 4 +- .../native_type/assoc/native_hash_map.hpp | 6 +- .../assoc/native_hash_multimap.hpp | 6 +- .../native_type/assoc/native_hash_set.hpp | 6 +- .../native_type/assoc/native_hash_tag.hpp | 4 +- .../util/native_type/assoc/native_map.hpp | 4 +- .../native_type/assoc/native_multimap.hpp | 4 +- .../util/native_type/assoc/native_set.hpp | 4 +- .../native_type/assoc/native_tree_tag.hpp | 4 +- .../priority_queue/native_priority_queue.hpp | 4 +- .../assoc/mem_usage/erase_test.hpp | 4 +- .../assoc/mem_usage/multimap_insert_test.hpp | 14 +- .../assoc/multimap_common_type.hpp | 22 +-- .../performance/assoc/timing/common_type.hpp | 20 +- .../performance/assoc/timing/find_test.hpp | 10 +- .../performance/assoc/timing/insert_test.hpp | 10 +- .../assoc/timing/multimap_find_test.hpp | 16 +- .../assoc/timing/multimap_insert_test.hpp | 10 +- .../assoc/timing/subscript_find_test.hpp | 10 +- .../assoc/timing/subscript_insert_test.hpp | 10 +- .../timing/tree_order_statistics_test.hpp | 16 +- .../assoc/timing/tree_split_join_test.hpp | 10 +- .../util/performance/io/xml_formatter.hpp | 4 +- .../priority_queue/mem_usage/pop_test.hpp | 4 +- .../priority_queue/timing/join_test.hpp | 12 +- .../priority_queue/timing/modify_test.hpp | 14 +- .../priority_queue/timing/push_pop_test.hpp | 10 +- .../priority_queue/timing/push_test.hpp | 10 +- .../util/performance/time/elapsed_timer.cc | 4 +- .../util/performance/time/elapsed_timer.hpp | 4 +- .../performance/time/timing_test_base.hpp | 6 +- .../util/regression/assoc/common_type.hpp | 16 +- .../testsuite/util/regression/basic_type.hpp | 4 +- .../regression/priority_queue/common_type.hpp | 4 +- .../assoc/container_rand_regression_test.hpp | 108 +++++------ .../rand/assoc/detail/cmp_fn_imps.hpp | 48 ++--- .../detail/constructor_destructor_fn_imps.hpp | 10 +- .../rand/assoc/detail/defs_fn_imps.hpp | 24 +-- .../rand/assoc/detail/erase_fn_imps.hpp | 16 +- .../assoc/detail/get_set_load_fn_imps.hpp | 6 +- .../assoc/detail/get_set_loads_fn_imps.hpp | 6 +- .../rand/assoc/detail/insert_fn_imps.hpp | 2 +- .../assoc/detail/it_conversion_fn_imps.hpp | 12 +- .../assoc/detail/policy_access_fn_imps.hpp | 16 +- .../rand/assoc/detail/resize_fn_imps.hpp | 6 +- .../rand/assoc/detail/split_join_fn_imps.hpp | 6 +- .../rand/assoc/detail/subscript_fn_imps.hpp | 10 +- .../rand/assoc/rand_regression_test.hpp | 6 +- .../rand/io/assoc/xml_formatter.hpp | 4 +- .../rand/io/priority_queue/xml_formatter.hpp | 4 +- .../util/regression/rand/io/xml_formatter.hpp | 4 +- .../container_rand_regression_test.hpp | 4 +- .../detail/split_join_fn_imps.hpp | 2 +- .../priority_queue/rand_regression_test.hpp | 6 +- .../trait/assoc/get_set_load_trait.hpp | 8 +- .../trait/assoc/get_set_loads_trait.hpp | 8 +- .../trait/assoc/native_type_trait.hpp | 6 +- .../trait/assoc/node_update_trait.hpp | 12 +- .../regression/trait/assoc/resize_trait.hpp | 8 +- .../util/regression/trait/assoc/to_string.hpp | 4 +- .../util/regression/trait/assoc/trait.hpp | 4 +- .../regression/trait/assoc/type_trait.hpp | 6 +- .../util/regression/trait/erase_if_fn.hpp | 4 +- .../regression/trait/priority_queue/trait.hpp | 6 +- .../testsuite/util/rng/twister_rand_gen.cc | 4 +- .../testsuite/util/rng/twister_rand_gen.hpp | 4 +- .../util/statistic/result_recorder.hpp | 4 +- .../testsuite/util/statistic/sample_mean.hpp | 4 +- .../sample_mean_confidence_checker.hpp | 4 +- .../util/statistic/sample_variance.hpp | 4 +- 245 files changed, 837 insertions(+), 854 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 37a7f5d1951..364648561c7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2007-09-12 Benjamin Kosnik + + * include/ext/pb_ds/*: Change namespace pb_ds to __gnu_pbds. + * docs/html/ext/pb_ds/*: Same. + * testsuite/ext/pb_ds/*: Same. + * testsuite/performance/ext/pb_ds/*: Same. + * testsuite/util/*: Same. + 2007-09-12 Benjamin Kosnik * include/parallel/find.h: Doxygen fixups. diff --git a/libstdc++-v3/docs/html/ext/pb_ds/ds_gen.html b/libstdc++-v3/docs/html/ext/pb_ds/ds_gen.html index 5c3eea6a423..ec99c4d5f7e 100644 --- a/libstdc++-v3/docs/html/ext/pb_ds/ds_gen.html +++ b/libstdc++-v3/docs/html/ext/pb_ds/ds_gen.html @@ -167,7 +167,7 @@ of some_op_sequence:

Additionally, a traits mechanism can be used to query a container type for its attributes. Given any container Cntnr, then pb_ds::container_traits<Cntnr> + "assoc_container_traits.html">__gnu_pbds::container_traits<Cntnr> is a traits class identifying the properties of the container.

diff --git a/libstdc++-v3/docs/html/ext/pb_ds/pq_design.html b/libstdc++-v3/docs/html/ext/pb_ds/pq_design.html index f33d963a9ad..95956004527 100644 --- a/libstdc++-v3/docs/html/ext/pb_ds/pq_design.html +++ b/libstdc++-v3/docs/html/ext/pb_ds/pq_design.html @@ -67,13 +67,13 @@

As mentioned in Tutorial::Priority Queues, pb_ds::priority_queue + "priority_queue.html">__gnu_pbds::priority_queue shares most of the same interface with std::priority_queue. E.g. if q is a priority queue of type Q, then q.top() will return the "largest" value in the container (according to typename Q::cmp_fn). pb_ds::priority_queue + "priority_queue.html">__gnu_pbds::priority_queue has a larger (and very slightly different) interface than std::priority_queue, however, since typically push and pop are deemed insufficient for @@ -309,7 +309,7 @@ assert(p.top() == 3);

Tags and traits are very useful for manipulating generic types. pb_ds::priority_queue + "priority_queue.html">__gnu_pbds::priority_queue publicly defines container_category as one of the tags discussed in Implementations. Given any container Cntnr, the tag of the underlying @@ -327,7 +327,7 @@ assert(p.top() == 3);

Additionally, a traits mechanism can be used to query a container type for its attributes. Given any container Cntnr, then pb_ds::container_traits<Cntnr> + "assoc_container_traits.html">__gnu_pbds::container_traits<Cntnr> is a traits class identifying the properties of the container.

diff --git a/libstdc++-v3/docs/html/ext/pb_ds/string_trie_e_access_traits.html b/libstdc++-v3/docs/html/ext/pb_ds/string_trie_e_access_traits.html index 58a8be62269..10fa2af1c9d 100644 --- a/libstdc++-v3/docs/html/ext/pb_ds/string_trie_e_access_traits.html +++ b/libstdc++-v3/docs/html/ext/pb_ds/string_trie_e_access_traits.html @@ -241,7 +241,7 @@ std::allocator<char> 
-typename pb_ds::detail::__conditional_type<
+typename __gnu_pbds::detail::__conditional_type<
     Reverse,
     typename String::const_reverse_iterator,
diff --git a/libstdc++-v3/docs/html/ext/pb_ds/trie_prefix_search_node_update.html b/libstdc++-v3/docs/html/ext/pb_ds/trie_prefix_search_node_update.html
index e3d5e273042..da6efa2f18f 100644
--- a/libstdc++-v3/docs/html/ext/pb_ds/trie_prefix_search_node_update.html
+++ b/libstdc++-v3/docs/html/ext/pb_ds/trie_prefix_search_node_update.html
@@ -269,7 +269,7 @@ The instantiating container's const key reference type.
 
         
           
-pb_ds::detail::null_node_metadata
+__gnu_pbds::detail::null_node_metadata
 

         
 
diff --git a/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp b/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
index 271cc7600f1..e2ac37c11cc 100644
--- a/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/assoc_container.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 #define PB_DS_BASE_C_DEC \
   detail::container_base_dispatch::type
@@ -495,7 +495,7 @@ namespace pb_ds
   template,
 	   typename Tag = rb_tree_tag,
 	   template
-  class Node_Update = pb_ds::null_tree_node_update,
+  class Node_Update = __gnu_pbds::null_tree_node_update,
 	   typename Allocator = std::allocator >
   class tree : public PB_DS_BASE_C_DEC
   {
@@ -684,6 +684,6 @@ namespace pb_ds
 
 #undef PB_DS_BASE_C_DEC
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
index d396d7d5da5..7c136057cba 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_TREE_LIKE_POLICY_BASE_HPP
 #define PB_DS_TREE_LIKE_POLICY_BASE_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -174,6 +174,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TREE_LIKE_POLICY_BASE_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
index 23991987097..88d1ba699f8 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -68,6 +68,6 @@ namespace pb_ds
     struct null_node_metadata
     { };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/traits.hpp
index c574bc09aa4..3a0b57d8404 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/basic_tree_policy/traits.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {    
@@ -81,7 +81,7 @@ namespace pb_ds
     struct trie_traits;
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #include 
 #include 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/basic_types.hpp b/libstdc++-v3/include/ext/pb_ds/detail/basic_types.hpp
index 69288ce5ec5..01d43e50f8b 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/basic_types.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/basic_types.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -211,7 +211,7 @@ namespace pb_ds
       typedef integral_constant::value> indicator;
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
index 2bf69ba0068..6e46cedbbe9 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
@@ -60,7 +60,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -500,4 +500,4 @@ namespace pb_ds
 #undef PB_DS_V2S
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
index ce1cd22b011..1df092378d1 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -237,7 +237,7 @@ namespace pb_ds
 #undef PB_DS_TREE_NODE_ITERATOR_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_BIN_SEARCH_TREE_NODE_ITERATORS_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
index 275177e10e0..a6e79b33a9e 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -382,6 +382,6 @@ namespace pb_ds
 #undef PB_DS_TREE_ODIR_IT_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
index 4c57608cc56..dc7c232563b 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -156,7 +156,7 @@ namespace pb_ds
       node_update;
 
       typedef
-      pb_ds::null_tree_node_update<
+      __gnu_pbds::null_tree_node_update<
 	const_node_iterator,
 	node_iterator,
 	Cmp_Fn,
@@ -242,7 +242,7 @@ namespace pb_ds
       node_update;
 
       typedef
-      pb_ds::null_tree_node_update<
+      __gnu_pbds::null_tree_node_update<
 	const_node_iterator,
 	node_iterator,
 	Cmp_Fn,
@@ -251,6 +251,6 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_BIN_SEARCH_TREE_NODE_AND_IT_TRAITS_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
index b32479b99d1..cf10195d28c 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
@@ -67,7 +67,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -81,7 +81,7 @@ namespace pb_ds
     entry_cmp::value, Allocator>::type
 
 #define PB_DS_RESIZE_POLICY_DEC	\
-    pb_ds::detail::resize_policy
+    __gnu_pbds::detail::resize_policy
 
     /**
      * class description = "Base class for some types of h3ap$">
@@ -358,6 +358,6 @@ namespace pb_ds
 #undef PB_DS_RESIZE_POLICY_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
index 12b96e766ba..79f36c009df 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -153,6 +153,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 #undef PB_DS_BASE_C_DEC
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
index 3a50cd6c4b1..b2b6760a50a 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -145,6 +145,6 @@ namespace pb_ds
       entry_pointer m_p_e;
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
index c98dae75cab..afde1cd4601 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_BINARY_HEAP_ENTRY_CMP_HPP
 #define PB_DS_BINARY_HEAP_ENTRY_CMP_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -94,6 +94,6 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_BINARY_HEAP_ENTRY_CMP_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_pred.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
index 25102f2c1ad..408e8559ec9 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_BINARY_HEAP_ENTRY_PRED_HPP
 #define PB_DS_BINARY_HEAP_ENTRY_PRED_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -94,6 +94,6 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_BINARY_HEAP_ENTRY_PRED_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/resize_policy.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
index c6021a99804..17aeb64f1f1 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -254,6 +254,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
 } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
index c6f361d936c..8f1826ef164 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -119,4 +119,4 @@ namespace pb_ds
 
 #undef PB_DS_BASE_C_DEC
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
index 09af8cfffd7..acd1c3cf4dc 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
@@ -59,7 +59,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -235,6 +235,6 @@ namespace pb_ds
 
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
index 5636cdc1243..3a772fa1df8 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
@@ -60,7 +60,7 @@
 #endif 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -609,7 +609,7 @@ namespace pb_ds
       enum
 	{
 	  store_hash_ok = !Store_Hash 
-	                  || !is_same::value
+	                  || !is_same::value
 	};
 
       PB_DS_STATIC_ASSERT(sth, store_hash_ok);
@@ -638,5 +638,5 @@ namespace pb_ds
 #undef PB_DS_V2S
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
index bf5e0bd4710..a4bcc4b81fd 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
@@ -44,7 +44,7 @@
  * Contains a conditional key destructor, used for exception handling.
  */
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -119,5 +119,5 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/cond_dealtor.hpp b/libstdc++-v3/include/ext/pb_ds/detail/cond_dealtor.hpp
index 3cf9ea91fa3..eba0f39307c 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/cond_dealtor.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/cond_dealtor.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_COND_DEALTOR_HPP
 #define PB_DS_COND_DEALTOR_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace detail
@@ -125,7 +125,7 @@ namespace pb_ds
 
   } // namespace detail
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_COND_DEALTOR_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/container_base_dispatch.hpp b/libstdc++-v3/include/ext/pb_ds/detail/container_base_dispatch.hpp
index 37db003fd75..cbc51433318 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/container_base_dispatch.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/container_base_dispatch.hpp
@@ -105,7 +105,7 @@
 #include 
 #undef PB_DS_DATA_FALSE_INDICATOR
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace detail
 {
@@ -333,6 +333,6 @@ namespace detail
 				 at3t::value, at4t, at5t, at2t>	type;
   };
 } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp
index 373b0f6c78e..086a50fc5fd 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/debug_map_base.hpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -357,7 +357,7 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
 } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/eq_by_less.hpp b/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
index 6e37b544039..467b01e1eca 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -69,6 +69,6 @@ namespace pb_ds
       }
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_EQ_BY_LESS_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp b/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
index 8218ea47ab5..706ee5ea24b 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -180,6 +180,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
index 88f250162ad..8da31e70e8a 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
@@ -58,7 +58,7 @@
 #endif
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -651,7 +651,7 @@ namespace pb_ds
       enum
 	{
 	  store_hash_ok = !Store_Hash 
-	                  || !is_same::value
+	                  || !is_same::value
 	};
 
       PB_DS_STATIC_ASSERT(sth, store_hash_ok);
@@ -679,5 +679,5 @@ namespace pb_ds
 #undef PB_DS_V2S
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
index f4bf7c6e472..cc67e92a062 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -66,15 +66,15 @@ namespace pb_ds
       typedef
       typename __conditional_type<
       is_same<
-      pb_ds::direct_mask_range_hashing,
+      __gnu_pbds::direct_mask_range_hashing,
       Comb_Probe_Fn>::value,
-      pb_ds::linear_probe_fn,
-      pb_ds::quadratic_probe_fn >::__type
+      __gnu_pbds::linear_probe_fn,
+      __gnu_pbds::quadratic_probe_fn >::__type
       type;
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
index 4aa1894bade..60d5c39991b 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_MASK_BASED_RANGE_HASHING_HPP
 #define PB_DS_MASK_BASED_RANGE_HASHING_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -108,6 +108,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
index 2d5e8d6ef55..ea04f5f6dcc 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_MOD_BASED_RANGE_HASHING_HPP
 #define PB_DS_MOD_BASED_RANGE_HASHING_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace detail
@@ -109,6 +109,6 @@ namespace pb_ds
 
   } // namespace detail
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_MOD_BASED_RANGE_HASHING_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
index e72a47ef825..4deb23b16ff 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -60,6 +60,6 @@ namespace pb_ds
       ~probe_fn_base() { }
     };
 } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
index 179e59358fc..b54f92d89ef 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -360,6 +360,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
index b665dbf36f8..c094026a7d5 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -327,7 +327,7 @@ namespace pb_ds
       { comb_probe_fn_base::swap(other); }
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
index cff9bb808dd..1d0a685143e 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -163,6 +163,6 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
index ea45b624ac1..c6ca2f0c72b 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -155,6 +155,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
index e06358d2f22..196ae3010ca 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
@@ -62,7 +62,7 @@
 #endif 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -350,6 +350,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_T_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
index e3460add5ee..2239683d67c 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -124,6 +124,6 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NODE_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
index 1716fd1aa64..290745e533d 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -58,6 +58,6 @@ namespace pb_ds
     { };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_NULL_METADATA_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
index 7d711a21d71..e2085a91b41 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_LU_MAP_ENTRY_METADATA_BASE_HPP
 #define PB_DS_LU_MAP_ENTRY_METADATA_BASE_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -61,6 +61,6 @@ namespace pb_ds
     struct lu_map_entry_metadata_base
     { };  
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
index f39baa0f39d..267beccceaf 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
@@ -59,7 +59,7 @@
 #endif 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -362,4 +362,4 @@ namespace pb_ds
 #undef PB_DS_V2S
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp b/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
index e02c6fbfe49..bbb539c0b50 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
@@ -44,7 +44,7 @@
  * Contains implementation of a lu counter policy's metadata.
  */
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -89,4 +89,4 @@ namespace pb_ds
       }
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
index c63f6b0d910..5b9f9a873aa 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -293,6 +293,6 @@ namespace pb_ds
 #undef PB_DS_OV_TREE_CONST_NODE_ITERATOR_C_DEC
 
 } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
index 78fdcf96c24..421a6bea617 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
@@ -60,7 +60,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -525,4 +525,4 @@ namespace pb_ds
 #undef PB_DS_CONST_NODE_ITERATOR_NAME
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/traits.hpp
index 182c0c8d393..92ff70d7c61 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/ov_tree_map_/traits.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -113,7 +113,7 @@ namespace pb_ds
       node_update;
 
       typedef
-      pb_ds::null_tree_node_update<
+      __gnu_pbds::null_tree_node_update<
 	const_node_iterator,
 	node_iterator,
 	Cmp_Fn,
@@ -174,7 +174,7 @@ namespace pb_ds
       node_update;
 
       typedef
-      pb_ds::null_tree_node_update<
+      __gnu_pbds::null_tree_node_update<
 	const_node_iterator,
 	node_iterator,
 	Cmp_Fn,
@@ -183,7 +183,7 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_OV_TREE_NODE_AND_IT_TRAITS_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
index 64754749796..6d3790653a4 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
@@ -57,7 +57,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -219,4 +219,4 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/head.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/head.hpp
index e8bee527350..13c1b5ddf6e 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/head.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/head.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -124,7 +124,7 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp
index 902c9b7ca53..67a612dd58a 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/internal_node.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -600,6 +600,6 @@ namespace pb_ds
 #undef PB_DS_LEAF_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/leaf.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/leaf.hpp
index 08f3761deda..310d78950a4 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/leaf.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/leaf.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -172,6 +172,6 @@ namespace pb_ds
 #undef PB_DS_PAT_TRIE_SUBTREE_DEBUG_INFO_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_base.hpp
index 753e66b28a5..4c71d015396 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_base.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -129,6 +129,6 @@ namespace pb_ds
 #undef PB_DS_PAT_TRIE_SUBTREE_DEBUG_INFO_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
index 9c8a40c4fdc..b5b273aaffd 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -338,7 +338,7 @@ namespace pb_ds
 #undef PB_DS_PAT_TRIE_NODE_ITERATOR_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
index 5434ff9d408..427ae03dd1e 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -86,7 +86,7 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_PAT_TRIE_NODE_BASE_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
index 386f91557db..00a00d34bce 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
@@ -71,7 +71,7 @@
 #endif 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -518,4 +518,4 @@ namespace pb_ds
 #undef PB_DS_V2S
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
index 1a42dc562f2..8554f260dc6 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -484,7 +484,7 @@ namespace pb_ds
 #undef PB_DS_ODIR_IT_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
index 84e6fddc088..f979e32f572 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
@@ -119,7 +119,7 @@ rotate_parent(node_pointer p_nd)
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-apply_update(node_pointer /*p_nd*/, pb_ds::null_node_update*  /*p_update*/)
+apply_update(node_pointer /*p_nd*/, __gnu_pbds::null_node_update*  /*p_update*/)
 { }
 
 PB_DS_CLASS_T_DEC
@@ -151,6 +151,6 @@ update_to_top(node_pointer p_nd, Node_Update_* p_update)
 PB_DS_CLASS_T_DEC
 inline void
 PB_DS_CLASS_C_DEC::
-update_to_top(node_pointer /*p_nd*/, pb_ds::null_node_update*  /*p_update*/)
+update_to_top(node_pointer /*p_nd*/, __gnu_pbds::null_node_update*  /*p_update*/)
 { }
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
index 79cd72cba2b..46e8ffa9552 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -230,6 +230,6 @@ namespace pb_ds
 #undef PB_DS_SYNTH_E_ACCESS_TRAITS_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/traits.hpp
index 59aa3098268..c29f814fe55 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/pat_trie_/traits.hpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -93,7 +93,7 @@ namespace pb_ds
       typedef E_Access_Traits e_access_traits;
 
       typedef
-      pb_ds::detail::synth_e_access_traits<
+      __gnu_pbds::detail::synth_e_access_traits<
 	type_traits,
 	false,
 	e_access_traits>
@@ -208,7 +208,7 @@ namespace pb_ds
       node_update;
 
       typedef
-      pb_ds::null_trie_node_update<
+      __gnu_pbds::null_trie_node_update<
 	const_node_iterator,
 	node_iterator,
 	E_Access_Traits,
@@ -254,7 +254,7 @@ namespace pb_ds
       typedef E_Access_Traits e_access_traits;
 
       typedef
-      pb_ds::detail::synth_e_access_traits<
+      __gnu_pbds::detail::synth_e_access_traits<
 	type_traits,
 	true,
 	e_access_traits>
@@ -341,7 +341,7 @@ namespace pb_ds
       node_update;
 
       typedef
-      pb_ds::null_trie_node_update<
+      __gnu_pbds::null_trie_node_update<
 	const_node_iterator,
 	const_node_iterator,
 	E_Access_Traits,
@@ -350,7 +350,7 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_PAT_TRIE_NODE_AND_IT_TRAITS_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/priority_queue_base_dispatch.hpp b/libstdc++-v3/include/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
index 67a705213d5..576e8657091 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
     namespace detail
     {
@@ -92,6 +92,6 @@ namespace pb_ds
       };
 
     } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_PRIORITY_QUEUE_BASE_DS_DISPATCHER_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/node.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/node.hpp
index 164f965a551..9797516a504 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/node.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/node.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -139,6 +139,6 @@ namespace pb_ds
       bool m_red;
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
index d08b2db69ae..b5d50a92ae8 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
@@ -69,7 +69,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -282,5 +282,5 @@ namespace pb_ds
 #undef PB_DS_V2S
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/traits.hpp
index 67570d84204..2f91669d752 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/rb_tree_map_/traits.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -125,6 +125,6 @@ namespace pb_ds
     { };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
index dc7869ca7a7..fc90ea7dea2 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_RC_HPP
 #define PB_DS_RC_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -263,6 +263,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
 } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
index 42417ed82fe..5b4a3b4122f 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -201,4 +201,4 @@ namespace pb_ds
 
 #undef PB_DS_RC_C_DEC
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
index 436de797d6f..f69690bb21d 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_HASH_LOAD_CHECK_RESIZE_TRIGGER_SIZE_BASE_HPP
 #define PB_DS_HASH_LOAD_CHECK_RESIZE_TRIGGER_SIZE_BASE_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -95,6 +95,6 @@ namespace pb_ds
       set_size(size_type size) { }
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
index db07fbbc7e0..19e54a7ab5b 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
@@ -140,6 +140,6 @@ private:
   do_resize(size_type new_size);
 };
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/node.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/node.hpp
index d23e9317323..29519d598aa 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/node.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/node.hpp
@@ -47,7 +47,7 @@
 #ifndef PB_DS_SPLAY_TREE_NODE_HPP
 #define PB_DS_SPLAY_TREE_NODE_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -126,6 +126,6 @@ namespace pb_ds
       bool m_special;
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
index bf905255333..1642abb068f 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
@@ -93,7 +93,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -300,5 +300,5 @@ namespace pb_ds
 #undef PB_DS_EP2VP
 #undef PB_DS_V2S
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/traits.hpp
index a758ef9ddba..0755963a36c 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/splay_tree_/traits.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -114,6 +114,6 @@ namespace pb_ds
     { };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_SPLAY_TREE_NODE_AND_IT_TRAITS_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/standard_policies.hpp b/libstdc++-v3/include/ext/pb_ds/detail/standard_policies.hpp
index 000e3a475de..bbd91c38d23 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/standard_policies.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/standard_policies.hpp
@@ -56,7 +56,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -79,7 +79,7 @@ namespace pb_ds
 
     struct default_comb_hash_fn
     {
-      typedef pb_ds::direct_mask_range_hashing<> type;
+      typedef __gnu_pbds::direct_mask_range_hashing<> type;
     };
 
     template
@@ -91,19 +91,19 @@ namespace pb_ds
       typedef
       typename __conditional_type<
 	is_same<
-	pb_ds::direct_mask_range_hashing<
+	__gnu_pbds::direct_mask_range_hashing<
 	size_type>,
 	Comb_Hash_Fn>::value,
-	pb_ds::hash_exponential_size_policy<
+	__gnu_pbds::hash_exponential_size_policy<
 	size_type>,
-	pb_ds::hash_prime_size_policy>::__type
+	__gnu_pbds::hash_prime_size_policy>::__type
       size_policy_type;
 
     public:
       typedef
-      pb_ds::hash_standard_resize_policy<
+      __gnu_pbds::hash_standard_resize_policy<
       size_policy_type,
-      pb_ds::hash_load_check_resize_trigger<
+      __gnu_pbds::hash_load_check_resize_trigger<
       false,
       size_type>,
       false,
@@ -113,7 +113,7 @@ namespace pb_ds
 
     struct default_update_policy
     {
-      typedef pb_ds::move_to_front_lu_policy<> type;
+      typedef __gnu_pbds::move_to_front_lu_policy<> type;
     };
 
     template
@@ -126,11 +126,11 @@ namespace pb_ds
       typedef
       typename __conditional_type<
       is_same<
-      pb_ds::direct_mask_range_hashing,
+      __gnu_pbds::direct_mask_range_hashing,
       Comb_Probe_Fn>::value,
-      pb_ds::linear_probe_fn<
+      __gnu_pbds::linear_probe_fn<
       size_type>,
-      pb_ds::quadratic_probe_fn<
+      __gnu_pbds::quadratic_probe_fn<
       size_type> >::__type
       type;
     };
@@ -147,7 +147,7 @@ namespace pb_ds
       char> > >
     {
       typedef
-      pb_ds::string_trie_e_access_traits<
+      __gnu_pbds::string_trie_e_access_traits<
 	std::basic_string<
 	Char,
 	Char_Traits,
@@ -157,7 +157,7 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_STANDARD_POLICIES_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
index 6d1f4ba9ca8..ee874e823be 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
@@ -59,7 +59,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -352,6 +352,6 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp b/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
index 3fd7dc9ac88..cbb57144e06 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -117,6 +117,6 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TREE_NODE_METADATA_SELECTOR_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/tree_trace_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/tree_trace_base.hpp
index 791f2fc6f2d..049a9c57527 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/tree_trace_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/tree_trace_base.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace detail
@@ -207,7 +207,7 @@ namespace pb_ds
 
   } // namespace detail
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifdef PB_DS_TREE_TRACE
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
index ed9e1aac6e0..ed724e191e2 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -117,6 +117,6 @@ namespace pb_ds
     };
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TRIE_NODE_METADATA_SELECTOR_HPP
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
index a8506ce6815..2a1319a4629 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -249,7 +249,7 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TRIE_POLICY_BASE_HPP
 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp b/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp
index 197b17efb6b..f57e8d6109c 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/type_utils.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -158,7 +158,7 @@ namespace pb_ds
     };
 
 #define PB_DS_STATIC_ASSERT(UNIQUE, E)  \
-    typedef pb_ds::detail::__static_assert_dumclass)> UNIQUE##__static_assert_type
+    typedef __gnu_pbds::detail::__static_assert_dumclass)> UNIQUE##__static_assert_type
 
 #endif
 
@@ -168,6 +168,6 @@ namespace pb_ds
       typedef Type type;
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/detail/types_traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/types_traits.hpp
index 089ca062f27..e493315508e 100644
--- a/libstdc++-v3/include/ext/pb_ds/detail/types_traits.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/types_traits.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace detail
   {
@@ -83,6 +83,6 @@ namespace pb_ds
       no_throw_copies 	m_no_throw_copies_indicator;
     };
   } // namespace detail
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/exception.hpp b/libstdc++-v3/include/ext/pb_ds/exception.hpp
index 379623d2d54..77d3f2d6927 100644
--- a/libstdc++-v3/include/ext/pb_ds/exception.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/exception.hpp
@@ -50,13 +50,13 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // Base class for exceptions.
   struct container_error : public std::logic_error
   {
     container_error() 
-    : std::logic_error(__N("pb_ds::container_error")) { }
+    : std::logic_error(__N("__gnu_pbds::container_error")) { }
   };
 
   // An entry cannot be inserted into a container object for logical
@@ -104,6 +104,6 @@ namespace pb_ds
   __throw_resize_error(void)
   { std::abort(); }
 #endif
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp b/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp
index c17d97831f8..d1833c17398 100644
--- a/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/hash_policy.hpp
@@ -56,7 +56,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // A null hash function, indicating that the combining hash function
   // is actually a ranged hash function.
@@ -605,6 +605,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_T_DEC
 #undef PB_DS_CLASS_C_DEC
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp b/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp
index 876ea3e2f38..5a63a3e16dc 100644
--- a/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // A null type that means that each link in a list-based container
   // does not actually need metadata.
@@ -137,6 +137,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_T_DEC
 #undef PB_DS_CLASS_C_DEC
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp b/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
index c6373c5d1c9..90ffafffefa 100644
--- a/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/priority_queue.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // A priority queue.
   template
 
 /**
- * @namespace pb_ds
+ * @namespace __gnu_pbds
  * @brief GNU extension policy-based data structures for public use.
  */
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // A trivial iterator tag. Signifies that the iterators has none of
   // the STL's movement abilities.
@@ -357,6 +357,6 @@ namespace pb_ds
 	reverse_iteration = base_type::reverse_iteration
       };
   };
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp b/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp
index 3c80fc6986a..dedabec5c48 100644
--- a/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/tree_policy.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // A null node updator, indicating that no node updates are required.
   template
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   // A null node updator, indicating that no node updates are required.
   template
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 template
 void
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_map.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_map.cc
index cc3bbe3c352..3caacb78f52 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_map.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_map.cc
@@ -55,8 +55,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // The following function performs a sequence of operations on an
 // associative container object mapping integers to characters.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc
index 77390809bb2..a48860597f6 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multimap.cc
@@ -56,7 +56,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor.
 // hash could serve instead of this functor, but it is not yet
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multiset.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multiset.cc
index 9b5d0aa069d..064e24d3610 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multiset.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_multiset.cc
@@ -61,7 +61,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple priority queue that also supports an "contains" query.
 class contains_pq
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_priority_queue.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_priority_queue.cc
index cc7641c2405..beedd0e7a88 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_priority_queue.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_priority_queue.cc
@@ -55,8 +55,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // The following function performs a sequence of operations on a
 // priority queue object storing integers.
@@ -94,35 +93,35 @@ int main()
   {
     // Perform operations on a pairing-heap queue.
     cout << "Pairing heap" << endl;
-    pb_ds::priority_queue, pairing_heap_tag> c;
+    __gnu_pbds::priority_queue, pairing_heap_tag> c;
     some_op_sequence(c);
   }
 
   {
     // Perform operations on a binomial-heap queue.
     cout << "Binomial heap" << endl;
-    pb_ds::priority_queue, binomial_heap_tag> c;
+    __gnu_pbds::priority_queue, binomial_heap_tag> c;
     some_op_sequence(c);
   }
 
   {
     // Perform operations on a binomial-heap queue.
     cout << "Redundant-counter binomial heap" << endl;
-    pb_ds::priority_queue, rc_binomial_heap_tag> c;
+    __gnu_pbds::priority_queue, rc_binomial_heap_tag> c;
     some_op_sequence(c);
   }
 
   {
     // Perform operations on a binomial-heap queue.
     cout << "Binary heap" << endl;
-    pb_ds::priority_queue, binary_heap_tag> c;
+    __gnu_pbds::priority_queue, binary_heap_tag> c;
     some_op_sequence(c);
   }
 
   {
     // Perform operations on a thin-heap queue.
     cout << "Thin heap" << endl;
-    pb_ds::priority_queue, thin_heap_tag> c;
+    __gnu_pbds::priority_queue, thin_heap_tag> c;
     some_op_sequence(c);
   }
 
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_set.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_set.cc
index 733dca311d0..12a9ad2af1a 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/basic_set.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/basic_set.cc
@@ -56,8 +56,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // The following function performs a sequence of operations on an
 // associative container object storing integers.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc
index 9142bd48377..b13dd0736ff 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/erase_if.cc
@@ -54,8 +54,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // The following functor takes a map's value-type object and returns
 // whether its key is between two numbers.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_find_neg.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_find_neg.cc
index a38c7fb6b3f..c77e6e0a141 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_find_neg.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_find_neg.cc
@@ -55,7 +55,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc
index 9b3e7747488..1518a0932ae 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_illegal_resize.cc
@@ -57,7 +57,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor.
 // hash could serve instead of this functor, but it is not yet
@@ -115,7 +115,7 @@ int main()
     {
       g.resize(200);
     }
-  catch(pb_ds::resize_error& )
+  catch(__gnu_pbds::resize_error& )
     {
       ex_thrown = true;
     }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc
index 5107657dac6..6168ba457a5 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_initial_size.cc
@@ -54,7 +54,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor.
 // hash could serve instead of this functor, but it is not yet
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc
index f8132e8e8db..0afc7efe6a4 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_load_set_change.cc
@@ -56,7 +56,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor.
 // hash could serve instead of this functor, but it is not yet
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc
index 500ed44724d..32b8e0fc483 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_mod.cc
@@ -54,7 +54,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor.
 // hash could serve instead of this functor, but it is not yet
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc
index b6421bdaf99..548e56cc88e 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize.cc
@@ -55,7 +55,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor.
 // hash could serve instead of this functor, but it is not yet
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc
index f120ae69b5f..3a6022ba696 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc
@@ -54,7 +54,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc
index 33d00120d44..5242d82c223 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_shift_mask.cc
@@ -57,7 +57,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A simple hash functor. hash could serve instead of this functor,
 // but it is not yet standard everywhere.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_container_traits.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_container_traits.cc
index f2f0e3b4280..d59ed81020e 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_container_traits.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_container_traits.cc
@@ -56,8 +56,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 template
 void
@@ -147,7 +146,7 @@ int main()
   {
     // Print the attributes of a binary heap.
     typedef
-      pb_ds::priority_queue<
+      __gnu_pbds::priority_queue<
       int,
       std::less,
       binary_heap_tag>
@@ -159,7 +158,7 @@ int main()
   {
     // Print the attributes of a binomial heap.
     typedef
-      pb_ds::priority_queue<
+      __gnu_pbds::priority_queue<
       int,
       std::less,
       binomial_heap_tag>
@@ -171,7 +170,7 @@ int main()
   {
     // Print the attributes of a redundant-counter binomial heap.
     typedef
-      pb_ds::priority_queue<
+      __gnu_pbds::priority_queue<
       int,
       std::less,
       rc_binomial_heap_tag>
@@ -183,7 +182,7 @@ int main()
   {
     // Print the attributes of a pairing heap.
     typedef
-      pb_ds::priority_queue<
+      __gnu_pbds::priority_queue<
       int,
       std::less,
       pairing_heap_tag>
@@ -198,7 +197,7 @@ int main()
      */
 
     typedef
-      pb_ds::priority_queue<
+      __gnu_pbds::priority_queue<
       int,
       std::less,
       thin_heap_tag>
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc
index 5eb4549db1b..af582b37b34 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_dijkstra.cc
@@ -64,8 +64,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // The value type of the priority queue.
 // The first entry is the node's id, and the second is the distance.
@@ -108,7 +107,7 @@ int main()
     };
 
   // The priority queue type.
-  typedef pb_ds::priority_queue< pq_value, pq_value_cmp> pq_t;
+  typedef __gnu_pbds::priority_queue< pq_value, pq_value_cmp> pq_t;
 
   // The priority queue object.
   pq_t p;
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_erase_if.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_erase_if.cc
index b67c8aed5d9..834994c4636 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_erase_if.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_erase_if.cc
@@ -54,13 +54,12 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 int
 main()
 {
-  pb_ds::priority_queue p;
+  __gnu_pbds::priority_queue p;
 
   // First we insert some values into the container.
   for (int i = 0; i < 1000; ++i)
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_split_join.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_split_join.cc
index e59cb34918d..14604d73dce 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_split_join.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_split_join.cc
@@ -54,14 +54,13 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 int
 main()
 {
   // Two priority queue objects.
-  pb_ds::priority_queue even_p, odd_p;
+  __gnu_pbds::priority_queue even_p, odd_p;
 
   // First we insert some values: even ones into even_p, and odd ones
   // into odd_p.
@@ -77,7 +76,7 @@ main()
 
   // Print out the values.
   cout << "Initial values in even priority queue:" << endl;
-  pb_ds::priority_queue::const_iterator it;
+  __gnu_pbds::priority_queue::const_iterator it;
   for (it = even_p.begin(); it != even_p.end(); ++it)
     cout <<* it << endl;
 
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_xref.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_xref.cc
index c718d1f86ff..47a9795b5cd 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_xref.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/priority_queue_xref.cc
@@ -66,8 +66,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A priority queue of integers, which supports fast pushes,
 // duplicated-int avoidance, and arbitrary-int erases.
@@ -107,7 +106,7 @@ public:
 
 private:
   // A priority queue of strings.
-  typedef pb_ds::priority_queue< int> pq_t;
+  typedef __gnu_pbds::priority_queue< int> pq_t;
 
   // A hash-table mapping strings to point_iterators inside the
   // priority queue.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc
index 4dc3721ad91..0be8d8535e7 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/ranged_hash.cc
@@ -61,8 +61,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 /**
  * A (somewhat simplistic) ranged-hash function for strings.
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc
index 11ef830cf7c..ba46c824b52 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/store_hash.cc
@@ -60,7 +60,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A string hash functor.
 struct string_hash : public unary_function
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_intervals.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_intervals.cc
index e82150de2b4..e4411aaab43 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_intervals.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_intervals.cc
@@ -68,8 +68,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // Following are definitions of line intervals and functors operating
 // on them. As the purpose of this example is node invariants, and not
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_join.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_join.cc
index 795456ab6d5..baba67e7292 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_join.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_join.cc
@@ -59,8 +59,8 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
+using namespace __gnu_pbds;
 
 int main()
 {
@@ -68,14 +68,7 @@ int main()
    *  
    */
   // A splay tree table mapping ints to chars.
-  typedef
-    tree<
-    int,
-    char,
-    less<
-    int>,
-    splay_tree_tag>
-    map_t;
+  typedef tree, splay_tree_tag> map_t;
 
   // Two map_t object.
   map_t h0, h1;
@@ -114,7 +107,7 @@ int main()
     {
       h2.join(h3);
     }
-  catch (pb_ds::join_error& )
+  catch (__gnu_pbds::join_error& )
     {
       exception_thrown = true;
     }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics.cc
index 30ae3091224..7a3e26292f6 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics.cc
@@ -58,8 +58,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A red-black tree table storing ints and their order
 // statistics. Note that since the tree uses
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics_join.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics_join.cc
index 74fe8382cdc..24661070cd9 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics_join.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/tree_order_statistics_join.cc
@@ -55,18 +55,14 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A splay tree table mapping ints to chars and storing the ints order
 // statistics.
 typedef
-tree<
-  int,
-  char,
-  less,
-  splay_tree_tag,
-  tree_order_statistics_node_update>
+tree,
+     splay_tree_tag,
+     tree_order_statistics_node_update>
 tree_map_t;
 
 int main()
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/trie_dna.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/trie_dna.cc
index 63afba382ba..76f2b7bdb81 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/trie_dna.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/trie_dna.cc
@@ -57,7 +57,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // DNA is represented by a string.
 typedef string dna_t;
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/trie_prefix_search.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/trie_prefix_search.cc
index 5cb140b5cb0..510da445836 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/trie_prefix_search.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/trie_prefix_search.cc
@@ -57,8 +57,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 // A PATRICIA trie with a prefix-search node-updator type. Note that
 // since the node updator is trie_prefix_search_node_update, then the
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/trie_split.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/trie_split.cc
index 11cd1823516..868a8cf6216 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/trie_split.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/trie_split.cc
@@ -54,7 +54,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/associative_containers.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/associative_containers.cc
index 686f8b9c70f..b7a0b8253ff 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/associative_containers.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/associative_containers.cc
@@ -50,7 +50,7 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
+using namespace __gnu_pbds;
 
 /**
  * The following function performs a sequence of operations on an
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
index 91135084c26..606679b19a4 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef hash_map_tl_t map_tl_t;
 
   return rand_regression_test(ITERATIONS, KEYS,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
index 2c55313f65a..202fe1443ce 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef hash_set_tl_t map_tl_t;
 
   return rand_regression_test(ITERATIONS, KEYS,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
index 6849a02ba37..7c8bb40eb1b 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
@@ -53,7 +53,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef lu_map_tl_t map_tl_t;
 
   return rand_regression_test(50, 10, 
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
index 3320e420407..0d31f5ad846 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
@@ -53,7 +53,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef lu_set_tl_t map_tl_t;
 
   return rand_regression_test(50, 10,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
index 3860e66eab9..8f4fdaaf689 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   return rand_regression_test(ITERATIONS, KEYS,
 			      "tree_no_data_map_rand_regression_test", 
 			      pq_tl_t());
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queues.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queues.cc
index 0f53cf22d03..52099b64e52 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queues.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queues.cc
@@ -50,8 +50,8 @@
 #include 
 
 using namespace std;
-using namespace pb_ds;
-using namespace pb_ds;
+using namespace __gnu_pbds;
+using namespace __gnu_pbds;
 
 template
 void
@@ -94,7 +94,7 @@ priority_queue_link_regression_test_0()
      *  Perform operations on a pairing-heap queue.
      */
     cout << "Pairing heap" << endl;
-    pb_ds::priority_queue, pairing_heap_tag> c;
+    __gnu_pbds::priority_queue, pairing_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -103,7 +103,7 @@ priority_queue_link_regression_test_0()
      *  Perform operations on a binomial-heap queue.
      */
     cout << "Binomial heap" << endl;
-    pb_ds::priority_queue, binomial_heap_tag> c;
+    __gnu_pbds::priority_queue, binomial_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -112,7 +112,7 @@ priority_queue_link_regression_test_0()
      *  Perform operations on a binomial-heap queue.
      */
     cout << "Redundant-counter binomial heap" << endl;
-    pb_ds::priority_queue, rc_binomial_heap_tag> c;
+    __gnu_pbds::priority_queue, rc_binomial_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -121,7 +121,7 @@ priority_queue_link_regression_test_0()
      *  Perform operations on a binomial-heap queue.
      */
     cout << "Binary heap" << endl;
-    pb_ds::priority_queue, binary_heap_tag> c;
+    __gnu_pbds::priority_queue, binary_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -130,7 +130,7 @@ priority_queue_link_regression_test_0()
      *  Perform operations on a thin-heap queue.
      */
     cout << "Thin heap" << endl;
-    pb_ds::priority_queue, thin_heap_tag> c;
+    __gnu_pbds::priority_queue, thin_heap_tag> c;
     some_op_sequence(c);
   }
 }
@@ -144,7 +144,7 @@ priority_queue_link_regression_test_1()
      *  Perform operations on a pairing-heap queue.
      */
     cout << "Pairing heap" << endl;
-    pb_ds::priority_queue, pairing_heap_tag> c;
+    __gnu_pbds::priority_queue, pairing_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -153,7 +153,7 @@ priority_queue_link_regression_test_1()
      *  Perform operations on a binomial-heap queue.
      */
     cout << "Binomial heap" << endl;
-    pb_ds::priority_queue, binomial_heap_tag> c;
+    __gnu_pbds::priority_queue, binomial_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -162,7 +162,7 @@ priority_queue_link_regression_test_1()
      *  Perform operations on a binomial-heap queue.
      */
     cout << "Redundant-counter binomial heap" << endl;
-    pb_ds::priority_queue, rc_binomial_heap_tag> c;
+    __gnu_pbds::priority_queue, rc_binomial_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -171,7 +171,7 @@ priority_queue_link_regression_test_1()
      *  Perform operations on a binomial-heap queue.
      */
     cout << "Binary heap" << endl;
-    pb_ds::priority_queue, binary_heap_tag> c;
+    __gnu_pbds::priority_queue, binary_heap_tag> c;
     some_op_sequence(c);
   }
 
@@ -180,7 +180,7 @@ priority_queue_link_regression_test_1()
      *  Perform operations on a thin-heap queue.
      */
     cout << "Thin heap" << endl;
-    pb_ds::priority_queue, thin_heap_tag> c;
+    __gnu_pbds::priority_queue, thin_heap_tag> c;
     some_op_sequence(c);
   }
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
index 5a2a29ca67f..b08fb855940 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef tree_map_tl_t map_tl_t;
 
   return rand_regression_test(ITERATIONS, KEYS,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
index 22f00c49643..6f1024f7d4a 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef tree_set_tl_t map_tl_t;
 
   return rand_regression_test(ITERATIONS, KEYS,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
index 61e72bca99a..bd55a83a094 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef trie_map_tl_t map_tl_t;
 
   return rand_regression_test(ITERATIONS, KEYS,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
index 1840ebf39ba..3407825bd78 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
@@ -61,7 +61,7 @@
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   typedef trie_set_tl_t map_tl_t;
 
   return rand_regression_test(ITERATIONS, KEYS,
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
index 27a7ff87903..cb7720cc609 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
@@ -68,7 +68,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   size_t vn = 200;
   size_t vs = 200;
@@ -87,7 +87,7 @@ main(int argc, char* a_p_argv[])
       erase_test tst(b,  vn, vs, vm);
       typedef __gnu_test::tracker_allocator alloc_t;
       {
-	typedef hash_common_types, alloc_t>::performance_tl tl_t;
+	typedef hash_common_types, alloc_t>::performance_tl tl_t;
 
 	tl_t tl;
 	__gnu_cxx::typelist::apply(tst, tl);
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
index 602ff530e24..d3cebc87571 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
@@ -60,7 +60,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp
index 61a91f4dda4..2b8a2a9b77b 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp
@@ -67,7 +67,7 @@ set_test_parameters(size_t& n, size_t&s, size_t& m, size_t& prm);
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t prm;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
index 5bfa42b3b6d..a485a8b915d 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
@@ -68,7 +68,7 @@ set_test_parameters(size_t& n, size_t&s, size_t& m, size_t& prm);
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t prm;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp
index cdf7e94f910..f7f33f051e0 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp
@@ -67,7 +67,7 @@ set_test_parameters(size_t& n, size_t&s, size_t& m, size_t& prm);
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t prm;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc
index 4487c27cf70..ad6fdd176c1 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc
@@ -60,7 +60,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc
index b867f9b79e7..5ab8db1edd5 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc
@@ -60,7 +60,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
index 4add14795cb..c5ba556f239 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
@@ -80,7 +80,7 @@ usage()
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
index 4eadff4f6d1..e8dffa6978b 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
@@ -63,7 +63,7 @@ set_test_parameters(bool& b);
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 100;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
index 3185e9b1ff0..adbbc0384fd 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
@@ -61,7 +61,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
 
   size_t vn = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc
index a02f50b6d5a..65a009c08ce 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc
@@ -60,7 +60,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
index cd60912051a..6fcaa0d23f6 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
@@ -60,7 +60,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc
index 409685dd64e..87d14d7f9e5 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc
@@ -61,7 +61,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
index d500bd39f0d..e336114b489 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
@@ -61,7 +61,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
index 09a13fec66b..e9554c1600d 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
@@ -61,7 +61,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   size_t vn = 200;
   size_t vs = 200;
   size_t vm = 2100;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc
index cc88399463f..8409a4aebb2 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc
@@ -62,7 +62,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 200;
   size_t vs = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
index 5909b56b5a3..2ca61ca1495 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
@@ -59,7 +59,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   size_t vn = 200;
   size_t vs = 200;
   size_t vm = 2100;
@@ -71,7 +71,7 @@ main(int argc, char* a_p_argv[])
       {
 	typedef tree_order_statistics_test< true> test_t;
 	test_t tst(vn, vs, vm);
-	typedef tree_common_types, pb_ds::tree_order_statistics_node_update>::performance_tl tl_t;
+	typedef tree_common_types, __gnu_pbds::tree_order_statistics_node_update>::performance_tl tl_t;
 	tl_t tl;
 	__gnu_cxx::typelist::apply(tst, tl);
       }
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
index 3a27eb2a0b7..9c4970f2826 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
@@ -59,7 +59,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   size_t vn = 200;
   size_t vs = 200;
   size_t vm = 2100;
@@ -72,7 +72,7 @@ main(int argc, char* a_p_argv[])
 	typedef tree_split_join_test test_t;
 	test_t tst(vn, vs, vm);
 
-	typedef tree_common_types::performance_tl tl_t;
+	typedef tree_common_types::performance_tl tl_t;
 	tl_t tl;
 	__gnu_cxx::typelist::apply(tst, tl);
       }
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
index 5ee6f90be3c..23a63023314 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
@@ -62,7 +62,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
   
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 200;
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
index da7bdedca74..44329b3f769 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
@@ -60,7 +60,7 @@ usage();
 int
 main(int argc, char* a_p_argv[])
 {
-  using namespace pb_ds::test;
+  using namespace __gnu_pbds::test;
 
   std::string f_name = "thirty_years_among_the_dead_preproc.txt";
   size_t vn = 200;
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp
index 209208747f4..e5af5c22cca 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp
@@ -51,13 +51,13 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
     template::type,
+	     class Hash_Fn = typename __gnu_pbds::detail::default_hash_fn::type,
 	     class Eq_Fn = std::equal_to,
 	     class Allocator = std::allocator > >
     struct hash_common_types
@@ -66,7 +66,7 @@ namespace pb_ds
       typedef typename Allocator::size_type size_type;
 
       typedef
-      pb_ds::test::hash_load_check_resize_trigger_t_<
+      __gnu_pbds::test::hash_load_check_resize_trigger_t_<
 	Allocator,
 	1, 8,
 	1, 2,
@@ -74,7 +74,7 @@ namespace pb_ds
       no_access_half_load_check_resize_trigger_policy;
 
       typedef
-      pb_ds::test::hash_load_check_resize_trigger_t_<
+      __gnu_pbds::test::hash_load_check_resize_trigger_t_<
 	Allocator,
 	1, 8,
 	1, 2,
@@ -82,7 +82,7 @@ namespace pb_ds
       access_half_load_check_resize_trigger_policy;
 
       typedef
-      pb_ds::test::hash_load_check_resize_trigger_t_<
+      __gnu_pbds::test::hash_load_check_resize_trigger_t_<
 	Allocator,
 	1, 8,
 	1, 1,
@@ -90,149 +90,149 @@ namespace pb_ds
       no_access_one_load_check_resize_trigger_policy;
 
       typedef
-      pb_ds::test::cc_hash_max_collision_check_resize_trigger_t_<
+      __gnu_pbds::test::cc_hash_max_collision_check_resize_trigger_t_<
 	Allocator,
 	1, 2,
 	false>
       no_access_half_max_col_check_check_resize_trigger_policy;
 
       typedef
-      pb_ds::test::cc_hash_max_collision_check_resize_trigger_t_<
+      __gnu_pbds::test::cc_hash_max_collision_check_resize_trigger_t_<
 	Allocator,
 	1, 2,
 	true>
       access_half_max_col_check_check_resize_trigger_policy;
 
-      typedef pb_ds::test::linear_probe_fn_t_ lin_p_t;
+      typedef __gnu_pbds::test::linear_probe_fn_t_ lin_p_t;
 
-      typedef pb_ds::test::quadratic_probe_fn_t_ quad_p_t;
+      typedef __gnu_pbds::test::quadratic_probe_fn_t_ quad_p_t;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       performance_cc_policy0;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mod_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_prime_size_policy_t_>::type
+	__gnu_pbds::test::hash_prime_size_policy_t_>::type
       performance_cc_policy1;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	no_access_one_load_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       performance_cc_policy2;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mod_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator>,
 	no_access_one_load_check_resize_trigger_policy,
-	pb_ds::test::hash_prime_size_policy_t_ >::type
+	__gnu_pbds::test::hash_prime_size_policy_t_ >::type
       performance_cc_policy3;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::true_type,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::detail::true_type,
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       performance_cc_policy4;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	no_access_half_max_col_check_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       performance_cc_policy5;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	access_half_max_col_check_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       regression_cc_policy0;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::false_type,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::detail::false_type,
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       regression_cc_policy1;
 
       typedef
       typename __gnu_cxx::typelist::create4<
-	pb_ds::detail::true_type,
-	pb_ds::test::direct_mod_range_hashing_t_<
+	__gnu_pbds::detail::true_type,
+	__gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_prime_size_policy_t_ >::type
+	__gnu_pbds::test::hash_prime_size_policy_t_ >::type
       regression_cc_policy2;
 
       typedef
       typename __gnu_cxx::typelist::create5<
-	pb_ds::detail::false_type,
+	__gnu_pbds::detail::false_type,
 	lin_p_t,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       performance_gp_policy0;
 
       typedef
       typename __gnu_cxx::typelist::create5<
-	pb_ds::detail::false_type,
+	__gnu_pbds::detail::false_type,
 	quad_p_t,
-	pb_ds::test::direct_mod_range_hashing_t_<
+	__gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_prime_size_policy_t_ >::type
+	__gnu_pbds::test::hash_prime_size_policy_t_ >::type
       performance_gp_policy1;
 
       typedef
       typename __gnu_cxx::typelist::create5<
-	pb_ds::detail::false_type,
+	__gnu_pbds::detail::false_type,
 	quad_p_t,
-	pb_ds::test::direct_mod_range_hashing_t_<
+	__gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator>,
 	access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_prime_size_policy_t_>::type
+	__gnu_pbds::test::hash_prime_size_policy_t_>::type
       regression_gp_policy0;
 
       typedef
       typename __gnu_cxx::typelist::create5<
-	pb_ds::detail::true_type,
+	__gnu_pbds::detail::true_type,
 	lin_p_t,
-	pb_ds::test::direct_mask_range_hashing_t_<
+	__gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator>,
 	access_half_load_check_resize_trigger_policy,
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator> >::type
       regression_gp_policy1;
 
@@ -296,13 +296,13 @@ namespace pb_ds
 
       public:
         typedef
-	pb_ds::cc_hash_table<
+	__gnu_pbds::cc_hash_table<
 	Key,
 	Data,
 	Hash_Fn,
 	Eq_Fn,
 	comb_hash_fn,
-	pb_ds::hash_standard_resize_policy<
+	__gnu_pbds::hash_standard_resize_policy<
 	size_policy,
 	trigger_policy,
 	false>,
@@ -342,13 +342,13 @@ namespace pb_ds
 
       public:
         typedef
-	pb_ds::cc_hash_table<
+	__gnu_pbds::cc_hash_table<
 	Key,
 	Data,
 	Hash_Fn,
 	Eq_Fn,
 	comb_hash_fn,
-	pb_ds::hash_standard_resize_policy<
+	__gnu_pbds::hash_standard_resize_policy<
 	size_policy,
 	trigger_policy,
 	true>,
@@ -393,14 +393,14 @@ namespace pb_ds
 
       public:
         typedef
-	pb_ds::gp_hash_table<
+	__gnu_pbds::gp_hash_table<
 	Key,
 	Data,
 	Hash_Fn,
 	Eq_Fn,
 	comb_probe_fn,
 	probe_fn,
-	pb_ds::hash_standard_resize_policy<
+	__gnu_pbds::hash_standard_resize_policy<
 	size_policy,
 	trigger_policy,
 	false>,
@@ -445,14 +445,14 @@ namespace pb_ds
 
       public:
         typedef
-	pb_ds::gp_hash_table<
+	__gnu_pbds::gp_hash_table<
 	Key,
 	Data,
 	Hash_Fn,
 	Eq_Fn,
 	comb_probe_fn,
 	probe_fn,
-	pb_ds::hash_standard_resize_policy<
+	__gnu_pbds::hash_standard_resize_policy<
 	size_policy,
 	trigger_policy,
 	true>,
@@ -533,7 +533,7 @@ namespace pb_ds
       typedef typename Allocator::size_type size_type;
 
       typedef
-      pb_ds::test::hash_load_check_resize_trigger_t_<
+      __gnu_pbds::test::hash_load_check_resize_trigger_t_<
 	Allocator,
 	1, 8,
 	1, 2,
@@ -541,7 +541,7 @@ namespace pb_ds
       no_access_half_load_check_resize_trigger_policy;
 
       typedef
-      pb_ds::test::hash_load_check_resize_trigger_t_<
+      __gnu_pbds::test::hash_load_check_resize_trigger_t_<
 	Allocator,
 	1, 8,
 	1, 1,
@@ -549,28 +549,28 @@ namespace pb_ds
       no_access_one_load_check_resize_trigger_policy;
 
       typedef
-      pb_ds::hash_standard_resize_policy<
-	pb_ds::test::hash_exponential_size_policy_t_<
+      __gnu_pbds::hash_standard_resize_policy<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator>,
 	no_access_half_load_check_resize_trigger_policy>
       mask_half_resize_policy_t;
 
       typedef
-      pb_ds::hash_standard_resize_policy<
-	pb_ds::test::hash_exponential_size_policy_t_<
+      __gnu_pbds::hash_standard_resize_policy<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
 	Allocator>,
 	no_access_one_load_check_resize_trigger_policy>
       mask_one_resize_policy_t;
 
       typedef
-      pb_ds::hash_standard_resize_policy<
-	pb_ds::test::hash_prime_size_policy_t_,
+      __gnu_pbds::hash_standard_resize_policy<
+	__gnu_pbds::test::hash_prime_size_policy_t_,
 	no_access_half_load_check_resize_trigger_policy>
       mod_half_resize_policy_t;
 
       typedef
-      pb_ds::hash_standard_resize_policy<
-	pb_ds::test::hash_prime_size_policy_t_,
+      __gnu_pbds::hash_standard_resize_policy<
+	__gnu_pbds::test::hash_prime_size_policy_t_,
 	no_access_one_load_check_resize_trigger_policy>
       mod_one_resize_policy_t;
 
@@ -579,7 +579,7 @@ namespace pb_ds
 
       template
       struct half_resize_policy_selector<
-        pb_ds::test::direct_mask_range_hashing_t_<
+        __gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator_> >
       {
         typedef mask_half_resize_policy_t type;
@@ -587,7 +587,7 @@ namespace pb_ds
 
       template
       struct half_resize_policy_selector<
-        pb_ds::test::direct_mod_range_hashing_t_<
+        __gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator_> >
       {
         typedef mod_half_resize_policy_t type;
@@ -598,7 +598,7 @@ namespace pb_ds
 
       template
       struct one_resize_policy_selector<
-        pb_ds::test::direct_mask_range_hashing_t_<
+        __gnu_pbds::test::direct_mask_range_hashing_t_<
 	Allocator_> >
       {
         typedef mask_one_resize_policy_t type;
@@ -606,7 +606,7 @@ namespace pb_ds
 
       template
       struct one_resize_policy_selector<
-        pb_ds::test::direct_mod_range_hashing_t_<
+        __gnu_pbds::test::direct_mod_range_hashing_t_<
 	Allocator_> >
       {
         typedef mod_one_resize_policy_t type;
@@ -616,10 +616,10 @@ namespace pb_ds
       struct generic_cc_hash_table_t
       {
         typedef
-	pb_ds::cc_hash_table<
+	__gnu_pbds::cc_hash_table<
 	  Key,
 	  Data,
-	  pb_ds::null_hash_fn,
+	  __gnu_pbds::null_hash_fn,
 	  Eq_Fn,
 	  Comb_Hash_Fn,
 	  typename one_resize_policy_selector<
@@ -639,13 +639,13 @@ namespace pb_ds
       struct no_access_generic_gp_hash_table_t
       {
         typedef
-	pb_ds::gp_hash_table<
+	__gnu_pbds::gp_hash_table<
 	  Key,
 	  Data,
-	  pb_ds::null_hash_fn,
+	  __gnu_pbds::null_hash_fn,
 	  Eq_Fn,
 	  Comb_Probe_Fn,
-	  pb_ds::null_probe_fn,
+	  __gnu_pbds::null_probe_fn,
 	  typename half_resize_policy_selector<
 	  typename Comb_Probe_Fn::comb_fn>::type,
 	  false,
@@ -675,9 +675,9 @@ namespace pb_ds
     private:
       typedef typename Allocator::size_type size_type;
 
-      typedef pb_ds::test::move_to_front_lu_policy_t_ mtf_u;
+      typedef __gnu_pbds::test::move_to_front_lu_policy_t_ mtf_u;
 
-      typedef pb_ds::test::counter_lu_policy_t_ cnt_5_u;
+      typedef __gnu_pbds::test::counter_lu_policy_t_ cnt_5_u;
 
       typedef typename __gnu_cxx::typelist::create1::type lu_policy0;
 
@@ -700,7 +700,7 @@ namespace pb_ds
 
       public:
         typedef
-	pb_ds::list_update<
+	__gnu_pbds::list_update<
 	Key,
 	Data,
 	Eq_Fn,
@@ -733,37 +733,37 @@ namespace pb_ds
 		      class Node_Iterator,
 		      class Cmp_Fn_,
 		      class Allocator_>
-    class Node_Update = pb_ds::null_tree_node_update,
+    class Node_Update = __gnu_pbds::null_tree_node_update,
 	     class Allocator = std::allocator > >
     struct tree_common_types
     {
     private:
       typedef
-      pb_ds::tree<
+      __gnu_pbds::tree<
       Key,
       Data,
       Cmp_Fn,
-      pb_ds::ov_tree_tag,
+      __gnu_pbds::ov_tree_tag,
       Node_Update,
       Allocator>
       ov_tree_assoc_container_t;
 
       typedef
-      pb_ds::tree<
+      __gnu_pbds::tree<
 	Key,
 	Data,
 	Cmp_Fn,
-	pb_ds::rb_tree_tag,
+	__gnu_pbds::rb_tree_tag,
 	Node_Update,
 	Allocator>
       rb_tree_assoc_container_t;
 
       typedef
-      pb_ds::tree<
+      __gnu_pbds::tree<
 	Key,
 	Data,
 	Cmp_Fn,
-	pb_ds::splay_tree_tag,
+	__gnu_pbds::splay_tree_tag,
 	Node_Update,
 	Allocator>
       splay_tree_assoc_container_t;
@@ -792,18 +792,18 @@ namespace pb_ds
     template::type,
-	     class Tag = pb_ds::pat_trie_tag,
+	     typename __gnu_pbds::detail::default_trie_e_access_traits::type,
+	     class Tag = __gnu_pbds::pat_trie_tag,
 	     template
-    class Node_Update = pb_ds::null_trie_node_update,
+    class Node_Update = __gnu_pbds::null_trie_node_update,
 	     class Allocator = std::allocator >
     class trie_common_types
     {
     private:
-      typedef pb_ds::trie type;
+      typedef __gnu_pbds::trie type;
 
     public:
       typedef typename __gnu_cxx::typelist::create1::type performance_tl;
@@ -813,6 +813,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_COMMON_TYPES_HPP
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/comb_hash_fn_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/comb_hash_fn_string_form.hpp
index 024caab4b2b..41d908e58f5 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/comb_hash_fn_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/comb_hash_fn_string_form.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -116,7 +116,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_COMB_HASH_FN_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/ds_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/ds_string_form.hpp
index 84edbd90273..28625aff6aa 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/ds_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/ds_string_form.hpp
@@ -59,7 +59,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -74,7 +74,7 @@ namespace pb_ds
       template
       struct ds_string_form<
 	Cntnr,
-	pb_ds::cc_hash_tag>
+	__gnu_pbds::cc_hash_tag>
       {
 	static std::string
         name()
@@ -104,7 +104,7 @@ namespace pb_ds
       template
       struct ds_string_form<
 	Cntnr,
-	pb_ds::gp_hash_tag>
+	__gnu_pbds::gp_hash_tag>
       {
 	static std::string
         name()
@@ -166,7 +166,7 @@ namespace pb_ds
       template
       struct ds_string_form<
         Cntnr,
-        pb_ds::rb_tree_tag> : private tree_ds_string_form<
+        __gnu_pbds::rb_tree_tag> : private tree_ds_string_form<
         Cntnr>
       {
       private:
@@ -189,7 +189,7 @@ namespace pb_ds
       template
       struct ds_string_form<
         Cntnr,
-        pb_ds::splay_tree_tag> : private tree_ds_string_form<
+        __gnu_pbds::splay_tree_tag> : private tree_ds_string_form<
         Cntnr>
       {
       private:
@@ -212,7 +212,7 @@ namespace pb_ds
       template
       struct ds_string_form<
         Cntnr,
-        pb_ds::ov_tree_tag> : private tree_ds_string_form<
+        __gnu_pbds::ov_tree_tag> : private tree_ds_string_form<
         Cntnr>
       {
       private:
@@ -235,7 +235,7 @@ namespace pb_ds
       template
       struct ds_string_form<
 	Cntnr,
-	pb_ds::list_update_tag>
+	__gnu_pbds::list_update_tag>
       {
 	static std::string
         name()
@@ -258,7 +258,7 @@ namespace pb_ds
       template
       struct ds_string_form<
 	Cntnr,
-	pb_ds::pat_trie_tag>
+	__gnu_pbds::pat_trie_tag>
       {
 	static std::string
         name()
@@ -298,7 +298,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_DS_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/list_update_policy_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/list_update_policy_string_form.hpp
index d8f9e977aec..08b65056065 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/list_update_policy_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/list_update_policy_string_form.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -107,7 +107,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_LU_POLICY_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/probe_fn_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/probe_fn_string_form.hpp
index 364e7efcc73..84c5d040051 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/probe_fn_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/probe_fn_string_form.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -103,7 +103,7 @@ namespace pb_ds
 
       template<>
       struct probe_fn_string_form<
-	pb_ds::null_probe_fn>
+	__gnu_pbds::null_probe_fn>
       {
 	static std::string
         name()
@@ -122,7 +122,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_PROBE_FN_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/resize_policy_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/resize_policy_string_form.hpp
index 96da7a3c721..8507163ff77 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/resize_policy_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/resize_policy_string_form.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -70,7 +70,7 @@ namespace pb_ds
 	       bool External_Size_Access,
 	       typename Size_Type>
       struct resize_policy_string_form<
-	pb_ds::hash_standard_resize_policy<
+	__gnu_pbds::hash_standard_resize_policy<
         Size_Policy,
         Trigger_Policy,
         External_Size_Access,
@@ -100,7 +100,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_RESIZE_POLICY_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/size_policy_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/size_policy_string_form.hpp
index 1ae61c4c14a..876505be3ee 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/size_policy_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/size_policy_string_form.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -67,7 +67,7 @@ namespace pb_ds
 
       template
       struct size_policy_string_form<
-	pb_ds::test::hash_exponential_size_policy_t_<
+	__gnu_pbds::test::hash_exponential_size_policy_t_<
         Allocator> >
       {
 	static std::string
@@ -85,7 +85,7 @@ namespace pb_ds
 
       template<>
       struct size_policy_string_form<
-	pb_ds::test::hash_prime_size_policy_t_>
+	__gnu_pbds::test::hash_prime_size_policy_t_>
       {
 	static std::string
         name()
@@ -104,7 +104,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_SIZE_POLICY_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/store_hash_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/store_hash_string_form.hpp
index 4dabbd6ca8f..89ef675ced5 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/store_hash_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/store_hash_string_form.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -97,7 +97,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_STORE_HASH_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/tree_supports_order_statistics.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/tree_supports_order_statistics.hpp
index 14bdc7bab32..f4b23110491 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/tree_supports_order_statistics.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/tree_supports_order_statistics.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -63,9 +63,9 @@ namespace pb_ds
       {
 	enum
 	  {
-	    value = pb_ds::detail::is_same<
+	    value = __gnu_pbds::detail::is_same<
             typename Tree_Cntnr::node_update,
-            pb_ds::tree_order_statistics_node_update<
+            __gnu_pbds::tree_order_statistics_node_update<
             typename Tree_Cntnr::const_node_iterator,
             typename Tree_Cntnr::node_iterator,
             typename Tree_Cntnr::cmp_fn,
@@ -77,7 +77,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TREE_SUPPORTS_ORDER_STATISTICS_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_order_statistics.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_order_statistics.hpp
index 43f2c711107..c23708f23cc 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_order_statistics.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_order_statistics.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -63,9 +63,9 @@ namespace pb_ds
       {
 	enum
 	  {
-	    value = pb_ds::detail::is_same<
+	    value = __gnu_pbds::detail::is_same<
             typename Tree_Cntnr::node_update,
-            pb_ds::trie_order_statistics_node_update<
+            __gnu_pbds::trie_order_statistics_node_update<
             typename Tree_Cntnr::const_node_iterator,
             typename Tree_Cntnr::node_iterator,
             typename Tree_Cntnr::e_access_traits,
@@ -77,7 +77,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TRIE_SUPPORTS_ORDER_STATISTICS_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_prefix_search.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_prefix_search.hpp
index 7fb3479715f..0adf029507e 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_prefix_search.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/trie_supports_prefix_search.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -63,9 +63,9 @@ namespace pb_ds
       {
 	enum
 	  {
-	    value = pb_ds::detail::is_same<
+	    value = __gnu_pbds::detail::is_same<
             typename Tree_Cntnr::node_update,
-            pb_ds::trie_prefix_search_node_update<
+            __gnu_pbds::trie_prefix_search_node_update<
             typename Tree_Cntnr::const_node_iterator,
             typename Tree_Cntnr::node_iterator,
             typename Tree_Cntnr::e_access_traits,
@@ -77,7 +77,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TRIE_SUPPORTS_PREFIX_SEARCH_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/detail/trigger_policy_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/detail/trigger_policy_string_form.hpp
index 0d7081f4966..8169d938155 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/detail/trigger_policy_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/detail/trigger_policy_string_form.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -70,7 +70,7 @@ namespace pb_ds
 	       typename Allocator::size_type Max_Load_Denom,
 	       bool External_Access>
       struct trigger_policy_string_form<
-	pb_ds::test::hash_load_check_resize_trigger_t_<
+	__gnu_pbds::test::hash_load_check_resize_trigger_t_<
         Allocator,
         Min_Load_Nom,
         Min_Load_Denom,
@@ -111,7 +111,7 @@ namespace pb_ds
 	       typename Allocator::size_type Load_Denom,
 	       bool External_Access>
       struct trigger_policy_string_form<
-	pb_ds::test::cc_hash_max_collision_check_resize_trigger_t_<
+	__gnu_pbds::test::cc_hash_max_collision_check_resize_trigger_t_<
         Allocator,
         Load_Nom,
         Load_Denom,
@@ -147,7 +147,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TRIGGER_POLICY_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/native_set.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/native_set.hpp
index b34364b132d..4667c9d4e2d 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/native_set.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/native_set.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -88,7 +88,7 @@ namespace pb_ds
       { return (make_xml_tag("type", "value", "std_set")); }
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp
index f29f29d24e0..73015b8967d 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp
@@ -61,7 +61,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -119,11 +119,11 @@ namespace pb_ds
 	  { return (""); }
 
 	  static std::string
-	  name(pb_ds::null_mapped_type)
+	  name(__gnu_pbds::null_mapped_type)
 	  { return ("set"); }
 
 	  static std::string
-	  desc(pb_ds::null_mapped_type)
+	  desc(__gnu_pbds::null_mapped_type)
 	  { return (""); }
 
 	public:
@@ -183,7 +183,7 @@ namespace pb_ds
 					    typename Cntnr::container_category>
     { };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp
index 10f03dadd06..12cf9fbcac6 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp
@@ -52,24 +52,24 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
     template
     struct direct_mask_range_hashing_t_ 
-    : public pb_ds::direct_mask_range_hashing
+    : public __gnu_pbds::direct_mask_range_hashing
     {
       typedef typename Allocator::size_type size_type;
-      typedef pb_ds::direct_mask_range_hashing base_type;
+      typedef __gnu_pbds::direct_mask_range_hashing base_type;
     };
 
     template
     struct direct_mod_range_hashing_t_ 
-    : public pb_ds::direct_mod_range_hashing
+    : public __gnu_pbds::direct_mod_range_hashing
     {
       typedef typename Allocator::size_type size_type;
-      typedef pb_ds::direct_mod_range_hashing base_type;
+      typedef __gnu_pbds::direct_mod_range_hashing base_type;
     };
 
     template
     struct hash_load_check_resize_trigger_t_ 
-    : public pb_ds::hash_load_check_resize_trigger
     {
       typedef typename Allocator::size_type size_type;
-      typedef pb_ds::hash_load_check_resize_trigger  base_type;
+      typedef __gnu_pbds::hash_load_check_resize_trigger  base_type;
 
       inline
       hash_load_check_resize_trigger_t_() 
@@ -102,11 +102,11 @@ namespace pb_ds
 	     typename Allocator::size_type Load_Denom,
 	     bool External_Access>
     struct cc_hash_max_collision_check_resize_trigger_t_ 
-    : public pb_ds::cc_hash_max_collision_check_resize_trigger
     {
       typedef typename Allocator::size_type size_type;
-      typedef pb_ds::cc_hash_max_collision_check_resize_trigger base_type;
+      typedef __gnu_pbds::cc_hash_max_collision_check_resize_trigger base_type;
 
       inline
       cc_hash_max_collision_check_resize_trigger_t_() 
@@ -120,36 +120,36 @@ namespace pb_ds
 	};
     };
 
-    struct hash_prime_size_policy_t_ : public pb_ds::hash_prime_size_policy
+    struct hash_prime_size_policy_t_ : public __gnu_pbds::hash_prime_size_policy
     { };
 
     template
     struct hash_exponential_size_policy_t_ 
-    : public pb_ds::hash_exponential_size_policy
+    : public __gnu_pbds::hash_exponential_size_policy
     { };
 
     template
     struct linear_probe_fn_t_ 
-    : public pb_ds::linear_probe_fn
+    : public __gnu_pbds::linear_probe_fn
     { };
 
     template
     struct quadratic_probe_fn_t_ 
-    : public pb_ds::quadratic_probe_fn
+    : public __gnu_pbds::quadratic_probe_fn
     { };
 
     template
     struct counter_lu_policy_t_ 
-    : public pb_ds::counter_lu_policy
+    : public __gnu_pbds::counter_lu_policy
     {
-      typedef pb_ds::counter_lu_policy base_type;
+      typedef __gnu_pbds::counter_lu_policy base_type;
     };
 
     struct move_to_front_lu_policy_t_ 
-    : public pb_ds::move_to_front_lu_policy<>
+    : public __gnu_pbds::move_to_front_lu_policy<>
     { };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp b/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp
index a9975578463..80176db44dd 100644
--- a/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -62,15 +62,15 @@ namespace pb_ds
     private:
       //    typedef typename Allocator::size_type size_type;
 
-      typedef pb_ds::priority_queue pairing_heap_t;
+      typedef __gnu_pbds::priority_queue pairing_heap_t;
 
-      typedef pb_ds::priority_queue binomial_heap_t;
+      typedef __gnu_pbds::priority_queue binomial_heap_t;
 
-      typedef pb_ds::priority_queue rc_binomial_heap_t;
+      typedef __gnu_pbds::priority_queue rc_binomial_heap_t;
 
-      typedef pb_ds::priority_queue binary_heap_t;
+      typedef __gnu_pbds::priority_queue binary_heap_t;
 
-      typedef pb_ds::priority_queue thin_heap_t;
+      typedef __gnu_pbds::priority_queue thin_heap_t;
 
       typedef typename __gnu_cxx::typelist::create5::type all_tl;
 
@@ -82,6 +82,6 @@ namespace pb_ds
     };
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_COMMON_TYPES_HPP
diff --git a/libstdc++-v3/testsuite/util/common_type/priority_queue/detail/ds_string_form.hpp b/libstdc++-v3/testsuite/util/common_type/priority_queue/detail/ds_string_form.hpp
index 4c33e6c1fdb..bf3b6885024 100644
--- a/libstdc++-v3/testsuite/util/common_type/priority_queue/detail/ds_string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/priority_queue/detail/ds_string_form.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -61,7 +61,7 @@ namespace pb_ds
       struct ds_string_form;
 
       template
-      struct ds_string_form
+      struct ds_string_form
       {
 	static std::string
         name()
@@ -73,7 +73,7 @@ namespace pb_ds
       };
 
       template
-      struct ds_string_form
+      struct ds_string_form
       {
 	static std::string
         name()
@@ -85,7 +85,7 @@ namespace pb_ds
       };
 
       template
-      struct ds_string_form
+      struct ds_string_form
       {
 	static std::string
         name()
@@ -97,7 +97,7 @@ namespace pb_ds
       };
 
       template
-      struct ds_string_form
+      struct ds_string_form
       {
 	static std::string
         name()
@@ -109,7 +109,7 @@ namespace pb_ds
       };
 
       template
-      struct ds_string_form
+      struct ds_string_form
       {
 	static std::string
         name()
@@ -122,7 +122,7 @@ namespace pb_ds
 
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_DS_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/common_type/priority_queue/string_form.hpp b/libstdc++-v3/testsuite/util/common_type/priority_queue/string_form.hpp
index 6d85b86a11d..0e5b0ce87c9 100644
--- a/libstdc++-v3/testsuite/util/common_type/priority_queue/string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/priority_queue/string_form.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -103,7 +103,7 @@ namespace pb_ds
       : public detail::tag_select_string_form
     { };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_STRING_FORM_HPP
 
diff --git a/libstdc++-v3/testsuite/util/hash_fn/dna_str_limit.hpp b/libstdc++-v3/testsuite/util/hash_fn/dna_str_limit.hpp
index 144cf03b2b9..0f97906764f 100644
--- a/libstdc++-v3/testsuite/util/hash_fn/dna_str_limit.hpp
+++ b/libstdc++-v3/testsuite/util/hash_fn/dna_str_limit.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -67,6 +67,6 @@ namespace pb_ds
       return ret;
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_DNA_STR_LIMIT_HPP
diff --git a/libstdc++-v3/testsuite/util/hash_fn/limit_string_hash_fn.hpp b/libstdc++-v3/testsuite/util/hash_fn/limit_string_hash_fn.hpp
index 78cc6f22735..59c09672256 100644
--- a/libstdc++-v3/testsuite/util/hash_fn/limit_string_hash_fn.hpp
+++ b/libstdc++-v3/testsuite/util/hash_fn/limit_string_hash_fn.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -77,6 +77,6 @@ namespace pb_ds
     size_t limit_string_hash_fn::_S_max;
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/hash_fn/string_hash_fn.hpp b/libstdc++-v3/testsuite/util/hash_fn/string_hash_fn.hpp
index b1990b4b390..00da3a95bce 100644
--- a/libstdc++-v3/testsuite/util/hash_fn/string_hash_fn.hpp
+++ b/libstdc++-v3/testsuite/util/hash_fn/string_hash_fn.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -73,6 +73,6 @@ namespace pb_ds
       }
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/hash_fn/string_ranged_hash_fn.hpp b/libstdc++-v3/testsuite/util/hash_fn/string_ranged_hash_fn.hpp
index e9a5465e485..ebfe6e2c605 100644
--- a/libstdc++-v3/testsuite/util/hash_fn/string_ranged_hash_fn.hpp
+++ b/libstdc++-v3/testsuite/util/hash_fn/string_ranged_hash_fn.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -104,6 +104,6 @@ namespace pb_ds
       { return ("string ranged-hash using" + string_form::desc()); }
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/hash_fn/string_ranged_probe_fn.hpp b/libstdc++-v3/testsuite/util/hash_fn/string_ranged_probe_fn.hpp
index 63bb0533c55..b677fed58b7 100644
--- a/libstdc++-v3/testsuite/util/hash_fn/string_ranged_probe_fn.hpp
+++ b/libstdc++-v3/testsuite/util/hash_fn/string_ranged_probe_fn.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -108,6 +108,6 @@ namespace pb_ds
       { return ("string ranged-probe using" + string_form::desc());}
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/io/illegal_input_error.hpp b/libstdc++-v3/testsuite/util/io/illegal_input_error.hpp
index 63675f9850c..033a90b3b1c 100644
--- a/libstdc++-v3/testsuite/util/io/illegal_input_error.hpp
+++ b/libstdc++-v3/testsuite/util/io/illegal_input_error.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -67,6 +67,6 @@ namespace pb_ds
 #endif
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_ILLEGAL_INPUT_EX_HPP
diff --git a/libstdc++-v3/testsuite/util/io/prog_bar.cc b/libstdc++-v3/testsuite/util/io/prog_bar.cc
index 365c5186532..b306762a9bd 100644
--- a/libstdc++-v3/testsuite/util/io/prog_bar.cc
+++ b/libstdc++-v3/testsuite/util/io/prog_bar.cc
@@ -46,7 +46,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -89,4 +89,4 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/testsuite/util/io/prog_bar.hpp b/libstdc++-v3/testsuite/util/io/prog_bar.hpp
index 0bbbda27854..b58f770933f 100644
--- a/libstdc++-v3/testsuite/util/io/prog_bar.hpp
+++ b/libstdc++-v3/testsuite/util/io/prog_bar.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -91,6 +91,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_PROG_BAR_HPP
diff --git a/libstdc++-v3/testsuite/util/io/text_populate.hpp b/libstdc++-v3/testsuite/util/io/text_populate.hpp
index a91097c5c93..c8bd15ebd24 100644
--- a/libstdc++-v3/testsuite/util/io/text_populate.hpp
+++ b/libstdc++-v3/testsuite/util/io/text_populate.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -75,7 +75,7 @@ namespace pb_ds
 	      std::cerr << "Cannot open file " << r_f_name.c_str() <<
                 std::endl;
 
-	      throw pb_ds::test::illegal_input_error();
+	      throw __gnu_pbds::test::illegal_input_error();
 	    }
 
 	  size_t i = 0;
@@ -93,7 +93,7 @@ namespace pb_ds
 	      std::cerr << "Read only " << static_cast(i) <<
                 " words" << std::endl;
 
-	      throw pb_ds::test::illegal_input_error();
+	      throw __gnu_pbds::test::illegal_input_error();
 	    }
 	}
       catch(...)
@@ -119,7 +119,7 @@ namespace pb_ds
 	      std::cerr << "Cannot open file " << r_f_name.c_str() <<
                 std::endl;
 
-	      throw pb_ds::test::illegal_input_error();
+	      throw __gnu_pbds::test::illegal_input_error();
 	    }
 
 	  typedef std::set< typename Vec::value_type::first_type> set_t;
@@ -145,7 +145,7 @@ namespace pb_ds
 	      std::cerr << "Read only " << static_cast(s.size()) <<
                 " words" << std::endl;
 
-	      throw pb_ds::test::illegal_input_error();
+	      throw __gnu_pbds::test::illegal_input_error();
 	    }
 	}
       catch(...)
@@ -158,6 +158,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TEXT_POPULATE_HPP
diff --git a/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.cc b/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.cc
index c24cd6fc10e..824f0d733f3 100644
--- a/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.cc
+++ b/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.cc
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -113,4 +113,4 @@ namespace pb_ds
       return false;
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp b/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp
index 725c75e6291..4e0b99216ce 100644
--- a/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp
+++ b/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -72,6 +72,6 @@ namespace pb_ds
     bool
     get_cmd_line_bool(int argc, char* a_p_argv[], int argn);
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_VERIFIED_CMD_LINE_INPUT_HPP
diff --git a/libstdc++-v3/testsuite/util/io/xml.hpp b/libstdc++-v3/testsuite/util/io/xml.hpp
index 506c1a10a0d..eb544da4442 100644
--- a/libstdc++-v3/testsuite/util/io/xml.hpp
+++ b/libstdc++-v3/testsuite/util/io/xml.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -126,6 +126,6 @@ namespace pb_ds
       return sstrm.str();
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_XML_HPP
diff --git a/libstdc++-v3/testsuite/util/io/xml_test_formatter.hpp b/libstdc++-v3/testsuite/util/io/xml_test_formatter.hpp
index ceedf817378..9eab6888ffb 100644
--- a/libstdc++-v3/testsuite/util/io/xml_test_formatter.hpp
+++ b/libstdc++-v3/testsuite/util/io/xml_test_formatter.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -83,6 +83,6 @@ namespace pb_ds
       { std::cout << "" << std::endl; }
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_XML_TEST_FORMATTER_HPP
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp
index be0e8f4227c..7bf1879b429 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp
@@ -62,7 +62,7 @@
 #include 
 #endif 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -79,7 +79,7 @@ namespace pb_ds
     template::type,
+	     typename Hash_Fn = typename __gnu_pbds::detail::default_hash_fn::type,
 	     typename Eq_Fn = std::equal_to,
 	     typename Less_Fn = std::less,
 	     typename Allocator = std::allocator
@@ -132,7 +132,7 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp
index a525ef20759..d787bc9bb7a 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -64,7 +64,7 @@ namespace pb_ds
     template::type,
+	     class Hash_Fn = typename __gnu_pbds::detail::default_hash_fn::type,
 	     class Eq_Fn = std::equal_to,
 	     class Less_Fn = std::less,
 	     class Allocator = std::allocator >
@@ -156,6 +156,6 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
index c78553b73fe..52d1aa13787 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
@@ -62,7 +62,7 @@
 #include 
 #endif
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -78,7 +78,7 @@ namespace pb_ds
 
     template::type,
+         typename Hash_Fn = typename __gnu_pbds::detail::default_hash_fn::type,
 	     typename Eq_Fn = std::equal_to,
 	     typename Less_Fn = std::less,
 	     typename Allocator = std::allocator
@@ -155,6 +155,6 @@ namespace pb_ds
 
 #undef PB_DS_BASE_C_DEC
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_tag.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_tag.hpp
index d4a19c2bda1..ad8fec10f2c 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_tag.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_tag.hpp
@@ -47,12 +47,12 @@
 #ifndef PB_DS_NATIVE_HASH_DS_TAG_HPP
 #define PB_DS_NATIVE_HASH_DS_TAG_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
     struct native_hash_tag { };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp
index d32730c230b..babe038d280 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -92,6 +92,6 @@ typename Allocator::template rebind >::other >
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_NATIVE_MAP_HPP
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp
index e2e1bafb3fb..2bec37473df 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -147,6 +147,6 @@ namespace pb_ds
 #undef PB_DS_BASE_C_DEC
 } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_NATIVE_MULTIMAP_HPP
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp
index 9d03adce3fc..c605ac6b18d 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -92,6 +92,6 @@ namespace pb_ds
 
 #undef PB_DS_BASE_C_DEC
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_NATIVE_SET_HPP
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp
index e8f8e705fb6..de2a019b273 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp
@@ -47,13 +47,13 @@
 #ifndef PB_DS_NATIVE_TREE_DS_TAG_HPP
 #define PB_DS_NATIVE_TREE_DS_TAG_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
     struct native_tree_tag
     { };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/native_type/priority_queue/native_priority_queue.hpp b/libstdc++-v3/testsuite/util/native_type/priority_queue/native_priority_queue.hpp
index 88b2697c4bd..81525c0bfc9 100644
--- a/libstdc++-v3/testsuite/util/native_type/priority_queue/native_priority_queue.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/priority_queue/native_priority_queue.hpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -229,6 +229,6 @@ namespace pb_ds
 #undef PB_DS_CLASS_C_DEC
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
index 3d2804e81f5..722811aac51 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -113,7 +113,7 @@ namespace pb_ds
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
index 1fb4eef9003..22300bb5b86 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -74,11 +74,11 @@ namespace pb_ds
 
       template
       size_t
-      insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::true_type);
+      insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::true_type);
 
       template
       size_t
-      insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::false_type);
+      insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::false_type);
 
       const It m_ins_b;
       const size_t m_ins_vn;
@@ -104,7 +104,7 @@ namespace pb_ds
 	  std::advance(ins_it_e, ins_size);
 
 	  const size_t delta_mem = insert(Cntnr(), ins_it_b, ins_it_e,
-					  pb_ds::detail::integral_constant());
+					  __gnu_pbds::detail::integral_constant());
 
 	  res_set_fmt.add_res(ins_size, static_cast(delta_mem));
 	}
@@ -114,7 +114,7 @@ namespace pb_ds
     template
     size_t
     multimap_insert_test::
-    insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::true_type)
+    insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::true_type)
     {
       typedef __gnu_test::tracker_allocator_counter counter_type;
       __gnu_test::tracker_allocator alloc;
@@ -133,7 +133,7 @@ namespace pb_ds
     template
     size_t
     multimap_insert_test::
-    insert(Cntnr, It ins_it_b, It ins_it_e, pb_ds::detail::false_type)
+    insert(Cntnr, It ins_it_b, It ins_it_e, __gnu_pbds::detail::false_type)
     {
       typedef __gnu_test::tracker_allocator_counter counter_type;
       __gnu_test::tracker_allocator alloc;
@@ -148,7 +148,7 @@ namespace pb_ds
       return (final_mem - init_mem);
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
index e0bb1e95d73..2d386ff2645 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -67,9 +67,9 @@ namespace pb_ds
       struct hash_set_tl_t
       {
 	typedef
-        typename pb_ds::test::hash_common_types<
+        typename __gnu_pbds::test::hash_common_types<
 	  Key,
-	  pb_ds::null_mapped_type,
+	  __gnu_pbds::null_mapped_type,
 	  int_hash,
 	  std::equal_to,
 	  Allocator>::performance_min_tl
@@ -80,9 +80,9 @@ namespace pb_ds
       struct lu_set_tl_t
       {
 	typedef
-        typename pb_ds::test::lu_common_types<
+        typename __gnu_pbds::test::lu_common_types<
 	  Key,
-	  pb_ds::null_mapped_type,
+	  __gnu_pbds::null_mapped_type,
 	  std::equal_to<
 	  Key>,
 	  Allocator>::performance_min_tl
@@ -96,8 +96,8 @@ namespace pb_ds
       {
       private:
 	typedef
-        typename pb_ds::detail::__conditional_type<
-	pb_ds::detail::is_same<
+        typename __gnu_pbds::detail::__conditional_type<
+	__gnu_pbds::detail::is_same<
 	int,
 	Key>::value,
 	int_hash,
@@ -108,7 +108,7 @@ namespace pb_ds
 	struct hash_mmap_transform
 	{
 	  typedef
-	  typename pb_ds::test::hash_common_types<
+	  typename __gnu_pbds::test::hash_common_types<
 	    Key,
 	    Cntnr_T,
 	    hash_fn_t,
@@ -137,12 +137,12 @@ namespace pb_ds
 	struct tree_mmap_transform
 	{
 	  typedef
-	  typename pb_ds::test::tree_common_types<
+	  typename __gnu_pbds::test::tree_common_types<
 	    Key,
 	    Cntnr_T,
 	    std::less<
 	    Key>,
-	    pb_ds::null_tree_node_update,
+	    __gnu_pbds::null_tree_node_update,
 	    Allocator>::performance_min_tl
 	  type;
 	};
@@ -227,7 +227,7 @@ namespace pb_ds
     };
 
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
index be4a31b3bdc..72cdf115cbc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
@@ -49,25 +49,25 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
   {
 
     typedef
-    pb_ds::test::hash_common_types<
+    __gnu_pbds::test::hash_common_types<
       int,
-      pb_ds::null_mapped_type>::tl
+      __gnu_pbds::null_mapped_type>::tl
     hash_set_tl_t;
 
     template
     struct hash_mmap_transform
     {
       typedef
-      typename pb_ds::test::hash_common_types<
+      typename __gnu_pbds::test::hash_common_types<
 	int,
-	pb_ds::compound_data_type<
+	__gnu_pbds::compound_data_type<
 	Cntnr_T> >::tl
       type;
     };
@@ -80,18 +80,18 @@ namespace pb_ds
     hash_mmap_tl_t;
 
     typedef
-    pb_ds::test::tree_common_types<
+    __gnu_pbds::test::tree_common_types<
       int,
-      pb_ds::null_mapped_type>::tl
+      __gnu_pbds::null_mapped_type>::tl
     tree_set_tl_t;
 
     template
     struct tree_mmap_transform
     {
       typedef
-      typename pb_ds::test::tree_common_types<
+      typename __gnu_pbds::test::tree_common_types<
 	int,
-	pb_ds::compound_data_type<
+	__gnu_pbds::compound_data_type<
 	Cntnr_T> >::tl
       type;
     };
@@ -107,7 +107,7 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_MULTIMAP_RANDOM_INT_INSERT_TEST_COMMON_TYPE_HPP
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
index bffac262247..d9ec7fb1572 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -111,7 +111,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class find_test : private pb_ds::test::detail::timing_test_base
+    class find_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       find_test(It ins_b, It fnd_it_b, size_t ins_vn, size_t ins_vs, 
@@ -161,16 +161,16 @@ namespace pb_ds
 	  It fnd_it_e = m_fnd_it_b;
 	  std::advance(fnd_it_e, fnd_size);
 
-	  pb_ds::test::detail::find_find_functor
+	  __gnu_pbds::test::detail::find_find_functor
             fn(test_container, fnd_it_b, fnd_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 	  res_set_fmt.add_res(v, res / fnd_size);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
index c1ff8eb064a..b4dfa29b8cf 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class insert_test : private pb_ds::test::detail::timing_test_base
+    class insert_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       insert_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -126,11 +126,11 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::insert_insert_functor
+	  __gnu_pbds::test::detail::insert_insert_functor
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
@@ -147,7 +147,7 @@ namespace pb_ds
         cntnr.insert((typename Cntnr::const_reference)(*ins_it));
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
index 019a32d2a23..efd5997bf54 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -128,7 +128,7 @@ namespace pb_ds
 
 
     template
-    class multimap_find_test : private pb_ds::test::detail::timing_test_base
+    class multimap_find_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       multimap_find_test(It ins_b, size_t ins_vn, size_t vs, size_t ins_vm)
@@ -144,12 +144,12 @@ namespace pb_ds
 
       template
       Cntnr
-      init(It ins_b, It ins_e, Cntnr, pb_ds::detail::true_type)
+      init(It ins_b, It ins_e, Cntnr, __gnu_pbds::detail::true_type)
       { return Cntnr(ins_b, ins_e); }
 
       template
       Cntnr
-      init(It ins_b, It ins_e, Cntnr, pb_ds::detail::false_type)
+      init(It ins_b, It ins_e, Cntnr, __gnu_pbds::detail::false_type)
       {
 	Cntnr ret;
 	for (It it = ins_b; it != ins_e; ++it)
@@ -182,19 +182,19 @@ namespace pb_ds
 	  std::advance(ins_it_e, v);
 
 	  Cntnr c = init(ins_it_b, ins_it_e, Cntnr(),
-			 pb_ds::detail::integral_constant());
+			 __gnu_pbds::detail::integral_constant());
 
-	  pb_ds::test::detail::multimap_find_functor
+	  __gnu_pbds::test::detail::multimap_find_functor
             fn(c, ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
index e911f859483..bbdc2455c94 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -108,7 +108,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class multimap_insert_test : private pb_ds::test::detail::timing_test_base
+    class multimap_insert_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       multimap_insert_test(It b, size_t ins_vn, size_t ins_vs, size_t ins_vm) 
@@ -146,16 +146,16 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::multimap_insert_functor
+	  __gnu_pbds::test::detail::multimap_insert_functor
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
index 6415cd8ece0..af84e9c9436 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -86,7 +86,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class subscript_find_test : private pb_ds::test::detail::timing_test_base
+    class subscript_find_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       subscript_find_test(It ins_b, It b, size_t ins_vn, size_t ins_vs, 
@@ -138,17 +138,17 @@ namespace pb_ds
 	  It fnd_it_e = m_fnd_b;
 	  std::advance(fnd_it_e, fnd_size);
 
-	  pb_ds::test::detail::subscript_find_functor
+	  __gnu_pbds::test::detail::subscript_find_functor
             fn(test_container, fnd_it_b, fnd_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / fnd_size);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
index 3b9efb02978..c9a9b9fdecc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class subscript_insert_test : private pb_ds::test::detail::timing_test_base
+    class subscript_insert_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       subscript_insert_test(It ins_b, It b, size_t ins_vn, size_t ins_vs, 
@@ -128,17 +128,17 @@ namespace pb_ds
 	  It ins_it_b = m_ins_b;
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
-	  pb_ds::test::detail::subscript_insert_functor
+	  __gnu_pbds::test::detail::subscript_insert_functor
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
index fb9b2c043db..8ccbfb95207 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
@@ -54,7 +54,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -73,7 +73,7 @@ namespace pb_ds
 	  enum
 	    {
 	      support_detected =
-	      pb_ds::test::detail::tree_supports_order_statistics::value
+	      __gnu_pbds::test::detail::tree_supports_order_statistics::value
 	    };
 
 	  PB_DS_STATIC_ASSERT(correct_type, support_detected);
@@ -126,7 +126,7 @@ namespace pb_ds
 
     template
     class tree_order_statistics_test 
-    : private pb_ds::test::detail::timing_test_base
+    : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       tree_order_statistics_test(size_t vn, size_t vs, size_t vm)
@@ -142,11 +142,11 @@ namespace pb_ds
 
       template
       void
-      order_statistics(Cntnr& r_container, pb_ds::detail::true_type);
+      order_statistics(Cntnr& r_container, __gnu_pbds::detail::true_type);
 
       template
       void
-      order_statistics(Cntnr& r_container, pb_ds::detail::false_type);
+      order_statistics(Cntnr& r_container, __gnu_pbds::detail::false_type);
 
     private:
       const size_t m_vn;
@@ -170,17 +170,17 @@ namespace pb_ds
 	  for (size_t ins = 0; ins < v; ++ ins)
             cntnr.insert((typename Cntnr::value_type)ins);
 
-	  pb_ds::test::detail::order_statistics_functor
+	  __gnu_pbds::test::detail::order_statistics_functor
             fn(cntnr);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
index 6c906522e37..7595dc2cb0d 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -111,7 +111,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class tree_split_join_test : private pb_ds::test::detail::timing_test_base
+    class tree_split_join_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       tree_split_join_test(size_t vn, size_t vs, size_t vm);
@@ -153,16 +153,16 @@ namespace pb_ds
 	  for (size_t ins = 0; ins < v; ++ ins)
             cntnr.insert((typename Cntnr::value_type)ins);
 
-	  pb_ds::test::detail::split_join_functor
+	  __gnu_pbds::test::detail::split_join_functor
             fn(cntnr);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 	  res_set_fmt.add_res(v, res);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp b/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp
index e7d48d7dc48..fdaa65e73c0 100644
--- a/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp
+++ b/libstdc++-v3/testsuite/util/performance/io/xml_formatter.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -83,6 +83,6 @@ namespace pb_ds
       }
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_XML_TEST_PERFORMANCE_FORMATTER_HPP
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
index a3b8486f191..4f84fa64b9c 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -115,7 +115,7 @@ namespace pb_ds
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
index d04f9041b3c..e419e4f173a 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -114,7 +114,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class join_test : private pb_ds::test::detail::timing_test_base
+    class join_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       join_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -125,9 +125,9 @@ namespace pb_ds
       void
       operator()(Cntnr)
       {
-	using pb_ds::test::detail::double_push_functor;
-	using pb_ds::test::detail::double_push_join_functor;
-	typedef pb_ds::test::detail::timing_test_base base_type;
+	using __gnu_pbds::test::detail::double_push_functor;
+	using __gnu_pbds::test::detail::double_push_join_functor;
+	typedef __gnu_pbds::test::detail::timing_test_base base_type;
 	typedef double_push_functor psh_fnct;
 	typedef double_push_join_functor psh_jn_fnct;
 
@@ -171,7 +171,7 @@ namespace pb_ds
       const size_t 	m_ins_vm;
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
index 33c7e58bdd1..1ce1804f297 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -126,7 +126,7 @@ namespace pb_ds
 
       // Specializations.
       template
-      class push_functor
+      class push_functor
       {
       public:
         push_functor(It ins_it_b,  It ins_it_e) 
@@ -151,7 +151,7 @@ namespace pb_ds
       };
 
       template
-      class push_functor
+      class push_functor
       {
       public:
         push_functor(It ins_it_b,  It ins_it_e) 
@@ -178,7 +178,7 @@ namespace pb_ds
 
 
       template
-      class push_modify_functor
+      class push_modify_functor
       {
       private:
 	typedef typename Cntnr::iterator iterator;
@@ -220,7 +220,7 @@ namespace pb_ds
       };
 
       template
-      class push_modify_functor
+      class push_modify_functor
       {
       private:
 	typedef typename Cntnr::value_type value_type;
@@ -253,7 +253,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class modify_test : private pb_ds::test::detail::timing_test_base
+    class modify_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       modify_test(It b, size_t vn, size_t vs, size_t vm, bool modify_up)
@@ -333,7 +333,7 @@ namespace pb_ds
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
index ef04c3258cc..a2303f9b1b3 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -88,7 +88,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class push_pop_test : private pb_ds::test::detail::timing_test_base
+    class push_pop_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       push_pop_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -135,17 +135,17 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::push_pop_push_pop_functor
+	  __gnu_pbds::test::detail::push_pop_push_pop_functor
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
index d6f280501dd..961c00ec638 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
     } // namespace detail
 
     template
-    class push_test : private pb_ds::test::detail::timing_test_base
+    class push_test : private __gnu_pbds::test::detail::timing_test_base
     {
     public:
       push_test(It ins_b, size_t ins_vn, size_t ins_vs, size_t ins_vm)
@@ -127,11 +127,11 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, v);
 
-	  pb_ds::test::detail::push_push_functor
+	  __gnu_pbds::test::detail::push_push_functor
             fn(ins_it_b, ins_it_e);
 
 	  const double res =
-            pb_ds::test::detail::timing_test_base::operator()(fn);
+            __gnu_pbds::test::detail::timing_test_base::operator()(fn);
 
 	  res_set_fmt.add_res(v, res / v);
 	}
@@ -148,7 +148,7 @@ namespace pb_ds
         cntnr.push((typename Cntnr::const_reference)(*ins_it));
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc
index 39748bf2d8d..e21d14dc61e 100644
--- a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc
+++ b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.cc
@@ -46,7 +46,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -75,4 +75,4 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp
index 06d9b307984..2ab7ac0e310 100644
--- a/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp
+++ b/libstdc++-v3/testsuite/util/performance/time/elapsed_timer.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -72,6 +72,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TEST_TIME_HPP
diff --git a/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp b/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp
index a56d2c21313..8e4cd99dc0e 100644
--- a/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp
+++ b/libstdc++-v3/testsuite/util/performance/time/timing_test_base.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -81,7 +81,7 @@ namespace pb_ds
       timing_test_base::operator()(Functor& fn)
       {
 	const std::size_t resolution = get_min_resolution(fn);
-	pb_ds::test::detail::result_recorder rec;
+	__gnu_pbds::test::detail::result_recorder rec;
 	double res;
 	do
 	  res = run_at_resolution(fn, resolution);
@@ -121,7 +121,7 @@ namespace pb_ds
 
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp b/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp
index 0f86f38da3d..61f04a8336d 100644
--- a/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -72,15 +72,15 @@ namespace test
     }
   };
 
-  typedef pb_ds::string_trie_e_access_traits e_access_traits_t;
+  typedef __gnu_pbds::string_trie_e_access_traits e_access_traits_t;
 
   template
   struct tree_types
   {
   private:
-    typedef typename tree_common_types, pb_ds::null_tree_node_update, alloc_type>::regression_tl no_order_statistics_tl_t;
+    typedef typename tree_common_types, __gnu_pbds::null_tree_node_update, alloc_type>::regression_tl no_order_statistics_tl_t;
 
-    typedef typename tree_common_types, pb_ds::tree_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t;
+    typedef typename tree_common_types, __gnu_pbds::tree_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t;
 
   public:
     typedef typename __gnu_cxx::typelist::append::type tl_t;
@@ -92,11 +92,11 @@ namespace test
   struct trie_types
   {
   private:
-    typedef typename trie_common_types::regression_tl no_updates_tl_t;
+    typedef typename trie_common_types::regression_tl no_updates_tl_t;
 
-    typedef typename trie_common_types::regression_tl order_statistics_tl_t;
+    typedef typename trie_common_types::regression_tl order_statistics_tl_t;
 
-    typedef typename trie_common_types::regression_tl prefix_search_tl_t;
+    typedef typename trie_common_types::regression_tl prefix_search_tl_t;
 
   public:
     typedef typename __gnu_cxx::typelist::append::type>::type tl_t;
@@ -140,6 +140,6 @@ namespace test
   typedef trie_types::tl_t 			trie_map_tl_t;
   typedef trie_types::min_tl_t 		min_trie_map_tl_t;
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/regression/basic_type.hpp b/libstdc++-v3/testsuite/util/regression/basic_type.hpp
index ad93bf47142..93a12922ffa 100644
--- a/libstdc++-v3/testsuite/util/regression/basic_type.hpp
+++ b/libstdc++-v3/testsuite/util/regression/basic_type.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -99,6 +99,6 @@ namespace test
 #undef PB_DS_BASE_C_DEC
 
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp b/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp
index ce5a9e81a01..7740a913852 100644
--- a/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/regression/priority_queue/common_type.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -60,6 +60,6 @@ namespace test
 
   typedef pq_tl_t min_pq_tl_t;
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp
index 3f77c219e00..7eaa3968f9a 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/container_rand_regression_test.hpp
@@ -58,7 +58,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -137,7 +137,7 @@ namespace detail
     typedef typename test_traits::value_type 		value_type;
     typedef typename test_traits::native_type 		native_type;
     typedef twister_rand_gen 				gen;
-    typedef pb_ds::container_traits 		container_traits;
+    typedef __gnu_pbds::container_traits 		container_traits;
     typedef __gnu_cxx::throw_allocator 		alloc_t;
 
     enum op
@@ -173,52 +173,52 @@ namespace detail
     iterator_defs();
 
     static void
-    node_iterator_defs(pb_ds::detail::false_type);
+    node_iterator_defs(__gnu_pbds::detail::false_type);
 
     static void
-    node_iterator_defs(pb_ds::detail::true_type);
+    node_iterator_defs(__gnu_pbds::detail::true_type);
 
     static void
     policy_defs();
 
     static void
-    policy_defs(pb_ds::basic_hash_tag);
+    policy_defs(__gnu_pbds::basic_hash_tag);
 
     static void
-    policy_defs(pb_ds::cc_hash_tag);
+    policy_defs(__gnu_pbds::cc_hash_tag);
 
     static void
-    policy_defs(pb_ds::gp_hash_tag);
+    policy_defs(__gnu_pbds::gp_hash_tag);
 
     static void
-    policy_defs(pb_ds::tree_tag);
+    policy_defs(__gnu_pbds::tree_tag);
 
     static void
-    policy_defs(pb_ds::list_update_tag);
+    policy_defs(__gnu_pbds::list_update_tag);
 
     static void
-    policy_defs(pb_ds::pat_trie_tag);
+    policy_defs(__gnu_pbds::pat_trie_tag);
 
     void
     policy_access();
 
     void
-    policy_access(pb_ds::basic_hash_tag);
+    policy_access(__gnu_pbds::basic_hash_tag);
 
     void
-    policy_access(pb_ds::cc_hash_tag);
+    policy_access(__gnu_pbds::cc_hash_tag);
 
     void
-    policy_access(pb_ds::gp_hash_tag);
+    policy_access(__gnu_pbds::gp_hash_tag);
 
     void
-    policy_access(pb_ds::tree_tag);
+    policy_access(__gnu_pbds::tree_tag);
 
     void
-    policy_access(pb_ds::list_update_tag);
+    policy_access(__gnu_pbds::list_update_tag);
 
     void
-    policy_access(pb_ds::pat_trie_tag);
+    policy_access(__gnu_pbds::pat_trie_tag);
 
     void
     it_copy();
@@ -233,16 +233,16 @@ namespace detail
     rev_it_assign();
 
     void
-    rev_it_copy_imp(pb_ds::detail::false_type);
+    rev_it_copy_imp(__gnu_pbds::detail::false_type);
 
     void
-    rev_it_copy_imp(pb_ds::detail::true_type);
+    rev_it_copy_imp(__gnu_pbds::detail::true_type);
 
     void
-    rev_it_assign_imp(pb_ds::detail::false_type);
+    rev_it_assign_imp(__gnu_pbds::detail::false_type);
 
     void
-    rev_it_assign_imp(pb_ds::detail::true_type);
+    rev_it_assign_imp(__gnu_pbds::detail::true_type);
 
     bool
     default_constructor();
@@ -260,19 +260,19 @@ namespace detail
     it_constructor();
 
     bool
-    it_constructor_imp(pb_ds::cc_hash_tag);
+    it_constructor_imp(__gnu_pbds::cc_hash_tag);
 
     bool
-    it_constructor_imp(pb_ds::gp_hash_tag);
+    it_constructor_imp(__gnu_pbds::gp_hash_tag);
 
     bool
-    it_constructor_imp(pb_ds::tree_tag);
+    it_constructor_imp(__gnu_pbds::tree_tag);
 
     bool
-    it_constructor_imp(pb_ds::list_update_tag);
+    it_constructor_imp(__gnu_pbds::list_update_tag);
 
     bool
-    it_constructor_imp(pb_ds::pat_trie_tag);
+    it_constructor_imp(__gnu_pbds::pat_trie_tag);
 
     bool
     insert();
@@ -284,19 +284,19 @@ namespace detail
     erase_it();
 
     bool
-    erase_it_imp(pb_ds::detail::false_type);
+    erase_it_imp(__gnu_pbds::detail::false_type);
 
     bool
-    erase_it_imp(pb_ds::detail::true_type);
+    erase_it_imp(__gnu_pbds::detail::true_type);
 
     bool
     erase_rev_it();
 
     bool
-    erase_rev_it_imp(pb_ds::detail::false_type);
+    erase_rev_it_imp(__gnu_pbds::detail::false_type);
 
     bool
-    erase_rev_it_imp(pb_ds::detail::true_type);
+    erase_rev_it_imp(__gnu_pbds::detail::true_type);
 
     bool
     erase_if();
@@ -308,46 +308,46 @@ namespace detail
     resize();
 
     bool
-    resize_imp(pb_ds::detail::true_type);
+    resize_imp(__gnu_pbds::detail::true_type);
 
     bool
-    resize_imp(pb_ds::detail::false_type);
+    resize_imp(__gnu_pbds::detail::false_type);
 
     bool
     get_set_loads();
 
     bool
-    get_set_loads_imp(pb_ds::detail::true_type);
+    get_set_loads_imp(__gnu_pbds::detail::true_type);
 
     bool
-    get_set_loads_imp(pb_ds::detail::false_type);
+    get_set_loads_imp(__gnu_pbds::detail::false_type);
 
     void
     get_set_load();
 
     void
-    get_set_load_imp(pb_ds::detail::true_type);
+    get_set_load_imp(__gnu_pbds::detail::true_type);
 
     void
-    get_set_load_imp(pb_ds::detail::false_type);
+    get_set_load_imp(__gnu_pbds::detail::false_type);
 
     bool
     subscript();
 
     bool
-    subscript_imp(pb_ds::detail::false_type);
+    subscript_imp(__gnu_pbds::detail::false_type);
 
     bool
-    subscript_imp(pb_ds::detail::true_type);
+    subscript_imp(__gnu_pbds::detail::true_type);
 
     bool
     split_join();
 
     bool
-    split_join_imp(pb_ds::detail::false_type);
+    split_join_imp(__gnu_pbds::detail::false_type);
 
     bool
-    split_join_imp(pb_ds::detail::true_type);
+    split_join_imp(__gnu_pbds::detail::true_type);
 
     void
     cmp(const Cntnr&, const native_type&, const std::string&);
@@ -360,43 +360,43 @@ namespace detail
 
     void
     order_preserving_cmp_imp(const Cntnr&, const native_type&, 
-			     pb_ds::detail::false_type);
+			     __gnu_pbds::detail::false_type);
 
     void
     order_preserving_cmp_imp(const Cntnr&, const native_type&, 
-			     pb_ds::detail::true_type);
+			     __gnu_pbds::detail::true_type);
 
     void
     back_order_preserving_cmp_imp(const Cntnr&, const native_type&, 
-				  pb_ds::detail::false_type);
+				  __gnu_pbds::detail::false_type);
 
     void
     back_order_preserving_cmp_imp(const Cntnr&, const native_type&, 
-				  pb_ds::detail::true_type);
+				  __gnu_pbds::detail::true_type);
 
     void
     reverse_iteration_cmp_imp(const Cntnr&, const native_type&, 
-			      pb_ds::detail::false_type);
+			      __gnu_pbds::detail::false_type);
 
     void
     reverse_iteration_cmp_imp(const Cntnr&, const native_type&, 
-			      pb_ds::detail::true_type);
+			      __gnu_pbds::detail::true_type);
 
     void
     order_statistics_cmp_imp(const Cntnr&, const native_type&, 
-			     pb_ds::detail::false_type);
+			     __gnu_pbds::detail::false_type);
 
     void
     order_statistics_cmp_imp(const Cntnr&, const native_type&, 
-			     pb_ds::detail::true_type);
+			     __gnu_pbds::detail::true_type);
 
     void
     prefix_search_cmp_imp(const Cntnr&, const native_type&, 
-			  pb_ds::detail::false_type);
+			  __gnu_pbds::detail::false_type);
 
     void
     prefix_search_cmp_imp(const Cntnr&, const native_type&, 
-			  pb_ds::detail::true_type);
+			  __gnu_pbds::detail::true_type);
 
     template
     void
@@ -408,19 +408,19 @@ namespace detail
 
     void
     lower_bound_cmp_imp(const Cntnr&, const native_type&, 
-			pb_ds::detail::false_type);
+			__gnu_pbds::detail::false_type);
 
     void
     lower_bound_cmp_imp(const Cntnr&, const native_type&, 
-			pb_ds::detail::true_type);
+			__gnu_pbds::detail::true_type);
 
     void
     upper_bound_cmp_imp(const Cntnr&, const native_type&, 
-			pb_ds::detail::false_type);
+			__gnu_pbds::detail::false_type);
 
     void
     upper_bound_cmp_imp(const Cntnr&, const native_type&, 
-			pb_ds::detail::true_type);
+			__gnu_pbds::detail::true_type);
 
     void
     print_container(const native_type&, std::ostream& r_os = std::cerr) const;
@@ -495,6 +495,6 @@ namespace detail
 
 } // namespace detail
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp
index 2b1325f8e51..3b19a752696 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/cmp_fn_imps.hpp
@@ -140,50 +140,50 @@ cmp_(const Cntnr& r_c, const native_type& r_native_c)
       container_traits::order_preserving,
       back_order_preserving =
       container_traits::order_preserving&& 
-      !pb_ds::detail::is_same<
+      !__gnu_pbds::detail::is_same<
       typename std::iterator_traits<
       typename cntnr::const_iterator>::iterator_category,
       std::forward_iterator_tag>::value,
       reverse_iteration = container_traits::reverse_iteration,
       order_statistics = test_traits::order_statistics,
       prefix_search = test_traits::prefix_search,
-      has_mapped = !pb_ds::detail::is_same<
+      has_mapped = !__gnu_pbds::detail::is_same<
       typename Cntnr::mapped_type,
-      pb_ds::null_mapped_type>::value
+      __gnu_pbds::null_mapped_type>::value
     };
 
   order_preserving_cmp_imp(r_c, r_native_c,
-			   pb_ds::detail::integral_constant());
+			   __gnu_pbds::detail::integral_constant());
 
   back_order_preserving_cmp_imp(r_c, r_native_c,
-				pb_ds::detail::integral_constant());
+				__gnu_pbds::detail::integral_constant());
 
   order_statistics_cmp_imp(r_c, r_native_c,
-			   pb_ds::detail::integral_constant());
+			   __gnu_pbds::detail::integral_constant());
 
   prefix_search_cmp_imp(r_c, r_native_c,
-			pb_ds::detail::integral_constant());
+			__gnu_pbds::detail::integral_constant());
 
   reverse_iteration_cmp_imp(r_c, r_native_c,
-			    pb_ds::detail::integral_constant());
+			    __gnu_pbds::detail::integral_constant());
 
   lower_bound_cmp_imp(r_c, r_native_c,
-		      pb_ds::detail::integral_constant());
+		      __gnu_pbds::detail::integral_constant());
 
   upper_bound_cmp_imp(r_c, r_native_c,
-		      pb_ds::detail::integral_constant());
+		      __gnu_pbds::detail::integral_constant());
 }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   PB_DS_SET_DESTRUCT_PRINT
 
@@ -217,13 +217,13 @@ order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds:
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-back_order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+back_order_preserving_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-back_order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+back_order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   PB_DS_SET_DESTRUCT_PRINT
 
@@ -241,13 +241,13 @@ back_order_preserving_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, p
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-reverse_iteration_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+reverse_iteration_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-reverse_iteration_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+reverse_iteration_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   PB_DS_SET_DESTRUCT_PRINT
 
@@ -281,13 +281,13 @@ reverse_iteration_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-order_statistics_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+order_statistics_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-order_statistics_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+order_statistics_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   {
     m_alloc.set_throw_prob(0);
@@ -350,13 +350,13 @@ order_statistics_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds:
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-prefix_search_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+prefix_search_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-prefix_search_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+prefix_search_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   PB_DS_SET_DESTRUCT_PRINT
 
@@ -495,13 +495,13 @@ back_it_cmp_imp(Const_It b, Const_It e, Const_Native_It native_b, Const_Native_I
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-lower_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+lower_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-lower_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+lower_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   PB_DS_SET_DESTRUCT_PRINT
 
@@ -548,13 +548,13 @@ lower_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::deta
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-upper_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, pb_ds::detail::false_type)
+upper_bound_cmp_imp(const Cntnr& /*r_c*/, const native_type& /*r_native_c*/, __gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-upper_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, pb_ds::detail::true_type)
+upper_bound_cmp_imp(const Cntnr& r_c, const native_type& r_native_c, __gnu_pbds::detail::true_type)
 {
   PB_DS_SET_DESTRUCT_PRINT
 
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp
index 66a7077470f..c6b02b61a17 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/constructor_destructor_fn_imps.hpp
@@ -162,7 +162,7 @@ it_constructor()
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-it_constructor_imp(pb_ds::cc_hash_tag)
+it_constructor_imp(__gnu_pbds::cc_hash_tag)
 {
   bool done = true;
   Cntnr* p_c = NULL;
@@ -229,7 +229,7 @@ it_constructor_imp(pb_ds::cc_hash_tag)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-it_constructor_imp(pb_ds::gp_hash_tag)
+it_constructor_imp(__gnu_pbds::gp_hash_tag)
 {
   bool done = true;
   Cntnr* p_c = NULL;
@@ -312,7 +312,7 @@ it_constructor_imp(pb_ds::gp_hash_tag)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-it_constructor_imp(pb_ds::tree_tag)
+it_constructor_imp(__gnu_pbds::tree_tag)
 {
   bool done = true;
   Cntnr* p_c = NULL;
@@ -348,7 +348,7 @@ it_constructor_imp(pb_ds::tree_tag)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-it_constructor_imp(pb_ds::list_update_tag)
+it_constructor_imp(__gnu_pbds::list_update_tag)
 {
   bool done = true;
   Cntnr* p_c = NULL;
@@ -373,7 +373,7 @@ it_constructor_imp(pb_ds::list_update_tag)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-it_constructor_imp(pb_ds::pat_trie_tag)
+it_constructor_imp(__gnu_pbds::pat_trie_tag)
 {
   bool done = true;
   Cntnr* p_c = NULL;
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp
index 68829d3e187..0acb20cd62e 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/defs_fn_imps.hpp
@@ -63,7 +63,7 @@ defs()
 
   iterator_defs();
 
-  node_iterator_defs(pb_ds::detail::integral_constant());
 
   policy_defs();
@@ -124,7 +124,7 @@ void
 PB_DS_CLASS_C_DEC::
 ds_defs()
 {
-  typedef pb_ds::container_traits< Cntnr> test_container_traits;
+  typedef __gnu_pbds::container_traits< Cntnr> test_container_traits;
 
   typedef typename test_container_traits::container_category test_container_category;
 
@@ -162,13 +162,13 @@ iterator_defs()
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-node_iterator_defs(pb_ds::detail::false_type)
+node_iterator_defs(__gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-node_iterator_defs(pb_ds::detail::true_type)
+node_iterator_defs(__gnu_pbds::detail::true_type)
 {
   typedef typename Cntnr::node_iterator test_node_iterator;
 
@@ -188,7 +188,7 @@ policy_defs()
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_defs(pb_ds::basic_hash_tag)
+policy_defs(__gnu_pbds::basic_hash_tag)
 {
   typedef typename Cntnr::hash_fn test_hash_fn;
 
@@ -200,9 +200,9 @@ policy_defs(pb_ds::basic_hash_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_defs(pb_ds::cc_hash_tag)
+policy_defs(__gnu_pbds::cc_hash_tag)
 {
-  policy_defs(pb_ds::basic_hash_tag());
+  policy_defs(__gnu_pbds::basic_hash_tag());
 
   typedef typename Cntnr::comb_hash_fn test_comb_hash_fn;
 }
@@ -210,9 +210,9 @@ policy_defs(pb_ds::cc_hash_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_defs(pb_ds::gp_hash_tag)
+policy_defs(__gnu_pbds::gp_hash_tag)
 {
-  policy_defs(pb_ds::basic_hash_tag());
+  policy_defs(__gnu_pbds::basic_hash_tag());
 
   typedef typename Cntnr::comb_probe_fn test_comb_probe_fn;
 
@@ -222,7 +222,7 @@ policy_defs(pb_ds::gp_hash_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_defs(pb_ds::tree_tag)
+policy_defs(__gnu_pbds::tree_tag)
 {
   typedef typename Cntnr::cmp_fn test_cmp_fn;
 
@@ -232,7 +232,7 @@ policy_defs(pb_ds::tree_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_defs(pb_ds::list_update_tag)
+policy_defs(__gnu_pbds::list_update_tag)
 {
   typedef typename Cntnr::eq_fn test_eq_fn;
 
@@ -242,7 +242,7 @@ policy_defs(pb_ds::list_update_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_defs(pb_ds::pat_trie_tag)
+policy_defs(__gnu_pbds::pat_trie_tag)
 {
   typedef typename Cntnr::e_access_traits e_access_traits;
 }
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp
index 0622d9eeef9..0bd39f33bb3 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/erase_fn_imps.hpp
@@ -166,13 +166,13 @@ erase_it()
       container_traits::order_preserving
     };
 
-  return (erase_it_imp(pb_ds::detail::integral_constant()));
+  return (erase_it_imp(__gnu_pbds::detail::integral_constant()));
 }
 
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-erase_it_imp(pb_ds::detail::false_type)
+erase_it_imp(__gnu_pbds::detail::false_type)
 {
   return (true);
 }
@@ -180,7 +180,7 @@ erase_it_imp(pb_ds::detail::false_type)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-erase_it_imp(pb_ds::detail::true_type)
+erase_it_imp(__gnu_pbds::detail::true_type)
 {
   PB_DS_TRACE("erase_it");
 
@@ -222,9 +222,9 @@ erase_it_imp(pb_ds::detail::true_type)
 	  m_native_c.erase(native_it);
 
         bool range_guarantee =
-	  pb_ds::detail::is_same<
+	  __gnu_pbds::detail::is_same<
 	  typename container_traits::invalidation_guarantee,
-	  pb_ds::range_invalidation_guarantee>::value ;
+	  __gnu_pbds::range_invalidation_guarantee>::value ;
 
         if (range_guarantee)
 	  PB_DS_THROW_IF_FAILED(                next_ers_it == next_it,  "",  m_p_c, & m_native_c);
@@ -255,13 +255,13 @@ erase_rev_it()
       container_traits::reverse_iteration
     };
 
-  return (erase_rev_it_imp(pb_ds::detail::integral_constant()));
+  return (erase_rev_it_imp(__gnu_pbds::detail::integral_constant()));
 }
 
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-erase_rev_it_imp(pb_ds::detail::false_type)
+erase_rev_it_imp(__gnu_pbds::detail::false_type)
 {
   return (true);
 }
@@ -269,7 +269,7 @@ erase_rev_it_imp(pb_ds::detail::false_type)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-erase_rev_it_imp(pb_ds::detail::true_type)
+erase_rev_it_imp(__gnu_pbds::detail::true_type)
 {
   PB_DS_TRACE("erase_rev_it");
 
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp
index 8f58f3e2c46..adc87271c25 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_load_fn_imps.hpp
@@ -50,7 +50,7 @@ PB_DS_CLASS_C_DEC::
 get_set_load()
 {
   typedef
-    pb_ds::detail::integral_constant
     get_set_load_ind;
 
@@ -60,13 +60,13 @@ get_set_load()
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-get_set_load_imp(pb_ds::detail::false_type)
+get_set_load_imp(__gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-get_set_load_imp(pb_ds::detail::true_type)
+get_set_load_imp(__gnu_pbds::detail::true_type)
 {
   PB_DS_TRACE("get_set_load");
 
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp
index cbcac81c631..10ea2aed941 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/get_set_loads_fn_imps.hpp
@@ -50,7 +50,7 @@ PB_DS_CLASS_C_DEC::
 get_set_loads()
 {
   typedef
-    pb_ds::detail::integral_constant
     get_set_loads_ind;
 
@@ -60,7 +60,7 @@ get_set_loads()
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-get_set_loads_imp(pb_ds::detail::false_type)
+get_set_loads_imp(__gnu_pbds::detail::false_type)
 {
   return (true);
 }
@@ -68,7 +68,7 @@ get_set_loads_imp(pb_ds::detail::false_type)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-get_set_loads_imp(pb_ds::detail::true_type)
+get_set_loads_imp(__gnu_pbds::detail::true_type)
 {
   PB_DS_TRACE("get_set_loads");
 
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp
index 78fc38907b6..e5bf3be35b0 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/insert_fn_imps.hpp
@@ -77,7 +77,7 @@ insert()
       {
         done = false;
       }
-    catch(pb_ds::insert_error&)
+    catch(__gnu_pbds::insert_error&)
       {
         PB_DS_THROW_IF_FAILED(false, "", m_p_c, &m_native_c);
       }
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp
index 14d89e1ebf9..2a3c6396e8a 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/it_conversion_fn_imps.hpp
@@ -195,7 +195,7 @@ rev_it_copy()
       reverse_iteration = container_traits::reverse_iteration
     };
 
-  rev_it_copy_imp(pb_ds::detail::integral_constant());
+  rev_it_copy_imp(__gnu_pbds::detail::integral_constant());
 }
 
 PB_DS_CLASS_T_DEC
@@ -208,19 +208,19 @@ rev_it_assign()
       reverse_iteration = container_traits::reverse_iteration
     };
 
-  rev_it_assign_imp(pb_ds::detail::integral_constant());
+  rev_it_assign_imp(__gnu_pbds::detail::integral_constant());
 }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-rev_it_copy_imp(pb_ds::detail::false_type)
+rev_it_copy_imp(__gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-rev_it_copy_imp(pb_ds::detail::true_type)
+rev_it_copy_imp(__gnu_pbds::detail::true_type)
 {
   {
     typename cntnr::iterator it = m_p_c->end();
@@ -260,13 +260,13 @@ rev_it_copy_imp(pb_ds::detail::true_type)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-rev_it_assign_imp(pb_ds::detail::false_type)
+rev_it_assign_imp(__gnu_pbds::detail::false_type)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-rev_it_assign_imp(pb_ds::detail::true_type)
+rev_it_assign_imp(__gnu_pbds::detail::true_type)
 {
   {
     typename cntnr::iterator it = m_p_c->end();
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp
index 7ffd18a77dc..9b4f0927f6f 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/policy_access_fn_imps.hpp
@@ -55,7 +55,7 @@ policy_access()
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_access(pb_ds::basic_hash_tag)
+policy_access(__gnu_pbds::basic_hash_tag)
 {
   {
     typename Cntnr::hash_fn& r_t =
@@ -97,9 +97,9 @@ policy_access(pb_ds::basic_hash_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_access(pb_ds::cc_hash_tag)
+policy_access(__gnu_pbds::cc_hash_tag)
 {
-  policy_access(pb_ds::basic_hash_tag());
+  policy_access(__gnu_pbds::basic_hash_tag());
 
   {
     typename Cntnr::comb_hash_fn& r_t =
@@ -117,9 +117,9 @@ policy_access(pb_ds::cc_hash_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_access(pb_ds::gp_hash_tag)
+policy_access(__gnu_pbds::gp_hash_tag)
 {
-  policy_access(pb_ds::basic_hash_tag());
+  policy_access(__gnu_pbds::basic_hash_tag());
 
   {
     typename Cntnr::comb_probe_fn& r_t =
@@ -149,7 +149,7 @@ policy_access(pb_ds::gp_hash_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_access(pb_ds::tree_tag)
+policy_access(__gnu_pbds::tree_tag)
 {
   {
     typename Cntnr::cmp_fn& r_t =
@@ -168,13 +168,13 @@ policy_access(pb_ds::tree_tag)
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_access(pb_ds::list_update_tag)
+policy_access(__gnu_pbds::list_update_tag)
 { }
 
 PB_DS_CLASS_T_DEC
 void
 PB_DS_CLASS_C_DEC::
-policy_access(pb_ds::pat_trie_tag)
+policy_access(__gnu_pbds::pat_trie_tag)
 {
   typename Cntnr::e_access_traits& r_t =
     m_p_c->get_e_access_traits();
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp
index 6f5ee79fdd4..77bfcb84c39 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/resize_fn_imps.hpp
@@ -49,7 +49,7 @@ bool
 PB_DS_CLASS_C_DEC::
 resize()
 {
-  typedef pb_ds::detail::integral_constant resize_ind;
+  typedef __gnu_pbds::detail::integral_constant resize_ind;
 
   return (resize_imp(resize_ind()));
 }
@@ -57,7 +57,7 @@ resize()
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-resize_imp(pb_ds::detail::false_type)
+resize_imp(__gnu_pbds::detail::false_type)
 {
   return (true);
 }
@@ -65,7 +65,7 @@ resize_imp(pb_ds::detail::false_type)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-resize_imp(pb_ds::detail::true_type)
+resize_imp(__gnu_pbds::detail::true_type)
 {
   PB_DS_TRACE("resize");
 
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp
index 073fda5666b..8026d7cc200 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/split_join_fn_imps.hpp
@@ -54,13 +54,13 @@ split_join()
       split_join = container_traits::order_preserving
     };
 
-  return (split_join_imp(pb_ds::detail::integral_constant()));
+  return (split_join_imp(__gnu_pbds::detail::integral_constant()));
 }
 
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-split_join_imp(pb_ds::detail::false_type)
+split_join_imp(__gnu_pbds::detail::false_type)
 {
   return (true);
 }
@@ -68,7 +68,7 @@ split_join_imp(pb_ds::detail::false_type)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-split_join_imp(pb_ds::detail::true_type)
+split_join_imp(__gnu_pbds::detail::true_type)
 {
   PB_DS_TRACE("split_join");
 
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp
index a2c59e12592..e627595d728 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/detail/subscript_fn_imps.hpp
@@ -53,18 +53,18 @@ subscript()
 
   enum
     {
-      no_data = pb_ds::detail::is_same<
+      no_data = __gnu_pbds::detail::is_same<
       typename Cntnr::const_key_reference,
       typename Cntnr::const_reference>::value
     };
 
-  return (subscript_imp(pb_ds::detail::integral_constant()));
+  return (subscript_imp(__gnu_pbds::detail::integral_constant()));
 }
 
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-subscript_imp(pb_ds::detail::false_type)
+subscript_imp(__gnu_pbds::detail::false_type)
 {
   bool done = true;
 
@@ -97,7 +97,7 @@ subscript_imp(pb_ds::detail::false_type)
 PB_DS_CLASS_T_DEC
 bool
 PB_DS_CLASS_C_DEC::
-subscript_imp(pb_ds::detail::true_type)
+subscript_imp(__gnu_pbds::detail::true_type)
 {
   bool done = true;
 
@@ -110,7 +110,7 @@ subscript_imp(pb_ds::detail::true_type)
         value_type v = test_traits::generate_value(m_g, m_m);
 
         m_alloc.set_throw_prob(m_tp);
-	(*m_p_c)[v] = pb_ds::null_mapped_type();
+	(*m_p_c)[v] = __gnu_pbds::null_mapped_type();
 
         m_native_c.insert(test_traits::native_value(v));
       }
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
index 2081c7c8b2d..2f79df56dce 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -123,7 +123,7 @@ namespace detail
       {
 	detail::verify_params(sd, n, m, tp, ip, ep, cp, mp, disp);
       }
-    catch (pb_ds::test::illegal_input_error&)
+    catch (__gnu_pbds::test::illegal_input_error&)
       {
 	detail::usage(name);
 	return -1;
@@ -205,6 +205,6 @@ namespace detail
   }
 } // namespace detail
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp b/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp
index d5e1f5ba3a4..db9ed28efb8 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/io/assoc/xml_formatter.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -76,6 +76,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_XML_TEST_REGRESSION_FORMATTER_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp b/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp
index a8ceab4d2ee..af6f5d242b9 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/io/priority_queue/xml_formatter.hpp
@@ -49,7 +49,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -77,6 +77,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_XML_TEST_REGRESSION_FORMATTER_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp b/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp
index 6bc89976c58..7006618bd47 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/io/xml_formatter.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -82,6 +82,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_COMMON_XML_TEST_REGRESSION_FORMATTER_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp
index 15ff02bba11..eeedc27bdca 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/container_rand_regression_test.hpp
@@ -60,7 +60,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -329,6 +329,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_CONTAINER_RAND_REGRESSION_TEST_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp
index 41c302718fe..b25394fa34d 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/detail/split_join_fn_imps.hpp
@@ -109,7 +109,7 @@ split_join()
       {
         done = false;
 
-        PB_DS_THROW_IF_FAILED(            pb_ds::container_traits::split_join_can_throw, pb_ds::container_traits::split_join_can_throw, m_p_c, & m_native_c);
+        PB_DS_THROW_IF_FAILED(            __gnu_pbds::container_traits::split_join_can_throw, __gnu_pbds::container_traits::split_join_can_throw, m_p_c, & m_native_c);
       }
 
   PB_DS_COND_COMPARE(*m_p_c, m_native_c);
diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
index 0d4c960fb85..80f941a6db9 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -125,7 +125,7 @@ namespace detail
       {
 	detail::verify_params(sd, n, m, tp, ip, dp, ep, cp, mp, disp);
       }
-    catch(pb_ds::test::illegal_input_error&)
+    catch(__gnu_pbds::test::illegal_input_error&)
       {
 	detail::usage(name);
 	return -1;
@@ -209,6 +209,6 @@ namespace detail
   }
 } // namespace detail
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp
index dac0c7f4719..a796b81b732 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_load_trait.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -80,14 +80,14 @@ namespace pb_ds
       template
       struct regression_test_get_set_load_traits<
         Cntnr,
-        pb_ds::cc_hash_tag> : public regression_test_hash_get_set_load_traits<
+        __gnu_pbds::cc_hash_tag> : public regression_test_hash_get_set_load_traits<
         Cntnr>
       { };
 
       template
       struct regression_test_get_set_load_traits<
         Cntnr,
-        pb_ds::gp_hash_tag> : public regression_test_hash_get_set_load_traits<
+        __gnu_pbds::gp_hash_tag> : public regression_test_hash_get_set_load_traits<
         Cntnr>
       { };
 
@@ -95,6 +95,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_REGRESSION_TEST_SET_LOAD_TRAIT_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp
index 17c872ee83e..389ad6467fe 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/get_set_loads_trait.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -80,14 +80,14 @@ namespace pb_ds
       template
       struct regression_test_get_set_loacontainer_traits<
         Cntnr,
-        pb_ds::cc_hash_tag> : public regression_test_hash_get_set_loacontainer_traits<
+        __gnu_pbds::cc_hash_tag> : public regression_test_hash_get_set_loacontainer_traits<
         Cntnr>
       { };
 
       template
       struct regression_test_get_set_loacontainer_traits<
         Cntnr,
-        pb_ds::gp_hash_tag> : public regression_test_hash_get_set_loacontainer_traits<
+        __gnu_pbds::gp_hash_tag> : public regression_test_hash_get_set_loacontainer_traits<
         Cntnr>
       { };
 
@@ -95,6 +95,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_REGRESSION_TEST_SET_LOADS_TRAIT_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp
index 1c65c6c81f8..d70c88339dd 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/native_type_trait.hpp
@@ -48,7 +48,7 @@
 #ifndef PB_DS_REGRESSION_TEST_NATIVE_TYPE_TRAIT_HPP
 #define PB_DS_REGRESSION_TEST_NATIVE_TYPE_TRAIT_HPP
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -133,7 +133,7 @@ namespace pb_ds
       struct native_type_traits_base<
 	Native_Key_Type,
 	Key_Type,
-	pb_ds::null_mapped_type,
+	__gnu_pbds::null_mapped_type,
 	Allocator>
       {
       public:
@@ -190,6 +190,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_REGRESSION_TEST_NATIVE_TYPE_TRAIT_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp
index 9f235116ecb..ff3004279f4 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/node_update_trait.hpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -75,7 +75,7 @@ namespace pb_ds
       template
       struct regression_test_node_update_traits<
 	Cntnr,
-	pb_ds::pat_trie_tag>
+	__gnu_pbds::pat_trie_tag>
       {
 	enum
 	  {
@@ -89,7 +89,7 @@ namespace pb_ds
       template
       struct regression_test_node_update_traits<
 	Cntnr,
-	pb_ds::rb_tree_tag>
+	__gnu_pbds::rb_tree_tag>
       {
 	enum
 	  {
@@ -102,7 +102,7 @@ namespace pb_ds
       template
       struct regression_test_node_update_traits<
 	Cntnr,
-	pb_ds::splay_tree_tag>
+	__gnu_pbds::splay_tree_tag>
       {
 	enum
 	  {
@@ -115,7 +115,7 @@ namespace pb_ds
       template
       struct regression_test_node_update_traits<
 	Cntnr,
-	pb_ds::ov_tree_tag>
+	__gnu_pbds::ov_tree_tag>
       {
 	enum
 	  {
@@ -129,6 +129,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_REGRESSION_TEST_NODE_UPDATOR_TRAIT_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp
index 24ee05b15c5..932a0ccbc1a 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/resize_trait.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -80,14 +80,14 @@ namespace pb_ds
       template
       struct regression_test_resize_traits<
         Cntnr,
-        pb_ds::cc_hash_tag> : public regression_test_hash_resize_traits<
+        __gnu_pbds::cc_hash_tag> : public regression_test_hash_resize_traits<
         Cntnr>
       { };
 
       template
       struct regression_test_resize_traits<
         Cntnr,
-        pb_ds::gp_hash_tag> : public regression_test_hash_resize_traits<
+        __gnu_pbds::gp_hash_tag> : public regression_test_hash_resize_traits<
         Cntnr>
       { };
 
@@ -95,6 +95,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_REGRESSION_TEST_RESIZE_TRAIT_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp
index d07b330cadb..a0ba69388a2 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/to_string.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 
   namespace test
@@ -86,6 +86,6 @@ namespace pb_ds
 
   } // namespace test
 
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_REGRESSION_TEST_TO_STRING_HPP
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp
index 9f571107df0..e8791a4472a 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/trait.hpp
@@ -57,7 +57,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
 namespace test
 {
@@ -214,6 +214,6 @@ namespace detail
 
 } // namespace detail
 } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp
index df8b66fcbc8..5c0682de38f 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -92,7 +92,7 @@ namespace pb_ds
 
 	template
 	static value_type
-        generate_value(Gen& r_gen, size_t max, pb_ds::null_mapped_type)
+        generate_value(Gen& r_gen, size_t max, __gnu_pbds::null_mapped_type)
 	{ return basic_type(r_gen, max); }
 
 	template
@@ -116,6 +116,6 @@ namespace pb_ds
       };
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp b/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp
index c583848c630..41618a6843e 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/erase_if_fn.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -90,6 +90,6 @@ namespace pb_ds
       };
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp
index 641d9295cfb..f2875105649 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/priority_queue/trait.hpp
@@ -50,7 +50,7 @@
 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -61,7 +61,7 @@ namespace pb_ds
       {
 	typedef typename Cntnr::value_type value_type;
 	typedef typename Cntnr::const_reference const_reference;
-	typedef pb_ds::test::native_priority_queue native_type;
+	typedef __gnu_pbds::test::native_priority_queue native_type;
 	typedef typename native_type::value_type native_value_type;
 
 	template
@@ -87,6 +87,6 @@ namespace pb_ds
       };
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
diff --git a/libstdc++-v3/testsuite/util/rng/twister_rand_gen.cc b/libstdc++-v3/testsuite/util/rng/twister_rand_gen.cc
index fbe7e8add95..a0c74586a41 100644
--- a/libstdc++-v3/testsuite/util/rng/twister_rand_gen.cc
+++ b/libstdc++-v3/testsuite/util/rng/twister_rand_gen.cc
@@ -47,7 +47,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -92,4 +92,4 @@ namespace pb_ds
       return ret;
     }
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
diff --git a/libstdc++-v3/testsuite/util/rng/twister_rand_gen.hpp b/libstdc++-v3/testsuite/util/rng/twister_rand_gen.hpp
index cbc8d1473b7..0088dac76f7 100644
--- a/libstdc++-v3/testsuite/util/rng/twister_rand_gen.hpp
+++ b/libstdc++-v3/testsuite/util/rng/twister_rand_gen.hpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -81,6 +81,6 @@ namespace pb_ds
       base_generator_t m_base_generator;
     };
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif // #ifndef PB_DS_TWISTER_RAND_GEN_HPP
diff --git a/libstdc++-v3/testsuite/util/statistic/result_recorder.hpp b/libstdc++-v3/testsuite/util/statistic/result_recorder.hpp
index 2f8eaa5ccd2..438fd845311 100644
--- a/libstdc++-v3/testsuite/util/statistic/result_recorder.hpp
+++ b/libstdc++-v3/testsuite/util/statistic/result_recorder.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -102,7 +102,7 @@ namespace pb_ds
       }
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/statistic/sample_mean.hpp b/libstdc++-v3/testsuite/util/statistic/sample_mean.hpp
index 4c6c5613540..98a7784ceff 100644
--- a/libstdc++-v3/testsuite/util/statistic/sample_mean.hpp
+++ b/libstdc++-v3/testsuite/util/statistic/sample_mean.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -73,7 +73,7 @@ namespace pb_ds
 
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/statistic/sample_mean_confidence_checker.hpp b/libstdc++-v3/testsuite/util/statistic/sample_mean_confidence_checker.hpp
index 074adc961e5..837fd665f0d 100644
--- a/libstdc++-v3/testsuite/util/statistic/sample_mean_confidence_checker.hpp
+++ b/libstdc++-v3/testsuite/util/statistic/sample_mean_confidence_checker.hpp
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -88,7 +88,7 @@ namespace pb_ds
       }
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif 
 
diff --git a/libstdc++-v3/testsuite/util/statistic/sample_variance.hpp b/libstdc++-v3/testsuite/util/statistic/sample_variance.hpp
index c2f87407c38..3d7d422c835 100644
--- a/libstdc++-v3/testsuite/util/statistic/sample_variance.hpp
+++ b/libstdc++-v3/testsuite/util/statistic/sample_variance.hpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-namespace pb_ds
+namespace __gnu_pbds
 {
   namespace test
   {
@@ -85,7 +85,7 @@ namespace pb_ds
 
     } // namespace detail
   } // namespace test
-} // namespace pb_ds
+} // namespace __gnu_pbds
 
 #endif