Use in API and utilities WKT2_2019 instead of WKT2_2018 (fixes #1518)

- C API: PJ_GUESSED_WKT2_2019 is added, PJ_GUESSED_WKT2_2018 aliased to it
- C API: PJ_WKT2_2019[_SIMPLIFIED] is added, PJ_WKT2_2018[_SIMPLIFIED] alias to it
- C++ API: similarly for WKTFormatter::Convention::WKT2_2019[_SIMPLIFIED]
Those above changes should be fully backward API and ABI compatible.

projinfo changes:
- accept WKT2_2019 as value for -o switch. WKT2_2018 is still accepted (undocumented)
- output now uses 'WKT2_2019 string:', so might break scripts that would rely on that.

Other internal code references to WKT2_2018 changes to WKT2_2019, included
in tests.

11 files changed, 127 insertions, 127 deletions

diff --git a/test/cli/testprojinfo b/test/cli/testprojinfo
index d8569a76..f070c999 100755
--- a/test/cli/testprojinfo
+++ b/test/cli/testprojinfo
@@ -42,8 +42,8 @@ echo "Testing projinfo -o WKT2_2015 EPSG:4326" >> ${OUT}
 $EXE -o WKT2_2015 EPSG:4326 >>${OUT}
 echo "" >>${OUT}
 
-echo "Testing projinfo -o WKT2_2018 EPSG:4326" >> ${OUT}
-$EXE -o WKT2_2018 EPSG:4326 >>${OUT}
+echo "Testing projinfo -o WKT2_2019 EPSG:4326" >> ${OUT}
+$EXE -o WKT2_2019 EPSG:4326 >>${OUT}
 echo "" >>${OUT}
 
 echo "Testing projinfo -o ALL EPSG:4326" >> ${OUT}
diff --git a/test/cli/testprojinfo_out.dist b/test/cli/testprojinfo_out.dist
index 97c1138c..8cb37cf7 100644
--- a/test/cli/testprojinfo_out.dist
+++ b/test/cli/testprojinfo_out.dist
@@ -2,7 +2,7 @@ Testing projinfo EPSG:4326
 PROJ.4 string:
 +proj=longlat +datum=WGS84 +no_defs +type=crs
 
-WKT2_2018 string:
+WKT2:2019 string:
 GEOGCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
@@ -23,7 +23,7 @@ GEOGCRS["WGS 84",
     ID["EPSG",4326]]
 
 Testing projinfo -o WKT1_GDAL EPSG:4326
-WKT1_GDAL:
+WKT1:GDAL string:
 GEOGCS["WGS 84",
     DATUM["WGS_1984",
         SPHEROID["WGS 84",6378137,298.257223563,
@@ -37,7 +37,7 @@ GEOGCS["WGS 84",
 
 
 Testing projinfo -o WKT2_2015 EPSG:4326
-WKT2_2015 string:
+WKT2:2015 string:
 GEODCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
@@ -55,8 +55,8 @@ GEODCRS["WGS 84",
     BBOX[-90,-180,90,180],
     ID["EPSG",4326]]
 
-Testing projinfo -o WKT2_2018 EPSG:4326
-WKT2_2018 string:
+Testing projinfo -o WKT2_2019 EPSG:4326
+WKT2:2019 string:
 GEOGCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
@@ -80,7 +80,7 @@ Testing projinfo -o ALL EPSG:4326
 PROJ.4 string:
 +proj=longlat +datum=WGS84 +no_defs +type=crs
 
-WKT2_2015 string:
+WKT2:2015 string:
 GEODCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
@@ -98,7 +98,7 @@ GEODCRS["WGS 84",
     BBOX[-90,-180,90,180],
     ID["EPSG",4326]]
 
-WKT2_2018 string:
+WKT2:2019 string:
 GEOGCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
@@ -118,7 +118,7 @@ GEOGCRS["WGS 84",
         BBOX[-90,-180,90,180]],
     ID["EPSG",4326]]
 
-WKT1_GDAL:
+WKT1:GDAL string:
 GEOGCS["WGS 84",
     DATUM["WGS_1984",
         SPHEROID["WGS 84",6378137,298.257223563,
@@ -131,7 +131,7 @@ GEOGCS["WGS 84",
     AUTHORITY["EPSG","4326"]]
 
 
-WKT1_ESRI:
+WKT1:ESRI string:
 GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
 
 
@@ -189,7 +189,7 @@ EPSG:16031, UTM zone 31N, 0 m, World - N hemisphere - 0°E to 6°E
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=utm +zone=31 +ellps=WGS84
 
-WKT2_2018 string:
+WKT2:2019 string:
 CONVERSION["UTM zone 31N",
     METHOD["Transverse Mercator",
         ID["EPSG",9807]],
@@ -221,7 +221,7 @@ unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, Wo
 PROJ string:
 +proj=noop
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
     SOURCECRS[
         GEOGCRS["NAD27",
@@ -286,7 +286,7 @@ DERIVED_FROM(EPSG):1312, NAD27 to NAD83 (3), 1.0 m, Canada
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv1_can.dat +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["NAD27 to NAD83 (3)",
     SOURCECRS[
         GEOGCRS["NAD27",
@@ -336,7 +336,7 @@ DERIVED_FROM(EPSG):1313, NAD27 to NAD83 (4), 1.5 m, Canada - NAD27
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=ntv2_0.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["NAD27 to NAD83 (4)",
     SOURCECRS[
         GEOGCRS["NAD27",
@@ -386,7 +386,7 @@ DERIVED_FROM(EPSG):1241, NAD27 to NAD83 (1), 0.15 m, USA - CONUS including EEZ
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=conus +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["NAD27 to NAD83 (1)",
     SOURCECRS[
         GEOGCRS["NAD27",
@@ -435,7 +435,7 @@ DERIVED_FROM(EPSG):1243, NAD27 to NAD83 (2), 0.5 m, USA - Alaska including EEZ
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=alaska +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["NAD27 to NAD83 (2)",
     SOURCECRS[
         GEOGCRS["NAD27",
@@ -484,7 +484,7 @@ EPSG:1462, NAD27 to NAD83 (5), 1.0 m, Canada - Quebec
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=GS2783v1.QUE +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["NAD27 to NAD83 (5)",
     VERSION["SGQ-Can QC NT1"],
     SOURCECRS[
@@ -536,7 +536,7 @@ EPSG:1573, NAD27 to NAD83 (6), 1.5 m, Canada - Quebec
 PROJ string:
 +proj=pipeline +step +proj=axisswap +order=2,1 +step +proj=unitconvert +xy_in=deg +xy_out=rad +step +proj=hgridshift +grids=QUE27-83.gsb +step +proj=unitconvert +xy_in=rad +xy_out=deg +step +proj=axisswap +order=2,1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["NAD27 to NAD83 (6)",
     VERSION["SGQ-Can QC NT2"],
     SOURCECRS[
@@ -588,7 +588,7 @@ unknown id, Ballpark geographic offset from NAD27 to NAD83, unknown accuracy, Wo
 PROJ string:
 +proj=noop
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["Ballpark geographic offset from NAD27 to NAD83",
     SOURCECRS[
         GEOGCRS["NAD27",
@@ -670,7 +670,7 @@ Alternative non-deprecated CRS:
 PROJ.4 string:
 +proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=1500000 +y_0=0 +ellps=intl +pm=rome +units=m +no_defs +type=crs
 
-WKT2_2018 string:
+WKT2:2019 string:
 PROJCRS["Monte Mario (Rome) / Italy zone 1",
     BASEGEOGCRS["Monte Mario (Rome)",
         DATUM["Monte Mario (Rome)",
@@ -718,7 +718,7 @@ HEROID["WGS 84",6378137,298.257223563]],UNIT["degree",0.0174532925199433]]
 PROJ.4 string:
 +proj=longlat +datum=WGS84 +no_defs +type=crs
 
-WKT2_2018 string:
+WKT2:2019 string:
 GEOGCRS["WGS 84",
     DATUM["World Geodetic System 1984",
         ELLIPSOID["WGS 84",6378137,298.257223563,
@@ -749,7 +749,7 @@ PROJ:EPSG_5613_TO_EPSG_4977, RH2000 height to SWEREF99, unknown accuracy, Sweden
 PROJ string:
 +proj=vgridshift +grids=SWEN17_RH2000.gtx +multiplier=1
 
-WKT2_2018 string:
+WKT2:2019 string:
 COORDINATEOPERATION["RH2000 height to SWEREF99",
     SOURCECRS[
         VERTCRS["RH2000 height",
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp
index 2a1c8577..ace66a0c 100644
--- a/test/unit/test_c_api.cpp
+++ b/test/unit/test_c_api.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
@@ -333,13 +333,13 @@ TEST_F(CApi, proj_as_wkt) {
     ASSERT_NE(obj, nullptr);
 
     {
-        auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2018, nullptr);
+        auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2019, nullptr);
         ASSERT_NE(wkt, nullptr);
         EXPECT_TRUE(std::string(wkt).find("GEOGCRS[") == 0) << wkt;
     }
 
     {
-        auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2018_SIMPLIFIED, nullptr);
+        auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2019_SIMPLIFIED, nullptr);
         ASSERT_NE(wkt, nullptr);
         EXPECT_TRUE(std::string(wkt).find("GEOGCRS[") == 0) << wkt;
         EXPECT_TRUE(std::string(wkt).find("ANGULARUNIT[") == std::string::npos)
@@ -435,7 +435,7 @@ TEST_F(CApi, proj_as_wkt) {
     // unsupported option
     {
         const char *const options[] = {"unsupported=yes", nullptr};
-        auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2018, options);
+        auto wkt = proj_as_wkt(m_ctxt, obj, PJ_WKT2_2019, options);
         EXPECT_EQ(wkt, nullptr);
     }
 }
@@ -1631,7 +1631,7 @@ TEST_F(CApi, proj_context_guess_wkt_dialect) {
                   "        AXIS[\"geodetic latitude (Lat)\",north],\n"
                   "        AXIS[\"geodetic longitude (Lon)\",east],\n"
                   "        UNIT[\"degree\",0.0174532925199433]]"),
-              PJ_GUESSED_WKT2_2018);
+              PJ_GUESSED_WKT2_2019);
 
     EXPECT_EQ(proj_context_guess_wkt_dialect(
                   nullptr,
@@ -2690,7 +2690,7 @@ TEST_F(CApi, proj_crs_alter_parameters_linear_unit) {
         ObjectKeeper keeper_alteredCRS(alteredCRS);
         ASSERT_NE(alteredCRS, nullptr);
 
-        auto wkt = proj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2018, nullptr);
+        auto wkt = proj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2019, nullptr);
         ASSERT_NE(wkt, nullptr);
         EXPECT_TRUE(std::string(wkt).find("500000") != std::string::npos)
             << wkt;
@@ -2704,7 +2704,7 @@ TEST_F(CApi, proj_crs_alter_parameters_linear_unit) {
         ObjectKeeper keeper_alteredCRS(alteredCRS);
         ASSERT_NE(alteredCRS, nullptr);
 
-        auto wkt = proj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2018, nullptr);
+        auto wkt = proj_as_wkt(m_ctxt, alteredCRS, PJ_WKT2_2019, nullptr);
         ASSERT_NE(wkt, nullptr);
         EXPECT_TRUE(std::string(wkt).find("250000") != std::string::npos)
             << wkt;
diff --git a/test/unit/test_common.cpp b/test/unit/test_common.cpp
index a6085e7b..2e44c121 100644
--- a/test/unit/test_common.cpp
+++ b/test/unit/test_common.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
diff --git a/test/unit/test_crs.cpp b/test/unit/test_crs.cpp
index 0f0304b1..5ee62ce4 100644
--- a/test/unit/test_crs.cpp
+++ b/test/unit/test_crs.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
@@ -157,7 +157,7 @@ TEST(crs, GeographicCRS_datum_ensemble) {
             nullptr, ensemble_vdatum,
             EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE));
         WKTFormatterNNPtr f(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019));
         crs->exportToWKT(f.get());
         auto expected =
             "GEOGCRS[\"unnamed\",\n"
@@ -187,7 +187,7 @@ TEST(crs, GeographicCRS_datum_ensemble) {
             ensemble_vdatum,
             EllipsoidalCS::createLatitudeLongitude(UnitOfMeasure::DEGREE));
         WKTFormatterNNPtr f(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019));
         crs->exportToWKT(f.get());
         auto expected = "GEOGCRS[\"unnamed\",\n"
                         "    ENSEMBLE[\"unnamed\",\n"
@@ -263,10 +263,10 @@ TEST(crs, EPSG_4326_as_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, EPSG_4326_as_WKT2_2018) {
+TEST(crs, EPSG_4326_as_WKT2_2019) {
     auto crs = GeographicCRS::EPSG_4326;
     WKTFormatterNNPtr f(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019));
     crs->exportToWKT(f.get());
     EXPECT_EQ(f->toString(),
               "GEOGCRS[\"WGS 84\",\n"
@@ -322,10 +322,10 @@ TEST(crs, EPSG_4326_as_WKT2_SIMPLIFIED_single_line) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, EPSG_4326_as_WKT2_2018_SIMPLIFIED) {
+TEST(crs, EPSG_4326_as_WKT2_2019_SIMPLIFIED) {
     auto crs = GeographicCRS::EPSG_4326;
     WKTFormatterNNPtr f(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018_SIMPLIFIED));
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019_SIMPLIFIED));
     crs->exportToWKT(f.get());
     EXPECT_EQ(f->toString(),
               "GEOGCRS[\"WGS 84\",\n"
@@ -454,10 +454,10 @@ TEST(crs, EPSG_4979_as_WKT2_SIMPLIFIED) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, EPSG_4979_as_WKT2_2018_SIMPLIFIED) {
+TEST(crs, EPSG_4979_as_WKT2_2019_SIMPLIFIED) {
     auto crs = GeographicCRS::EPSG_4979;
     WKTFormatterNNPtr f(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018_SIMPLIFIED));
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019_SIMPLIFIED));
     crs->exportToWKT(f.get());
     EXPECT_EQ(f->toString(),
               "GEOGCRS[\"WGS 84\",\n"
@@ -1069,7 +1069,7 @@ TEST(crs, geocentricCRS_as_WKT2) {
     EXPECT_EQ(crs->exportToWKT(WKTFormatter::create().get()), expected);
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 
     EXPECT_TRUE(crs->isEquivalentTo(crs.get()));
@@ -1614,7 +1614,7 @@ TEST(crs, projectedCRS_as_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, projectedCRS_as_WKT2_2018) {
+TEST(crs, projectedCRS_as_WKT2_2019) {
     auto crs = createProjected();
 
     auto expected =
@@ -1655,7 +1655,7 @@ TEST(crs, projectedCRS_as_WKT2_2018) {
 
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 // ---------------------------------------------------------------------------
@@ -1690,7 +1690,7 @@ TEST(crs, projectedCRS_as_WKT2_simplified) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, projectedCRS_as_WKT2_2018_simplified) {
+TEST(crs, projectedCRS_as_WKT2_2019_simplified) {
     auto crs = createProjected();
 
     auto expected =
@@ -1714,7 +1714,7 @@ TEST(crs, projectedCRS_as_WKT2_2018_simplified) {
 
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018_SIMPLIFIED)
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019_SIMPLIFIED)
                 .get()),
         expected);
 }
@@ -2845,7 +2845,7 @@ TEST(crs, usage) {
     ASSERT_TRUE(crs != nullptr);
 
     auto got_wkt = crs->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     auto expected = "GEODCRS[\"JGD2000\",\n"
                     "    DATUM[\"Japanese Geodetic Datum 2000\",\n"
                     "        ELLIPSOID[\"GRS 1980\",6378137,298.257222101,\n"
@@ -3061,7 +3061,7 @@ TEST(crs, verticalCRS_datum_ensemble) {
         PropertyMap().set(IdentifiedObject::NAME_KEY, "unnamed"), nullptr,
         ensemble, VerticalCS::createGravityRelatedHeight(UnitOfMeasure::METRE));
     WKTFormatterNNPtr f(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018));
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019));
     f->simulCurNodeHasId();
     crs->exportToWKT(f.get());
     auto expected = "VERTCRS[\"unnamed\",\n"
@@ -4017,7 +4017,7 @@ TEST(crs, derivedGeographicCRS_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, derivedGeographicCRS_WKT2_2018) {
+TEST(crs, derivedGeographicCRS_WKT2_2019) {
 
     auto expected = "GEOGCRS[\"WMO Atlantic Pole\",\n"
                     "    BASEGEOGCRS[\"WGS 84\",\n"
@@ -4049,7 +4049,7 @@ TEST(crs, derivedGeographicCRS_WKT2_2018) {
 
     EXPECT_EQ(
         createDerivedGeographicCRS()->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4207,7 +4207,7 @@ TEST(crs, derivedGeodeticCRS_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, derivedGeodeticCRS_WKT2_2018) {
+TEST(crs, derivedGeodeticCRS_WKT2_2019) {
 
     auto expected = "GEODCRS[\"Derived geodetic CRS\",\n"
                     "    BASEGEOGCRS[\"WGS 84\",\n"
@@ -4234,7 +4234,7 @@ TEST(crs, derivedGeodeticCRS_WKT2_2018) {
 
     EXPECT_EQ(
         createDerivedGeodeticCRS()->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4266,7 +4266,7 @@ static DerivedProjectedCRSNNPtr createDerivedProjectedCRS() {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, derivedProjectedCRS_WKT2_2018) {
+TEST(crs, derivedProjectedCRS_WKT2_2019) {
 
     auto expected =
         "DERIVEDPROJCRS[\"derived projectedCRS\",\n"
@@ -4310,7 +4310,7 @@ TEST(crs, derivedProjectedCRS_WKT2_2018) {
     auto crs = createDerivedProjectedCRS();
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 
     EXPECT_TRUE(crs->isEquivalentTo(crs.get()));
@@ -4381,7 +4381,7 @@ TEST(crs, dateTimeTemporalCRS_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, dateTimeTemporalCRS_WKT2_2018) {
+TEST(crs, dateTimeTemporalCRS_WKT2_2019) {
 
     auto expected = "TIMECRS[\"Temporal CRS\",\n"
                     "    TDATUM[\"Gregorian calendar\",\n"
@@ -4392,7 +4392,7 @@ TEST(crs, dateTimeTemporalCRS_WKT2_2018) {
 
     EXPECT_EQ(
         createDateTimeTemporalCRS()->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4418,7 +4418,7 @@ static TemporalCRSNNPtr createTemporalCountCRSWithConvFactor() {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, temporalCountCRSWithConvFactor_WKT2_2018) {
+TEST(crs, temporalCountCRSWithConvFactor_WKT2_2019) {
 
     auto expected = "TIMECRS[\"GPS milliseconds\",\n"
                     "    TDATUM[\"GPS time origin\",\n"
@@ -4430,7 +4430,7 @@ TEST(crs, temporalCountCRSWithConvFactor_WKT2_2018) {
 
     EXPECT_EQ(
         createTemporalCountCRSWithConvFactor()->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4458,7 +4458,7 @@ static TemporalCRSNNPtr createTemporalCountCRSWithoutConvFactor() {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, temporalCountCRSWithoutConvFactor_WKT2_2018) {
+TEST(crs, temporalCountCRSWithoutConvFactor_WKT2_2019) {
 
     auto expected = "TIMECRS[\"Calendar hours from 1979-12-29\",\n"
                     "    TDATUM[\"29 December 1979\",\n"
@@ -4470,7 +4470,7 @@ TEST(crs, temporalCountCRSWithoutConvFactor_WKT2_2018) {
 
     EXPECT_EQ(
         createTemporalCountCRSWithoutConvFactor()->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4496,7 +4496,7 @@ static TemporalCRSNNPtr createTemporalMeasureCRSWithoutConvFactor() {
 
 // ---------------------------------------------------------------------------
 
-TEST(crs, temporalMeasureCRSWithoutConvFactor_WKT2_2018) {
+TEST(crs, temporalMeasureCRSWithoutConvFactor_WKT2_2019) {
 
     auto expected = "TIMECRS[\"Decimal Years CE\",\n"
                     "    TDATUM[\"Common Era\",\n"
@@ -4508,7 +4508,7 @@ TEST(crs, temporalMeasureCRSWithoutConvFactor_WKT2_2018) {
 
     EXPECT_EQ(
         createTemporalMeasureCRSWithoutConvFactor()->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4718,7 +4718,7 @@ TEST(crs, DerivedEngineeringCRS_WKT2) {
 
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
     EXPECT_THROW(
         createDerivedEngineeringCRS()->exportToWKT(
@@ -4775,7 +4775,7 @@ TEST(crs, DerivedParametricCRS_WKT2) {
 
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -4830,7 +4830,7 @@ TEST(crs, DeriveTemporalCRS_WKT2) {
 
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
diff --git a/test/unit/test_datum.cpp b/test/unit/test_datum.cpp
index fbd1f79d..8a5d67cf 100644
--- a/test/unit/test_datum.cpp
+++ b/test/unit/test_datum.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
@@ -273,7 +273,7 @@ TEST(datum, dynamic_geodetic_reference_frame) {
 
     EXPECT_EQ(drf->exportToWKT(WKTFormatter::create().get()), expected);
 
-    auto expected_wtk2_2018 =
+    auto expected_wtk2_2019 =
         "DYNAMIC[\n"
         "    FRAMEEPOCH[2018.5],\n"
         "    MODEL[\"My model\"]],\n"
@@ -284,8 +284,8 @@ TEST(datum, dynamic_geodetic_reference_frame) {
         "    ANCHOR[\"My anchor\"]]";
     EXPECT_EQ(
         drf->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
-        expected_wtk2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
+        expected_wtk2_2019);
 }
 
 // ---------------------------------------------------------------------------
@@ -355,7 +355,7 @@ TEST(datum, temporal_datum_time_origin_non_ISO8601) {
 
 // ---------------------------------------------------------------------------
 
-TEST(datum, temporal_datum_WKT2_2018) {
+TEST(datum, temporal_datum_WKT2_2019) {
     auto datum = TemporalDatum::create(
         PropertyMap().set(IdentifiedObject::NAME_KEY, "Gregorian calendar"),
         DateTime::create("0000-01-01"),
@@ -367,7 +367,7 @@ TEST(datum, temporal_datum_WKT2_2018) {
 
     EXPECT_EQ(
         datum->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -385,15 +385,15 @@ TEST(datum, dynamic_vertical_reference_frame) {
 
     EXPECT_EQ(drf->exportToWKT(WKTFormatter::create().get()), expected);
 
-    auto expected_wtk2_2018 = "DYNAMIC[\n"
+    auto expected_wtk2_2019 = "DYNAMIC[\n"
                               "    FRAMEEPOCH[2018.5],\n"
                               "    MODEL[\"My model\"]],\n"
                               "VDATUM[\"test\",\n"
                               "    ANCHOR[\"My anchor\"]]";
     EXPECT_EQ(
         drf->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
-        expected_wtk2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
+        expected_wtk2_2019);
 }
 
 // ---------------------------------------------------------------------------
@@ -412,7 +412,7 @@ TEST(datum, datum_ensemble) {
                  FormattingException);
     EXPECT_EQ(
         ensemble->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         "ENSEMBLE[\"test\",\n"
         "    MEMBER[\"World Geodetic System 1984\",\n"
         "        ID[\"EPSG\",6326]],\n"
@@ -436,7 +436,7 @@ TEST(datum, datum_ensemble_vertical) {
         PositionalAccuracy::create("100"));
     EXPECT_EQ(
         ensemble->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         "ENSEMBLE[\"unnamed\",\n"
         "    MEMBER[\"vdatum1\"],\n"
         "    MEMBER[\"vdatum2\"],\n"
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
index e68b42fc..881b7605 100644
--- a/test/unit/test_factory.cpp
+++ b/test/unit/test_factory.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
@@ -705,7 +705,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_8_CF) {
                     "        ID[\"EPSG\",1049]],\n";
 
     auto wkt = op->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     EXPECT_TRUE(wkt.find(expected) != std::string::npos) << wkt;
 }
 
@@ -818,7 +818,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_helmert_15_CF) {
 
     EXPECT_EQ(
         op->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -924,7 +924,7 @@ TEST(
         "in grid file.\"]]";
     EXPECT_EQ(
         op->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
@@ -940,7 +940,7 @@ TEST(
         "    PARAMETERFILE[\"Longitude difference file\",\"alaska.los\"],\n";
 
     auto wkt = op->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     EXPECT_TRUE(wkt.find(expected) != std::string::npos) << wkt;
 }
 
@@ -998,7 +998,7 @@ TEST(factory, AuthorityFactory_createCoordinateOperation_other_transformation) {
 
     EXPECT_EQ(
         op->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         expected);
 }
 
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index 0239d74a..85f3e06a 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
@@ -651,7 +651,7 @@ TEST(wkt_parse, wkt2_long_GEODETICCRS_EPSG_4326) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_GEOGCRS_EPSG_4326) {
+TEST(wkt_parse, wkt2_2019_GEOGCRS_EPSG_4326) {
     auto obj = WKTParser().createFromWKT("GEOGCRS" + contentWKT2_EPSG_4326);
     auto crs = nn_dynamic_pointer_cast<GeographicCRS>(obj);
     ASSERT_TRUE(crs != nullptr);
@@ -660,7 +660,7 @@ TEST(wkt_parse, wkt2_2018_GEOGCRS_EPSG_4326) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_long_GEOGRAPHICCRS_EPSG_4326) {
+TEST(wkt_parse, wkt2_2019_long_GEOGRAPHICCRS_EPSG_4326) {
     auto obj =
         WKTParser().createFromWKT("GEOGRAPHICCRS" + contentWKT2_EPSG_4326);
     auto crs = nn_dynamic_pointer_cast<GeographicCRS>(obj);
@@ -1640,7 +1640,7 @@ TEST(wkt_parse, wkt2_projected) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_projected_with_id_in_basegeodcrs) {
+TEST(wkt_parse, wkt2_2019_projected_with_id_in_basegeodcrs) {
     auto wkt = "PROJCRS[\"WGS 84 / UTM zone 31N\",\n"
                "    BASEGEOGCRS[\"WGS 84\",\n"
                "        DATUM[\"World Geodetic System 1984\",\n"
@@ -1666,14 +1666,14 @@ TEST(wkt_parse, wkt2_2018_projected_with_id_in_basegeodcrs) {
 
     {
         auto got_wkt = crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
         EXPECT_TRUE(got_wkt.find("ID[\"EPSG\",4326]]") != std::string::npos)
             << got_wkt;
     }
 
     {
         auto got_wkt = crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018_SIMPLIFIED)
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019_SIMPLIFIED)
                 .get());
         EXPECT_TRUE(got_wkt.find("ID[\"EPSG\",4326]]") == std::string::npos)
             << got_wkt;
@@ -1682,7 +1682,7 @@ TEST(wkt_parse, wkt2_2018_projected_with_id_in_basegeodcrs) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_projected_no_id_but_id_in_basegeodcrs) {
+TEST(wkt_parse, wkt2_2019_projected_no_id_but_id_in_basegeodcrs) {
     auto wkt = "PROJCRS[\"WGS 84 / UTM zone 31N\",\n"
                "    BASEGEOGCRS[\"WGS 84\",\n"
                "        DATUM[\"World Geodetic System 1984\",\n"
@@ -1704,14 +1704,14 @@ TEST(wkt_parse, wkt2_2018_projected_no_id_but_id_in_basegeodcrs) {
     ASSERT_TRUE(crs != nullptr);
 
     auto got_wkt = crs->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     EXPECT_TRUE(got_wkt.find("ID[\"EPSG\",4326]]") != std::string::npos)
         << got_wkt;
 }
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_simplified_projected) {
+TEST(wkt_parse, wkt2_2019_simplified_projected) {
     auto wkt = "PROJCRS[\"WGS 84 / UTM zone 31N\",\n"
                "    BASEGEOGCRS[\"WGS 84\",\n"
                "        DATUM[\"World Geodetic System 1984\",\n"
@@ -1737,7 +1737,7 @@ TEST(wkt_parse, wkt2_2018_simplified_projected) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_projected_3D) {
+TEST(wkt_parse, wkt2_2019_projected_3D) {
     auto wkt =
         "PROJCRS[\"WGS 84 (G1762) / UTM zone 31N 3D\","
         "    BASEGEOGCRS[\"WGS 84\","
@@ -1777,13 +1777,13 @@ TEST(wkt_parse, wkt2_2018_projected_3D) {
         FormattingException);
 
     EXPECT_NO_THROW(crs->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()));
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()));
 }
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, wkt2_2018_projected_utm_3D) {
-    // Example from WKT2:2018
+TEST(wkt_parse, wkt2_2019_projected_utm_3D) {
+    // Example from WKT2:2019
     auto wkt =
         "PROJCRS[\"WGS 84 (G1762) / UTM zone 31N 3D\","
         "    BASEGEOGCRS[\"WGS 84\","
@@ -1822,7 +1822,7 @@ TEST(wkt_parse, wkt2_2018_projected_utm_3D) {
         FormattingException);
 
     EXPECT_NO_THROW(crs->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()));
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()));
 }
 
 // ---------------------------------------------------------------------------
@@ -2165,7 +2165,7 @@ TEST(wkt_parse, COMPOUNDCRS_spatio_parametric_2015) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, COMPOUNDCRS_spatio_parametric_2018) {
+TEST(wkt_parse, COMPOUNDCRS_spatio_parametric_2019) {
     auto obj = WKTParser().createFromWKT(
         "COMPOUNDCRS[\"ICAO layer 0\",\n"
         "    GEOGRAPHICCRS[\"WGS 84\",\n"
@@ -2220,7 +2220,7 @@ TEST(wkt_parse, COMPOUNDCRS_spatio_temporal_2015) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, COMPOUNDCRS_spatio_temporal_2018) {
+TEST(wkt_parse, COMPOUNDCRS_spatio_temporal_2019) {
     auto obj = WKTParser().createFromWKT(
         "COMPOUNDCRS[\"2D GPS position with civil time in ISO 8601 format\",\n"
         "    GEOGCRS[\"WGS 84 (G1762)\",\n"
@@ -2361,12 +2361,12 @@ TEST(wkt_parse, COORDINATEOPERATION) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, COORDINATEOPERATION_wkt2018) {
+TEST(wkt_parse, COORDINATEOPERATION_wkt2_2019) {
 
     std::string src_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         formatter->setOutputId(false);
         src_wkt = GeographicCRS::EPSG_4326->exportToWKT(formatter.get());
     }
@@ -2374,7 +2374,7 @@ TEST(wkt_parse, COORDINATEOPERATION_wkt2018) {
     std::string dst_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         formatter->setOutputId(false);
         dst_wkt = GeographicCRS::EPSG_4807->exportToWKT(formatter.get());
     }
@@ -2382,7 +2382,7 @@ TEST(wkt_parse, COORDINATEOPERATION_wkt2018) {
     std::string interpolation_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         formatter->setOutputId(false);
         interpolation_wkt =
             GeographicCRS::EPSG_4979->exportToWKT(formatter.get());
@@ -2429,7 +2429,7 @@ TEST(wkt_parse, COORDINATEOPERATION_wkt2018) {
 
     {
         auto outWkt = transf->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
         EXPECT_EQ(replaceAll(replaceAll(outWkt, "\n", ""), " ", ""),
                   replaceAll(replaceAll(wkt, "\n", ""), " ", ""));
     }
@@ -2493,7 +2493,7 @@ TEST(wkt_parse, CONCATENATEDOPERATION) {
             PositionalAccuracy::create("0.1")});
 
     auto wkt = concat_in->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
 
     auto obj = WKTParser().createFromWKT(wkt);
     auto concat = nn_dynamic_pointer_cast<ConcatenatedOperation>(obj);
@@ -2636,7 +2636,7 @@ TEST(wkt_parse, CONCATENATEDOPERATION_with_conversion_and_conversion) {
               "+step +proj=utm +zone=32 +ellps=WGS84");
 
     auto outWkt = concat->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     EXPECT_EQ(wkt, outWkt);
 }
 
@@ -2809,7 +2809,7 @@ TEST(wkt_parse,
               "+zone=11 +ellps=WGS84");
 
     auto outWkt = concat->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     EXPECT_EQ(wkt, outWkt);
 }
 
@@ -3348,7 +3348,7 @@ TEST(wkt_parse, DerivedGeographicCRS_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, DerivedGeographicCRS_WKT2_2018) {
+TEST(wkt_parse, DerivedGeographicCRS_WKT2_2019) {
     auto wkt = "GEOGCRS[\"WMO Atlantic Pole\",\n"
                "    BASEGEOGCRS[\"WGS 84\",\n"
                "        DATUM[\"World Geodetic System 1984\",\n"
@@ -3532,7 +3532,7 @@ TEST(wkt_parse, DerivedProjectedCRS_ordinal) {
 
     EXPECT_EQ(
         crs->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get()),
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get()),
         wkt);
 }
 
@@ -3595,7 +3595,7 @@ TEST(wkt_parse, dateTimeTemporalCRS_WKT2) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, dateTimeTemporalCRS_WKT2_2018) {
+TEST(wkt_parse, dateTimeTemporalCRS_WKT2_2019) {
     auto wkt = "TIMECRS[\"Temporal CRS\",\n"
                "    TDATUM[\"Gregorian calendar\",\n"
                "        CALENDAR[\"proleptic Gregorian\"],\n"
@@ -3622,7 +3622,7 @@ TEST(wkt_parse, dateTimeTemporalCRS_WKT2_2018) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, temporalCountCRSWithConvFactor_WKT2_2018) {
+TEST(wkt_parse, temporalCountCRSWithConvFactor_WKT2_2019) {
     auto wkt = "TIMECRS[\"GPS milliseconds\",\n"
                "    TDATUM[\"GPS time origin\",\n"
                "        TIMEORIGIN[1980-01-01T00:00:00.0Z]],\n"
@@ -3650,7 +3650,7 @@ TEST(wkt_parse, temporalCountCRSWithConvFactor_WKT2_2018) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, temporalCountCRSWithoutConvFactor_WKT2_2018) {
+TEST(wkt_parse, temporalCountCRSWithoutConvFactor_WKT2_2019) {
     auto wkt = "TIMECRS[\"Calendar hours from 1979-12-29\",\n"
                "    TDATUM[\"29 December 1979\",\n"
                "        CALENDAR[\"proleptic Gregorian\"],\n"
@@ -3677,7 +3677,7 @@ TEST(wkt_parse, temporalCountCRSWithoutConvFactor_WKT2_2018) {
 
 // ---------------------------------------------------------------------------
 
-TEST(wkt_parse, temporalMeasureCRSWithoutConvFactor_WKT2_2018) {
+TEST(wkt_parse, temporalMeasureCRSWithoutConvFactor_WKT2_2019) {
     auto wkt = "TIMECRS[\"Decimal Years CE\",\n"
                "    TIMEDATUM[\"Common Era\",\n"
                "        TIMEORIGIN[0000]],\n"
@@ -9017,7 +9017,7 @@ TEST(io, guessDialect) {
                   "        AXIS[\"geodetic latitude (Lat)\",north],\n"
                   "        AXIS[\"geodetic longitude (Lon)\",east],\n"
                   "        UNIT[\"degree\",0.0174532925199433]]"),
-              WKTParser::WKTGuessedDialect::WKT2_2018);
+              WKTParser::WKTGuessedDialect::WKT2_2019);
 
     EXPECT_EQ(
         WKTParser().guessDialect("TIMECRS[\"Temporal CRS\",\n"
@@ -9026,7 +9026,7 @@ TEST(io, guessDialect) {
                                  "        TIMEORIGIN[0000-01-01]],\n"
                                  "    CS[TemporalDateTime,1],\n"
                                  "        AXIS[\"time (T)\",future]]"),
-        WKTParser::WKTGuessedDialect::WKT2_2018);
+        WKTParser::WKTGuessedDialect::WKT2_2019);
 
     EXPECT_EQ(WKTParser().guessDialect(
                   "GEODCRS[\"WGS 84\",\n"
diff --git a/test/unit/test_metadata.cpp b/test/unit/test_metadata.cpp
index 137e8e42..e12788b4 100644
--- a/test/unit/test_metadata.cpp
+++ b/test/unit/test_metadata.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
diff --git a/test/unit/test_operation.cpp b/test/unit/test_operation.cpp
index 89edfca4..96727c2b 100644
--- a/test/unit/test_operation.cpp
+++ b/test/unit/test_operation.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************
@@ -446,28 +446,28 @@ TEST(operation, concatenated_operation) {
     std::string src_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         src_wkt = GeographicCRS::EPSG_4326->exportToWKT(formatter.get());
     }
 
     std::string dst_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         dst_wkt = GeographicCRS::EPSG_4979->exportToWKT(formatter.get());
     }
 
     std::string step1_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         step1_wkt = transf_1->exportToWKT(formatter.get());
     }
 
     std::string step2_wkt;
     {
         auto formatter =
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018);
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019);
         step2_wkt = transf_2->exportToWKT(formatter.get());
     }
 
@@ -485,7 +485,7 @@ TEST(operation, concatenated_operation) {
 
     EXPECT_EQ(replaceAll(replaceAll(concat->exportToWKT(
                                         WKTFormatter::create(
-                                            WKTFormatter::Convention::WKT2_2018)
+                                            WKTFormatter::Convention::WKT2_2019)
                                             .get()),
                                     " ", ""),
                          "\n", ""),
@@ -6559,7 +6559,7 @@ TEST(operation, compoundCRS_to_compoundCRS_context) {
         // Test that we can round-trip this through WKT and still get the same
         // PROJ string.
         auto wkt = list[0]->exportToWKT(
-            WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+            WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
         auto obj = WKTParser().createFromWKT(wkt);
         auto co = nn_dynamic_pointer_cast<CoordinateOperation>(obj);
         ASSERT_TRUE(co != nullptr);
@@ -6775,7 +6775,7 @@ TEST(operation, compoundCRS_from_WKT2_to_geogCRS_3D_context) {
         CoordinateOperationFactory::create()->createOperations(src, dst, ctxt);
     ASSERT_GE(list.size(), 1U);
     auto wkt2 = src->exportToWKT(
-        WKTFormatter::create(WKTFormatter::Convention::WKT2_2018).get());
+        WKTFormatter::create(WKTFormatter::Convention::WKT2_2019).get());
     auto obj = WKTParser().createFromWKT(wkt2);
     auto src_from_wkt2 = nn_dynamic_pointer_cast<CRS>(obj);
     ASSERT_TRUE(src_from_wkt2 != nullptr);
@@ -7019,10 +7019,10 @@ TEST(operation, createOperation_on_crs_with_canonical_bound_crs) {
         EXPECT_TRUE(op->isEquivalentTo(boundCRS->transformation().get()));
         {
             auto wkt1 = op->exportToWKT(
-                WKTFormatter::create(WKTFormatter::Convention::WKT2_2018)
+                WKTFormatter::create(WKTFormatter::Convention::WKT2_2019)
                     .get());
             auto wkt2 = boundCRS->transformation()->exportToWKT(
-                WKTFormatter::create(WKTFormatter::Convention::WKT2_2018)
+                WKTFormatter::create(WKTFormatter::Convention::WKT2_2019)
                     .get());
             EXPECT_EQ(wkt1, wkt2);
         }
@@ -7035,10 +7035,10 @@ TEST(operation, createOperation_on_crs_with_canonical_bound_crs) {
             op->isEquivalentTo(boundCRS->transformation()->inverse().get()));
         {
             auto wkt1 = op->exportToWKT(
-                WKTFormatter::create(WKTFormatter::Convention::WKT2_2018)
+                WKTFormatter::create(WKTFormatter::Convention::WKT2_2019)
                     .get());
             auto wkt2 = boundCRS->transformation()->inverse()->exportToWKT(
-                WKTFormatter::create(WKTFormatter::Convention::WKT2_2018)
+                WKTFormatter::create(WKTFormatter::Convention::WKT2_2019)
                     .get());
             EXPECT_EQ(wkt1, wkt2);
         }
diff --git a/test/unit/test_util.cpp b/test/unit/test_util.cpp
index 67c7da52..0c6004d0 100644
--- a/test/unit/test_util.cpp
+++ b/test/unit/test_util.cpp
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Project:  PROJ
- * Purpose:  Test ISO19111:2018 implementation
+ * Purpose:  Test ISO19111:2019 implementation
  * Author:   Even Rouault <even dot rouault at spatialys dot com>
  *
  ******************************************************************************