diff --git a/src/common/aux/gradient_m_phy.F90 b/src/common/aux/mode_gradient_m_phy.F90
similarity index 99%
rename from src/common/aux/gradient_m_phy.F90
rename to src/common/aux/mode_gradient_m_phy.F90
index 348dea22e2e0f2301f5b7e15a5ad8dd6bb750b48..6f3c34f01c872849d90154f8b73a90b649854bd3 100644
--- a/src/common/aux/gradient_m_phy.F90
+++ b/src/common/aux/mode_gradient_m_phy.F90
@@ -166,7 +166,7 @@ SUBROUTINE GX_M_M_PHY(D,OFLAT,PA,PDXX,PDZZ,PDZX,PGX_M_M)
 !
 !
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
-USE SHUMAN_PHY, ONLY: DXF_PHY, MZF_PHY, DZM_PHY, MXF_PHY, MXM_PHY
+USE MODE_SHUMAN_PHY, ONLY: DXF_PHY, MZF_PHY, DZM_PHY, MXF_PHY, MXM_PHY
 !
 IMPLICIT NONE
 !
@@ -290,7 +290,7 @@ END SUBROUTINE GX_M_M_PHY
 !
 !
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
-USE SHUMAN_PHY, ONLY: DYF_PHY, MZF_PHY, DZM_PHY, MYF_PHY, MYM_PHY
+USE MODE_SHUMAN_PHY, ONLY: DYF_PHY, MZF_PHY, DZM_PHY, MYF_PHY, MYM_PHY
 !
 IMPLICIT NONE
 !
diff --git a/src/common/aux/gradient_u_phy.F90 b/src/common/aux/mode_gradient_u_phy.F90
similarity index 98%
rename from src/common/aux/gradient_u_phy.F90
rename to src/common/aux/mode_gradient_u_phy.F90
index ff685a0c1319532998fddd9a0051fd17dd1fc4eb..f66dfeff79fac30aeabb45fe0d91866866caa170 100644
--- a/src/common/aux/gradient_u_phy.F90
+++ b/src/common/aux/mode_gradient_u_phy.F90
@@ -53,7 +53,7 @@ CONTAINS
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY, ONLY : DZM_PHY, MXM_PHY
+USE MODE_SHUMAN_PHY, ONLY : DZM_PHY, MXM_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
@@ -158,7 +158,7 @@ END SUBROUTINE GZ_U_UW_PHY
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY, ONLY : DZM_PHY, DXF_PHY, MXF_PHY, MZF_PHY
+USE MODE_SHUMAN_PHY, ONLY : DZM_PHY, DXF_PHY, MXF_PHY, MZF_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
diff --git a/src/common/aux/gradient_v_phy.F90 b/src/common/aux/mode_gradient_v_phy.F90
similarity index 98%
rename from src/common/aux/gradient_v_phy.F90
rename to src/common/aux/mode_gradient_v_phy.F90
index 66ec0b4ca7708bd3dffd385752e336a49910f9d6..0e29c0064d67e01b07396f7c7e544ae9968592b6 100644
--- a/src/common/aux/gradient_v_phy.F90
+++ b/src/common/aux/mode_gradient_v_phy.F90
@@ -54,7 +54,7 @@ CONTAINS
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY, ONLY : DZM_PHY, MYM_PHY
+USE MODE_SHUMAN_PHY, ONLY : DZM_PHY, MYM_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
@@ -154,7 +154,7 @@ END SUBROUTINE GZ_V_VW_PHY
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY, ONLY : DZM_PHY, DYF_PHY, MYF_PHY, MZF_PHY
+USE MODE_SHUMAN_PHY, ONLY : DZM_PHY, DYF_PHY, MYF_PHY, MZF_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
diff --git a/src/common/aux/gradient_w_phy.F90 b/src/common/aux/mode_gradient_w_phy.F90
similarity index 98%
rename from src/common/aux/gradient_w_phy.F90
rename to src/common/aux/mode_gradient_w_phy.F90
index 0377f0991ceffd5f90533f5af1091b9bc653dc36..0f8db721bfbc5be4d986dd23373fb00eb0f36b2f 100644
--- a/src/common/aux/gradient_w_phy.F90
+++ b/src/common/aux/mode_gradient_w_phy.F90
@@ -50,7 +50,7 @@ CONTAINS
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY,    ONLY: MZF_PHY, DZF_PHY, MXM_PHY, DXM_PHY, MZM_PHY, DZM_PHY
+USE MODE_SHUMAN_PHY,    ONLY: MZF_PHY, DZF_PHY, MXM_PHY, DXM_PHY, MZM_PHY, DZM_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
@@ -162,7 +162,7 @@ END SUBROUTINE GX_W_UW_PHY
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY,    ONLY: MZF_PHY, DZF_PHY, MYM_PHY, DYM_PHY, MZM_PHY, DZM_PHY
+USE MODE_SHUMAN_PHY,    ONLY: MZF_PHY, DZF_PHY, MYM_PHY, DYM_PHY, MZM_PHY, DZM_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
@@ -280,7 +280,7 @@ END SUBROUTINE GY_W_VW_PHY
 !*       0.    DECLARATIONS
 !
 !
