diff --git a/scripts/create_newcase b/scripts/create_newcase
index 627c0b60f42..ed20ada7570 100755
--- a/scripts/create_newcase
+++ b/scripts/create_newcase
@@ -32,20 +32,20 @@ OR
 
     parser.add_argument("--compset", "-compset", required=True,
                         help="(required) Specify a compset. "
-                        "To see list of current compsets, use the utility manage_case in this directory")
+                        "To see list of current compsets, use the utility query_case in this directory")
 
     parser.add_argument("--res", "-res", required=True,
                         help="(required) Specify a model grid resolution. "
-                        "To see list of current compsets, use the utility manage_case in this directory")
+                        "To see list of current compsets, use the utility query_case in this directory")
 
     parser.add_argument("--machine", "-mach",
                         help="Specify a machine. default: match NODENAME_REGEX in config_machines.xml "
-                        "To see list of current  machines, use the utility manage_case in this directory"
+                        "To see list of current  machines, use the utility query_case in this directory"
                         )
 
     parser.add_argument("--compiler", "-compiler",
                         help="Specify a compiler. "
-                        "To see list of supported compilers for each machine, use the utility manage_case in this directory")
+                        "To see list of supported compilers for each machine, use the utility query_case in this directory")
 
     parser.add_argument("--ninst",default=1,
                         help="Specify number of component instances"
@@ -53,7 +53,7 @@ OR
 
     parser.add_argument("--mpilib", "-mpilib",
                         help="Specify the mpilib. "
-                        "To see list of supported mpilibs for each machine, use the utility manage_case in this directory. "
+                        "To see list of supported mpilibs for each machine, use the utility query_case in this directory. "
                         "The default is the first listing in MPILIBS in config_machines.xml")
 
     parser.add_argument("--project", "-project",
diff --git a/scripts/create_test b/scripts/create_test
index 35654578954..3fbe88c4ddd 100755
--- a/scripts/create_test
+++ b/scripts/create_test
@@ -124,7 +124,7 @@ OR
 
     parser.add_argument("--mpilib",
                         help="Specify the mpilib. "
-                        "To see list of supported mpilibs for each machine, use the utility manage_case in this directory. "
+                        "To see list of supported mpilibs for each machine, use the utility query_case in this directory. "
                         "The default is the first listing in MPILIBS in config_machines.xml")
 
     if model == "cesm":
diff --git a/scripts/lib/CIME/XML/grids.py b/scripts/lib/CIME/XML/grids.py
index 351b40d254e..15643022c6d 100644
--- a/scripts/lib/CIME/XML/grids.py
+++ b/scripts/lib/CIME/XML/grids.py
@@ -113,7 +113,7 @@ def _read_config_grids_v1(self, name, compset):
                     component_grids = self._get_component_grids(lname)
                     return lname, component_grids
         expect (False,
-                "grid '%s'  is not supported, use manage_case to determine supported grids " %name)
+                "grid '%s'  is not supported, use query_case to determine supported grids " %name)
 
     def _read_config_grids_v2(self, name, compset):
         """
diff --git a/scripts/manage_case b/scripts/query_case
similarity index 100%
rename from scripts/manage_case
rename to scripts/query_case
diff --git a/tools/Readme.configure b/tools/Readme.configure
index 36b310ee5f9..8bae506bedf 100644
--- a/tools/Readme.configure
+++ b/tools/Readme.configure
@@ -39,11 +39,11 @@ optional arguments:
                         defaults to the current working directory.
   --compiler COMPILER, -compiler COMPILER
                         Specify a compiler. To see list of supported compilers
-                        for each machine, use the utility manage_case in this
+                        for each machine, use the utility query_case in this
                         directory
   --mpilib MPILIB, -mpilib MPILIB
                         Specify the mpilib. To see list of supported mpilibs
-                        for each machine, use the utility manage_case in this
+                        for each machine, use the utility query_case in this
                         directory. The default is the first listing in MPILIBS
                         in config_machines.xml
   --clean               Remove old Macros and env files before attempting to
diff --git a/tools/configure b/tools/configure
index 997b1d3e524..b6e4ed65424 100755
--- a/tools/configure
+++ b/tools/configure
@@ -57,14 +57,14 @@ def parse_command_line(args):
 
     parser.add_argument("--compiler", "-compiler",
                         help="Specify a compiler. "
-                        "To see list of supported compilers for each machine, use the utility manage_case in this directory")
+                        "To see list of supported compilers for each machine, use the utility query_case in this directory")
 
     parser.add_argument("--mpilib", "-mpilib",
                         help="Specify the mpilib. "
-                        "To see list of supported mpilibs for each machine, use the utility manage_case in this directory. "
+                        "To see list of supported mpilibs for each machine, use the utility query_case in this directory. "
                         "The default is the first listing in MPILIBS in config_machines.xml")
 
-    parser.add_argument("--clean", action="store_true", 
+    parser.add_argument("--clean", action="store_true",
                         help="Remove old Macros and env files before attempting to create new ones")
 
     argcnt = len(args)
@@ -135,7 +135,7 @@ def parse_command_line(args):
 
 
     if args.clean:
-        files = ["Macros.make", "Macros.cmake", "env_mach_specific.xml", ".env_mach_specific.sh", 
+        files = ["Macros.make", "Macros.cmake", "env_mach_specific.xml", ".env_mach_specific.sh",
                  ".env_mach_specific.csh", "Depends.%s"%compiler, "Depends.%s"%args.machine,
                   "Depends.%s.%s"%(args.machine,compiler)]
         for file_ in files: