diff --git a/cime_config/buildnml b/cime_config/buildnml
index e9d8a3ed1..ee9b0f1f7 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -572,7 +572,7 @@ def buildnml(case, caseroot, component):
         filename = os.path.join(fd_dir,"fd_cesm.yaml")
     elif coupling_mode == 'hafs':
         filename = os.path.join(fd_dir,"fd_hafs.yaml")
-    elif coupling_mode == 'nems':
+    elif 'nems' in coupling_mode:
         filename = os.path.join(fd_dir,"fd_nems.yaml")
     else:
         expect(False, "coupling mode currently only supports cesm, hafs and nems")
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 036930492..aa7ab6510 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -28,7 +28,7 @@
 
   <entry id="COUPLING_MODE">
     <type>char</type>
-    <valid_values>cesm,nems_orig_active,nems_orig_data,nems_frac,hafs</valid_values>
+    <valid_values>cesm,nems_orig,nems_orig_data,nems_frac,hafs</valid_values>
     <default_value>cesm</default_value>
     <group>run_coupling</group>
     <file>env_run.xml</file>