diff --git a/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex b/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex
index fadd772831f..7953df43d01 100644
--- a/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Burning_Rate_Chapter.tex
@@ -3058,7 +3058,7 @@ \section{Summary of Burning and Spread Rates}
 \begin{figure}[!ht]
 \centering
 \begin{tabular}{c}
-\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Heat_Release_Rates}
+\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Heat_Release_Rates}
 \end{tabular}
 \caption[Summary of heat release rate predictions]{Summary of heat release rate predictions.}
 \label{Heat_Release_Rate}
@@ -3068,7 +3068,7 @@ \section{Summary of Burning and Spread Rates}
 \begin{figure}[!ht]
 \centering
 \begin{tabular}{c}
-\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Burning_Rates}
+\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Burning_Rates}
 \end{tabular}
 \caption[Summary of burning rate predictions]{Summary of burning rate predictions.}
 \label{Burning_Rate}
@@ -3078,7 +3078,7 @@ \section{Summary of Burning and Spread Rates}
 \begin{figure}[!ht]
 \centering
 \begin{tabular}{c}
-\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Liquid_Pool_Burning_Rates}
+\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Liquid_Pool_Burning_Rates}
 \end{tabular}
 \caption[Summary of liquid pool burning rate predictions]{Summary of liquid pool burning rate predictions.}
 \label{Liquid_Pool_Burning_Rate}
@@ -3087,7 +3087,7 @@ \section{Summary of Burning and Spread Rates}
 \begin{figure}[!ht]
 \centering
 \begin{tabular}{c}
-\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Scaling_HRRPUA}
+\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Scaling_HRRPUA}
 \end{tabular}
 \caption[Summary of scaling heat release rate per unit area predictions]{Summary of scaling heat release rate per unit area predictions.}
 \label{Scaling_Heat_Release_Rate_Per_Unit_Area}
@@ -3096,7 +3096,7 @@ \section{Summary of Burning and Spread Rates}
 \begin{figure}[!ht]
 \centering
 \begin{tabular}{c}
-\includegraphics[height=3.5in]{SCRIPT_FIGURES/ScatterPlots/FDS_Rate_of_Spread}
+\includegraphics[height=3.5in]{SCRIPT_FIGURES/Scatterplots/FDS_Rate_of_Spread}
 \end{tabular}
 \caption[Summary, Wildfire Rate of Spread]
 {Summary, Wildfire Rate of Spread.}
diff --git a/Manuals/FDS_Validation_Guide/Ceiling_Jet_Chapter.tex b/Manuals/FDS_Validation_Guide/Ceiling_Jet_Chapter.tex
index 518da94d370..cb3e559cfd5 100644
--- a/Manuals/FDS_Validation_Guide/Ceiling_Jet_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Ceiling_Jet_Chapter.tex
@@ -1106,7 +1106,7 @@ \subsection{Summary of Ceiling Jet Temperature Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Flat_Ceiling_Jet_Temperature}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Flat_Ceiling_Jet_Temperature}
 \end{tabular}
 \end{center}
 \caption[Summary of ceiling jet temperature predictions]{Summary of ceiling jet temperature predictions.}
@@ -1129,7 +1129,7 @@ \subsection{Time to First Sprinkler Activation}
 
 \begin{figure}[h]
 \begin{center}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Sprinkler_Actuation_Time}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Sprinkler_Actuation_Time}
 \end{center}
 \caption[Comparison of measured and predicted sprinkler actuation times]{Comparison of measured and predicted sprinkler actuation times.}
 \label{Sprinkler_Activation_Times}
@@ -1232,7 +1232,7 @@ \subsection{Number of Sprinkler Activations}
 
 \begin{figure}[p]
 \begin{center}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Sprinkler_Actuations}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Sprinkler_Actuations}
 \end{center}
 \caption[Comparison of the number of predicted and measured sprinkler activations]
 {Comparison of the number of predicted and measured sprinkler activations.}
@@ -1253,7 +1253,7 @@ \section{Smoke Detector Activation Times}
 \begin{figure}[!h]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Detector_Activation_Time_Temp_Rise}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Detector_Activation_Time_Temp_Rise}
 \end{tabular}
 \end{center}
 \caption[Summary of smoke detector activation times (temperature rise), NIST Smoke Alarms]
@@ -1267,7 +1267,7 @@ \section{Smoke Detector Activation Times}
 \begin{figure}[!h]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Detector_Activation_Time}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Detector_Activation_Time}
 \end{tabular}
 \end{center}
 \caption[Summary of activation times, smoke detector model, NIST Smoke Alarms]
diff --git a/Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex b/Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex
index d3a28f0d0a8..0e6cb93b653 100644
--- a/Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex
+++ b/Manuals/FDS_Validation_Guide/FDS_Validation_Guide.tex
@@ -272,7 +272,7 @@ \section{Summary of FDS Model Uncertainty Statistics}
 
 For further details about model uncertainty and the meaning of these statistics, see Chapter~\ref{Error_Chapter}.
 
