diff --git a/include/xo/unit/native_bpu2.hpp b/include/xo/unit/bpu2.hpp
similarity index 100%
rename from include/xo/unit/native_bpu2.hpp
rename to include/xo/unit/bpu2.hpp
diff --git a/include/xo/unit/native_bpu2_iostream.hpp b/include/xo/unit/bpu2_iostream.hpp
similarity index 95%
rename from include/xo/unit/native_bpu2_iostream.hpp
rename to include/xo/unit/bpu2_iostream.hpp
index e16cc65a..75249b9d 100644
--- a/include/xo/unit/native_bpu2_iostream.hpp
+++ b/include/xo/unit/bpu2_iostream.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "xo/ratio/ratio_iostream.hpp"
-#include "native_bpu2.hpp"
+#include "bpu2.hpp"
 #include <iostream>
 
 namespace xo {
diff --git a/include/xo/unit/bpu_store.hpp b/include/xo/unit/bpu_store.hpp
index 196bd8ed..6c2960de 100644
--- a/include/xo/unit/bpu_store.hpp
+++ b/include/xo/unit/bpu_store.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "native_bpu2.hpp"
+#include "bpu2.hpp"
 
 namespace xo {
     namespace qty {
diff --git a/include/xo/unit/natural_unit.hpp b/include/xo/unit/natural_unit.hpp
index d827cfca..dd3fe94d 100644
--- a/include/xo/unit/natural_unit.hpp
+++ b/include/xo/unit/natural_unit.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "native_bpu2.hpp"
+#include "bpu2.hpp"
 #include <cmath>
 #include <cassert>
 
diff --git a/utest/mpl_unit.test.cpp b/utest/mpl_unit.test.cpp
index 0fc6e10f..a72c32d8 100644
--- a/utest/mpl_unit.test.cpp
+++ b/utest/mpl_unit.test.cpp
@@ -1,6 +1,6 @@
 /* @file mpl_unit.test.cpp */
 
-#include "native_bpu2.hpp"
+//#include "native_bpu.hpp"
 #include "xo/unit/mpl/quantity.hpp"
 //#include "xo/unit/unit.hpp"
 //#include "xo/unit/Quantity2_iostream.hpp"
@@ -39,7 +39,7 @@ namespace xo {
         //using xo::unit::bpu2_abbrev_type;
         //using xo::unit::abbrev::bpu2_abbrev;
         //using xo::unit::basis_unit2_store;
-        using xo::qty::power_ratio_type;
+        //using xo::unit::power_ratio_type;
         //using xo::unit::abbrev::flatstring_from_exponent;
         //using xo::unit::bpu2;
         //using xo::unit::detail::bpu2_rescale;
diff --git a/utest/unit.test.cpp b/utest/unit.test.cpp
index c957ce9c..af8f387c 100644
--- a/utest/unit.test.cpp
+++ b/utest/unit.test.cpp
@@ -7,8 +7,8 @@
 #include "xo/unit/natural_unit.hpp"
 #include "xo/unit/natural_unit_iostream.hpp"
 #include "xo/unit/bpu_store.hpp"
-#include "xo/unit/native_bpu2.hpp"
-#include "xo/unit/native_bpu2_iostream.hpp"
+#include "xo/unit/bpu2.hpp"
+#include "xo/unit/bpu2_iostream.hpp"
 #include "xo/unit/basis_unit2.hpp"
 #include "xo/unit/dim_util2.hpp"
 #include "xo/reflect/Reflect.hpp"