diff --git a/.gitignore b/.gitignore
index 8cb0b48f7c87..711b91bb5fdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,4 +87,6 @@ Mercurial
 # Ignore build folder
 ./build/
 build/
+
+# ninja binary (build system)
 ninja
diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp
index a79802b7fb6e..622fce275934 100644
--- a/Common/include/CConfig.hpp
+++ b/Common/include/CConfig.hpp
@@ -660,11 +660,6 @@ class CConfig {
   unsigned short Res_FEM_CRIT;        /*!< \brief Criteria to apply to the FEM convergence (absolute/relative). */
   unsigned long StartConv_Iter;       /*!< \brief Start convergence criteria at iteration. */
   su2double Cauchy_Eps;               /*!< \brief Epsilon used for the convergence. */
-  unsigned long Wrt_Sol_Freq,   /*!< \brief Writing solution frequency. */
-  Wrt_Sol_Freq_DualTime,        /*!< \brief Writing solution frequency for Dual Time. */
-  Wrt_Con_Freq,                 /*!< \brief Writing convergence history frequency. */
-  Wrt_Con_Freq_DualTime;        /*!< \brief Writing convergence history frequency. */
-  bool Wrt_Dynamic;             /*!< \brief Write dynamic data adding header and prefix. */
   bool Restart,                 /*!< \brief Restart solution (for direct, adjoint, and linearized problems).*/
   Read_Binary_Restart,          /*!< \brief Read binary SU2 native restart files.*/
   Restart_Flow;                 /*!< \brief Restart flow solution for adjoint and linearized problems. */
@@ -759,7 +754,6 @@ class CConfig {
   string Mesh_FileName,          /*!< \brief Mesh input file. */
   Mesh_Out_FileName,             /*!< \brief Mesh output file. */
   Solution_FileName,             /*!< \brief Flow solution input file. */
-  Solution_LinFileName,          /*!< \brief Linearized flow solution input file. */
   Solution_AdjFileName,          /*!< \brief Adjoint solution input file for drag functional. */
   Volume_FileName,               /*!< \brief Flow variables output file. */
   Residual_FileName,             /*!< \brief Residual variables output file. */
@@ -772,24 +766,13 @@ class CConfig {
   ObjFunc_Value_FileName,        /*!< \brief Objective function. */
   SurfCoeff_FileName,            /*!< \brief Output file with the flow variables on the surface. */
   SurfAdjCoeff_FileName,         /*!< \brief Output file with the adjoint variables on the surface. */
-  New_SU2_FileName,              /*!< \brief Output SU2 mesh file converted from CGNS format. */
   SurfSens_FileName,             /*!< \brief Output file for the sensitivity on the surface (discrete adjoint). */
   VolSens_FileName;              /*!< \brief Output file for the sensitivity in the volume (discrete adjoint). */
 
-  bool Wrt_Output,           /*!< \brief Write any output files */
-  Wrt_Vol_Sol,               /*!< \brief Write a volume solution file */
-  Wrt_Srf_Sol,               /*!< \brief Write a surface solution file */
-  Wrt_Csv_Sol,               /*!< \brief Write a surface comma-separated values solution file */
-  Wrt_Crd_Sol,               /*!< \brief Write a binary file with the grid coordinates only. */
-  Wrt_Residuals,             /*!< \brief Write residuals to solution file */
-  Wrt_Surface,               /*!< \brief Write solution at each surface */
-  Wrt_Limiters,              /*!< \brief Write residuals to solution file */
-  Wrt_SharpEdges,            /*!< \brief Write residuals to solution file */
-  Wrt_Halo,                  /*!< \brief Write rind layers in solution files */
+  bool
   Wrt_Performance,           /*!< \brief Write the performance summary at the end of a calculation.  */
   Wrt_AD_Statistics,         /*!< \brief Write the tape statistics (discrete adjoint).  */
   Wrt_MeshQuality,           /*!< \brief Write the mesh quality statistics to the visualization files.  */
-  Wrt_Slice,                 /*!< \brief Write 1D slice of a 2D cartesian solution */
   Wrt_Projected_Sensitivity, /*!< \brief Write projected sensitivities (dJ/dx) on surfaces to ASCII file. */
   Plot_Section_Forces;       /*!< \brief Write sectional forces for specified markers. */
   unsigned short
@@ -1010,7 +993,6 @@ class CConfig {
   long ParMETIS_edgeWgt;            /*!< \brief Load balancing weight given to edges. */
   unsigned short DirectDiff;        /*!< \brief Direct Differentation mode. */
   bool DiscreteAdjoint;                  /*!< \brief AD-based discrete adjoint mode. */
-  unsigned long Wrt_Surf_Freq_DualTime;  /*!< \brief Writing surface solution frequency for Dual Time. */
   su2double Const_DES;                 /*!< \brief Detached Eddy Simulation Constant. */
   unsigned short Kind_WindowFct;       /*!< \brief Type of window (weight) function for objective functional. */
   unsigned short Kind_HybridRANSLES;   /*!< \brief Kind of Hybrid RANS/LES. */
@@ -3073,102 +3055,6 @@ class CConfig {
    */
   su2double GetPhysicalTime(void) const { return PhysicalTime; }
 
-  /*!
-   * \brief Get the frequency for writing the solution file.
-   * \return It writes the solution file with this frequency.
-   */
-  unsigned long GetWrt_Sol_Freq(void) const { return Wrt_Sol_Freq; }
-
-  /*!
-   * \brief Get the frequency for writing the solution file in Dual Time.
-   * \return It writes the solution file with this frequency.
-   */
-  unsigned long GetWrt_Sol_Freq_DualTime(void) const { return Wrt_Sol_Freq_DualTime; }
-
-  /*!
-   * \brief Get the frequency for writing the convergence file.
-   * \return It writes the convergence file with this frequency.
-   */
-  unsigned long GetWrt_Con_Freq(void) const { return Wrt_Con_Freq; }
-
-  /*!
-   * \brief Set the frequency for writing the convergence file.
-   * \return It writes the convergence file with this frequency.
-   */
-  void SetWrt_Con_Freq(unsigned long val_freq) { Wrt_Con_Freq = val_freq; }
-
-  /*!
-   * \brief Get the frequency for writing the convergence file in Dual Time.
-   * \return It writes the convergence file with this frequency.
-   */
-  unsigned long GetWrt_Con_Freq_DualTime(void) const { return Wrt_Con_Freq_DualTime; }
-
-  /*!
-   * \brief Get information about writing unsteady headers and file extensions.
-   * \return    <code>TRUE</code> means that unsteady solution files will be written.
-   */
-  bool GetWrt_Unsteady(void);
-
-  /*!
-   * \brief Get information about writing output files.
-   * \return <code>TRUE</code> means that output files will be written.
-   */
-  bool GetWrt_Output(void) const { return Wrt_Output; }
-
-  /*!
-   * \brief Get information about writing a volume solution file.
-   * \return <code>TRUE</code> means that a volume solution file will be written.
-   */
-  bool GetWrt_Vol_Sol(void) const { return Wrt_Vol_Sol; }
-
-  /*!
-   * \brief Get information about writing a surface solution file.
-   * \return <code>TRUE</code> means that a surface solution file will be written.
-   */
-  bool GetWrt_Srf_Sol(void) const { return Wrt_Srf_Sol; }
-
-  /*!
-   * \brief Get information about writing a surface comma-separated values (CSV) solution file.
-   * \return <code>TRUE</code> means that a surface comma-separated values (CSV) solution file will be written.
-   */
-  bool GetWrt_Csv_Sol(void) const { return Wrt_Csv_Sol; }
-
-  /*!
-   * \brief Get information about writing a binary coordinates file.
-   * \return <code>TRUE</code> means that a binary coordinates file will be written.
-   */
-  bool GetWrt_Crd_Sol(void) const { return Wrt_Crd_Sol; }
-
-  /*!
-   * \brief Get information about writing residuals to volume solution file.
-   * \return <code>TRUE</code> means that residuals will be written to the solution file.
-   */
-  bool GetWrt_Residuals(void) const { return Wrt_Residuals; }
-
-  /*!
-   * \brief Get information about writing residuals to volume solution file.
-   * \return <code>TRUE</code> means that residuals will be written to the solution file.
-   */
-  bool GetWrt_Limiters(void) const { return Wrt_Limiters; }
-
-  /*!
-   * \brief Write solution at each surface.
-   * \return <code>TRUE</code> means that the solution at each surface will be written.
-   */
-  bool GetWrt_Surface(void) const { return Wrt_Surface; }
-
-  /*!
-   * \brief Get information about writing residuals to volume solution file.
-   * \return <code>TRUE</code> means that residuals will be written to the solution file.
-   */
-  bool GetWrt_SharpEdges(void) const { return Wrt_SharpEdges; }
-
-  /*!
-   * \brief Get information about writing rind layers to the solution files.
-   * \return <code>TRUE</code> means that rind layers will be written to the solution file.
-   */
-  bool GetWrt_Halo(void) const { return Wrt_Halo; }
-
   /*!
    * \brief Get information about writing the performance summary at the end of a calculation.
    * \return <code>TRUE</code> means that the performance summary will be written at the end of a calculation.
@@ -3187,12 +3073,6 @@ class CConfig {
    */
   bool GetWrt_MeshQuality(void) const { return Wrt_MeshQuality; }
 
-  /*!
-   * \brief Get information about writing a 1D slice of a 2D cartesian solution.
-   * \return <code>TRUE</code> means that a 1D slice of a 2D cartesian solution will be written.
-   */
-  bool GetWrt_Slice(void) const { return Wrt_Slice; }
-
   /*!
    * \brief Get information about writing projected sensitivities on surfaces to an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex.
    * \return <code>TRUE</code> means that projected sensitivities on surfaces in an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex will be written.
@@ -8523,12 +8403,6 @@ class CConfig {
    */
   void SetiInst(unsigned short val_iInst) { iInst = val_iInst; }
 
-  /*!
-   * \brief Get information about writing dynamic structural analysis headers and file extensions.
-   * \return    <code>TRUE</code> means that dynamic structural analysis solution files will be written.
-   */
-  bool GetWrt_Dynamic(void) const { return Wrt_Dynamic; }
-
   /*!
    * \brief Get Newmark alpha parameter.
    * \return Value of the Newmark alpha parameter.
@@ -8908,12 +8782,6 @@ class CConfig {
    */
   su2double GetRestart_Bandwidth_Agg(void) const { return Restart_Bandwidth_Agg; }
 
-  /*!
-   * \brief Get the frequency for writing the surface solution file in Dual Time.
-   * \return It writes the surface solution file with this frequency.
-   */
-  unsigned long GetWrt_Surf_Freq_DualTime(void) const { return Wrt_Surf_Freq_DualTime; }
-
   /*!
    * \brief Get the Kind of Hybrid RANS/LES.
    * \return Value of Hybrid RANS/LES method.
@@ -9303,6 +9171,7 @@ class CConfig {
 
   /*!
    * \brief GetScreen_Wrt_Freq_Inner
+   * \param[in] iter: index for Time (0), Outer (1), or Inner (2) iterations
    * \return
    */
   unsigned long GetScreen_Wrt_Freq(unsigned short iter) const { return ScreenWrtFreq[iter]; }
diff --git a/Common/include/geometry/CGeometry.hpp b/Common/include/geometry/CGeometry.hpp
index eb6356af425d..15dc71f8075d 100644
--- a/Common/include/geometry/CGeometry.hpp
+++ b/Common/include/geometry/CGeometry.hpp
@@ -856,20 +856,6 @@ class CGeometry {
    */
   inline virtual void SetBoundControlVolume(CConfig *config, CGeometry *geometry, unsigned short action) {}
 
-  /*!
-   * \brief A virtual member.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_mesh_out_filename - Name of the output file.
-   */
-  inline virtual void SetMeshFile(CConfig *config, string val_mesh_out_filename) {}
-
-  /*!
-   * \brief A virtual member.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_mesh_out_filename - Name of the output file.
-   */
-  inline virtual void SetMeshFile(CGeometry *geometry, CConfig *config, string val_mesh_out_filename) {}
-
   /*!
    * \brief A virtual member.
    * \param[in] config - Definition of the particular problem.
diff --git a/Common/include/geometry/CMultiGridGeometry.hpp b/Common/include/geometry/CMultiGridGeometry.hpp
index 6a48f648efd3..472a45069db4 100644
--- a/Common/include/geometry/CMultiGridGeometry.hpp
+++ b/Common/include/geometry/CMultiGridGeometry.hpp
@@ -40,7 +40,6 @@ class CMultiGridGeometry final : public CGeometry {
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
   using CGeometry::SetVertex;
-  using CGeometry::SetMeshFile;
   using CGeometry::SetControlVolume;
   using CGeometry::SetBoundControlVolume;
   using CGeometry::SetPoint_Connectivity;
diff --git a/Common/include/geometry/CPhysicalGeometry.hpp b/Common/include/geometry/CPhysicalGeometry.hpp
index d0596b3a83c4..84e1acdd89c8 100644
--- a/Common/include/geometry/CPhysicalGeometry.hpp
+++ b/Common/include/geometry/CPhysicalGeometry.hpp
@@ -112,7 +112,6 @@ class CPhysicalGeometry final : public CGeometry {
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
   using CGeometry::SetVertex;
-  using CGeometry::SetMeshFile;
   using CGeometry::SetControlVolume;
   using CGeometry::SetBoundControlVolume;
   using CGeometry::SetPoint_Connectivity;
@@ -595,13 +594,6 @@ class CPhysicalGeometry final : public CGeometry {
    */
   void SetCoord_Smoothing(unsigned short val_nSmooth, su2double val_smooth_coeff, CConfig *config) override;
 
-  /*!
-   * \brief Write the .su2 file.
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] val_mesh_out_filename - Name of the output file.
-   */
-  void SetMeshFile(CConfig *config, string val_mesh_out_filename) override;
-
   /*!
    * \brief Compute 3 grid quality metrics: orthogonality angle, dual cell aspect ratio, and dual cell volume ratio.
    * \param[in] config - Definition of the particular problem.
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
index 2d92146202af..023d6fcef2c3 100644
--- a/Common/src/CConfig.cpp
+++ b/Common/src/CConfig.cpp
@@ -2001,53 +2001,10 @@ void CConfig::SetConfig_Options() {
   /*!\brief VOLUME_SENS_FILENAME
    *  \n DESCRIPTION: Output file volume sensitivity (discrete adjoint))  \ingroup Config*/
   addStringOption("VOLUME_SENS_FILENAME", VolSens_FileName, string("volume_sens"));
-  /*!\brief WRT_SOL_FREQ
-   *  \n DESCRIPTION: Writing solution file frequency  \ingroup Config*/
-  addUnsignedLongOption("WRT_SOL_FREQ", Wrt_Sol_Freq, 1000);
-  /*!\brief WRT_SOL_FREQ_DUALTIME
-   *  \n DESCRIPTION: Writing solution file frequency for dual time  \ingroup Config*/
-  addUnsignedLongOption("WRT_SOL_FREQ_DUALTIME", Wrt_Sol_Freq_DualTime, 1);
-  /*!\brief WRT_CON_FREQ
-   *  \n DESCRIPTION: Writing convergence history frequency  \ingroup Config*/
-  addUnsignedLongOption("WRT_CON_FREQ",  Wrt_Con_Freq, 1);
-  /*!\brief WRT_CON_FREQ_DUALTIME
-   *  \n DESCRIPTION: Writing convergence history frequency for the dual time  \ingroup Config*/
-  addUnsignedLongOption("WRT_CON_FREQ_DUALTIME",  Wrt_Con_Freq_DualTime, 10);
-  /*!\brief WRT_OUTPUT
-   *  \n DESCRIPTION: Write output files (disable all output by setting to NO)  \ingroup Config*/
-  addBoolOption("WRT_OUTPUT", Wrt_Output, true);
-  /*!\brief WRT_VOL_SOL
-   *  \n DESCRIPTION: Write a volume solution file  \ingroup Config*/
-  addBoolOption("WRT_VOL_SOL", Wrt_Vol_Sol, true);
-  /*!\brief WRT_SRF_SOL
-   *  \n DESCRIPTION: Write a surface solution file  \ingroup Config*/
-  addBoolOption("WRT_SRF_SOL", Wrt_Srf_Sol, true);
-  /*!\brief WRT_CSV_SOL
-   *  \n DESCRIPTION: Write a surface CSV solution file  \ingroup Config*/
-  addBoolOption("WRT_CSV_SOL", Wrt_Csv_Sol, true);
-  /*!\brief WRT_CSV_SOL
-   *  \n DESCRIPTION: Write a binary coordinates file  \ingroup Config*/
-  addBoolOption("WRT_CRD_SOL", Wrt_Crd_Sol, false);
-  /*!\brief WRT_SURFACE
-   *  \n DESCRIPTION: Output solution at each surface  \ingroup Config*/
-  addBoolOption("WRT_SURFACE", Wrt_Surface, false);
-  /*!\brief WRT_RESIDUALS
-   *  \n DESCRIPTION: Output residual info to solution/restart file  \ingroup Config*/
-  addBoolOption("WRT_RESIDUALS", Wrt_Residuals, false);
-  /*!\brief WRT_LIMITERS
-   *  \n DESCRIPTION: Output limiter value information to solution/restart file  \ingroup Config*/
-  addBoolOption("WRT_LIMITERS", Wrt_Limiters, false);
-  /*!\brief WRT_SHARPEDGES
-   *  \n DESCRIPTION: Output sharp edge limiter information to solution/restart file  \ingroup Config*/
-  addBoolOption("WRT_SHARPEDGES", Wrt_SharpEdges, false);
-  /* DESCRIPTION: Output the rind layers in the solution files  \ingroup Config*/
-  addBoolOption("WRT_HALO", Wrt_Halo, false);
   /* DESCRIPTION: Output the performance summary to the console at the end of SU2_CFD  \ingroup Config*/
   addBoolOption("WRT_PERFORMANCE", Wrt_Performance, false);
   /* DESCRIPTION: Output the tape statistics (discrete adjoint)  \ingroup Config*/
   addBoolOption("WRT_AD_STATISTICS", Wrt_AD_Statistics, false);
-    /* DESCRIPTION: Output a 1D slice of a 2D cartesian solution \ingroup Config*/
-  addBoolOption("WRT_SLICE", Wrt_Slice, false);
   /*!\brief MARKER_ANALYZE_AVERAGE
    *  \n DESCRIPTION: Output averaged flow values on specified analyze marker.
    *  Options: AREA, MASSFLUX
@@ -2705,9 +2662,6 @@ void CConfig::SetConfig_Options() {
   /*--- options that are used in the Hybrid RANS/LES Simulations  ---*/
   /*!\par CONFIG_CATEGORY:Hybrid_RANSLES Options\ingroup Config*/
 
-  /* DESCRIPTION: Writing surface solution file frequency for dual time */
-  addUnsignedLongOption("WRT_SURF_FREQ_DUALTIME", Wrt_Surf_Freq_DualTime, 1);
-
   /* DESCRIPTION: Starting Iteration for windowing approach */
   addUnsignedLongOption("WINDOW_START_ITER", StartWindowIteration, 0);
 
@@ -2906,6 +2860,22 @@ void CConfig::SetConfig_Parsing(istream& config_buffer){
             newString.append("VISUALIZE_VOLUME_DEF is deprecated. Simply add a volume format to OUTPUT_FILES.\n\n");
           if (!option_name.compare("WRT_BINARY_RESTART"))
             newString.append("WRT_BINARY_RESTART is deprecated. The type of restart is determined from the OUTPUT_FILES list.\n\n");
+          if (!option_name.compare("WRT_RESIDUALS"))
+            newString.append("WRT_RESIDUALS is deprecated. Use VOLUME_OUTPUT= ( RESIDUAL, ... ) instead.\n\n");
+          if (!option_name.compare("WRT_LIMITERS"))
+            newString.append("WRT_LIMITERS is deprecated. Use VOLUME_OUTPUT= ( LIMITER, ... ) instead.\n\n");
+          if (!option_name.compare("WRT_CON_FREQ"))
+            newString.append("WRT_CON_FREQ is deprecated. Use SCREEN_WRT_FREQ_INNER or SCREEN_WRT_FREQ_OUTER for multizone cases instead.\n\n");
+          if (!option_name.compare("WRT_CON_FREQ_DUALTIME"))
+            newString.append("WRT_CON_FREQ_DUALTIME is deprecated. Use SCREEN_WRT_FREQ_TIME instead.\n\n");
+          if (!option_name.compare("WRT_SRF_SOL"))
+            newString.append("WRT_SRF_SOL is deprecated. Simply add a surface format to OUTPUT_FILES.\n\n");
+          if (!option_name.compare("WRT_CSV_SOL"))
+            newString.append("WRT_CSV_SOL is deprecated. Simply add a CSV format to OUTPUT_FILES.\n\n");
+          if (!option_name.compare("WRT_SOL_FREQ"))
+            newString.append("WRT_SOL_FREQ is deprecated. Use OUTPUT_WRT_FREQ instead.\n\n");
+          if (!option_name.compare("WRT_SOL_FREQ_DUALTIME"))
+            newString.append("WRT_SOL_FREQ_DUALTIME is deprecated. Use OUTPUT_WRT_FREQ instead.\n\n");
           errorString.append(newString);
           err_count++;
           line_count++;
@@ -3436,20 +3406,30 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   }
 
   if (Time_Domain){
-    if (TimeMarching == TIME_STEPPING){
-      InnerIter = 1;
-    }
-    if (!OptionIsSet("OUTPUT_WRT_FREQ"))
-      VolumeWrtFreq = 1;
-    if (Restart == NO){
-      Restart_Iter = 0;
-    }
-    if (!OptionIsSet("HISTORY_WRT_FREQ_INNER")){
-      HistoryWrtFreq[2] = 0;
-    }
-    if (!OptionIsSet("HISTORY_WRT_FREQ_OUTER")){
-      HistoryWrtFreq[1] = 0;
-    }
+    Delta_UnstTime = Time_Step;
+    Delta_DynTime  = Time_Step;
+
+    if (TimeMarching == TIME_STEPPING){ InnerIter = 1; }
+
+    /*--- Set the default write frequency to 1 if unsteady instead of 250 ---*/
+    if (!OptionIsSet("OUTPUT_WRT_FREQ")) { VolumeWrtFreq = 1; }
+
+    /*--- Set History write freq for inner and outer iteration to zero by default, so only time iterations write. ---*/
+    if (!OptionIsSet("HISTORY_WRT_FREQ_INNER")) { HistoryWrtFreq[2] = 0; }
+    if (!OptionIsSet("HISTORY_WRT_FREQ_OUTER")) { HistoryWrtFreq[1] = 0; }
+
+    if (Restart == NO) { Restart_Iter = 0; }
+
+    if (Time_Step <= 0.0 && Unst_CFL == 0.0){ SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION); }
+  } else {
+    nTimeIter = 1;
+    Time_Step = 0;
+
+    /*--- Entry 0 corresponds to unsteady simulation so for steady simulation are just set to 1. ---*/
+    ScreenWrtFreq[0]  = 1;
+    HistoryWrtFreq[0] = 1;
+
+    if (TimeMarching != HARMONIC_BALANCE) { TimeMarching = STEADY; }
   }
 
   /*--- Ensure that Discard_InFiles is false, owerwise the gradient could be wrong ---*/
@@ -3498,24 +3478,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     }
   }
 
-  /*--- Initialize the ofstream ConvHistFile. ---*/
-//  ofstream ConvHistFile;
-
-//  if (Kind_Solver == FEM_ELASTICITY) {
-
-//    if (Dynamic_Analysis == STATIC) { Wrt_Dynamic = false; }
-//    else { Wrt_Dynamic = true; }
-
-//  } else {
-//    Wrt_Dynamic = false;
-//  }
-
-  if (Kind_Radiation != NO_RADIATION) {
-    Radiation = true;
-  }
-  else{
-    Radiation = false;
-  }
+  Radiation = (Kind_Radiation != NO_RADIATION);
 
   /*--- Check for unsupported features. ---*/
 
@@ -3632,35 +3595,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Number of KIND_SURFACE_MOVEMENT must match number of MARKER_MOVING", CURRENT_FUNCTION);
   }
 
-  if (Time_Domain && Time_Step <= 0.0 && Unst_CFL == 0.0){
-    SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION);
-  }
-
   if (TimeMarching == TIME_STEPPING){
     nIter      = 1;
     nInnerIter  = 1;
   }
 
-  if (!Time_Domain){
-    nTimeIter = 1;
-    Time_Step = 0;
-
-    ScreenWrtFreq[0]  = 1;
-    HistoryWrtFreq[0] = 1;
-
-    if (TimeMarching != HARMONIC_BALANCE)
-      TimeMarching = STEADY;
-  }
-
-  if (Time_Domain){
-    Delta_UnstTime = Time_Step;
-    Delta_DynTime  = Time_Step;
-    /*--- Set the default write frequency to 1 if unsteady ---*/
-    if (!OptionIsSet("OUTPUT_WRT_FREQ")){
-      VolumeWrtFreq = 1;
-    }
-  }
-
   if (!Multizone_Problem){
     ScreenWrtFreq[1]  = 0;
     HistoryWrtFreq[1] = 0;
@@ -4805,16 +4744,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
     if (Comm_Level == COMM_NONE)
       SU2_MPI::Error("COMM_LEVEL = NONE not yet implemented.", CURRENT_FUNCTION);
-
-    Wrt_Sol_Freq          = nTimeIter+1;
-    Wrt_Sol_Freq_DualTime = nTimeIter+1;
-
-    /*--- Write only the restart. ---*/
-
-    Wrt_Slice   = false;
-    Wrt_Vol_Sol = false;
-    Wrt_Srf_Sol = false;
-    Wrt_Csv_Sol = false;
   }
 
   /*--- Check the conductivity model. Deactivate the turbulent component
@@ -4864,9 +4793,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     Kind_Linear_Solver = Kind_DiscAdj_Linear_Solver;
     Kind_Linear_Solver_Prec = Kind_DiscAdj_Linear_Prec;
 
-    /*--- Disable writing of limiters if enabled ---*/
-    Wrt_Limiters = false;
-
     if (TimeMarching) {
 
       Restart_Flow = false;
diff --git a/Common/src/geometry/CPhysicalGeometry.cpp b/Common/src/geometry/CPhysicalGeometry.cpp
index 1a5b36a1f3ab..3a7a40c9a96d 100644
--- a/Common/src/geometry/CPhysicalGeometry.cpp
+++ b/Common/src/geometry/CPhysicalGeometry.cpp
@@ -7900,95 +7900,6 @@ void CPhysicalGeometry::VisualizeControlVolume(CConfig *config, unsigned short a
 
 }
 
-void CPhysicalGeometry::SetMeshFile (CConfig *config, string val_mesh_out_filename) {
-  unsigned long iElem, iPoint, iElem_Bound;
-  unsigned short iMarker, iNodes, iDim;
-  ofstream output_file;
-  string Grid_Marker;
-  char *cstr;
-
-  cstr = new char [val_mesh_out_filename.size()+1];
-  strcpy (cstr, val_mesh_out_filename.c_str());
-
-  /*--- Open .su2 grid file ---*/
-
-  output_file.precision(15);
-  output_file.open(cstr, ios::out);
-
-  /*--- Write dimension, number of elements and number of points ---*/
-
-  output_file << "NDIME= " << nDim << endl;
-  output_file << "NELEM= " << nElem << endl;
-  for (iElem = 0; iElem < nElem; iElem++) {
-    output_file << elem[iElem]->GetVTK_Type();
-    for (iNodes = 0; iNodes < elem[iElem]->GetnNodes(); iNodes++)
-      output_file << "\t" << elem[iElem]->GetNode(iNodes);
-    output_file << "\t"<<iElem<< endl;
-  }
-
-  /*--- Write the node coordinates ---*/
-
-  output_file << "NPOIN= " << nPoint << "\t" << nPointDomain << endl;
-  output_file.precision(15);
-  for (iPoint = 0; iPoint < nPoint; iPoint++) {
-    for (iDim = 0; iDim < nDim; iDim++)
-      output_file << scientific << "\t" << nodes->GetCoord(iPoint, iDim) ;
-#ifndef HAVE_MPI
-    output_file << "\t" << iPoint << endl;
-#else
-    output_file << "\t" << iPoint << "\t" << nodes->GetGlobalIndex(iPoint) << endl;
-#endif
-
-  }
-
-  /*--- Loop through and write the boundary info ---*/
-
-  output_file << "NMARK= " << nMarker << endl;
-  for (iMarker = 0; iMarker < nMarker; iMarker++) {
-
-    /*--- Ignore SEND_RECEIVE for the moment ---*/
-    if (bound[iMarker][0]->GetVTK_Type() != VERTEX) {
-
-      Grid_Marker = config->GetMarker_All_TagBound(iMarker);
-      output_file << "MARKER_TAG= " << Grid_Marker << endl;
-      output_file << "MARKER_ELEMS= " << nElem_Bound[iMarker]<< endl;
-
-      if (nDim == 2) {
-        for (iElem_Bound = 0; iElem_Bound < nElem_Bound[iMarker]; iElem_Bound++) {
-          output_file << bound[iMarker][iElem_Bound]->GetVTK_Type() << "\t" ;
-          for (iNodes = 0; iNodes < bound[iMarker][iElem_Bound]->GetnNodes(); iNodes++)
-            output_file << bound[iMarker][iElem_Bound]->GetNode(iNodes) << "\t" ;
-          output_file << iElem_Bound << endl;
-        }
-      }
-
-      if (nDim == 3) {
-        for (iElem_Bound = 0; iElem_Bound < nElem_Bound[iMarker]; iElem_Bound++) {
-          output_file << bound[iMarker][iElem_Bound]->GetVTK_Type() << "\t" ;
-          for (iNodes = 0; iNodes < bound[iMarker][iElem_Bound]->GetnNodes(); iNodes++)
-            output_file << bound[iMarker][iElem_Bound]->GetNode(iNodes) << "\t" ;
-          output_file << iElem_Bound << endl;
-        }
-      }
-
-    } else if (bound[iMarker][0]->GetVTK_Type() == VERTEX) {
-      output_file << "MARKER_TAG= SEND_RECEIVE" << endl;
-      output_file << "MARKER_ELEMS= " << nElem_Bound[iMarker]<< endl;
-      if (config->GetMarker_All_SendRecv(iMarker) > 0) output_file << "SEND_TO= " << config->GetMarker_All_SendRecv(iMarker) << endl;
-      if (config->GetMarker_All_SendRecv(iMarker) < 0) output_file << "SEND_TO= " << config->GetMarker_All_SendRecv(iMarker) << endl;
-
-      for (iElem_Bound = 0; iElem_Bound < nElem_Bound[iMarker]; iElem_Bound++) {
-        output_file << bound[iMarker][iElem_Bound]->GetVTK_Type() << "\t" <<
-        bound[iMarker][iElem_Bound]->GetNode(0) << "\t" <<
-        bound[iMarker][iElem_Bound]->GetRotation_Type() << endl;
-      }
-
-    }
-  }
-
-  output_file.close();
-}
-
 void CPhysicalGeometry::SetCoord_Smoothing (unsigned short val_nSmooth, su2double val_smooth_coeff, CConfig *config) {
   unsigned short iSmooth, nneigh, iMarker;
   su2double *Coord_Old, *Coord_Sum, *Coord, *Coord_i, *Coord_j, Position_Plane = 0.0;
@@ -8958,7 +8869,7 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
     /*--- Error check for opening the file. ---*/
 
     if (!fhw) {
-      SU2_MPI::Error(string("Unable to open SU2 restart file ") + fname, CURRENT_FUNCTION);
+      SU2_MPI::Error(string("Unable to open SU2 restart file ") + string(fname), CURRENT_FUNCTION);
     }
 
     /*--- First, read the number of variables and points. ---*/
diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg
index 162970d11b92..3ed3ce1914d9 100644
--- a/QuickStart/inv_NACA0012.cfg
+++ b/QuickStart/inv_NACA0012.cfg
@@ -301,10 +301,7 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 250
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 % Available flow based objective functions or constraint functions
diff --git a/SU2_CFD/include/numerics/CNumerics.hpp b/SU2_CFD/include/numerics/CNumerics.hpp
index 81157b088ed2..2f401309bc81 100644
--- a/SU2_CFD/include/numerics/CNumerics.hpp
+++ b/SU2_CFD/include/numerics/CNumerics.hpp
@@ -539,6 +539,53 @@ class CNumerics {
 
   }
 
+  /*!
+   * \brief Add a correction using a Quadratic Constitutive Relation
+   *
+   * This function requires that the stress tensor already be
+   * computed using \ref GetStressTensor
+   *
+   * See: Spalart, P. R., "Strategies for Turbulence Modelling and
+   * Simulation," International Journal of Heat and Fluid Flow, Vol. 21,
+   * 2000, pp. 252-263
+   *
+   * \param[in] nDim: 2D or 3D.
+   * \param[in] gradvel: Velocity gradients.
+   * \param[in,out] tau: Shear stress tensor.
+   */
+  template <class U, class V>
+  inline static void AddQCR(unsigned short nDim, const U& gradvel, V& tau) {
+
+    const su2double c_cr1= 0.3;
+    unsigned short iDim, jDim, kDim;
+
+    /*--- Denominator Antisymmetric normalized rotation tensor ---*/
+
+    su2double den_aux = 0.0;
+    for (iDim = 0; iDim < nDim; iDim++)
+      for (jDim = 0; jDim < nDim; jDim++)
+        den_aux += gradvel[iDim][jDim] * gradvel[iDim][jDim];
+    den_aux = sqrt(max(den_aux,1E-10));
+
+    /*--- Adding the QCR contribution ---*/
+
+    su2double tauQCR[MAXNDIM][MAXNDIM] = {{0.0}};
+
+    for (iDim = 0; iDim < nDim; iDim++){
+      for (jDim = 0; jDim < nDim; jDim++){
+        for (kDim = 0; kDim < nDim; kDim++){
+          su2double O_ik = (gradvel[iDim][kDim] - gradvel[kDim][iDim])/ den_aux;
+          su2double O_jk = (gradvel[jDim][kDim] - gradvel[kDim][jDim])/ den_aux;
+          tauQCR[iDim][jDim] = c_cr1 * ((O_ik * tau[jDim][kDim]) + (O_jk * tau[iDim][kDim]));
+        }
+      }
+    }
+
+    for (iDim = 0; iDim < nDim; iDim++)
+      for (jDim = 0; jDim < nDim; jDim++)
+        tau[iDim][jDim] -= tauQCR[iDim][jDim];
+  }
+
   /*!
    * \brief Set the value of the first blending function.
    * \param[in] val_F1_i - Value of the first Menter blending function at point i.
diff --git a/SU2_CFD/include/numerics/flow/flow_diffusion.hpp b/SU2_CFD/include/numerics/flow/flow_diffusion.hpp
index c3131d48203d..e36b8a2d01e2 100644
--- a/SU2_CFD/include/numerics/flow/flow_diffusion.hpp
+++ b/SU2_CFD/include/numerics/flow/flow_diffusion.hpp
@@ -67,20 +67,6 @@ class CAvgGrad_Base : public CNumerics {
   su2double** Jacobian_i = nullptr;       /*!< \brief The Jacobian w.r.t. point i after computation. */
   su2double** Jacobian_j = nullptr;       /*!< \brief The Jacobian w.r.t. point j after computation. */
 
-  /*!
-   * \brief Add a correction using a Quadratic Constitutive Relation
-   *
-   * This function requires that the stress tensor already be
-   * computed using \ref GetStressTensor
-   *
-   * See: Spalart, P. R., "Strategies for Turbulence Modelling and
-   * Simulation," International Journal of Heat and Fluid Flow, Vol. 21,
-   * 2000, pp. 252-263
-   *
-   * \param[in] val_gradprimvar
-   */
-  void AddQCR(const su2double* const *val_gradprimvar);
-
   /*!
    * \brief Scale the stress tensor using a predefined wall stress.
    *
diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
index 94b8780ca034..a8ca6afba1a4 100644
--- a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
+++ b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl
@@ -552,7 +552,7 @@ void CFVMFlowSolverBase<V, R>::ComputeVerificationError(CGeometry* geometry, CCo
    global measures, one can compute the order of accuracy. ---*/
 
   bool write_heads =
-      ((((config->GetInnerIter() % (config->GetWrt_Con_Freq() * 40)) == 0) && (config->GetInnerIter() != 0)) ||
+      ((((config->GetInnerIter() % (config->GetScreen_Wrt_Freq(2) * 40)) == 0) && (config->GetInnerIter() != 0)) ||
        (config->GetInnerIter() == 1));
   if (!write_heads) return;
 
@@ -2193,34 +2193,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
       /*--- If necessary evaluate the QCR contribution to Tau ---*/
 
-      if (QCR) {
-        su2double den_aux, c_cr1 = 0.3, O_ik, O_jk;
-        unsigned short kDim;
-
-        /*--- Denominator Antisymmetric normalized rotation tensor ---*/
-
-        den_aux = 0.0;
-        for (iDim = 0; iDim < nDim; iDim++)
-          for (jDim = 0; jDim < nDim; jDim++) den_aux += Grad_Vel[iDim][jDim] * Grad_Vel[iDim][jDim];
-        den_aux = sqrt(max(den_aux, 1E-10));
-
-        /*--- Adding the QCR contribution ---*/
-
-        su2double tauQCR[MAXNDIM][MAXNDIM] = {{0.0}};
-
-        for (iDim = 0; iDim < nDim; iDim++) {
-          for (jDim = 0; jDim < nDim; jDim++) {
-            for (kDim = 0; kDim < nDim; kDim++) {
-              O_ik = (Grad_Vel[iDim][kDim] - Grad_Vel[kDim][iDim]) / den_aux;
-              O_jk = (Grad_Vel[jDim][kDim] - Grad_Vel[kDim][jDim]) / den_aux;
-              tauQCR[iDim][jDim] += O_ik * Tau[jDim][kDim] + O_jk * Tau[iDim][kDim];
-            }
-          }
-        }
-
-        for (iDim = 0; iDim < nDim; iDim++)
-          for (jDim = 0; jDim < nDim; jDim++) Tau[iDim][jDim] -= c_cr1 * tauQCR[iDim][jDim];
-      }
+      if (QCR) CNumerics::AddQCR(nDim, Grad_Vel, Tau);
 
       /*--- Project Tau in each surface element ---*/
 
diff --git a/SU2_CFD/include/variables/CEulerVariable.hpp b/SU2_CFD/include/variables/CEulerVariable.hpp
index 1e977d365370..3eee69cbd2cc 100644
--- a/SU2_CFD/include/variables/CEulerVariable.hpp
+++ b/SU2_CFD/include/variables/CEulerVariable.hpp
@@ -53,7 +53,7 @@ class CEulerVariable : public CVariable {
   MatrixType Limiter_Primitive;            /*!< \brief Limiter of the primitive variables (T, vx, vy, vz, P, rho). */
 
   /*--- Secondary variable definition ---*/
-  MatrixType Secondary;        /*!< \brief Primitive variables (T, vx, vy, vz, P, rho, h, c) in compressible flows. */
+  MatrixType Secondary;        /*!< \brief Secondary variables (dPdrho_e, dPde_rho, dTdrho_e, dTde_rho, dmudrho_T, dmudT_rho, dktdrho_T, dktdT_rho) in compressible (Euler: 2, NS: 8) flows. */
 
   MatrixType Solution_New;     /*!< \brief New solution container for Classical RK4. */
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
index 55fdf052db5b..66617186f88e 100644
--- a/SU2_CFD/src/drivers/CDriver.cpp
+++ b/SU2_CFD/src/drivers/CDriver.cpp
@@ -2764,17 +2764,10 @@ void CDriver::Output_Preprocessing(CConfig **config, CConfig *driver_config, COu
     driver_output->PreprocessMultizoneHistoryOutput(output, config, driver_config, !dry_run);
   }
 
-
   /*--- Check for an unsteady restart. Update ExtIter if necessary. ---*/
   if (config_container[ZONE_0]->GetTime_Domain() && config_container[ZONE_0]->GetRestart())
     TimeIter = config_container[ZONE_0]->GetRestart_Iter();
 
-  /*--- Check for a dynamic restart (structural analysis). Update ExtIter if necessary. ---*/
-  if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY
-      && config_container[ZONE_0]->GetWrt_Dynamic() && config_container[ZONE_0]->GetRestart())
-    TimeIter = config_container[ZONE_0]->GetRestart_Iter();
-
-
 }
 
 
diff --git a/SU2_CFD/src/numerics/flow/flow_diffusion.cpp b/SU2_CFD/src/numerics/flow/flow_diffusion.cpp
index 5737b0f2d6ed..1c97e3b462fc 100644
--- a/SU2_CFD/src/numerics/flow/flow_diffusion.cpp
+++ b/SU2_CFD/src/numerics/flow/flow_diffusion.cpp
@@ -142,32 +142,6 @@ void CAvgGrad_Base::SetStressTensor(const su2double *val_primvar,
   }
 }
 
-void CAvgGrad_Base::AddQCR(const su2double* const *val_gradprimvar) {
-
-  su2double den_aux, c_cr1= 0.3, O_ik, O_jk;
-  unsigned short iDim, jDim, kDim;
-
-  /*--- Denominator Antisymmetric normalized rotation tensor ---*/
-
-  den_aux = 0.0;
-  for (iDim = 0 ; iDim < nDim; iDim++)
-    for (jDim = 0 ; jDim < nDim; jDim++)
-      den_aux += val_gradprimvar[iDim+1][jDim] * val_gradprimvar[iDim+1][jDim];
-  den_aux = sqrt(max(den_aux,1E-10));
-
-  /*--- Adding the QCR contribution ---*/
-
-  for (iDim = 0 ; iDim < nDim; iDim++){
-    for (jDim = 0 ; jDim < nDim; jDim++){
-      for (kDim = 0 ; kDim < nDim; kDim++){
-        O_ik = (val_gradprimvar[iDim+1][kDim] - val_gradprimvar[kDim+1][iDim])/ den_aux;
-        O_jk = (val_gradprimvar[jDim+1][kDim] - val_gradprimvar[kDim+1][jDim])/ den_aux;
-        tau[iDim][jDim] -= c_cr1 * ((O_ik * tau[jDim][kDim]) + (O_jk * tau[iDim][kDim]));
-      }
-    }
-  }
-}
-
 void CAvgGrad_Base::AddTauWall(const su2double *val_normal,
                                const su2double val_tau_wall) {
 
@@ -595,7 +569,7 @@ CNumerics::ResidualType<> CAvgGrad_Flow::ComputeResidual(const CConfig* config)
 
   SetStressTensor(Mean_PrimVar, Mean_GradPrimVar, Mean_turb_ke,
          Mean_Laminar_Viscosity, Mean_Eddy_Viscosity);
-  if (config->GetQCR()) AddQCR(Mean_GradPrimVar);
+  if (config->GetQCR()) AddQCR(nDim, &Mean_GradPrimVar[1], tau);
   if (Mean_TauWall > 0) AddTauWall(Normal, Mean_TauWall);
 
   SetHeatFluxVector(Mean_GradPrimVar, Mean_Laminar_Viscosity,
diff --git a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
index ec12baf69fc8..b2e5d2f05e34 100644
--- a/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CAdjFlowIncOutput.cpp
@@ -113,7 +113,7 @@ void CAdjFlowIncOutput::SetHistoryOutputFields(CConfig *config){
   /// DESCRIPTION: Root-mean square residual of the adjoint Velocity z-component.
   AddHistoryOutput("RMS_ADJ_VELOCITY-Z", "rms[A_W]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint Velocity z-component.", HistoryFieldType::RESIDUAL);
   /// DESCRIPTION: Maximum residual of the temperature.
-  AddHistoryOutput("RMS_ADJ_TEMPERATURE", "rms[A_T]", ScreenOutputFormat::FIXED, "RMS_RES", " Root-mean square residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
+  AddHistoryOutput("RMS_ADJ_TEMPERATURE", "rms[A_T]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of the adjoint temperature.", HistoryFieldType::RESIDUAL);
   if (!config->GetFrozen_Visc_Disc() || !config->GetFrozen_Visc_Cont()){
     switch(turb_model){
     case SA: case SA_NEG: case SA_E: case SA_COMP: case SA_E_COMP:
diff --git a/SU2_CFD/src/output/CFlowCompOutput.cpp b/SU2_CFD/src/output/CFlowCompOutput.cpp
index d2b3b2ecb811..e59202bf7aef 100644
--- a/SU2_CFD/src/output/CFlowCompOutput.cpp
+++ b/SU2_CFD/src/output/CFlowCompOutput.cpp
@@ -419,6 +419,9 @@ void CFlowCompOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("ASPECT_RATIO",  "Aspect_Ratio",  "MESH_QUALITY", "CV Face Area Aspect Ratio");
   AddVolumeOutput("VOLUME_RATIO",  "Volume_Ratio",  "MESH_QUALITY", "CV Sub-Volume Ratio");
 
+  // MPI-Rank
+  AddVolumeOutput("RANK", "rank", "MPI", "Rank of the MPI-partition");
+
   if (config->GetTime_Domain()){
     SetTimeAveragedFields();
   }
@@ -566,6 +569,9 @@ void CFlowCompOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolv
     SetVolumeOutputValue("VOLUME_RATIO",  iPoint, geometry->Volume_Ratio[iPoint]);
   }
 
+  // MPI-Rank
+  SetVolumeOutputValue("RANK", iPoint, rank);
+
   if (config->GetTime_Domain()){
     LoadTimeAveragedData(iPoint, Node_Flow);
   }
diff --git a/SU2_CFD/src/output/CFlowIncOutput.cpp b/SU2_CFD/src/output/CFlowIncOutput.cpp
index 83c21b465b6e..927cb743c8ff 100644
--- a/SU2_CFD/src/output/CFlowIncOutput.cpp
+++ b/SU2_CFD/src/output/CFlowIncOutput.cpp
@@ -484,6 +484,8 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("ASPECT_RATIO",  "Aspect_Ratio",  "MESH_QUALITY", "CV Face Area Aspect Ratio");
   AddVolumeOutput("VOLUME_RATIO",  "Volume_Ratio",  "MESH_QUALITY", "CV Sub-Volume Ratio");
 
+  // MPI-Rank
+  AddVolumeOutput("RANK", "Rank", "MPI", "Rank of the MPI-partition");
 }
 
 void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint){
@@ -510,12 +512,10 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
   SetVolumeOutputValue("PRESSURE",   iPoint, Node_Flow->GetSolution(iPoint, 0));
   SetVolumeOutputValue("VELOCITY-X", iPoint, Node_Flow->GetSolution(iPoint, 1));
   SetVolumeOutputValue("VELOCITY-Y", iPoint, Node_Flow->GetSolution(iPoint, 2));
-  if (nDim == 3){
+  if (nDim == 3)
     SetVolumeOutputValue("VELOCITY-Z", iPoint, Node_Flow->GetSolution(iPoint, 3));
-    if (heat) SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetSolution(iPoint, 4));
-  } else {
-    if (heat) SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetSolution(iPoint, 3));
-  }
+
+  if (heat) SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Flow->GetSolution(iPoint, nDim+1));
   if (weakly_coupled_heat) SetVolumeOutputValue("TEMPERATURE", iPoint, Node_Heat->GetSolution(iPoint, 0));
 
   switch(config->GetKind_Turb_Model()){
@@ -637,6 +637,8 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve
     SetVolumeOutputValue("VOLUME_RATIO",  iPoint, geometry->Volume_Ratio[iPoint]);
   }
 
+  // MPI-Rank
+  SetVolumeOutputValue("RANK", iPoint, rank);
 }
 
 void CFlowIncOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
diff --git a/SU2_CFD/src/output/CFlowOutput.cpp b/SU2_CFD/src/output/CFlowOutput.cpp
index c1fbe1b3b6c2..5788d4a33b8d 100644
--- a/SU2_CFD/src/output/CFlowOutput.cpp
+++ b/SU2_CFD/src/output/CFlowOutput.cpp
@@ -2852,16 +2852,16 @@ void CFlowOutput::WriteForcesBreakdown(CConfig *config, CGeometry *geometry, CSo
 bool CFlowOutput::WriteVolume_Output(CConfig *config, unsigned long Iter, bool force_writing){
 
   if (config->GetTime_Domain()){
-    if (((config->GetTime_Marching() == DT_STEPPING_1ST) ||
-         (config->GetTime_Marching() == TIME_STEPPING)) &&
+    if (((config->GetTime_Marching() == DT_STEPPING_1ST) || (config->GetTime_Marching() == TIME_STEPPING)) &&
         ((Iter == 0) || (Iter % config->GetVolume_Wrt_Freq() == 0))){
       return true;
     }
 
     if ((config->GetTime_Marching() == DT_STEPPING_2ND) &&
-        ((Iter == 0) || (Iter    % config->GetVolume_Wrt_Freq() == 0) ||
-         ((Iter+1) % config->GetVolume_Wrt_Freq() == 0) ||
-         ((Iter+2 == config->GetnTime_Iter())))){
+        ((Iter == 0) ||
+         (Iter % config->GetVolume_Wrt_Freq() == 0) ||
+         ((Iter+1) % config->GetVolume_Wrt_Freq() == 0) || // Restarts need 2 old solution.
+         ((Iter+2) == config->GetnTime_Iter()))){ // The last timestep is written anyways but again one needs the step before for restarts.
       return true;
     }
   } else {
diff --git a/SU2_CFD/src/output/CHeatOutput.cpp b/SU2_CFD/src/output/CHeatOutput.cpp
index 734e9870c2a5..9d76e88542ea 100644
--- a/SU2_CFD/src/output/CHeatOutput.cpp
+++ b/SU2_CFD/src/output/CHeatOutput.cpp
@@ -136,6 +136,8 @@ void CHeatOutput::SetVolumeOutputFields(CConfig *config){
   AddVolumeOutput("ASPECT_RATIO",  "Aspect_Ratio",  "MESH_QUALITY", "CV Face Area Aspect Ratio");
   AddVolumeOutput("VOLUME_RATIO",  "Volume_Ratio",  "MESH_QUALITY", "CV Sub-Volume Ratio");
 
+  // MPI-Rank
+  AddVolumeOutput("RANK", "rank", "MPI", "Rank of the MPI-partition");
 }
 
 
@@ -163,6 +165,8 @@ void CHeatOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolver *
     SetVolumeOutputValue("VOLUME_RATIO",  iPoint, geometry->Volume_Ratio[iPoint]);
   }
 
+  // MPI-Rank
+  SetVolumeOutputValue("RANK", iPoint, rank);
 }
 
 void CHeatOutput::LoadSurfaceData(CConfig *config, CGeometry *geometry, CSolver **solver, unsigned long iPoint, unsigned short iMarker, unsigned long iVertex){
diff --git a/SU2_CFD/src/output/output_structure_legacy.cpp b/SU2_CFD/src/output/output_structure_legacy.cpp
index 48c5684f4058..3695a7942953 100644
--- a/SU2_CFD/src/output/output_structure_legacy.cpp
+++ b/SU2_CFD/src/output/output_structure_legacy.cpp
@@ -360,7 +360,7 @@ void COutputLegacy::SetConvHistory_Header(ofstream *ConvHist_file, CConfig *conf
 
   bool output_surface = (config->GetnMarker_Analyze() != 0);
   bool output_comboObj = (config->GetnObj() > 1);
-  bool output_per_surface = config->GetWrt_Surface();
+  bool output_per_surface = true;
   bool turbo = config->GetBoolTurbomachinery();
   unsigned short direct_diff = config->GetDirectDiff();
 
@@ -630,7 +630,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
 
     /*--- We need to evaluate some of the objective functions to write the value on the history file ---*/
 
-    if (((iExtIter % (config[val_iZone]->GetWrt_Sol_Freq())) == 0) ||
+    if (((iExtIter % (config[val_iZone]->GetVolume_Wrt_Freq())) == 0) ||
         (!fixed_cl && (iExtIter == (config[val_iZone]->GetnInner_Iter()-1))) ||
         /*--- If CL mode we need to compute the complete solution at two very particular iterations ---*/
         (fixed_cl && (iExtIter == (config[val_iZone]->GetnInner_Iter()-2) ||
@@ -773,7 +773,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
 
     unsigned short nTurboPerf  = config[val_iZone]->GetnMarker_TurboPerformance();
 
-    bool output_per_surface = config[val_iZone]->GetWrt_Surface();
+    bool output_per_surface = true;
 
     unsigned short direct_diff = config[val_iZone]->GetDirectDiff();
 
@@ -1249,34 +1249,33 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
 
     bool Unsteady = ((config[val_iZone]->GetTime_Marching() == DT_STEPPING_1ST) ||
                      (config[val_iZone]->GetTime_Marching() == DT_STEPPING_2ND));
-    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_NoDualTime = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetScreen_Wrt_Freq(2) == 0));
+    bool In_DualTime_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetScreen_Wrt_Freq(0) == 0));
     bool In_DualTime_1 = (!DualTime_Iteration && Unsteady);
-    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_DualTime_2 = (Unsteady && DualTime_Iteration && (iExtIter % config[val_iZone]->GetScreen_Wrt_Freq(2) == 0));
+    bool In_DualTime_3 = (Unsteady && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetScreen_Wrt_Freq(2) == 0));
 
     /*--- Header frequency: analogy for dynamic structural analysis ---*/
     /*--- DualTime_Iteration is a bool we receive, which is true if it comes from FEM_StructuralIteration and false from SU2_CFD ---*/
     /*--- We maintain the name, as it is an input of the function ---*/
-    /*--- The function GetWrt_Con_Freq_DualTime should be modified to be able to define different frequencies ---*/
     /*--- dynamic determines if the problem is, or not, time dependent ---*/
     bool dynamic = (config[val_iZone]->GetTime_Domain());              // Dynamic simulations.
-    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetWrt_Con_Freq_DualTime() == 0));
+    bool In_NoDynamic = (!DualTime_Iteration && (iExtIter % config[val_iZone]->GetScreen_Wrt_Freq(2) == 0));
+    bool In_Dynamic_0 = (DualTime_Iteration && (iIntIter % config[val_iZone]->GetScreen_Wrt_Freq(0) == 0));
     bool In_Dynamic_1 = (!DualTime_Iteration && nonlinear_analysis);
-    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
-    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetWrt_Con_Freq() == 0));
+    bool In_Dynamic_2 = (nonlinear_analysis && DualTime_Iteration && (iExtIter % config[val_iZone]->GetScreen_Wrt_Freq(2) == 0));
+    bool In_Dynamic_3 = (nonlinear_analysis && !DualTime_Iteration && (iExtIter % config[val_iZone]->GetScreen_Wrt_Freq(2) == 0));
 
     bool write_heads;
     if (Unsteady) write_heads = (iIntIter == 0);
-    else write_heads = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+    else write_heads = (((iExtIter % (config[val_iZone]->GetScreen_Wrt_Freq(2)*40)) == 0));
 
-    bool write_turbo = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0) || (iExtIter == (config[val_iZone]->GetnInner_Iter() -1)));
+    bool write_turbo = (((iExtIter % (config[val_iZone]->GetScreen_Wrt_Freq(2)*40)) == 0) || (iExtIter == (config[val_iZone]->GetnInner_Iter() -1)));
 
     /*--- Analogous for dynamic problems (as of now I separate the problems, it may be worthy to do all together later on ---*/
     bool write_heads_FEM;
     if (nonlinear_analysis) write_heads_FEM = (iIntIter == 0);
