diff --git a/docs/framework/dimensions.rst b/docs/framework/dimensions.rst
index ce6a91b4..f6000772 100644
--- a/docs/framework/dimensions.rst
+++ b/docs/framework/dimensions.rst
@@ -109,10 +109,10 @@ The above dimensions can be defined in the library with the
 
     namespace si {
 
-    struct dim_area     : derived_dimension<dim_area, square_metre,
-                                            exp<dim_length, 2>> {};
-    struct dim_velocity : derived_dimension<dim_velocity, metre_per_second,
-                                            exp<dim_length, 1>, exp<dim_time, -1>> {};
+    struct dim_area  : derived_dimension<dim_area, square_metre,
+                                         exp<dim_length, 2>> {};
+    struct dim_speed : derived_dimension<dim_speed, metre_per_second,
+                                         exp<dim_length, 1>, exp<dim_time, -1>> {};
 
     }
 
@@ -141,10 +141,10 @@ matter. Even if we define the above as:
 
     namespace si {
 
-    struct dim_area     : derived_dimension<dim_area, square_metre,
-                                            exp<dim_length, 1>, exp<dim_length, 1>> {};
-    struct dim_velocity : derived_dimension<dim_velocity, metre_per_second,
-                                            exp<dim_time, -1>, exp<dim_length, 1>> {};
+    struct dim_area  : derived_dimension<dim_area, square_metre,
+                                         exp<dim_length, 1>, exp<dim_length, 1>> {};
+    struct dim_speed : derived_dimension<dim_speed, metre_per_second,
+                                         exp<dim_time, -1>, exp<dim_length, 1>> {};
 
     }
 
@@ -170,7 +170,7 @@ In order to obtain the base/coherent unit of any dimension type a
 `dimension_unit` helper was introduced::
 
     static_assert(std::is_same_v<dimension_unit<si::dim_length>, si::metre>);
-    static_assert(std::is_same_v<dimension_unit<si::dim_velocity>, si::metre_per_second>);
+    static_assert(std::is_same_v<dimension_unit<si::dim_speed>, si::metre_per_second>);
 
 
 .. rubric:: Citations:
diff --git a/docs/framework/units.rst b/docs/framework/units.rst
index 1b505429..a16fbaa7 100644
--- a/docs/framework/units.rst
+++ b/docs/framework/units.rst
@@ -144,7 +144,7 @@ However, the easiest way to define momentum is just to use the
 
     struct dim_momentum : derived_dimension<dim_momentum, kilogram_metre_per_second,
                                             exp<si::dim_mass, 1>,
-                                            exp<si::dim_velocity, 1>> {}; // kg ⋅ m/s
+                                            exp<si::dim_speed, 1>> {}; // kg ⋅ m/s
 
 In such a case the library will do its magic and will automatically
 unpack a provided derived dimension to its base dimensions in order to
@@ -296,7 +296,7 @@ does not exist at all. With it `si::kilometre_per_hour` can be defined as::
 
     namespace si {
 
-    struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_velocity, kilometre, hour> {};
+    struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_speed, kilometre, hour> {};
 
     }
 
diff --git a/docs/use_cases/unknown_dimensions.rst b/docs/use_cases/unknown_dimensions.rst
index 6d990572..3e778ebc 100644
--- a/docs/use_cases/unknown_dimensions.rst
+++ b/docs/use_cases/unknown_dimensions.rst
@@ -27,7 +27,7 @@ will determine its type. The same applies to the resulting unit. For example:
     using namespace units::physical::si;
 
     constexpr auto result = 144q_km / 2q_h;
-    static_assert(std::is_same_v<decltype(result)::dimension, dim_velocity>);
+    static_assert(std::is_same_v<decltype(result)::dimension, dim_speed>);
     static_assert(std::is_same_v<decltype(result)::unit, kilometre_per_hour>);
 
 However, if the resulting dimension is not predefined by the user the library framework
