diff --git a/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp b/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp
index 05127e0d23..3163d1f7ed 100644
--- a/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp
+++ b/include/boost/geometry/algorithms/detail/envelope/intersects_antimeridian.hpp
@@ -62,7 +62,7 @@ struct intersects_antimeridian
 
         return apply
             <
-                typename coordinate_system<Point>::type::units
+                detail::coordinate_system_units_t<Point>
             >(geometry::get<0>(p1_normalized),
               geometry::get<1>(p1_normalized),
               geometry::get<0>(p2_normalized),
diff --git a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
index 0f510b5fc5..b49dafde90 100644
--- a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+++ b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
@@ -254,7 +254,7 @@ struct collected_vector_polar
         using constants = math::detail::constants_on_spheroid
             <
                 coord_type,
-                typename coordinate_system<Point>::type::units
+                detail::coordinate_system_units_t<Point>
             > ;
 
         constexpr coord_type pi_2 = constants::half_period() / 2;
diff --git a/include/boost/geometry/algorithms/detail/gc_make_rtree.hpp b/include/boost/geometry/algorithms/detail/gc_make_rtree.hpp
index db66aaf81d..d12cdff506 100644
--- a/include/boost/geometry/algorithms/detail/gc_make_rtree.hpp
+++ b/include/boost/geometry/algorithms/detail/gc_make_rtree.hpp
@@ -39,7 +39,7 @@ using gc_make_rtree_box_t = geometry::model::box
             <
                 geometry::coordinate_type_t<GC>,
                 geometry::dimension<GC>::value,
-                typename geometry::coordinate_system<GC>::type
+                geometry::coordinate_system_t<GC>
             >
     >;
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp b/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
index e98101a135..9a6cff29c7 100644
--- a/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/pointlike_areal.hpp
@@ -187,7 +187,7 @@ class multipoint_multipolygon_point
             <
                 geometry::coordinate_type_t<MultiPoint>,
                 geometry::dimension<MultiPoint>::value,
-                typename geometry::coordinate_system<MultiPoint>::type
+                geometry::coordinate_system_t<MultiPoint>
             >;
         using box_type = geometry::model::box<point_type>;
         using box_pair = std::pair<box_type, std::size_t>;
diff --git a/include/boost/geometry/algorithms/detail/sections/section_functions.hpp b/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
index d91ce7633e..53be42f091 100644
--- a/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
+++ b/include/boost/geometry/algorithms/detail/sections/section_functions.hpp
@@ -55,11 +55,8 @@ struct preceding_check<0, Geometry, spherical_tag>
     template <typename Point, typename Box>
     static inline bool apply(int dir, Point const& point, Box const& point_box, Box const& other_box)
     {
-        typedef typename select_coordinate_type
-            <
-                Point, Box
-            >::type calc_t;
-        typedef typename coordinate_system<Point>::type::units units_t;
+        using calc_t = typename select_coordinate_type<Point, Box>::type;
+        using units_t = detail::coordinate_system_units_t<Point>;
 
         calc_t const c0 = 0;
 
diff --git a/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
index c2ab77af91..f72738bdc4 100644
--- a/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+++ b/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
@@ -190,7 +190,7 @@ struct get_direction_loop<Point, DimensionVector, 0, Count, spherical_tag>
                 int directions[Count])
     {
         using coordinate_type = coordinate_type_t<Segment>;
-        using units_t = typename coordinate_system<Point>::type::units;
+        using units_t = detail::coordinate_system_units_t<Point>;
 
         coordinate_type const diff = math::longitude_distance_signed
                                         <
diff --git a/include/boost/geometry/algorithms/detail/touches/implementation.hpp b/include/boost/geometry/algorithms/detail/touches/implementation.hpp
index c966863a0c..a29fa8ff45 100644
--- a/include/boost/geometry/algorithms/detail/touches/implementation.hpp
+++ b/include/boost/geometry/algorithms/detail/touches/implementation.hpp
@@ -114,8 +114,8 @@ struct box_box
     {
         BOOST_STATIC_ASSERT((std::is_same
                                 <
-                                    typename geometry::coordinate_system<Box1>::type,
-                                    typename geometry::coordinate_system<Box2>::type
+                                    geometry::coordinate_system_t<Box1>,
+                                    geometry::coordinate_system_t<Box2>
                                 >::value
                            ));
         assert_dimension_equal<Box1, Box2>();
diff --git a/include/boost/geometry/algorithms/merge_elements.hpp b/include/boost/geometry/algorithms/merge_elements.hpp
index c08695ebe2..5d1de1114b 100644
--- a/include/boost/geometry/algorithms/merge_elements.hpp
+++ b/include/boost/geometry/algorithms/merge_elements.hpp
@@ -271,7 +271,7 @@ struct merge_gc
         using original_point_t = geometry::point_type_t<GeometryCollection>;
         using iterator_t = typename boost::range_iterator<GeometryCollection const>::type;
         using coor_t = geometry::coordinate_type_t<original_point_t>;
-        using cs_t = typename geometry::coordinate_system<original_point_t>::type;
+        using cs_t = geometry::coordinate_system_t<original_point_t>;
         using point_t = model::point<coor_t, 2, cs_t>;
 
         using multi_point_t = typename util::sequence_find_if
diff --git a/include/boost/geometry/core/coordinate_system.hpp b/include/boost/geometry/core/coordinate_system.hpp
index c980d82aca..68922c029d 100644
--- a/include/boost/geometry/core/coordinate_system.hpp
+++ b/include/boost/geometry/core/coordinate_system.hpp
@@ -96,10 +96,25 @@ struct coordinate_system
         >::type;
 };
 
-
 template <typename Geometry>
 using coordinate_system_t = typename coordinate_system<Geometry>::type;
 
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail {
+
+// Short cut for coordinate system units
+template <typename Geometry>
+struct coordinate_system_units
+{
+    using type = typename coordinate_system<Geometry>::type::units;
+};
+
+
+template <typename Geometry>
+using coordinate_system_units_t = typename coordinate_system_units<Geometry>::type;
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
 
 }} // namespace boost::geometry
 
diff --git a/include/boost/geometry/core/radian_access.hpp b/include/boost/geometry/core/radian_access.hpp
index ef87701ba5..05a55957e2 100644
--- a/include/boost/geometry/core/radian_access.hpp
+++ b/include/boost/geometry/core/radian_access.hpp
@@ -191,7 +191,7 @@ template <std::size_t Dimension, typename Geometry>
 inline typename fp_coordinate_type<Geometry>::type get_as_radian(Geometry const& geometry)
 {
     return detail::radian_access<Dimension, Geometry,
-            typename coordinate_system<Geometry>::type>::get(geometry);
+            coordinate_system_t<Geometry>>::get(geometry);
 }
 
 /*!
@@ -211,7 +211,7 @@ inline void set_from_radian(Geometry& geometry,
             typename fp_coordinate_type<Geometry>::type const& radians)
 {
     detail::radian_access<Dimension, Geometry,
-            typename coordinate_system<Geometry>::type>::set(geometry, radians);
+            coordinate_system_t<Geometry>>::set(geometry, radians);
 }
 
 /*!
@@ -231,7 +231,7 @@ template <std::size_t Index, std::size_t Dimension, typename Geometry>
 inline typename fp_coordinate_type<Geometry>::type get_as_radian(Geometry const& geometry)
 {
     return detail::radian_access_box_segment<Index, Dimension, Geometry,
-            typename coordinate_system<Geometry>::type>::get(geometry);
+            coordinate_system_t<Geometry>>::get(geometry);
 }
 
 /*!
@@ -252,7 +252,7 @@ inline void set_from_radian(Geometry& geometry,
             typename fp_coordinate_type<Geometry>::type const& radians)
 {
     detail::radian_access_box_segment<Index, Dimension, Geometry,
-            typename coordinate_system<Geometry>::type>::set(geometry, radians);
+            coordinate_system_t<Geometry>>::set(geometry, radians);
 }
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/formulas/geographic.hpp b/include/boost/geometry/formulas/geographic.hpp
index a8c0a369c2..2fa45d8dab 100644
--- a/include/boost/geometry/formulas/geographic.hpp
+++ b/include/boost/geometry/formulas/geographic.hpp
@@ -128,7 +128,7 @@ inline PointGeo cart3d_to_geo(Point3d const& point_3d, Spheroid const& spheroid)
 
     math::normalize_spheroidal_coordinates
         <
-            typename coordinate_system<PointGeo>::type::units,
+            geometry::detail::coordinate_system_units_t<PointGeo>,
             coord_t
         >(lon, lat);
 
diff --git a/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp b/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp
index 4ae4e947bb..99940ee444 100644
--- a/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp
+++ b/include/boost/geometry/geometries/adapted/boost_polygon/point.hpp
@@ -47,14 +47,14 @@ struct tag<boost::polygon::point_data<CoordinateType> >
 template <typename CoordinateType>
 struct coordinate_type<boost::polygon::point_data<CoordinateType> >
 {
-    typedef CoordinateType type;
+    using type = CoordinateType;
 };
 
 
 template <typename CoordinateType>
 struct coordinate_system<boost::polygon::point_data<CoordinateType> >
 {
-    typedef cs::cartesian type;
+    using type = cs::cartesian;
 };
 
 
diff --git a/include/boost/geometry/geometries/concepts/point_concept.hpp b/include/boost/geometry/geometries/concepts/point_concept.hpp
index 64c9d30564..bf05f02f72 100644
--- a/include/boost/geometry/geometries/concepts/point_concept.hpp
+++ b/include/boost/geometry/geometries/concepts/point_concept.hpp
@@ -41,7 +41,7 @@ class Point
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
 
     using ctype = coordinate_type_t<Geometry>;
-    using csystem = typename coordinate_system<Geometry>::type;
+    using csystem = coordinate_system_t<Geometry>;
 
     // The following enum is used to fully instantiate the coordinate
     // system class; this is needed in order to check the units passed
@@ -93,8 +93,8 @@ class ConstPoint
 {
 #ifndef DOXYGEN_NO_CONCEPT_MEMBERS
 
-    typedef coordinate_type_t<Geometry> ctype;
-    typedef typename coordinate_system<Geometry>::type csystem;
+    using ctype = coordinate_type_t<Geometry>;
+    using csystem = coordinate_system_t<Geometry>;
 
     // The following enum is used to fully instantiate the coordinate
     // system class; this is needed in order to check the units passed
diff --git a/include/boost/geometry/index/rtree.hpp b/include/boost/geometry/index/rtree.hpp
index 61cecb2cdd..ec8451f33e 100644
--- a/include/boost/geometry/index/rtree.hpp
+++ b/include/boost/geometry/index/rtree.hpp
@@ -195,7 +195,7 @@ class rtree
                 geometry::model::point<
                     coordinate_type_t<indexable_type>,
                     dimension<indexable_type>::value,
-                    typename coordinate_system<indexable_type>::type
+                    coordinate_system_t<indexable_type>
                 >
             >
     bounds_type;
diff --git a/include/boost/geometry/srs/transformation.hpp b/include/boost/geometry/srs/transformation.hpp
index d8aeff9ab3..fc2e30c8bd 100644
--- a/include/boost/geometry/srs/transformation.hpp
+++ b/include/boost/geometry/srs/transformation.hpp
@@ -103,7 +103,7 @@ struct transform_geometry_point
                     CT
                 >::type,
             geometry::dimension<point_type>::type::value,
-            typename geometry::coordinate_system<point_type>::type
+            geometry::coordinate_system_t<point_type>
         >;
 
     template <typename PtIn, typename PtOut>
diff --git a/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp b/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp
index 3b79de2a77..cb52e2ea02 100644
--- a/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp
+++ b/include/boost/geometry/strategies/cartesian/closest_points_pt_seg.hpp
@@ -42,7 +42,7 @@ struct compute_closest_point_to_segment
             <
                 CalculationType,
                 dimension<PointOfSegment>::value,
-                typename coordinate_system<PointOfSegment>::type
+                coordinate_system_t<PointOfSegment>
             >;
 
         // For convenience
diff --git a/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp b/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
index 0128669f19..3344500bcd 100644
--- a/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
+++ b/include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp
@@ -170,7 +170,7 @@ public :
             <
                 calculation_type,
                 dimension<PointOfSegment>::value,
-                typename coordinate_system<PointOfSegment>::type
+                coordinate_system_t<PointOfSegment>
             > fp_point_type;
 
         // For convenience
diff --git a/include/boost/geometry/strategies/geographic/closest_points_pt_seg.hpp b/include/boost/geometry/strategies/geographic/closest_points_pt_seg.hpp
index 94b32a50d2..25030b4097 100644
--- a/include/boost/geometry/strategies/geographic/closest_points_pt_seg.hpp
+++ b/include/boost/geometry/strategies/geographic/closest_points_pt_seg.hpp
@@ -84,7 +84,7 @@ public :
                 <
                     typename calculation_type<Point, PointOfSegment>::type,
                     dimension<PointOfSegment>::value,
-                    typename coordinate_system<PointOfSegment>::type
+                    coordinate_system_t<PointOfSegment>
                 > cp;
 
             geometry::set_from_radian<0>(cp, result.lon);
diff --git a/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp b/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
index 5790ead7a5..353fcf2ae3 100644
--- a/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
+++ b/include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
@@ -93,7 +93,7 @@ class cross_track
             <
                 CT,
                 dimension<PointOfSegment>::value,
-                typename coordinate_system<PointOfSegment>::type
+                coordinate_system_t<PointOfSegment>
             > result;
 
         // http://williams.best.vwh.net/avform.htm#XTE
diff --git a/test/algorithms/envelope_expand/envelope_on_spheroid.cpp b/test/algorithms/envelope_expand/envelope_on_spheroid.cpp
index 9d2bd688d8..5d964e3c6b 100644
--- a/test/algorithms/envelope_expand/envelope_on_spheroid.cpp
+++ b/test/algorithms/envelope_expand/envelope_on_spheroid.cpp
@@ -201,7 +201,7 @@ class envelope_on_spheroid_basic_tester
         T3 const& lon_max, T4 const& lat_max, double height_max,
         double tolerance)
     {
-        typedef typename bg::coordinate_system<Box>::type::units box_units_type;
+        using box_units_type = bg::detail::coordinate_system_unit_t<Box>;
 
         std::string const units_str = units2string<box_units_type>();
 
diff --git a/test/algorithms/envelope_expand/expand_on_spheroid.cpp b/test/algorithms/envelope_expand/expand_on_spheroid.cpp
index e7e45a230b..bbfb46cb0c 100644
--- a/test/algorithms/envelope_expand/expand_on_spheroid.cpp
+++ b/test/algorithms/envelope_expand/expand_on_spheroid.cpp
@@ -138,11 +138,7 @@ class test_expand_on_spheroid
                                      double height_max2,
                                      double tolerance)
         {
-            typedef typename bg::coordinate_system
-                <
-                    Box
-                >::type::units box_units_type;
-
+            using box_units_type = bg::detail::coordinate_system_units_t<Box>;
             std::string const units_str = units2string<box_units_type>();
 
             Box detected;
diff --git a/test/algorithms/similarity/discrete_frechet_distance.cpp b/test/algorithms/similarity/discrete_frechet_distance.cpp
index 35e552585d..7e1ed0bc87 100644
--- a/test/algorithms/similarity/discrete_frechet_distance.cpp
+++ b/test/algorithms/similarity/discrete_frechet_distance.cpp
@@ -16,13 +16,13 @@
 
 #include "test_frechet_distance.hpp"
 
-    template <typename P>
+template <typename P>
 void test_all_cartesian()
 {
-    typedef bg::model::linestring<P> linestring_2d;
+    using linestring_2d = bg::model::linestring<P>;
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
-    typedef typename coordinate_system<P>::type CordType;
-    std::cout << typeid(CordType).name() << std::endl;
+    using coor_t = bg::coordinate_system_t<P>;
+    std::cout << typeid(coor_t).name() << std::endl;
 #endif
 
     test_geometry<linestring_2d,linestring_2d >("LINESTRING(3 0,2 1,3 2)","LINESTRING(0 0,3 4,4 3)", 3);
@@ -37,14 +37,14 @@ void test_all_cartesian()
 
 }
 
-    template <typename P>
+template <typename P>
 void test_all_geographic()
 {
-    typedef bg::model::linestring<P> linestring_2d;
+    using linestring_2d = bg::model::linestring<P>;
 
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
-    typedef typename coordinate_system<P>::type CordType;
-    std::cout << typeid(CordType).name() << std::endl;
+    using coor_t = bg::coordinate_system_t<P>;
+    std::cout << typeid(coor_t).name() << std::endl;
 #endif
 
     test_geometry<linestring_2d,linestring_2d >("LINESTRING(3 0,2 1,3 2)","LINESTRING(0 0,3 4,4 3)", 333958);
@@ -59,14 +59,14 @@ void test_all_geographic()
 
 }
 
-    template <typename P>
+template <typename P>
 void test_all_spherical_equ()
 {
-    typedef bg::model::linestring<P> linestring_2d;
+    using linestring_2d = bg::model::linestring<P>;
 
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
-    typedef typename coordinate_system<P>::type CordType;
-    std::cout << typeid(CordType).name() << std::endl;
+    using coor_t = bg::coordinate_system_t<P>;
+    std::cout << typeid(coor_t).name() << std::endl;
 #endif
 
     test_geometry<linestring_2d,linestring_2d >("LINESTRING(3 0,2 1,3 2)","LINESTRING(0 0,3 4,4 3)", 0.05235987);
diff --git a/test/algorithms/similarity/discrete_hausdorff_distance.cpp b/test/algorithms/similarity/discrete_hausdorff_distance.cpp
index d5d98cdcb8..9da820272e 100644
--- a/test/algorithms/similarity/discrete_hausdorff_distance.cpp
+++ b/test/algorithms/similarity/discrete_hausdorff_distance.cpp
@@ -23,16 +23,16 @@
 
 #include "test_hausdorff_distance.hpp"
 
-    template <typename P>
+template <typename P>
 void test_all_cartesian()
 {
-    typedef bg::model::linestring<P> linestring_2d;
-    typedef bg::model::multi_linestring<linestring_2d> mlinestring_t;
-    typedef bg::model::multi_point<P> mpoint_t;
+    using linestring_2d = bg::model::linestring<P>;
+    using mlinestring_t = bg::model::multi_linestring<linestring_2d>;
+    using mpoint_t = bg::model::multi_point<P>;
 
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
-    typedef typename coordinate_system<P>::type CordType;
-    std::cout << typeid(CordType).name() << std::endl;
+    using coor_t = bg::coordinate_system_t<P>;
+    std::cout << typeid(coor_t).name() << std::endl;
 #endif
 
     test_geometry<P,mpoint_t>("POINT(3 1)","MULTIPOINT(0 0,3 4,4 3)", sqrt(5.0));
@@ -48,15 +48,16 @@ void test_all_cartesian()
     test_geometry<linestring_2d,linestring_2d >("LINESTRING(0 0,3 4,4 3)","LINESTRING(4 3,3 4,0 0)",0);
 }
 
-    template <typename P>
+template <typename P>
 void test_all_geographic()
 {
-    typedef bg::model::linestring<P> linestring_2d;
-    typedef bg::model::multi_linestring<linestring_2d> mlinestring_t;
-    typedef bg::model::multi_point<P> mpoint_t;
+    using linestring_2d = bg::model::linestring<P>;
+    using mlinestring_t = bg::model::multi_linestring<linestring_2d>;
+    using mpoint_t = bg::model::multi_point<P>;
+
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
-    typedef typename coordinate_system<P>::type CordType;
-    std::cout << typeid(CordType).name() << std::endl;
+    using coor_t = bg::coordinate_system_t<P>;
+    std::cout << typeid(coor_t).name() << std::endl;
 #endif
 
     test_geometry<P,mpoint_t>("POINT(3 1)","MULTIPOINT(0 0,3 4,4 3)", 247552);
@@ -74,16 +75,16 @@ void test_all_geographic()
     test_geometry<linestring_2d,linestring_2d >("LINESTRING(0 0,3 4,4 3)","LINESTRING(4 3,3 4,0 0)",0);
 }
 
-    template <typename P>
+template <typename P>
 void test_all_spherical_equ()
 {
-    typedef bg::model::linestring<P> linestring_2d;
-    typedef bg::model::multi_linestring<linestring_2d> mlinestring_t;
-    typedef bg::model::multi_point<P> mpoint_t;
+    using linestring_2d = bg::model::linestring<P>;
+    using mlinestring_t = bg::model::multi_linestring<linestring_2d>;
+    using mpoint_t = bg::model::multi_point<P>;
 
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
-    typedef typename coordinate_system<P>::type CordType;
-    std::cout << typeid(CordType).name() << std::endl;
+    using coor_t = bg::coordinate_system_t<P>;
+    std::cout << typeid(coor_t).name() << std::endl;
 #endif
 
     test_geometry<P,mpoint_t>("POINT(3 1)","MULTIPOINT(0 0,3 4,4 3)", 0.03902);
diff --git a/test/concepts/point_concept_checker.cpp b/test/concepts/point_concept_checker.cpp
index ea51a2e962..0b6b439a24 100644
--- a/test/concepts/point_concept_checker.cpp
+++ b/test/concepts/point_concept_checker.cpp
@@ -30,9 +30,9 @@ struct rw_point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<ro_point> { typedef point_tag type; };
-template <> struct coordinate_type<ro_point> { typedef float type; };
-template <> struct coordinate_system<ro_point> { typedef cs::cartesian type; };
+template <> struct tag<ro_point> { using type = point_tag; };
+template <> struct coordinate_type<ro_point> { using type = float; };
+template <> struct coordinate_system<ro_point> { using type = cs::cartesian; };
 template <> struct dimension<ro_point> { enum { value = 2 }; };
 
 template <> struct access<ro_point, 0>
@@ -48,9 +48,9 @@ template <> struct access<ro_point, 1>
 
 
 
-template <> struct tag<rw_point> { typedef point_tag type; };
-template <> struct coordinate_type<rw_point> { typedef float type; };
-template <> struct coordinate_system<rw_point> { typedef cs::cartesian type; };
+template <> struct tag<rw_point> { using type = point_tag; };
+template <> struct coordinate_type<rw_point> { using type = float; };
+template <> struct coordinate_system<rw_point> { using type = cs::cartesian; };
 template <> struct dimension<rw_point> { enum { value = 2 }; };
 
 template <> struct access<rw_point, 0>
diff --git a/test/concepts/point_well_formed_traits.cpp b/test/concepts/point_well_formed_traits.cpp
index fc4ab82f2d..d0f8352bfe 100644
--- a/test/concepts/point_well_formed_traits.cpp
+++ b/test/concepts/point_well_formed_traits.cpp
@@ -27,19 +27,19 @@ namespace boost { namespace geometry { namespace traits {
 template <>
 struct tag<point>
 {
-    typedef point_tag type;
+    using type = point_tag;
 };
 
 template <>
 struct coordinate_type<point>
 {
-    typedef float type;
+    using type = float;
 };
 
 template <>
 struct coordinate_system<point>
 {
-    typedef bg::cs::cartesian type;
+    using type = bg::cs::cartesian;
 };
 
 template <>
diff --git a/test/concepts/point_with_incorrect_dimension.cpp b/test/concepts/point_with_incorrect_dimension.cpp
index 79ffc8bee4..5929863885 100644
--- a/test/concepts/point_with_incorrect_dimension.cpp
+++ b/test/concepts/point_with_incorrect_dimension.cpp
@@ -28,9 +28,9 @@ struct point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<point> { typedef point_tag type; };
-template <> struct coordinate_type<point> { typedef float type; };
-template <> struct coordinate_system<point> { typedef bg::cs::cartesian type; };
+template <> struct tag<point> { using type = point_tag; };
+template <> struct coordinate_type<point> { using type = float; };
+template <> struct coordinate_system<point> { using type = bg::cs::cartesian; };
 template <> struct dimension<point> { enum { value = 3 }; };
 
 template <> struct access<point, 0>
diff --git a/test/concepts/point_without_coordinate_type.cpp b/test/concepts/point_without_coordinate_type.cpp
index 3896e46903..af852ec653 100644
--- a/test/concepts/point_without_coordinate_type.cpp
+++ b/test/concepts/point_without_coordinate_type.cpp
@@ -25,9 +25,9 @@ struct point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<point> { typedef point_tag type; };
-//template <> struct coordinate_type<point> { typedef float type; };
-template <> struct coordinate_system<point> { typedef bg::cs::cartesian type; };
+template <> struct tag<point> { using type = point_tag; };
+//template <> struct coordinate_type<point> { using type = float; };
+template <> struct coordinate_system<point> { using type = bg::cs::cartesian; };
 template <> struct dimension<point> { enum { value = 2 }; };
 
 template <> struct access<point, 0>
diff --git a/test/concepts/point_without_dimension.cpp b/test/concepts/point_without_dimension.cpp
index 11182ed2b8..eb910b1b41 100644
--- a/test/concepts/point_without_dimension.cpp
+++ b/test/concepts/point_without_dimension.cpp
@@ -26,9 +26,9 @@ struct point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<point> { typedef point_tag type; };
-template <> struct coordinate_type<point> { typedef float type; };
-template <> struct coordinate_system<point> { typedef bg::cs::cartesian type; };
+template <> struct tag<point> { using type = point_tag; };
+template <> struct coordinate_type<point> { using type = float; };
+template <> struct coordinate_system<point> { using type = bg::cs::cartesian; };
 //template <> struct dimension<point> { enum { value = 2 }; };
 
 template <> struct access<point, 0>
diff --git a/test/concepts/point_without_getter.cpp b/test/concepts/point_without_getter.cpp
index 5d19924e2a..ee74aedce8 100644
--- a/test/concepts/point_without_getter.cpp
+++ b/test/concepts/point_without_getter.cpp
@@ -25,9 +25,9 @@ struct point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<point> { typedef point_tag type; };
-template <> struct coordinate_type<point> { typedef float type; };
-template <> struct coordinate_system<point> { typedef bg::cs::cartesian type; };
+template <> struct tag<point> { using type = point_tag; };
+template <> struct coordinate_type<point> { using type = float; };
+template <> struct coordinate_system<point> { using type = bg::cs::cartesian; };
 template <> struct dimension<point> { enum { value = 2 }; };
 
 template <> struct access<point, 0>
diff --git a/test/concepts/point_without_setter.cpp b/test/concepts/point_without_setter.cpp
index 78be839945..3978db266c 100644
--- a/test/concepts/point_without_setter.cpp
+++ b/test/concepts/point_without_setter.cpp
@@ -25,9 +25,9 @@ struct point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<point> { typedef point_tag type; };
-template <> struct coordinate_type<point> { typedef float type; };
-template <> struct coordinate_system<point> { typedef bg::cs::cartesian type; };
+template <> struct tag<point> { using type = point_tag; };
+template <> struct coordinate_type<point> { using type = float; };
+template <> struct coordinate_system<point> { using type = bg::cs::cartesian; };
 template <> struct dimension<point> { enum { value = 2 }; };
 
 template <> struct access<point, 0>
diff --git a/test/geometries/concepts/check.cpp b/test/geometries/concepts/check.cpp
index 07b3442950..d5414ccbd1 100644
--- a/test/geometries/concepts/check.cpp
+++ b/test/geometries/concepts/check.cpp
@@ -30,9 +30,9 @@ struct rw_point
 
 namespace boost { namespace geometry { namespace traits {
 
-template <> struct tag<ro_point> { typedef point_tag type; };
-template <> struct coordinate_type<ro_point> { typedef float type; };
-template <> struct coordinate_system<ro_point> { typedef bg::cs::cartesian type; };
+template <> struct tag<ro_point> { using type = point_tag; };
+template <> struct coordinate_type<ro_point> { using type = float; };
+template <> struct coordinate_system<ro_point> { using type = bg::cs::cartesian; };
 template <> struct dimension<ro_point> { enum { value = 2 }; };
 
 template <> struct access<ro_point, 0>
@@ -48,9 +48,9 @@ template <> struct access<ro_point, 1>
 
 
 
-template <> struct tag<rw_point> { typedef point_tag type; };
-template <> struct coordinate_type<rw_point> { typedef float type; };
-template <> struct coordinate_system<rw_point> { typedef bg::cs::cartesian type; };
+template <> struct tag<rw_point> { using type = point_tag; };
+template <> struct coordinate_type<rw_point> { using type = float; };
+template <> struct coordinate_system<rw_point> { using type = bg::cs::cartesian; };
 template <> struct dimension<rw_point> { enum { value = 2 }; };
 
 template <> struct access<rw_point, 0>
diff --git a/test/test_common/test_point.hpp b/test/test_common/test_point.hpp
index b5c2766e2c..49fc41fb0a 100644
--- a/test/test_common/test_point.hpp
+++ b/test/test_common/test_point.hpp
@@ -59,10 +59,10 @@ template<>
 struct tag<test::test_point> { using type = point_tag; };
 
 template<>
-struct coordinate_type<test::test_point> { typedef float type; };
+struct coordinate_type<test::test_point> { using type = float; };
 
 template<>
-struct coordinate_system<test::test_point> { typedef cs::cartesian type; };
+struct coordinate_system<test::test_point> { using type = cs::cartesian; };
 
 template<>
 struct dimension<test::test_point> : std::integral_constant<int, 3> {};
diff --git a/test/test_common/with_pointer.hpp b/test/test_common/with_pointer.hpp
index 58469cc528..34641197a7 100644
--- a/test/test_common/with_pointer.hpp
+++ b/test/test_common/with_pointer.hpp
@@ -48,10 +48,10 @@ template<> struct tag<test::test_point_xy>
 { using type = point_tag; };
 
 template<> struct coordinate_type<test::test_point_xy>
-{ typedef double type; };
+{ using type = double; };
 
 template<> struct coordinate_system<test::test_point_xy>
-{ typedef cs::cartesian type; };
+{ using type = cs::cartesian; };
 
 template<> struct dimension<test::test_point_xy> : std::integral_constant<int, 2> {};