diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca005650ca814bd351b74a414db439fa7bf4349c..53d15ec554d7be692eb5857a5f31573599e27f00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,29 +88,29 @@ set(HEADERS_F
 
 if(USE_CXX)
     set(SOURCES_C 
-        srcC/c_sfx_model_compute_flux.c
+        srcC/c-sfx-model-compute-flux.c
     )
 
     set(HEADERS_C
-        includeC/sfx_data.h
+        includeC/sfx-data.h
     )
     list(APPEND HEADERS_DIRS includeC/)
 
     set(SOURCES_CXX 
-            srcCXX/model_base.cpp
-            srcCXX/sfx_esm.cpp
-            srcCXX/sfx_sheba.cpp
-            srcCXX/cxx_sfx_model_compute_flux.cpp
+            srcCXX/model-base.cpp
+            srcCXX/sfx-esm.cpp
+            srcCXX/sfx-sheba.cpp
+            srcCXX/cxx-sfx-model-compute-flux.cpp
     )
     set(HEADERS_CXX 
-            includeCU/sfx_surface.cuh
-            includeCU/sfx_math.cuh
-            includeCU/sfx_model_compute_subfunc.cuh
-
-            includeCXX/model_base.h
-            includeCXX/sfx_esm.h
-            includeCXX/sfx_sheba.h
-            includeCXX/cxx_sfx_model_compute_flux.h
+            includeCU/sfx-surface.cuh
+            includeCU/sfx-math.cuh
+            includeCU/sfx-model-compute-subfunc.cuh
+
+            includeCXX/model-base.h
+            includeCXX/sfx-esm.h
+            includeCXX/sfx-sheba.h
+            includeCXX/cxx-sfx-model-compute-flux.h
         )
     list(APPEND HEADERS_DIRS includeCU/)
     list(APPEND HEADERS_DIRS includeCXX/)
@@ -118,8 +118,8 @@ endif(USE_CXX)
 
 if(INCLUDE_CUDA)
     set(SOURCES_CU 
-        srcCU/sfx_esm.cu
-        srcCU/sfx_sheba.cu
+        srcCU/sfx-esm.cu
+        srcCU/sfx-sheba.cu
     )
     set(HEADERS_CU
     
@@ -128,19 +128,19 @@ endif(INCLUDE_CUDA)
 
 if(USE_CXX OR INCLUDE_CUDA)
     set(MEMPROC_SOURCES_CXX
-        srcCXX/sfx_memory_processing.cpp
+        srcCXX/sfx-memory-processing.cpp
     )
     set(MEMPROC_HEADERS_CXX
-        includeCXX/sfx_memory_processing.h
-        includeCXX/sfx_template_parameters.h
+        includeCXX/sfx-memory-processing.h
+        includeCXX/sfx-template-parameters.h
     )
 
     if(INCLUDE_CUDA)
         set(MEMPROC_SOURCES_CU
-            srcCU/sfx_memory_processing.cu
+            srcCU/sfx-memory-processing.cu
         )
         set(MEMPROC_HEADERS_CU
-            includeCU/sfx_memory_processing.cuh
+            includeCU/sfx-memory-processing.cuh
         )
     endif(INCLUDE_CUDA)
 endif(USE_CXX OR INCLUDE_CUDA)
diff --git a/includeC/sfx_data.h b/includeC/sfx-data.h
similarity index 100%
rename from includeC/sfx_data.h
rename to includeC/sfx-data.h
diff --git a/includeCU/sfx_math.cuh b/includeCU/sfx-math.cuh
similarity index 100%
rename from includeCU/sfx_math.cuh
rename to includeCU/sfx-math.cuh
diff --git a/includeCU/sfx_memory_processing.cuh b/includeCU/sfx-memory-processing.cuh
similarity index 93%
rename from includeCU/sfx_memory_processing.cuh
rename to includeCU/sfx-memory-processing.cuh
index 2e68b1402dcfd009ef694a22730946e0728d4729..e8b09d0e9d53fe8263f909b22c3209b39c623b52 100644
--- a/includeCU/sfx_memory_processing.cuh
+++ b/includeCU/sfx-memory-processing.cuh
@@ -1,5 +1,5 @@
 #pragma once
-#include "sfx_template_parameters.h"
+#include "sfx-template-parameters.h"
 #include <cstddef>
 
 namespace memproc
diff --git a/includeCU/sfx_model_compute_subfunc.cuh b/includeCU/sfx-model-compute-subfunc.cuh
similarity index 99%
rename from includeCU/sfx_model_compute_subfunc.cuh
rename to includeCU/sfx-model-compute-subfunc.cuh
index ecc53f20a1889bfe7024ce652b070c610090cfd0..7acf0340125de4f13acddaf9c105f4e255e83a20 100644
--- a/includeCU/sfx_model_compute_subfunc.cuh
+++ b/includeCU/sfx-model-compute-subfunc.cuh
@@ -1,6 +1,6 @@
 #pragma once 
-#include "sfx_data.h"
-#include "sfx_math.cuh"
+#include "sfx-data.h"
+#include "sfx-math.cuh"
 
 template<typename T, class sfx_param>
 FUCNTION_DECLARATION_SPECIFIER void get_convection_lim(T &zeta_lim, T &Rib_lim, T &f_m_lim, T &f_h_lim,
diff --git a/includeCU/sfx_surface.cuh b/includeCU/sfx-surface.cuh
similarity index 97%
rename from includeCU/sfx_surface.cuh
rename to includeCU/sfx-surface.cuh
index c2d6ebe54abd4d45fafbeddcea558c3800f0e236..85908c1abc0a3e9f161ffa1fdbe7ab7dc07a5d29 100644
--- a/includeCU/sfx_surface.cuh
+++ b/includeCU/sfx-surface.cuh
@@ -1,6 +1,6 @@
 #pragma once
-#include "sfx_data.h"
-#include "sfx_math.cuh"
+#include "sfx-data.h"
+#include "sfx-math.cuh"
 
 template<typename T>
 FUCNTION_DECLARATION_SPECIFIER void get_thermal_roughness(T &z0_t, T &B,
diff --git a/includeCXX/cxx_sfx_model_compute_flux.h b/includeCXX/cxx-sfx-model-compute-flux.h
similarity index 97%
rename from includeCXX/cxx_sfx_model_compute_flux.h
rename to includeCXX/cxx-sfx-model-compute-flux.h
index 79a4c1deed673b1f2bcca1d10a614090da1603e3..44adc935d41df0edcf4e415876e3a029b458df04 100644
--- a/includeCXX/cxx_sfx_model_compute_flux.h
+++ b/includeCXX/cxx-sfx-model-compute-flux.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "sfx_data.h"
+#include "sfx-data.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/includeCXX/model_base.h b/includeCXX/model-base.h
similarity index 87%
rename from includeCXX/model_base.h
rename to includeCXX/model-base.h
index 2a3bb893d0d9eef0bcb2f5bb10fa2a2f920e4f52..ccf4975b89d1cad6b9e1748e73d36dd4eadb75a0 100644
--- a/includeCXX/model_base.h
+++ b/includeCXX/model-base.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstddef>
-#include "sfx_template_parameters.h"
-#include "sfx_data.h"
+#include "sfx-template-parameters.h"
+#include "sfx-data.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 class ModelBase
diff --git a/includeCXX/sfx_esm.h b/includeCXX/sfx-esm.h
similarity index 97%
rename from includeCXX/sfx_esm.h
rename to includeCXX/sfx-esm.h
index 34478320b7c7a5b96955182e239f837c9a4e8c39..546db2482c85578c1cf15b816811d2996b106bb2 100644
--- a/includeCXX/sfx_esm.h
+++ b/includeCXX/sfx-esm.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "sfx_template_parameters.h"
-#include "model_base.h"
-#include "sfx_data.h"
+#include "sfx-template-parameters.h"
+#include "model-base.h"
+#include "sfx-data.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 class FluxEsmBase : public ModelBase<T, memIn, memOut, RunMem>
diff --git a/includeCXX/sfx_memory_processing.h b/includeCXX/sfx-memory-processing.h
similarity index 93%
rename from includeCXX/sfx_memory_processing.h
rename to includeCXX/sfx-memory-processing.h
index 2de2fcd729344226dbd8dec326cabe3d1f10caa6..ba36e71f5e8e02ba8e561dd317ea6aff76c90950 100644
--- a/includeCXX/sfx_memory_processing.h
+++ b/includeCXX/sfx-memory-processing.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "sfx_template_parameters.h"
+#include "sfx-template-parameters.h"
 #include <cstddef>
 
 namespace memproc
diff --git a/includeCXX/sfx_sheba.h b/includeCXX/sfx-sheba.h
similarity index 97%
rename from includeCXX/sfx_sheba.h
rename to includeCXX/sfx-sheba.h
index 832f49a5c0ab515c3d6cb1b54e18b51c7bad5e22..a6623703a4d292165f6ab73a67b19a4dc30444a2 100644
--- a/includeCXX/sfx_sheba.h
+++ b/includeCXX/sfx-sheba.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "sfx_template_parameters.h"
-#include "model_base.h"
-#include "sfx_data.h"
+#include "sfx-template-parameters.h"
+#include "model-base.h"
+#include "sfx-data.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 class FluxShebaBase : public ModelBase<T, memIn, memOut, RunMem>
diff --git a/includeCXX/sfx_template_parameters.h b/includeCXX/sfx-template-parameters.h
similarity index 100%
rename from includeCXX/sfx_template_parameters.h
rename to includeCXX/sfx-template-parameters.h
diff --git a/srcC/c_sfx_model_compute_flux.c b/srcC/c-sfx-model-compute-flux.c
similarity index 94%
rename from srcC/c_sfx_model_compute_flux.c
rename to srcC/c-sfx-model-compute-flux.c
index bde2ab670f078ae9ce1b6cf02dbe843c79089ee3..60a2a18032713338167d7ba850dcaff3efd52272 100644
--- a/srcC/c_sfx_model_compute_flux.c
+++ b/srcC/c-sfx-model-compute-flux.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "cxx_sfx_model_compute_flux.h"
-// #include "../includeC/sfx_call_cxx.h"
+#include "cxx-sfx-model-compute-flux.h"
 // -------------------------------------------------------------------------- //
 
 void c_esm_compute_flux (struct sfxDataVecTypeC* sfx,
diff --git a/srcCU/sfx_esm.cu b/srcCU/sfx-esm.cu
similarity index 98%
rename from srcCU/sfx_esm.cu
rename to srcCU/sfx-esm.cu
index e8aba38f7bf3efc93dec8f530a44603ba0b68ea5..993db40535fa7a6da44f3353e8afb921bcd32c4b 100644
--- a/srcCU/sfx_esm.cu
+++ b/srcCU/sfx-esm.cu
@@ -1,10 +1,10 @@
 #include <cuda.h>
 #include <cuda_runtime_api.h>
 
-#include "sfx_esm.h"
-#include "sfx_model_compute_subfunc.cuh"
-#include "sfx_surface.cuh"
-#include "sfx_memory_processing.cuh"
+#include "sfx-esm.h"
+#include "sfx-model-compute-subfunc.cuh"
+#include "sfx-surface.cuh"
+#include "sfx-memory-processing.cuh"
 
 namespace sfx_kernel
 {
diff --git a/srcCU/sfx_memory_processing.cu b/srcCU/sfx-memory-processing.cu
similarity index 97%
rename from srcCU/sfx_memory_processing.cu
rename to srcCU/sfx-memory-processing.cu
index 8d622c1962312c9bb57f59832b099ed103c22e66..372bf9327a12e27837a7699791b756e37548d4aa 100644
--- a/srcCU/sfx_memory_processing.cu
+++ b/srcCU/sfx-memory-processing.cu
@@ -1,4 +1,4 @@
-#include "sfx_memory_processing.cuh"
+#include "sfx-memory-processing.cuh"
 #include <cuda.h>
 #include <cuda_runtime_api.h>
 
diff --git a/srcCU/sfx_sheba.cu b/srcCU/sfx-sheba.cu
similarity index 97%
rename from srcCU/sfx_sheba.cu
rename to srcCU/sfx-sheba.cu
index e31f93cd34e2a582eabf301e58ccc7af7c2bae06..b4dd14b141801ced4584ab7c503fd3c83baa2e52 100644
--- a/srcCU/sfx_sheba.cu
+++ b/srcCU/sfx-sheba.cu
@@ -1,10 +1,10 @@
 #include <cuda.h>
 #include <cuda_runtime_api.h>
 
-#include "sfx_sheba.h"
-#include "sfx_model_compute_subfunc.cuh"
-#include "sfx_surface.cuh"
-#include "sfx_memory_processing.cuh"
+#include "sfx-sheba.h"
+#include "sfx-model-compute-subfunc.cuh"
+#include "sfx-surface.cuh"
+#include "sfx-memory-processing.cuh"
 
 namespace sfx_kernel
 {
diff --git a/srcCXX/cxx_sfx_model_compute_flux.cpp b/srcCXX/cxx-sfx-model-compute-flux.cpp
similarity index 95%
rename from srcCXX/cxx_sfx_model_compute_flux.cpp
rename to srcCXX/cxx-sfx-model-compute-flux.cpp
index fd19000287800dcbb929310b2506023471bf5779..493f4ca0c77bdf2ada9d64df84652f36a61733ca 100644
--- a/srcCXX/cxx_sfx_model_compute_flux.cpp
+++ b/srcCXX/cxx-sfx-model-compute-flux.cpp
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "cxx_sfx_model_compute_flux.h"
-#include "sfx_esm.h"
-#include "sfx_sheba.h"
+#include "cxx-sfx-model-compute-flux.h"
+#include "sfx-esm.h"
+#include "sfx-sheba.h"
 #include <vector>
 
 // -------------------------------------------------------------------------- //
diff --git a/srcCXX/model_base.cpp b/srcCXX/model-base.cpp
similarity index 98%
rename from srcCXX/model_base.cpp
rename to srcCXX/model-base.cpp
index a72d47d5973035b4a7dd639c004f566802273a8b..b89480ae8b339310f48bb73d47c5ebfea0c25a1b 100644
--- a/srcCXX/model_base.cpp
+++ b/srcCXX/model-base.cpp
@@ -1,9 +1,9 @@
-#include "model_base.h"
+#include "model-base.h"
 
 #ifdef INCLUDE_CUDA
-    #include "sfx_memory_processing.cuh"
+    #include "sfx-memory-processing.cuh"
 #endif
-#include "sfx_memory_processing.h"
+#include "sfx-memory-processing.h"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 ModelBase<T, memIn, memOut, RunMem>::ModelBase(sfxDataVecTypeC* sfx_in,
diff --git a/srcCXX/sfx_esm.cpp b/srcCXX/sfx-esm.cpp
similarity index 97%
rename from srcCXX/sfx_esm.cpp
rename to srcCXX/sfx-esm.cpp
index b704d99aa8114c59fec6e200394a193b98ac5ad3..bbbcd2163c9080b18494a6d6cef182aadf3bb83c 100644
--- a/srcCXX/sfx_esm.cpp
+++ b/srcCXX/sfx-esm.cpp
@@ -1,14 +1,14 @@
 #include <iostream>
 #include <cmath>
 
-#include "sfx_esm.h"
+#include "sfx-esm.h"
 #ifdef INCLUDE_CUDA
-    #include "sfx_memory_processing.cuh"
+    #include "sfx-memory-processing.cuh"
 #endif
 
-#include "sfx_memory_processing.h"
-#include "sfx_surface.cuh"
-#include "sfx_model_compute_subfunc.cuh"
+#include "sfx-memory-processing.h"
+#include "sfx-surface.cuh"
+#include "sfx-model-compute-subfunc.cuh"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 FluxEsmBase<T, memIn, memOut, RunMem>::FluxEsmBase(sfxDataVecTypeC* sfx_in,
diff --git a/srcCXX/sfx_memory_processing.cpp b/srcCXX/sfx-memory-processing.cpp
similarity index 97%
rename from srcCXX/sfx_memory_processing.cpp
rename to srcCXX/sfx-memory-processing.cpp
index 6b13745da36f58e8cf909206678e6d3583a11da4..eb0e39cf3e04b9a62f708c3dd97e4abddfe9f488 100644
--- a/srcCXX/sfx_memory_processing.cpp
+++ b/srcCXX/sfx-memory-processing.cpp
@@ -1,4 +1,4 @@
-#include "sfx_memory_processing.h"
+#include "sfx-memory-processing.h"
 #include <cstdlib>
 #include <cstring>
 
diff --git a/srcCXX/sfx_sheba.cpp b/srcCXX/sfx-sheba.cpp
similarity index 97%
rename from srcCXX/sfx_sheba.cpp
rename to srcCXX/sfx-sheba.cpp
index a6b74d7854ad72a2d5473097f8c3c5d4e7d3897a..7d565650de0bfbba447007d3b14430ef7395dd0c 100644
--- a/srcCXX/sfx_sheba.cpp
+++ b/srcCXX/sfx-sheba.cpp
@@ -1,14 +1,14 @@
 #include <iostream>
 #include <cmath>
 
-#include "sfx_sheba.h"
+#include "sfx-sheba.h"
 #ifdef INCLUDE_CUDA
-    #include "sfx_memory_processing.cuh"
+    #include "sfx-memory-processing.cuh"
 #endif
 
-#include "sfx_memory_processing.h"
-#include "sfx_surface.cuh"
-#include "sfx_model_compute_subfunc.cuh"
+#include "sfx-memory-processing.h"
+#include "sfx-surface.cuh"
+#include "sfx-model-compute-subfunc.cuh"
 
 template<typename T, MemType memIn, MemType memOut, MemType RunMem >
 FluxShebaBase<T, memIn, memOut, RunMem>::FluxShebaBase(sfxDataVecTypeC* sfx_in,