diff --git a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
index dca629c845..1a31e077f9 100755
--- a/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
+++ b/jobs/JGDAS_ATMOS_GEMPAK_META_NCDC
@@ -34,17 +34,17 @@ export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 ##############################################
 # Define COM directories
 ##############################################
-GRID=1p00 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COM_ATMOS_GEMPAK_1p00:COM_ATMOS_GEMPAK_TMPL"
+GRID=1p00 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMIN_ATMOS_GEMPAK_1p00:COM_ATMOS_GEMPAK_TMPL"
 
-GRID="meta" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COM_ATMOS_GEMPAK_META:COM_ATMOS_GEMPAK_TMPL"
-if [[ ! -d "${COM_ATMOS_GEMPAK_META}" ]]; then
-  mkdir -m 775 -p "${COM_ATMOS_GEMPAK_META}"
+GRID="meta" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_META:COM_ATMOS_GEMPAK_TMPL"
+if [[ ! -d "${COMOUT_ATMOS_GEMPAK_META}" ]]; then
+  mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_META}"
 fi
 
 if (( cyc%12 == 0 )); then
-  GRID="gif" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COM_ATMOS_GEMPAK_GIF:COM_ATMOS_GEMPAK_TMPL"
-  if [[ ! -d "${COM_ATMOS_GEMPAK_GIF}" ]]; then
-    mkdir -m 775 -p "${COM_ATMOS_GEMPAK_GIF}"
+  GRID="gif" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx "COMOUT_ATMOS_GEMPAK_GIF:COM_ATMOS_GEMPAK_TMPL"
+  if [[ ! -d "${COMOUT_ATMOS_GEMPAK_GIF}" ]]; then
+    mkdir -m 775 -p "${COMOUT_ATMOS_GEMPAK_GIF}"
   fi
 fi
 
diff --git a/scripts/exgdas_atmos_gempak_gif_ncdc.sh b/scripts/exgdas_atmos_gempak_gif_ncdc.sh
index 2dc460cc55..f932fb570c 100755
--- a/scripts/exgdas_atmos_gempak_gif_ncdc.sh
+++ b/scripts/exgdas_atmos_gempak_gif_ncdc.sh
@@ -19,7 +19,7 @@ if [[ ${MODEL} == GDAS ]]; then
     max_tries=180
     export fhr3
     for fhr3 in ${fcsthrs}; do
-        gempak_file="${COM_ATMOS_GEMPAK_1p00}/${RUN}_1p00_${PDY}${cyc}f${fhr3}"
+        gempak_file="${COMIN_ATMOS_GEMPAK_1p00}/${RUN}_1p00_${PDY}${cyc}f${fhr3}"
         if ! wait_for_file "${gempak_file}" "${sleep_interval}" "${max_tries}" ; then
             echo "FATAL ERROR: ${gempak_file} not found after ${max_tries} iterations"
             exit 10