-USE SHUMAN_PHY,    ONLY: MZF_PHY, DZF_PHY
+USE MODE_SHUMAN_PHY,    ONLY: MZF_PHY, DZF_PHY
 USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 !
 IMPLICIT NONE
diff --git a/src/common/aux/shuman_phy.F90 b/src/common/aux/shuman_phy.F90
index 112da4864b78e285820b35b5d9d0776cbc387db8..ab02447333cc790df851676ff903c851228c3d98 100644
--- a/src/common/aux/shuman_phy.F90
+++ b/src/common/aux/shuman_phy.F90
@@ -1,4 +1,4 @@
-MODULE SHUMAN_PHY
+MODULE MODE_SHUMAN_PHY
 IMPLICIT NONE
 CONTAINS
 !     ###############################
@@ -1331,4 +1331,4 @@ CALL ABORT ! AROME SHOULD NOT CALLED HORIZONTAL FINITE DIFFERENCE
 IF (LHOOK) CALL DR_HOOK('DYF',1,ZHOOK_HANDLE)
 END SUBROUTINE DYF_PHY
 !
-END MODULE SHUMAN_PHY
+END MODULE MODE_SHUMAN_PHY
diff --git a/src/common/turb/mode_prandtl.F90 b/src/common/turb/mode_prandtl.F90
index 9a0d77c6dd45218aecc31b142635e444bbb1d2c4..0b2b63ecd182434374d91804434d55fff5d523e3 100644
--- a/src/common/turb/mode_prandtl.F90
+++ b/src/common/turb/mode_prandtl.F90
@@ -17,7 +17,7 @@ USE MODD_CTURB,      ONLY : CSTURB_t
 USE MODD_DIMPHYEX,   ONLY : DIMPHYEX_t
 USE MODD_PARAMETERS, ONLY : JPVEXT_TURB
 !
-USE SHUMAN_PHY, ONLY: MZM_PHY,MZF_PHY
+USE MODE_SHUMAN_PHY, ONLY: MZM_PHY,MZF_PHY
 USE MODE_GRADIENT_M_PHY
 IMPLICIT NONE
 !----------------------------------------------------------------------------
diff --git a/src/common/turb/mode_rmc01.F90 b/src/common/turb/mode_rmc01.F90
index 5a980a92be0abf8fd509eba3bf3a572b9df28d89..59f254a0d4af720a86f3692144d7fcad68e4d806 100644
--- a/src/common/turb/mode_rmc01.F90
+++ b/src/common/turb/mode_rmc01.F90
@@ -53,7 +53,7 @@ USE MODD_CTURB, ONLY: CSTURB_t
 USE MODE_UPDATE_IIJU_PHY, ONLY: UPDATE_IIJU_PHY
 USE MODE_SBL_PHY, ONLY: BUSINGER_PHIM, BUSINGER_PHIE
 !
-USE SHUMAN_PHY, ONLY: MZF_PHY, MYF_PHY, MXF_PHY
+USE MODE_SHUMAN_PHY, ONLY: MZF_PHY, MYF_PHY, MXF_PHY
 !
 IMPLICIT NONE
 !
diff --git a/src/common/turb/mode_tke_eps_sources.F90 b/src/common/turb/mode_tke_eps_sources.F90
index f7f6a5082ae0c68b332cc8b4fed22347fbd2bfd1..91286d4bc0a1e34654731a00fe4ffc3fc3eb74ef 100644
--- a/src/common/turb/mode_tke_eps_sources.F90
+++ b/src/common/turb/mode_tke_eps_sources.F90
@@ -128,7 +128,7 @@ CONTAINS
 !             ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY, ONLY: MZM_PHY, MZF_PHY, DZF_PHY, DZM_PHY
