diff --git a/hallc_replay_gui.py b/hallc_replay_gui.py
index 2dc3957666301dab029c477612d3ef7521a0cffb..0a7de19960d4685cf243652d9fdb4ea16994aad0 100755
--- a/hallc_replay_gui.py
+++ b/hallc_replay_gui.py
@@ -50,8 +50,8 @@ def hms_var_states():
         hms_def_file_text.append('''#include "DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def"\n''')
     if htrig_histos.get() == 1:
         hms_def_file_text.append('''#include "DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def"\n''')
-    if hepics_histos.get() == 1:
-        hms_def_file_text.append('''#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_histos.def"\n''')
+    if hepics_vars.get() == 1:
+        hms_def_file_text.append('''#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_vars.def"\n''')
     if hreact_histos.get() == 1:
         hms_def_file_text.append('''#include "DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def"\n''')
     if hpid_histos.get() == 1:
@@ -94,10 +94,10 @@ def shms_var_states():
         shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"\n''')
     if pdc_histos.get() == 1:
         shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"\n''')
-    if pepics_histos.get() == 1:
-        shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_histos.def"\n''')
+    if pepics_vars.get() == 1:
+        shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def"\n''')
     if pgtr_histos.get() == 1:
-        shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/GTR/hgtr_histos.def"\n''')
+        shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def"\n''')
     if phgcer_histos.get() == 1:
         shms_def_file_text.append('''#include "DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def"\n''')
     if phodo_histos.get() == 1:
@@ -132,7 +132,7 @@ def set_hms_production_defaults():
     hkin_histos.set(1)
     hgtr_histos.set(1)
     hraster_histos.set(1)
-    hepics_histos.set(1)
+    hepics_vars.set(1)
     hreact_histos.set(1)
     hpid_histos.set(1)
     hcalana_histos.set(0)
@@ -145,7 +145,7 @@ def set_shms_production_defaults():
     paero_histos.set(1)
     pcal_histos.set(1)
     pdc_histos.set(1)
-    pepics_histos.set(1)
+    pepics_vars.set(1)
     pgtr_histos.set(1)
     phgcer_histos.set(1)
     phodo_histos.set(1)
@@ -187,14 +187,14 @@ hkin_histos = tk.IntVar()
 hgtr_histos = tk.IntVar()
 hraster_histos = tk.IntVar()
 htrig_histos = tk.IntVar()
-hepics_histos = tk.IntVar()
+hepics_vars = tk.IntVar()
 hreact_histos = tk.IntVar()
 hpid_histos = tk.IntVar()
 
 paero_histos = tk.IntVar()
 pcal_histos = tk.IntVar()
 pdc_histos = tk.IntVar()
-pepics_histos = tk.IntVar()
+pepics_vars = tk.IntVar()
 pgtr_histos = tk.IntVar()
 phgcer_histos = tk.IntVar()
 phodo_histos = tk.IntVar()
@@ -302,7 +302,7 @@ irow=irow+1
 tk.Checkbutton(root, 
               text="Epics",
               padx = 20, 
-              variable=hepics_histos).grid(row=irow,column=icol,sticky=tk.W)
+              variable=hepics_vars).grid(row=irow,column=icol,sticky=tk.W)
 irow=irow+1
 tk.Checkbutton(root, 
               text="Reaction",
@@ -418,7 +418,7 @@ irow=irow+1
 tk.Checkbutton(root, 
               text="Epics",
               padx = 20, 
-              variable=pepics_histos).grid(row=irow,column=icol,sticky=tk.W)
+              variable=pepics_vars).grid(row=irow,column=icol,sticky=tk.W)
 irow=irow+1
 tk.Checkbutton(root, 
               text="Reaction",