diff --git a/gcm_setup b/gcm_setup
index b26a46ea..032599ec 100755
--- a/gcm_setup
+++ b/gcm_setup
@@ -2917,7 +2917,7 @@ if ( $OGCM == 1 ) then
    set OGCM = TRUE
    # Now we need to find out if we are running MOM or MOM6 by looking
    # at OCEAN_NAME: val and checking if it is MOM or MOM6
-   set OCEAN_MODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
+   set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
 else if ( $OGCM == 0 ) then
    set OGCM = FALSE
 else
@@ -2984,7 +2984,9 @@ HOMDIR/gcm_emip.setup
 HOMDIR/logging.yaml
 EOF
 
-if( $OGCM == TRUE & "$OCNMODEL" != MIT ) then
+if( $OGCM == TRUE ) then
+
+if ("$OCNMODEL" != "MIT" ) then
 
 # Some files are common to both MOM and MOM6
 cat >> $FILES_TO_PROCESS << EOF
@@ -2993,16 +2995,17 @@ HOMDIR/diag_table
 HOMDIR/__init__.py
 EXPDIR/plot/plotocn.j
 EOF
+endif
 
 # Some files are specific to MOM
-if ( $OCEAN_MODEL == "MOM" ) then
+if ( "$OCNMODEL" == "MOM" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/field_table
 EOF
 endif
 
 # Some files are specific to MOM6
-if ( $OCEAN_MODEL == "MOM6" ) then
+if ( "$OCNMODEL" == "MOM6" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/MOM_override
 HOMDIR/MOM_input
diff --git a/geoschemchem_setup b/geoschemchem_setup
index 68806fc8..4533f1ed 100755
--- a/geoschemchem_setup
+++ b/geoschemchem_setup
@@ -1216,7 +1216,7 @@ if( $AGCM_IM == "c540" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF540x6C
+     set ATMOS_RES = CF0540x6C
      set   CNV_NX = 8
      set POST_NDS = 32
      set USE_SHMEM = 1
@@ -2895,6 +2895,7 @@ endif
 # ---------------------
 # (By default, ENABLE_TR is TRUE in RC/GEOS_ChemGridComp.rc)
 
+
 #######################################################################
 #              Modify MOM input files to match HEARTBEAT
 #######################################################################
@@ -3121,7 +3122,7 @@ if ( $OGCM == 1 ) then
    set OGCM = TRUE
    # Now we need to find out if we are running MOM or MOM6 by looking
    # at OCEAN_NAME: val and checking if it is MOM or MOM6
-   set OCEAN_MODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
+   set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
 else if ( $OGCM == 0 ) then
    set OGCM = FALSE
 else
@@ -3188,7 +3189,9 @@ HOMDIR/gcm_emip.setup
 HOMDIR/logging.yaml
 EOF
 
-if( $OGCM == TRUE & "$OCNMODEL" != MIT ) then
+if( $OGCM == TRUE ) then
+
+if ("$OCNMODEL" != "MIT" ) then
 
 # Some files are common to both MOM and MOM6
 cat >> $FILES_TO_PROCESS << EOF
@@ -3197,16 +3200,17 @@ HOMDIR/diag_table
 HOMDIR/__init__.py
 EXPDIR/plot/plotocn.j
 EOF
+endif
 
 # Some files are specific to MOM
-if ( $OCEAN_MODEL == "MOM" ) then
+if ( "$OCNMODEL" == "MOM" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/field_table
 EOF
 endif
 
 # Some files are specific to MOM6
-if ( $OCEAN_MODEL == "MOM6" ) then
+if ( "$OCNMODEL" == "MOM6" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/MOM_override
 HOMDIR/MOM_input
diff --git a/gmichem_setup b/gmichem_setup
index 01b54817..e8f7f7e2 100755
--- a/gmichem_setup
+++ b/gmichem_setup
@@ -1313,7 +1313,7 @@ if( $AGCM_IM == "c540" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF540x6C
+     set ATMOS_RES = CF0540x6C
      set   CNV_NX = 8
      set POST_NDS = 32
      set USE_SHMEM = 1
@@ -3328,7 +3328,7 @@ if ( $OGCM == 1 ) then
    set OGCM = TRUE
    # Now we need to find out if we are running MOM or MOM6 by looking
    # at OCEAN_NAME: val and checking if it is MOM or MOM6
-   set OCEAN_MODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
+   set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
 else if ( $OGCM == 0 ) then
    set OGCM = FALSE
 else
@@ -3395,7 +3395,9 @@ HOMDIR/gcm_emip.setup
 HOMDIR/logging.yaml
 EOF
 
-if( $OGCM == TRUE & "$OCNMODEL" != MIT ) then
+if( $OGCM == TRUE ) then
+
+if ("$OCNMODEL" != "MIT" ) then
 
 # Some files are common to both MOM and MOM6
 cat >> $FILES_TO_PROCESS << EOF
@@ -3404,16 +3406,17 @@ HOMDIR/diag_table
 HOMDIR/__init__.py
 EXPDIR/plot/plotocn.j
 EOF
+endif
 
 # Some files are specific to MOM
-if ( $OCEAN_MODEL == "MOM" ) then
+if ( "$OCNMODEL" == "MOM" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/field_table
 EOF
 endif
 
 # Some files are specific to MOM6
-if ( $OCEAN_MODEL == "MOM6" ) then
+if ( "$OCNMODEL" == "MOM6" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/MOM_override
 HOMDIR/MOM_input
diff --git a/stratchem_setup b/stratchem_setup
index 7102f9d5..38319417 100755
--- a/stratchem_setup
+++ b/stratchem_setup
@@ -1216,7 +1216,7 @@ if( $AGCM_IM == "c540" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF540x6C
+     set ATMOS_RES = CF0540x6C
      set   CNV_NX = 8
      set POST_NDS = 32
      set USE_SHMEM = 1
@@ -3034,7 +3034,7 @@ if ( $OGCM == 1 ) then
    set OGCM = TRUE
    # Now we need to find out if we are running MOM or MOM6 by looking
    # at OCEAN_NAME: val and checking if it is MOM or MOM6
-   set OCEAN_MODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
+   set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
 else if ( $OGCM == 0 ) then
    set OGCM = FALSE
 else
@@ -3101,7 +3101,9 @@ HOMDIR/gcm_emip.setup
 HOMDIR/logging.yaml
 EOF
 
-if( $OGCM == TRUE & "$OCNMODEL" != MIT ) then
+if( $OGCM == TRUE ) then
+
+if ("$OCNMODEL" != "MIT" ) then
 
 # Some files are common to both MOM and MOM6
 cat >> $FILES_TO_PROCESS << EOF
@@ -3110,16 +3112,17 @@ HOMDIR/diag_table
 HOMDIR/__init__.py
 EXPDIR/plot/plotocn.j
 EOF
+endif
 
 # Some files are specific to MOM
-if ( $OCEAN_MODEL == "MOM" ) then
+if ( "$OCNMODEL" == "MOM" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/field_table
 EOF
 endif
 
 # Some files are specific to MOM6
-if ( $OCEAN_MODEL == "MOM6" ) then
+if ( "$OCNMODEL" == "MOM6" ) then
 cat >> $FILES_TO_PROCESS << EOF
 HOMDIR/MOM_override
 HOMDIR/MOM_input