diff --git a/algorithm/obstats/aero/viirs_n20_template.yaml.j2 b/algorithm/obstats/aero/viirs_n20_template.yaml.j2
index a5dde2f..9606dd9 100644
--- a/algorithm/obstats/aero/viirs_n20_template.yaml.j2
+++ b/algorithm/obstats/aero/viirs_n20_template.yaml.j2
@@ -3,14 +3,14 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: {{ aero_obsdatain_path }}/diag_{{ obspace }}_{{ window_YMDH }}.nc4
+        obsfile: {{ aero_obsdatain_path }}/diag_{{ obspace }}_{{ stat_current_cycle_YMDH }}.nc4
     simulated variables: {{ aero_obsdatatin_simulated_variables }}
     observed variables: {{ aero_obsdatain_observed_variables }}
   variables: {{ aero_variables }}
   groups to process: {{ aero_file_groups }}
   qc groups: {{ aero_file_qc_groups }}
   statistics to compute: ['mean', 'count', 'RMS']
-  output file: "{{ obspace }}_{{ window_YMDH }}_output_aod.nc"
+  output file: "{{ obspace }}_{{ stat_current_cycle_YMDH }}_output_aod.nc"
   domains to process:
   - domain:
       name: "nowhere"
diff --git a/algorithm/obstats/aero/viirs_npp_template.yaml.j2 b/algorithm/obstats/aero/viirs_npp_template.yaml.j2
index f4a07d8..e0909bb 100644
--- a/algorithm/obstats/aero/viirs_npp_template.yaml.j2
+++ b/algorithm/obstats/aero/viirs_npp_template.yaml.j2
@@ -3,14 +3,14 @@
     obsdatain:
       engine:
         type: H5File
-        obsfile: {{ aero_obsdatain_path }}/diag_{{ obspace }}_{{ window_YMDH }}.nc4
+        obsfile: {{ aero_obsdatain_path }}/diag_{{ obspace }}_{{ stat_current_cycle_YMDH }}.nc4
     simulated variables: {{ aero_obsdatatin_simulated_variables }}
     observed variables: {{ aero_obsdatain_observed_variables }}
   variables: {{ aero_variables }}
   groups to process: {{ aero_file_groups }}
   qc groups: {{ aero_file_qc_groups }}
   statistics to compute: ['mean', 'count', 'RMS']
-  output file: "{{ obspace }}_{{ window_YMDH }}_output_aod.nc"
+  output file: "{{ obspace }}_{{ stat_current_cycle_YMDH }}_output_aod.nc"
   domains to process:
   - domain:
       name: "nowhere"