-\IfFileExists{SCRIPT_FIGURES/ScatterPlots/validation_statistics.tex}{\input{SCRIPT_FIGURES/ScatterPlots/validation_statistics.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/ScatterPlots/validation_statistics.tex}}
+\IfFileExists{SCRIPT_FIGURES/Scatterplots/validation_statistics.tex}{\input{SCRIPT_FIGURES/Scatterplots/validation_statistics.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/Scatterplots/validation_statistics.tex}}
 
 
 \section{Normality Tests}
@@ -294,7 +294,7 @@ \section{Normality Tests}
 
 The flaw in most normality tests is that they tend to reject the assumption of normality when the number of samples is relatively large. As can be seen in some of the histograms on the following pages, some fairly ``normal'' looking distributions fail while decidedly non-normal distributions pass. For this reason, the $p$-value is less important than the qualitative appearance of the histogram. If the histogram exhibits the typical bell-shaped curve, this adds confidence to the statistical treatment of the data. If the histogram is not bell-shaped, this might cast doubt on the statistical treatment for that particular quantity.
 
-\IfFileExists{SCRIPT_FIGURES/ScatterPlots/validation_histograms.tex}{\input{SCRIPT_FIGURES/ScatterPlots/validation_histograms.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/ScatterPlots/validation_histograms.tex}}
+\IfFileExists{SCRIPT_FIGURES/Scatterplots/validation_histograms.tex}{\input{SCRIPT_FIGURES/Scatterplots/validation_histograms.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/Scatterplots/validation_histograms.tex}}
 
 
 \clearpage
@@ -304,7 +304,7 @@ \section{Summary of FDS Validation Git Statistics}
 
 Table~\ref{validation_git_stats} shows the Git repository statistics for all of the validation datasets. For each dataset, the corresponding last changed date and Git revision string are shown. This indicates the Git revision string and date for which the most recent validation results for a given dataset were committed to the repository.
 
-\IfFileExists{SCRIPT_FIGURES/ScatterPlots/validation_git_stats.tex}{\input{SCRIPT_FIGURES/ScatterPlots/validation_git_stats.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/ScatterPlots/validation_git_stats.tex}}
+\IfFileExists{SCRIPT_FIGURES/Scatterplots/validation_git_stats.tex}{\input{SCRIPT_FIGURES/Scatterplots/validation_git_stats.tex}}{\typeout{Error: Missing file SCRIPT_FIGURES/Scatterplots/validation_git_stats.tex}}
 
 
 \bibliography{../Bibliography/FDS_refs,../Bibliography/FDS_general,../Bibliography/FDS_mathcomp}
diff --git a/Manuals/FDS_Validation_Guide/HGL_Chapter.tex b/Manuals/FDS_Validation_Guide/HGL_Chapter.tex
index dd6745364d6..5a4aeb8f2c2 100644
--- a/Manuals/FDS_Validation_Guide/HGL_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/HGL_Chapter.tex
@@ -1500,8 +1500,8 @@ \section{Summary of Hot Gas Layer Temperature and Height}
 \begin{figure}[!h]
 \centering
 \begin{tabular}{l}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_Natural_Ventilation} \\
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_Forced_Ventilation}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_Natural_Ventilation} \\
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_Forced_Ventilation}
 \end{tabular}
 \caption[Summary, HGL temperature, natural and forced ventilation]
 {Summary, HGL temperature, natural and forced ventilation.}
@@ -1513,8 +1513,8 @@ \section{Summary of Hot Gas Layer Temperature and Height}
 \begin{figure}[!h]
 \centering
 \begin{tabular}{l}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_No_Ventilation} \\
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Depth}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_No_Ventilation} \\
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_HGL_Depth}
 \end{tabular}
 \caption[Summary, HGL temperature, unventilated compartments; HGL depth]
 {Summary, HGL temperature, unventilated compartments; HGL depth.}
diff --git a/Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex b/Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex
index 23fca8b537c..d08d94ccc5f 100644
--- a/Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Heat_Flux_Chapter.tex
@@ -1013,7 +1013,7 @@ \subsection{Summary of Wall, Ceiling and Floor Heat Flux Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Surface_Heat_Flux}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Surface_Heat_Flux}
 \end{tabular}
 \end{center}
 \caption[Summary of compartment surface heat flux predictions]
@@ -2472,7 +2472,7 @@ \subsection{Summary of Target Heat Flux Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Target_Heat_Flux}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Target_Heat_Flux}
 \end{tabular}
 \end{center}
 \caption[Summary of target heat flux predictions]
@@ -2627,7 +2627,7 @@ \subsection{Bouchair Solar Chimney}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Convective_Heat_Flux}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Convective_Heat_Flux}
 \end{tabular}
 \end{center}
 \caption[Summary of Bouchair Solar Chimney results]{Summary of Bouchair Solar Chimney results.}
@@ -2688,7 +2688,7 @@ \subsection{SETCOM Experiments}
 \begin{figure}[h!]
         \begin{center}
                 \begin{tabular}{c}
-                        \includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Condensation}
+                        \includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Condensation}
                 \end{tabular}
         \end{center}
         \caption[Summary of SETCOM results]{Summary of SETCOM results.}
