diff --git a/scripts/exglobal_fcst_nemsfv3gfs.sh b/scripts/exglobal_fcst_nemsfv3gfs.sh
index 9e38e9bd223..dd030a30f77 100755
--- a/scripts/exglobal_fcst_nemsfv3gfs.sh
+++ b/scripts/exglobal_fcst_nemsfv3gfs.sh
@@ -281,7 +281,7 @@ if [ $warm_start = ".true." -o $RERUN = "YES" ]; then
       file2=$(echo $(basename $file))
       file2=$(echo $file2 | cut -d. -f3-) 
       testchar=$(echo $file2 | cut -c1-8) 
-      if [ $testchar = "gefswave" ]; then
+      if [ $testchar = "gefs.wave" ]; then
           file2=$(echo $file2 | cut -d. -f2-) 
           $NLN $file $DATA/$file2
       else
@@ -396,7 +396,7 @@ if [ $cplwav = ".true." ]; then
 
   if [ "${RERUN}" != "YES" ]; then
 # Next-cycle restart for GEFS
-    if [ "${COMPONENTwave}" = "gefswave" ]; then
+    if [ "${COMPONENTwave}" = "gefs.wave" ]; then
       mkdir -p $COMOUTWW3/restart
       RDATE=$($NDATE +$WAVHCYC $CDATE)
       rPDY=$(echo $RDATE | cut -c1-8)
diff --git a/scripts/exwave_nawips.sh b/scripts/exwave_nawips.sh
index 423a0ab51ab..7f153207fb3 100755
--- a/scripts/exwave_nawips.sh
+++ b/scripts/exwave_nawips.sh
@@ -80,7 +80,7 @@ while [ $fhcnt -le $FHMAX_WAV ]; do
   echo "fhr3: $fhr3"
   pgm="$NAGRIB for F$fhr $model"
 
-  GRIBIN=$COMIN/gridded/${model}.${cycle}.${ftype}.global.0p25.f${fhr3}.grib2
+  GRIBIN=$COMIN/gridded/gefs.wave.${cycle}.${ftype}.global.0p25.f${fhr3}.grib2
 
   echo "GRIBIN: $GRIBIN"
   GEMGRD=${model}${waveMEMB}_0p25_${PDY}${cyc}f${fhr3}
diff --git a/scripts/exwave_stat.sh b/scripts/exwave_stat.sh
index a53ac08695e..2dee49982e5 100755
--- a/scripts/exwave_stat.sh
+++ b/scripts/exwave_stat.sh
@@ -201,7 +201,7 @@
            fi
            ENSTAG=${ftype}${me}
            infile=${WAV_MOD_TAG}.${cycle}.${ENSTAG}.${GRDNAME}.${GRDRES}.f${FH3}.grib2
-           outfile=${nnip}_${me}.t${cyc}z.f${FH3}.grib2
+           outfile=${nnip}_${me}.t${cyc}z.${GRDNAME}.${GRDRES}.f${FH3}.grib2
 
            wgfileout=wgrib_${nnip}_${me}.out
            if [ "${npart}" = "0" ]
@@ -283,7 +283,7 @@
       else
 # Line for doing per parameter, per time stamp
         echo "nip ngrib fhour: ${nip}, ${ngrib}, ${fhour}"
-        echo "$USHwave/wave_ens_stat.sh ${nip} ${ngrib} ${fhour} 1> wave_ens_stats_${nip}_${fhour}.out 2>&1" >> cmdfile
+        echo "$USHwave/wave_ens_stat.sh ${nip} ${ngrib} ${fhour} 1 ${GRDNAME} ${GRDRES} > wave_ens_stats_${nip}_${fhour}.out 2>&1" >> cmdfile
 
       fi
 
@@ -350,27 +350,27 @@
     do
       nip=${arrpar[$iparam-1]}
       case $nip in
-        HTSGW)   stypes='mean spread probab' ; snip=hs ;;
-        PERPW)   stypes='mean spread probab' ; snip=tp ;;
-        ICEC)    stypes='mean spread probab' ; snip=ice ;;
-        DIRPW)   stypes='mean spread probab' ; snip=pdir ;;
-        IMWF)    stypes='mean spread probab' ; snip=tm ;;
-        MWSP)    stypes='mean spread probab' ; snip=tz ;;
-        WVHGT)   stypes='mean spread probab' ; snip=wshs ;;
-        WVPER)   stypes='mean spread probab' ; snip=wstp ;;
+        HTSGW)   stypes='mean spread prob' ; snip=hs ;;
+        PERPW)   stypes='mean spread prob' ; snip=tp ;;
+        ICEC)    stypes='mean spread prob' ; snip=ice ;;
+        DIRPW)   stypes='mean spread prob' ; snip=pdir ;;
+        IMWF)    stypes='mean spread prob' ; snip=tm ;;
+        MWSP)    stypes='mean spread prob' ; snip=tz ;;
+        WVHGT)   stypes='mean spread prob' ; snip=wshs ;;
+        WVPER)   stypes='mean spread prob' ; snip=wstp ;;
         WVDIR)   stypes='mean spread' ; snip=wsdir ;;
         WWSDIR)  stypes='mean spread' ; snip=wwdir ;;
-        WIND)    stypes='mean spread probab' ; snip=wnd ;;
+        WIND)    stypes='mean spread prob' ; snip=wnd ;;
         WDIR)    stypes='mean spread' ; snip=wnddir ;;
