diff --git a/MantleAPI/include/MantleAPI/Common/spline.h b/MantleAPI/include/MantleAPI/Common/spline.h
index fd713272dfe041084c622f6eaf391d1d4e4a06a6..4c109eec614de5fb69546fd1a8af751aa0e3035f 100644
--- a/MantleAPI/include/MantleAPI/Common/spline.h
+++ b/MantleAPI/include/MantleAPI/Common/spline.h
@@ -56,7 +56,6 @@ UNIT_ADD_CATEGORY_TRAIT(jerk_acceleration)
 
 namespace mantle_api
 {
-using namespace units;
 
 template <typename T>
 struct SplineSegment
@@ -67,7 +66,7 @@ struct SplineSegment
   Vec3<T> d;
 };
 
-template <typename T, class = typename std::enable_if_t<traits::is_unit<T>::value>>
+template <typename T, class = typename std::enable_if_t<units::traits::is_unit<T>::value>>
 struct SplineSection
 {
   Time start_time{0};
@@ -78,15 +77,15 @@ struct SplineSection
   /// \f[
   ///   P(x) = \sum_{i=0}^{3} a_{i} x^{i} = a_3 x^3 + a_2 x^2 + a_1 x + a_0
   /// \f]
-  std::tuple<unit_t<compound_unit<T, inverse<cubed<time::second>>>>,
-             unit_t<compound_unit<T, inverse<squared<time::second>>>>,
-             unit_t<compound_unit<T, inverse<time::second>>>,
-             unit_t<T>>
+  std::tuple<units::unit_t<units::compound_unit<T, units::inverse<units::cubed<units::time::second>>>>,
+             units::unit_t<units::compound_unit<T, units::inverse<units::squared<units::time::second>>>>,
+             units::unit_t<units::compound_unit<T, units::inverse<units::time::second>>>,
+             units::unit_t<T>>
       polynomial{
-          unit_t<compound_unit<T, inverse<cubed<time::second>>>>(0),
-          unit_t<compound_unit<T, inverse<squared<time::second>>>>(0),
-          unit_t<compound_unit<T, inverse<time::second>>>(0),
-          unit_t<T>(0)};
+          units::unit_t<units::compound_unit<T, units::inverse<units::cubed<units::time::second>>>>(0),
+          units::unit_t<units::compound_unit<T, units::inverse<units::squared<units::time::second>>>>(0),
+          units::unit_t<units::compound_unit<T, units::inverse<units::time::second>>>(0),
+          units::unit_t<T>(0)};
 };
 
 /// @brief Equality comparison for SplineSection.