diff --git a/Source/wall.f90 b/Source/wall.f90
index 6126c5cfc22..5c3118b65ed 100644
--- a/Source/wall.f90
+++ b/Source/wall.f90
@@ -51,17 +51,17 @@ SUBROUTINE WALL_BC(T,DT,NM)
 CALL POINT_TO_MESH(NM)
 
 IF (PREDICTOR) THEN
-   UU => US
-   VV => VS
-   WW => WS
+   UU => U
+   VV => V
+   WW => W
    RHOP => RHOS
    ZZP  => ZZS
    PBAR_P => PBAR_S
    HP     => HS
 ELSE
-   UU => U
-   VV => V
-   WW => W
+   UU => US
+   VV => VS
+   WW => WS
    RHOP => RHO
    ZZP  => ZZ
    PBAR_P => PBAR
diff --git a/Utilities/Matlab/FDS_verification_dataplot_inputs.csv b/Utilities/Matlab/FDS_verification_dataplot_inputs.csv
index 7eec9a9552c..c31f682a84b 100644
--- a/Utilities/Matlab/FDS_verification_dataplot_inputs.csv
+++ b/Utilities/Matlab/FDS_verification_dataplot_inputs.csv
@@ -703,7 +703,7 @@ d,thermocouple_time_constant,Heat_Transfer/thermocouple_time_constant_git.txt,He
 f,thermocouple_time_constant,Heat_Transfer/thermocouple_time_constant_git.txt,Heat_Transfer/thermocouple_time_constant.csv,1,2,Time,T_3.0,Exact (3.0 s),ro,0,100000,,2.99,3.01,-1.00E+09,1.00E+09,0,Heat_Transfer/thermocouple_time_constant_devc.csv,2,3,Time,T_3.0,FDS (3.0 s),r-,0,100000,,2.99,3.01,-1.00E+09,1.00E+09,0,Bead Temperature (thermocouple\_time\_constant),Time (s),Temperature (°C),0,20,1,15,35,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/thermocouple_time_constant,Relative Error,max,0.01,Heat Transfer,ro,r,TeX
 f,thermocouple_time_constant,Heat_Transfer/thermocouple_time_constant_git.txt,Heat_Transfer/thermocouple_time_constant.csv,1,2,Time,T_8.0,Exact (8.0 s),go,0,100000,,7.99,8.01,-1.00E+09,1.00E+09,0,Heat_Transfer/thermocouple_time_constant_devc.csv,2,3,Time,T_8.0,FDS (8.0 s),g-,0,100000,,7.99,8.01,-1.00E+09,1.00E+09,0,Bead Temperature (thermocouple\_time\_constant),Time (s),Temperature (°C),0,20,1,15,35,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/thermocouple_time_constant,Relative Error,max,0.01,Heat Transfer,ro,r,TeX
 d,thick_orifice,Pressure_Effects/thick_orifice_5cm_git.txt,Pressure_Effects/thick_orifice.csv,1,2,x,p,Empirical,ko,-100000,100000,,-10000,10000,-1.00E+09,1.00E+09,0,Pressure_Effects/thick_orifice_5cm_line.csv,2,3,x,p,FDS,k-,-100000,100000,,-10000,10000,-1.00E+09,1.00E+09,0,Pressure Rise (thick\_orifice),x (m),Pressure Rise (Pa),-5,11,1,-2,6,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/thick_orifice,Relative Error,max,0.05,Heat Transfer,ro,r,TeX
-d,test_hrr_2d_cyl,Energy_Budget/test_hrr_2d_cyl_git.txt,Energy_Budget/test_hrr_3d_hrr.csv,2,3,Time,HRR,3D HRR,k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Energy_Budget/test_hrr_2d_cyl_hrr.csv,2,3,Time,HRR,2D Cyl HRR,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Release Rate,Time (s),$\dot{Q}$ (kW),0,10,1,0,200,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/test_hrr_2d_cyl,Relative Error,mean,0.01,Energy Budget,m+,m,LaTeX
+d,test_hrr_2d_cyl,Energy_Budget/test_hrr_2d_cyl_git.txt,Energy_Budget/test_hrr_3d_hrr.csv,2,3,Time,HRR,3D HRR,k--,0,100000,,3,10,-1.00E+09,1.00E+09,0,Energy_Budget/test_hrr_2d_cyl_hrr.csv,2,3,Time,HRR,2D Cyl HRR,k-,0,100000,,3,10,-1.00E+09,1.00E+09,0,Heat Release Rate,Time (s),$\dot{Q}$ (kW),0,10,1,0,200,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/test_hrr_2d_cyl,Relative Error,mean,0.02,Energy Budget,m+,m,LaTeX
 d,tmp_lower_limit,Fires/tmp_lower_limit_default_git.txt,Fires/tmp_lower_limit.csv,1,2,Time,T,Expected (min T),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Fires/tmp_lower_limit_default_devc.csv,2,3,Time,minT,FDS (min T),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature Lower Limit (default),Time (s),Temperature (°C),0,1,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/tmp_lower_limit_default,Absolute Error,threshold,0.05,Fires,kd,k,TeX
 d,tmp_lower_limit,Fires/tmp_lower_limit_simple_git.txt,Fires/tmp_lower_limit.csv,1,2,Time,T,Expected (min T),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Fires/tmp_lower_limit_simple_devc.csv,2,3,Time,minT,FDS (min T),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature Lower Limit (simple),Time (s),Temperature (°C),0,1,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/tmp_lower_limit_simple,Absolute Error,threshold,0.01,Fires,kd,k,TeX
 d,tunnel_const_gamma,Fires/tunnel_const_gamma_git.txt,Fires/tunnel_const_gamma.csv,1,2,x,p,Exact (p),ko,0,100000,,0,0.03,-1.00E+09,1.00E+09,0,Fires/tunnel_const_gamma_line.csv,2,3,x,p,FDS (p),k-,0,100000,,0,0.03,-1.00E+09,1.00E+09,0,Pressure  (fire\_const\_gamma),Distance (m),Pressure (Pa),0,0.1,1,0,1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/tunnel_const_gamma_p,Relative Error,mean,0.01,Fires,r*,r,TeX
diff --git a/Verification/Energy_Budget/test_hrr_2d_cyl.fds b/Verification/Energy_Budget/test_hrr_2d_cyl.fds
index a9bbc5b0da0..c6bba9812c4 100644
--- a/Verification/Energy_Budget/test_hrr_2d_cyl.fds
+++ b/Verification/Energy_Budget/test_hrr_2d_cyl.fds
@@ -4,6 +4,8 @@
 
 &TIME T_END=10/
 
+&DUMP DT_HRR=0.1 /
+
 &REAC FUEL='METHANE'/
 
 &SURF ID='burner', HRRPUA=200, COLOR='RED'/
diff --git a/Verification/Energy_Budget/test_hrr_3d.fds b/Verification/Energy_Budget/test_hrr_3d.fds
index 06fa5b18e7c..f72022831a4 100644
--- a/Verification/Energy_Budget/test_hrr_3d.fds
+++ b/Verification/Energy_Budget/test_hrr_3d.fds
@@ -4,6 +4,8 @@
 
 &TIME T_END=10/
 
+&DUMP DT_HRR=0.1 /
+
 &REAC FUEL='METHANE'/
 
 &SURF ID='burner', HRRPUA=200, COLOR='RED'/