diff --git a/src/MNH/advec_weno_k_2_aux.f90 b/src/MNH/advec_weno_k_2_aux.f90
index d51520c40526b99efcb85bd1727014cf6a873a9c..cb225c6f87c3e02b975869b862dd4c44051aab6e 100644
--- a/src/MNH/advec_weno_k_2_aux.f90
+++ b/src/MNH/advec_weno_k_2_aux.f90
@@ -607,10 +607,10 @@ PR = PR * PRUCT
 !$acc end kernels
 !
 #ifndef MNH_OPENACC
-CALL GET_HALO(PR)
+CALL GET_HALO( PR, HNAME = 'ADVEC_WENO_K_2_UX::PR' )
 #else
 !!$!$acc update self(PR)
-CALL GET_HALO_D(PR)
+CALL GET_HALO_D( PR, HNAME = 'ADVEC_WENO_K_2_UX::PR' )
 !!$!$acc update device(PR)
 #endif
 !
@@ -999,14 +999,14 @@ ELSE CYCL ! HLBCX(1) == ('OPEN','WALL','NEST')
 !
 END IF CYCL
 !
-PR = PR * PRUCT
+PR(:,:,:) = PR(:,:,:) * PRUCT(:,:,:)
 !$acc end kernels
 !
 #ifndef MNH_OPENACC
-CALL GET_HALO(PR)
+CALL GET_HALO( PR, HNAME = 'ADVEC_WENO_K_2_MX::PR' )
 #else
 !!$!$acc update self(PR)
-CALL GET_HALO_D(PR)
+CALL GET_HALO_D( PR, HNAME = 'ADVEC_WENO_K_2_MX::PR' )
 !!$!$acc update device(PR)
 #endif
 !
@@ -1398,10 +1398,10 @@ PR = PR * PRVCT
 !$acc end kernels
 !
 #ifndef MNH_OPENACC
-CALL GET_HALO(PR)
+CALL GET_HALO( PR, HNAME = 'ADVEC_WENO_K_2_MY::PR' )
 #else
 !!$!$acc update self(PR)
-CALL GET_HALO_D(PR)
+CALL GET_HALO_D( PR, HNAME = 'ADVEC_WENO_K_2_MY::PR' )
 !!$!$acc update device(PR)
 #endif
 !
@@ -1786,10 +1786,10 @@ PR = PR * PRVCT
 !$acc end kernels
 !
 #ifndef MNH_OPENACC
-CALL GET_HALO(PR)
+CALL GET_HALO( PR, HNAME = 'ADVEC_WENO_K_2_VY::PR' )
 #else
 !!$!$acc update self(PR)
-CALL GET_HALO_D(PR)
+CALL GET_HALO_D( PR, HNAME = 'ADVEC_WENO_K_2_VY::PR' )
 !!$!$acc update device(PR)
 #endif
 !
@@ -1987,10 +1987,10 @@ PR = PR * PRWCT
 !$acc end kernels
 !
 #ifndef MNH_OPENACC
-CALL GET_HALO(PR)
+CALL GET_HALO( PR, HNAME = 'WENO_K_2_WZ::PR' )
 #else
 !!$!$acc update self(PR)
-CALL GET_HALO_D(PR)
+CALL GET_HALO_D( PR, HNAME = 'WENO_K_2_WZ::PR' )
 !!$!$acc update device(PR)
 #endif
 !
@@ -2190,10 +2190,10 @@ PR = PR * PRWCT
 !$acc end kernels
 !
 #ifndef MNH_OPENACC
-CALL GET_HALO(PR)
+CALL GET_HALO( PR, HNAME = 'WENO_K_2_MZ::PR' )
 #else
 !!$!$acc update self(PR)