-    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetWrt_Con_Freq()*40)) == 0));
+    else write_heads_FEM = (((iExtIter % (config[val_iZone]->GetScreen_Wrt_Freq(2)*40)) == 0));
 
     if (  (!fem && ((In_NoDualTime || In_DualTime_0 || In_DualTime_1) && (In_NoDualTime || In_DualTime_2 || In_DualTime_3))) ||
         (fem  && ( (In_NoDynamic || In_Dynamic_0 || In_Dynamic_1) && (In_NoDynamic || In_Dynamic_2 || In_Dynamic_3)))
@@ -1639,7 +1638,7 @@ void COutputLegacy::SetConvHistory_Body(ofstream *ConvHist_file,
 
                 cout << endl;
                 cout << "------------------------ Discrete Adjoint Summary -----------------------" << endl;
-                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetWrt_Sol_Freq() << " iterations): ";
+                cout << "Total Geometry Sensitivity (updated every "  << config[val_iZone]->GetVolume_Wrt_Freq() << " iterations): ";
                 cout.precision(4);
                 cout.setf(ios::scientific, ios::floatfield);
                 cout << Total_Sens_Geo;
diff --git a/SU2_CFD/src/solvers/CEulerSolver.cpp b/SU2_CFD/src/solvers/CEulerSolver.cpp
index 0dfa329c4ed1..a49af41d9137 100644
--- a/SU2_CFD/src/solvers/CEulerSolver.cpp
+++ b/SU2_CFD/src/solvers/CEulerSolver.cpp
@@ -3915,8 +3915,8 @@ void CEulerSolver::GetPower_Properties(CGeometry *geometry, CConfig *config, uns
   su2double Cp = Gas_Constant*Gamma / (Gamma-1.0);
   su2double Alpha = config->GetAoA()*PI_NUMBER/180.0;
   su2double Beta = config->GetAoS()*PI_NUMBER/180.0;
-  bool write_heads = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0) && (config->GetInnerIter()!= 0)) || (config->GetInnerIter() == 1));
-  bool Evaluate_BC = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0)) || (config->GetInnerIter() == 1) || (config->GetDiscrete_Adjoint()));
+  bool write_heads = ((((config->GetInnerIter() % (config->GetScreen_Wrt_Freq(2)*40)) == 0) && (config->GetInnerIter()!= 0)) || (config->GetInnerIter() == 1));
+  bool Evaluate_BC = ((((config->GetInnerIter() % (config->GetScreen_Wrt_Freq(2)*40)) == 0)) || (config->GetInnerIter() == 1) || (config->GetDiscrete_Adjoint()));
 
   if ((config->GetnMarker_EngineInflow() != 0) || (config->GetnMarker_EngineExhaust() != 0)) Engine = true;
   if ((config->GetnMarker_ActDiskInlet() != 0) || (config->GetnMarker_ActDiskOutlet() != 0)) Engine = false;
