diff --git a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc b/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
index c2911fa77..eb701ee75 100644
--- a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
+++ b/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_lambert_azimuthal_equal_area.h"
 
 eccodes::geo_nearest::LambertAzimuthalEqualArea _grib_nearest_lambert_azimuthal_equal_area{};
-eccodes::geo_nearest::LambertAzimuthalEqualArea* grib_nearest_lambert_azimuthal_equal_area = &_grib_nearest_lambert_azimuthal_equal_area;
+eccodes::geo_nearest::Nearest* grib_nearest_lambert_azimuthal_equal_area = &_grib_nearest_lambert_azimuthal_equal_area;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_lambert_conformal.cc b/src/geo_nearest/grib_nearest_class_lambert_conformal.cc
index fe4955518..a61756e54 100644
--- a/src/geo_nearest/grib_nearest_class_lambert_conformal.cc
+++ b/src/geo_nearest/grib_nearest_class_lambert_conformal.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_lambert_conformal.h"
 
 eccodes::geo_nearest::LambertConformal _grib_nearest_lambert_conformal{};
-eccodes::geo_nearest::LambertConformal* grib_nearest_lambert_conformal = &_grib_nearest_lambert_conformal;
+eccodes::geo_nearest::Nearest* grib_nearest_lambert_conformal = &_grib_nearest_lambert_conformal;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc b/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
index f9e3a4ae5..d7e54da11 100644
--- a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
+++ b/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_latlon_reduced.h"
 
 eccodes::geo_nearest::LatlonReduced _grib_nearest_latlon_reduced{};
-eccodes::geo_nearest::LatlonReduced* grib_nearest_latlon_reduced = &_grib_nearest_latlon_reduced;
+eccodes::geo_nearest::Nearest* grib_nearest_latlon_reduced = &_grib_nearest_latlon_reduced;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_mercator.cc b/src/geo_nearest/grib_nearest_class_mercator.cc
index 4faa54917..e8d1935f7 100644
--- a/src/geo_nearest/grib_nearest_class_mercator.cc
+++ b/src/geo_nearest/grib_nearest_class_mercator.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_mercator.h"
 
 eccodes::geo_nearest::Mercator _grib_nearest_mercator{};
-eccodes::geo_nearest::Mercator* grib_nearest_mercator = &_grib_nearest_mercator;
+eccodes::geo_nearest::Nearest* grib_nearest_mercator = &_grib_nearest_mercator;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc b/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
index 37baf493d..ed223f285 100644
--- a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
+++ b/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_polar_stereographic.h"
 
 eccodes::geo_nearest::PolarStereographic _grib_nearest_polar_stereographic{};
-eccodes::geo_nearest::PolarStereographic* grib_nearest_polar_stereographic = &_grib_nearest_polar_stereographic;
+eccodes::geo_nearest::Nearest* grib_nearest_polar_stereographic = &_grib_nearest_polar_stereographic;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_reduced.cc b/src/geo_nearest/grib_nearest_class_reduced.cc
index 6d4b65241..f0e057b33 100644
--- a/src/geo_nearest/grib_nearest_class_reduced.cc
+++ b/src/geo_nearest/grib_nearest_class_reduced.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_reduced.h"
 
 eccodes::geo_nearest::Reduced _grib_nearest_reduced{};
-eccodes::geo_nearest::Reduced* grib_nearest_reduced = &_grib_nearest_reduced;
+eccodes::geo_nearest::Nearest* grib_nearest_reduced = &_grib_nearest_reduced;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_regular.cc b/src/geo_nearest/grib_nearest_class_regular.cc
index 9b5700310..9dac4b0cc 100644
--- a/src/geo_nearest/grib_nearest_class_regular.cc
+++ b/src/geo_nearest/grib_nearest_class_regular.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_regular.h"
 
 eccodes::geo_nearest::Regular _grib_nearest_regular{};
-eccodes::geo_nearest::Regular* grib_nearest_regular = &_grib_nearest_regular;
+eccodes::geo_nearest::Nearest* grib_nearest_regular = &_grib_nearest_regular;
 
 namespace eccodes::geo_nearest {
 
diff --git a/src/geo_nearest/grib_nearest_class_space_view.cc b/src/geo_nearest/grib_nearest_class_space_view.cc
index 172e5d357..fdad5fba6 100644
--- a/src/geo_nearest/grib_nearest_class_space_view.cc
+++ b/src/geo_nearest/grib_nearest_class_space_view.cc
@@ -11,7 +11,7 @@
 #include "grib_nearest_class_space_view.h"
 
 eccodes::geo_nearest::SpaceView _grib_nearest_space_view{};
-eccodes::geo_nearest::SpaceView* grib_nearest_space_view = &_grib_nearest_space_view;
+eccodes::geo_nearest::Nearest* grib_nearest_space_view = &_grib_nearest_space_view;
 
 namespace eccodes::geo_nearest {