From c3d7359ca372675b485cdacfd705028f956390dd Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Wed, 18 Sep 2019 21:55:16 -0600
Subject: [PATCH] `units` removed from a `std::experimental` namespace

---
 README.md                                     |  2 +-
 doc/DESIGN.md                                 | 18 +++++++++---------
 example/example.cpp                           | 19 +++++++++----------
 src/include/units/bits/concepts.h             |  4 ++--
 src/include/units/bits/downcasting.h          |  4 ++--
 src/include/units/bits/type_list.h            |  4 ++--
 src/include/units/bits/type_traits.h          |  2 +-
 src/include/units/dimension.h                 |  4 ++--
 src/include/units/dimensions/acceleration.h   |  4 ++--
 src/include/units/dimensions/area.h           |  4 ++--
 .../units/dimensions/base_dimensions.h        |  4 ++--
 src/include/units/dimensions/capacitance.h    |  4 ++--
 src/include/units/dimensions/current.h        |  4 ++--
 .../units/dimensions/electric_charge.h        |  4 ++--
 src/include/units/dimensions/energy.h         |  4 ++--
 src/include/units/dimensions/force.h          |  4 ++--
 src/include/units/dimensions/frequency.h      |  4 ++--
 src/include/units/dimensions/length.h         |  4 ++--
 .../units/dimensions/luminous_intensity.h     |  4 ++--
 src/include/units/dimensions/mass.h           |  4 ++--
 src/include/units/dimensions/power.h          |  4 ++--
 src/include/units/dimensions/pressure.h       |  4 ++--
 src/include/units/dimensions/substance.h      |  4 ++--
 src/include/units/dimensions/temperature.h    |  4 ++--
 src/include/units/dimensions/time.h           |  4 ++--
 src/include/units/dimensions/velocity.h       |  4 ++--
 src/include/units/dimensions/voltage.h        |  4 ++--
 src/include/units/dimensions/volume.h         |  4 ++--
 src/include/units/math.h                      |  4 ++--
 src/include/units/quantity.h                  |  4 ++--
 src/include/units/ratio.h                     |  4 ++--
 src/include/units/unit.h                      |  8 ++++----
 .../list/type_list_concepts_all.cpp.erb       |  4 +---
 test/metabench/list/type_list_concepts_all.h  |  4 ++--
 .../list/type_list_concepts_iface.cpp.erb     |  4 +---
 .../metabench/list/type_list_concepts_iface.h |  4 ++--
 .../list/type_list_concepts_no.cpp.erb        |  4 +---
 test/metabench/list/type_list_concepts_no.h   |  4 ++--
 .../list/type_list_conditional_alias.cpp.erb  |  4 +---
 .../list/type_list_conditional_alias.h        |  4 ++--
 .../type_list_conditional_alias_hard.cpp.erb  |  4 +---
 .../list/type_list_conditional_alias_hard.h   |  4 ++--
 .../list/type_list_conditional_std.cpp.erb    |  4 +---
 .../list/type_list_conditional_std.h          |  4 ++--
 .../make_dimension/concepts_all.cpp.erb       |  8 +++-----
 .../make_dimension/concepts_iface.cpp.erb     |  8 +++-----
 .../make_dimension/dimension_concepts_all.h   |  4 ++--
 .../make_dimension/dimension_concepts_iface.h |  4 ++--
 .../make_dimension/dimension_no_concepts.h    |  4 ++--
 .../make_dimension/downcasting_concepts_all.h |  4 ++--
 .../make_dimension/downcasting_no_concepts.h  |  4 ++--
 .../make_dimension/no_concepts.cpp.erb        |  8 +++-----
 .../make_dimension/ratio_concepts_all.h       |  4 ++--
 .../make_dimension/ratio_concepts_iface.h     |  4 ++--
 .../make_dimension/ratio_no_concepts.h        |  4 ++--
 .../make_dimension/type_list_concepts_all.h   |  4 ++--
 .../make_dimension/type_list_concepts_iface.h |  4 ++--
 .../make_dimension/type_list_no_concepts.h    |  4 ++--
 test/metabench/make_dimension/type_traits.h   |  2 +-
 .../ratio/all_ratio_type_constexpr.cpp.erb    | 12 +++++-------
 test/metabench/ratio/all_std_ratio.cpp.erb    |  4 +---
 .../common_ratio_ratio_type_constexpr.cpp.erb |  8 +++-----
 .../ratio/common_ratio_std_ratio.cpp.erb      |  4 +---
 .../ratio/create_ratio_type_constexpr.cpp.erb |  6 ++----
 ...ltiply_divide_ratio_type_constexpr.cpp.erb | 10 ++++------
 test/metabench/ratio/ratio_type_constexpr.h   |  4 ++--
 test/metabench/ratio/std_ratio.h              |  4 ++--
 test/unit_test/test_custom_units.cpp          | 14 +++++---------
 test/unit_test/test_dimension.cpp             |  2 +-
 test/unit_test/test_quantity.cpp              |  8 ++++----
 test/unit_test/test_ratio.cpp                 |  2 +-
 test/unit_test/test_type_list.cpp             |  2 +-
 test/unit_test/test_units.cpp                 |  2 +-
 test_package/test_package.cpp                 |  7 +++----
 74 files changed, 164 insertions(+), 200 deletions(-)

diff --git a/README.md b/README.md
index b84d40d1..11df05a6 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ NOTE: This library as of now compiles correctly only with gcc-9.1 and newer.
 ## Release notes
 
 - 0.4.0 ???
-  - 
+  - `units` removed from a `std::experimental` namespace
 
 - 0.3.1 Sep 18, 2019
   - cmcstl2 dependency changed to range-v3 0.9.1
diff --git a/doc/DESIGN.md b/doc/DESIGN.md
index 8e3fb2d2..265b1303 100644
--- a/doc/DESIGN.md
+++ b/doc/DESIGN.md
@@ -51,7 +51,7 @@ Quantity is a concrete amount of a unit for a specified dimension with a specifi
 
 ```cpp
 units::quantity<units::kilometre, double> d1(123);
-auto d2 = 123km;    // stde::units::quantity<units::kilometre, std::int64_t>
+auto d2 = 123km;    // units::quantity<units::kilometre, std::int64_t>
 ```
 
 There are C++ concepts provided for each such quantity type:
@@ -385,7 +385,7 @@ could generate a following compile time error:
    const Velocity auto t = 20s;
                            ^~~~
 In file included from <path>\example\example.cpp:23:
-<path>/src/include/units/si/velocity.h:41:16: note: within 'template<class T> concept const bool stde::units::Velocity<T> [with T = stde::units::quantity<units::unit<units::dimension<units::exp<units::base_dim_time, 1> >, std::ratio<1> >, long long int>]'
+<path>/src/include/units/si/velocity.h:41:16: note: within 'template<class T> concept const bool units::Velocity<T> [with T = units::quantity<units::unit<units::dimension<units::exp<units::base_dim_time, 1> >, std::ratio<1> >, long long int>]'
    concept Velocity = Quantity<T> && std::same_as<typename T::dimension, velocity>;
            ^~~~~~~~
 In file included from <path>/src/include/units/bits/tools.h:25,
@@ -393,7 +393,7 @@ In file included from <path>/src/include/units/bits/tools.h:25,
                  from <path>/src/include/units/si/base_dimensions.h:25,
                  from <path>/src/include/units/si/velocity.h:25,
                  from <path>\example\example.cpp:23:
