diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b58a1937f95aae76c017aaf05d3d46382aa4148..5343720ab3fd84402b6e2562bb08808e659907d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ set(HEADERS_F
 
 if(USE_CXX)
     set(SOURCES_C 
-        srcC/sfx_model_compute_flux_c.c
+        srcC/c_sfx_model_compute_flux.c
     )
 
     set(HEADERS_C
@@ -99,7 +99,7 @@ if(USE_CXX)
             srcCXX/model_base.cpp
             srcCXX/sfx_esm.cpp
             srcCXX/sfx_sheba.cpp
-            srcCXX/sfx_model_compute_flux_cxx.cpp
+            srcCXX/cxx_sfx_model_compute_flux.cpp
     )
     set(HEADERS_CXX 
             includeCU/sfx_surface.cuh
@@ -109,7 +109,7 @@ if(USE_CXX)
             includeCXX/model_base.h
             includeCXX/sfx_esm.h
             includeCXX/sfx_sheba.h
-            includeCXX/sfx_model_compute_flux_cxx.h
+            includeCXX/cxx_sfx_model_compute_flux.h
         )
     list(APPEND HEADERS_DIRS includeCU/)
     list(APPEND HEADERS_DIRS includeCXX/)
diff --git a/includeCXX/sfx_model_compute_flux_cxx.h b/includeCXX/cxx_sfx_model_compute_flux.h
similarity index 100%
rename from includeCXX/sfx_model_compute_flux_cxx.h
rename to includeCXX/cxx_sfx_model_compute_flux.h
diff --git a/srcC/sfx_model_compute_flux_c.c b/srcC/c_sfx_model_compute_flux.c
similarity index 97%
rename from srcC/sfx_model_compute_flux_c.c
rename to srcC/c_sfx_model_compute_flux.c
index b9cbf6a71b9aee4be12ebf9a8cf80bfcdac0d142..11b488a3f0072d809030e98c3294cb6af6622500 100644
--- a/srcC/sfx_model_compute_flux_c.c
+++ b/srcC/c_sfx_model_compute_flux.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "sfx_model_compute_flux_cxx.h"
+#include "cxx_sfx_model_compute_flux.h"
 // #include "../includeC/sfx_call_cxx.h"
 // -------------------------------------------------------------------------- //
 
diff --git a/srcCXX/sfx_model_compute_flux_cxx.cpp b/srcCXX/cxx_sfx_model_compute_flux.cpp
similarity index 97%
rename from srcCXX/sfx_model_compute_flux_cxx.cpp
rename to srcCXX/cxx_sfx_model_compute_flux.cpp
index 40fca4b76d5272e12b691d51025559c357ca59f2..22213a46fb88bbf72f5a9cf8bf030ac4fc3a9f30 100644
--- a/srcCXX/sfx_model_compute_flux_cxx.cpp
+++ b/srcCXX/cxx_sfx_model_compute_flux.cpp
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "sfx_model_compute_flux_cxx.h"
+#include "cxx_sfx_model_compute_flux.h"
 #include "sfx_esm.h"
 #include "sfx_sheba.h"
 #include <vector>