diff --git a/data/config/ConfigConstants b/data/config/ConfigConstants
index a2688227e1..15a2a8db4c 100644
--- a/data/config/ConfigConstants
+++ b/data/config/ConfigConstants
@@ -59,7 +59,7 @@ MB_to_PA(p)  = HPA_to_PA(p);
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-// Gridded data file types
+// File types
 GRIB1          = 1;
 GRIB2          = 2;
 NETCDF_MET     = 3;
diff --git a/src/basic/vx_config/config_constants.h b/src/basic/vx_config/config_constants.h
index 70526f0a47..9f1366a681 100644
--- a/src/basic/vx_config/config_constants.h
+++ b/src/basic/vx_config/config_constants.h
@@ -1268,7 +1268,7 @@ static const char conf_key_cira_diag_flag[]         = "cira_diag_flag";
 // Parameter value names common to multiple tools
 //
 
-// Gridded data file types
+// File types
 static const char conf_val_grib1         [] = "GRIB1";
 static const char conf_val_grib2         [] = "GRIB2";
 static const char conf_val_netcdf_met    [] = "NETCDF_MET";
diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc
index c26cb35b77..a4323a23b1 100644
--- a/src/basic/vx_config/config_util.cc
+++ b/src/basic/vx_config/config_util.cc
@@ -345,12 +345,12 @@ StringArray parse_conf_string_array(Dictionary *dict, const char *conf_key, cons
 
 ///////////////////////////////////////////////////////////////////////////////
 
-FileType parse_conf_grd_file_type(Dictionary *dict) {
-   FileType t = FileType_None;
+GrdFileType parse_conf_file_type(Dictionary *dict) {
+   GrdFileType t = FileType_None;
    int v;
 
    if(!dict) {
-      mlog << Error << "\nparse_conf_grd_file_type() -> "
+      mlog << Error << "\nparse_conf_file_type() -> "
            << "empty dictionary!\n\n";
       exit(1);
    }
@@ -359,7 +359,7 @@ FileType parse_conf_grd_file_type(Dictionary *dict) {
    v = dict->lookup_int(conf_key_file_type, false);
 
    if(dict->last_lookup_status()) {
-      // Convert integer to enumerated FileType
+      // Convert integer to enumerated GrdFileType
            if(v == conf_const.lookup_int(conf_val_grib1))         t = FileType_Gb1;
       else if(v == conf_const.lookup_int(conf_val_grib2))         t = FileType_Gb2;
       else if(v == conf_const.lookup_int(conf_val_netcdf_met))    t = FileType_NcMet;
@@ -370,7 +370,7 @@ FileType parse_conf_grd_file_type(Dictionary *dict) {
       else if(v == conf_const.lookup_int(conf_val_python_numpy))  t = FileType_Python_Numpy;
       else if(v == conf_const.lookup_int(conf_val_python_xarray)) t = FileType_Python_Xarray;
       else {
-         mlog << Error << "\nparse_conf_grd_file_type() -> "
+         mlog << Error << "\nparse_conf_file_type() -> "
               << "Unexpected config file value of " << v << " for \""
               << conf_key_file_type << "\".\n\n";
          exit(1);
diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h
index e025fd752e..885fa6fb2e 100644
--- a/src/basic/vx_config/config_util.h
+++ b/src/basic/vx_config/config_util.h
@@ -35,7 +35,7 @@ extern ConcatString    parse_conf_string(
                           Dictionary *dict,
                           const char *,
                           bool check_empty=true);
-extern FileType        parse_conf_grd_file_type(Dictionary *dict);
+extern GrdFileType     parse_conf_file_type(Dictionary *dict);
 extern std::map<STATLineType,STATOutputType>
                        parse_conf_output_flag(
                           Dictionary *dict,
diff --git a/src/basic/vx_config/data_file_type.h b/src/basic/vx_config/data_file_type.h
index 7b31907833..9fbefee775 100644
--- a/src/basic/vx_config/data_file_type.h
+++ b/src/basic/vx_config/data_file_type.h
@@ -17,7 +17,7 @@
 // Enumeration of supported file types
 //
 
-enum FileType {
+enum GrdFileType {
 
    FileType_None,           // Default
 
@@ -38,7 +38,7 @@ enum FileType {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline bool is_netcdf_grdfiletype(const FileType _t) {
+inline bool is_netcdf_grdfiletype(const GrdFileType _t) {
    return(_t == FileType_NcMet          ||
           _t == FileType_General_Netcdf ||
           _t == FileType_NcWrf          ||
@@ -48,7 +48,7 @@ inline bool is_netcdf_grdfiletype(const FileType _t) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline bool is_python_grdfiletype(const FileType _t) {
+inline bool is_python_grdfiletype(const GrdFileType _t) {
    return(_t == FileType_Python_Xarray ||
           _t == FileType_Python_Numpy);
 }
diff --git a/src/basic/vx_config/grdfiletype_to_string.cc b/src/basic/vx_config/grdfiletype_to_string.cc
index ca4bfe26b4..c9e89451c3 100644
--- a/src/basic/vx_config/grdfiletype_to_string.cc
+++ b/src/basic/vx_config/grdfiletype_to_string.cc
@@ -34,7 +34,7 @@ using namespace std;
 ////////////////////////////////////////////////////////////////////////
 
 
-ConcatString grdfiletype_to_string(const FileType t)
+ConcatString grdfiletype_to_string(const GrdFileType t)
 
 {
 
@@ -73,7 +73,7 @@ return ConcatString(s);
 ////////////////////////////////////////////////////////////////////////
 
 
-bool string_to_grdfiletype(const char * text, FileType & t)
+bool string_to_grdfiletype(const char * text, GrdFileType & t)
 
 {
 
diff --git a/src/basic/vx_config/grdfiletype_to_string.h b/src/basic/vx_config/grdfiletype_to_string.h
index c240080c7d..6b44a35670 100644
--- a/src/basic/vx_config/grdfiletype_to_string.h
+++ b/src/basic/vx_config/grdfiletype_to_string.h
@@ -38,10 +38,10 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-extern ConcatString grdfiletype_to_string(const FileType);
+extern ConcatString grdfiletype_to_string(const GrdFileType);
 
 
-extern bool string_to_grdfiletype(const char *, FileType &);
+extern bool string_to_grdfiletype(const char *, GrdFileType &);
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d/data_class.h b/src/libcode/vx_data2d/data_class.h
index 5377bc0370..5fbf07e266 100644
--- a/src/libcode/vx_data2d/data_class.h
+++ b/src/libcode/vx_data2d/data_class.h
@@ -129,7 +129,7 @@ class Met2dDataFile : public Met2dData {
       virtual int raw_nx() const;
       virtual int raw_ny() const;
 
-      virtual FileType file_type() const = 0;
+      virtual GrdFileType file_type() const = 0;
 
       int shift_right() const;
 
diff --git a/src/libcode/vx_data2d/var_info.cc b/src/libcode/vx_data2d/var_info.cc
index cd27a0a392..ac12513e76 100644
--- a/src/libcode/vx_data2d/var_info.cc
+++ b/src/libcode/vx_data2d/var_info.cc
@@ -952,7 +952,7 @@ ConcatString EnsVarInfo::get_ens_member_id(int index) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-ConcatString raw_magic_str(Dictionary i_edict, FileType file_type) {
+ConcatString raw_magic_str(Dictionary i_edict, GrdFileType file_type) {
    ConcatString magic_str;
 
    ConcatString name = i_edict.lookup_string("name");
diff --git a/src/libcode/vx_data2d/var_info.h b/src/libcode/vx_data2d/var_info.h
index 924cdca505..996e736600 100644
--- a/src/libcode/vx_data2d/var_info.h
+++ b/src/libcode/vx_data2d/var_info.h
@@ -106,7 +106,7 @@ class VarInfo
          // get stuff
          //
 
-      virtual FileType  file_type() const = 0;
+      virtual GrdFileType file_type() const = 0;
 
       ConcatString magic_str()      const;
       ConcatString magic_time_str() const;
@@ -310,7 +310,7 @@ class EnsVarInfo {
 
 ////////////////////////////////////////////////////////////////////////
 
-ConcatString raw_magic_str(Dictionary i_edict, FileType file_type);
+ConcatString raw_magic_str(Dictionary i_edict, GrdFileType file_type);
 bool is_req_level_match(const ConcatString &, const ConcatString &);
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc
index 48197ffa81..ff422493d0 100644
--- a/src/libcode/vx_data2d_factory/data2d_factory.cc
+++ b/src/libcode/vx_data2d_factory/data2d_factory.cc
@@ -44,7 +44,7 @@ using namespace std;
 //
 ////////////////////////////////////////////////////////////////////////
 
-Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(FileType type)
+Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(GrdFileType type)
 
 {
 
@@ -116,7 +116,7 @@ MetPythonDataFile * p = nullptr;
       case FileType_HdfEos:
 
          mlog << Error << "\n" << method_name
-              << "Support for FileType = \"" << grdfiletype_to_string(type)
+              << "Support for GrdFileType = \"" << grdfiletype_to_string(type)
               << "\" not yet implemented!\n\n";
          exit(1);
 
@@ -160,7 +160,7 @@ MetPythonDataFile * p = nullptr;
 ////////////////////////////////////////////////////////////////////////
 
 Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename) {
-   FileType type;
+   GrdFileType type;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
 
    //
@@ -191,7 +191,7 @@ Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename)
 
 ////////////////////////////////////////////////////////////////////////
 
-Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename, FileType type)
+Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename, GrdFileType type)
 
 {
 
@@ -247,14 +247,14 @@ bool is_2d_data_file(const ConcatString &filename,
                      const ConcatString &config_str) {
    Met2dDataFileFactory mtddf_factory;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
-   FileType type = FileType_None;
+   GrdFileType type = FileType_None;
 
    // Check for a requested file type
    if(config_str.nonempty()) {
       MetConfig config;
       config.read(replace_path(config_const_filename).c_str());
       config.read_string(config_str.c_str());
-      type = parse_conf_grd_file_type(&config);
+      type = parse_conf_file_type(&config);
    }
 
    mtddf = mtddf_factory.new_met_2d_data_file(filename.c_str(), type);
diff --git a/src/libcode/vx_data2d_factory/data2d_factory.h b/src/libcode/vx_data2d_factory/data2d_factory.h
index a4a043931b..0ad9072900 100644
--- a/src/libcode/vx_data2d_factory/data2d_factory.h
+++ b/src/libcode/vx_data2d_factory/data2d_factory.h
@@ -21,9 +21,9 @@
 class Met2dDataFileFactory
 {
    public:
-      static Met2dDataFile *new_met_2d_data_file(FileType type);
+      static Met2dDataFile *new_met_2d_data_file(GrdFileType type);
       static Met2dDataFile *new_met_2d_data_file(const char *filename);
-      static Met2dDataFile *new_met_2d_data_file(const char *filename, FileType type);
+      static Met2dDataFile *new_met_2d_data_file(const char *filename, GrdFileType type);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_factory/data2d_factory_utils.cc b/src/libcode/vx_data2d_factory/data2d_factory_utils.cc
index 526a1003a5..71bcae49a4 100644
--- a/src/libcode/vx_data2d_factory/data2d_factory_utils.cc
+++ b/src/libcode/vx_data2d_factory/data2d_factory_utils.cc
@@ -49,17 +49,17 @@ static const int   n_bf_file_ext  = sizeof(bf_file_ext)/sizeof(*bf_file_ext);
 ////////////////////////////////////////////////////////////////////////
 
 
-static FileType file_type_by_suffix(const char * filename);
+static GrdFileType file_type_by_suffix(const char * filename);
 
 
 ////////////////////////////////////////////////////////////////////////
 
-FileType grd_file_type(const char * filename)
+GrdFileType grd_file_type(const char * filename)
 
 {
 
-FileType suffix_type = FileType_None;
-FileType data_type   = FileType_None;
+GrdFileType suffix_type = FileType_None;
+GrdFileType data_type   = FileType_None;
 
    //
    //  first check for python strings
@@ -129,7 +129,7 @@ else                                 return data_type  ;
 ////////////////////////////////////////////////////////////////////////
 
 
-FileType file_type_by_suffix(const char * filename)
+GrdFileType file_type_by_suffix(const char * filename)
 
 {
 
diff --git a/src/libcode/vx_data2d_factory/data2d_factory_utils.h b/src/libcode/vx_data2d_factory/data2d_factory_utils.h
index 80ae2f6441..aec07f95f8 100644
--- a/src/libcode/vx_data2d_factory/data2d_factory_utils.h
+++ b/src/libcode/vx_data2d_factory/data2d_factory_utils.h
@@ -23,7 +23,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-extern FileType grd_file_type(const char * filename);
+extern GrdFileType grd_file_type(const char * filename);
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_factory/parse_file_list.cc b/src/libcode/vx_data2d_factory/parse_file_list.cc
index 2072e51f7b..dd31e1a213 100644
--- a/src/libcode/vx_data2d_factory/parse_file_list.cc
+++ b/src/libcode/vx_data2d_factory/parse_file_list.cc
@@ -93,7 +93,7 @@ StringArray parse_ascii_file_list(const char * path)
 
 ifstream f_in;
 StringArray a;
-FileType file_type;
+GrdFileType file_type;
 std::string file_name;
 ConcatString list_str(file_list_str);
 bool check_files_exist = true;
@@ -205,11 +205,11 @@ return a;
 ////////////////////////////////////////////////////////////////////////
 
 
-FileType parse_file_list_type(const StringArray& file_list)
+GrdFileType parse_file_list_type(const StringArray& file_list)
 
 {
 
-FileType ftype = FileType_None;
+GrdFileType ftype = FileType_None;
 
 for ( int i=0; i<file_list.n(); i++ )  {
 
diff --git a/src/libcode/vx_data2d_factory/parse_file_list.h b/src/libcode/vx_data2d_factory/parse_file_list.h
index eb489f78cd..a7e4526449 100644
--- a/src/libcode/vx_data2d_factory/parse_file_list.h
+++ b/src/libcode/vx_data2d_factory/parse_file_list.h
@@ -29,7 +29,7 @@ extern StringArray parse_file_list(const StringArray&);
 
 extern StringArray parse_ascii_file_list(const char * path);
 
-extern FileType parse_file_list_type(const StringArray&);
+extern GrdFileType parse_file_list_type(const StringArray&);
 
 extern void log_missing_file(const char *method_name,
                              const char *desc_str,
diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc
index 65ac023f7e..32a398fb39 100644
--- a/src/libcode/vx_data2d_factory/var_info_factory.cc
+++ b/src/libcode/vx_data2d_factory/var_info_factory.cc
@@ -49,7 +49,7 @@ using namespace std;
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-VarInfo * VarInfoFactory::new_var_info(FileType type)
+VarInfo * VarInfoFactory::new_var_info(GrdFileType type)
 
 {
 
@@ -117,7 +117,7 @@ VarInfo * VarInfoFactory::new_var_info(FileType type)
 
       case FileType_HdfEos:
          mlog << Error << "\n" << method_name
-              << "Support for FileType = " << grdfiletype_to_string(type)
+              << "Support for GrdFileType = " << grdfiletype_to_string(type)
               << " not yet implemented!\n\n";
          exit(1);
 
@@ -138,7 +138,7 @@ VarInfo * VarInfoFactory::new_var_info(FileType type)
 ///////////////////////////////////////////////////////////////////////////////
 
 VarInfo * VarInfoFactory::new_var_info(ConcatString s) {
-   FileType type;
+   GrdFileType type;
 
    // Convert the string to a gridded data file type
    string_to_grdfiletype(s.c_str(), type);
diff --git a/src/libcode/vx_data2d_factory/var_info_factory.h b/src/libcode/vx_data2d_factory/var_info_factory.h
index 42768fc7f5..eb150b39a2 100644
--- a/src/libcode/vx_data2d_factory/var_info_factory.h
+++ b/src/libcode/vx_data2d_factory/var_info_factory.h
@@ -23,7 +23,7 @@
 class VarInfoFactory
 {
    public:
-      static VarInfo *new_var_info(FileType t);
+      static VarInfo *new_var_info(GrdFileType t);
       static VarInfo *new_var_info(ConcatString s);
       static VarInfo *new_copy(const VarInfo *);
 };
diff --git a/src/libcode/vx_data2d_grib/data2d_grib.h b/src/libcode/vx_data2d_grib/data2d_grib.h
index 03cd1e6056..1834d18bf5 100644
--- a/src/libcode/vx_data2d_grib/data2d_grib.h
+++ b/src/libcode/vx_data2d_grib/data2d_grib.h
@@ -60,7 +60,7 @@ class MetGrib1DataFile : public Met2dDataFile {
          //  get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
       double operator () (int x, int y) const;
 
@@ -102,8 +102,8 @@ class MetGrib1DataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline double   MetGrib1DataFile::operator  () (int x, int y) const { return get(x, y);    }
-inline FileType MetGrib1DataFile::file_type ()                const { return FileType_Gb1; }
+inline double      MetGrib1DataFile::operator  () (int x, int y) const { return get(x, y);    }
+inline GrdFileType MetGrib1DataFile::file_type ()                const { return FileType_Gb1; }
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_grib/var_info_grib.h b/src/libcode/vx_data2d_grib/var_info_grib.h
index 929e88a17e..d4a5aa2a10 100644
--- a/src/libcode/vx_data2d_grib/var_info_grib.h
+++ b/src/libcode/vx_data2d_grib/var_info_grib.h
@@ -76,15 +76,15 @@ class VarInfoGrib : public VarInfo
          // get stuff
          //
 
-      FileType file_type() const;
-      int      ptv()       const;
-      int      code()      const;
-      int      lvl_type()  const;
-      int      p_code()    const;
-      int      center()    const;
-      int      subcenter() const;
-      int      field_rec() const;
-      int      tri()       const;
+      GrdFileType file_type() const;
+      int         ptv()       const;
+      int         code()      const;
+      int         lvl_type()  const;
+      int         p_code()    const;
+      int         center()    const;
+      int         subcenter() const;
+      int         field_rec() const;
+      int         tri()       const;
 
          //
          // set stuff
@@ -116,15 +116,15 @@ class VarInfoGrib : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType VarInfoGrib::file_type() const { return FileType_Gb1; }
-inline int      VarInfoGrib::ptv()       const { return PTV;          }
-inline int      VarInfoGrib::code()      const { return Code;         }
-inline int      VarInfoGrib::lvl_type()  const { return LvlType;      }
-inline int      VarInfoGrib::p_code()    const { return PCode;        }
-inline int      VarInfoGrib::center()    const { return Center;       }
-inline int      VarInfoGrib::subcenter() const { return Subcenter;    }
-inline int      VarInfoGrib::field_rec() const { return FieldRec;     }
-inline int      VarInfoGrib::tri()       const { return TRI;          }
+inline GrdFileType VarInfoGrib::file_type() const { return FileType_Gb1; }
+inline int         VarInfoGrib::ptv()       const { return PTV;          }
+inline int         VarInfoGrib::code()      const { return Code;         }
+inline int         VarInfoGrib::lvl_type()  const { return LvlType;      }
+inline int         VarInfoGrib::p_code()    const { return PCode;        }
+inline int         VarInfoGrib::center()    const { return Center;       }
+inline int         VarInfoGrib::subcenter() const { return Subcenter;    }
+inline int         VarInfoGrib::field_rec() const { return FieldRec;     }
+inline int         VarInfoGrib::tri()       const { return TRI;          }
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/libcode/vx_data2d_grib2/data2d_grib2.h b/src/libcode/vx_data2d_grib2/data2d_grib2.h
index 716fe517f4..3811f7cfa8 100644
--- a/src/libcode/vx_data2d_grib2/data2d_grib2.h
+++ b/src/libcode/vx_data2d_grib2/data2d_grib2.h
@@ -132,7 +132,7 @@ class MetGrib2DataFile : public Met2dDataFile {
          //  get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
          //  retrieve the first matching data plane
 
@@ -164,7 +164,7 @@ class MetGrib2DataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline FileType MetGrib2DataFile::file_type () const { return FileType_Gb2; }
+inline GrdFileType MetGrib2DataFile::file_type () const { return FileType_Gb2; }
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_grib2/var_info_grib2.h b/src/libcode/vx_data2d_grib2/var_info_grib2.h
index cd1712d57d..a7044fced7 100644
--- a/src/libcode/vx_data2d_grib2/var_info_grib2.h
+++ b/src/libcode/vx_data2d_grib2/var_info_grib2.h
@@ -81,7 +81,7 @@ class VarInfoGrib2 : public VarInfo
          // get stuff
          //
 
-      FileType    file_type()   const;
+      GrdFileType file_type()   const;
       int         record()      const;
       int         discipline()  const;
       int         m_table()     const;
@@ -147,28 +147,28 @@ class VarInfoGrib2 : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType VarInfoGrib2::file_type()  const { return FileType_Gb2; }
-inline int      VarInfoGrib2::record()     const { return Record;          }
-inline int      VarInfoGrib2::discipline() const { return Discipline;      }
-inline int      VarInfoGrib2::m_table()    const { return MTable;          }
-inline int      VarInfoGrib2::l_table()    const { return LTable;          }
-inline int      VarInfoGrib2::parm_cat()   const { return ParmCat;         }
-inline int      VarInfoGrib2::parm()       const { return Parm;            }
-inline int      VarInfoGrib2::pdt()        const { return PDTmpl;          }
-inline int      VarInfoGrib2::process()    const { return Process;         }
-inline int      VarInfoGrib2::ens_type()   const { return EnsType;         }
-inline int      VarInfoGrib2::der_type()   const { return DerType;         }
-inline int      VarInfoGrib2::stat_type()  const { return StatType;        }
-inline int      VarInfoGrib2::perc_val()   const { return PercVal;         }
-
-inline int      VarInfoGrib2::aerosol_type()          const { return AerosolType;         }
-inline int      VarInfoGrib2::aerosol_interval_type() const { return AerosolIntervalType; }
-inline double   VarInfoGrib2::aerosol_size_lower()    const { return AerosolSizeLower;    }
-inline double   VarInfoGrib2::aerosol_size_upper()    const { return AerosolSizeUpper;    }
-
-inline int      VarInfoGrib2::n_ipdtmpl()          const { return IPDTmplIndex.n(); } 
-inline int      VarInfoGrib2::ipdtmpl_index(int i) const { return IPDTmplIndex[i];  }
-inline int      VarInfoGrib2::ipdtmpl_val(int i)   const { return IPDTmplVal[i];    }
+inline GrdFileType VarInfoGrib2::file_type()  const { return FileType_Gb2; }
+inline int         VarInfoGrib2::record()     const { return Record;       }
+inline int         VarInfoGrib2::discipline() const { return Discipline;   }
+inline int         VarInfoGrib2::m_table()    const { return MTable;       }
+inline int         VarInfoGrib2::l_table()    const { return LTable;       }
+inline int         VarInfoGrib2::parm_cat()   const { return ParmCat;      }
+inline int         VarInfoGrib2::parm()       const { return Parm;         }
+inline int         VarInfoGrib2::pdt()        const { return PDTmpl;       }
+inline int         VarInfoGrib2::process()    const { return Process;      }
+inline int         VarInfoGrib2::ens_type()   const { return EnsType;      }
+inline int         VarInfoGrib2::der_type()   const { return DerType;      }
+inline int         VarInfoGrib2::stat_type()  const { return StatType;     }
+inline int         VarInfoGrib2::perc_val()   const { return PercVal;      }
+
+inline int    VarInfoGrib2::aerosol_type()          const { return AerosolType;         }
+inline int    VarInfoGrib2::aerosol_interval_type() const { return AerosolIntervalType; }
+inline double VarInfoGrib2::aerosol_size_lower()    const { return AerosolSizeLower;    }
+inline double VarInfoGrib2::aerosol_size_upper()    const { return AerosolSizeUpper;    }
+
+inline int VarInfoGrib2::n_ipdtmpl()          const { return IPDTmplIndex.n(); } 
+inline int VarInfoGrib2::ipdtmpl_index(int i) const { return IPDTmplIndex[i];  }
+inline int VarInfoGrib2::ipdtmpl_val(int i)   const { return IPDTmplVal[i];    }
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/libcode/vx_data2d_nc_cf/data2d_nc_cf.h b/src/libcode/vx_data2d_nc_cf/data2d_nc_cf.h
index 45d1e360c2..05e68fc54f 100644
--- a/src/libcode/vx_data2d_nc_cf/data2d_nc_cf.h
+++ b/src/libcode/vx_data2d_nc_cf/data2d_nc_cf.h
@@ -78,7 +78,7 @@ class MetNcCFDataFile : public Met2dDataFile {
       //  get stuff
       //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
       //  retrieve the first matching data plane
 
@@ -111,7 +111,7 @@ class MetNcCFDataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline FileType MetNcCFDataFile::file_type () const { return FileType_NcCF; }
+inline GrdFileType MetNcCFDataFile::file_type () const { return FileType_NcCF; }
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_nc_cf/var_info_nc_cf.h b/src/libcode/vx_data2d_nc_cf/var_info_nc_cf.h
index 49463896e3..cb5adbc975 100644
--- a/src/libcode/vx_data2d_nc_cf/var_info_nc_cf.h
+++ b/src/libcode/vx_data2d_nc_cf/var_info_nc_cf.h
@@ -54,7 +54,7 @@ class VarInfoNcCF : public VarInfo
       // get stuff
       //
 
-      FileType          file_type()      const;
+      GrdFileType       file_type()      const;
       const LongArray & dimension()      const;
       int               dimension(int i) const;
       const NumArray  & dim_value()      const;
@@ -86,7 +86,7 @@ class VarInfoNcCF : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType          VarInfoNcCF::file_type()      const { return FileType_NcCF;          }
+inline GrdFileType       VarInfoNcCF::file_type()      const { return FileType_NcCF;          }
 inline const LongArray & VarInfoNcCF::dimension()      const { return Dimension;              }
 inline int               VarInfoNcCF::dimension(int i) const { return Dimension[i];           }
 inline int               VarInfoNcCF::n_dimension()    const { return Dimension.n_elements(); }
diff --git a/src/libcode/vx_data2d_nc_met/data2d_nc_met.h b/src/libcode/vx_data2d_nc_met/data2d_nc_met.h
index 0c5f8379ba..d4ae16fc55 100644
--- a/src/libcode/vx_data2d_nc_met/data2d_nc_met.h
+++ b/src/libcode/vx_data2d_nc_met/data2d_nc_met.h
@@ -55,7 +55,7 @@ class MetNcMetDataFile : public Met2dDataFile {
          //  get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
          //  retrieve the first matching data plane
 
@@ -85,7 +85,7 @@ class MetNcMetDataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline FileType MetNcMetDataFile::file_type () const { return FileType_NcMet; }
+inline GrdFileType MetNcMetDataFile::file_type () const { return FileType_NcMet; }
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_nc_met/var_info_nc_met.h b/src/libcode/vx_data2d_nc_met/var_info_nc_met.h
index f9d0acc6c9..750662da18 100644
--- a/src/libcode/vx_data2d_nc_met/var_info_nc_met.h
+++ b/src/libcode/vx_data2d_nc_met/var_info_nc_met.h
@@ -50,10 +50,10 @@ class VarInfoNcMet : public VarInfo
          // get stuff
          //
 
-      FileType file_type()             const;
-      const    LongArray & dimension() const;
-      int      dimension(int i)        const;
-      int      n_dimension()           const;
+      GrdFileType file_type()             const;
+      const       LongArray & dimension() const;
+      int         dimension(int i)        const;
+      int         n_dimension()           const;
 
          //
          // set stuff
@@ -78,7 +78,7 @@ class VarInfoNcMet : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType          VarInfoNcMet::file_type()      const { return FileType_NcMet;         }
+inline GrdFileType       VarInfoNcMet::file_type()      const { return FileType_NcMet;         }
 inline const LongArray & VarInfoNcMet::dimension()      const { return Dimension;              }
 inline int               VarInfoNcMet::dimension(int i) const { return Dimension[i];           }
 inline int               VarInfoNcMet::n_dimension()    const { return Dimension.n_elements(); }
diff --git a/src/libcode/vx_data2d_nc_wrf/data2d_nc_wrf.h b/src/libcode/vx_data2d_nc_wrf/data2d_nc_wrf.h
index e198ad5084..a9a1e081c4 100644
--- a/src/libcode/vx_data2d_nc_wrf/data2d_nc_wrf.h
+++ b/src/libcode/vx_data2d_nc_wrf/data2d_nc_wrf.h
@@ -57,7 +57,7 @@ class MetNcWrfDataFile : public Met2dDataFile {
          //  get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
          //  retrieve the first matching data plane
 
@@ -87,7 +87,7 @@ class MetNcWrfDataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline FileType MetNcWrfDataFile::file_type () const { return ( FileType_NcWrf ); }
+inline GrdFileType MetNcWrfDataFile::file_type () const { return ( FileType_NcWrf ); }
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_nc_wrf/var_info_nc_wrf.h b/src/libcode/vx_data2d_nc_wrf/var_info_nc_wrf.h
index 976fd1eb38..f76554c6d1 100644
--- a/src/libcode/vx_data2d_nc_wrf/var_info_nc_wrf.h
+++ b/src/libcode/vx_data2d_nc_wrf/var_info_nc_wrf.h
@@ -213,7 +213,7 @@ class VarInfoNcWrf : public VarInfo
          // get stuff
          //
 
-      FileType          file_type()      const;
+      GrdFileType       file_type()      const;
       const LongArray & dimension()      const;
       int               dimension(int i) const;
       const NumArray  & dim_value()      const;
@@ -247,7 +247,7 @@ class VarInfoNcWrf : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType          VarInfoNcWrf::file_type()      const { return FileType_NcWrf;         }
+inline GrdFileType       VarInfoNcWrf::file_type()      const { return FileType_NcWrf;         }
 inline const LongArray & VarInfoNcWrf::dimension()      const { return Dimension;              }
 inline int               VarInfoNcWrf::dimension(int i) const { return Dimension[i];           }
 inline int               VarInfoNcWrf::n_dimension()    const { return Dimension.n_elements(); }
diff --git a/src/libcode/vx_data2d_python/data2d_python.cc b/src/libcode/vx_data2d_python/data2d_python.cc
index 4767271d11..cefd04cf79 100644
--- a/src/libcode/vx_data2d_python/data2d_python.cc
+++ b/src/libcode/vx_data2d_python/data2d_python.cc
@@ -131,7 +131,7 @@ return;
 ////////////////////////////////////////////////////////////////////////
 
 
-void MetPythonDataFile::set_type(const FileType t)
+void MetPythonDataFile::set_type(const GrdFileType t)
 
 {
 
diff --git a/src/libcode/vx_data2d_python/data2d_python.h b/src/libcode/vx_data2d_python/data2d_python.h
index 58f924c918..5376fc20d4 100644
--- a/src/libcode/vx_data2d_python/data2d_python.h
+++ b/src/libcode/vx_data2d_python/data2d_python.h
@@ -47,7 +47,7 @@ class MetPythonDataFile : public Met2dDataFile {
 
       VarInfoPython VInfo;
 
-      FileType Type;   // FileType_Python_Xarray or FileType_Python_Numpy
+      GrdFileType Type;   // FileType_Python_Xarray or FileType_Python_Numpy
 
    public:
 
@@ -59,13 +59,13 @@ class MetPythonDataFile : public Met2dDataFile {
          //  set stuff
          //
 
-      void set_type(const FileType);
+      void set_type(const GrdFileType);
 
          //
          //  get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
       double operator () (int x, int y) const;
 
@@ -100,8 +100,8 @@ class MetPythonDataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline double   MetPythonDataFile::operator  () (int x, int y) const { return get(x, y); }
-inline FileType MetPythonDataFile::file_type ()                const { return Type; }
+inline double      MetPythonDataFile::operator  () (int x, int y) const { return get(x, y); }
+inline GrdFileType MetPythonDataFile::file_type ()                const { return Type;      }
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_data2d_python/var_info_python.cc b/src/libcode/vx_data2d_python/var_info_python.cc
index 90af0089c0..71b2dc39e9 100644
--- a/src/libcode/vx_data2d_python/var_info_python.cc
+++ b/src/libcode/vx_data2d_python/var_info_python.cc
@@ -135,7 +135,7 @@ void VarInfoPython::dump(ostream &out) const {
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void VarInfoPython::set_file_type(const FileType t) {
+void VarInfoPython::set_file_type(const GrdFileType t) {
 
    if ( is_python_grdfiletype(t) ) {
 
@@ -146,7 +146,7 @@ void VarInfoPython::set_file_type(const FileType t) {
    }
 
    mlog << Error
-        << "VarInfoPython::set_file_type(const FileType) -> bad type ... "
+        << "VarInfoPython::set_file_type(const GrdFileType) -> bad type ... "
         << grdfiletype_to_string(t) << "\n\n";
 
    return;
diff --git a/src/libcode/vx_data2d_python/var_info_python.h b/src/libcode/vx_data2d_python/var_info_python.h
index d541045610..abdfec9021 100644
--- a/src/libcode/vx_data2d_python/var_info_python.h
+++ b/src/libcode/vx_data2d_python/var_info_python.h
@@ -31,7 +31,7 @@ class VarInfoPython : public VarInfo
 
    private:
 
-      FileType Type;
+      GrdFileType Type;
 
       void init_from_scratch();
       void assign(const VarInfoPython &);
@@ -50,13 +50,13 @@ class VarInfoPython : public VarInfo
          // get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
          //
          // set stuff
          //
 
-      void set_file_type(const FileType);
+      void set_file_type(const GrdFileType);
       void set_dict(Dictionary &);
 
          //
@@ -73,7 +73,7 @@ class VarInfoPython : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType VarInfoPython::file_type() const { return Type; }
+inline GrdFileType VarInfoPython::file_type() const { return Type; }
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h
index 5daf466372..0e1399118e 100644
--- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h
+++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h
@@ -83,7 +83,7 @@ class MetUGridDataFile : public Met2dDataFile {
       //  get stuff
       //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
       //  retrieve the first matching data plane
 
@@ -123,7 +123,7 @@ class MetUGridDataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline FileType MetUGridDataFile::file_type ()          const { return FileType_UGrid;         }
+inline GrdFileType  MetUGridDataFile::file_type()       const { return FileType_UGrid;         }
 inline ConcatString MetUGridDataFile::coordinate_file() const { return _file->coordinate_nc(); }
 
 
diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.h b/src/libcode/vx_data2d_ugrid/var_info_ugrid.h
index b53f8f28cb..6289fd62dc 100644
--- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.h
+++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.h
@@ -54,7 +54,7 @@ class VarInfoUGrid : public VarInfo
       // get stuff
       //
 
-      FileType          file_type()      const;
+      GrdFileType       file_type()      const;
       const LongArray & dimension()      const;
       int               dimension(int i) const;
       const NumArray  & dim_value()      const;
@@ -86,7 +86,7 @@ class VarInfoUGrid : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType          VarInfoUGrid::file_type()      const { return FileType_UGrid;         }
+inline GrdFileType       VarInfoUGrid::file_type()      const { return FileType_UGrid;         }
 inline const LongArray & VarInfoUGrid::dimension()      const { return Dimension;              }
 inline int               VarInfoUGrid::dimension(int i) const { return Dimension[i];           }
 inline int               VarInfoUGrid::n_dimension()    const { return Dimension.n_elements(); }
diff --git a/src/libcode/vx_series_data/series_data.cc b/src/libcode/vx_series_data/series_data.cc
index 2218720f8f..b2396bff3b 100644
--- a/src/libcode/vx_series_data/series_data.cc
+++ b/src/libcode/vx_series_data/series_data.cc
@@ -22,16 +22,16 @@ using namespace std;
 
 ////////////////////////////////////////////////////////////////////////
 
-static bool read_single_entry(VarInfo*, const ConcatString&, const FileType,
+static bool read_single_entry(VarInfo*, const ConcatString&, const GrdFileType,
                               DataPlane&, Grid&);
 
-static bool read_all_entries(vector<VarInfo*>&, const ConcatString&, const FileType,
+static bool read_all_entries(vector<VarInfo*>&, const ConcatString&, const GrdFileType,
                              vector<DataPlane>&, Grid&);
 
 ////////////////////////////////////////////////////////////////////////
 
 bool get_series_entry(int i_series, VarInfo* data_info,
-        const StringArray& search_files, const FileType type,
+        const StringArray& search_files, const GrdFileType type,
         DataPlane& dp, Grid& grid,
         bool error_out, bool print_warning) {
    int i;
@@ -80,7 +80,7 @@ bool get_series_entry(int i_series, VarInfo* data_info,
 ////////////////////////////////////////////////////////////////////////
 
 bool read_single_entry(VarInfo* info, const ConcatString& filename,
-        const FileType type, DataPlane& dp, Grid& grid) {
+        const GrdFileType type, DataPlane& dp, Grid& grid) {
 
    Met2dDataFileFactory mtddf_factory;
    Met2dDataFile* mtddf = (Met2dDataFile*) nullptr;
@@ -110,7 +110,7 @@ bool read_single_entry(VarInfo* info, const ConcatString& filename,
 ////////////////////////////////////////////////////////////////////////
 
 bool get_series_entries(int i_series, vector<VarInfo*> &vi_list,
-        const StringArray &search_files, const FileType type,
+        const StringArray &search_files, const GrdFileType type,
         vector<DataPlane> &dp_list, Grid &grid,
         bool error_out, bool print_warning) {
    int i;
@@ -162,7 +162,7 @@ bool get_series_entries(int i_series, vector<VarInfo*> &vi_list,
 ////////////////////////////////////////////////////////////////////////
 
 bool read_all_entries(vector<VarInfo*> &vi_list, const ConcatString &filename,
-        const FileType type, vector<DataPlane> &dp_list, Grid &grid) {
+        const GrdFileType type, vector<DataPlane> &dp_list, Grid &grid) {
 
    Met2dDataFileFactory mtddf_factory;
    Met2dDataFile* mtddf = (Met2dDataFile*) nullptr;
diff --git a/src/libcode/vx_series_data/series_data.h b/src/libcode/vx_series_data/series_data.h
index fa9b9eb8f3..bd92238440 100644
--- a/src/libcode/vx_series_data/series_data.h
+++ b/src/libcode/vx_series_data/series_data.h
@@ -24,12 +24,12 @@
 ////////////////////////////////////////////////////////////////////////
 
 bool get_series_entry(int, VarInfo*, const StringArray&,
-                      const FileType, DataPlane&, Grid&,
+                      const GrdFileType, DataPlane&, Grid&,
                       bool error_out=true,
                       bool print_warning=true);
 
 bool get_series_entries(int, std::vector<VarInfo*>&, const StringArray&,
-                        const FileType, std::vector<DataPlane>&, Grid&,
+                        const GrdFileType, std::vector<DataPlane>&, Grid&,
                         bool error_out=true,
                         bool print_warning=true);
 
diff --git a/src/libcode/vx_shapedata/mode_conf_info.cc b/src/libcode/vx_shapedata/mode_conf_info.cc
index 95d19891a6..080365c757 100644
--- a/src/libcode/vx_shapedata/mode_conf_info.cc
+++ b/src/libcode/vx_shapedata/mode_conf_info.cc
@@ -298,7 +298,7 @@ void ModeConfInfo::read_config(const char * default_file_name, const char * user
 
 ////////////////////////////////////////////////////////////////////////
 
-void ModeConfInfo::process_config_traditional(FileType ftype, FileType otype)
+void ModeConfInfo::process_config_traditional(GrdFileType ftype, GrdFileType otype)
 {
    process_config_except_fields();
    process_config_field (ftype, otype, ModeDataType::Traditional, 0);
@@ -507,7 +507,7 @@ void ModeConfInfo::process_config_except_fields()
 
 ////////////////////////////////////////////////////////////////////////
 
-void ModeConfInfo::process_config_field(FileType ftype, FileType otype,
+void ModeConfInfo::process_config_field(GrdFileType ftype, GrdFileType otype,
                                         ModeDataType dt, int field_index)
 
 {
@@ -530,7 +530,7 @@ void ModeConfInfo::process_config_field(FileType ftype, FileType otype,
 ////////////////////////////////////////////////////////////////////////
 
 
-void ModeConfInfo::process_config_both(FileType ftype, FileType otype,
+void ModeConfInfo::process_config_both(GrdFileType ftype, GrdFileType otype,
                                        int field_index)
 {
    int j, k, n;
@@ -604,7 +604,7 @@ void ModeConfInfo::process_config_both(FileType ftype, FileType otype,
 ////////////////////////////////////////////////////////////////////////
 
 
-void ModeConfInfo::process_config_fcst(FileType ftype, int field_index)
+void ModeConfInfo::process_config_fcst(GrdFileType ftype, int field_index)
 {
    int j, k, n;
 
@@ -641,7 +641,7 @@ void ModeConfInfo::process_config_fcst(FileType ftype, int field_index)
 ////////////////////////////////////////////////////////////////////////
 
 
-void ModeConfInfo::process_config_obs(FileType otype, int field_index)
+void ModeConfInfo::process_config_obs(GrdFileType otype, int field_index)
 {
    int j, k, n;
 
@@ -916,7 +916,7 @@ void ModeConfInfo::evaluate_obs_settings(int j)
 ////////////////////////////////////////////////////////////////////////
 
 
-void ModeConfInfo::read_fields_0 (Mode_Field_Info * & info_array, Dictionary * dict, FileType type, char _fo)
+void ModeConfInfo::read_fields_0 (Mode_Field_Info * & info_array, Dictionary * dict, GrdFileType type, char _fo)
 
 {
 
@@ -995,7 +995,7 @@ return;
 ////////////////////////////////////////////////////////////////////////
 
 
-void ModeConfInfo::read_fields_1 (Mode_Field_Info * & info_array, Dictionary * dict, FileType type, char _fo,
+void ModeConfInfo::read_fields_1 (Mode_Field_Info * & info_array, Dictionary * dict, GrdFileType type, char _fo,
                                   int field_index)
 
 {
@@ -1588,7 +1588,7 @@ void ModeConfInfo::set_data_type(ModeDataType type)
 
 ////////////////////////////////////////////////////////////////////////
 
-FileType ModeConfInfo::file_type_for_field(bool isFcst, int field_index)
+GrdFileType ModeConfInfo::file_type_for_field(bool isFcst, int field_index)
 {
    // look at the dictionary for the obs or forecast at index, with
    // parents
@@ -1623,7 +1623,7 @@ FileType ModeConfInfo::file_type_for_field(bool isFcst, int field_index)
       exit ( 1 );
    }
    Dictionary *dictf = e->dict_value();
-   return parse_conf_grd_file_type(dictf);
+   return parse_conf_file_type(dictf);
 }
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/libcode/vx_shapedata/mode_conf_info.h b/src/libcode/vx_shapedata/mode_conf_info.h
index a00fcbba8b..08f61ff3df 100644
--- a/src/libcode/vx_shapedata/mode_conf_info.h
+++ b/src/libcode/vx_shapedata/mode_conf_info.h
@@ -149,21 +149,21 @@ class ModeConfInfo {
 
       void read_config    (const char * default_filename, const char * user_filename);
 
-      void process_config_traditional(FileType ftype, FileType otype);
+      void process_config_traditional(GrdFileType ftype, GrdFileType otype);
 
       void process_config_except_fields();
 
-      void process_config_field (FileType ftype, FileType otype, ModeDataType dt, int field_index);
+      void process_config_field (GrdFileType ftype, GrdFileType otype, ModeDataType dt, int field_index);
 
       void config_set_all_percentile_thresholds(const std::vector<ModeInputData> &fdata,
                                                 const std::vector<ModeInputData> &odata);
       PercThreshType perctype(const Mode_Field_Info &f) const;
 
       // deal with zeroth field 
-      void read_fields_0 (Mode_Field_Info * &, Dictionary * dict, FileType, char _fo);
+      void read_fields_0 (Mode_Field_Info * &, Dictionary * dict, GrdFileType, char _fo);
 
       // deal with non-zeroth field 
-      void read_fields_1 (Mode_Field_Info * &, Dictionary * dict, FileType, char _fo, int field_index);
+      void read_fields_1 (Mode_Field_Info * &, Dictionary * dict, GrdFileType, char _fo, int field_index);
 
       PiecewiseLinear * parse_interest_function(Dictionary * dict, const char * conf_key_if);
 
@@ -295,14 +295,14 @@ class ModeConfInfo {
 
       void set_data_type(ModeDataType type);
 
-      FileType file_type_for_field(bool isFcst, int field_index);
+      GrdFileType file_type_for_field(bool isFcst, int field_index);
 
 private:
 
       // some private methods
-      void process_config_both(FileType ftype, FileType otype, int field_index=0);
-      void process_config_fcst(FileType ftype, int field_index=0);
-      void process_config_obs(FileType otype, int field_index=0);
+      void process_config_both(GrdFileType ftype, GrdFileType otype, int field_index=0);
+      void process_config_fcst(GrdFileType ftype, int field_index=0);
+      void process_config_obs(GrdFileType otype, int field_index=0);
       void evaluate_fcst_settings(int);
       void evaluate_obs_settings(int);
 
diff --git a/src/libcode/vx_shapedata/mode_field_info.cc b/src/libcode/vx_shapedata/mode_field_info.cc
index 47cc7211b4..df3bd475f7 100644
--- a/src/libcode/vx_shapedata/mode_field_info.cc
+++ b/src/libcode/vx_shapedata/mode_field_info.cc
@@ -193,7 +193,7 @@ return;
 ////////////////////////////////////////////////////////////////////////
 
 
-void Mode_Field_Info::set (const bool _multivar, int _index, Dictionary * _dict, MetConfig * _conf, FileType type, char _fo, bool do_clear)
+void Mode_Field_Info::set (const bool _multivar, int _index, Dictionary * _dict, MetConfig * _conf, GrdFileType type, char _fo, bool do_clear)
 
 {
 
@@ -338,7 +338,7 @@ if ( FO == 'F' )  raw_pi = parse_conf_plot_info(conf->lookup_dictionary(conf_key
 else              raw_pi = parse_conf_plot_info(conf->lookup_dictionary(conf_key_obs_raw_plot));
 
 
-file_type = parse_conf_grd_file_type(dict);
+file_type = parse_conf_file_type(dict);
  
    //
    //  done
diff --git a/src/libcode/vx_shapedata/mode_field_info.h b/src/libcode/vx_shapedata/mode_field_info.h
index ae276ae25b..fe0509ff36 100644
--- a/src/libcode/vx_shapedata/mode_field_info.h
+++ b/src/libcode/vx_shapedata/mode_field_info.h
@@ -46,7 +46,7 @@ class Mode_Field_Info {
 
       MetConfig * conf;    //  not allocated, based on reading the config file
 
-      FileType gft;
+      GrdFileType gft;
 
       char FO;   //  'F' or 'O', for fcst or obs
 
@@ -62,7 +62,7 @@ class Mode_Field_Info {
 
       void clear();
 
-      void set (const bool _multivar, int _index, Dictionary *, MetConfig *, FileType, char _fo, bool do_clear = false);
+      void set (const bool _multivar, int _index, Dictionary *, MetConfig *, GrdFileType, char _fo, bool do_clear = false);
 
       int index;
 
@@ -85,7 +85,7 @@ class Mode_Field_Info {
 
       PlotInfo       raw_pi;              // Raw forecast plotting info
 
-      FileType       file_type;           // each field can have a configured file type
+      GrdFileType    file_type;           // each field can have a configured file type
    
          //
          //  member functions
diff --git a/src/libcode/vx_statistics/apply_mask.cc b/src/libcode/vx_statistics/apply_mask.cc
index 6b2a25125b..3777adc5f0 100644
--- a/src/libcode/vx_statistics/apply_mask.cc
+++ b/src/libcode/vx_statistics/apply_mask.cc
@@ -418,7 +418,7 @@ void parse_poly_2d_data_mask(const ConcatString &mask_poly_str,
    }
 
    // Parse the requested file type
-   FileType type = parse_conf_grd_file_type(&config);
+   GrdFileType type = parse_conf_file_type(&config);
 
    // 2D Data file
    Met2dDataFileFactory mtddf_factory;
@@ -573,7 +573,7 @@ DataPlane parse_geog_data(Dictionary *dict, const Grid &vx_grid,
    DataPlane dp;
    StringArray geog_files;
    RegridInfo regrid_info;
-   FileType ftype;
+   GrdFileType ftype;
    Dictionary *field_dict = (Dictionary *) nullptr;
    bool found = false;
    int i;
@@ -602,7 +602,7 @@ DataPlane parse_geog_data(Dictionary *dict, const Grid &vx_grid,
    }
 
    // Check for specified file type
-   ftype = parse_conf_grd_file_type(field_dict);
+   ftype = parse_conf_file_type(field_dict);
 
    // Search each input file for a match
    for(i=0; !found && i<geog_files.n(); i++) {
diff --git a/src/libcode/vx_statistics/read_climo.cc b/src/libcode/vx_statistics/read_climo.cc
index ac17bced72..8f8ddd8e9b 100644
--- a/src/libcode/vx_statistics/read_climo.cc
+++ b/src/libcode/vx_statistics/read_climo.cc
@@ -27,7 +27,7 @@ using namespace std;
 ////////////////////////////////////////////////////////////////////////
 
 static void read_climo_file(
-          const char *, FileType, Dictionary *, unixtime,
+          const char *, GrdFileType, Dictionary *, unixtime,
           int, int, const Grid &, const RegridInfo &,
           DataPlaneArray &dpa, const char *);
 
@@ -170,7 +170,7 @@ DataPlaneArray read_climo_data_plane_array(Dictionary *dict,
                   nint(hour_interval * sec_per_hour));
 
    // Check if file_type was specified
-   FileType ctype = parse_conf_grd_file_type(&i_dict);
+   GrdFileType ctype = parse_conf_file_type(&i_dict);
 
    // Search the files for the requested records
    for(int i=0; i<climo_files.n(); i++) {
@@ -190,7 +190,7 @@ DataPlaneArray read_climo_data_plane_array(Dictionary *dict,
 
 ////////////////////////////////////////////////////////////////////////
 
-void read_climo_file(const char *climo_file, FileType ctype,
+void read_climo_file(const char *climo_file, GrdFileType ctype,
                      Dictionary *dict, unixtime vld_ut,
                      int day_ts, int hour_ts, const Grid &vx_grid,
                      const RegridInfo &regrid_default,
diff --git a/src/tools/core/ensemble_stat/ensemble_stat.cc b/src/tools/core/ensemble_stat/ensemble_stat.cc
index fa0c292590..68cfe50cc1 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat.cc
+++ b/src/tools/core/ensemble_stat/ensemble_stat.cc
@@ -119,9 +119,9 @@ static void process_command_line  (int, char **);
 static void process_grid          (const Grid &);
 static void process_n_vld         ();
 static void process_vx            ();
-static bool get_data_plane        (const char *, FileType, VarInfo *,
+static bool get_data_plane        (const char *, GrdFileType, VarInfo *,
                                    DataPlane &, bool do_regrid);
-static bool get_data_plane_array  (const char *, FileType, VarInfo *,
+static bool get_data_plane_array  (const char *, GrdFileType, VarInfo *,
                                    DataPlaneArray &, bool do_regrid);
 
 static void process_point_vx      ();
@@ -365,7 +365,7 @@ void process_command_line(int argc, char **argv) {
    conf_info.read_config(default_config_file, config_file);
 
    // Get the ensemble file type from config, if present
-   etype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
+   etype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
 
    // Get the ensemble file type from the files
    if(etype == FileType_None) {
@@ -398,7 +398,7 @@ void process_command_line(int argc, char **argv) {
    else {
 
       // Get the observation file type from config, if present
-      otype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
+      otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
 
       // Get the observation file type from the files
       if(otype == FileType_None) {
@@ -614,7 +614,7 @@ void process_n_vld() {
 
 ////////////////////////////////////////////////////////////////////////
 
-bool get_data_plane(const char *infile, FileType ftype,
+bool get_data_plane(const char *infile, GrdFileType ftype,
                     VarInfo *info, DataPlane &dp, bool do_regrid) {
    bool found;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
@@ -667,7 +667,7 @@ bool get_data_plane(const char *infile, FileType ftype,
 
 ////////////////////////////////////////////////////////////////////////
 
-bool get_data_plane_array(const char *infile, FileType ftype,
+bool get_data_plane_array(const char *infile, GrdFileType ftype,
                           VarInfo *info, DataPlaneArray &dpa,
                           bool do_regrid) {
    int n, i;
diff --git a/src/tools/core/ensemble_stat/ensemble_stat.h b/src/tools/core/ensemble_stat/ensemble_stat.h
index 0caec58e7b..3e14ebbaa1 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat.h
+++ b/src/tools/core/ensemble_stat/ensemble_stat.h
@@ -83,7 +83,7 @@ static IntArray     n_vx_vld;      // Number of members with valid data for each
 
 static StringArray  ens_file_list; // Array of ensemble input files
 static IntArray     ens_file_vld;  // Array of ensemble file valid status
-static FileType     etype = FileType_None;
+static GrdFileType  etype = FileType_None;
 
 static ConcatString ens_mean_file; // User-specified ensemble mean data file
 static ConcatString ctrl_file;     // Control member file
@@ -96,7 +96,7 @@ static bool         grid_obs_flag = false;
 static StringArray  point_obs_file_list;
 static bool         point_obs_flag = false;
 
-static FileType     otype = FileType_None;
+static GrdFileType  otype = FileType_None;
 
 // Input Config file
 static EnsembleStatConfInfo conf_info;
diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
index ccd6fbb920..c218975d6b 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
+++ b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
@@ -115,8 +115,8 @@ void EnsembleStatConfInfo::read_config(const ConcatString default_file_name,
 
 ////////////////////////////////////////////////////////////////////////
 
-void EnsembleStatConfInfo::process_config(FileType etype,
-                                          FileType otype,
+void EnsembleStatConfInfo::process_config(GrdFileType etype,
+                                          GrdFileType otype,
                                           bool grid_vx, bool point_vx,
                                           StringArray * ens_files,
                                           bool use_ctrl) {
@@ -637,8 +637,8 @@ void EnsembleStatVxOpt::clear() {
 
 ////////////////////////////////////////////////////////////////////////
 
-void EnsembleStatVxOpt::process_config(FileType ftype, Dictionary &fdict,
-                                       FileType otype, Dictionary &odict,
+void EnsembleStatVxOpt::process_config(GrdFileType ftype, Dictionary &fdict,
+                                       GrdFileType otype, Dictionary &odict,
                                        gsl_rng *rng_ptr, bool grid_vx, bool point_vx,
                                        StringArray ens_member_ids,
                                        StringArray * ens_files,
diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
index f5eaaf0f01..36d6cf5f95 100644
--- a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
+++ b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
@@ -142,8 +142,8 @@ class EnsembleStatVxOpt {
 
       void clear();
 
-      void process_config(FileType, Dictionary &,
-                          FileType, Dictionary &,
+      void process_config(GrdFileType, Dictionary &,
+                          GrdFileType, Dictionary &,
                           gsl_rng *, bool, bool,
                           StringArray, StringArray *,
                           bool, ConcatString);
@@ -245,7 +245,7 @@ class EnsembleStatConfInfo {
       void clear();
 
       void read_config   (const ConcatString , const ConcatString);
-      void process_config(FileType, FileType, bool, bool,
+      void process_config(GrdFileType, GrdFileType, bool, bool,
                           StringArray *, bool);
       void process_grib_codes();
       void process_flags ();
diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc
index 6cdb206796..45afc74615 100644
--- a/src/tools/core/grid_stat/grid_stat.cc
+++ b/src/tools/core/grid_stat/grid_stat.cc
@@ -233,7 +233,7 @@ const string get_tool_name()
 
 void process_command_line(int argc, char **argv) {
    CommandLine cline;
-   FileType ftype, otype;
+   GrdFileType ftype, otype;
    ConcatString default_config_file;
    DataPlane dp;
    const char *method_name = "process_command_line() -> ";
@@ -284,8 +284,8 @@ void process_command_line(int argc, char **argv) {
 #endif
 
    // Get the forecast and observation file types from config, if present
-   ftype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
-   otype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
+   ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
+   otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
 
    // Read forecast file
    if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) {
diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc
index 4c3035a489..d334804850 100644
--- a/src/tools/core/grid_stat/grid_stat_conf_info.cc
+++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc
@@ -137,8 +137,8 @@ void GridStatConfInfo::read_ugrid_configs(StringArray ugrid_config_names, const
 
 ////////////////////////////////////////////////////////////////////////
 
-void GridStatConfInfo::process_config(FileType ftype,
-                                      FileType otype) {
+void GridStatConfInfo::process_config(GrdFileType ftype,
+                                      GrdFileType otype) {
    int i, j, n_fvx, n_ovx;
    Dictionary *fdict = (Dictionary *) nullptr;
    Dictionary *odict = (Dictionary *) nullptr;
@@ -655,8 +655,8 @@ void GridStatVxOpt::clear() {
 ////////////////////////////////////////////////////////////////////////
 
 void GridStatVxOpt::process_config(
-        FileType ftype, Dictionary &fdict,
-        FileType otype, Dictionary &odict) {
+        GrdFileType ftype, Dictionary &fdict,
+        GrdFileType otype, Dictionary &odict) {
    int i, n;
    VarInfoFactory info_factory;
    map<STATLineType,STATOutputType>output_map;
diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.h b/src/tools/core/grid_stat/grid_stat_conf_info.h
index f1abfb1bc3..c3e72ee3a4 100644
--- a/src/tools/core/grid_stat/grid_stat_conf_info.h
+++ b/src/tools/core/grid_stat/grid_stat_conf_info.h
@@ -203,8 +203,8 @@ class GridStatVxOpt {
 
       void clear();
 
-      void process_config(FileType, Dictionary &,
-                          FileType, Dictionary &);
+      void process_config(GrdFileType, Dictionary &,
+                          GrdFileType, Dictionary &);
       void parse_nc_info(Dictionary &);
       bool is_uv_match(const GridStatVxOpt &) const;
 
@@ -305,7 +305,7 @@ class GridStatConfInfo {
 #ifdef WITH_UGRID
       void read_ugrid_configs(StringArray ugrid_config_names, const char * user_config);
 #endif
-      void process_config(FileType, FileType);
+      void process_config(GrdFileType, GrdFileType);
       void process_flags ();
       void process_masks (const Grid &);
 
diff --git a/src/tools/core/mode/mode_exec.cc b/src/tools/core/mode/mode_exec.cc
index a8df697509..db43b97ebe 100644
--- a/src/tools/core/mode/mode_exec.cc
+++ b/src/tools/core/mode/mode_exec.cc
@@ -153,8 +153,8 @@ void ModeExecutive::init_traditional(int n_files)
    conf_read();
 
    // Get the forecast and observation file types from config, if present
-   ftype = parse_conf_grd_file_type(engine.conf_info.conf.lookup_dictionary(conf_key_fcst));
-   otype = parse_conf_grd_file_type(engine.conf_info.conf.lookup_dictionary(conf_key_obs));
+   ftype = parse_conf_file_type(engine.conf_info.conf.lookup_dictionary(conf_key_fcst));
+   otype = parse_conf_file_type(engine.conf_info.conf.lookup_dictionary(conf_key_obs));
 
 
    // Read observation file
diff --git a/src/tools/core/mode/mode_exec.h b/src/tools/core/mode/mode_exec.h
index 35ad7549a8..184a2e0a74 100644
--- a/src/tools/core/mode/mode_exec.h
+++ b/src/tools/core/mode/mode_exec.h
@@ -137,7 +137,7 @@ class ModeExecutive {
    ShapeData Fcst_sd, Obs_sd;
 
    // not used by multivar
-   FileType ftype, otype;
+   GrdFileType ftype, otype;
 
    // set into execs's conf varInfo object, only for multivar intensity comparisons
    // for trad it's read in from the config
diff --git a/src/tools/core/mode/multivar_frontend.cc b/src/tools/core/mode/multivar_frontend.cc
index 460162c40d..baa0537791 100644
--- a/src/tools/core/mode/multivar_frontend.cc
+++ b/src/tools/core/mode/multivar_frontend.cc
@@ -67,15 +67,15 @@ int MultivarFrontEnd::run(const StringArray & Argv)
    int shift = config.shift_right;
 
    for (int i=0; i<n_fcst_files; ++i) {
-      FileType ft, ot;
+      GrdFileType ft, ot;
       ft = config.file_type_for_field(true, i);
-      ot = parse_conf_grd_file_type(config.conf.lookup_dictionary(conf_key_obs));
+      ot = parse_conf_file_type(config.conf.lookup_dictionary(conf_key_obs));
       read_input(fcst_filenames[i], i, ModeDataType::MvMode_Fcst, ft, ot, shift);
 
    }
    for (int i=0; i<n_obs_files; ++i) {
-      FileType ft, ot;
-      ft = parse_conf_grd_file_type(config.conf.lookup_dictionary(conf_key_fcst));
+      GrdFileType ft, ot;
+      ft = parse_conf_file_type(config.conf.lookup_dictionary(conf_key_fcst));
       ot = config.file_type_for_field(false, i);
       read_input(obs_filenames[i], i, ModeDataType::MvMode_Obs, ot, ft, shift);
    }
@@ -255,7 +255,7 @@ void MultivarFrontEnd::set_compress(const StringArray & a)
 ////////////////////////////////////////////////////////////////////////
 
 void MultivarFrontEnd::read_input(const string &name, int index, ModeDataType type,
-                                  FileType f_t, FileType other_t, int shift)
+                                  GrdFileType f_t, GrdFileType other_t, int shift)
 {
    Met2dDataFileFactory mtddf_factory;
    Met2dDataFile *f = mtddf_factory.new_met_2d_data_file(name.c_str(), f_t);
@@ -265,7 +265,7 @@ void MultivarFrontEnd::read_input(const string &name, int index, ModeDataType ty
       exit(1);
    }
    Grid g = f->grid();
-   FileType ft = f->file_type();
+   GrdFileType ft = f->file_type();
 
    //?
    f->set_shift_right(shift);
diff --git a/src/tools/core/mode/multivar_frontend.h b/src/tools/core/mode/multivar_frontend.h
index 65711f04af..f4c78c243d 100644
--- a/src/tools/core/mode/multivar_frontend.h
+++ b/src/tools/core/mode/multivar_frontend.h
@@ -76,7 +76,7 @@ class MultivarFrontEnd {
    static void set_compress  (const StringArray &);
 
    void read_input(const std::string &name, int index, ModeDataType type,
-                   FileType f_t, FileType other_t, int shift);
+                   GrdFileType f_t, GrdFileType other_t, int shift);
 
 
    void create_verif_grid(void);
diff --git a/src/tools/core/pair_stat/pair_stat.cc b/src/tools/core/pair_stat/pair_stat.cc
index 37d3e4b186..815a58e232 100644
--- a/src/tools/core/pair_stat/pair_stat.cc
+++ b/src/tools/core/pair_stat/pair_stat.cc
@@ -141,7 +141,7 @@ const string get_tool_name() {
 void process_command_line(int argc, char **argv) {
    int i;
    CommandLine cline;
-   FileType ftype;
+   GrdFileType ftype;
    ConcatString default_config_file;
    const char *method_name = "process_command_line() -> ";
 
diff --git a/src/tools/core/pair_stat/pair_stat_conf_info.cc b/src/tools/core/pair_stat/pair_stat_conf_info.cc
index 2b53b544aa..cd9d36b7e1 100644
--- a/src/tools/core/pair_stat/pair_stat_conf_info.cc
+++ b/src/tools/core/pair_stat/pair_stat_conf_info.cc
@@ -135,7 +135,7 @@ void PairStatConfInfo::read_ugrid_configs(StringArray ugrid_config_names, const
 
 ////////////////////////////////////////////////////////////////////////
 
-void PairStatConfInfo::process_config(FileType ftype) {
+void PairStatConfInfo::process_config(GrdFileType ftype) {
    int i, j, n_fvx, n_ovx;
    Dictionary *fdict = (Dictionary *) nullptr;
    Dictionary *odict = (Dictionary *) nullptr;
@@ -839,7 +839,7 @@ bool PairStatVxOpt::is_uv_match(const PairStatVxOpt &v) const {
 
 ////////////////////////////////////////////////////////////////////////
 
-void PairStatVxOpt::process_config(FileType ftype,
+void PairStatVxOpt::process_config(GrdFileType ftype,
         Dictionary &fdict, Dictionary &odict) {
    int n;
    VarInfoFactory info_factory;
diff --git a/src/tools/core/pair_stat/pair_stat_conf_info.h b/src/tools/core/pair_stat/pair_stat_conf_info.h
index f074c03911..73446bb915 100644
--- a/src/tools/core/pair_stat/pair_stat_conf_info.h
+++ b/src/tools/core/pair_stat/pair_stat_conf_info.h
@@ -163,7 +163,7 @@ class PairStatVxOpt {
 
       void clear();
 
-      void process_config(FileType, Dictionary &, Dictionary &);
+      void process_config(GrdFileType, Dictionary &, Dictionary &);
       void set_vx_pd(PairStatConfInfo *);
       bool is_uv_match(const PairStatVxOpt &) const;
 
@@ -272,7 +272,7 @@ class PairStatConfInfo {
       void read_ugrid_configs(StringArray ugrid_config_names, const char * user_config);
 #endif
 
-      void process_config(FileType);
+      void process_config(GrdFileType);
       void process_grib_codes();
       void process_flags();
       void process_masks(const Grid &);
diff --git a/src/tools/core/pcp_combine/pcp_combine.cc b/src/tools/core/pcp_combine/pcp_combine.cc
index 13677ce491..380eb85185 100644
--- a/src/tools/core/pcp_combine/pcp_combine.cc
+++ b/src/tools/core/pcp_combine/pcp_combine.cc
@@ -151,7 +151,7 @@ static ConcatString pcp_reg_exp = (string)default_reg_exp;
 
 // Variables for the derive command
 static StringArray  file_list;
-static FileType     file_list_type = FileType_None;
+static GrdFileType  file_list_type = FileType_None;
 static StringArray  field_list;
 static StringArray  derive_list;
 
@@ -1213,7 +1213,7 @@ bool get_field(const char *filename, const char *cur_field,
                Grid & grid, DataPlane & plane, bool error_out) {
    Met2dDataFileFactory factory;
    Met2dDataFile *mtddf = nullptr;
-   FileType ftype;
+   GrdFileType ftype;
    VarInfoFactory var_fac;
    VarInfo *cur_var = nullptr;
    const char *method_name = "get_field() -> ";
@@ -1240,7 +1240,7 @@ bool get_field(const char *filename, const char *cur_field,
    //
    // Get the gridded file type from config string, if present.
    //
-   ftype = parse_conf_grd_file_type(&config);
+   ftype = parse_conf_file_type(&config);
 
    //
    // If not set by the config string, use the file list type.
diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc
index 2b28be518c..735f85107e 100644
--- a/src/tools/core/point_stat/point_stat.cc
+++ b/src/tools/core/point_stat/point_stat.cc
@@ -232,7 +232,7 @@ const string get_tool_name() {
 void process_command_line(int argc, char **argv) {
    int i;
    CommandLine cline;
-   FileType ftype;
+   GrdFileType ftype;
    ConcatString default_config_file;
    const char *method_name = "process_command_line() -> ";
 
@@ -298,7 +298,7 @@ void process_command_line(int argc, char **argv) {
 #endif
 
    // Get the forecast file type from config, if present
-   ftype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
+   ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
 
    // Read forecast file
    if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) {
diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc
index fe9e6a9f45..cfd5e10432 100644
--- a/src/tools/core/point_stat/point_stat_conf_info.cc
+++ b/src/tools/core/point_stat/point_stat_conf_info.cc
@@ -135,7 +135,7 @@ void PointStatConfInfo::read_ugrid_configs(StringArray ugrid_config_names, const
 
 ////////////////////////////////////////////////////////////////////////
 
-void PointStatConfInfo::process_config(FileType ftype) {
+void PointStatConfInfo::process_config(GrdFileType ftype) {
    int i, j, n_fvx, n_ovx;
    Dictionary *fdict = (Dictionary *) nullptr;
    Dictionary *odict = (Dictionary *) nullptr;
@@ -839,7 +839,7 @@ bool PointStatVxOpt::is_uv_match(const PointStatVxOpt &v) const {
 
 ////////////////////////////////////////////////////////////////////////
 
-void PointStatVxOpt::process_config(FileType ftype,
+void PointStatVxOpt::process_config(GrdFileType ftype,
         Dictionary &fdict, Dictionary &odict) {
    int n;
    VarInfoFactory info_factory;
diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h
index 66425e12d7..9db3081dd7 100644
--- a/src/tools/core/point_stat/point_stat_conf_info.h
+++ b/src/tools/core/point_stat/point_stat_conf_info.h
@@ -163,7 +163,7 @@ class PointStatVxOpt {
 
       void clear();
 
-      void process_config(FileType, Dictionary &, Dictionary &);
+      void process_config(GrdFileType, Dictionary &, Dictionary &);
       void set_vx_pd(PointStatConfInfo *);
       bool is_uv_match(const PointStatVxOpt &) const;
 
@@ -272,7 +272,7 @@ class PointStatConfInfo {
       void read_ugrid_configs(StringArray ugrid_config_names, const char * user_config);
 #endif
 
-      void process_config(FileType);
+      void process_config(GrdFileType);
       void process_grib_codes();
       void process_flags();
       void process_masks(const Grid &);
diff --git a/src/tools/core/series_analysis/series_analysis.cc b/src/tools/core/series_analysis/series_analysis.cc
index 1b85e571f2..e5c3a62fe8 100644
--- a/src/tools/core/series_analysis/series_analysis.cc
+++ b/src/tools/core/series_analysis/series_analysis.cc
@@ -71,17 +71,17 @@ static void process_command_line(int, char **);
 static void process_grid        (const Grid &, const Grid &);
 
 static Met2dDataFile *get_mtddf(const StringArray &,
-                                const FileType);
+                                const GrdFileType);
 static bool           file_is_ok(const ConcatString &,
-                                 const FileType);
+                                 const GrdFileType);
 
 static void get_series_data(int, VarInfo *, VarInfo *,
                             DataPlane &, DataPlane &);
 static void get_series_entry(int, VarInfo *, const StringArray &,
-                             const FileType, StringArray &,
+                             const GrdFileType, StringArray &,
                              DataPlane &, Grid &);
 static bool read_single_entry(VarInfo *, const ConcatString &,
-                              const FileType, DataPlane &, Grid &);
+                              const GrdFileType, DataPlane &, Grid &);
 
 static void open_aggr_file();
 static DataPlane read_aggr_data_plane(const ConcatString &,
@@ -274,8 +274,8 @@ void process_command_line(int argc, char **argv) {
    conf_info.read_config(default_config_file.c_str(), config_file.c_str());
 
    // Get the forecast and observation file types from config, if present
-   ftype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
-   otype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
+   ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
+   otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
 
    // Get mtddf
    fcst_mtddf = get_mtddf(fcst_files, ftype);
@@ -427,7 +427,7 @@ void process_grid(const Grid &fcst_grid, const Grid &obs_grid) {
 ////////////////////////////////////////////////////////////////////////
 
 Met2dDataFile *get_mtddf(const StringArray &file_list,
-                         const FileType type) {
+                         const GrdFileType type) {
    int i;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
 
@@ -454,7 +454,7 @@ Met2dDataFile *get_mtddf(const StringArray &file_list,
 
 ////////////////////////////////////////////////////////////////////////
 
-bool file_is_ok(const ConcatString &file_name, const FileType t) {
+bool file_is_ok(const ConcatString &file_name, const GrdFileType t) {
    return(file_exists(file_name.c_str()) || is_python_grdfiletype(t));
 }
 
@@ -624,7 +624,7 @@ void get_series_data(int i_series,
 
 void get_series_entry(int i_series, VarInfo *info,
                       const StringArray &search_files,
-                      const FileType type,
+                      const GrdFileType type,
                       StringArray &found_files, DataPlane &dp,
                       Grid &cur_grid) {
    bool found = false;
@@ -699,7 +699,7 @@ void get_series_entry(int i_series, VarInfo *info,
 ////////////////////////////////////////////////////////////////////////
 
 bool read_single_entry(VarInfo *info, const ConcatString &cur_file,
-                       const FileType type, DataPlane &dp,
+                       const GrdFileType type, DataPlane &dp,
                        Grid &cur_grid) {
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
    bool found = false;
diff --git a/src/tools/core/series_analysis/series_analysis.h b/src/tools/core/series_analysis/series_analysis.h
index 1b46ac7c33..73b2f3d6f6 100644
--- a/src/tools/core/series_analysis/series_analysis.h
+++ b/src/tools/core/series_analysis/series_analysis.h
@@ -74,8 +74,8 @@ static const char * total_name = "TOTAL";
 // Input files
 static StringArray fcst_files, found_fcst_files;
 static StringArray obs_files, found_obs_files;
-static FileType ftype = FileType_None;
-static FileType otype = FileType_None;
+static GrdFileType ftype = FileType_None;
+static GrdFileType otype = FileType_None;
 static ConcatString aggr_file;
 static bool paired = false;
 static int compress_level = -1;
diff --git a/src/tools/core/series_analysis/series_analysis_conf_info.cc b/src/tools/core/series_analysis/series_analysis_conf_info.cc
index eebd36508e..fd19bf61bc 100644
--- a/src/tools/core/series_analysis/series_analysis_conf_info.cc
+++ b/src/tools/core/series_analysis/series_analysis_conf_info.cc
@@ -129,8 +129,8 @@ void SeriesAnalysisConfInfo::read_config(const char *default_file_name,
 
 ////////////////////////////////////////////////////////////////////////
 
-void SeriesAnalysisConfInfo::process_config(FileType ftype,
-                                            FileType otype) {
+void SeriesAnalysisConfInfo::process_config(GrdFileType ftype,
+                                            GrdFileType otype) {
    int i, n;
    ConcatString s;
    StringArray sa;
diff --git a/src/tools/core/series_analysis/series_analysis_conf_info.h b/src/tools/core/series_analysis/series_analysis_conf_info.h
index c850d69eed..01aff16098 100644
--- a/src/tools/core/series_analysis/series_analysis_conf_info.h
+++ b/src/tools/core/series_analysis/series_analysis_conf_info.h
@@ -89,7 +89,7 @@ class SeriesAnalysisConfInfo {
       void clear();
 
       void read_config   (const char *, const char *);
-      void process_config(FileType, FileType);
+      void process_config(GrdFileType, GrdFileType);
       void process_masks (const Grid &);
       int get_compression_level();
 
diff --git a/src/tools/core/wavelet_stat/wavelet_stat.cc b/src/tools/core/wavelet_stat/wavelet_stat.cc
index 027e9dc15b..89d05ce6ae 100644
--- a/src/tools/core/wavelet_stat/wavelet_stat.cc
+++ b/src/tools/core/wavelet_stat/wavelet_stat.cc
@@ -166,7 +166,7 @@ const string get_tool_name() {
 
 void process_command_line(int argc, char **argv) {
    CommandLine cline;
-   FileType ftype, otype;
+   GrdFileType ftype, otype;
    ConcatString default_config_file;
    DataPlane dp;
 
@@ -210,8 +210,8 @@ void process_command_line(int argc, char **argv) {
    conf_info.read_config(default_config_file.c_str(), config_file.c_str());
 
    // Get the forecast and observation file types from config, if present
-   ftype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
-   otype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
+   ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst));
+   otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs));
 
    // Read forecast file
    if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) {
diff --git a/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc b/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc
index 61b09ae42c..2c51c68857 100644
--- a/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc
+++ b/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc
@@ -134,8 +134,8 @@ void WaveletStatConfInfo::read_config(const char *default_file_name,
 
 ////////////////////////////////////////////////////////////////////////
 
-void WaveletStatConfInfo::process_config(FileType ftype,
-                                         FileType otype) {
+void WaveletStatConfInfo::process_config(GrdFileType ftype,
+                                         GrdFileType otype) {
    int i, j, n;
    VarInfoFactory info_factory;
    map<STATLineType,STATOutputType>output_map;
diff --git a/src/tools/core/wavelet_stat/wavelet_stat_conf_info.h b/src/tools/core/wavelet_stat/wavelet_stat_conf_info.h
index a13cbca1f7..11bdf93f90 100644
--- a/src/tools/core/wavelet_stat/wavelet_stat_conf_info.h
+++ b/src/tools/core/wavelet_stat/wavelet_stat_conf_info.h
@@ -121,7 +121,7 @@ class WaveletStatConfInfo {
       void clear();
 
       void read_config   (const char *, const char *);
-      void process_config(FileType, FileType);
+      void process_config(GrdFileType, GrdFileType);
       void process_tiles (const Grid &);
       void center_tiles  (int, int);
       void pad_tiles     (int, int);
diff --git a/src/tools/dev_utils/gen_climo_bin.cc b/src/tools/dev_utils/gen_climo_bin.cc
index 23b002b389..62541a8a67 100644
--- a/src/tools/dev_utils/gen_climo_bin.cc
+++ b/src/tools/dev_utils/gen_climo_bin.cc
@@ -333,7 +333,7 @@ void write_nc_bin(const DataPlane &dp, int i_cdf, double cdf_y) {
 ////////////////////////////////////////////////////////////////////////
 
 void get_field(const char *file, const char *config_str, DataPlane &dp) {
-   FileType ftype;
+   GrdFileType ftype;
    Met2dDataFile * mtddf_ptr = (Met2dDataFile * ) nullptr;
    Met2dDataFileFactory m_factory;
    VarInfo * vi_ptr = (VarInfo * ) nullptr;
@@ -346,7 +346,7 @@ void get_field(const char *file, const char *config_str, DataPlane &dp) {
    config.read_string(config_str);
 
    // Get the gridded file type from config string, if present
-   ftype = parse_conf_grd_file_type(&config);
+   ftype = parse_conf_file_type(&config);
 
    // Instantiate Met2dDataFile object from the factory
    mlog << Debug(1)  << "Opening data file: " << file << "\n";
diff --git a/src/tools/other/gen_ens_prod/gen_ens_prod.cc b/src/tools/other/gen_ens_prod/gen_ens_prod.cc
index 162ef8933a..d552e90405 100644
--- a/src/tools/other/gen_ens_prod/gen_ens_prod.cc
+++ b/src/tools/other/gen_ens_prod/gen_ens_prod.cc
@@ -62,7 +62,7 @@ static void process_ensemble();
 static void get_climo_mean_stdev(GenEnsProdVarInfo *, int,
                                  bool, int, DataPlane &, DataPlane &);
 static void get_ens_mean_stdev(GenEnsProdVarInfo *, DataPlane &, DataPlane &);
-static bool get_data_plane(const char *, FileType, VarInfo *, DataPlane &);
+static bool get_data_plane(const char *, GrdFileType, VarInfo *, DataPlane &);
 
 static void clear_counts();
 static void track_counts(GenEnsProdVarInfo *, const DataPlane &, bool,
@@ -186,7 +186,7 @@ void process_command_line(int argc, char **argv) {
    conf_info.read_config(default_config_file, config_file);
 
    // Get the ensemble file type from config, if present
-   etype = parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_ens));
+   etype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_ens));
 
    // Get the ensemble file type from the files
    if(etype == FileType_None) {
@@ -624,7 +624,7 @@ void get_ens_mean_stdev(GenEnsProdVarInfo *ens_info,
 
 ////////////////////////////////////////////////////////////////////////
 
-bool get_data_plane(const char *infile, FileType ftype,
+bool get_data_plane(const char *infile, GrdFileType ftype,
                     VarInfo *info, DataPlane &dp) {
    bool found;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
diff --git a/src/tools/other/gen_ens_prod/gen_ens_prod.h b/src/tools/other/gen_ens_prod/gen_ens_prod.h
index a9d9d96d02..ebf1d3a20f 100644
--- a/src/tools/other/gen_ens_prod/gen_ens_prod.h
+++ b/src/tools/other/gen_ens_prod/gen_ens_prod.h
@@ -66,7 +66,7 @@ static const char * default_config_filename =
 
 static StringArray        ens_files;
 static IntArray           ens_file_vld;
-static FileType           etype = FileType_None;
+static GrdFileType        etype = FileType_None;
 static int                n_ens_files;
 static GenEnsProdConfInfo conf_info;
 static ConcatString       config_file;
diff --git a/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.cc b/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.cc
index c37d49e9cf..52281061fd 100644
--- a/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.cc
+++ b/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.cc
@@ -101,7 +101,7 @@ void GenEnsProdConfInfo::read_config(const ConcatString default_file_name,
 
 ////////////////////////////////////////////////////////////////////////
 
-void GenEnsProdConfInfo::process_config(FileType etype, StringArray * ens_files, bool use_ctrl) {
+void GenEnsProdConfInfo::process_config(GrdFileType etype, StringArray * ens_files, bool use_ctrl) {
    int i, j;
    VarInfoFactory info_factory;
    Dictionary *edict = (Dictionary *) nullptr;
diff --git a/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.h b/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.h
index d6d42b6229..bb76ce0c63 100644
--- a/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.h
+++ b/src/tools/other/gen_ens_prod/gen_ens_prod_conf_info.h
@@ -99,7 +99,7 @@ class GenEnsProdConfInfo {
       void clear();
 
       void read_config   (const ConcatString, const ConcatString);
-      void process_config(FileType, StringArray *, bool);
+      void process_config(GrdFileType, StringArray *, bool);
 
       GenEnsProdNcOutInfo parse_nc_info(Dictionary *);
 
diff --git a/src/tools/other/gen_vx_mask/gen_vx_mask.cc b/src/tools/other/gen_vx_mask/gen_vx_mask.cc
index 0892f0dc34..83fe7cc568 100644
--- a/src/tools/other/gen_vx_mask/gen_vx_mask.cc
+++ b/src/tools/other/gen_vx_mask/gen_vx_mask.cc
@@ -389,7 +389,7 @@ void get_data_plane(const ConcatString &file_name,
                     bool read_gen_vx_mask_output,
                     DataPlane &dp, Grid &dp_grid) {
    ConcatString local_cs = config_str;
-   FileType ftype = FileType_None;
+   GrdFileType ftype = FileType_None;
 
    // Initialize to the global configuration
    MetConfig local_config = global_config;
@@ -397,7 +397,7 @@ void get_data_plane(const ConcatString &file_name,
    // Parse non-empty config strings
    if(local_cs.length() > 0) {
       local_config.read_string(local_cs.c_str());
-      ftype = parse_conf_grd_file_type(&local_config);
+      ftype = parse_conf_file_type(&local_config);
    }
 
    // Attempt to open the data file
diff --git a/src/tools/other/grid_diag/grid_diag.cc b/src/tools/other/grid_diag/grid_diag.cc
index a9fae02300..cd5ddc843b 100644
--- a/src/tools/other/grid_diag/grid_diag.cc
+++ b/src/tools/other/grid_diag/grid_diag.cc
@@ -245,7 +245,7 @@ void process_series(void) {
    DataPlane data_dp[conf_info.get_n_data()];
    double min, max;
    StringArray *cur_files;
-   FileType *cur_ftype;
+   GrdFileType *cur_ftype;
    Grid cur_grid;
    ConcatString i_var_str, j_var_str, ij_var_str;
 
@@ -752,7 +752,7 @@ Met2dDataFile *get_mtddf(const StringArray &file_list,
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
    Dictionary *dict = (Dictionary *) nullptr;
    Dictionary i_dict;
-   FileType file_type;
+   GrdFileType file_type;
    int i;
 
    // Conf: data.field
@@ -762,7 +762,7 @@ Met2dDataFile *get_mtddf(const StringArray &file_list,
    i_dict = parse_conf_i_vx_dict(dict, i_field);
 
    // Look for file_type in the i-th data.field entry
-   file_type = parse_conf_grd_file_type(&i_dict);
+   file_type = parse_conf_file_type(&i_dict);
 
    // Find the first file that actually exists
    for(i=0; i<file_list.n(); i++) {
diff --git a/src/tools/other/grid_diag/grid_diag.h b/src/tools/other/grid_diag/grid_diag.h
index e21ebf9f84..663bb70e7f 100644
--- a/src/tools/other/grid_diag/grid_diag.h
+++ b/src/tools/other/grid_diag/grid_diag.h
@@ -68,7 +68,7 @@ static const char * default_config_filename =
 
 // Input files
 static std::vector <StringArray> data_files;
-static std::vector <FileType> file_types;
+static std::vector <GrdFileType> file_types;
 static int compress_level = -1;
 
 // Output file
diff --git a/src/tools/other/grid_diag/grid_diag_conf_info.cc b/src/tools/other/grid_diag/grid_diag_conf_info.cc
index cd7b4e26fa..149145a622 100644
--- a/src/tools/other/grid_diag/grid_diag_conf_info.cc
+++ b/src/tools/other/grid_diag/grid_diag_conf_info.cc
@@ -121,13 +121,13 @@ void GridDiagConfInfo::set_n_data() {
 
 ////////////////////////////////////////////////////////////////////////
 
-void GridDiagConfInfo::process_config(vector<FileType> file_types) {
+void GridDiagConfInfo::process_config(vector<GrdFileType> file_types) {
    ConcatString s;
    StringArray sa;
    VarInfoFactory info_factory;
    Dictionary *dict = (Dictionary *) nullptr;
    Dictionary i_dict;
-   FileType file_type;
+   GrdFileType file_type;
 
    // Dump the contents of the config file
    if(mlog.verbosity_level() >= 5) conf.dump(cout);
diff --git a/src/tools/other/grid_diag/grid_diag_conf_info.h b/src/tools/other/grid_diag/grid_diag_conf_info.h
index 6a87f8efdd..5a4a2f1a13 100644
--- a/src/tools/other/grid_diag/grid_diag_conf_info.h
+++ b/src/tools/other/grid_diag/grid_diag_conf_info.h
@@ -58,7 +58,7 @@ class GridDiagConfInfo {
 
       void read_config(const char *, const char *);
       void set_n_data();
-      void process_config(std::vector<FileType>);
+      void process_config(std::vector<GrdFileType>);
       void process_masks(const Grid &);
 
       int get_n_data() const;
diff --git a/src/tools/other/mode_time_domain/mtd.cc b/src/tools/other/mode_time_domain/mtd.cc
index 72b662ba5e..aaad44203d 100644
--- a/src/tools/other/mode_time_domain/mtd.cc
+++ b/src/tools/other/mode_time_domain/mtd.cc
@@ -164,9 +164,9 @@ config.read_config(default_config_filename.c_str(), local_config_filename.c_str(
 
 if ( single_filenames.n() > 0 )  {
 
-   FileType stype;
+   GrdFileType stype;
 
-   stype = parse_conf_grd_file_type(config.conf.lookup_dictionary(conf_key_fcst));   //  use the "fcst" dictionary
+   stype = parse_conf_file_type(config.conf.lookup_dictionary(conf_key_fcst));   //  use the "fcst" dictionary
 
    single_filenames = parse_file_list(single_filenames);
 
@@ -187,10 +187,10 @@ if ( single_filenames.n() > 0 )  {
 fcst_filenames = parse_file_list(fcst_filenames);
 obs_filenames  = parse_file_list(obs_filenames);
 
-FileType ftype, otype;
+GrdFileType ftype, otype;
 
-ftype = parse_conf_grd_file_type(config.conf.lookup_dictionary(conf_key_fcst));
-otype = parse_conf_grd_file_type(config.conf.lookup_dictionary(conf_key_obs));
+ftype = parse_conf_file_type(config.conf.lookup_dictionary(conf_key_fcst));
+otype = parse_conf_file_type(config.conf.lookup_dictionary(conf_key_obs));
 
 if ( ftype == FileType_None ) ftype = grd_file_type(fcst_filenames[0].c_str());
 if ( otype == FileType_None ) otype = grd_file_type(obs_filenames[0].c_str());
diff --git a/src/tools/other/mode_time_domain/mtd_config_info.cc b/src/tools/other/mode_time_domain/mtd_config_info.cc
index d35a672802..c23af5a638 100644
--- a/src/tools/other/mode_time_domain/mtd_config_info.cc
+++ b/src/tools/other/mode_time_domain/mtd_config_info.cc
@@ -202,7 +202,7 @@ return;
 ////////////////////////////////////////////////////////////////////////
 
 
-void MtdConfigInfo::process_config(FileType ftype, FileType otype)
+void MtdConfigInfo::process_config(GrdFileType ftype, GrdFileType otype)
 
 {
 
diff --git a/src/tools/other/mode_time_domain/mtd_config_info.h b/src/tools/other/mode_time_domain/mtd_config_info.h
index 29a931bceb..fd38779b3a 100644
--- a/src/tools/other/mode_time_domain/mtd_config_info.h
+++ b/src/tools/other/mode_time_domain/mtd_config_info.h
@@ -73,7 +73,7 @@ class MtdConfigInfo {
 
       void read_config    (const char * default_filename, const char * user_filename);
 
-      void process_config (FileType ftype, FileType otype);
+      void process_config (GrdFileType ftype, GrdFileType otype);
 
       void parse_nc_info  ();
       void parse_txt_info  ();
diff --git a/src/tools/other/plot_data_plane/plot_data_plane.cc b/src/tools/other/plot_data_plane/plot_data_plane.cc
index 7a16a03d82..ecab619d02 100644
--- a/src/tools/other/plot_data_plane/plot_data_plane.cc
+++ b/src/tools/other/plot_data_plane/plot_data_plane.cc
@@ -98,7 +98,7 @@ int met_main(int argc, char * argv[]) {
    VarInfoFactory v_factory;
    DataPlane data_plane;
    Grid grid;
-   FileType ftype;
+   GrdFileType ftype;
    ColorTable color_table;
    double data_min, data_max;
    bool status = false;
@@ -130,7 +130,7 @@ int met_main(int argc, char * argv[]) {
    //
    // get the gridded file type from config string, if present
    //
-   ftype = parse_conf_grd_file_type(&config);
+   ftype = parse_conf_file_type(&config);
 
    //
    // instantiate the Met2dDataFile object using the data_2d_factory
diff --git a/src/tools/other/plot_point_obs/plot_point_obs_conf_info.cc b/src/tools/other/plot_point_obs/plot_point_obs_conf_info.cc
index b6c5382806..4a06fd3e89 100644
--- a/src/tools/other/plot_point_obs/plot_point_obs_conf_info.cc
+++ b/src/tools/other/plot_point_obs/plot_point_obs_conf_info.cc
@@ -429,7 +429,7 @@ void PlotPointObsConfInfo::process_config(
    dict = conf.lookup_dictionary(conf_key_grid_data);
 
    // Conf: grid_data.file_type, if present
-   FileType ftype = parse_conf_grd_file_type(dict);
+   GrdFileType ftype = parse_conf_file_type(dict);
 
    // Conf: field
    fdict = dict->lookup_array(conf_key_field);
diff --git a/src/tools/other/point2grid/point2grid.cc b/src/tools/other/point2grid/point2grid.cc
index 05440acfb2..cd24f6bac9 100644
--- a/src/tools/other/point2grid/point2grid.cc
+++ b/src/tools/other/point2grid/point2grid.cc
@@ -379,7 +379,7 @@ static void process_command_line(int argc, char **argv) {
 
 static void process_data_file() {
    Grid fr_grid;
-   FileType ftype;
+   GrdFileType ftype;
    ConcatString run_cs;
    auto nc_in = (NcFile *) nullptr;
    static const char *method_name = "process_data_file() -> ";
@@ -393,7 +393,7 @@ static void process_data_file() {
    if (compress_level < 0) compress_level = conf_info.conf.nc_compression();
 
    // Get the gridded file type from config string, if present
-   ftype = parse_conf_grd_file_type(&conf_info.conf);
+   ftype = parse_conf_file_type(&conf_info.conf);
 
    // Open the input file
    mlog << Debug(1)  << "Reading data file: " << InputFilename << "\n";
diff --git a/src/tools/other/regrid_data_plane/regrid_data_plane.cc b/src/tools/other/regrid_data_plane/regrid_data_plane.cc
index 2c0b63e170..0306c670a6 100644
--- a/src/tools/other/regrid_data_plane/regrid_data_plane.cc
+++ b/src/tools/other/regrid_data_plane/regrid_data_plane.cc
@@ -215,7 +215,7 @@ void process_command_line(int argc, char **argv) {
 void process_data_file() {
    DataPlane fr_dp, to_dp;
    Grid fr_grid, to_grid;
-   FileType ftype;
+   GrdFileType ftype;
    double dmin, dmax;
    ConcatString run_cs, vname;
    //Variables for GOES
@@ -233,7 +233,7 @@ void process_data_file() {
    if (compress_level < 0) compress_level = config.nc_compression();
 
    // Get the gridded file type from config string, if present
-   ftype = parse_conf_grd_file_type(&config);
+   ftype = parse_conf_file_type(&config);
 
    // Read the input data file
    Met2dDataFileFactory m_factory;
diff --git a/src/tools/other/shift_data_plane/shift_data_plane.cc b/src/tools/other/shift_data_plane/shift_data_plane.cc
index fd9eea2558..7f5e56da5b 100644
--- a/src/tools/other/shift_data_plane/shift_data_plane.cc
+++ b/src/tools/other/shift_data_plane/shift_data_plane.cc
@@ -85,7 +85,7 @@ static ConcatString shift_cs;
 static void process_command_line(int, char **);
 static void process_data_file();
 static void write_netcdf(const DataPlane &dp, const Grid &grid,
-                         const VarInfo *vinfo, const FileType& ftype);
+                         const VarInfo *vinfo, const GrdFileType& ftype);
 static void usage();
 static void set_from(const StringArray &);
 static void set_to(const StringArray &);
@@ -170,7 +170,7 @@ void process_command_line(int argc, char **argv) {
 void process_data_file() {
    DataPlane dp_in, dp_shift;
    Grid grid;
-   FileType ftype;
+   GrdFileType ftype;
    double fr_x, fr_y, to_x, to_y, dx, dy, v;
    int x, y;
 
@@ -183,7 +183,7 @@ void process_data_file() {
    if (compress_level < 0) compress_level = config.nc_compression();
 
    // Get the gridded file type from config string, if present
-   ftype = parse_conf_grd_file_type(&config);
+   ftype = parse_conf_file_type(&config);
 
    // Read the input data file
    Met2dDataFileFactory m_factory;
@@ -286,7 +286,7 @@ void process_data_file() {
 ////////////////////////////////////////////////////////////////////////
 
 void write_netcdf(const DataPlane &dp, const Grid &grid,
-                  const VarInfo *vinfo, const FileType &ftype) {
+                  const VarInfo *vinfo, const GrdFileType &ftype) {
    ConcatString cs;
    NcDim lat_dim, lon_dim;
 
diff --git a/src/tools/tc_utils/rmw_analysis/rmw_analysis_conf_info.cc b/src/tools/tc_utils/rmw_analysis/rmw_analysis_conf_info.cc
index 3f004834b8..7ff7463c9a 100644
--- a/src/tools/tc_utils/rmw_analysis/rmw_analysis_conf_info.cc
+++ b/src/tools/tc_utils/rmw_analysis/rmw_analysis_conf_info.cc
@@ -119,7 +119,7 @@ void RMWAnalysisConfInfo::process_config() {
     VarInfoFactory info_factory;
     Dictionary *fdict = (Dictionary *) nullptr;
     ConcatString poly_file;
-    FileType ftype = FileType_NcCF;
+    GrdFileType ftype = FileType_NcCF;
 
     // Conf: Version
     Version = Conf.lookup_string(conf_key_version);
diff --git a/src/tools/tc_utils/tc_diag/tc_diag.cc b/src/tools/tc_utils/tc_diag/tc_diag.cc
index e0a510f973..00abca8909 100644
--- a/src/tools/tc_utils/tc_diag/tc_diag.cc
+++ b/src/tools/tc_utils/tc_diag/tc_diag.cc
@@ -258,8 +258,8 @@ void get_file_type() {
    }
 
    // Get data file type from config
-   FileType conf_file_type =
-      parse_conf_grd_file_type(conf_info.conf.lookup_dictionary(conf_key_data));
+   GrdFileType conf_file_type =
+      parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_data));
 
    // Find the first file that actually exists
    for(i=0; i<file_list.n(); i++) {
diff --git a/src/tools/tc_utils/tc_diag/tc_diag.h b/src/tools/tc_utils/tc_diag/tc_diag.h
index fbe18a65e0..a153e28318 100644
--- a/src/tools/tc_utils/tc_diag/tc_diag.h
+++ b/src/tools/tc_utils/tc_diag/tc_diag.h
@@ -91,7 +91,7 @@ static std::map<std::string,DataOptInfo> data_opt_map;
 static StringArray    deck_source, deck_model_suffix;
 static ConcatString   config_file;
 static TCDiagConfInfo conf_info;
-static FileType       file_type = FileType_None;
+static GrdFileType    file_type = FileType_None;
 
 // Optional arguments
 static ConcatString out_dir;
diff --git a/src/tools/tc_utils/tc_diag/tc_diag_conf_info.cc b/src/tools/tc_utils/tc_diag/tc_diag_conf_info.cc
index bb446714bc..0ef7d137b7 100644
--- a/src/tools/tc_utils/tc_diag/tc_diag_conf_info.cc
+++ b/src/tools/tc_utils/tc_diag/tc_diag_conf_info.cc
@@ -224,7 +224,7 @@ void TCDiagConfInfo::read_config(const char *default_file_name,
 
 ////////////////////////////////////////////////////////////////////////
 
-void TCDiagConfInfo::process_config(FileType file_type,
+void TCDiagConfInfo::process_config(GrdFileType file_type,
                                     map<string,DataOptInfo> dmap) {
    int i, j;
    StringArray sa;
diff --git a/src/tools/tc_utils/tc_diag/tc_diag_conf_info.h b/src/tools/tc_utils/tc_diag/tc_diag_conf_info.h
index 00bce278e7..7d0db17ad2 100644
--- a/src/tools/tc_utils/tc_diag/tc_diag_conf_info.h
+++ b/src/tools/tc_utils/tc_diag/tc_diag_conf_info.h
@@ -144,7 +144,7 @@ class TCDiagConfInfo {
       void clear();
 
       void read_config(const char *, const char *);
-      void process_config(FileType,
+      void process_config(GrdFileType,
                           std::map<std::string,DataOptInfo>);
 
       void parse_domain_info(std::map<std::string,DataOptInfo>);
diff --git a/src/tools/tc_utils/tc_rmw/tc_rmw.cc b/src/tools/tc_utils/tc_rmw/tc_rmw.cc
index 52d262bc29..2dfe8afd6e 100644
--- a/src/tools/tc_utils/tc_rmw/tc_rmw.cc
+++ b/src/tools/tc_utils/tc_rmw/tc_rmw.cc
@@ -61,8 +61,8 @@ using namespace netCDF;
 static void usage();
 static void process_command_line(int, char**);
 
-static FileType get_file_type(const StringArray &, const FileType);
-static bool file_is_ok(const ConcatString &, const FileType);
+static GrdFileType get_file_type(const StringArray &, const GrdFileType);
+static bool file_is_ok(const ConcatString &, const GrdFileType);
 
 static void process_rmw();
 static void process_tracks(TrackInfoArray&);
@@ -193,7 +193,7 @@ void process_command_line(int argc, char **argv) {
                           config_file.c_str());
 
     // Get data file type from config
-    ftype = parse_conf_grd_file_type(conf_info.Conf.lookup_dictionary(
+    ftype = parse_conf_file_type(conf_info.Conf.lookup_dictionary(
                                  conf_key_data));
 
     // Get data file type from input files
@@ -210,12 +210,12 @@ void process_command_line(int argc, char **argv) {
 
 ////////////////////////////////////////////////////////////////////////
 
-FileType get_file_type(const StringArray &file_list,
-                       const FileType in_ftype) {
+GrdFileType get_file_type(const StringArray &file_list,
+                          const GrdFileType in_ftype) {
     int i;
     Met2dDataFileFactory mtddf_factory;
     Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
-    FileType out_ftype;
+    GrdFileType out_ftype;
 
     // Find the first file that actually exists
     for(i=0; i<file_list.n(); i++) {
@@ -246,7 +246,7 @@ FileType get_file_type(const StringArray &file_list,
 
 ////////////////////////////////////////////////////////////////////////
 
-bool file_is_ok(const ConcatString &file_name, const FileType t) {
+bool file_is_ok(const ConcatString &file_name, const GrdFileType t) {
     return(file_exists(file_name.c_str()) || is_python_grdfiletype(t));
 }
 
diff --git a/src/tools/tc_utils/tc_rmw/tc_rmw.h b/src/tools/tc_utils/tc_rmw/tc_rmw.h
index 9105855468..3bd0bfae40 100644
--- a/src/tools/tc_utils/tc_rmw/tc_rmw.h
+++ b/src/tools/tc_utils/tc_rmw/tc_rmw.h
@@ -81,7 +81,7 @@ static StringArray   data_files;
 static StringArray   deck_source, deck_model_suffix;
 static ConcatString  config_file;
 static TCRMWConfInfo conf_info;
-static FileType      ftype;
+static GrdFileType   ftype;
 static TCRMW_WindConverter wind_converter;
 
 // Optional arguments
diff --git a/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.cc b/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.cc
index 327ef19b36..eaaeebafeb 100644
--- a/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.cc
+++ b/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.cc
@@ -119,7 +119,7 @@ void TCRMWConfInfo::read_config(const char* default_file_name,
 
 ////////////////////////////////////////////////////////////////////////
 
-void TCRMWConfInfo::process_config(FileType ftype) {
+void TCRMWConfInfo::process_config(GrdFileType ftype) {
     int i;
     StringArray sa;
     VarInfoFactory info_factory;
diff --git a/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.h b/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.h
index ccd892e179..1e3bf5b3b2 100644
--- a/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.h
+++ b/src/tools/tc_utils/tc_rmw/tc_rmw_conf_info.h
@@ -71,7 +71,7 @@ class TCRMWConfInfo {
         void clear();
 
         void read_config(const char *, const char *);
-        void process_config(FileType);
+        void process_config(GrdFileType);
 
         int get_n_data() const;
 };
diff --git a/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.cc b/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.cc
index 338bca854b..58e4b9ea48 100644
--- a/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.cc
+++ b/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.cc
@@ -167,7 +167,7 @@ bool TCRMW_WindConverter::compute_winds_if_input_is_u(int i_point,
                                                       const string &varLevel,
                                                       unixtime valid_time,
                                                       const StringArray &data_files,
-                                                      const FileType &ftype,
+                                                      const GrdFileType &ftype,
                                                       const Grid &grid_in,
                                                       const Grid &grid_out,
                                                       const DataPlane &u_wind_dp,
diff --git a/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.h b/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.h
index 475d52c09a..819dcb999a 100644
--- a/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.h
+++ b/src/tools/tc_utils/tc_rmw/tc_rmw_wind_converter.h
@@ -112,7 +112,7 @@ class TCRMW_WindConverter {
                                    const string &varLevel,
                                    unixtime valid_time,
                                    const StringArray &data_files,
-                                   const FileType &ftype,
+                                   const GrdFileType &ftype,
                                    const Grid &grid_in,
                                    const Grid &grid_out,
                                    const DataPlane &u_wind_dp,