-        SWELL1)  stypes='mean spread probab' ; snip=hswell1 ;;
-        SWELL2)  stypes='mean spread probab' ; snip=hswell2 ;;
-        SWELL3)  stypes='mean spread probab' ; snip=hswell3 ;;
+        SWELL1)  stypes='mean spread prob' ; snip=hswell1 ;;
+        SWELL2)  stypes='mean spread prob' ; snip=hswell2 ;;
+        SWELL3)  stypes='mean spread prob' ; snip=hswell3 ;;
         SWDIR1)  stypes='mean spread' ; snip=dswell1 ;;
         SWDIR2)  stypes='mean spread' ; snip=dswell2 ;;
         SWDIR3)  stypes='mean spread' ; snip=dswell3 ;;
-        SWPER1)  stypes='mean spread probab' ; snip=tswell1 ;;
-        SWPER2)  stypes='mean spread probab' ; snip=tswell2 ;;
-        SWPER3)  stypes='mean spread probab' ; snip=tswell3 ;;
+        SWPER1)  stypes='mean spread prob' ; snip=tswell1 ;;
+        SWPER2)  stypes='mean spread prob' ; snip=tswell2 ;;
+        SWPER3)  stypes='mean spread prob' ; snip=tswell3 ;;
         *)       nnip= ;;
       esac
 
@@ -389,7 +389,7 @@
         do
 
           ingrib=${snip}_${stype}.${FH3}.grib2
-          outgrib=${WAV_MOD_TAG}.${stype}.t${cyc}z.f${FH3}.grib2 
+          outgrib=${WAV_MOD_TAG}.t${cyc}z.${stype}.${GRDNAME}.${GRDRES}.f${FH3}.grib2 
 
           echo "$WGRIB2  ./${par_dir}/${valtime}/${ingrib} -append -grib ./${outgrib} >> ${FH3}_${stype}.t${cyc}z.out 2>> ${FH3}_${stype}.t${cyc}z.err" >> cmdfile.${fhour}
 
@@ -453,9 +453,9 @@
   while [ "$fhour" -le "$FHMAX_WAV" ]
   do
     FH3=$(printf "%03d" $fhour)
-    for stype in mean spread probab
+    for stype in mean spread prob
     do
-      fcopy=${WAV_MOD_TAG}.${stype}.t${cyc}z.f${FH3}.grib2
+      fcopy=${WAV_MOD_TAG}.t${cyc}z.${stype}.${GRDNAME}.${GRDRES}.f${FH3}.grib2
       if [ -s ${fcopy} ]
       then
         set +x
@@ -510,7 +510,7 @@
 
 # 3.c Create bundled grib2 file with all parameters
 
-  cat gefswave.mean.t${cyc}z.f???.grib2 | $WGRIB2 - -match "(HTSGW|PERPW|WIND)" -grib gribfile > gribfile.out 2>&1 
+  cat ${WAV_MOD_TAG}.t${cyc}z.mean.${GRDNAME}.${GRDRES}.f???.grib2 | $WGRIB2 - -match "(HTSGW|PERPW|WIND)" -grib gribfile > gribfile.out 2>&1 
 
   if [ -s gribfile ]
   then
diff --git a/ush/wave_ens_stat.sh b/ush/wave_ens_stat.sh
index 12567611745..2948970c186 100755
--- a/ush/wave_ens_stat.sh
+++ b/ush/wave_ens_stat.sh
@@ -46,6 +46,8 @@
 
 # Forecast range
   fhour=$3
+  grdname=$5
+  grdres=$6
 
   mkdir -p tmp_${para}
   cd tmp_${para}
@@ -123,7 +125,7 @@
 #
 # set $seton
 
-  rm -f mean.t${cyc}z.grib2 spread.t${cyc}z.grib2 probab.t${cyc}z.grib2
+  rm -f mean.t${cyc}z.grib2 spread.t${cyc}z.grib2 prob.t${cyc}z.grib2
 
   nmemb=${nmembn}
   nmembm1=`expr ${nmemb} - 1`
@@ -146,7 +148,8 @@
 #    while [ ${nme} -lt ${nmemb} ]
     for im in $membn
     do
-      infile=../../${para}_${im}.t${cyc}z.f${FH3}.grib2
+      infile=../../${para}_${im}.t${cyc}z.${grdname}.${grdres}.f${FH3}.grib2
+      echo "infile: ${infile}"
       if [ "${im}" = "00" ]
       then
 
@@ -184,7 +187,7 @@
 #
 # 1.c Execute wave_stat and create grib2 files
 #
-    rm -f mean_out spread_out probab_out test_out
+    rm -f mean_out spread_out prob_out test_out
 #
     $EXECwave/wave_stat  < wave_stat.inp >>$pgmout 2>&1
 #
@@ -217,17 +220,17 @@
    nscale=`echo ${ascale[@]} | wc -w`     
    if [ ${nscale} -gt 1 ]
    then
-     if [ ! -f probab_out ]
+     if [ ! -f prob_out ]
      then
-       msg="ABNORMAL EXIT: ERR probab_out not gerenerated for ${nnip} $FH3."
+       msg="ABNORMAL EXIT: ERR prob_out not gerenerated for ${nnip} $FH3."
        postmsg "$jlogfile" "$msg"
        set +x
-       echo "--- probab_out not gerenerated for ${nnip} $FH3 --- "
+       echo "--- prob_out not gerenerated for ${nnip} $FH3 --- "
        [[ "$LOUD" = YES ]] && set -x
-       echo "probab_out not gerenerated for ${nnip} $FH3" >> $wave_log
+       echo "prob_out not gerenerated for ${nnip} $FH3" >> $wave_log
        err=1;export err;err_chk
      else
-       mv -f probab_out  ${nnip}_probab.$FH3.grib2
+       mv -f prob_out  ${nnip}_prob.$FH3.grib2
      fi
    fi