diff --git a/SCRIPTS/SHMS/replay_shms.C b/SCRIPTS/SHMS/replay_shms.C
index b5c23b700e471e157d317e80943bfe333ef9c267..1be01de60b45bca86dcfe9e5cc8682a342b06e07 100644
--- a/SCRIPTS/SHMS/replay_shms.C
+++ b/SCRIPTS/SHMS/replay_shms.C
@@ -17,7 +17,7 @@ void replay_shms(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
@@ -103,7 +103,7 @@ void replay_shms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   run->Print();
 
   // Define the analysis parameters
-  TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber);
+  TString ROOTFileName = Form(ROOTFileNamePattern, RunNumber, MaxEvent);
   analyzer->SetCountMode(2);    // 0 = counter is # of physics triggers
                                 // 1 = counter is # of all decode reads
                                 // 2 = counter is event number
diff --git a/SCRIPTS/SHMS/replay_shms_report.C b/SCRIPTS/SHMS/replay_shms_report.C
index 42549df65af43bcc39b1871d53a63ca45880679c..6f4158c239872a834daf5f8b7ae644804402b10a 100644
--- a/SCRIPTS/SHMS/replay_shms_report.C
+++ b/SCRIPTS/SHMS/replay_shms_report.C
@@ -17,7 +17,7 @@ void replay_shms_report(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_report_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");