-<path>/src/include/units/bits/stdconcepts.h:33:18: note: within 'template<class T, class U> concept const bool std::same_as<T, U> [with T = stde::units::dimension<units::exp<units::base_dim_time, 1> >; U = stde::units::dimension<units::exp<units::base_dim_length, 1>,stde::units::exp<units::base_dim_time, -1> >]'
+<path>/src/include/units/bits/stdconcepts.h:33:18: note: within 'template<class T, class U> concept const bool std::same_as<T, U> [with T = units::dimension<units::exp<units::base_dim_time, 1> >; U = units::dimension<units::exp<units::base_dim_length, 1>,units::exp<units::base_dim_time, -1> >]'
      concept same_as = std::is_same_v<T, U>;
              ^~~~
 <path>/src/include/units/bits/stdconcepts.h:33:18: note: 'std::is_same_v' evaluated to false
@@ -403,13 +403,13 @@ Time and velocity are not that complicated dimensions and there are much more co
 out there, but even for those dimensions
 
 ```text
-[with T = stde::units::quantity<units::unit<units::dimension<units::exp<units::base_dim_time, 1> >, std::ratio<1> >, long long int>]
+[with T = units::quantity<units::unit<units::dimension<units::exp<units::base_dim_time, 1> >, std::ratio<1> >, long long int>]
 ```
 
 and
 
 ```text
-[with T = stde::units::dimension<units::exp<units::base_dim_time, 1> >; U = stde::units::dimension<units::exp<units::base_dim_length, 1>,stde::units::exp<units::base_dim_time, -1> >]
+[with T = units::dimension<units::exp<units::base_dim_time, 1> >; U = units::dimension<units::exp<units::base_dim_length, 1>,units::exp<units::base_dim_time, -1> >]
 ```
 
 starts to be really hard to analyze or debug.
@@ -422,7 +422,7 @@ same code will result with such an error:
    const Velocity t = 20s;
                       ^~~~
 In file included from <path>\example\example.cpp:23:
-<path>/src/include/units/si/velocity.h:48:16: note: within 'template<class T> concept const bool stde::units::Velocity<T> [with T = stde::units::quantity<units::second, long long int>]'
+<path>/src/include/units/si/velocity.h:48:16: note: within 'template<class T> concept const bool units::Velocity<T> [with T = units::quantity<units::second, long long int>]'
    concept Velocity = Quantity<T> && std::same_as<typename T::dimension, velocity>;
            ^~~~~~~~
 In file included from <path>/src/include/units/bits/tools.h:25,
@@ -430,7 +430,7 @@ In file included from <path>/src/include/units/bits/tools.h:25,
                  from <path>/src/include/units/si/base_dimensions.h:25,
                  from <path>/src/include/units/si/velocity.h:25,
                  from <path>\example\example.cpp:23:
-<path>/src/include/units/bits/stdconcepts.h:33:18: note: within 'template<class T, class U> concept const bool std::same_as<T, U> [with T = stde::units::time; U = stde::units::velocity]'
+<path>/src/include/units/bits/stdconcepts.h:33:18: note: within 'template<class T, class U> concept const bool std::same_as<T, U> [with T = units::time; U = units::velocity]'
      concept same_as = std::is_same_v<T, U>;
              ^~~~
 <path>/src/include/units/bits/stdconcepts.h:33:18: note: 'std::is_same_v' evaluated to false
@@ -439,13 +439,13 @@ In file included from <path>/src/include/units/bits/tools.h:25,
 Now
 
 ```text
-[with T = stde::units::quantity<units::second, long long int>]
+[with T = units::quantity<units::second, long long int>]
 ```
 
 and
 
 ```text
-[with T = stde::units::time; U = stde::units::velocity]
+[with T = units::time; U = units::velocity]
 ```
 
 are not arguably much easier to understand thus provide better user experience.
