diff --git a/Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py b/Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py
index 11a995dc08b1c..40de7ba847096 100644
--- a/Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py
+++ b/Validation/Geometry/test/runMaterialBudgetHFNose_cfg.py
@@ -70,7 +70,7 @@
     else:
         process = cms.Process('MaterialBudgetVolume',Phase2C17I13M9)
 
-geomFile = "Configuration.Geometry.Geometry" + flag + "Extended2026" + options.geometry + "Reco_cff"
+geomFile = "Configuration.Geometry.Geometry" + flag + "ExtendedRun4" + options.geometry + "Reco_cff"
 fileName = "matbdgHFNose" + flag + options.geometry + tag + ".root"
 
 print("Geometry file Name: ", geomFile)
diff --git a/Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolumeRun4DD4hep_cfg.py
similarity index 95%
rename from Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py
rename to Validation/Geometry/test/runMaterialBudgetVolumeRun4DD4hep_cfg.py
index 1194d9f400c8f..36725b840a714 100644
--- a/Validation/Geometry/test/runMaterialBudgetVolume2026DD4hep_cfg.py
+++ b/Validation/Geometry/test/runMaterialBudgetVolumeRun4DD4hep_cfg.py
@@ -1,6 +1,6 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runMaterialBudgetVolume2026DD4hep_cfg.py geometry=D110
+#   cmsRun runMaterialBudgetVolumeRun4DD4hep_cfg.py geometry=D110
 #
 #   Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
 #                        D110, D111, D112, D113, D114, D115
@@ -34,7 +34,7 @@
     from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
     process = cms.Process('MaterialBudgetVolume',Phase2C17I13M9,dd4hep)
 
-geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff"
+geomFile = "Configuration.Geometry.GeometryDD4hepExtendedRun4" + options.geometry + "Reco_cff"
 fileName = "matbdg" + options.geometry + "DD4hep" + ".root"
 
 print("Geometry file Name: ", geomFile)
diff --git a/Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolumeRun4DDD_cfg.py
similarity index 95%
rename from Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py
rename to Validation/Geometry/test/runMaterialBudgetVolumeRun4DDD_cfg.py
index 828d14b55e706..c0d2d807e555c 100644
--- a/Validation/Geometry/test/runMaterialBudgetVolume2026DDD_cfg.py
+++ b/Validation/Geometry/test/runMaterialBudgetVolumeRun4DDD_cfg.py
@@ -1,6 +1,6 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun runMaterialBudgetVolume2026DDD_cfg.py geometry=D110
+#   cmsRun runMaterialBudgetVolumeRun4DDD_cfg.py geometry=D110
 #
 #   Options for geometry D98, D99, D103, D104, D105, D106, D107, D108, D109
 #                        D110, D111, D112, D113, D114, D115
@@ -33,7 +33,7 @@
     from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
     process = cms.Process('MaterialBudgetVolume',Phase2C17I13M9)
 
-geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
 fileName = "matbdg" + options.geometry + "DDD" + ".root"
 
 print("Geometry file Name: ", geomFile)
diff --git a/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh b/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh
index 71a18afa7f2f2..a02c5e6512f4b 100755
--- a/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh
+++ b/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh
@@ -8,7 +8,7 @@ set -x
 # DEFAULTS
 
 events=5000
-geometry=Extended2026D77
+geometry=ExtendedRun4D110
 
 # ARGUMENT PARSING
 
diff --git a/Validation/Geometry/test/runP_HGCal_cfg.py b/Validation/Geometry/test/runP_HGCal_cfg.py
index 84a5c672a2acf..bec9853d49e76 100644
--- a/Validation/Geometry/test/runP_HGCal_cfg.py
+++ b/Validation/Geometry/test/runP_HGCal_cfg.py
@@ -15,7 +15,7 @@
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 
-# The default geometry is Extended2026D110Reco. If a different geoemtry
+# The default geometry is ExtendedRun4D110Reco. If a different geoemtry
 # is needed, the appropriate flag has to be passed at command line,
 # e.g.: cmsRun runP_HGCal_cfg.py geom="XYZ"
 
@@ -30,7 +30,7 @@
 
 options = VarParsing('analysis')
 options.register('geom',             #name
-                 'Extended2026D110',      #default value
+                 'ExtendedRun4D110',      #default value
                  VarParsing.multiplicity.singleton,   # kind of options
                  VarParsing.varType.string,           # type of option
                  "Select the geometry to be studied"  # help message
diff --git a/Validation/Geometry/test/runP_Mtd_cfg.py b/Validation/Geometry/test/runP_Mtd_cfg.py
index 59424479ed4ce..24877c7076b0d 100644
--- a/Validation/Geometry/test/runP_Mtd_cfg.py
+++ b/Validation/Geometry/test/runP_Mtd_cfg.py
@@ -7,7 +7,7 @@
 
 #Geometry
 #
-process.load("Configuration.Geometry.GeometryExtended2026D95Reco_cff")
+process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff")
 
 #Magnetic Field
 #
diff --git a/Validation/Geometry/test/runP_TrackerPhase2TkBE_cfg.py b/Validation/Geometry/test/runP_TrackerPhase2TkBE_cfg.py
index 965697b95403f..c31e430e89b19 100644
--- a/Validation/Geometry/test/runP_TrackerPhase2TkBE_cfg.py
+++ b/Validation/Geometry/test/runP_TrackerPhase2TkBE_cfg.py
@@ -7,7 +7,7 @@
 
 #Geometry
 #
-process.load("Configuration.Geometry.GeometryExtended2026D86Reco_cff")
+process.load("Configuration.Geometry.GeometryExtendedRun4D110Reco_cff")
 
 #Magnetic Field
 #