diff --git a/includeCXX/cxx_sfx_model_compute_flux.h b/includeCXX/cxx_sfx_model_compute_flux.h
index 880539659202278b515f55da64f6af6f16ade964..79a4c1deed673b1f2bcca1d10a614090da1603e3 100644
--- a/includeCXX/cxx_sfx_model_compute_flux.h
+++ b/includeCXX/cxx_sfx_model_compute_flux.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-    void cxx_esm_compute_flux(struct sfxDataVecTypeC* sfx,
+    void esm_compute_flux(struct sfxDataVecTypeC* sfx,
                            struct meteoDataVecTypeC* meteo,
                            const struct sfx_esm_param_C* model_param, 
                            const struct sfx_surface_param* surface_param,
@@ -13,7 +13,7 @@ extern "C" {
                            const struct sfx_phys_constants* constants,
                            const int grid_size);
 
-    void cxx_sheba_compute_flux(struct sfxDataVecTypeC* sfx,
+    void sheba_compute_flux(struct sfxDataVecTypeC* sfx,
                            struct meteoDataVecTypeC* meteo,
                            const struct sfx_sheba_param_C* model_param, 
                            const struct sfx_surface_param* surface_param,
diff --git a/srcC/c_sfx_model_compute_flux.c b/srcC/c_sfx_model_compute_flux.c
index 11b488a3f0072d809030e98c3294cb6af6622500..bde2ab670f078ae9ce1b6cf02dbe843c79089ee3 100644
--- a/srcC/c_sfx_model_compute_flux.c
+++ b/srcC/c_sfx_model_compute_flux.c
@@ -12,7 +12,7 @@ void c_esm_compute_flux (struct sfxDataVecTypeC* sfx,
                                  const struct sfx_phys_constants* constants,
                                  const int *grid_size)
 {
-  cxx_esm_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size); 
+  esm_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size); 
 }
 
 void c_sheba_compute_flux (struct sfxDataVecTypeC* sfx,
@@ -23,5 +23,5 @@ void c_sheba_compute_flux (struct sfxDataVecTypeC* sfx,
                                  const struct sfx_phys_constants* constants,
                                  const int *grid_size)
 {
-  cxx_sheba_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size); 
+  sheba_compute_flux(sfx, meteo, model_param, surface_param, numerics, constants, *grid_size); 
 }
\ No newline at end of file
diff --git a/srcCXX/cxx_sfx_model_compute_flux.cpp b/srcCXX/cxx_sfx_model_compute_flux.cpp
index 9367ce4c9715d5a9c4172021a5a0aa13a52073ef..fd19000287800dcbb929310b2506023471bf5779 100644
--- a/srcCXX/cxx_sfx_model_compute_flux.cpp
+++ b/srcCXX/cxx_sfx_model_compute_flux.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 // -------------------------------------------------------------------------- //
-void cxx_esm_compute_flux (sfxDataVecTypeC* sfx,
+void esm_compute_flux (sfxDataVecTypeC* sfx,
                            meteoDataVecTypeC* meteo,
                            const sfx_esm_param_C* model_param, 
                            const sfx_surface_param* surface_param,
@@ -23,7 +23,7 @@ void cxx_esm_compute_flux (sfxDataVecTypeC* sfx,
 #endif
 }
 
-void cxx_sheba_compute_flux (sfxDataVecTypeC* sfx,
+void sheba_compute_flux (sfxDataVecTypeC* sfx,
                            meteoDataVecTypeC* meteo,
                            const sfx_sheba_param_C* model_param, 
                            const sfx_surface_param* surface_param,