diff --git a/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp b/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
index b196b4f351b8..3b89266e7f29 100644
--- a/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
+++ b/SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp
@@ -7323,7 +7323,7 @@ void CFEM_DG_EulerSolver::ComputeVerificationError(CGeometry *geometry,
    RMS (L2) and maximum (Linf) global error norms. From these
    global measures, one can compute the order of accuracy. ---*/
 
-  bool write_heads = ((((config->GetTimeIter() % (config->GetWrt_Con_Freq()*40)) == 0)
+  bool write_heads = ((((config->GetTimeIter() % (config->GetScreen_Wrt_Freq(2)*40)) == 0)
                        && (config->GetTimeIter()!= 0))
                       || (config->GetTimeIter() == 1));
   if( !write_heads ) return;
diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
index 991c10eaeb08..fd49035d48c8 100644
--- a/SU2_CFD/src/solvers/CIncEulerSolver.cpp
+++ b/SU2_CFD/src/solvers/CIncEulerSolver.cpp
@@ -1479,7 +1479,7 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
 
       numerics->SetVolume(geometry->nodes->GetVolume(iPoint));
 
-      /*--- Compute the rotating frame source residual ---*/
+      /*--- Compute the body force source residual ---*/
 
       auto residual = numerics->ComputeResidual(config);
 
@@ -1510,7 +1510,7 @@ void CIncEulerSolver::Source_Residual(CGeometry *geometry, CSolver **solver_cont
 
       numerics->SetVolume(geometry->nodes->GetVolume(iPoint));
 
-      /*--- Compute the rotating frame source residual ---*/
+      /*--- Compute the boussinesq source residual ---*/
 
       auto residual = numerics->ComputeResidual(config);
 
@@ -3293,7 +3293,7 @@ void CIncEulerSolver::GetOutlet_Properties(CGeometry *geometry, CConfig *config,
 
   bool axisymmetric = config->GetAxisymmetric();
 
-  bool write_heads = ((((config->GetInnerIter() % (config->GetWrt_Con_Freq()*40)) == 0)
+  bool write_heads = ((((config->GetInnerIter() % (config->GetScreen_Wrt_Freq(2)*40)) == 0)
                        && (config->GetInnerIter()!= 0))
                       || (config->GetInnerIter() == 1));
 
diff --git a/SU2_CFD/src/solvers/CIncNSSolver.cpp b/SU2_CFD/src/solvers/CIncNSSolver.cpp
index 3afd6860b316..854022bac234 100644
--- a/SU2_CFD/src/solvers/CIncNSSolver.cpp
+++ b/SU2_CFD/src/solvers/CIncNSSolver.cpp
@@ -59,7 +59,7 @@ void CIncNSSolver::Preprocessing(CGeometry *geometry, CSolver **solver_container
   unsigned long iPoint, ErrorCounter = 0;
   su2double StrainMag = 0.0, Omega = 0.0, *Vorticity;
 
-  unsigned long InnerIter     = config->GetInnerIter();
+  unsigned long InnerIter   = config->GetInnerIter();
   bool cont_adjoint         = config->GetContinuous_Adjoint();
   bool implicit             = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
   bool center               = ((config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED) || (cont_adjoint && config->GetKind_ConvNumScheme_AdjFlow() == SPACE_CENTERED));
diff --git a/SU2_CFD/src/solvers/CMeshSolver.cpp b/SU2_CFD/src/solvers/CMeshSolver.cpp
index c124fa66cfa2..256016ac682f 100644
--- a/SU2_CFD/src/solvers/CMeshSolver.cpp
+++ b/SU2_CFD/src/solvers/CMeshSolver.cpp
@@ -645,45 +645,26 @@ void CMeshSolver::SetBoundaryDisplacements(CGeometry *geometry, CNumerics *numer
 
   unsigned short iMarker;
 
-  /*--- Impose zero displacements of all non-moving surfaces (also at nodes in multiple moving/non-moving boundaries). ---*/
-  /*--- Exceptions: symmetry plane, the receive boundaries and periodic boundaries should get a different treatment. ---*/
+  /*--- Impose zero displacements of all non-moving surfaces that are not MARKER_DEFORM_SYM_PLANE. ---*/
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     if ((config->GetMarker_All_Deform_Mesh(iMarker) == NO) &&
         (config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == NO) &&
         (config->GetMarker_All_Moving(iMarker) == NO) &&
-        (config->GetMarker_All_KindBC(iMarker) != SYMMETRY_PLANE) &&
-        (config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE) &&
-        (config->GetMarker_All_KindBC(iMarker) != PERIODIC_BOUNDARY)) {
+        (config->GetMarker_All_KindBC(iMarker) != INTERNAL_BOUNDARY) &&
+        (config->GetMarker_All_KindBC(iMarker) != SEND_RECEIVE)) {
 
       BC_Clamped(geometry, numerics, config, iMarker);
     }
   }
 
-  /*--- Symmetry plane is clamped, for now. ---*/
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if ((config->GetMarker_All_Deform_Mesh(iMarker) == NO) &&
-        (config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == NO) &&
-        (config->GetMarker_All_Moving(iMarker) == NO) &&
-        (config->GetMarker_All_KindBC(iMarker) == SYMMETRY_PLANE)) {
-
-      BC_Clamped(geometry, numerics, config, iMarker);
-    }
-  }
-
-
-  /*--- Impose displacement boundary conditions. ---*/
+  /*--- Impose displacement boundary conditions and symmetry. ---*/
   for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
     if ((config->GetMarker_All_Deform_Mesh(iMarker) == YES) ||
         (config->GetMarker_All_Moving(iMarker) == YES)) {
 
       BC_Deforming(geometry, numerics, config, iMarker);
     }
-  }
-
-
-  /*--- Symmetry deform plane is not clamped ---*/
-  for (iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
-    if (config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == YES) {
+    else if (config->GetMarker_All_Deform_Mesh_Sym_Plane(iMarker) == YES) {
 
       BC_Sym_Plane(geometry, numerics, config, iMarker);
     }
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
index 18bbba0e5b45..c1ba17e3dff7 100755
--- a/SU2_PY/SU2/io/config.py
+++ b/SU2_PY/SU2/io/config.py
@@ -669,9 +669,6 @@ def read_config(filename):
         data_dict['OPT_BOUND_LOWER'] = -1e10
     if 'OPT_COMBINE_OBJECTIVE' not in data_dict:
         data_dict['OPT_COMBINE_OBJECTIVE'] = "NO"
-    # ensure that per-surface output will be included when there are multiple objectives
-    if 'WRT_SURFACE' not in data_dict and 'OPT_OBJECTIVE' in data_dict and len(data_dict['OPT_OBJECTIVE'])>1:
-        data_dict['WRT_SURFACE'] = "YES"
     if 'OPT_CONSTRAINT' not in data_dict:
         data_dict['OPT_CONSTRAINT'] =  {'INEQUALITY': OrderedDict(), 'EQUALITY': OrderedDict()}
     if 'VALUE_OBJFUNC_FILENAME' not in data_dict:
diff --git a/SU2_PY/continuous_adjoint.py b/SU2_PY/continuous_adjoint.py
index f2115023b5aa..77befc8f9137 100755
--- a/SU2_PY/continuous_adjoint.py
+++ b/SU2_PY/continuous_adjoint.py
@@ -83,7 +83,6 @@ def continuous_adjoint( filename           ,
     state = SU2.io.State()
     
     # Force CSV output in order to compute gradients
-    config.WRT_CSV_SOL = 'YES'
     
     if not 'OUTPUT_FILES' in config:
         config['OUTPUT_FILES'] = ['RESTART']
diff --git a/SU2_PY/discrete_adjoint.py b/SU2_PY/discrete_adjoint.py
index 7544ac188578..45ac3d5b2382 100755
--- a/SU2_PY/discrete_adjoint.py
+++ b/SU2_PY/discrete_adjoint.py
@@ -86,10 +86,6 @@ def discrete_adjoint( filename           ,
     # State
     state = SU2.io.State()
 
-    # Force CSV output in order to compute gradients
-    config.WRT_CSV_SOL = 'YES'
-
-
     config['GRADIENT_METHOD'] = 'DISCRETE_ADJOINT'
 
     # check for existing files
diff --git a/SU2_SOL/src/SU2_SOL.cpp b/SU2_SOL/src/SU2_SOL.cpp
index 31d86a6aa003..840476c98916 100644
--- a/SU2_SOL/src/SU2_SOL.cpp
+++ b/SU2_SOL/src/SU2_SOL.cpp
@@ -273,7 +273,7 @@ int main(int argc, char *argv[]) {
 
         if ((TimeIter+1 == driver_config->GetnTime_Iter()) || // The last time iteration
             (StopCalc) || // We have surpassed the requested time
-            ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)) // The iteration has been requested
+            ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0)) // The iteration has been requested
           ){
           if (rank == MASTER_NODE) cout << "Writing the volume solution for time step " << TimeIter << ", t = " << Physical_t << " s ." << endl;
 
@@ -355,20 +355,20 @@ int main(int argc, char *argv[]) {
 
       if (
           ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
-           ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
+           ((TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0) && (TimeIter != 0) &&
             !((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
               (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND))) ||
            (StopCalc) ||
            (((config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_1ST) ||
              (config_container[ZONE_0]->GetTime_Marching() == DT_STEPPING_2ND)) &&
-            ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0))))
+            ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0))))
 
           &&
 
           ((TimeIter+1 == config_container[ZONE_1]->GetnTime_Iter()) ||
            (StopCalc) ||
            ((config_container[ZONE_1]->GetTime_Domain()) &&
-            ((TimeIter == 0) || (TimeIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0))))
+            ((TimeIter == 0) || (TimeIter % config_container[ZONE_1]->GetVolume_Wrt_Freq() == 0))))
 
           ){
 
@@ -382,7 +382,7 @@ int main(int argc, char *argv[]) {
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFlow == false &&
             (TimeIter == 0 || ((config_container[ZONE_0]->GetRestart() && (SU2_TYPE::Int(TimeIter) == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()))) ||
-                               TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                               TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0 ||
                                TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()))) {
           solver_container[ZONE_0][INST_0] = new CBaselineSolver(geometry_container[ZONE_0][INST_0], config_container[ZONE_0]);
           output[ZONE_0] = new CBaselineOutput(config_container[ZONE_0], geometry_container[ZONE_0][INST_0]->GetnDim(), solver_container[ZONE_0][INST_0]);
@@ -399,7 +399,7 @@ int main(int argc, char *argv[]) {
         /*--- Either instantiate the solution class or load a restart file. ---*/
         if (SolutionInstantiatedFEM == false &&
             (TimeIter == 0 || ((config_container[ZONE_1]->GetRestart() && (SU2_TYPE::Int(TimeIter) == SU2_TYPE::Int(config_container[ZONE_1]->GetRestart_Iter()))) ||
-                               TimeIter % config_container[ZONE_1]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                               TimeIter % config_container[ZONE_1]->GetVolume_Wrt_Freq() == 0 ||
                                TimeIter+1 == config_container[ZONE_1]->GetnTime_Iter()))) {
           solver_container[ZONE_1][INST_0] = new CBaselineSolver(geometry_container[ZONE_1][INST_0], config_container[ZONE_1]);
           output[ZONE_1] = new CBaselineOutput(config_container[ZONE_1], geometry_container[ZONE_1][INST_0]->GetnDim(), solver_container[ZONE_1][INST_0]);
@@ -448,11 +448,11 @@ int main(int argc, char *argv[]) {
           StopCalc = true;
 
         if ((TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter()) ||
-            ((TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq() == 0) && (TimeIter != 0) &&
+            ((TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0) && (TimeIter != 0) &&
              !(config_container[ZONE_0]->GetTime_Marching() == TIME_STEPPING)) ||
             (StopCalc) ||
             ((config_container[ZONE_0]->GetTime_Marching() == TIME_STEPPING) &&
-             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0)))) {
+             ((TimeIter == 0) || (TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0)))) {
 
               /*--- Read in the restart file for this time step ---*/
               for (iZone = 0; iZone < nZone; iZone++) {
@@ -464,7 +464,7 @@ int main(int argc, char *argv[]) {
                 if (SolutionInstantiated[iZone] == false &&
                     (TimeIter == 0 ||
                      (config_container[ZONE_0]->GetRestart() && ((long)TimeIter == SU2_TYPE::Int(config_container[ZONE_0]->GetRestart_Iter()) ||
-                                                                                  TimeIter % config_container[ZONE_0]->GetWrt_Sol_Freq_DualTime() == 0 ||
+                                                                                  TimeIter % config_container[ZONE_0]->GetVolume_Wrt_Freq() == 0 ||
                                                                                   TimeIter+1 == config_container[ZONE_0]->GetnTime_Iter())))) {
 
                   solver_container[iZone][INST_0] = new CBaselineSolver_FEM(geometry_container[iZone][INST_0], config_container[iZone]);
@@ -633,10 +633,8 @@ int main(int argc, char *argv[]) {
       bool SolutionInstantiated = false;
 
 
-
       /*--- Check for an dynamic restart (structural analysis). Update ExtIter if necessary. ---*/
-      if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY &&
-          config_container[ZONE_0]->GetWrt_Dynamic() && config_container[ZONE_0]->GetRestart())
+      if (config_container[ZONE_0]->GetKind_Solver() == FEM_ELASTICITY && config_container[ZONE_0]->GetRestart())
         TimeIter = config_container[ZONE_0]->GetRestart_Iter();
 
       while (TimeIter < config_container[ZONE_0]->GetnTime_Iter()) {
diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
index 403867d2c8db..b8703b602c3f 100644
--- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
+++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg
@@ -296,17 +296,9 @@ VOLUME_FILENAME= flow
 % Output file surface flow coefficient (w/o extension)
 SURFACE_FILENAME= surface_flow
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1000
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG_ON_SURFACE, PLUNGE, PITCH) 
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
index eaa20108b51e..0fcb610c0ef9 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg
@@ -298,10 +298,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG) 
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
index 6896b9f34e2e..10906c14d299 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg
@@ -296,10 +296,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % History output
 HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, D_AERO_COEFF)
diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
index f6426133bf91..8290c764a76f 100644
--- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
+++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg
@@ -258,10 +258,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
index 7910b19ab062..069cb9b8e43a 100644
--- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -262,10 +262,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 %
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
index 33ce06a79305..e89fdde7af43 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE.cfg
@@ -254,10 +254,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) 
 %
diff --git a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
index 2f9dc372b2e8..6f239abfc0d6 100644
--- a/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/cont_adj_euler/wedge/inv_wedge_ROE_multiobj.cfg
@@ -271,10 +271,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
diff --git a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
index 878ccbb11b25..37f5025faaad 100644
--- a/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/cont_adj_navierstokes/cylinder/lam_cylinder.cfg
@@ -265,10 +265,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
diff --git a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
index e16267df2eb8..5fe84b06ea24 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg
@@ -256,10 +256,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 %
diff --git a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
index 52151229ff98..09c7397d9cd4 100644
--- a/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
+++ b/TestCases/cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg
@@ -267,10 +267,9 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 5
+SCREEN_WRT_FREQ_INNER= 5
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
 %
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
index 1f9c71f528a1..30e430ca8730 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg
@@ -322,10 +322,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
index 2e80414c4300..3cac5c811a38 100644
--- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
+++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg
@@ -322,10 +322,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
index 7dfe008009b3..a852cdd890ae 100644
--- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg
@@ -325,13 +325,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 25
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
index 833504b896c8..6da745ce09ff 100644
--- a/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/cont_adj_rans/rae2822/turb_SA_RAE2822.cfg
@@ -242,10 +242,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA)
diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg
index c5ef976cc0b5..f40cce879892 100644
--- a/TestCases/control_surface/inv_ONERAM6_moving.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg
@@ -251,10 +251,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg
index 66e9555d517e..09835ea7f1ab 100644
--- a/TestCases/control_surface/inv_ONERAM6_setting.cfg
+++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg
@@ -251,10 +251,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg
index e51b9e28c855..c15f371c0d4d 100644
--- a/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg
@@ -179,11 +179,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg b/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg
index 7ecad45b1d19..06325af0a5e1 100644
--- a/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/comp_2d/solid_cylinder1.cfg
@@ -158,11 +158,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg b/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg
index d667a8377ab2..05756d604714 100644
--- a/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/comp_2d/solid_cylinder2.cfg
@@ -168,11 +168,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg b/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg
index 5a2b1dc0d88d..22ee243c51b3 100644
--- a/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/comp_2d/solid_cylinder3.cfg
@@ -168,11 +168,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg
index 274262dd208c..aba99dce0511 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg
@@ -233,11 +233,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg
index 1e6fc12c63b0..5e45bd1daad6 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder1.cfg
@@ -158,11 +158,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg
index 75987cc22cd7..6dcccea26062 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder2.cfg
@@ -168,11 +168,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg
index b32a34eed161..47d064accbcf 100644
--- a/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/disc_adj_incomp_2d/solid_cylinder3.cfg
@@ -168,11 +168,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg
index 65151d38b99a..c587d6907b3d 100644
--- a/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg
@@ -230,11 +230,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg b/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg
index f2c82a249b56..df303ab245eb 100644
--- a/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/incomp_2d/solid_cylinder1.cfg
@@ -158,11 +158,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg b/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg
index fc9669a26196..3f2a7a5d5f65 100644
--- a/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/incomp_2d/solid_cylinder2.cfg
@@ -168,11 +168,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg b/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg
index 0b76aaf087c2..3e33cbe1a989 100644
--- a/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/incomp_2d/solid_cylinder3.cfg
@@ -168,11 +168,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg
index d32b70003aef..75f4590a4814 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg
@@ -217,11 +217,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg
index 1e29c43f3d81..c424aca32456 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder1.cfg
@@ -145,11 +145,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg
index 4ee66737d5c0..379a6eaf3803 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder2.cfg
@@ -146,11 +146,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg
index 44c8c58e98e5..439aa0f77e4b 100644
--- a/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg
+++ b/TestCases/coupled_cht/incomp_2d_unsteady/solid_cylinder3.cfg
@@ -146,11 +146,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/ddes/flatplate/ddes_flatplate.cfg b/TestCases/ddes/flatplate/ddes_flatplate.cfg
index 681c4329f429..c1359d277f8d 100644
--- a/TestCases/ddes/flatplate/ddes_flatplate.cfg
+++ b/TestCases/ddes/flatplate/ddes_flatplate.cfg
@@ -226,20 +226,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1000
-WRT_SURF_FREQ_DUALTIME= 50000
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
-WRT_LIMITERS= NO
-WRT_RESIDUALS= NO
+OUTPUT_WRT_FREQ= 1000
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/deformation/brick_hex/def_brick_hex.cfg b/TestCases/deformation/brick_hex/def_brick_hex.cfg
index 518f5527debf..62d9ce5443c2 100755
--- a/TestCases/deformation/brick_hex/def_brick_hex.cfg
+++ b/TestCases/deformation/brick_hex/def_brick_hex.cfg
@@ -252,9 +252,3 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-
diff --git a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
index 214994f3027e..23034d0e7b1d 100755
--- a/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
+++ b/TestCases/deformation/brick_hex_rans/def_brick_hex_rans.cfg
@@ -253,8 +253,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
diff --git a/TestCases/deformation/brick_prism/def_brick_prism.cfg b/TestCases/deformation/brick_prism/def_brick_prism.cfg
index 8cacfd62a499..b88702e06f30 100755
--- a/TestCases/deformation/brick_prism/def_brick_prism.cfg
+++ b/TestCases/deformation/brick_prism/def_brick_prism.cfg
@@ -252,9 +252,4 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
diff --git a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
index a6d309f7967f..633a5058ce77 100755
--- a/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
+++ b/TestCases/deformation/brick_prism_rans/def_brick_prism_rans.cfg
@@ -252,9 +252,4 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
diff --git a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
index dfafd5b377f4..d7ad3ec4ad92 100755
--- a/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
+++ b/TestCases/deformation/brick_pyra/def_brick_pyra.cfg
@@ -253,8 +253,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
diff --git a/TestCases/deformation/brick_tets/def_brick_tets.cfg b/TestCases/deformation/brick_tets/def_brick_tets.cfg
index 64af11d3a8c2..7e282788c47f 100755
--- a/TestCases/deformation/brick_tets/def_brick_tets.cfg
+++ b/TestCases/deformation/brick_tets/def_brick_tets.cfg
@@ -253,8 +253,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
diff --git a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
index 39156b8791a2..f884b3e57330 100644
--- a/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
+++ b/TestCases/deformation/cylindrical_ffd/def_cylindrical.cfg
@@ -300,24 +300,7 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1500
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
+OUTPUT_WRT_FREQ= 1
 %
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
 %
diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg
index 9aa249d35f8f..bbb7c279db4b 100644
--- a/TestCases/deformation/naca0012/def_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/def_NACA0012.cfg
@@ -297,10 +297,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
index 42c02f334713..bd457e87a81a 100644
--- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
+++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg
@@ -307,11 +307,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/deformation/naca4412/def_NACA4412.cfg b/TestCases/deformation/naca4412/def_NACA4412.cfg
index 59dc7c53fa5d..31cd1910edc1 100644
--- a/TestCases/deformation/naca4412/def_NACA4412.cfg
+++ b/TestCases/deformation/naca4412/def_NACA4412.cfg
@@ -281,10 +281,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/deformation/rae2822/def_RAE2822.cfg b/TestCases/deformation/rae2822/def_RAE2822.cfg
index 8c66aafdbf32..1d0393af24a5 100644
--- a/TestCases/deformation/rae2822/def_RAE2822.cfg
+++ b/TestCases/deformation/rae2822/def_RAE2822.cfg
@@ -256,10 +256,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 OUTPUT_FILES=(PARAVIEW_ASCII)
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/deformation/spherical_ffd/def_spherical.cfg b/TestCases/deformation/spherical_ffd/def_spherical.cfg
index 092a3ab103a6..960eb4434453 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical.cfg
@@ -304,23 +304,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1500
+OUTPUT_WRT_FREQ= 1500
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
 %
diff --git a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
index 5962a89d03b1..73778d3d0058 100644
--- a/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
+++ b/TestCases/deformation/spherical_ffd/def_spherical_bspline.cfg
@@ -311,23 +311,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1500
+OUTPUT_WRT_FREQ= 1500
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
 %
diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
index 97b1dd78db12..085f32cd7872 100644
--- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
+++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg
@@ -540,28 +540,7 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= YES
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
-%
-% Output the solution at each surface in the history file
-WRT_SURFACE= NO
+OUTPUT_WRT_FREQ= 1000
 %
 %
 % Read binary restart files (YES, NO)
diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
index 781c5651c04c..94f131b4a9ba 100644
--- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
+++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg
@@ -321,28 +321,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 2525
+OUTPUT_WRT_FREQ= 2525
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
-%
-% Output the solution at each surface in the history file
-WRT_SURFACE= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
diff --git a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
index 48543bbc93c1..92aa8555a1e1 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching/inv_NACA0012_pitching.cfg
@@ -328,20 +328,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
+OUTPUT_WRT_FREQ= 1
 %
-% Output rind layers in the solution files
-WRT_HALO= NO
 
 % Optimization design variables, separated by semicolons
 % FFD_CONTROL_POINT (Y)
diff --git a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg
index cd2eda32fb8e..31a8143368cb 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform.cfg
@@ -124,8 +124,4 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
-WRT_SOL_FREQ= 250.0
-WRT_SOL_FREQ_DUALTIME= 1
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 10
-
+OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg
index ec65eb46b12e..6ea04d7b1aae 100644
--- a/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg
+++ b/TestCases/disc_adj_euler/naca0012_pitching_def/inv_NACA0012_pitching_deform_ad.cfg
@@ -124,8 +124,4 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
-WRT_SOL_FREQ= 250.0
-WRT_SOL_FREQ_DUALTIME= 1
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 10
-
+OUTPUT_WRT_FREQ= 1
diff --git a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
index 30483ee3cd2f..fe9144c425c5 100644
--- a/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/disc_adj_euler/oneram6/inv_ONERAM6.cfg
@@ -243,13 +243,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
diff --git a/TestCases/disc_adj_fea/configAD_fem.cfg b/TestCases/disc_adj_fea/configAD_fem.cfg
index 0d64651ba54d..fed9bccb3782 100644
--- a/TestCases/disc_adj_fea/configAD_fem.cfg
+++ b/TestCases/disc_adj_fea/configAD_fem.cfg
@@ -52,16 +52,10 @@ RESTART_FILENAME= restart_beam.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
-
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
 LINEAR_SOLVER= CONJUGATE_GRADIENT
 LINEAR_SOLVER_PREC= JACOBI
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg
index caed22ee0683..30dbb2dc246f 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/configFEA.cfg
@@ -44,7 +44,7 @@ MESH_FORMAT= SU2
 RESTART_SOL= NO
 SOLUTION_FILENAME= solution_solid.dat
 SOLUTION_ADJ_FILENAME= adjoint_solid.dat
-WRT_SOL_FREQ= 999999
+OUTPUT_WRT_FREQ= 999999
 RESTART_FILENAME= solution_solid.dat
 RESTART_ADJ_FILENAME= adjoint_solid.dat
 %
@@ -52,6 +52,6 @@ TABULAR_FORMAT= CSV
 VOLUME_FILENAME= solid
 VOLUME_ADJ_FILENAME= adjoint_solid
 %
-WRT_CON_FREQ= 10
+SCREEN_WRT_FREQ_INNER= 10
 CONV_FILENAME= history
 
diff --git a/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg b/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
index 498b75828333..ed655c6d94fe 100755
--- a/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/Airfoil_2d/configFlow.cfg
@@ -88,7 +88,7 @@ MESH_FORMAT= SU2
 RESTART_SOL= NO
 SOLUTION_FILENAME= solution_fluid.dat
 SOLUTION_ADJ_FILENAME= adjoint_fluid.dat
-WRT_SOL_FREQ= 999999
+OUTPUT_WRT_FREQ= 999999
 RESTART_FILENAME= solution_fluid.dat
 RESTART_ADJ_FILENAME= adjoint_fluid.dat
 %
@@ -98,6 +98,6 @@ VOLUME_ADJ_FILENAME= adjoint_fluid
 SURFACE_FILENAME= surface_fluid
 SURFACE_ADJ_FILENAME= adjoint_surface_fluid
 %
-WRT_CON_FREQ= 10
+SCREEN_WRT_FREQ_INNER= 10
 CONV_FILENAME= history
 
diff --git a/TestCases/disc_adj_fsi/configFEA.cfg b/TestCases/disc_adj_fsi/configFEA.cfg
index c8099e3be632..fac3f471cd7e 100644
--- a/TestCases/disc_adj_fsi/configFEA.cfg
+++ b/TestCases/disc_adj_fsi/configFEA.cfg
@@ -46,10 +46,6 @@ INNER_ITER= 5
 MARKER_CLAMPED = ( Clamped_Right, Clamped_Left )
 MARKER_FLUID_LOAD= ( LowerWallS, UpperWallS)
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 5
 
 LINEAR_SOLVER= CONJUGATE_GRADIENT
 LINEAR_SOLVER_PREC= JACOBI
@@ -75,7 +71,5 @@ RESTART_FILENAME= restart_beam.dat
 SOLUTION_ADJ_FILENAME= solution_flow_adj.dat
 RESTART_ADJ_FILENAME= restart_flow_adj.dat
 
-WRT_SRF_SOL = NO
-
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
diff --git a/TestCases/disc_adj_fsi/configFlow.cfg b/TestCases/disc_adj_fsi/configFlow.cfg
index 7564b8d20271..edcb19ec2743 100644
--- a/TestCases/disc_adj_fsi/configFlow.cfg
+++ b/TestCases/disc_adj_fsi/configFlow.cfg
@@ -48,10 +48,6 @@ MARKER_MONITORING= ( UpperWall, LowerWall, Wall)
 DEFORM_MESH= YES
 MARKER_DEFORM_MESH= ( UpperWall, LowerWall )
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 5
 
 DEFORM_STIFFNESS_TYPE = INVERSE_VOLUME
 DEFORM_POISSONS_RATIO = 1e6
@@ -91,7 +87,5 @@ RESTART_FILENAME= restart_flow.dat
 SOLUTION_ADJ_FILENAME= solution_flow_adj.dat
 RESTART_ADJ_FILENAME= restart_flow_adj.dat
 
-WRT_SRF_SOL = NO
-
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg
index 619a9ebcef19..18d16c8fe31b 100644
--- a/TestCases/disc_adj_heat/disc_adj_heat.cfg
+++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg
@@ -221,21 +221,8 @@ SURFACE_FILENAME= surface_flow
 
 SURFACE_ADJ_FILENAME= surface_adjoint
 
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 1
 
-WRT_SOL_FREQ_DUALTIME= 1
-
-WRT_CON_FREQ= 1
-
-WRT_CON_FREQ_DUALTIME= 100
-
-WRT_RESIDUALS= YES
-
-WRT_LIMITERS= NO
-
-WRT_SHARPEDGES= NO
-
-%READ_BINARY_RESTART= NO
 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_NU_TILDE, RMS_ADJ_HEAT, SENS_VEL_IN, SENS_PRESS_OUT)
diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
index 838bd3075f8c..1ead1ba7148c 100644
--- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
+++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg
@@ -225,10 +225,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_VELOCITY-X, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
index 80bff775012f..d45b1714d36e 100644
--- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
+++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg
@@ -306,10 +306,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_TEMPERATURE, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
index 319a8296a846..acfbec543e64 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg
@@ -283,10 +283,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_NU_TILDE, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
index 553a24ccd373..4b8f64c3f04e 100755
--- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
+++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg
@@ -283,10 +283,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_ADJ_PRESSURE, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_rans/cylinder/cylinder.cfg b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
index eb71f4fd8a4e..fc98978e6c17 100644
--- a/TestCases/disc_adj_rans/cylinder/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder/cylinder.cfg
@@ -257,17 +257,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
index 2f69bbf1325e..18c88595fafb 100644
--- a/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
+++ b/TestCases/disc_adj_rans/cylinder_DT_1ST/cylinder.cfg
@@ -27,13 +27,6 @@ RESTART_SOL= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= NO
-%
-WRT_CSV_SOL= NO 
-%
-WRT_VOL_SOL= NO
-%
-WRT_SRF_SOL= NO
-
 
 TIME_DOMAIN = YES
 TIME_ITER = 10
@@ -265,17 +258,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_PRESS, SENS_AOA)
diff --git a/TestCases/disc_adj_rans/naca0012/naca0012.cfg b/TestCases/disc_adj_rans/naca0012/naca0012.cfg
index 631f69a0d7cd..ba349d651873 100644
--- a/TestCases/disc_adj_rans/naca0012/naca0012.cfg
+++ b/TestCases/disc_adj_rans/naca0012/naca0012.cfg
@@ -169,12 +169,7 @@ VOLUME_FILENAME= flow
 % Output file surface flow coefficient (w/o extension)
 SURFACE_FILENAME= surface_flow
 % Writing solution file frequency
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
-% Writing convergence history frequency% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-WRT_CON_FREQ= 1
-WRT_CSV_SOL=NO
+OUTPUT_WRT_FREQ= 1
 %
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
index 29580ac333b4..d6f881b02d30 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg
@@ -240,10 +240,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_NU_TILDE, SENS_PRESS, SENS_AOA RMS_DENSITY RMS_NU_TILDE LIFT DRAG)
diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
index 8637b4fa8614..fb672dde3583 100644
--- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg
@@ -240,10 +240,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_TKE, SENS_PRESS, SENS_AOA RMS_DENSITY RMS_TKE LIFT DRAG)
diff --git a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
index 8c2c470dcb61..6e9e98762bdc 100644
--- a/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/disc_adj_turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -422,9 +422,7 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 SCREEN_OUTPUT=(INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_TKE)
diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg
index b34b9ace1740..5fc00757ee2c 100644
--- a/TestCases/euler/CRM/inv_CRM_JST.cfg
+++ b/TestCases/euler/CRM/inv_CRM_JST.cfg
@@ -243,7 +243,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
index 9139eb12aef0..2d99d1a33330 100644
--- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg
+++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg
@@ -272,7 +272,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/euler/bluntbody/blunt.cfg b/TestCases/euler/bluntbody/blunt.cfg
index 8403d4b59d8b..7070027f3a31 100644
--- a/TestCases/euler/bluntbody/blunt.cfg
+++ b/TestCases/euler/bluntbody/blunt.cfg
@@ -200,10 +200,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg
index 3a17609bc6d8..9697b70c17a2 100644
--- a/TestCases/euler/channel/inv_channel.cfg
+++ b/TestCases/euler/channel/inv_channel.cfg
@@ -222,7 +222,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg
index 7598740efb73..3b057f7ec5aa 100644
--- a/TestCases/euler/channel/inv_channel_RK.cfg
+++ b/TestCases/euler/channel/inv_channel_RK.cfg
@@ -215,10 +215,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg
index 4210ca194a44..89dd10e29c51 100644
--- a/TestCases/euler/naca0012/inv_NACA0012.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012.cfg
@@ -286,11 +286,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
index 4e7d02a4f30a..bd55aa33fb70 100644
--- a/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
+++ b/TestCases/euler/naca0012/inv_NACA0012_Roe.cfg
@@ -204,11 +204,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 250
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg
index 5bbcdee6ac9f..f48acd756a41 100644
--- a/TestCases/euler/oneram6/inv_ONERAM6.cfg
+++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg
@@ -265,10 +265,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/euler/wedge/inv_wedge_HLLC.cfg b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
index e67ecd9cd81c..8c6a6e9baeca 100644
--- a/TestCases/euler/wedge/inv_wedge_HLLC.cfg
+++ b/TestCases/euler/wedge/inv_wedge_HLLC.cfg
@@ -215,10 +215,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
index 898906be77ed..74020ed4a16e 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFEA.cfg
@@ -60,7 +60,7 @@ MULTIZONE_MESH= NO
 RESTART_SOL= YES
 SOLUTION_FILENAME= solution_solid.dat
 % outputs
