diff --git a/src/MNH/aircraft_balloon.f90 b/src/MNH/aircraft_balloon.f90
index 3ee7836b22949de9e67e9c47a8945aab135dd977..153d76fe61b3174ea15d8e7546a8acf6cc4ddc74 100644
--- a/src/MNH/aircraft_balloon.f90
+++ b/src/MNH/aircraft_balloon.f90
@@ -359,11 +359,11 @@ character(len=:), allocatable :: ytype
 if ( Trim( TPFLYER%TYPE ) == 'AIRCRA' ) then
   ytype = 'Aircrafts'
 else if ( Trim( TPFLYER%TYPE ) == 'RADIOS' ) then
-  ytype = 'Radiosonde balloons'
+  ytype = 'Radiosonde_balloons'
 else if ( Trim( TPFLYER%TYPE ) == 'ISODEN' ) then
-  ytype = 'Iso-density balloons'
+  ytype = 'Isodensity_balloons'
 else if ( Trim( TPFLYER%TYPE ) == 'CVBALL' ) then
-  ytype = 'Constant volume balloons'
+  ytype = 'Constant_volume_balloons'
 else
   call Print_msg( NVERB_ERROR, 'GEN', 'AIRCRAFT_BALLOON_LONGTYPE_GET', 'unknown category for flyer ' // Trim( tpflyer%title ) )
   ytype = 'Unknown'
diff --git a/src/MNH/mode_les_diachro.f90 b/src/MNH/mode_les_diachro.f90
index 4a46449ecd24b3f154af5632c534635868da7045..89496d62baa3f4ba68fa92c3e41cba9c5138f525 100644
--- a/src/MNH/mode_les_diachro.f90
+++ b/src/MNH/mode_les_diachro.f90
@@ -1050,7 +1050,7 @@ if ( iresp == 0 .and. any( zfield /= XUNDEF ) ) then
   tzfields(:)%ccomment  = ycomment(:)
 
   tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-  tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES budgets'
+  tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES_budgets'
   tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different LES budgets'
 
   tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -1067,10 +1067,10 @@ if ( iresp == 0 .and. any( zfield /= XUNDEF ) ) then
 
   tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .true.
   if ( oavg ) then
-    tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Time averaged'
+    tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Time_averaged'
     tzbudiachro%ccomments(NLVL_TIMEAVG)   = 'Values are time averaged'
   else
-    tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Not time averaged'
+    tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Not_time_averaged'
     tzbudiachro%ccomments(NLVL_TIMEAVG)   = 'Values are not time averaged'
   end if
 
@@ -1080,7 +1080,7 @@ if ( iresp == 0 .and. any( zfield /= XUNDEF ) ) then
     !Type of normalization is stored in the attribute "normalization" in Write_diachro
     tzbudiachro%ccomments(NLVL_NORM)      = 'Values are normalized'
   else
-    tzbudiachro%clevels  (NLVL_NORM)      = 'Not normalized'
+    tzbudiachro%clevels  (NLVL_NORM)      = 'Not_normalized'
     tzbudiachro%ccomments(NLVL_NORM)      = 'Values are not normalized'
   end if
 
@@ -1289,7 +1289,7 @@ if ( gavg ) then
 end if
 
 tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES budgets'
+tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES_budgets'
 tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different LES budgets'
 
 tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -1301,20 +1301,20 @@ tzbudiachro%clevels  (NLVL_GROUP)       = ''
 tzbudiachro%ccomments(NLVL_GROUP)       = ''
 
 tzbudiachro%lleveluse(NLVL_SHAPE)       = .true.
-tzbudiachro%clevels  (NLVL_SHAPE)       = 'Two-point correlation'
+tzbudiachro%clevels  (NLVL_SHAPE)       = 'Two_point_correlation'
 tzbudiachro%ccomments(NLVL_SHAPE)       = ''
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .true.
 if ( gavg ) then
-  tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Time averaged'
+  tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Time_averaged'
   tzbudiachro%ccomments(NLVL_TIMEAVG)   = 'Values are time averaged'
 else
-  tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Not time averaged'
+  tzbudiachro%clevels  (NLVL_TIMEAVG)   = 'Not_time_averaged'
   tzbudiachro%ccomments(NLVL_TIMEAVG)   = 'Values are not time averaged'
 end if
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .true.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .false.
@@ -1480,7 +1480,7 @@ tzfield%clongname = ygroup
 tzfield%ccomment  = ycomment(:)
 
 tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES budgets'
+tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES_budgets'
 tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different LES budgets'
 
 tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -1496,11 +1496,11 @@ tzbudiachro%clevels  (NLVL_SHAPE)       = 'Spectrum'
 tzbudiachro%ccomments(NLVL_SHAPE)       = ''
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .true.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .true.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .false.
@@ -1542,7 +1542,7 @@ do ji = 1, NMNHMAXDIMS
 end do
 
 tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES budgets'
+tzbudiachro%clevels  (NLVL_CATEGORY)    = 'LES_budgets'
 tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different LES budgets'
 
 tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -1558,11 +1558,11 @@ tzbudiachro%clevels  (NLVL_SHAPE)       = 'Spectrum'
 tzbudiachro%ccomments(NLVL_SHAPE)       = ''
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .true.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .true.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .false.
diff --git a/src/MNH/write_aircraft_balloon.f90 b/src/MNH/write_aircraft_balloon.f90
index e103f1b5b50c989bc32dcd141f402b2fe8cfa958..afa5d56114652c4c2e204caf81a39b70f46c8e4d 100644
--- a/src/MNH/write_aircraft_balloon.f90
+++ b/src/MNH/write_aircraft_balloon.f90
@@ -935,15 +935,15 @@ tzbudiachro%clevels  (NLVL_GROUP)       = Trim( ygroupz )
 tzbudiachro%ccomments(NLVL_GROUP)       = 'Values for flyer ' // Trim( tpflyer%title )
 
 tzbudiachro%lleveluse(NLVL_SHAPE)       = .true.
-tzbudiachro%clevels  (NLVL_SHAPE)       = 'Vertical profile'
+tzbudiachro%clevels  (NLVL_SHAPE)       = 'Vertical_profile'
 tzbudiachro%ccomments(NLVL_SHAPE)       = 'Vertical profiles at position of flyer ' // Trim( tpflyer%title )
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .false.
diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90
index 7acbbb37c80c1b6ac05b6461993600c80e6cedf4..767541ad935a58606ffd9de97aaddc47c1fe836c 100644
--- a/src/MNH/write_budget.f90
+++ b/src/MNH/write_budget.f90
@@ -560,11 +560,11 @@ subroutine Store_one_budget_rho( tpdiafile, tpdates, tprhodj, knocompress, prhod
   end if
 
   tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-  tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Time averaged'
+  tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Time_averaged'
   tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are time averaged'
 
   tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-  tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+  tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
   tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
   tzbudiachro%lleveluse(NLVL_MASK)        = .false.
@@ -805,11 +805,11 @@ subroutine Store_one_budget( tpdiafile, tpdates, tpbudget, prhodjn, knocompress,
   end if
 
   tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-  tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Time averaged'
+  tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Time_averaged'
   tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are time averaged'
 
   tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-  tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+  tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
   tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
   tzbudiachro%lleveluse(NLVL_MASK)        = .false.
diff --git a/src/MNH/write_diachro.f90 b/src/MNH/write_diachro.f90
index 3cccf5f833182f4cd6396d0ee8a68b03d1043716..cfb648886b09bc7999acbc1cecb7467442c568e0 100644
--- a/src/MNH/write_diachro.f90
+++ b/src/MNH/write_diachro.f90
@@ -261,11 +261,11 @@ end if
 
 !For backward compatibility
 if (       Trim( tpbudiachro%clevels(NLVL_CATEGORY) ) == 'Flyers'           &
-     .and. Trim( tpbudiachro%clevels(NLVL_SHAPE) )    == 'Vertical profile' ) then
+     .and. Trim( tpbudiachro%clevels(NLVL_SHAPE) )    == 'Vertical_profile' ) then
   ygroup = Trim( ygroup ) // 'Z'
 end if
 
-if (       Trim( tpbudiachro%clevels(NLVL_CATEGORY) ) == 'LES budgets' &
+if (       Trim( tpbudiachro%clevels(NLVL_CATEGORY) ) == 'LES_budgets' &
      .and. Trim( tpbudiachro%clevels(NLVL_SHAPE) )    == 'Cartesian'   ) then
   if ( tpbudiachro%ltcompress ) then
     if ( tpbudiachro%lnorm ) then
@@ -284,7 +284,7 @@ if (       Trim( tpbudiachro%clevels(NLVL_CATEGORY) ) == 'LES budgets' &
   if ( Len_trim( ygroup )  > 10 ) ygroup = ygroup(1:10)
 end if
 
-if (       Trim( tpbudiachro%clevels(NLVL_CATEGORY) ) == 'LES budgets' &
+if (       Trim( tpbudiachro%clevels(NLVL_CATEGORY) ) == 'LES_budgets' &
      .and. Trim( tpbudiachro%clevels(NLVL_SHAPE) )    == 'Spectrum'    ) then
   if ( tpbudiachro%ltcompress ) then
     ygroup = 'T_' // Trim( ygroup )
@@ -300,7 +300,7 @@ if ( ycategory == 'Budgets' ) then
   else
     ytype = 'MASK'
   end if
-else if ( ycategory == 'LES budgets' ) then
+else if ( ycategory == 'LES_budgets' ) then
   if ( yshape == 'Cartesian' ) then
     ytype = 'SSOL'
   else
@@ -351,7 +351,7 @@ IF ( PRESENT( tpflyer ) ) THEN
   IKTRAJX = 1
   ITTRAJX = SIZE( tpflyer%x )
   INTRAJX = 1
-ELSE IF ( ycategory == 'LES budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
+ELSE IF ( ycategory == 'LES_budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
   IKTRAJX = 1
   ITTRAJX = 1
   INTRAJX = IN
@@ -360,7 +360,7 @@ IF ( PRESENT( tpflyer ) ) THEN
   IKTRAJY = 1
   ITTRAJY = SIZE( tpflyer%y )
   INTRAJY = 1
-ELSE IF ( ycategory == 'LES budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
+ELSE IF ( ycategory == 'LES_budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
   IKTRAJY = 1
   ITTRAJY = 1
   INTRAJY = IN
@@ -369,7 +369,7 @@ IF ( PRESENT( tpflyer ) ) THEN
   IKTRAJZ = 1
   ITTRAJZ = SIZE( tpflyer%z )
   INTRAJZ = 1
-ELSE IF ( ycategory == 'LES budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
+ELSE IF ( ycategory == 'LES_budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
   IKTRAJZ = IK
   ITTRAJZ = 1
   INTRAJZ = IN
@@ -632,7 +632,7 @@ IF(PRESENT(tpflyer))THEN
   TZFIELD%NDIMS      = 3
   TZFIELD%LTIMEDEP   = .FALSE.
   CALL IO_Field_write(tzfile,TZFIELD, Reshape( tpflyer%x, [1, Size( tpflyer%x), 1] ) )
-ELSE IF ( ycategory == 'LES budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
+ELSE IF ( ycategory == 'LES_budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
   TZFIELD%CMNHNAME   = TRIM(ygroup)//'.TRAJX'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = TRIM(ygroup)//'.TRAJX'
@@ -663,7 +663,7 @@ IF(PRESENT(tpflyer))THEN
   TZFIELD%NDIMS      = 3
   TZFIELD%LTIMEDEP   = .FALSE.
   CALL IO_Field_write(tzfile,TZFIELD, Reshape( tpflyer%y, [1, Size( tpflyer%y), 1] ) )
-ELSE IF ( ycategory == 'LES budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
+ELSE IF ( ycategory == 'LES_budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
   TZFIELD%CMNHNAME   = TRIM(ygroup)//'.TRAJY'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = TRIM(ygroup)//'.TRAJY'
@@ -694,7 +694,7 @@ IF(PRESENT(tpflyer))THEN
   TZFIELD%NDIMS      = 3
   TZFIELD%LTIMEDEP   = .FALSE.
   CALL IO_Field_write(tzfile,TZFIELD, Reshape( tpflyer%z, [1, Size( tpflyer%z), 1] ) )
-ELSE IF ( ycategory == 'LES budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
+ELSE IF ( ycategory == 'LES_budgets' .and.  tpbudiachro%clevels(NLVL_SHAPE) == 'Cartesian' ) THEN
   TZFIELD%CMNHNAME   = TRIM(ygroup)//'.TRAJZ'
   TZFIELD%CSTDNAME   = ''
   TZFIELD%CLONGNAME  = TRIM(ygroup)//'.TRAJZ'
@@ -869,8 +869,8 @@ MASTER: if ( isp == tzfile%nmaster_rank) then
     if ( tpbudiachro%lleveluse(NLVL_CATEGORY) .and. Len_trim( tpbudiachro%ccomments(NLVL_CATEGORY) ) > 0 ) &
     call Att_write( ylevelname, ilevelid, 'comment',  tpbudiachro%ccomments(NLVL_CATEGORY) )
 
-    if ( ycategory == 'LES budgets' ) &
-    call Att_write( ylevelname, ilevelid, 'temporal sampling frequency', xles_temp_sampling )
+    if ( ycategory == 'LES_budgets' ) &
+    call Att_write( ylevelname, ilevelid, 'temporal_sampling_frequency', xles_temp_sampling )
   end if
 
   if ( .not. gleveldefined(NLVL_SUBCATEGORY) ) then
@@ -902,37 +902,37 @@ MASTER: if ( isp == tzfile%nmaster_rank) then
     call Att_write( ylevelname, ilevelid, 'moving', Merge( 'yes', 'no ', tpbudiachro%lmobile ) )
 
     if (      ( ycategory == 'Budgets' .and. yshape == 'Cartesian' )             &
-         .or. ycategory == 'LES budgets'                                         &
+         .or. ycategory == 'LES_budgets'                                         &
          .or. tpbudiachro%clevels(NLVL_GROUP)      == 'TSERIES'                  &
          .or. tpbudiachro%clevels(NLVL_GROUP)      == 'ZTSERIES'                 &
          .or. tpbudiachro%clevels(NLVL_GROUP)(1:8) == 'XTSERIES'                 ) then
-      call Att_write( ylevelname, ilevelid, 'min I index in physical domain', iil )
-      call Att_write( ylevelname, ilevelid, 'max I index in physical domain', iih )
-      call Att_write( ylevelname, ilevelid, 'min J index in physical domain', ijl )
-      call Att_write( ylevelname, ilevelid, 'max J index in physical domain', ijh )
+      call Att_write( ylevelname, ilevelid, 'min_I_index_in_physical_domain', iil )
+      call Att_write( ylevelname, ilevelid, 'max_I_index_in_physical_domain', iih )
+      call Att_write( ylevelname, ilevelid, 'min_J_index_in_physical_domain', ijl )
+      call Att_write( ylevelname, ilevelid, 'max_J_index_in_physical_domain', ijh )
     end if
 
     if (      ( ycategory == 'Budgets' .and. yshape == 'Cartesian' )           &
          .or. tpbudiachro%clevels(NLVL_GROUP)      == 'TSERIES'                &
          .or. tpbudiachro%clevels(NLVL_GROUP)      == 'ZTSERIES'               &
          .or. tpbudiachro%clevels(NLVL_GROUP)(1:8) == 'XTSERIES'               ) then
-      !Disabled for LES budgets because no real meaning on that case (vertical levels are stored in the level_les variable)
-      call Att_write( ylevelname, ilevelid, 'min K index in physical domain', ikl )
-      call Att_write( ylevelname, ilevelid, 'max K index in physical domain', ikh )
+      !Disabled for LES_budgets because no real meaning on that case (vertical levels are stored in the level_les variable)
+      call Att_write( ylevelname, ilevelid, 'min_K_index_in_physical_domain', ikl )
+      call Att_write( ylevelname, ilevelid, 'max_K_index_in_physical_domain', ikh )
     end if
 
 
     if (      ( ycategory == 'Budgets' .and. yshape == 'Cartesian' )           &
-         .or. ( ycategory == 'LES budgets'    .and. yshape == 'Cartesian' )    &
+         .or. ( ycategory == 'LES_budgets'    .and. yshape == 'Cartesian' )    &
          .or. tpbudiachro%clevels(NLVL_GROUP)      == 'TSERIES'                &
          .or. tpbudiachro%clevels(NLVL_GROUP)      == 'ZTSERIES'               &
          .or. tpbudiachro%clevels(NLVL_GROUP)(1:8) == 'XTSERIES'               ) then
       call Att_write( ylevelname, ilevelid, &
-                      'averaged in the I direction', Merge( 'yes', 'no ', tpbudiachro%licompress ) )
+                      'averaged_in_the_I_direction', Merge( 'yes', 'no ', tpbudiachro%licompress ) )
       call Att_write( ylevelname, ilevelid, &
-                      'averaged in the J direction', Merge( 'yes', 'no ', tpbudiachro%ljcompress ) )
+                      'averaged_in_the_J_direction', Merge( 'yes', 'no ', tpbudiachro%ljcompress ) )
       call Att_write( ylevelname, ilevelid, &
-                      'averaged in the K direction', Merge( 'yes', 'no ', tpbudiachro%lkcompress ) )
+                      'averaged_in_the_K_direction', Merge( 'yes', 'no ', tpbudiachro%lkcompress ) )
     end if
   end if
 
@@ -943,7 +943,7 @@ MASTER: if ( isp == tzfile%nmaster_rank) then
     if ( tpbudiachro%lleveluse(NLVL_TIMEAVG) .and. Len_trim( tpbudiachro%ccomments(NLVL_TIMEAVG) ) > 0 ) &
     call Att_write( ylevelname, ilevelid, 'comment',        tpbudiachro%ccomments(NLVL_TIMEAVG) )
 
-    call Att_write( ylevelname, ilevelid, 'time averaged', Merge( 'yes', 'no ', tpbudiachro%ltcompress ) )
+    call Att_write( ylevelname, ilevelid, 'time_averaged', Merge( 'yes', 'no ', tpbudiachro%ltcompress ) )
   end if
 
   if ( .not. gleveldefined(NLVL_NORM) ) then
@@ -955,18 +955,18 @@ MASTER: if ( isp == tzfile%nmaster_rank) then
 
     call Att_write( ylevelname, ilevelid, 'normalized', Merge( 'yes', 'no ', tpbudiachro%lnorm ) )
 
-    if ( ycategory == 'LES budgets' .and. yshape == 'Cartesian' ) then
+    if ( ycategory == 'LES_budgets' .and. yshape == 'Cartesian' ) then
       if ( tpbudiachro%lnorm ) then
         if ( cles_norm_type == 'NONE' ) then
           call Att_write( ylevelname, ilevelid, 'normalization', 'none' )
         else if ( cles_norm_type == 'CONV' ) then
           call Att_write( ylevelname, ilevelid, 'normalization', 'convective' )
           ! cbl_height_def determines how the boundary layer height is computed, which is used in this normalization
-          call Att_write( ylevelname, ilevelid, 'definition of boundary layer height', cbl_height_def )
+          call Att_write( ylevelname, ilevelid, 'definition_of_boundary_layer_height', cbl_height_def )
         else if ( cles_norm_type == 'EKMA' ) then
           call Att_write( ylevelname, ilevelid, 'normalization', 'Ekman' )
           ! cbl_height_def determines how the boundary layer height is computed, which is used in this normalization
-          call Att_write( ylevelname, ilevelid, 'definition of boundary layer height', cbl_height_def )
+          call Att_write( ylevelname, ilevelid, 'definition_of_boundary_layer_height', cbl_height_def )
         else if ( cles_norm_type == 'MOBU' ) then
           call Att_write( ylevelname, ilevelid, 'normalization', 'Monin-Obukhov' )
         else
@@ -989,7 +989,7 @@ MASTER: if ( isp == tzfile%nmaster_rank) then
     call Att_write( ylevelname, ilevelid, 'comment', tpbudiachro%ccomments(NLVL_MASK) )
 
     if ( ycategory == 'Budgets' .and. yshape == 'Mask' ) &
-    call Att_write( ylevelname, ilevelid, 'masks are stored in variable', tpbudiachro%clevels(NLVL_MASK) )
+    call Att_write( ylevelname, ilevelid, 'masks_are_stored_in_variable', tpbudiachro%clevels(NLVL_MASK) )
   end if
 
 end if MASTER
diff --git a/src/MNH/write_profilern.f90 b/src/MNH/write_profilern.f90
index cb341f90cf0f56534682be6057df6adeee58d369..da881113ce3a4ddab6f0904deef266114b15edab 100644
--- a/src/MNH/write_profilern.f90
+++ b/src/MNH/write_profilern.f90
@@ -664,15 +664,15 @@ tzbudiachro%clevels  (NLVL_GROUP)       = ygroup
 tzbudiachro%ccomments(NLVL_GROUP)       = 'Vertical profiles at position of profiler ' // Trim( ygroup )
 
 tzbudiachro%lleveluse(NLVL_SHAPE)       = .false.
-tzbudiachro%clevels  (NLVL_SHAPE)       = 'Vertical profile'
+tzbudiachro%clevels  (NLVL_SHAPE)       = 'Vertical_profile'
 tzbudiachro%ccomments(NLVL_SHAPE)       = ''
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .false.
diff --git a/src/MNH/write_seriesn.f90 b/src/MNH/write_seriesn.f90
index 153b7a4e0ecc60a6dc4f69012a564edcc5cd44cb..a1e425f39842f5fb842e9b524db845929f6549e2 100644
--- a/src/MNH/write_seriesn.f90
+++ b/src/MNH/write_seriesn.f90
@@ -263,7 +263,7 @@ tzfields(:)%ndimlist(5) = NMNHDIM_UNUSED
 tzfields(:)%ndimlist(6) = NMNHDIM_UNUSED !Set to unused because write are done in a loop (1 write per "process")
 
 tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-tzbudiachro%clevels  (NLVL_CATEGORY)    = 'Time series'
+tzbudiachro%clevels  (NLVL_CATEGORY)    = 'Time_series'
 tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different time series'
 
 tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -279,11 +279,11 @@ tzbudiachro%clevels  (NLVL_SHAPE)       = 'Cartesian' !It is based on a cartesia
 tzbudiachro%ccomments(NLVL_SHAPE)       = 'Cartesian domain'
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .true.
@@ -391,7 +391,7 @@ tzfields(:)%ndimlist(5) = NMNHDIM_UNUSED
 tzfields(:)%ndimlist(6) = NMNHDIM_UNUSED !Set to unused because write are done in a loop (1 write per "process")
 
 tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-tzbudiachro%clevels  (NLVL_CATEGORY)    = 'Time series'
+tzbudiachro%clevels  (NLVL_CATEGORY)    = 'Time_series'
 tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different time series'
 
 tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -407,11 +407,11 @@ tzbudiachro%clevels  (NLVL_SHAPE)       = 'Cartesian' !It is based on a cartesia
 tzbudiachro%ccomments(NLVL_SHAPE)       = 'Cartesian domain'
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .true.
@@ -521,7 +521,7 @@ DO JS=1,NBJSLICE
   tzfields(:)%ndimlist(6) = NMNHDIM_SERIES_PROC
 
   tzbudiachro%lleveluse(NLVL_CATEGORY)    = .true.
-  tzbudiachro%clevels  (NLVL_CATEGORY)    = 'Time series'
+  tzbudiachro%clevels  (NLVL_CATEGORY)    = 'Time_series'
   tzbudiachro%ccomments(NLVL_CATEGORY)    = 'Level for the different time series'
 
   tzbudiachro%lleveluse(NLVL_SUBCATEGORY) = .false.
@@ -538,11 +538,11 @@ DO JS=1,NBJSLICE
   tzbudiachro%ccomments(NLVL_SHAPE)       = 'Cartesian domain'
 
   tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-  tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+  tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
   tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
   tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-  tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+  tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
   tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
   tzbudiachro%lleveluse(NLVL_MASK)        = .false.
diff --git a/src/MNH/write_stationn.f90 b/src/MNH/write_stationn.f90
index b89b12c2152686284b3620e830fa745b9137c9bf..1254fa13337a42e1e6532aeaa91f66c2f0ca1511 100644
--- a/src/MNH/write_stationn.f90
+++ b/src/MNH/write_stationn.f90
@@ -753,11 +753,11 @@ tzbudiachro%clevels  (NLVL_SHAPE)       = 'Point'
 tzbudiachro%ccomments(NLVL_SHAPE)       = 'Values at position of station ' // Trim( ygroup )
 
 tzbudiachro%lleveluse(NLVL_TIMEAVG)     = .false.
-tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not time averaged'
+tzbudiachro%clevels  (NLVL_TIMEAVG)     = 'Not_time_averaged'
 tzbudiachro%ccomments(NLVL_TIMEAVG)     = 'Values are not time averaged'
 
 tzbudiachro%lleveluse(NLVL_NORM)        = .false.
-tzbudiachro%clevels  (NLVL_NORM)        = 'Not normalized'
+tzbudiachro%clevels  (NLVL_NORM)        = 'Not_normalized'
 tzbudiachro%ccomments(NLVL_NORM)        = 'Values are not normalized'
 
 tzbudiachro%lleveluse(NLVL_MASK)        = .false.