-CALL GET_HALO_D(PR)
+CALL GET_HALO_D( PR, HNAME = 'WENO_K_2_MZ::PR' )
 !!$!$acc update device(PR)
 #endif
 !
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index 6aa9852404122334f2335a53165bcc230eb85d36..75646e064425c095cf71fd77622230c28124dfe8 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -1032,7 +1032,7 @@ DO JSPL=1,KSPLIT
 #ifndef MNH_OPENACC   
    NULLIFY(TZFIELDS1_ll)
 !!$   IF(NHALO == 1) THEN
-    CALL ADD3DFIELD_ll( TZFIELDS1_ll, ZTH, 'ZTH' )
+    CALL ADD3DFIELD_ll( TZFIELDS1_ll, ZTH, 'ADVECTION_METSV::ZTH' )
     IF (GTKE)        CALL ADD3DFIELD_ll( TZFIELDS1_ll, ZTKE,                        'ADVECTION_METSV::ZTKE' )
     IF ( KRR>0 )     CALL ADD4DFIELD_ll( TZFIELDS1_ll, ZR (:,:,:,1:KRR),            'ADVECTION_METSV::ZR'    )
     IF ( KSV>0 )     CALL ADD4DFIELD_ll( TZFIELDS1_ll, ZSV(:,:,:,1:KSV),            'ADVECTION_METSV::ZSV'   )
@@ -1041,17 +1041,20 @@ DO JSPL=1,KSPLIT
     CALL CLEANLIST_ll(TZFIELDS1_ll)
 !!$   END IF
 #else
-    CALL GET_HALO_D(ZTH,HNAME='ZTH')
+    CALL GET_HALO_D(ZTH,HNAME='ADVECTION_METSV::ZTH')
     IF (GTKE) CALL GET_HALO_D(ZTKE,HNAME='ADVECTION_METSV::ZTKE')
     DO JR=1,KRR
