diff --git a/DEF-files/SHMS/ALL/HGC/phgcer_histos.def b/DEF-files/SHMS/ALL/HGCER/phgcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/HGC/phgcer_histos.def
rename to DEF-files/SHMS/ALL/HGCER/phgcer_histos.def
diff --git a/DEF-files/SHMS/ALL/NGC/pngcer_histos.def b/DEF-files/SHMS/ALL/NGCER/pngcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/NGC/pngcer_histos.def
rename to DEF-files/SHMS/ALL/NGCER/pngcer_histos.def
diff --git a/DEF-files/SHMS/ALL/merge_list.txt b/DEF-files/SHMS/ALL/merge_list.txt
index c2a3ea0bf7c0d71325a4e7a0939fc2a44b9de57b..4a07205890e0e2cbc50574eb66e76b3d58ad5001 100644
--- a/DEF-files/SHMS/ALL/merge_list.txt
+++ b/DEF-files/SHMS/ALL/merge_list.txt
@@ -1,8 +1,8 @@
 BLOCK/pblock_vars.def
-NGC/pngcer_histos.def
+NGCER/pngcer_histos.def
 DC/pdc_histos.def
 HODO/phodo_histos.def
-HGC/phgcer_histos.def
+HGCER/phgcer_histos.def
 AERO/paero_histos.def
 CAL/pcal_histos.def
 TRIG/ptrig_histos.def
diff --git a/DEF-files/SHMS/STACK/HGC/phgcer_histos.def b/DEF-files/SHMS/STACK/HGCER/phgcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/STACK/HGC/phgcer_histos.def
rename to DEF-files/SHMS/STACK/HGCER/phgcer_histos.def
diff --git a/DEF-files/SHMS/STACK/NGC/pngcer_histos.def b/DEF-files/SHMS/STACK/NGCER/pngcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/STACK/NGC/pngcer_histos.def
rename to DEF-files/SHMS/STACK/NGCER/pngcer_histos.def
diff --git a/DEF-files/SHMS/STACK/merge_list.txt b/DEF-files/SHMS/STACK/merge_list.txt
index 194b685bae7312317575e0ab5cad530efa4a94ea..9cd7399273a34ad1299ef67a95f29b3bd67c358b 100644
--- a/DEF-files/SHMS/STACK/merge_list.txt
+++ b/DEF-files/SHMS/STACK/merge_list.txt
@@ -1,8 +1,8 @@
 BLOCK/pblock_vars.def
-NGC/pngcer_histos.def
+NGCER/pngcer_histos.def
 DC/pdc_histos.def
 HODO/phodo_histos.def
-HGC/phgcer_histos.def
+HGCER/phgcer_histos.def
 AERO/paero_histos.def
 CAL/pcal_histos.def
 TRIG/ptrig_histos.def
diff --git a/MAPS/SHMS/DETEC/HGC/phgcer.map b/MAPS/SHMS/DETEC/HGCER/phgcer.map
similarity index 100%
rename from MAPS/SHMS/DETEC/HGC/phgcer.map
rename to MAPS/SHMS/DETEC/HGCER/phgcer.map
diff --git a/MAPS/SHMS/DETEC/HGC/phgcer_ptrig.map b/MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
similarity index 100%
rename from MAPS/SHMS/DETEC/HGC/phgcer_ptrig.map
rename to MAPS/SHMS/DETEC/HGCER/phgcer_ptrig.map
diff --git a/MAPS/SHMS/DETEC/NGC/pngcer.map b/MAPS/SHMS/DETEC/NGCER/pngcer.map
similarity index 100%
rename from MAPS/SHMS/DETEC/NGC/pngcer.map
rename to MAPS/SHMS/DETEC/NGCER/pngcer.map
diff --git a/MAPS/SHMS/DETEC/NGC/pngcer_ptrig.map b/MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
similarity index 100%
rename from MAPS/SHMS/DETEC/NGC/pngcer_ptrig.map
rename to MAPS/SHMS/DETEC/NGCER/pngcer_ptrig.map
diff --git a/MAPS/merge_list.txt b/MAPS/merge_list.txt
index 8fe2023f71bc611ab88da7624c4bb6ad1d9bb0f2..10738df581b5ba24ffbdc2201ca55d01059abd6f 100644
--- a/MAPS/merge_list.txt
+++ b/MAPS/merge_list.txt
@@ -1,8 +1,8 @@
-SHMS/DETEC/ptrig.map
-SHMS/DETEC/pdc.map
-SHMS/DETEC/phodo.map
-SHMS/DETEC/phgcer.map
-SHMS/DETEC/pngcer.map
-SHMS/DETEC/pcal.map
-SHMS/DETEC/paero.map
+SHMS/DETEC/TRIG/ptrig.map
+SHMS/DETEC/DC/pdc.map
+SHMS/DETEC/HODO/phodo.map
+SHMS/DETEC/HGCER/phgcer.map
+SHMS/DETEC/NGCER/pngcer.map
+SHMS/DETEC/CAL/pcal.map
+SHMS/DETEC/AERO/paero.map