-WRT_SOL_FREQ= 9999
+OUTPUT_WRT_FREQ= 9999
 RESTART_FILENAME= restart_solid.dat
 VOLUME_FILENAME= solid
 % history and screen
diff --git a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
index 9a109fef67f7..b2d7075ba0f7 100644
--- a/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
+++ b/TestCases/fea_fsi/Airfoil_RBF/configFlow.cfg
@@ -118,7 +118,7 @@ MULTIZONE_MESH= NO
 RESTART_SOL= YES
 SOLUTION_FILENAME= solution_fluid.dat
 % outputs
-WRT_SOL_FREQ= 9999
+OUTPUT_WRT_FREQ= 9999
 RESTART_FILENAME= restart_fluid.dat
 VOLUME_FILENAME= fluid
 SURFACE_FILENAME= surface_fluid
diff --git a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
index 91d466efc834..f46a6ded3b24 100644
--- a/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
+++ b/TestCases/fea_fsi/DynBeam_2d/configBeam_2d.cfg
@@ -36,12 +36,8 @@ LINEAR_SOLVER_ERROR= 1E-8
 LINEAR_SOLVER_ITER= 1000
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_SRF_SOL = NO
 VOLUME_FILENAME= beam
 RESTART_FILENAME= restart_beam.dat
 SOLUTION_FILENAME= solution_beam.dat
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 OUTPUT_FILES= (RESTART_ASCII)
diff --git a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
index 5f9dbd121b0b..be65f753f069 100644
--- a/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
+++ b/TestCases/fea_fsi/SquareCyl_Beam/config.cfg
@@ -249,21 +249,9 @@ RESTART_FILENAME= restart_flow.dat
 % Output file restart flow
 RESTART_STRUCTURE_FILENAME= restart_beam.dat
 %
