diff --git a/cime_config/buildlib b/cime_config/buildlib
index 62b55ee..bd41d6c 100755
--- a/cime_config/buildlib
+++ b/cime_config/buildlib
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Build the mosart component library
+Build the rtm component library
 """
 #pylint: disable=unused-wildcard-import, wildcard-import, multiple-imports
 #pylint: disable=wrong-import-position, invalid-name, too-many-locals
diff --git a/cime_config/buildnml b/cime_config/buildnml
index 1738359..3486746 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -77,9 +77,11 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
             nmlgen.add_default("finidat_rtm", value=filename, ignore_abs_path=True)
         else:
             nmlgen.add_default("nrevsn_rtm", value=filename)
+    elif nmlgen.get_value("finidat_rtm").strip() == '':
+        nmlgen.set_value('finidat_rtm', value=' ')
     else:
         if nmlgen.get_default('finidat_rtm') == 'UNSET':
-            nmlgen.add_default('finidat_rtm', value='', ignore_abs_path=True)
+            nmlgen.add_default('finidat_rtm', value=' ', ignore_abs_path=True)
         else:
             nmlgen.add_default("finidat_rtm")
 
@@ -159,7 +161,7 @@ def buildnml(case, caseroot, compname):
     #----------------------------------------------------
     # Clear out old data.
     #----------------------------------------------------
-    data_list_path = os.path.join(case.get_case_root(), "Buildconf", "mosart.input_data_list")
+    data_list_path = os.path.join(case.get_case_root(), "Buildconf", "rtm.input_data_list")
     if os.path.exists(data_list_path):
         os.remove(data_list_path)
     #----------------------------------------------------