diff --git a/src/include/units/physical/cgs/speed.h b/src/include/units/physical/cgs/speed.h
index 0a988c49..5c07f202 100644
--- a/src/include/units/physical/cgs/speed.h
+++ b/src/include/units/physical/cgs/speed.h
@@ -30,10 +30,10 @@
 namespace units::physical::cgs {
 
 struct centimetre_per_second : unit<centimetre_per_second> {};
-struct dim_velocity : physical::dim_velocity<dim_velocity, centimetre_per_second, dim_length, dim_time> {};
+struct dim_speed : physical::dim_speed<dim_speed, centimetre_per_second, dim_length, dim_time> {};
 
 template<Unit U, Scalar Rep = double>
-using speed = quantity<dim_velocity, U, Rep>;
+using speed = quantity<dim_speed, U, Rep>;
 
 inline namespace literals {
 
diff --git a/src/include/units/physical/dimensions.h b/src/include/units/physical/dimensions.h
index d312973b..5a1a9cba 100644
--- a/src/include/units/physical/dimensions.h
+++ b/src/include/units/physical/dimensions.h
@@ -70,7 +70,7 @@ template<typename Child, Unit U, DimensionOf<dim_length> L>
 struct dim_volume : derived_dimension<Child, U, exp<L, 3>> {};
 
 template<typename Child, Unit U, DimensionOf<dim_length> L, DimensionOf<dim_time> T>
-struct dim_velocity : derived_dimension<Child, U, exp<L, 1>, exp<T, -1>> {};
+struct dim_speed : derived_dimension<Child, U, exp<L, 1>, exp<T, -1>> {};
 
 template<typename Child, Unit U, DimensionOf<dim_length> L, DimensionOf<dim_time> T>
 struct dim_acceleration : derived_dimension<Child, U, exp<L, 1>, exp<T, -2>> {};
@@ -78,7 +78,7 @@ struct dim_acceleration : derived_dimension<Child, U, exp<L, 1>, exp<T, -2>> {};
 template<typename Child, Unit U, DimensionOf<dim_mass> M, DimensionOf<dim_acceleration> A>
 struct dim_force : derived_dimension<Child, U, exp<M, 1>, exp<A, 1>> {};
 
-template<typename Child, Unit U, DimensionOf<dim_mass> M, DimensionOf<dim_velocity> V>
+template<typename Child, Unit U, DimensionOf<dim_mass> M, DimensionOf<dim_speed> V>
 struct dim_momentum : derived_dimension<Child, U, exp<M, 1>, exp<V, 1>> {};
 
 template<typename Child, Unit U, DimensionOf<dim_force> F, DimensionOf<dim_length> L>
@@ -207,7 +207,7 @@ template<typename T>
 concept Volume = QuantityOf<T, dim_volume>;
 
 template<typename T>
-concept Speed = QuantityOf<T, dim_velocity>;
+concept Speed = QuantityOf<T, dim_speed>;
 
 template<typename T>
 concept Acceleration = QuantityOf<T, dim_acceleration>;
diff --git a/src/include/units/physical/international/speed.h b/src/include/units/physical/international/speed.h
index da68cbe6..89c09c56 100644
--- a/src/include/units/physical/international/speed.h
+++ b/src/include/units/physical/international/speed.h
@@ -27,7 +27,7 @@
 
 namespace units::physical::international {
 
-struct mile_per_hour : deduced_unit<mile_per_hour, si::dim_velocity, international::mile, si::hour> {};
+struct mile_per_hour : deduced_unit<mile_per_hour, si::dim_speed, international::mile, si::hour> {};
 
 inline namespace literals {
 
diff --git a/src/include/units/physical/natural/dimensions.h b/src/include/units/physical/natural/dimensions.h
index ede5a66c..4ec305d5 100644
--- a/src/include/units/physical/natural/dimensions.h
+++ b/src/include/units/physical/natural/dimensions.h
@@ -40,9 +40,9 @@ struct dim_mass : physical::dim_mass<gigaelectronvolt> {};
 template<Unit U, Scalar Rep = double>
 using mass = quantity<dim_mass, U, Rep>;
 
-struct dim_velocity : physical::dim_velocity<dim_velocity, unitless, dim_length, dim_time> {};
+struct dim_speed : physical::dim_speed<dim_speed, unitless, dim_length, dim_time> {};
 template<Unit U, Scalar Rep = double>
-using speed = quantity<dim_velocity, U, Rep>;
+using speed = quantity<dim_speed, U, Rep>;
 
 struct dim_acceleration : physical::dim_acceleration<dim_acceleration, gigaelectronvolt, dim_length, dim_time> {};
 template<Unit U, Scalar Rep = double>
@@ -52,7 +52,7 @@ struct dim_force : physical::dim_force<dim_force, square_gigaelectronvolt, dim_m
 template<Unit U, Scalar Rep = double>
 using force = quantity<dim_force, U, Rep>;
 
-struct dim_momentum : physical::dim_momentum<dim_momentum, gigaelectronvolt, dim_mass, dim_velocity> {};
+struct dim_momentum : physical::dim_momentum<dim_momentum, gigaelectronvolt, dim_mass, dim_speed> {};
 template<Unit U, Scalar Rep = double>
 using momentum = quantity<dim_momentum, U, Rep>;
 
diff --git a/src/include/units/physical/si/momentum.h b/src/include/units/physical/si/momentum.h
index 888e782a..0e15dbf6 100644
--- a/src/include/units/physical/si/momentum.h
+++ b/src/include/units/physical/si/momentum.h
@@ -30,7 +30,7 @@
 namespace units::physical::si {
 
 struct kilogram_metre_per_second : unit<kilogram_metre_per_second> {};
-struct dim_momentum : physical::dim_momentum<dim_momentum, kilogram_metre_per_second, dim_mass, dim_velocity> {};
+struct dim_momentum : physical::dim_momentum<dim_momentum, kilogram_metre_per_second, dim_mass, dim_speed> {};
 
 template<Unit U, Scalar Rep = double>
 using momentum = quantity<dim_momentum, U, Rep>;
diff --git a/src/include/units/physical/si/speed.h b/src/include/units/physical/si/speed.h
index 9c3ba933..46ce7189 100644
--- a/src/include/units/physical/si/speed.h
+++ b/src/include/units/physical/si/speed.h
@@ -30,12 +30,12 @@
 namespace units::physical::si {
 
 struct metre_per_second : unit<metre_per_second> {};
-struct dim_velocity : physical::dim_velocity<dim_velocity, metre_per_second, dim_length, dim_time> {};
+struct dim_speed : physical::dim_speed<dim_speed, metre_per_second, dim_length, dim_time> {};
 
-struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_velocity, kilometre, hour> {};
+struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_speed, kilometre, hour> {};
 
 template<Unit U, Scalar Rep = double>
-using speed = quantity<dim_velocity, U, Rep>;
+using speed = quantity<dim_speed, U, Rep>;
 
 inline namespace literals {
 
diff --git a/test/unit_test/static/cgs_test.cpp b/test/unit_test/static/cgs_test.cpp
index bd6e074c..28ba1453 100644
--- a/test/unit_test/static/cgs_test.cpp
+++ b/test/unit_test/static/cgs_test.cpp
@@ -54,7 +54,7 @@ static_assert(10q_cm / 5q_s == 2q_cm_per_s);
 static_assert(10q_cm / 2q_cm_per_s == 5q_s);
 static_assert(10q_cm == 2q_cm_per_s * 5q_s);
 
-static_assert(detail::unit_text<dim_velocity, centimetre_per_second>() == "cm/s");
+static_assert(detail::unit_text<dim_speed, centimetre_per_second>() == "cm/s");
 
 // area
 static_assert(std::is_same_v<ratio_divide<centimetre::ratio, dimension_unit<dim_length>::ratio>, ratio<1>>);
diff --git a/test/unit_test/static/si_test.cpp b/test/unit_test/static/si_test.cpp
index e2ea7ecb..65ce7e3b 100644
--- a/test/unit_test/static/si_test.cpp
+++ b/test/unit_test/static/si_test.cpp
@@ -255,7 +255,7 @@ static_assert(2q_km / 2q_km_per_h == 1q_h);
 // static_assert(2000q_m / 2q_km_per_h == 1q_h); // should not compile
 static_assert(quantity_cast<kilometre>(2000q_m) / 2q_km_per_h == 1q_h);
 
-static_assert(detail::unit_text<dim_velocity, metre_per_second>() == "m/s");
+static_assert(detail::unit_text<dim_speed, metre_per_second>() == "m/s");
 static_assert(kilometre_per_hour::symbol == "km/h");
 
 // acceleration
diff --git a/test/unit_test/static/unit_test.cpp b/test/unit_test/static/unit_test.cpp
index 6f6cc477..3b641f5e 100644
--- a/test/unit_test/static/unit_test.cpp
+++ b/test/unit_test/static/unit_test.cpp
@@ -43,8 +43,8 @@ struct kelvin : named_unit<kelvin, "K", no_prefix> {};
 // struct kilokelvin : prefixed_unit<kilokelvin, si::kilo, kelvin> {};  // should not compile (prefix not allowed for this reference unit)
 
 struct metre_per_second : unit<metre_per_second> {};
-struct dim_velocity : derived_dimension<dim_velocity, metre_per_second, units::exp<dim_length, 1>, units::exp<dim_time, -1>> {};
-struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_velocity, kilometre, hour> {};
+struct dim_speed : derived_dimension<dim_speed, metre_per_second, units::exp<dim_length, 1>, units::exp<dim_time, -1>> {};
+struct kilometre_per_hour : deduced_unit<kilometre_per_hour, dim_speed, kilometre, hour> {};
 
 static_assert(std::is_same_v<downcast<scaled_unit<ratio<1>, metre>>, metre>);
 static_assert(std::is_same_v<downcast<scaled_unit<ratio<1, 1, -2>, metre>>, centimetre>);