-% Avoid writing surface and csv files
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
-%
-% Writing solution file frequency
-WRT_SOL_FREQ= 1
 %
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
 % -----------------------------------------------------------------------------%
 % --------------------------- MESH PARAMETERS ---------------------------------%
diff --git a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
index a247f2f1ac13..154cfd476cad 100644
--- a/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
+++ b/TestCases/fea_fsi/StatBeam_3d/configBeam_3d.cfg
@@ -25,13 +25,9 @@ LINEAR_SOLVER_ERROR= 1E-8
 LINEAR_SOLVER_ITER= 500
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_SRF_SOL = NO
 CONV_FILENAME= history_beam
 VOLUME_FILENAME= beam
 RESTART_FILENAME= restart_beam.dat
 SOLUTION_FILENAME= restart_beam.dat
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 INNER_ITER=1
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
index 876686438f92..d2234449cdc6 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFEA.cfg
@@ -45,14 +45,9 @@ MESH_FILENAME= meshFEA.su2
 
 MESH_FORMAT= SU2
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
 VOLUME_FILENAME= results_wall
 RESTART_FILENAME= solution_wall.dat
 SOLUTION_FILENAME= solution_wall.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
index 66740a32d593..1257c794f952 100644
--- a/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
+++ b/TestCases/fea_fsi/WallChannel_2d/configFlow.cfg
@@ -73,14 +73,9 @@ DEFORM_POISSONS_RATIO= 1e6
 
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
 VOLUME_FILENAME= results_flow
 RESTART_FILENAME= solution_flow.dat
 SOLUTION_FILENAME= solution_flow.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