diff --git a/Manuals/FDS_Validation_Guide/Plume_Chapter.tex b/Manuals/FDS_Validation_Guide/Plume_Chapter.tex
index fb69ab34714..591fc8fc86b 100644
--- a/Manuals/FDS_Validation_Guide/Plume_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Plume_Chapter.tex
@@ -838,7 +838,7 @@ \subsection{Summary of Plume Temperature Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Plume_Temperature}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Plume_Temperature}
 \end{tabular}
 \end{center}
 \caption[Summary of plume temperature predictions]
@@ -973,7 +973,7 @@ \subsection{Flame Height Summary}
 
 \begin{figure}[!h]
 \begin{center}
-\includegraphics[height=4.in]{SCRIPT_FIGURES/ScatterPlots/FDS_Flame_Height}
+\includegraphics[height=4.in]{SCRIPT_FIGURES/Scatterplots/FDS_Flame_Height}
 \end{center}
 \caption[Summary of flame height predictions]
 {Summary of measured and predicted mean flame heights.}
@@ -991,7 +991,7 @@ \section{Flame Tilt}
 
 \begin{figure}[!h]
 \begin{center}
-\includegraphics[height=4.in]{SCRIPT_FIGURES/ScatterPlots/FDS_Flame_Tilt}
+\includegraphics[height=4.in]{SCRIPT_FIGURES/Scatterplots/FDS_Flame_Tilt}
 \end{center}
 \caption[Summary of flame tilt angle predictions]
 {Summary of measured and predicted mean flame tilt angle.}
@@ -1012,7 +1012,7 @@ \section{Harrison Spill Plumes/Entrainment Experiments}
 
 \begin{figure}[h]
 \begin{center}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Entrainment}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Entrainment}
 \caption[Summary of plume entrainment predictions]{A comparison of predicted and measured mass flow rates at various heights for the Harrison Spill Plume experiments.}
 \label{Entrainment_Plot}
 \end{center}
diff --git a/Manuals/FDS_Validation_Guide/Pressure_Chapter.tex b/Manuals/FDS_Validation_Guide/Pressure_Chapter.tex
index 9e40d5549a3..d4999156a3b 100644
--- a/Manuals/FDS_Validation_Guide/Pressure_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Pressure_Chapter.tex
@@ -448,7 +448,7 @@ \section{Summary of Pressure Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Compartment_Pressure}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Compartment_Pressure}
 \end{tabular}
 \end{center}
 \caption[Summary of pressure predictions]{Summary of pressure predictions for open and closed compartments.}
diff --git a/Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/.gitignore b/Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/.gitignore
similarity index 100%
rename from Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/.gitignore
rename to Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/.gitignore
diff --git a/Manuals/FDS_Validation_Guide/Species_Chapter.tex b/Manuals/FDS_Validation_Guide/Species_Chapter.tex
index 6900dae1978..422c3119d93 100644
--- a/Manuals/FDS_Validation_Guide/Species_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Species_Chapter.tex
@@ -594,8 +594,8 @@ \subsection{Summary of Major Combustion Products Predictions}
 \begin{figure}[!h]
 \centering
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Carbon_Dioxide_Concentration} \\
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Oxygen_Concentration}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Carbon_Dioxide_Concentration} \\
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Oxygen_Concentration}
 \end{tabular}
 \caption[Summary of major gas species predictions]
 {Summary of major gas species predictions.}
@@ -855,7 +855,7 @@ \subsection{NIST/NRC Experiments}
 \begin{figure}[p]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Concentration}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Concentration}
 \end{tabular}
 \end{center}
 \caption[Summary of smoke concentration predictions]{Summary of smoke concentration predictions.}
@@ -885,7 +885,7 @@ \subsection{FAA Cargo Compartments}
 \begin{figure}[p]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Obscuration}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Obscuration}
 \end{tabular}
 \end{center}
 \caption[Summary of smoke obscuration predictions]{Summary of smoke obscuration predictions.}
@@ -917,7 +917,7 @@ \subsection{Sippola Aerosol Deposition Experiments}
 \begin{figure}[!ht]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Aerosol_Deposition_Velocity} \\
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Aerosol_Deposition_Velocity} \\
 \vspace{0.25in} \\
 \end{tabular}
 \end{center}
@@ -946,7 +946,7 @@ \subsection{NIST Soot Deposition Gauge Experiments}
 \begin{figure}[!ht]
    \begin{center}
       \begin{tabular}{c}
-         \includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Aerosol_Deposition} \\
+         \includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Aerosol_Deposition} \\
          \vspace{0.25in} \\
       \end{tabular}
    \end{center}
@@ -989,7 +989,7 @@ \subsection{Ranz and Marshall}
 \begin{figure}[!ht]
    \begin{center}
       \begin{tabular}{c}
-         \includegraphics[height=3.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Evaporation_Rate} \\
+         \includegraphics[height=3.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Evaporation_Rate} \\
          \vspace{0.25in} \\
       \end{tabular}
    \end{center}
