diff --git a/include/xo/unit/Quantity.hpp b/include/xo/unit/Quantity2.hpp
similarity index 100%
rename from include/xo/unit/Quantity.hpp
rename to include/xo/unit/Quantity2.hpp
diff --git a/include/xo/unit/Quantity_iostream.hpp b/include/xo/unit/Quantity2_iostream.hpp
similarity index 100%
rename from include/xo/unit/Quantity_iostream.hpp
rename to include/xo/unit/Quantity2_iostream.hpp
diff --git a/include/xo/unit/quantity_.hpp b/include/xo/unit/quantity.hpp
similarity index 100%
rename from include/xo/unit/quantity_.hpp
rename to include/xo/unit/quantity.hpp
diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt
index 09cfd8ff..9584b632 100644
--- a/utest/CMakeLists.txt
+++ b/utest/CMakeLists.txt
@@ -3,7 +3,7 @@
 set(SELF_EXE utest.unit)
 set(SELF_SRCS
     unit_utest_main.cpp  #mpl_unit.test.cpp
-    Quantity.test.cpp
+    Quantity2.test.cpp
     quantity.test.cpp
     bpu.test.cpp
     basis_unit.test.cpp
diff --git a/utest/Quantity2.test.cpp b/utest/Quantity2.test.cpp
index 62a5b3d1..66647ef2 100644
--- a/utest/Quantity2.test.cpp
+++ b/utest/Quantity2.test.cpp
@@ -1,7 +1,7 @@
 /* @file Quantity.test.cpp */
 
-#include "Quantity.hpp"
-#include "Quantity_iostream.hpp"
+#include "Quantity2.hpp"
+#include "Quantity2_iostream.hpp"
 #include "xo/randomgen/random_seed.hpp"
 #include "xo/randomgen/xoshiro256.hpp"
 #include "xo/indentlog/scope.hpp"