index e76f935c7b44..0423a1d488d1 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFEA.cfg
@@ -46,14 +46,10 @@ MESH_FILENAME= meshFEA.su2
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
 
-WRT_CON_FREQ= 100
-WRT_CON_FREQ_DUALTIME= 100
-WRT_SOL_FREQ= 100
-WRT_SOL_FREQ_DUALTIME= 100
+SCREEN_WRT_FREQ_INNER= 100
+OUTPUT_WRT_FREQ= 100
 
 VOLUME_FILENAME= results_wall
 RESTART_FILENAME= restart_wall.dat
 SOLUTION_FILENAME= solution_wall.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
index 82450681b863..978c66da2ed6 100644
--- a/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/dyn_fsi/configFlow.cfg
@@ -70,14 +70,10 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_CON_FREQ= 100
-WRT_CON_FREQ_DUALTIME= 100
-WRT_SOL_FREQ= 100
-WRT_SOL_FREQ_DUALTIME= 100
+SCREEN_WRT_FREQ_INNER= 100
+OUTPUT_WRT_FREQ= 100
 
 VOLUME_FILENAME= results_flow
 RESTART_FILENAME= restart_flow.dat
 SOLUTION_FILENAME= solution_flow.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
diff --git a/TestCases/fea_fsi/stat_fsi/configFEA.cfg b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
index fee60e5af14d..8f291ad93f54 100755
--- a/TestCases/fea_fsi/stat_fsi/configFEA.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFEA.cfg
@@ -30,8 +30,7 @@ INCREMENTAL_LOAD = NO
 % --------------------------- TIME STEP ISSUES --------------------------------%
 
 TIME_ITER= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
 % --------------------------- MESH REFINEMENT ---------------------------------%
 
@@ -57,9 +56,6 @@ BREAKDOWN_FILENAME= forces_breakdown.dat
 SOLUTION_FILENAME= solution_beam.dat
 RESTART_FILENAME= restart_beam.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
-
 % ------------------------ STRUCTURAL PARAMETERS ------------------------------%
 
 ELASTICITY_MODULUS=21000
@@ -89,5 +85,3 @@ MARKER_FLUID_LOAD = (wallS)
 
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/fea_fsi/stat_fsi/configFlow.cfg b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
index bdecf787254d..9d430682d2a9 100755
--- a/TestCases/fea_fsi/stat_fsi/configFlow.cfg
+++ b/TestCases/fea_fsi/stat_fsi/configFlow.cfg
@@ -36,8 +36,7 @@ DEFORM_CONSOLE_OUTPUT = NO
 
 % -----------------------------------------------------------------------------%
 
-WRT_SOL_FREQ= 10
-WRT_SOL_FREQ_DUALTIME= 10
+OUTPUT_WRT_FREQ= 10
 
 INNER_ITER= 200
 
@@ -51,9 +50,6 @@ BREAKDOWN_FILENAME= forces_breakdown.dat
 SOLUTION_FILENAME= solution_flow.dat
 RESTART_FILENAME= restart_flow.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
-
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 
 MARKER_HEATFLUX= ( wallF, 0.0)
@@ -133,5 +129,3 @@ CONV_CAUCHY_EPS= 1E-5
 
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
diff --git a/TestCases/fea_topology/config.cfg b/TestCases/fea_topology/config.cfg
index 59f2ba224144..8294fe3eb2b0 100644
--- a/TestCases/fea_topology/config.cfg
+++ b/TestCases/fea_topology/config.cfg
@@ -93,8 +93,7 @@ DISCADJ_LIN_PREC= ILU
 MESH_FILENAME= mesh.su2
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
-WRT_SOL_FREQ= 9999
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 9999
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
index cde746b5dcc6..d9070a047b09 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg
@@ -298,10 +298,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
index 2173e2e8fa42..bf990b8de429 100644
--- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
+++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg
@@ -303,10 +303,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) 
 
diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg
index a6199a5cea8e..00703c7a844a 100644
--- a/TestCases/gust/inv_gust_NACA0012.cfg
+++ b/TestCases/gust/inv_gust_NACA0012.cfg
@@ -262,17 +262,9 @@ VOLUME_FILENAME= flow
 % Output file surface flow coefficient (w/o extension)
 SURFACE_FILENAME= surface_flow
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1000
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg
index 56ef28ca2f64..4df2859f0c15 100644
--- a/TestCases/harmonic_balance/HB.cfg
+++ b/TestCases/harmonic_balance/HB.cfg
@@ -316,11 +316,9 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
+%
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-WRT_RESIDUALS = NO
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
 % Available flow based objective functions or constraint functions
diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
index d7e0ab571d63..35297c1883c2 100644
--- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
+++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg
@@ -244,8 +244,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-WRT_RESIDUALS = NO
diff --git a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
index b56e2dbc5d5d..e5ac537d7d94 100644
--- a/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/2D/Quad32X32_nPoly4/InviscidVortex.cfg
@@ -183,11 +183,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 100
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 40
+OUTPUT_WRT_FREQ= 40
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
index 7e135cd553cc..522a764fb400 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly2_Tets/InviscidVortex.cfg
@@ -182,11 +182,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 100
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
index ca2505d08176..099263ebb856 100644
--- a/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
+++ b/TestCases/hom_euler/InviscidVortex/3D/nPoly4_Tets/InviscidVortex.cfg
@@ -182,11 +182,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 100
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
index 90bb5cb05718..8dfb0a75c99a 100644
--- a/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_3D_Hybrid_4thOrder/fem_NACA0012.cfg
@@ -177,7 +177,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 2500
+OUTPUT_WRT_FREQ= 2500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
index f68f704a22cb..722f7fe39c5a 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012.cfg
@@ -182,10 +182,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50000
+OUTPUT_WRT_FREQ= 50000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT = (RMS_DENSITY, RMS_MOMENTUM-X, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
index b11e2f6e657a..51fd99f49b51 100644
--- a/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
+++ b/TestCases/hom_euler/NACA0012_5thOrder/fem_NACA0012_reg.cfg
@@ -185,10 +185,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50000
+OUTPUT_WRT_FREQ= 50000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
index 3da9645c1387..08dcc9cf1a38 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
index a7e8b4fe01f0..4434222802d3 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly3/Ringleb_WallBC.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
index 855979cb5516..a496a516743f 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
index d839246cbc36..3411911b5677 100644
--- a/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad100X50_nPoly4/Ringleb_WallBC.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
index 38ec92d1671b..bb46103376c5 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
index a0bbae44e929..902ddb066477 100644
--- a/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad200X100_nPoly4/Ringleb_WallBC.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
index 471c101e3e53..3acd6ce906c6 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index 7366214878a7..a138f70ced8b 100644
--- a/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Quad50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
index 9bf0517eee8a..497fe62167d2 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index abd0968dc1ab..f40a45980a0d 100644
--- a/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/QuadDominantUnstr100X100_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
index 9afcb47a579f..8a46168cffc5 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
index dd3fc378315d..94e42fa571a5 100644
--- a/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
+++ b/TestCases/hom_euler/Ringleb/Triangle50X50_HalfGeom_nPoly4/Ringleb_WallBC.cfg
@@ -174,7 +174,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
index 1f5d8864e170..37c565dc4fe9 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Hexa/fem_Sphere.cfg
@@ -177,7 +177,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
index f84469319ba2..958e683811a0 100644
--- a/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
+++ b/TestCases/hom_euler/Sphere_4thOrder_Tet/fem_Sphere.cfg
@@ -181,7 +181,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
index d6e387e7b9dc..3c2bad1c8af5 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel.cfg
@@ -187,7 +187,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
index dd40c533227d..95bd94df144d 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly1/fem_SubsonicChannel_Farfield.cfg
@@ -180,7 +180,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
index 5c122da7f367..a76f02ed62f9 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel.cfg
@@ -187,7 +187,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
index 8595c424d8a8..511c0f5b09ac 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly2/fem_SubsonicChannel_Farfield.cfg
@@ -180,7 +180,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
index 9e83ec133b10..f840de5703e6 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel.cfg
@@ -187,7 +187,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
index 3f6d8c85c3d6..c5ea63cb679a 100644
--- a/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
+++ b/TestCases/hom_euler/SubsonicChannel/nPoly4/fem_SubsonicChannel_Farfield.cfg
@@ -180,7 +180,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 100
+SCREEN_WRT_FREQ_INNER= 100
diff --git a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
index ae6a076bf2c5..5cfd4351986f 100644
--- a/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
+++ b/TestCases/hom_navierstokes/CylinderViscous/nPoly3/fem_Cylinder_reg.cfg
@@ -178,10 +178,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
index a2b367aa1645..627256f557d4 100644
--- a/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
+++ b/TestCases/hom_navierstokes/FlatPlate/nPoly4/lam_flatplate_reg.cfg
@@ -187,10 +187,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
index 6a45222a86fc..08db1994bf0e 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg.cfg
@@ -180,10 +180,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 2500
+OUTPUT_WRT_FREQ= 2500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
index 7d3178fa5f95..5ce695870dc6 100644
--- a/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
+++ b/TestCases/hom_navierstokes/SphereViscous/nPoly3_QuadDominant/fem_Sphere_reg_ADER.cfg
@@ -202,13 +202,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 10000
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT = (TIME_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
index 2185ceec498e..37a453851cde 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder.cfg
@@ -196,14 +196,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
index fa987e0aec72..1ec7016538e7 100644
--- a/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
+++ b/TestCases/hom_navierstokes/UnsteadyCylinder/nPoly4/fem_unst_cylinder_ADER.cfg
@@ -208,14 +208,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (TIME_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
index ded1a092e5cb..f65949007e24 100644
--- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
+++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg
@@ -188,10 +188,8 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 200
+OUTPUT_WRT_FREQ= 200
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
index 264dc465013b..c2737b7df8eb 100644
--- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
+++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg
@@ -210,7 +210,7 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 % 
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/incomp_navierstokes/bend/lam_bend.cfg b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
index 3b7206b08a79..4715d36d9277 100755
--- a/TestCases/incomp_navierstokes/bend/lam_bend.cfg
+++ b/TestCases/incomp_navierstokes/bend/lam_bend.cfg
@@ -254,18 +254,7 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
 %
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
index 7eb65c9d4190..565be6880fe0 100644
--- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
+++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg
@@ -258,19 +258,14 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TEMPERATURE, LIFT, DRAG)
 
 % ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
 %
-% Extract a slice using GEO_BOUNDS (works with 2D cartesian grids only)
-WRT_SLICE= YES
-%
 % Geometrical bounds (Y coordinate) for the wing geometry analysis or
 % fuselage evaluation (X coordinate).
 GEO_BOUNDS= ( 0.499, 0.501)
diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
index 63a09d0879a0..5086b4373974 100644
--- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg
@@ -185,10 +185,8 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
index 7bba5d472960..e9654e572cd0 100644
--- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
+++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg
@@ -289,10 +289,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TEMPERATURE, LIFT, DRAG)
diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
index 32d104bcfbd0..bfcc4892d16b 100644
--- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
+++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg
@@ -336,13 +336,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg
index 038f2cc2e552..1dc386b7c111 100644
--- a/TestCases/incomp_rans/naca0012/naca0012.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012.cfg
@@ -244,10 +244,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
index 96db81510154..030382d564c5 100644
--- a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
+++ b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg
@@ -243,10 +243,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
index 0142f508d274..ce00494b14d9 100644
--- a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
+++ b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg
@@ -283,8 +283,6 @@ SURFACE_FILENAME= surface_flow
 % Writing solution file frequency
 OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 SCREEN_OUTPUT= (WALL_TIME,INNER_ITER, RMS_VELOCITY-X, RMS_NU_TILDE, LIFT,DRAG)
 %
diff --git a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
index 50212e85eb9f..010a314d4ad0 100644
--- a/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
+++ b/TestCases/mms/dg_navierstokes/lam_mms_dg.cfg
@@ -175,10 +175,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 25000
+OUTPUT_WRT_FREQ= 25000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
index c310caa6aeb6..eb0519a3047f 100644
--- a/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
+++ b/TestCases/mms/dg_navierstokes_3d/lam_mms_dg_3d.cfg
@@ -193,10 +193,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 25000
+OUTPUT_WRT_FREQ= 25000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/mms/dg_ringleb/ringleb_dg.cfg b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
index de820fac4f29..91fb76892e18 100644
--- a/TestCases/mms/dg_ringleb/ringleb_dg.cfg
+++ b/TestCases/mms/dg_ringleb/ringleb_dg.cfg
@@ -192,10 +192,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 5000
+OUTPUT_WRT_FREQ= 5000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
index efa14611861c..b65418d31385 100755
--- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
+++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg
@@ -220,10 +220,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
index 6f6997c2ff1e..4cc0305b8438 100755
--- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
+++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg
@@ -242,10 +242,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
diff --git a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
index b2894885f2a4..5e6aa1903f8f 100755
--- a/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
+++ b/TestCases/mms/fvm_navierstokes/lam_mms_roe.cfg
@@ -259,10 +259,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/moving_wall/cavity/lam_cavity.cfg b/TestCases/moving_wall/cavity/lam_cavity.cfg
index 218b38480ad3..744f0ba6001f 100644
--- a/TestCases/moving_wall/cavity/lam_cavity.cfg
+++ b/TestCases/moving_wall/cavity/lam_cavity.cfg
@@ -227,10 +227,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
index c69cc634096d..c4ddc5ae39be 100644
--- a/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
+++ b/TestCases/moving_wall/spinning_cylinder/spinning_cylinder.cfg
@@ -244,10 +244,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
index 0a19fad02439..7bc2f03ad049 100644
--- a/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
+++ b/TestCases/multiple_ffd/naca0012/inv_NACA0012_ffd.cfg
@@ -317,19 +317,9 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output rind layers in the solution files
-WRT_HALO= NO
 HISTORY_OUTPUT=(ITER, RMS_RES, AERO_COEFF, D_AERO_COEFF)
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
index 9c6942ea8450..05c44c49ab9b 100644
--- a/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
+++ b/TestCases/navierstokes/cylinder/cylinder_lowmach.cfg
@@ -219,10 +219,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/cylinder/lam_cylinder.cfg b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
index c60031393f43..53f81fd2ebfe 100644
--- a/TestCases/navierstokes/cylinder/lam_cylinder.cfg
+++ b/TestCases/navierstokes/cylinder/lam_cylinder.cfg
@@ -213,10 +213,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/flatplate/lam_flatplate.cfg b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
index ce3d7e6a8890..66924f9aa18b 100644
--- a/TestCases/navierstokes/flatplate/lam_flatplate.cfg
+++ b/TestCases/navierstokes/flatplate/lam_flatplate.cfg
@@ -231,10 +231,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
index e7bf88b8ee54..4174cea09991 100644
--- a/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
+++ b/TestCases/navierstokes/naca0012/lam_NACA0012.cfg
@@ -208,8 +208,6 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
diff --git a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
index 1041ac5634e5..6c0f5647e366 100644
--- a/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/lam_poiseuille.cfg
@@ -254,10 +254,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
index c75a55d97f23..e1704782600f 100644
--- a/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
+++ b/TestCases/navierstokes/poiseuille/profile_poiseuille.cfg
@@ -288,10 +288,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 25
+OUTPUT_WRT_FREQ= 25
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/nicf/LS89/turb_SA_PR.cfg b/TestCases/nicf/LS89/turb_SA_PR.cfg
index 12277ca50620..ed25c46db185 100644
--- a/TestCases/nicf/LS89/turb_SA_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SA_PR.cfg
@@ -315,10 +315,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/nicf/LS89/turb_SST_PR.cfg b/TestCases/nicf/LS89/turb_SST_PR.cfg
index 66dd25696613..f686f9351350 100644
--- a/TestCases/nicf/LS89/turb_SST_PR.cfg
+++ b/TestCases/nicf/LS89/turb_SST_PR.cfg
@@ -314,10 +314,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % 
 % Screen output
diff --git a/TestCases/nicf/edge/edge_PPR.cfg b/TestCases/nicf/edge/edge_PPR.cfg
index b3ac6378e350..fb5ec5926114 100644
--- a/TestCases/nicf/edge/edge_PPR.cfg
+++ b/TestCases/nicf/edge/edge_PPR.cfg
@@ -235,10 +235,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/nicf/edge/edge_VW.cfg b/TestCases/nicf/edge/edge_VW.cfg
index 5595c9e0f105..b6dca66355fa 100644
--- a/TestCases/nicf/edge/edge_VW.cfg
+++ b/TestCases/nicf/edge/edge_VW.cfg
@@ -235,10 +235,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/nonequilibrium/invwedge/invwedge.cfg b/TestCases/nonequilibrium/invwedge/invwedge.cfg
index 98956c446352..59134cb105c7 100644
--- a/TestCases/nonequilibrium/invwedge/invwedge.cfg
+++ b/TestCases/nonequilibrium/invwedge/invwedge.cfg
@@ -187,11 +187,6 @@ SURFACE_FILENAME= soln_surface
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 100
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 OUTPUT_WRT_FREQ= 100
 
diff --git a/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg b/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
index 60f1a279bb11..8638078e418c 100644
--- a/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
+++ b/TestCases/nonequilibrium/thermalbath/finitechemistry/thermalbath.cfg
@@ -31,7 +31,6 @@ TIME_MARCHING=TIME_STEPPING
 TIME_DOMAIN= YES
 TIME_STEP= 0.000000001 % 1.e-09
 MAX_TIME= 0.001
-WRT_SOL_FREQ_DUALTIME = 10
 %
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE_STREAM DEFINITION ----------%
 %
@@ -170,10 +169,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 50
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 10
+SCREEN_WRT_FREQ_INNER= 10
 
 OUTPUT_WRT_FREQ= 10
diff --git a/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg b/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
index c542422ddae5..bd1eef6e6144 100644
--- a/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
+++ b/TestCases/nonequilibrium/thermalbath/frozen/thermalbath_frozen.cfg
@@ -30,7 +30,6 @@ TIME_MARCHING=TIME_STEPPING
 TIME_DOMAIN= YES
 TIME_STEP= 0.000000001 % 1.e-09
 MAX_TIME= 0.001
-WRT_SOL_FREQ_DUALTIME = 10
 %
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE_STREAM DEFINITION ----------%
 %
@@ -171,10 +170,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 50
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 10
+SCREEN_WRT_FREQ_INNER= 10
 
 OUTPUT_WRT_FREQ= 10
diff --git a/TestCases/nonequilibrium/viscwedge/viscwedge.cfg b/TestCases/nonequilibrium/viscwedge/viscwedge.cfg
index 14ba3fd1b7d9..d398f92184dc 100644
--- a/TestCases/nonequilibrium/viscwedge/viscwedge.cfg
+++ b/TestCases/nonequilibrium/viscwedge/viscwedge.cfg
@@ -189,11 +189,6 @@ SURFACE_FILENAME= soln_surface
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 100
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 OUTPUT_WRT_FREQ= 100
 
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
index 9de8b9b83e22..0b1ef6d84171 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_2surf_1obj.cfg
@@ -270,10 +270,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
index ac77f020c2c2..a8b72cb67832 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj.cfg
@@ -271,10 +271,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
index a9dddaea7d82..a533efab289e 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_1surf.cfg
@@ -271,10 +271,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
diff --git a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
index 021a1221856c..b4a9f3638e83 100644
--- a/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
+++ b/TestCases/optimization_euler/multiobjective_wedge/inv_wedge_ROE_multiobj_combo.cfg
@@ -273,10 +273,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Read binary restart files
 READ_BINARY_RESTART = NO
diff --git a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
index 0c9b96af6f74..84eebac0ea43 100644
--- a/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
+++ b/TestCases/optimization_euler/multipoint_naca0012/inv_NACA0012_multipoint.cfg
@@ -276,19 +276,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output rind layers in the solution files
-WRT_HALO= NO
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
index 829c6279f628..fa2c8d0ba7f8 100644
--- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
+++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg
@@ -326,10 +326,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
index d9fd95e7356b..f8b2fed70360 100644
--- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
+++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg
@@ -311,10 +311,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
index f36cbc91f274..57e718a42487 100644
--- a/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
+++ b/TestCases/optimization_euler/rotating_naca0012/rotating_NACA0012.cfg
@@ -295,10 +295,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
index 57875ef332c5..47c4186c9a0a 100644
--- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
+++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg
@@ -285,10 +285,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
index 06178a68c9d6..2c5672b7d92c 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_adv.cfg
@@ -297,19 +297,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output rind layers in the solution files
-WRT_HALO= NO
 %
 % History output
 HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF)
diff --git a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
index 04cee21b6a8a..7c78a1bba0f3 100644
--- a/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
+++ b/TestCases/optimization_euler/steady_naca0012/inv_NACA0012_basic.cfg
@@ -285,19 +285,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output rind layers in the solution files
-WRT_HALO= NO
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
index e2b51abdd772..0d8f431a9a61 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_adv.cfg
@@ -268,17 +268,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 500
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
 %
 OUTPUT_FILES=(RESTART, PARAVIEW, SURFACE_CSV)
 
diff --git a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
index 4dfde1fefe41..b0f64ef8e8d3 100644
--- a/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
+++ b/TestCases/optimization_euler/steady_oneram6/inv_ONERAM6_basic.cfg
@@ -268,17 +268,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 500
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
 
 % -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
 %
diff --git a/TestCases/optimization_rans/naca0012/naca0012.cfg b/TestCases/optimization_rans/naca0012/naca0012.cfg
index f12c5c707d30..07309c7ab9a0 100644
--- a/TestCases/optimization_rans/naca0012/naca0012.cfg
+++ b/TestCases/optimization_rans/naca0012/naca0012.cfg
@@ -169,12 +169,7 @@ VOLUME_FILENAME= flow
 % Output file surface flow coefficient (w/o extension)
 SURFACE_FILENAME= surface_flow
 % Writing solution file frequency
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
-% Writing convergence history frequency% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-WRT_CON_FREQ= 1
-WRT_CSV_SOL=NO
+OUTPUT_WRT_FREQ= 1
 %
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
index b5bfe74e584b..47e0e3bee6f1 100644
--- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
+++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg
@@ -341,17 +341,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 100
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
index a296b45846a7..99b169d3343d 100644
--- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg
@@ -365,13 +365,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 25
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
index accfb91691dd..e8eaebd240ca 100644
--- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
+++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg
@@ -312,13 +312,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 25
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
index 29efbdf9c417..80768e05b03e 100644
--- a/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/optimization_rans/steady_rae2822/turb_SA_RAE2822.cfg
@@ -263,10 +263,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg
index 6920565f4060..51f92306f186 100644
--- a/TestCases/polar/naca0012/inv_NACA0012.cfg
+++ b/TestCases/polar/naca0012/inv_NACA0012.cfg
@@ -300,10 +300,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % 
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
diff --git a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
index 2357ddeb3dff..63edf6869cf6 100644
--- a/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
+++ b/TestCases/py_wrapper/disc_adj_fea/flow_load_sens/configAD_fem.cfg
@@ -51,16 +51,10 @@ RESTART_FILENAME= restart_beam.dat
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 RESTART_ADJ_FILENAME= restart_adj.dat
 
-WRT_SRF_SOL = NO
-WRT_CSV_SOL = NO
-
 MESH_FORMAT= SU2
 TABULAR_FORMAT= CSV
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
 LINEAR_SOLVER= CONJUGATE_GRADIENT
 LINEAR_SOLVER_PREC= JACOBI
diff --git a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
index 1dc082c52164..af96cf4e0fa4 100644
--- a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
+++ b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg
@@ -144,11 +144,7 @@ CONV_FILENAME= history
 VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 
-WRT_SOL_FREQ= 1000
-WRT_SOL_FREQ_DUALTIME= 1
-
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1000
 
 
 % --------------------------- MESH PARAMETERS ---------------------------------%
diff --git a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
index de171ef3a08e..113b0c0f3b13 100644
--- a/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_rigidMotion/flatPlate_rigidMotion_Conf.cfg
@@ -515,29 +515,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 50
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 3
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
+OUTPUT_WRT_FREQ= 3
 %
-% Output the solution at each surface in the history file
-WRT_SURFACE= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
index f8c399f35901..df0070bc2335 100644
--- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
+++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg
@@ -496,29 +496,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 50
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 3
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
+OUTPUT_WRT_FREQ= 3
 %
-% Output the solution at each surface in the history file
-WRT_SURFACE= NO
 %
 % Read binary restart files (YES, NO)
 READ_BINARY_RESTART= YES
diff --git a/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg b/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
index 20ec4f80cc69..f71d5ad86e2c 100644
--- a/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
+++ b/TestCases/rans/actuatordisk_variable_load/propeller_variable_load.cfg
@@ -228,10 +228,8 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 %
 %