@@ -1912,7 +1912,7 @@ \subsection{Summary, Products of Incomplete Combustion}
 \begin{figure}[h]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Carbon_Monoxide_Concentration}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Carbon_Monoxide_Concentration}
 \end{tabular}
 \end{center}
 \caption[Summary of carbon monoxide predictions]{Summary of carbon monoxide predictions.}
@@ -1999,7 +1999,7 @@ \section{Helium Release in a Reduced Scale Garage Geometry}
 \begin{figure}[p]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Species_Concentration}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Species_Concentration}
 \end{tabular}
 \end{center}
 \caption[Summary of species concentration predictions]{Summary of species concentration predictions.}
diff --git a/Manuals/FDS_Validation_Guide/Suppression_Chapter.tex b/Manuals/FDS_Validation_Guide/Suppression_Chapter.tex
index b07b047a608..47d538c214e 100644
--- a/Manuals/FDS_Validation_Guide/Suppression_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Suppression_Chapter.tex
@@ -16,7 +16,7 @@ \subsection{Cup Burner Experiments}
 
 \begin{figure}[h!]
 \begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Minimum_Extinguishing_Concentration} &
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Minimum_Extinguishing_Concentration} &
 \raisebox{0.5\height}{\includegraphics[height=2in]{FIGURES/Cup_Burner/Cup_Legend}}
 \end{tabular*}
 \caption[Results of Cup Burner experiments]{Comparison of measured and predicted minimum extinguishing volume fractions for the cup burner tests. Fuel type is indicated by color, and extinguishing agent is indicated by shape.}
@@ -384,7 +384,7 @@ \subsection{Summary, Flame Extinction Time}
 
 \begin{figure}[h!]
 \begin{center}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Extinction_Time}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Extinction_Time}
 \caption[Extinguishment times for the USCG/HAI water mist suppression tests]{Comparison of measured and predicted extinguishment times for the USCG/HAI water mist suppression tests.}
 \label{USCG_Scatter}
 \end{center}
diff --git a/Manuals/FDS_Validation_Guide/Surface_Temperature_Chapter.tex b/Manuals/FDS_Validation_Guide/Surface_Temperature_Chapter.tex
index 3d174ee18cd..0d81d1c94e4 100644
--- a/Manuals/FDS_Validation_Guide/Surface_Temperature_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Surface_Temperature_Chapter.tex
@@ -861,7 +861,7 @@ \subsection{Summary of Wall, Ceiling, and Floor Temperature Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Surface_Temperature}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Surface_Temperature}
 \end{tabular}
 \end{center}
 \caption[Summary of compartment surface temperature predictions]
@@ -1999,7 +1999,7 @@ \subsection{Summary of Target Temperature Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Target_Temperature}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Target_Temperature}
 \end{tabular}
 \end{center}
 \caption[Summary of target temperature predictions]
@@ -2017,7 +2017,7 @@ \subsection{Time to Failure}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Cable_Failure_Time}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Cable_Failure_Time}
 \end{tabular}
 \end{center}
 \caption[Summary of time to failure predictions for electrical cables]
