diff --git a/SCRIPTS/HMS/replay_hdc_test_stand.C b/SCRIPTS/HMS/replay_hdc_test_stand.C
index 12de01928212d263036af7b6c63c38e9572cc60e..96453ca90823870f1f5d7d7403bade17b908c167 100644
--- a/SCRIPTS/HMS/replay_hdc_test_stand.C
+++ b/SCRIPTS/HMS/replay_hdc_test_stand.C
@@ -18,7 +18,7 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create file name patterns.
   //const char* RunFileNamePattern = "raw/test_%d.dat"
   //const char* RunFileNamePattern = "raw/hms_dc_000%d.dat";
-  const char* RunFileNamePattern = "raw/hms_all_000%d.dat";
+  const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
   const char* ROOTFileNamePattern = "ROOTfiles/test_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
diff --git a/SCRIPTS/SHMS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/replay_pdc_test_stand.C
index 1cb393425eb347c0739dc288c9136ae66a120909..0db32feb83266574d889786f6ea32e57b600fe46 100644
--- a/SCRIPTS/SHMS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/replay_pdc_test_stand.C
@@ -16,7 +16,7 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   }
 
   // Create file name patterns.
-  const char* RunFileNamePattern = "raw/shms_dc_00%d.dat";
+  const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
   const char* ROOTFileNamePattern = "ROOTfiles/shms_dc_00%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
@@ -29,6 +29,9 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
 
+  // Load params for HMS DC test stand configuration
+  gHcParms->Load("PARAM/SHMS/DC/pdc_test_stand.param");
+
   gHcDetectorMap = new THcDetectorMap();
   //gHcDetectorMap->Load(gHcParms->GetString("g_decode_map_filename"));
   gHcDetectorMap->Load("MAPS/SHMS/DETEC/pdc.map");