+USE MODE_SHUMAN_PHY, ONLY: MZM_PHY, MZF_PHY, DZF_PHY, DZM_PHY
 USE YOMHOOK,    ONLY: LHOOK, DR_HOOK
 !
 USE MODD_ARGSLIST_ll,    ONLY: LIST_ll
diff --git a/src/common/turb/mode_tridiag_thermo.F90 b/src/common/turb/mode_tridiag_thermo.F90
index fcef93a9789f5513e9b7a213a0c24796dcc516a8..23d959b9bdb5714bdc06ecfe4592456c2a0a5751 100644
--- a/src/common/turb/mode_tridiag_thermo.F90
+++ b/src/common/turb/mode_tridiag_thermo.F90
@@ -122,7 +122,7 @@ USE MODD_DIMPHYEX, ONLY : DIMPHYEX_t
 USE MODD_PARAMETERS, ONLY : JPVEXT_TURB
 !
 USE MODI_SHUMAN, ONLY : MZM
-USE SHUMAN_PHY, ONLY: MZM_PHY
+USE MODE_SHUMAN_PHY, ONLY: MZM_PHY
 !
 IMPLICIT NONE
 !
diff --git a/src/common/turb/mode_turb_ver_dyn_flux.F90 b/src/common/turb/mode_turb_ver_dyn_flux.F90
index 17f8d55009e8e4a0c251bc3f79d9b715a4ebcf6c..43bc13f265ddb053892836851f99adb002b501ec 100644
--- a/src/common/turb/mode_turb_ver_dyn_flux.F90
+++ b/src/common/turb/mode_turb_ver_dyn_flux.F90
@@ -205,7 +205,7 @@ SUBROUTINE TURB_VER_DYN_FLUX(D,CST,CSTURB,TURBN,TLES,KSV,O2D,OFLAT, &
 !          ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY
+USE MODE_SHUMAN_PHY
 USE YOMHOOK,    ONLY: LHOOK, DR_HOOK
 !
 USE MODD_CST,            ONLY: CST_t
diff --git a/src/common/turb/mode_turb_ver_sv_corr.F90 b/src/common/turb/mode_turb_ver_sv_corr.F90
index 2a1915b221dabe682ce5f2e6cf85e163a2941ff9..64acbc7f83418a05b71b816b7d6cf9cb86b452fa 100644
--- a/src/common/turb/mode_turb_ver_sv_corr.F90
+++ b/src/common/turb/mode_turb_ver_sv_corr.F90
@@ -62,7 +62,7 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
 USE MODD_PARAMETERS, ONLY: JPVEXT_TURB
 USE MODD_LES, ONLY: TLES_t
 !
-USE SHUMAN_PHY, ONLY:  MZF_PHY
+USE MODE_SHUMAN_PHY, ONLY:  MZF_PHY
 USE MODE_GRADIENT_M_PHY, ONLY : GZ_M_W_PHY
 USE MODE_EMOIST, ONLY: EMOIST
 USE MODE_ETHETA, ONLY: ETHETA
diff --git a/src/common/turb/mode_turb_ver_sv_flux.F90 b/src/common/turb/mode_turb_ver_sv_flux.F90
index ab552090a450c7e48e04baf5d99f1b14dc4c2c6f..45ef7cd5b25fcc8a58f87becc06e704f7922e81a 100644
--- a/src/common/turb/mode_turb_ver_sv_flux.F90
+++ b/src/common/turb/mode_turb_ver_sv_flux.F90
@@ -210,7 +210,7 @@ SUBROUTINE TURB_VER_SV_FLUX(D,CST,CSTURB,TURBN,TLES,ONOMIXLG,       &
 !          ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY, ONLY: DZM_PHY, MZM_PHY, MZF_PHY
+USE MODE_SHUMAN_PHY, ONLY: DZM_PHY, MZM_PHY, MZF_PHY
 USE YOMHOOK,    ONLY: LHOOK, DR_HOOK
 !
 USE MODD_CST,              ONLY: CST_t
diff --git a/src/common/turb/mode_turb_ver_thermo_corr.F90 b/src/common/turb/mode_turb_ver_thermo_corr.F90
index 56c4e01d7c54ac8f2e02d8f7a272f356846a767a..b2ce7e927246ba15a040fba375abaf3a73f8593d 100644
--- a/src/common/turb/mode_turb_ver_thermo_corr.F90
+++ b/src/common/turb/mode_turb_ver_thermo_corr.F90
@@ -205,7 +205,7 @@ SUBROUTINE TURB_VER_THERMO_CORR(D,CST,CSTURB,TURBN,TLES,            &
 !          ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY, ONLY: MZM_PHY, MZF_PHY, DZM_PHY
+USE MODE_SHUMAN_PHY, ONLY: MZM_PHY, MZF_PHY, DZM_PHY
 USE YOMHOOK,    ONLY: LHOOK, DR_HOOK
 !
 USE MODD_CST,            ONLY: CST_t
diff --git a/src/common/turb/mode_turb_ver_thermo_flux.F90 b/src/common/turb/mode_turb_ver_thermo_flux.F90
index 618fb377a19214004ad7dcd906efc3e6fbad40b5..c158cc1dd53d018a723a6b26d50fda8155ed230c 100644
--- a/src/common/turb/mode_turb_ver_thermo_flux.F90
+++ b/src/common/turb/mode_turb_ver_thermo_flux.F90
@@ -230,7 +230,7 @@ SUBROUTINE TURB_VER_THERMO_FLUX(D,CST,CSTURB,TURBN,TLES,            &
 !          ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY, ONLY: DZF_PHY, DZM_PHY, MXF_PHY, MYF_PHY, MZF_PHY, MZM_PHY
+USE MODE_SHUMAN_PHY, ONLY: DZF_PHY, DZM_PHY, MXF_PHY, MYF_PHY, MZF_PHY, MZM_PHY
 USE YOMHOOK,    ONLY: LHOOK, DR_HOOK
 !
 USE MODD_CST,              ONLY: CST_t
diff --git a/src/common/turb/shallow_mf.F90 b/src/common/turb/shallow_mf.F90
index 898883076890bc04c938b2339d1c956b653fff5c..0c6b142cb6105005ead056cbbb24dc130de77087 100644
--- a/src/common/turb/shallow_mf.F90
+++ b/src/common/turb/shallow_mf.F90
@@ -73,7 +73,7 @@
 !          ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY, ONLY: MXM_PHY, MYM_PHY
+USE MODE_SHUMAN_PHY, ONLY: MXM_PHY, MYM_PHY
 USE YOMHOOK,    ONLY: LHOOK, DR_HOOK
 !
 USE MODD_BUDGET,          ONLY: TBUDGETCONF_t, TBUDGETDATA, NBUDGET_U,  NBUDGET_V, &
diff --git a/src/common/turb/turb.F90 b/src/common/turb/turb.F90
index 58e0ba1847373e468597bdfa8ed1590f97281dc0..2342495d4eb151c0b8cae46a659c19ed2d9103e0 100644
--- a/src/common/turb/turb.F90
+++ b/src/common/turb/turb.F90
@@ -240,7 +240,7 @@
 !          ------------
 !
 USE PARKIND1,   ONLY: JPRB
-USE SHUMAN_PHY, ONLY: MZF_PHY,MXF_PHY,MYF_PHY
+USE MODE_SHUMAN_PHY, ONLY: MZF_PHY,MXF_PHY,MYF_PHY
 USE YOMHOOK ,   ONLY: LHOOK, DR_HOOK
 !
 USE MODD_BUDGET,     ONLY:  NBUDGET_U,  NBUDGET_V,  NBUDGET_W,  NBUDGET_TH, NBUDGET_RV, NBUDGET_RC,  &
diff --git a/src/mesonh/aux/shuman_phy.f90 b/src/mesonh/aux/shuman_phy.f90
index 98ab1fd072d37acd923bc6c7a417c848c9934999..e3e493afe37c2a8414312116367dfad2c3c0bbc1 100644
--- a/src/mesonh/aux/shuman_phy.f90
+++ b/src/mesonh/aux/shuman_phy.f90
@@ -1,4 +1,4 @@
-MODULE SHUMAN_PHY
+MODULE MODE_SHUMAN_PHY
 IMPLICIT NONE
 CONTAINS
 !     ###############################
@@ -1605,4 +1605,4 @@ END DO
 !
 END SUBROUTINE DYF_PHY
 !
-END MODULE SHUMAN_PHY
+END MODULE MODE_SHUMAN_PHY