diff --git a/example/example.cpp b/example/example.cpp
index 27685ce1..a4424a7d 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -25,28 +25,27 @@
 
 namespace {
 
-namespace stde = std::experimental;
-using namespace stde::units::literals;
+using namespace units::literals;
 
-template<stde::units::Length D, stde::units::Time T>
-constexpr stde::units::Velocity avg_speed(D d, T t)
+template<units::Length D, units::Time T>
+constexpr units::Velocity avg_speed(D d, T t)
 {
   return d / t;
 }
 
-template<stde::units::Velocity V, stde::units::Time T>
+template<units::Velocity V, units::Time T>
 void example_1(V v, T t)
 {
-  const stde::units::Length distance = v * t;
+  const units::Length distance = v * t;
   std::cout << "A car driving " << v.count() << " km/h in a time of " << t.count() << " minutes will pass "
-            << stde::units::quantity_cast<stde::units::quantity<stde::units::metre, double>>(distance).count() << " metres.\n";
+            << units::quantity_cast<units::quantity<units::metre, double>>(distance).count() << " metres.\n";
 }
 
 void example_2(double distance_v, double duration_v)
 {
-  stde::units::quantity<stde::units::kilometre> distance(distance_v);
-  stde::units::quantity<stde::units::hour> duration(duration_v);
-  const auto kmph = quantity_cast<stde::units::kilometre_per_hour>(avg_speed(distance, duration));
+  units::quantity<units::kilometre> distance(distance_v);
+  units::quantity<units::hour> duration(duration_v);
+  const auto kmph = quantity_cast<units::kilometre_per_hour>(avg_speed(distance, duration));
   std::cout << "Average speed of a car that makes " << distance.count() << " km in "
             << duration.count() << " hours is " << kmph.count() << " km/h.\n";
 }
diff --git a/src/include/units/bits/concepts.h b/src/include/units/bits/concepts.h
index c8b4d0ef..c9d2269e 100644
--- a/src/include/units/bits/concepts.h
+++ b/src/include/units/bits/concepts.h
@@ -24,7 +24,7 @@
 
 #include <units/bits/hacks.h>
 
-namespace std::experimental::units {
+namespace units {
 
   template<typename T>
   concept bool Number = std::regular<T> &&
@@ -43,4 +43,4 @@ namespace std::experimental::units {
         // …
   };
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/bits/downcasting.h b/src/include/units/bits/downcasting.h
index c80881a2..d27b9a51 100644
--- a/src/include/units/bits/downcasting.h
+++ b/src/include/units/bits/downcasting.h
@@ -25,7 +25,7 @@
 #include <units/bits/hacks.h>
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   template<typename BaseType>
   struct downcast_base {
@@ -51,4 +51,4 @@ namespace std::experimental::units {
   template<Downcastable T>
   using downcasting_traits_t = downcasting_traits<T>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/bits/type_list.h b/src/include/units/bits/type_list.h
index 30ba1f0a..7a720d66 100644
--- a/src/include/units/bits/type_list.h
+++ b/src/include/units/bits/type_list.h
@@ -24,7 +24,7 @@
 
 #include <units/bits/type_traits.h>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -182,4 +182,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/bits/type_traits.h b/src/include/units/bits/type_traits.h
index a2928c5b..4a9c8a50 100644
--- a/src/include/units/bits/type_traits.h
+++ b/src/include/units/bits/type_traits.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
diff --git a/src/include/units/dimension.h b/src/include/units/dimension.h
index 38d09fa3..6ecd45bd 100644
--- a/src/include/units/dimension.h
+++ b/src/include/units/dimension.h
@@ -27,7 +27,7 @@
 #include <units/ratio.h>
 #include <ratio>
 
-namespace std::experimental::units {
+namespace units {
 
   template<typename T>
   concept bool BaseDimension = std::is_empty_v<T> &&
@@ -286,4 +286,4 @@ namespace std::experimental::units {
   template<Dimension D, std::size_t N>
   using dimension_pow_t = dimension_pow<typename D::base_type, N>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/acceleration.h b/src/include/units/dimensions/acceleration.h
index dfb8efc5..ac68bf83 100644
--- a/src/include/units/dimensions/acceleration.h
+++ b/src/include/units/dimensions/acceleration.h
@@ -24,7 +24,7 @@
 
 #include <units/dimensions/velocity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct acceleration : make_dimension_t<exp<velocity, 1>, exp<base_dim_time, -1>> {};
   template<> struct downcasting_traits<downcast_from<acceleration>> : downcast_to<acceleration> {};
@@ -43,4 +43,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/area.h b/src/include/units/dimensions/area.h
index c111b6ee..b0fd45ba 100644
--- a/src/include/units/dimensions/area.h
+++ b/src/include/units/dimensions/area.h
@@ -24,7 +24,7 @@
 
 #include <units/dimensions/length.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct area : make_dimension_t<exp<base_dim_length, 2>> {};
   template<> struct downcasting_traits<downcast_from<area>> : downcast_to<area> {};
@@ -67,4 +67,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/base_dimensions.h b/src/include/units/dimensions/base_dimensions.h
index 732e88e0..81314a0b 100644
--- a/src/include/units/dimensions/base_dimensions.h
+++ b/src/include/units/dimensions/base_dimensions.h
@@ -24,7 +24,7 @@
 
 #include <units/dimension.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct base_dim_length { static constexpr const char* value = "length"; };
   struct base_dim_mass { static constexpr const char* value = "mass"; };
@@ -34,4 +34,4 @@ namespace std::experimental::units {
   struct base_dim_substance { static constexpr const char* value = "substance"; };
   struct base_dim_luminous_intensity { static constexpr const char* value = "luminous intensity"; };
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/capacitance.h b/src/include/units/dimensions/capacitance.h
index 770cacb9..41436eb3 100644
--- a/src/include/units/dimensions/capacitance.h
+++ b/src/include/units/dimensions/capacitance.h
@@ -26,7 +26,7 @@
 #include <units/dimensions/electric_charge.h>
 #include <units/dimensions/voltage.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct capacitance : make_dimension_t<exp<electric_charge, 1>, exp<voltage, -1>> {};
   template<> struct downcasting_traits<downcast_from<capacitance>> : downcast_to<capacitance> {};
@@ -45,4 +45,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/current.h b/src/include/units/dimensions/current.h
index a9adc210..275ba564 100644
--- a/src/include/units/dimensions/current.h
+++ b/src/include/units/dimensions/current.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct current : make_dimension_t<exp<base_dim_current, 1>> {};
   template<> struct downcasting_traits<downcast_from<current>> : downcast_to<current> {};
@@ -44,4 +44,4 @@ namespace std::experimental::units {
 
   }
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/electric_charge.h b/src/include/units/dimensions/electric_charge.h
index f634ce71..195eda18 100644
--- a/src/include/units/dimensions/electric_charge.h
+++ b/src/include/units/dimensions/electric_charge.h
@@ -26,7 +26,7 @@
 #include <units/dimensions/time.h>
 #include <units/dimensions/current.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct electric_charge : make_dimension_t<exp<base_dim_time, 1>, exp<base_dim_current, 1>> {};
   template<> struct downcasting_traits<downcast_from<electric_charge>> : downcast_to<electric_charge> {};
@@ -45,4 +45,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/energy.h b/src/include/units/dimensions/energy.h
index c1acfca1..49fc59b6 100644
--- a/src/include/units/dimensions/energy.h
+++ b/src/include/units/dimensions/energy.h
@@ -26,7 +26,7 @@
 #include <units/dimensions/force.h>
 #include <units/dimensions/pressure.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct energy : make_dimension_t<exp<force, 1>, exp<length, 1>> {};
   template<> struct downcasting_traits<downcast_from<energy>> : downcast_to<energy> {};
@@ -45,4 +45,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/force.h b/src/include/units/dimensions/force.h
index f67ca285..c4d9b2c8 100644
--- a/src/include/units/dimensions/force.h
+++ b/src/include/units/dimensions/force.h
@@ -26,7 +26,7 @@
 #include <units/dimensions/mass.h>
 #include <units/dimensions/acceleration.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct force : make_dimension_t<exp<base_dim_mass, 1>, exp<acceleration, 1>> {};
   template<> struct downcasting_traits<downcast_from<force>> : downcast_to<force> {};
@@ -45,4 +45,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/frequency.h b/src/include/units/dimensions/frequency.h
index 528cd23e..19c9fe7b 100644
--- a/src/include/units/dimensions/frequency.h
+++ b/src/include/units/dimensions/frequency.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/dimensions/time.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct frequency : make_dimension_t<exp<base_dim_time, -1>> {};
   template<> struct downcasting_traits<downcast_from<frequency>> : downcast_to<frequency> {};
@@ -79,4 +79,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/length.h b/src/include/units/dimensions/length.h
index fefb59bc..f02506f3 100644
--- a/src/include/units/dimensions/length.h
+++ b/src/include/units/dimensions/length.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct length : make_dimension_t<exp<base_dim_length, 1>> {};
   template<> struct downcasting_traits<downcast_from<length>> : downcast_to<length> {};
@@ -99,4 +99,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/luminous_intensity.h b/src/include/units/dimensions/luminous_intensity.h
index e4d84c12..21263247 100644
--- a/src/include/units/dimensions/luminous_intensity.h
+++ b/src/include/units/dimensions/luminous_intensity.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct luminous_intensity : make_dimension_t<exp<base_dim_luminous_intensity, 1>> {};
   template<> struct downcasting_traits<downcast_from<luminous_intensity>> : downcast_to<luminous_intensity> {};
@@ -44,4 +44,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/mass.h b/src/include/units/dimensions/mass.h
index 312e6bf7..432b4bb3 100644
--- a/src/include/units/dimensions/mass.h
+++ b/src/include/units/dimensions/mass.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct mass : make_dimension_t<exp<base_dim_mass, 1>> {};
   template<> struct downcasting_traits<downcast_from<mass>> : downcast_to<mass> {};
@@ -51,4 +51,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/power.h b/src/include/units/dimensions/power.h
index ca309ca1..1e8cd408 100644
--- a/src/include/units/dimensions/power.h
+++ b/src/include/units/dimensions/power.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/dimensions/energy.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct power : make_dimension_t<exp<energy, 1>, exp<base_dim_time, -1>> {};
   template<> struct downcasting_traits<downcast_from<power>> : downcast_to<power> {};
@@ -44,4 +44,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/pressure.h b/src/include/units/dimensions/pressure.h
index 8c630bc8..0b7c6bac 100644
--- a/src/include/units/dimensions/pressure.h
+++ b/src/include/units/dimensions/pressure.h
@@ -26,7 +26,7 @@
 #include <units/dimensions/force.h>
 #include <units/dimensions/area.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct pressure : make_dimension_t<exp<force, 1>, exp<area, -1>> {};
   template<> struct downcasting_traits<downcast_from<pressure>> : downcast_to<pressure> {};
@@ -45,4 +45,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/substance.h b/src/include/units/dimensions/substance.h
index b8864268..64ab5513 100644
--- a/src/include/units/dimensions/substance.h
+++ b/src/include/units/dimensions/substance.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct substance : make_dimension_t<exp<base_dim_substance, 1>> {};
   template<> struct downcasting_traits<downcast_from<substance>> : downcast_to<substance> {};
@@ -44,4 +44,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/temperature.h b/src/include/units/dimensions/temperature.h
index 6ed30694..5ec92eef 100644
--- a/src/include/units/dimensions/temperature.h
+++ b/src/include/units/dimensions/temperature.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct temperature : make_dimension_t<exp<base_dim_temperature, 1>> {};
   template<> struct downcasting_traits<downcast_from<temperature>> : downcast_to<temperature> {};
@@ -44,4 +44,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/time.h b/src/include/units/dimensions/time.h
index 290c7c8b..fa198b0b 100644
--- a/src/include/units/dimensions/time.h
+++ b/src/include/units/dimensions/time.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/base_dimensions.h>
 #include <units/quantity.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct time : make_dimension_t<exp<base_dim_time, 1>> {};
   template<> struct downcasting_traits<downcast_from<time>> : downcast_to<time> {};
@@ -79,4 +79,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/velocity.h b/src/include/units/dimensions/velocity.h
index 1ff70120..ca154891 100644
--- a/src/include/units/dimensions/velocity.h
+++ b/src/include/units/dimensions/velocity.h
@@ -25,7 +25,7 @@
 #include <units/dimensions/length.h>
 #include <units/dimensions/time.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct velocity : make_dimension_t<exp<base_dim_length, 1>, exp<base_dim_time, -1>> {};
   template<> struct downcasting_traits<downcast_from<velocity>> : downcast_to<velocity> {};
@@ -58,4 +58,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/voltage.h b/src/include/units/dimensions/voltage.h
index b4bece2c..61ca4ac0 100644
--- a/src/include/units/dimensions/voltage.h
+++ b/src/include/units/dimensions/voltage.h
@@ -28,7 +28,7 @@
 #include <units/dimensions/energy.h>
 #include <units/dimensions/electric_charge.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct voltage : make_dimension_t<exp<power, 1>, exp<base_dim_current, -1>> {};
   template<> struct downcasting_traits<downcast_from<voltage>> : downcast_to<voltage> {};
@@ -47,4 +47,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/dimensions/volume.h b/src/include/units/dimensions/volume.h
index 4128374a..c493c048 100644
--- a/src/include/units/dimensions/volume.h
+++ b/src/include/units/dimensions/volume.h
@@ -24,7 +24,7 @@
 
 #include <units/dimensions/length.h>
 
-namespace std::experimental::units {
+namespace units {
 
   struct volume : make_dimension_t<exp<base_dim_length, 3>> {};
   template<> struct downcasting_traits<downcast_from<volume>> : downcast_to<volume> {};
@@ -67,4 +67,4 @@ namespace std::experimental::units {
 
   }  // namespace literals
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/math.h b/src/include/units/math.h
index 377b1615..9135085a 100644
--- a/src/include/units/math.h
+++ b/src/include/units/math.h
@@ -25,7 +25,7 @@
 #include <units/quantity.h>
 #include <cmath>
 
-namespace std::experimental::units {
+namespace units {
 
   template<std::size_t N, typename U, typename Rep>
   inline Quantity pow(const quantity<U, Rep>& q) noexcept
@@ -43,4 +43,4 @@ namespace std::experimental::units {
     return quantity<downcasting_traits_t<unit<dim, r>>, Rep>(std::sqrt(q.count()));
   }
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/quantity.h b/src/include/units/quantity.h
index 1e273b94..fe0cf3da 100644
--- a/src/include/units/quantity.h
+++ b/src/include/units/quantity.h
@@ -26,7 +26,7 @@
 #include <units/bits/concepts.h>
 #include <limits>
 
-namespace std::experimental::units {
+namespace units {
 
   // is_quantity
   namespace detail {
@@ -430,4 +430,4 @@ namespace std::experimental::units {
     return !(lhs < rhs);
   }
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/ratio.h b/src/include/units/ratio.h
index 09055d96..ef7c2d76 100644
--- a/src/include/units/ratio.h
+++ b/src/include/units/ratio.h
@@ -27,7 +27,7 @@
 #include <numeric>
 #include <cstdint>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -196,4 +196,4 @@ namespace std::experimental::units {
   template<Ratio R1, Ratio R2>
   using common_ratio = detail::common_ratio_impl<R1, R2>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/src/include/units/unit.h b/src/include/units/unit.h
index bbc342c1..1768ae69 100644
--- a/src/include/units/unit.h
+++ b/src/include/units/unit.h
@@ -26,7 +26,7 @@
 #include <units/ratio.h>
 #include <ratio>
 
-namespace std::experimental::units {
+namespace units {
 
   template<Dimension D, Ratio R = ratio<1>>
     requires (R::num * R::den > 0)
@@ -68,7 +68,7 @@ namespace std::experimental::units {
 
     template<BaseDimension BD, typename... Us>
     struct get_ratio {
-      using ratio = ::std::experimental::units::ratio<1>;
+      using ratio = ::units::ratio<1>;
     };
 
     template<BaseDimension BD, typename U, typename... Rest>
@@ -99,7 +99,7 @@ namespace std::experimental::units {
 
     template<typename... Us>
     struct derived_ratio<dimension<>, Us...> {
-      using ratio = ::std::experimental::units::ratio<1>;
+      using ratio = ::units::ratio<1>;
     };
 
     template<typename E, typename... Rest, typename... Us>
@@ -131,4 +131,4 @@ namespace std::experimental::units {
   template<Unit U> using peta = unit<typename U::dimension, ratio_multiply<typename U::ratio, ratio<std::peta::num>>>;
   template<Unit U> using exa = unit<typename U::dimension, ratio_multiply<typename U::ratio, ratio<std::exa::num>>>;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/list/type_list_concepts_all.cpp.erb b/test/metabench/list/type_list_concepts_all.cpp.erb
index 3a64d24a..142aa11b 100644
--- a/test/metabench/list/type_list_concepts_all.cpp.erb
+++ b/test/metabench/list/type_list_concepts_all.cpp.erb
@@ -6,8 +6,6 @@ using dim_id = std::integral_constant<int, UniqueValue>;
 template<typename D1, typename D2>
 using dim_id_less = std::bool_constant<D1::value < D2::value>;
 
-namespace stde = std::experimental;
-
 template<typename... Es>
 struct dimension;
 
@@ -21,7 +19,7 @@ using <%= "dim#{i}" %> = dimension<<%=
     xs.shuffle(random: rng).join(', ')
 %>>;
 #if defined(METABENCH)
-using <%= "result#{i}" %> = stde::units::type_list_sort_t<<%= "dim#{i}" %>, dim_id_less>;
+using <%= "result#{i}" %> = units::type_list_sort_t<<%= "dim#{i}" %>, dim_id_less>;
 #else
 using <%= "result#{i}" %> = void;
 #endif
diff --git a/test/metabench/list/type_list_concepts_all.h b/test/metabench/list/type_list_concepts_all.h
index a0a17d0f..3f0a4746 100644
--- a/test/metabench/list/type_list_concepts_all.h
+++ b/test/metabench/list/type_list_concepts_all.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -182,4 +182,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort_t = type_list_sort<List, Pred>::type;
 
-}  // namespace std::experimental::units
\ No newline at end of file
+}  // namespace units
\ No newline at end of file
diff --git a/test/metabench/list/type_list_concepts_iface.cpp.erb b/test/metabench/list/type_list_concepts_iface.cpp.erb
index 9c4659dd..649440a9 100644
--- a/test/metabench/list/type_list_concepts_iface.cpp.erb
+++ b/test/metabench/list/type_list_concepts_iface.cpp.erb
@@ -1,7 +1,5 @@
 #include "type_list_concepts_iface.h"
 
-namespace stde = std::experimental;
-
 template<int UniqueValue>
 using dim_id = std::integral_constant<int, UniqueValue>;
 
@@ -22,7 +20,7 @@ using <%= "dim#{i}" %> = dimension<<%=
     xs.shuffle(random: rng).join(', ')
 %>>;
 #if defined(METABENCH)
-using <%= "result#{i}" %> = stde::units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
+using <%= "result#{i}" %> = units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
 #else
 using <%= "result#{i}" %> = void;
 #endif
diff --git a/test/metabench/list/type_list_concepts_iface.h b/test/metabench/list/type_list_concepts_iface.h
index 0fe3a290..056ba4f2 100644
--- a/test/metabench/list/type_list_concepts_iface.h
+++ b/test/metabench/list/type_list_concepts_iface.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -201,4 +201,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/list/type_list_concepts_no.cpp.erb b/test/metabench/list/type_list_concepts_no.cpp.erb
index 5e1156d5..19cec4f3 100644
--- a/test/metabench/list/type_list_concepts_no.cpp.erb
+++ b/test/metabench/list/type_list_concepts_no.cpp.erb
@@ -1,7 +1,5 @@
 #include "type_list_concepts_no.h"
 
-namespace stde = std::experimental;
-
 template<int UniqueValue>
 using dim_id = std::integral_constant<int, UniqueValue>;
 
@@ -22,7 +20,7 @@ using <%= "dim#{i}" %> = dimension<<%=
     xs.shuffle(random: rng).join(', ')
 %>>;
 #if defined(METABENCH)
-using <%= "result#{i}" %> = stde::units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
+using <%= "result#{i}" %> = units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
 #else
 using <%= "result#{i}" %> = void;
 #endif
diff --git a/test/metabench/list/type_list_concepts_no.h b/test/metabench/list/type_list_concepts_no.h
index 4c24c039..ab74a04e 100644
--- a/test/metabench/list/type_list_concepts_no.h
+++ b/test/metabench/list/type_list_concepts_no.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -188,4 +188,4 @@ namespace std::experimental::units {
   template<typename List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/list/type_list_conditional_alias.cpp.erb b/test/metabench/list/type_list_conditional_alias.cpp.erb
index 1dc44696..5738e52e 100644
--- a/test/metabench/list/type_list_conditional_alias.cpp.erb
+++ b/test/metabench/list/type_list_conditional_alias.cpp.erb
@@ -1,7 +1,5 @@
 #include "type_list_conditional_alias.h"
 
-namespace stde = std::experimental;
-
 template<int UniqueValue>
 using dim_id = std::integral_constant<int, UniqueValue>;
 
@@ -22,7 +20,7 @@ using <%= "dim#{i}" %> = dimension<<%=
     xs.shuffle(random: rng).join(', ')
 %>>;
 #if defined(METABENCH)
-using <%= "result#{i}" %> = stde::units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
+using <%= "result#{i}" %> = units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
 #else
 using <%= "result#{i}" %> = void;
 #endif
diff --git a/test/metabench/list/type_list_conditional_alias.h b/test/metabench/list/type_list_conditional_alias.h
index 0fe3a290..056ba4f2 100644
--- a/test/metabench/list/type_list_conditional_alias.h
+++ b/test/metabench/list/type_list_conditional_alias.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -201,4 +201,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/list/type_list_conditional_alias_hard.cpp.erb b/test/metabench/list/type_list_conditional_alias_hard.cpp.erb
index 2dc4cc06..737e2367 100644
--- a/test/metabench/list/type_list_conditional_alias_hard.cpp.erb
+++ b/test/metabench/list/type_list_conditional_alias_hard.cpp.erb
@@ -1,7 +1,5 @@
 #include "type_list_conditional_alias_hard.h"
 
-namespace stde = std::experimental;
-
 template<int UniqueValue>
 using dim_id = std::integral_constant<int, UniqueValue>;
 
@@ -22,7 +20,7 @@ using <%= "dim#{i}" %> = dimension<<%=
     xs.shuffle(random: rng).join(', ')
 %>>;
 #if defined(METABENCH)
-using <%= "result#{i}" %> = stde::units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
+using <%= "result#{i}" %> = units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
 #else
 using <%= "result#{i}" %> = void;
 #endif
diff --git a/test/metabench/list/type_list_conditional_alias_hard.h b/test/metabench/list/type_list_conditional_alias_hard.h
index 556ae9bd..c6b43d43 100644
--- a/test/metabench/list/type_list_conditional_alias_hard.h
+++ b/test/metabench/list/type_list_conditional_alias_hard.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   template<bool>
   struct conditional {
@@ -194,4 +194,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/list/type_list_conditional_std.cpp.erb b/test/metabench/list/type_list_conditional_std.cpp.erb
index 2b43e9ae..772c689b 100644
--- a/test/metabench/list/type_list_conditional_std.cpp.erb
+++ b/test/metabench/list/type_list_conditional_std.cpp.erb
@@ -1,7 +1,5 @@
 #include "type_list_conditional_std.h"
 
-namespace stde = std::experimental;
-
 template<int UniqueValue>
 using dim_id = std::integral_constant<int, UniqueValue>;
 
@@ -22,7 +20,7 @@ using <%= "dim#{i}" %> = dimension<<%=
     xs.shuffle(random: rng).join(', ')
 %>>;
 #if defined(METABENCH)
-using <%= "result#{i}" %> = stde::units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
+using <%= "result#{i}" %> = units::type_list_sort<<%= "dim#{i}" %>, dim_id_less>;
 #else
 using <%= "result#{i}" %> = void;
 #endif
diff --git a/test/metabench/list/type_list_conditional_std.h b/test/metabench/list/type_list_conditional_std.h
index 5600f16b..54e0a100 100644
--- a/test/metabench/list/type_list_conditional_std.h
+++ b/test/metabench/list/type_list_conditional_std.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -182,4 +182,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/concepts_all.cpp.erb b/test/metabench/make_dimension/concepts_all.cpp.erb
index cc9aa860..b37b1dc7 100644
--- a/test/metabench/make_dimension/concepts_all.cpp.erb
+++ b/test/metabench/make_dimension/concepts_all.cpp.erb
@@ -1,16 +1,14 @@
 #include "dimension_concepts_all.h"
 
-namespace stde = std::experimental;
-
 <% (1..100).each do |k| %>
 struct test<%= k %> {
   <% (1..n).each do |i| %>
-  static constexpr stde::units::base_dimension dim<%= i %>{"dim<%= i %>"};
+  static constexpr units::base_dimension dim<%= i %>{"dim<%= i %>"};
   <% end %>
 
 #if defined(METABENCH)
-  using dim = stde::units::make_dimension_t<<%=
-      xs = ((1)..(n)).map { |j| "stde::units::exp<dim#{j}, 1>" }
+  using dim = units::make_dimension_t<<%=
+      xs = ((1)..(n)).map { |j| "units::exp<dim#{j}, 1>" }
       rng = Random.new(k)
       xs.shuffle(random: rng).join(', ')
   %>>;
diff --git a/test/metabench/make_dimension/concepts_iface.cpp.erb b/test/metabench/make_dimension/concepts_iface.cpp.erb
index b407542a..0d8cff6b 100644
--- a/test/metabench/make_dimension/concepts_iface.cpp.erb
+++ b/test/metabench/make_dimension/concepts_iface.cpp.erb
@@ -1,16 +1,14 @@
 #include "dimension_concepts_iface.h"
 
-namespace stde = std::experimental;
-
 <% (1..100).each do |k| %>
 struct test<%= k %> {
   <% (1..n).each do |i| %>
-  static constexpr stde::units::base_dimension dim<%= i %>{"dim<%= i %>"};
+  static constexpr units::base_dimension dim<%= i %>{"dim<%= i %>"};
   <% end %>
 
 #if defined(METABENCH)
-  using dim = stde::units::make_dimension_t<<%=
-      xs = ((1)..(n)).map { |j| "stde::units::exp<dim#{j}, 1>" }
+  using dim = units::make_dimension_t<<%=
+      xs = ((1)..(n)).map { |j| "units::exp<dim#{j}, 1>" }
       rng = Random.new(k)
       xs.shuffle(random: rng).join(', ')
   %>>;
diff --git a/test/metabench/make_dimension/dimension_concepts_all.h b/test/metabench/make_dimension/dimension_concepts_all.h
index b44517c2..adba3bd3 100644
--- a/test/metabench/make_dimension/dimension_concepts_all.h
+++ b/test/metabench/make_dimension/dimension_concepts_all.h
@@ -27,7 +27,7 @@
 #include "ratio_concepts_all.h"
 #include <ratio>
 
-namespace std::experimental::units {
+namespace units {
 
   struct base_dimension {
     const char* name;
@@ -213,4 +213,4 @@ namespace std::experimental::units {
   template<Dimension D1, Dimension D2>
   using dimension_divide_t = dimension_divide<typename D1::base_type, typename D2::base_type>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/dimension_concepts_iface.h b/test/metabench/make_dimension/dimension_concepts_iface.h
index 46b67e87..701296ec 100644
--- a/test/metabench/make_dimension/dimension_concepts_iface.h
+++ b/test/metabench/make_dimension/dimension_concepts_iface.h
@@ -27,7 +27,7 @@
 #include "ratio_concepts_iface.h"
 #include <ratio>
 
-namespace std::experimental::units {
+namespace units {
 
   struct base_dimension {
     const char* name;
@@ -213,4 +213,4 @@ namespace std::experimental::units {
   template<Dimension D1, Dimension D2>
   using dimension_divide_t = dimension_divide<typename D1::base_type, typename D2::base_type>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/dimension_no_concepts.h b/test/metabench/make_dimension/dimension_no_concepts.h
index 869c1aa7..f874b357 100644
--- a/test/metabench/make_dimension/dimension_no_concepts.h
+++ b/test/metabench/make_dimension/dimension_no_concepts.h
@@ -27,7 +27,7 @@
 #include "ratio_no_concepts.h"
 #include <ratio>
 
-namespace std::experimental::units {
+namespace units {
 
   struct base_dimension {
     const char* name;
@@ -184,4 +184,4 @@ namespace std::experimental::units {
   template<typename D1, typename D2>
   using dimension_divide_t = dimension_divide<typename D1::base_type, typename D2::base_type>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/downcasting_concepts_all.h b/test/metabench/make_dimension/downcasting_concepts_all.h
index f2fde3b6..6cf5f2e9 100644
--- a/test/metabench/make_dimension/downcasting_concepts_all.h
+++ b/test/metabench/make_dimension/downcasting_concepts_all.h
@@ -25,7 +25,7 @@
 #include "hacks.h"
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   template<typename BaseType>
   struct downcast_base {
@@ -51,4 +51,4 @@ namespace std::experimental::units {
   template<Downcastable T>
   using downcasting_traits_t = downcasting_traits<T>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/downcasting_no_concepts.h b/test/metabench/make_dimension/downcasting_no_concepts.h
index 17f5b883..70842392 100644
--- a/test/metabench/make_dimension/downcasting_no_concepts.h
+++ b/test/metabench/make_dimension/downcasting_no_concepts.h
@@ -25,7 +25,7 @@
 #include "hacks.h"
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   template<typename BaseType>
   struct downcast_base {
@@ -44,4 +44,4 @@ namespace std::experimental::units {
   template<typename T>
   using downcasting_traits_t = downcasting_traits<T>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/no_concepts.cpp.erb b/test/metabench/make_dimension/no_concepts.cpp.erb
index 422ac4fa..68b98188 100644
--- a/test/metabench/make_dimension/no_concepts.cpp.erb
+++ b/test/metabench/make_dimension/no_concepts.cpp.erb
@@ -1,16 +1,14 @@
 #include "dimension_no_concepts.h"
 
-namespace stde = std::experimental;
-
 <% (1..100).each do |k| %>
 struct test<%= k %> {
   <% (1..n).each do |i| %>
-  static constexpr stde::units::base_dimension dim<%= i %>{"dim<%= i %>"};
+  static constexpr units::base_dimension dim<%= i %>{"dim<%= i %>"};
   <% end %>
 
 #if defined(METABENCH)
-  using dim = stde::units::make_dimension_t<<%=
-      xs = ((1)..(n)).map { |j| "stde::units::exp<dim#{j}, 1>" }
+  using dim = units::make_dimension_t<<%=
+      xs = ((1)..(n)).map { |j| "units::exp<dim#{j}, 1>" }
       rng = Random.new(k)
       xs.shuffle(random: rng).join(', ')
   %>>;
diff --git a/test/metabench/make_dimension/ratio_concepts_all.h b/test/metabench/make_dimension/ratio_concepts_all.h
index a77ae4d2..05772ac7 100644
--- a/test/metabench/make_dimension/ratio_concepts_all.h
+++ b/test/metabench/make_dimension/ratio_concepts_all.h
@@ -27,7 +27,7 @@
 #include <numeric>
 #include <cstdint>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -135,4 +135,4 @@ namespace std::experimental::units {
   template<Ratio R1, Ratio R2>
   using common_ratio = detail::common_ratio_impl<R1, R2>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/ratio_concepts_iface.h b/test/metabench/make_dimension/ratio_concepts_iface.h
index c18b3e4b..d77fc93c 100644
--- a/test/metabench/make_dimension/ratio_concepts_iface.h
+++ b/test/metabench/make_dimension/ratio_concepts_iface.h
@@ -27,7 +27,7 @@
 #include <numeric>
 #include <cstdint>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -135,4 +135,4 @@ namespace std::experimental::units {
   template<Ratio R1, Ratio R2>
   using common_ratio = detail::common_ratio_impl<R1, R2>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/ratio_no_concepts.h b/test/metabench/make_dimension/ratio_no_concepts.h
index 0e5ccacd..85679a53 100644
--- a/test/metabench/make_dimension/ratio_no_concepts.h
+++ b/test/metabench/make_dimension/ratio_no_concepts.h
@@ -27,7 +27,7 @@
 #include <numeric>
 #include <cstdint>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -120,4 +120,4 @@ namespace std::experimental::units {
   template<typename R1, typename R2>
   using common_ratio = detail::common_ratio_impl<R1, R2>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/type_list_concepts_all.h b/test/metabench/make_dimension/type_list_concepts_all.h
index a67ed8e3..180f5039 100644
--- a/test/metabench/make_dimension/type_list_concepts_all.h
+++ b/test/metabench/make_dimension/type_list_concepts_all.h
@@ -24,7 +24,7 @@
 
 #include "type_traits.h"
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -182,4 +182,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/type_list_concepts_iface.h b/test/metabench/make_dimension/type_list_concepts_iface.h
index 5fd73751..b5b54cd9 100644
--- a/test/metabench/make_dimension/type_list_concepts_iface.h
+++ b/test/metabench/make_dimension/type_list_concepts_iface.h
@@ -24,7 +24,7 @@
 
 #include "type_traits.h"
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -182,4 +182,4 @@ namespace std::experimental::units {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/type_list_no_concepts.h b/test/metabench/make_dimension/type_list_no_concepts.h
index f68f2cee..c17fda5d 100644
--- a/test/metabench/make_dimension/type_list_no_concepts.h
+++ b/test/metabench/make_dimension/type_list_no_concepts.h
@@ -24,7 +24,7 @@
 
 #include "type_traits.h"
 
-namespace std::experimental::units {
+namespace units {
 
   // push_front
 
@@ -169,4 +169,4 @@ namespace std::experimental::units {
   template<typename List, template<typename, typename> typename Pred>
   using type_list_sort = detail::type_list_sort_impl<List, Pred>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/make_dimension/type_traits.h b/test/metabench/make_dimension/type_traits.h
index a2928c5b..4a9c8a50 100644
--- a/test/metabench/make_dimension/type_traits.h
+++ b/test/metabench/make_dimension/type_traits.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
diff --git a/test/metabench/ratio/all_ratio_type_constexpr.cpp.erb b/test/metabench/ratio/all_ratio_type_constexpr.cpp.erb
index 9192ab86..aa036f58 100644
--- a/test/metabench/ratio/all_ratio_type_constexpr.cpp.erb
+++ b/test/metabench/ratio/all_ratio_type_constexpr.cpp.erb
@@ -1,17 +1,15 @@
 #include "ratio_type_constexpr.h"
 
-namespace stde = std::experimental;
-
 <% (1..n).each do |i| %>
   struct test<%= i %> {
 #if defined(METABENCH)
-    using r1 = stde::units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
-    using r2 = stde::units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
+    using r1 = units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
+    using r2 = units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
 
-    using r3 = stde::units::ratio_multiply<r1, r2>;
-    using r4 = stde::units::ratio_divide<r1, r2>;
+    using r3 = units::ratio_multiply<r1, r2>;
+    using r4 = units::ratio_divide<r1, r2>;
 
-    using r5 = stde::units::common_ratio_t<r1, r2>;
+    using r5 = units::common_ratio_t<r1, r2>;
 #else
     using r1 = void;
     using r2 = void;
diff --git a/test/metabench/ratio/all_std_ratio.cpp.erb b/test/metabench/ratio/all_std_ratio.cpp.erb
index 71a51e29..2d34bc82 100644
--- a/test/metabench/ratio/all_std_ratio.cpp.erb
+++ b/test/metabench/ratio/all_std_ratio.cpp.erb
@@ -1,7 +1,5 @@
 #include "std_ratio.h"
 
-namespace stde = std::experimental;
-
 <% (1..n).each do |i| %>
   struct test<%= i %> {
 #if defined(METABENCH)
@@ -11,7 +9,7 @@ namespace stde = std::experimental;
     using r3 = std::ratio_multiply<r1, r2>;
     using r4 = std::ratio_divide<r1, r2>;
 
-    using r5 = stde::units::common_ratio_t<r1, r2>;
+    using r5 = units::common_ratio_t<r1, r2>;
 #else
     using r1 = void;
     using r2 = void;
diff --git a/test/metabench/ratio/common_ratio_ratio_type_constexpr.cpp.erb b/test/metabench/ratio/common_ratio_ratio_type_constexpr.cpp.erb
index cdc1dcf8..23daae35 100644
--- a/test/metabench/ratio/common_ratio_ratio_type_constexpr.cpp.erb
+++ b/test/metabench/ratio/common_ratio_ratio_type_constexpr.cpp.erb
@@ -1,14 +1,12 @@
 #include "ratio_type_constexpr.h"
 
-namespace stde = std::experimental;
-
 <% (1..n).each do |i| %>
   struct test<%= i %> {
-    using r1 = stde::units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
-    using r2 = stde::units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
+    using r1 = units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
+    using r2 = units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
 
 #if defined(METABENCH)
-    using r3 = stde::units::common_ratio_t<r1, r2>;
+    using r3 = units::common_ratio_t<r1, r2>;
 #else
     using r3 = void;
 #endif
diff --git a/test/metabench/ratio/common_ratio_std_ratio.cpp.erb b/test/metabench/ratio/common_ratio_std_ratio.cpp.erb
index 115a8c7e..5885f4f9 100644
--- a/test/metabench/ratio/common_ratio_std_ratio.cpp.erb
+++ b/test/metabench/ratio/common_ratio_std_ratio.cpp.erb
@@ -1,14 +1,12 @@
 #include "std_ratio.h"
 
-namespace stde = std::experimental;
-
 <% (1..n).each do |i| %>
   struct test<%= i %> {
     using r1 = std::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
     using r2 = std::ratio<<%= 2 * i %>, <%= 2 * n %>>;
 
 #if defined(METABENCH)
-    using r3 = stde::units::common_ratio_t<r1, r2>;
+    using r3 = units::common_ratio_t<r1, r2>;
 #else
     using r3 = void;
 #endif
diff --git a/test/metabench/ratio/create_ratio_type_constexpr.cpp.erb b/test/metabench/ratio/create_ratio_type_constexpr.cpp.erb
index e9f245d8..145cc852 100644
--- a/test/metabench/ratio/create_ratio_type_constexpr.cpp.erb
+++ b/test/metabench/ratio/create_ratio_type_constexpr.cpp.erb
@@ -1,12 +1,10 @@
 #include "ratio_type_constexpr.h"
 
-namespace stde = std::experimental;
-
 <% (1..n).each do |i| %>
   struct test<%= i %> {
 #if defined(METABENCH)
-    using r1 = stde::units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
-    using r2 = stde::units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
+    using r1 = units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
+    using r2 = units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
 #else
     using r1 = void;
     using r2 = void;
diff --git a/test/metabench/ratio/multiply_divide_ratio_type_constexpr.cpp.erb b/test/metabench/ratio/multiply_divide_ratio_type_constexpr.cpp.erb
index 2adf0d4a..9bdf1577 100644
--- a/test/metabench/ratio/multiply_divide_ratio_type_constexpr.cpp.erb
+++ b/test/metabench/ratio/multiply_divide_ratio_type_constexpr.cpp.erb
@@ -1,15 +1,13 @@
 #include "ratio_type_constexpr.h"
 
-namespace stde = std::experimental;
-
 <% (1..n).each do |i| %>
   struct test<%= i %> {
-    using r1 = stde::units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
-    using r2 = stde::units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
+    using r1 = units::ratio<<%= 2 * i - 1 %>, <%= 2 * n %>>;
+    using r2 = units::ratio<<%= 2 * i %>, <%= 2 * n %>>;
 
 #if defined(METABENCH)
-    using r3 = stde::units::ratio_multiply<r1, r2>;
-    using r4 = stde::units::ratio_divide<r1, r2>;
+    using r3 = units::ratio_multiply<r1, r2>;
+    using r4 = units::ratio_divide<r1, r2>;
 #else
     using r3 = void;
     using r4 = void;
diff --git a/test/metabench/ratio/ratio_type_constexpr.h b/test/metabench/ratio/ratio_type_constexpr.h
index ffa7f94d..b11b0aee 100644
--- a/test/metabench/ratio/ratio_type_constexpr.h
+++ b/test/metabench/ratio/ratio_type_constexpr.h
@@ -29,7 +29,7 @@
 
 #define Expects(cond) if(!(cond)) ::std::terminate();
 
-namespace std::experimental::units {
+namespace units {
 
   namespace detail {
 
@@ -122,4 +122,4 @@ namespace std::experimental::units {
   template<typename R1, typename R2>
   using common_ratio_t = typename detail::common_ratio_impl<R1, R2>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/metabench/ratio/std_ratio.h b/test/metabench/ratio/std_ratio.h
index 8e7d49e8..45422fe9 100644
--- a/test/metabench/ratio/std_ratio.h
+++ b/test/metabench/ratio/std_ratio.h
@@ -25,7 +25,7 @@
 #include <ratio>
 #include <type_traits>
 
-namespace std::experimental::units {
+namespace units {
 
   // static_sign
 
@@ -66,4 +66,4 @@ namespace std::experimental::units {
   template<typename R1, typename R2>
   using common_ratio_t = typename common_ratio<R1, R2>::type;
 
-}  // namespace std::experimental::units
+}  // namespace units
diff --git a/test/unit_test/test_custom_units.cpp b/test/unit_test/test_custom_units.cpp
index 0e5f5c79..143dfc9a 100644
--- a/test/unit_test/test_custom_units.cpp
+++ b/test/unit_test/test_custom_units.cpp
@@ -28,8 +28,6 @@
 
 namespace {
 
-  using namespace std::experimental;
-
   struct base_dim_digital_information { static constexpr const char* value = "digital information"; };
 
   struct digital_information : units::make_dimension_t<units::exp<base_dim_digital_information, 1>> {};
@@ -51,11 +49,9 @@ namespace {
   }
 }
 
-namespace stde = std::experimental;
-
-template<> struct stde::units::downcasting_traits<stde::units::downcast_from<digital_information>> : stde::units::downcast_to<digital_information> {};
-template<> struct stde::units::downcasting_traits<stde::units::downcast_from<bit>> : stde::units::downcast_to<bit> {};
-template<> struct stde::units::downcasting_traits<stde::units::downcast_from<::byte>> : stde::units::downcast_to<::byte> {};
+template<> struct units::downcasting_traits<units::downcast_from<digital_information>> : units::downcast_to<digital_information> {};
+template<> struct units::downcasting_traits<units::downcast_from<bit>> : units::downcast_to<bit> {};
+template<> struct units::downcasting_traits<units::downcast_from<::byte>> : units::downcast_to<::byte> {};
 
 namespace {
 
@@ -65,7 +61,7 @@ namespace {
 
 namespace {
 
-  using namespace stde::units;
+  using namespace units;
 
   // power spectral density
   struct power_spectral_density : make_dimension_t<units::exp<voltage, 2>, units::exp<frequency, -1>> {};
@@ -78,7 +74,7 @@ namespace {
   struct volt_per_sqrt_hertz : unit<amplitude_spectral_density> {};
 }
 
-namespace std::experimental::units {
+namespace units {
 
 template<> struct downcasting_traits<downcast_from<power_spectral_density>> : downcast_to<power_spectral_density> {};
 template<> struct downcasting_traits<downcast_from<sq_volt_per_hertz>> : downcast_to<sq_volt_per_hertz> {};
diff --git a/test/unit_test/test_dimension.cpp b/test/unit_test/test_dimension.cpp
index 93d10efa..8395c5c8 100644
--- a/test/unit_test/test_dimension.cpp
+++ b/test/unit_test/test_dimension.cpp
@@ -23,7 +23,7 @@
 #include "units/dimension.h"
 #include <utility>
 
-using namespace std::experimental::units;
+using namespace units;
 
 namespace {
 
diff --git a/test/unit_test/test_quantity.cpp b/test/unit_test/test_quantity.cpp
index 3cdb06fe..5ed81fd6 100644
--- a/test/unit_test/test_quantity.cpp
+++ b/test/unit_test/test_quantity.cpp
@@ -25,7 +25,7 @@
 #include <utility>
 #include <chrono>
 
-using namespace std::experimental::units;
+using namespace units;
 
 namespace {
 
@@ -44,7 +44,7 @@ namespace {
 
 }  // namespace
 
-namespace std::experimental::units {
+namespace units {
 
   template<typename T>
   inline constexpr bool treat_as_floating_point<my_value<T>> = std::is_floating_point_v<T>;
@@ -56,7 +56,7 @@ namespace std::experimental::units {
     static constexpr my_value<T> min() { return std::numeric_limits<T>::lowest(); }
   };
 
-}  // namespace std::experimental::units
+}  // namespace units
 
 namespace std {
 
@@ -72,7 +72,7 @@ namespace std {
 
 namespace {
 
-  using namespace std::experimental::units;
+  using namespace units;
 
   // class invariants
 
diff --git a/test/unit_test/test_ratio.cpp b/test/unit_test/test_ratio.cpp
index d60acfdf..997645c0 100644
--- a/test/unit_test/test_ratio.cpp
+++ b/test/unit_test/test_ratio.cpp
@@ -24,7 +24,7 @@
 
 namespace {
 
-  using namespace std::experimental::units;
+  using namespace units;
 
   template<Ratio R1, Ratio R2>
   inline constexpr bool same = R1::num == R2::num && R1::den == R2::den;
diff --git a/test/unit_test/test_type_list.cpp b/test/unit_test/test_type_list.cpp
index e3c8db55..dd89b836 100644
--- a/test/unit_test/test_type_list.cpp
+++ b/test/unit_test/test_type_list.cpp
@@ -25,7 +25,7 @@
 
 namespace {
 
-  using namespace std::experimental::units;
+  using namespace units;
 
   template<typename... Types>
   struct type_list;
diff --git a/test/unit_test/test_units.cpp b/test/unit_test/test_units.cpp
index 057d4540..ff9f7e18 100644
--- a/test/unit_test/test_units.cpp
+++ b/test/unit_test/test_units.cpp
@@ -46,7 +46,7 @@
 
 namespace {
 
-  using namespace std::experimental::units;
+  using namespace units;
 
   /* ************** BASE DIMENSIONS **************** */
 
diff --git a/test_package/test_package.cpp b/test_package/test_package.cpp
index 0233c92a..174991d4 100644
--- a/test_package/test_package.cpp
+++ b/test_package/test_package.cpp
@@ -23,11 +23,10 @@
 #include <units/dimensions/velocity.h>
 #include <iostream>
 
-namespace stde = std::experimental;
-using namespace stde::units::literals;
+using namespace units::literals;
 
-template<stde::units::Length D, stde::units::Time T>
-constexpr stde::units::Velocity avg_speed(D d, T t)
+template<units::Length D, units::Time T>
+constexpr units::Velocity avg_speed(D d, T t)
 {
   return d / t;
 }