-       CALL GET_HALO_D(ZR(:,:,:,JR),HNAME='ADVECTION_METSV::ZR')
+        WRITE(YNUM, '( I3.3 )' ) JR
+       CALL GET_HALO_D(ZR(:,:,:,JR),HNAME='ADVECTION_METSV::ZR:'//YNUM)
     END DO
     DO JSV = 1, KSV
-       CALL GET_HALO_D(ZSV(:,:,:,JSV),HNAME='ADVECTION_METSV::ZSV')
+        WRITE(YNUM, '( I3.3 )' ) JSV
+       CALL GET_HALO_D(ZSV(:,:,:,JSV),HNAME='ADVECTION_METSV::ZSV:'//YNUM)
     END DO
     IF ( LBLOWSNOW ) THEN
       DO JSV = 1,NBLOWSNOW_2D
-        CALL GET_HALO_D(ZSNWC(:,:,:,JSV),HNAME='ADVECTION_METSV::ZSNWC')
+        WRITE(YNUM, '( I3.3 )' ) JSV
+        CALL GET_HALO_D(ZSNWC(:,:,:,JSV),HNAME='ADVECTION_METSV::ZSNWC:'//YNUM)
       END DO
     END IF
 #endif
diff --git a/src/MNH/advection_uvw.f90 b/src/MNH/advection_uvw.f90
index 55069401400eeca413c3a215d71aba3a2bd74791..fb31df5b4e2acd983b6e083b3987cadd2d5d0ff0 100644
--- a/src/MNH/advection_uvw.f90
+++ b/src/MNH/advection_uvw.f90
@@ -334,9 +334,9 @@ CALL CONTRAV_DEVICE (HLBCX,HLBCY,ZRUT,ZRVT,ZRWT,PDXX,PDYY,PDZZ,PDZX,PDZY,ZRUCT,Z
 #ifndef MNH_OPENACC
   NULLIFY(TZFIELDS_ll)
 !!$IF(NHALO == 1) THEN
-  CALL ADD3DFIELD_ll( TZFIELDS_ll, ZRWCT, 'ADVECTION_UVW::ZRWCT' )
   CALL ADD3DFIELD_ll( TZFIELDS_ll, ZRUCT, 'ADVECTION_UVW::ZRUCT' )
   CALL ADD3DFIELD_ll( TZFIELDS_ll, ZRVCT, 'ADVECTION_UVW::ZRVCT' )
+  CALL ADD3DFIELD_ll( TZFIELDS_ll, ZRWCT, 'ADVECTION_UVW::ZRWCT' )
   CALL UPDATE_HALO_ll(TZFIELDS_ll,IINFO_ll)
   CALL CLEANLIST_ll(TZFIELDS_ll)
 !!$END IF
diff --git a/src/MNH/gravity.f90 b/src/MNH/gravity.f90
index 9ca8f1c82b9c4283f0ee0f1e98bc47ef7ef414c5..d54c94db62bf3fa9011ea7a20f3d43fbd41ca35f 100644
--- a/src/MNH/gravity.f90
+++ b/src/MNH/gravity.f90
@@ -209,10 +209,11 @@ ELSE
       ZWORK1(:,:,:) = 1.
 !$acc end kernels
       DO JWATER = 1, 1 + KRRL + KRRI
+        WRITE( YNUM, '( I3.3 )' ) JWATER
 #ifndef MNH_OPENACC
-        CALL GET_HALO(PRT(:,:,:,JWATER))
+        CALL GET_HALO(PRT(:,:,:,JWATER), HNAME = 'GRAVITY::PRT'//YNUM )
 #else
-        CALL GET_HALO_D(PRT(:,:,:,JWATER))
+        CALL GET_HALO_D(PRT(:,:,:,JWATER), HNAME = 'GRAVITY::PRT'//YNUM )
 #endif
 !$acc kernels
         !dir$ concurrent
@@ -223,9 +224,9 @@ ELSE
 !   compute the virtual potential temperature when water is present in any form
 !
 #ifndef MNH_OPENACC
-      CALL GET_HALO(PTHT)
+      CALL GET_HALO(PTHT, HNAME = 'GRAVITY::PTHT' )
 #else
-      CALL GET_HALO_D(PTHT)
+      CALL GET_HALO_D(PTHT, HNAME = 'GRAVITY::PTHT' )
 #endif
 !
 !$acc kernels
diff --git a/src/MNH/tke_eps_sources.f90 b/src/MNH/tke_eps_sources.f90
index 33f1de21130a0768c334059c2c5e1cefc9691454..de317a7a1f8c87ad49ab5b11343259e54b97d76b 100644
--- a/src/MNH/tke_eps_sources.f90
+++ b/src/MNH/tke_eps_sources.f90
@@ -435,7 +435,7 @@ ZA(:,:,:)     = - PTSTEP * XCET * ZTMP1_DEVICE(:,:,:) * ZTMP2_DEVICE(:,:,:) / PD
 #ifndef MNH_OPENACC
 CALL TRIDIAG_TKE(KKA,KKU,KKL,PTKEM,ZA,PTSTEP,PEXPL,PIMPL,PRHODJ,&
             & ZSOURCE,PTSTEP*ZFLX,ZRES)
-CALL GET_HALO(ZRES)
+CALL GET_HALO( ZRES, HNAME = 'ZRES' )
 #else
 !$acc kernels
 !$mnh_do_concurrent ( JI=1:JIU,JJ=1:JJU,JK=1:JKU)
@@ -445,7 +445,7 @@ CALL GET_HALO(ZRES)
 CALL TRIDIAG_TKE(KKA,KKU,KKL,PTKEM,ZA,PTSTEP,PEXPL,PIMPL,PRHODJ,&
             & ZSOURCE,ZTMP3_DEVICE,ZRES)
 ! acc update self(ZRES)
-CALL GET_HALO_D(ZRES)
+CALL GET_HALO_D( ZRES, HNAME = 'ZRES' )
 ! acc update device(ZRES)
 #endif
 !