@@ -2139,7 +2139,7 @@ \subsection{Summary of Liquid Pool Surface Temperature Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[height=4in]{SCRIPT_FIGURES/ScatterPlots/FDS_Liquid_Pool_Surface_Temperature}
+\includegraphics[height=4in]{SCRIPT_FIGURES/Scatterplots/FDS_Liquid_Pool_Surface_Temperature}
 \end{tabular}
 \end{center}
 \caption[Summary of liquid pool surface temperature predictions]
diff --git a/Manuals/FDS_Validation_Guide/Velocity_Chapter.tex b/Manuals/FDS_Validation_Guide/Velocity_Chapter.tex
index db96b7bd2f3..d51ed2da745 100644
--- a/Manuals/FDS_Validation_Guide/Velocity_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Velocity_Chapter.tex
@@ -846,7 +846,7 @@ \section{Summary of Velocity Predictions}
 \begin{figure}[h!]
 \begin{center}
 \begin{tabular}{l}
-\includegraphics[height=4.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Velocity}
+\includegraphics[height=4.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Velocity}
 \end{tabular}
 \end{center}
 \caption[Summary of velocity predictions]
diff --git a/Manuals/FDS_Validation_Guide/Wind_Chapter.tex b/Manuals/FDS_Validation_Guide/Wind_Chapter.tex
index 0a4f758395e..ea2dee5a186 100644
--- a/Manuals/FDS_Validation_Guide/Wind_Chapter.tex
+++ b/Manuals/FDS_Validation_Guide/Wind_Chapter.tex
@@ -245,7 +245,7 @@ \section{LNG Dispersion Experiments}
 \begin{figure}[p]
 \begin{center}
 \begin{tabular}{c}
-\includegraphics[width=6.0in]{SCRIPT_FIGURES/ScatterPlots/FDS_Atmospheric_Dispersion}
+\includegraphics[width=6.0in]{SCRIPT_FIGURES/Scatterplots/FDS_Atmospheric_Dispersion}
 \end{tabular}
 \end{center}
 \caption[Summary of LNG Dispersion predictions]{Summary of LNG Dispersion predictions. Note that the dashed black lines denote plus/minus a factor of two from the measured values. The red dashed lines represent two relative standard deviations about the solid red line, the model average.}
@@ -291,7 +291,7 @@ \section{Stack Emission Plume Rise}
 \includegraphics[height=2.1in]{SCRIPT_FIGURES/Atmospheric_Dispersion/plume_rise_1} &
 \includegraphics[height=2.1in]{SCRIPT_FIGURES/Atmospheric_Dispersion/plume_rise_2} \\
 \multicolumn{2}{c}{\includegraphics[height=2.1in]{SCRIPT_FIGURES/Atmospheric_Dispersion/plume_rise_3}} \\
-\multicolumn{2}{c}{\includegraphics[height=3.1in]{SCRIPT_FIGURES/ScatterPlots/FDS_Plume_Height}}
+\multicolumn{2}{c}{\includegraphics[height=3.1in]{SCRIPT_FIGURES/Scatterplots/FDS_Plume_Height}}
 \end{tabular*}
 \caption[Atmospheric Dispersion, Plume Height results]{Atmospheric Dispersion, Plume Height results.}
 \label{plume_height}
diff --git a/Utilities/Matlab/FDS_validation_scatterplot_inputs.csv b/Utilities/Matlab/FDS_validation_scatterplot_inputs.csv
index 975dd5a2882..2f9f6758231 100644
--- a/Utilities/Matlab/FDS_validation_scatterplot_inputs.csv
+++ b/Utilities/Matlab/FDS_validation_scatterplot_inputs.csv
@@ -1,42 +1,42 @@
 Scatter_Plot_Title,Ind_Title,Dep_Title,Plot_Min,Plot_Max,Title_Position,Key_Position,Paper_Width_Factor,Sigma_E,Weight_Data,Plot_Type,Plot_Filename
-"HGL Temperature, Forced Ventilation",Measured Temperature Rise (°C),Predicted Temperature Rise (°C),10,1000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_Forced_Ventilation
-"HGL Temperature, Natural Ventilation",Measured Temperature Rise (°C),Predicted Temperature Rise (°C),10,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_Natural_Ventilation
-"HGL Temperature, No Ventilation",Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,500,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Temperature_No_Ventilation
-HGL Depth,Measured Layer Depth (m),Predicted Layer Depth (m),0.1,20,0.03 0.95,EastOutside,1.5,5,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_HGL_Depth
-Ceiling Jet Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Flat_Ceiling_Jet_Temperature
-Plume Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Plume_Temperature
-Oxygen Concentration,Measured Drop in Volume Fraction,Predicted Drop in Volume Fraction,0.01,0.25,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Oxygen_Concentration
-Carbon Dioxide Concentration,Measured Rise in Volume Fraction,Predicted Rise in Volume Fraction,0.001,0.2,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Carbon_Dioxide_Concentration
-Smoke Concentration,Measured Density (mg/m³),Predicted Density (mg/m³),1,600,0.03 0.95,EastOutside,1.5,19,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Concentration
-Compartment Over-Pressure,Measured Pressure Rise (Pa),Predicted Pressure Rise (Pa),1,2000,0.03 0.95,EastOutside,1.5,23,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Compartment_Pressure
-Target Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,1300,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Target_Temperature
-Surface Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Surface_Temperature
-Liquid Pool Surface Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,500,0.03 0.95,EastOutside,1.6,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Liquid_Pool_Surface_Temperature
-Target Heat Flux,Measured Heat Flux (kW/m²),Predicted Heat Flux (kW/m²),0.1,500,0.03 0.95,EastOutside,1.5,11,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Target_Heat_Flux
-Surface Heat Flux,Measured Heat Flux (kW/m²),Predicted Heat Flux (kW/m²),0.1,400,0.03 0.95,EastOutside,1.5,11,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Surface_Heat_Flux
-Velocity,Measured Velocity (m/s),Predicted Velocity (m/s),0.1,20,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Velocity
-Sprinkler Activation Time,Measured Time to Activation (s),Predicted Time to Activation (s),10,500,0.03 0.95,EastOutside,1.6,6,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Sprinkler_Actuation_Time
-Smoke Detector Activation Time,Measured Time to Activation (s),Predicted Time to Activation (s),1,300,0.03 0.95,EastOutside,1.5,34,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Detector_Activation_Time
-"Smoke Detector Activation Time, Temp. Rise",Measured Time to Activation (s),Predicted Time to Activation (s),1,300,0.03 0.95,EastOutside,1.5,34,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Detector_Activation_Time_Temp_Rise
-Cable Failure Time,Measured Time to Threshold Temperature (s),Predicted Time to Threshold Temperature (s),100,2000,0.03 0.95,EastOutside,1.5,12,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Cable_Failure_Time
-Sprinkler Actuations,Measured Actuations,Predicted Actuations,1,100,0.03 0.95,EastOutside,1.5,15,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Sprinkler_Actuations
-Aerosol Deposition Velocity,Measured Deposition Velocity (m/s),Predicted Deposition Velocity (m/s),1.00E-07,1.00E-01,0.03 0.95,EastOutside,1.5,-1,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Aerosol_Deposition_Velocity
-Heat Release Rate,Measured Heat Release Rate (kW),Predicted Heat Release Rate (kW),10,10000,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Heat_Release_Rates
-Scaling Heat Release Rate Per Unit Area,Measured Heat Release Rate Per Unit Area (kW/m²),Predicted Heat Release Rate Per Unit Area (kW/m²),1,10000,0.03 0.95,EastOutside,1.5,8,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Scaling_HRRPUA
-Burning Rate,Measured Burning Rate (kg/m²/s),Predicted Burning Rate (kg/m²/s),0.001,0.1,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Burning_Rates
-Liquid Pool Burning Rate,Measured Burning Rate (kg/m²/s),Predicted Burning Rate (kg/m²/s),0.005,0.1,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Liquid_Pool_Burning_Rates
-Carbon Monoxide Concentration,Measured Change in Volume Fraction,Predicted Change in Volume Fraction,0.00001,0.2,0.03 0.95,EastOutside,1.5,19,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Carbon_Monoxide_Concentration
-Entrainment,Measured Mass Flow Rate (kg/s),Predicted Mass Flow Rate (kg/s),0.01,1,0.03 0.95,EastOutside,1.5,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Entrainment
-Extinction Time,Measured Time (s),Predicted Time (s),10,5000,0.03 0.95,EastOutside,1.5,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Extinction_Time
-Species Concentration,Measured Change in Volume Fraction (%),Predicted Change in Volume Fraction (%),1,100,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Species_Concentration
-Smoke Obscuration,Measured Obscuration (%/m),Predicted Obscuration (%/m),1,100,0.03 0.95,EastOutside,1.5,20,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Smoke_Obscuration
-Mass Flow Rate,Measured Mass Flow Rate (kg/s),Predicted Mass Flow Rate (kg/s),0.01,1,0.03 0.95,EastOutside,1.5,8,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Convective_Heat_Flux
-Atmospheric Dispersion,Measured Concentration (%),Predicted Concentration (%),0.1,100,0.03 0.95,EastOutside,1.5,50,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Atmospheric_Dispersion
-Minimum Extinguishing Concentration,Measured MEC (mol/mol),Predicted MEC (mol/mol),0.05,1,0.03 0.95,,1,6,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Minimum_Extinguishing_Concentration
-Flame Height,Measured Flame Height (m),Predicted Flame Height (m),0.1,500,0.03 0.95,EastOutside,1.5,10,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Flame_Height
-Flame Tilt,Measured Flame Tilt (deg),Predicted Flame Tilt (deg),1,90,0.03 0.95,EastOutside,1.5,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Flame_Tilt
-Plume Height,Empirical Plume Height (m),Predicted Plume Height (m),10,1000,0.03 0.96,,1,-1,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Plume_Height
-Rate of Spread,Measured Rate of Spread (m/s),Predicted Rate of Spread (m/s),0.001,3,0.03 0.96,EastOutside,1.6,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Rate_of_Spread
-Condensation,Measured Heat Flux (kW/m²),Predicted Heat Flux (kW/m²),0,12,0.03 0.96,EastOutside,1.5,12,yes,linear,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Condensation
-Aerosol Deposition,Measured Mass (mg),Predicted Mass (mg),0,0.15,0.03 0.96,EastOutside,1.5,12,yes,linear,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Aerosol_Deposition
-Evaporation Rate,Measured Rate (dD²/dt),Predicted Rate (dD²/dt),1.00E-09,1.00E-07,0.03 0.95,EastOutside,1.5,-1,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/FDS_Evaporation_Rate
+"HGL Temperature, Forced Ventilation",Measured Temperature Rise (°C),Predicted Temperature Rise (°C),10,1000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_Forced_Ventilation
+"HGL Temperature, Natural Ventilation",Measured Temperature Rise (°C),Predicted Temperature Rise (°C),10,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_Natural_Ventilation
+"HGL Temperature, No Ventilation",Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,500,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_HGL_Temperature_No_Ventilation
+HGL Depth,Measured Layer Depth (m),Predicted Layer Depth (m),0.1,20,0.03 0.95,EastOutside,1.5,5,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_HGL_Depth
+Ceiling Jet Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Flat_Ceiling_Jet_Temperature
+Plume Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Plume_Temperature
+Oxygen Concentration,Measured Drop in Volume Fraction,Predicted Drop in Volume Fraction,0.01,0.25,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Oxygen_Concentration
+Carbon Dioxide Concentration,Measured Rise in Volume Fraction,Predicted Rise in Volume Fraction,0.001,0.2,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Carbon_Dioxide_Concentration
+Smoke Concentration,Measured Density (mg/m³),Predicted Density (mg/m³),1,600,0.03 0.95,EastOutside,1.5,19,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Concentration
+Compartment Over-Pressure,Measured Pressure Rise (Pa),Predicted Pressure Rise (Pa),1,2000,0.03 0.95,EastOutside,1.5,23,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Compartment_Pressure
+Target Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,1300,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Target_Temperature
+Surface Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,2000,0.03 0.95,EastOutside,1.5,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Surface_Temperature
+Liquid Pool Surface Temperature,Measured Temperature Rise (°C),Predicted Temperature Rise (°C),1,500,0.03 0.95,EastOutside,1.6,7,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Liquid_Pool_Surface_Temperature
+Target Heat Flux,Measured Heat Flux (kW/m²),Predicted Heat Flux (kW/m²),0.1,500,0.03 0.95,EastOutside,1.5,11,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Target_Heat_Flux
+Surface Heat Flux,Measured Heat Flux (kW/m²),Predicted Heat Flux (kW/m²),0.1,400,0.03 0.95,EastOutside,1.5,11,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Surface_Heat_Flux
+Velocity,Measured Velocity (m/s),Predicted Velocity (m/s),0.1,20,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Velocity
+Sprinkler Activation Time,Measured Time to Activation (s),Predicted Time to Activation (s),10,500,0.03 0.95,EastOutside,1.6,6,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Sprinkler_Actuation_Time
+Smoke Detector Activation Time,Measured Time to Activation (s),Predicted Time to Activation (s),1,300,0.03 0.95,EastOutside,1.5,34,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Detector_Activation_Time
+"Smoke Detector Activation Time, Temp. Rise",Measured Time to Activation (s),Predicted Time to Activation (s),1,300,0.03 0.95,EastOutside,1.5,34,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Detector_Activation_Time_Temp_Rise
+Cable Failure Time,Measured Time to Threshold Temperature (s),Predicted Time to Threshold Temperature (s),100,2000,0.03 0.95,EastOutside,1.5,12,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Cable_Failure_Time
+Sprinkler Actuations,Measured Actuations,Predicted Actuations,1,100,0.03 0.95,EastOutside,1.5,15,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Sprinkler_Actuations
+Aerosol Deposition Velocity,Measured Deposition Velocity (m/s),Predicted Deposition Velocity (m/s),1.00E-07,1.00E-01,0.03 0.95,EastOutside,1.5,-1,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Aerosol_Deposition_Velocity
+Heat Release Rate,Measured Heat Release Rate (kW),Predicted Heat Release Rate (kW),10,10000,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Heat_Release_Rates
+Scaling Heat Release Rate Per Unit Area,Measured Heat Release Rate Per Unit Area (kW/m²),Predicted Heat Release Rate Per Unit Area (kW/m²),1,10000,0.03 0.95,EastOutside,1.5,8,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Scaling_HRRPUA
+Burning Rate,Measured Burning Rate (kg/m²/s),Predicted Burning Rate (kg/m²/s),0.001,0.1,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Burning_Rates
+Liquid Pool Burning Rate,Measured Burning Rate (kg/m²/s),Predicted Burning Rate (kg/m²/s),0.005,0.1,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Liquid_Pool_Burning_Rates
+Carbon Monoxide Concentration,Measured Change in Volume Fraction,Predicted Change in Volume Fraction,0.00001,0.2,0.03 0.95,EastOutside,1.5,19,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Carbon_Monoxide_Concentration
+Entrainment,Measured Mass Flow Rate (kg/s),Predicted Mass Flow Rate (kg/s),0.01,1,0.03 0.95,EastOutside,1.5,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Entrainment
+Extinction Time,Measured Time (s),Predicted Time (s),10,5000,0.03 0.95,EastOutside,1.5,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Extinction_Time
+Species Concentration,Measured Change in Volume Fraction (%),Predicted Change in Volume Fraction (%),1,100,0.03 0.95,EastOutside,1.5,8,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Species_Concentration
+Smoke Obscuration,Measured Obscuration (%/m),Predicted Obscuration (%/m),1,100,0.03 0.95,EastOutside,1.5,20,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Smoke_Obscuration
+Mass Flow Rate,Measured Mass Flow Rate (kg/s),Predicted Mass Flow Rate (kg/s),0.01,1,0.03 0.95,EastOutside,1.5,8,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Convective_Heat_Flux
+Atmospheric Dispersion,Measured Concentration (%),Predicted Concentration (%),0.1,100,0.03 0.95,EastOutside,1.5,50,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Atmospheric_Dispersion
+Minimum Extinguishing Concentration,Measured MEC (mol/mol),Predicted MEC (mol/mol),0.05,1,0.03 0.95,,1,6,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Minimum_Extinguishing_Concentration
+Flame Height,Measured Flame Height (m),Predicted Flame Height (m),0.1,500,0.03 0.95,EastOutside,1.5,10,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Flame_Height
+Flame Tilt,Measured Flame Tilt (deg),Predicted Flame Tilt (deg),1,90,0.03 0.95,EastOutside,1.5,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Flame_Tilt
+Plume Height,Empirical Plume Height (m),Predicted Plume Height (m),10,1000,0.03 0.96,,1,-1,no,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Plume_Height
+Rate of Spread,Measured Rate of Spread (m/s),Predicted Rate of Spread (m/s),0.001,3,0.03 0.96,EastOutside,1.6,10,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Rate_of_Spread
+Condensation,Measured Heat Flux (kW/m²),Predicted Heat Flux (kW/m²),0,12,0.03 0.96,EastOutside,1.5,12,yes,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Condensation
+Aerosol Deposition,Measured Mass (mg),Predicted Mass (mg),0,0.15,0.03 0.96,EastOutside,1.5,12,yes,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Aerosol_Deposition
+Evaporation Rate,Measured Rate (dD²/dt),Predicted Rate (dD²/dt),1.00E-09,1.00E-07,0.03 0.95,EastOutside,1.5,-1,yes,loglog,FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/FDS_Evaporation_Rate
diff --git a/Utilities/Matlab/FDS_validation_script.m b/Utilities/Matlab/FDS_validation_script.m
index 1f193971196..bb4fe4a6446 100644
--- a/Utilities/Matlab/FDS_validation_script.m
+++ b/Utilities/Matlab/FDS_validation_script.m
@@ -41,7 +41,7 @@
 % Statistics output options
 
 Stats_Output = 'Validation';
-Scatterplot_Dir = [pwd, '/../../Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/'];
+Scatterplot_Dir = [pwd, '/../../Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/'];
 
 % Run dataplot and scatplot scripts
 
diff --git a/Utilities/Python/FDS_validation_script.py b/Utilities/Python/FDS_validation_script.py
index bf63bfef9a3..c98ae2ffd10 100644
--- a/Utilities/Python/FDS_validation_script.py
+++ b/Utilities/Python/FDS_validation_script.py
@@ -36,7 +36,7 @@
 # Statistics output options
 
 Stats_Output = 'Validation'
-Scatterplot_Dir = '../../Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/'
+Scatterplot_Dir = '../../Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Scatterplots/'
 
 # Run dataplot and scatplot scripts
 
diff --git a/Utilities/Python/FDS_verification_script.py b/Utilities/Python/FDS_verification_script.py
index 077d70b996d..51f130b2426 100644
--- a/Utilities/Python/FDS_verification_script.py
+++ b/Utilities/Python/FDS_verification_script.py
@@ -36,7 +36,7 @@
 # Statistics output options
 
 Stats_Output = 'Verification'
-Scatterplot_Dir = '../../Manuals/FDS_Verification_Guide/SCRIPT_FIGURES/ScatterPlots/'
+Scatterplot_Dir = '../../Manuals/FDS_Verification_Guide/SCRIPT_FIGURES/Scatterplots/'
 
 # Run dataplot and scatplot scripts
 
diff --git a/Utilities/Python/fdsplotlib.py b/Utilities/Python/fdsplotlib.py
index 5dc57afd4d5..003c32cdd0d 100644
--- a/Utilities/Python/fdsplotlib.py
+++ b/Utilities/Python/fdsplotlib.py
@@ -1728,9 +1728,9 @@ def scatplot(saved_data, drange, **kwargs):
         Output_File = os.path.join(Scatterplot_Dir, "verification_scatterplot_output.csv")
         Histogram_Tex_Output = os.path.join(Scatterplot_Dir, "verification_histograms.tex")
     else:
-        Statistics_Tex_Output = os.path.join(Scatterplot_Dir, f"ScatterPlot_Tables_{Stats_Output}.tex")
-        Output_File = os.path.join(Scatterplot_Dir, f"ScatterPlot_Stats_{Stats_Output}.csv")
-        Histogram_Tex_Output = os.path.join(Scatterplot_Dir, f"ScatterPlot_Histograms_{Stats_Output}.tex")
+        Statistics_Tex_Output = os.path.join(Scatterplot_Dir, f"Scatterplot_Tables_{Stats_Output}.tex")
+        Output_File = os.path.join(Scatterplot_Dir, f"Scatterplot_Stats_{Stats_Output}.csv")
+        Histogram_Tex_Output = os.path.join(Scatterplot_Dir, f"Scatterplot_Histograms_{Stats_Output}.tex")
 
     # --- Unpack saved_data (dataplot output) ---
     (
@@ -2265,7 +2265,7 @@ def _safe_float(x):
                     end = "&" if (j % 2) == 0 else "\\\\"
                     fid.write(
                         f"\\includegraphics[height=2.2in]"
-                        f"{{SCRIPT_FIGURES/ScatterPlots/{Output_Histograms[j]}}} {end}\n"
+                        f"{{SCRIPT_FIGURES/Scatterplots/{Output_Histograms[j]}}} {end}\n"
                     )
                 fid.write("\\end{tabular*}\n")
                 fid.write(f"\\label{{Histogram_{i + 1}}}\n")
@@ -2295,7 +2295,7 @@ def histogram_output(Histogram_Tex_Output, Output_Histograms):
             for j in range(i * 8, min((i + 1) * 8, n)):
                 end = "&" if j % 2 == 0 else "\\\\"
                 fid.write(f"\\includegraphics[height=2.2in]"
-                          f"{{SCRIPT_FIGURES/ScatterPlots/{Output_Histograms[j]}}} {end}\n")
+                          f"{{SCRIPT_FIGURES/Scatterplots/{Output_Histograms[j]}}} {end}\n")
 
             fid.write("\\end{tabular*}\n")
             fid.write(f"\\label{{Histogram_{i + 1}}}\n")