diff --git a/TestCases/rans/flatplate/turb_SA_flatplate.cfg b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
index e868014da012..dc0e29afecad 100644
--- a/TestCases/rans/flatplate/turb_SA_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SA_flatplate.cfg
@@ -240,10 +240,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/rans/flatplate/turb_SST_flatplate.cfg b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
index ee2cfa972ba0..424eaaefdd55 100644
--- a/TestCases/rans/flatplate/turb_SST_flatplate.cfg
+++ b/TestCases/rans/flatplate/turb_SST_flatplate.cfg
@@ -239,7 +239,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
index 7f1d366cccb3..fa91f63fa820 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa.cfg
@@ -240,10 +240,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT=(INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
index 99e669d1216e..3838a627d480 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_binary.cfg
@@ -249,10 +249,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
index b9b854ed6d82..104b4fb3618c 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sa_neg.cfg
@@ -240,7 +240,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
index bfa260190383..9dfd5c24ec98 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst.cfg
@@ -243,10 +243,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
index beb31c8cad0c..ce2e1b2f6d07 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg
@@ -386,28 +386,11 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
 % Uses two restart files and switches between them when writting restarts
 %WRT_FLIPFLOP_RESTART = YES
 %
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 50
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= YES
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Write a CSV surface flow file
-WRT_CSV_SOL= NO
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
index 28ab3b2931dc..92750082434d 100644
--- a/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
+++ b/TestCases/rans/naca0012/turb_NACA0012_sst_sust.cfg
@@ -249,10 +249,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/TestCases/rans/oneram6/turb_ONERAM6.cfg b/TestCases/rans/oneram6/turb_ONERAM6.cfg
index 52a25a75c5aa..724261b762f4 100644
--- a/TestCases/rans/oneram6/turb_ONERAM6.cfg
+++ b/TestCases/rans/oneram6/turb_ONERAM6.cfg
@@ -285,10 +285,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/rans/propeller/propeller.cfg b/TestCases/rans/propeller/propeller.cfg
index 7805f15ab646..d8344a1aac58 100644
--- a/TestCases/rans/propeller/propeller.cfg
+++ b/TestCases/rans/propeller/propeller.cfg
@@ -266,28 +266,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1500
-%
-% Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-%
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-%
-% Output residual values in the solution files
-WRT_RESIDUALS= NO
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
-%
-% Output the sharp edges detector
-WRT_SHARPEDGES= NO
-%
+OUTPUT_WRT_FREQ= 1500
 %
 %
 % Screen output fields
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
-
diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
index b9b6d2388bf2..4c4776292976 100644
--- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg
@@ -253,10 +253,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output fields 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
index e8db49745f8f..ca399dd816cf 100644
--- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg
@@ -230,10 +230,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
 
diff --git a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
index 2c1e9f9f7b64..4445ee1953ce 100644
--- a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
+++ b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg
@@ -230,10 +230,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 % Screen output fields
 SCREEN_OUTPUT = (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
 
diff --git a/TestCases/rans/restart_directdiff_naca/naca0012.cfg b/TestCases/rans/restart_directdiff_naca/naca0012.cfg
index 02f062535293..2d43774b7a81 100644
--- a/TestCases/rans/restart_directdiff_naca/naca0012.cfg
+++ b/TestCases/rans/restart_directdiff_naca/naca0012.cfg
@@ -169,12 +169,7 @@ VOLUME_FILENAME= flow
 % Output file surface flow coefficient (w/o extension)
 SURFACE_FILENAME= surface_flow
 % Writing solution file frequency
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
-% Writing convergence history frequency% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 10
-WRT_CON_FREQ= 1
-WRT_CSV_SOL=NO
+OUTPUT_WRT_FREQ= 1
 %
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg
index c896622ae920..01f9e1314c42 100644
--- a/TestCases/rans/s809/trans_s809.cfg
+++ b/TestCases/rans/s809/trans_s809.cfg
@@ -234,7 +234,5 @@ SURFACE_ADJ_FILENAME= trans_surface_adjoint
 SURFACE_LIN_FILENAME= trans_surface_linear
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/rans/s809/turb_S809.cfg b/TestCases/rans/s809/turb_S809.cfg
index 1097effe3471..7b9c61eccefa 100644
--- a/TestCases/rans/s809/turb_S809.cfg
+++ b/TestCases/rans/s809/turb_S809.cfg
@@ -239,7 +239,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/rans/vki_turbine/turb_vki.cfg b/TestCases/rans/vki_turbine/turb_vki.cfg
index 06c1a99921a3..ee163c52c232 100644
--- a/TestCases/rans/vki_turbine/turb_vki.cfg
+++ b/TestCases/rans/vki_turbine/turb_vki.cfg
@@ -246,7 +246,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
index 4d874ecf4f97..eb382dbe202e 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq.cfg
@@ -238,7 +238,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
index 7a8060e1c3aa..9ed891401238 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_1c.cfg
@@ -253,10 +253,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
index db16e7f0921b..193942e503c7 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_2c.cfg
@@ -253,10 +253,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
index 3500f5388450..fea63cab1ade 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_3c.cfg
@@ -253,10 +253,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
index e192b21f7199..83c63ba0207e 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c1.cfg
@@ -253,10 +253,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
index f048c9b733b4..4d2746756caa 100644
--- a/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
+++ b/TestCases/rans_uq/naca0012/turb_NACA0012_uq_p1c2.cfg
@@ -253,10 +253,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 10000
+OUTPUT_WRT_FREQ= 10000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG
diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
index bf580ca9e71f..c789e00e4c61 100644
--- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
+++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg
@@ -226,9 +226,7 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 SCREEN_OUTPUT=(INNER_ITER, WALL_TIME, RMS_DENSITY, LIFT, DRAG, AVG_CFL)
diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg
index c49296330767..8f3470cb08b3 100644
--- a/TestCases/rotating/naca0012/rot_NACA0012.cfg
+++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg
@@ -317,10 +317,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
index ff8e60bbef39..5d7e3d5a8f63 100644
--- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg
+++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg
@@ -329,12 +329,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-% Output residual values in the solution files
-WRT_RESIDUALS= YES
-%
-% Output limiters values in the solution files
-WRT_LIMITERS= NO
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
index 9e79e979cd6c..b3b7a75085e2 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_NN.cfg
@@ -230,7 +230,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
index eebace601a1c..753114922306 100644
--- a/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
+++ b/TestCases/sliding_interface/channel_2D/channel_2D_WA.cfg
@@ -228,7 +228,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
index 64c16fb1d48b..6e00b13b6e37 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_NN.cfg
@@ -230,7 +230,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
index 0bf0094fb7e1..cf83150bebd8 100644
--- a/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
+++ b/TestCases/sliding_interface/channel_3D/channel_3D_WA.cfg
@@ -228,7 +228,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
index 694d12ac692a..e8407db3bef8 100644
--- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg
@@ -132,6 +132,5 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
-WRT_SOL_FREQ= 1000
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1000
 
diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
index 88fecf2fb3eb..e7ef64e9db97 100644
--- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg
@@ -138,6 +138,5 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
-WRT_SOL_FREQ= 1000
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1000
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
index 1a46e22fda5e..2bffacac5197 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg
@@ -136,9 +136,6 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
 
diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
index b3873938ef93..35a17cfa398c 100644
--- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
+++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg
@@ -146,9 +146,6 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 
-WRT_SOL_FREQ= 1
-WRT_SOL_FREQ_DUALTIME= 1
+OUTPUT_WRT_FREQ= 1
 
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 1
 
diff --git a/TestCases/sliding_interface/pipe/pipe_NN.cfg b/TestCases/sliding_interface/pipe/pipe_NN.cfg
index 030545723345..913ba4c38a82 100644
--- a/TestCases/sliding_interface/pipe/pipe_NN.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_NN.cfg
@@ -235,7 +235,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/pipe/pipe_WA.cfg b/TestCases/sliding_interface/pipe/pipe_WA.cfg
index d3426972777f..04d38488e127 100644
--- a/TestCases/sliding_interface/pipe/pipe_WA.cfg
+++ b/TestCases/sliding_interface/pipe/pipe_WA.cfg
@@ -234,7 +234,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
index f0905c16e3f9..5d788fe62bed 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_NN.cfg
@@ -233,7 +233,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
index 9803529ee86e..2a0ec112c1ea 100644
--- a/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
+++ b/TestCases/sliding_interface/rotating_cylinders/rot_cylinders_WA.cfg
@@ -235,7 +235,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
index 1abaa6406bdf..141cb2081aed 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_NN.cfg
@@ -273,7 +273,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
index 97bb4f23ef55..a64ac575c784 100644
--- a/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
+++ b/TestCases/sliding_interface/single_stage/single_stage_WA.cfg
@@ -271,7 +271,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
index cefa2217b64b..c67f4e33299e 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_NN.cfg
@@ -236,7 +236,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
index 0d3c1a121c32..1b55ee492f23 100644
--- a/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
+++ b/TestCases/sliding_interface/supersonic_vortex_shedding/sup_vor_shed_WA.cfg
@@ -236,7 +236,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
index 9e7cef652fa6..5cb885c84f0a 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_NN.cfg
@@ -233,7 +233,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
index 9c1ed17b5f31..31def6809ef5 100644
--- a/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
+++ b/TestCases/sliding_interface/uniform_flow/uniform_WA.cfg
@@ -233,7 +233,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 50
+OUTPUT_WRT_FREQ= 50
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
index 3add916d76e2..29add17a1695 100644
--- a/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/E387_Airfoil/transitional_BC_model_ConfigFile.cfg
@@ -238,7 +238,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
index 678988dd7c81..f45281331c97 100644
--- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg
@@ -271,10 +271,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 %
 % Screen output 
 SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
index 25826dfc8dd4..982880bd3d11 100644
--- a/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
+++ b/TestCases/transition/T3A_FlatPlate/transitional_BC_model_ConfigFile.cfg
@@ -257,7 +257,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
index ba06795a7deb..3b34e71a76ef 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones.cfg
@@ -340,7 +340,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
index 8743715e8583..3d327e879611 100755
--- a/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
+++ b/TestCases/turbomachinery/APU_turbocharger/Jones_rst.cfg
@@ -345,7 +345,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 100
+OUTPUT_WRT_FREQ= 100
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
index 4cedf5e074f3..57e5a63d1f6d 100755
--- a/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
+++ b/TestCases/turbomachinery/axial_stage_2D/Axial_stage2D.cfg
@@ -332,7 +332,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1000
+OUTPUT_WRT_FREQ= 1000
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
index a1f5c733841e..e33415dc7eca 100755
--- a/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
+++ b/TestCases/turbomachinery/centrifugal_blade/centrifugal_blade.cfg
@@ -356,7 +356,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
index d2e8204fae61..40d7b49f8a36 100755
--- a/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
+++ b/TestCases/turbomachinery/centrifugal_stage/centrifugal_stage.cfg
@@ -364,7 +364,5 @@ VOLUME_FILENAME= flow
 SURFACE_FILENAME= surface_flow
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
index bb6a6c7c7896..9a86ea4578bc 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator.cfg
@@ -340,7 +340,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
index 726b79cc58a7..6646c803dcb4 100644
--- a/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
+++ b/TestCases/turbomachinery/transonic_stator_2D/transonic_stator_rst.cfg
@@ -345,7 +345,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 500
+OUTPUT_WRT_FREQ= 500
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
diff --git a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
index 94a6971466cb..7045568c646b 100644
--- a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
+++ b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg
@@ -113,8 +113,5 @@ VOLUME_ADJ_FILENAME= adjoint
 GRAD_OBJFUNC_FILENAME= of_grad.dat
 SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
-WRT_SOL_FREQ= 100
-WRT_SOL_FREQ_DUALTIME= 1
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 10
+OUTPUT_WRT_FREQ= 1
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_PRESSURE, RMS_NU_TILDE, LIFT, DRAG)
diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
index c06b97fbcd3e..6c1b3eec9b78 100644
--- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg
@@ -318,10 +318,8 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 250
+OUTPUT_WRT_FREQ= 250
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
index 39dc1e71801b..beb158248139 100644
--- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
+++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg
@@ -341,17 +341,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 100
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
diff --git a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
index d6d0f97f6897..32874ec5f826 100644
--- a/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
+++ b/TestCases/unsteady/plunging_naca0012/plunging_NACA0012.cfg
@@ -247,8 +247,5 @@ SURFACE_FILENAME= surface_flow
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
 % Writing solution file frequency
-WRT_SOL_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
-WRT_CON_FREQ_DUALTIME= 50
diff --git a/TestCases/unsteady/square_cylinder/turb_square.cfg b/TestCases/unsteady/square_cylinder/turb_square.cfg
index 158dc397d7ac..a24b6b55cdfa 100644
--- a/TestCases/unsteady/square_cylinder/turb_square.cfg
+++ b/TestCases/unsteady/square_cylinder/turb_square.cfg
@@ -255,17 +255,9 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-% Writing solution file frequency
-WRT_SOL_FREQ= 1000
-%
 % Writing solution file frequency for physical time steps (dual time)
-WRT_SOL_FREQ_DUALTIME= 1
-%
-% Writing convergence history frequency
-WRT_CON_FREQ= 1
+OUTPUT_WRT_FREQ= 1
 %
-% Writing convergence history frequency (dual time, only written to screen)
-WRT_CON_FREQ_DUALTIME= 1
 % 
 % Screen output 
 SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
diff --git a/config_template.cfg b/config_template.cfg
index 4153b6177999..6958a53ecfdb 100644
--- a/config_template.cfg
+++ b/config_template.cfg
@@ -5,17 +5,17 @@
 % Author: ___________________________________________________________________  %
 % Institution: ______________________________________________________________  %
 % Date: __________                                                             %
-% File Version 7.0.8 "Blackbird"                                                  %
+% File Version 7.0.8 "Blackbird"                                               %
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
 %
 % Solver type (EULER, NAVIER_STOKES, RANS,
-%                               INC_EULER, INC_NAVIER_STOKES, INC_RANS,
-                                NEMO_EULER, NEMO_NAVIER_STOKES,
-%                               FEM_EULER, FEM_NAVIER_STOKES, FEM_RANS, FEM_LES,
-%                               HEAT_EQUATION_FVM, ELASTICITY)
+%              INC_EULER, INC_NAVIER_STOKES, INC_RANS,
+%              NEMO_EULER, NEMO_NAVIER_STOKES,
+%              FEM_EULER, FEM_NAVIER_STOKES, FEM_RANS, FEM_LES,
+%              HEAT_EQUATION_FVM, ELASTICITY)
 SOLVER= EULER
 %
 % Specify turbulence model (NONE, SA, SA_NEG, SST, SA_E, SA_COMP, SA_E_COMP, SST_SUST)
@@ -58,9 +58,15 @@ DISCARD_INFILES= NO
 %                                       Speed = ft/s, Equiv. Area = ft^2 )
 SYSTEM_MEASUREMENTS= SI
 %
+% List of config files for each zone in a multizone setup with SOLVER=MULTIPHYSICS
+% Order here has to match the order in the meshfile if just one is used.
+CONFIG_LIST= (configA.cfg, configB.cfg, ...)
 %
 % ------------------------------- SOLVER CONTROL ------------------------------%
 %
+% Number of iterations for single-zone problems
+ITER= 1
+%
 % Maximum number of inner iterations
 INNER_ITER= 9999
 %
@@ -180,6 +186,12 @@ FREESTREAM_VELOCITY= ( 1.0, 0.00, 0.00 )
 % Free-stream viscosity (1.853E-5 N s/m^2, 3.87E-7 lbf s/ft^2 by default)
 FREESTREAM_VISCOSITY= 1.853E-5
 %
+% Free-stream turbulence intensity
+FREESTREAM_TURBULENCEINTENSITY= 0.05
+%
+% Free-stream ratio between turbulent and laminar viscosity
+FREESTREAM_TURB2LAMVISCRATIO= 10.0
+%
 % Compressible flow non-dimensionalization (DIMENSIONAL, FREESTREAM_PRESS_EQ_ONE,
 %                              FREESTREAM_VEL_EQ_MACH, FREESTREAM_VEL_EQ_ONE)
 REF_DIMENSIONALIZATION= DIMENSIONAL
@@ -234,7 +246,21 @@ INC_OUTLET_TYPE= PRESSURE_OUTLET
 %
 % Damping coefficient for iterative updates at mass flow outlets. (0.1 by default)
 INC_OUTLET_DAMPING= 0.1
-
+%
+% Epsilon^2 multipier in Beta calculation for incompressible preconditioner.
+BETA_FACTOR= 4.1
+%
+% ----------------------------- SOLID ZONE HEAT VARIABLES-----------------------%
+%
+% Thermal conductivity used for heat equation
+SOLID_THERMAL_CONDUCTIVITY= 0.0
+%
+% Solids temperature at freestream conditions
+SOLID_TEMPERATURE_INIT= 288.15
+%
+% Density used in solids
+SOLID_DENSITY= 2710.0
+%
 % ----------------------------- CL DRIVER DEFINITION ---------------------------%
 %
 % Activate fixed lift mode (specify a CL instead of AoA, NO/YES)
@@ -293,7 +319,7 @@ CRITICAL_PRESSURE= 3588550.0
 ACENTRIC_FACTOR= 0.035
 %
 % Specific heat at constant pressure, Cp (1004.703 J/kg*K (air)). 
-% Incompressible fluids with energy eqn. only (CONSTANT_DENSITY, INC_IDEAL_GAS).
+% Incompressible fluids with energy eqn. (CONSTANT_DENSITY, INC_IDEAL_GAS) and the heat equation.
 SPECIFIC_HEAT_CP= 1004.703
 %
 % Thermal expansion coefficient (0.00347 K^-1 (air)) 
@@ -1119,7 +1145,19 @@ CFL_REDUCTION_TURB= 1.0
 %
 % Value of the thermal diffusivity
 THERMAL_DIFFUSIVITY= 1.0
-
+%
+% Convective numerical method
+CONV_NUM_METHOD_HEAT= SPACE_CENTERED
+%
+% Check if the MUSCL scheme should be used
+MUSCL_HEAT= YES
+%
+% 2nd and 4th order artificial dissipation coefficients for the JST method
+JST_SENSOR_COEFF_HEAT= ( 0.5, 0.15 )
+%
+% Time discretization
+TIME_DISCRE_HEAT= EULER_IMPLICIT
+%
 % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------%
 %
 % Frozen the slope limiter in the discrete adjoint formulation (NO, YES)