diff --git a/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json b/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json
index de88547798705..7e09ee8d705c0 100644
--- a/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json
+++ b/CondFormats/Common/data/BeamSpotObjectsRcdByLumi_prep.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
-        "BeamSpotObjects_PCL_byLumi_v1_prompt": {}
+        "BeamSpotObjects_PCL_byLumi_prep_prompt": {}
     }, 
     "inputTag": "BeamSpotObject_ByLumi", 
     "since": null, 
diff --git a/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json b/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json
index b8311de996706..9fa54d09bcd85 100644
--- a/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json
+++ b/CondFormats/Common/data/BeamSpotObjectsRcdByRun_prep.json
@@ -3,7 +3,7 @@
     "destinationTags": {
         "BeamSpotObjects_PCL_byRun_v1_express": {}, 
         "BeamSpotObjects_PCL_byRun_v1_hlt": {}, 
-        "BeamSpotObjects_PCL_byRun_v1_prompt": {}
+        "BeamSpotObjects_PCL_byRun_prep_prompt": {}
     }, 
     "inputTag": "BeamSpotObject_ByRun", 
     "since": null, 
diff --git a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
index a630f909a4f6e..1bf56f86ddd2a 100644
--- a/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
+++ b/CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPSRPAlignment_byPCL_v1_prompt": {}
+        "CTPPSRPAlignment_byPCL_prep_prompt": {}
     }, 
     "inputTag": "CTPPSRPAlignment_real_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
index 23fc587ef7bb0..9813725254731 100644
--- a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
+++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPPSTimingCalibration_SAMPIC_byPCL_v1_prompt": {}
+        "CTPPPSTimingCalibration_SAMPIC_byPCL_prep_prompt": {}
     }, 
     "inputTag": "PPSDiamondSampicCalibration_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json
index ae3b18c2788bb..d9669bbdd7467 100644
--- a/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json
+++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_prep.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
-        "CTPPPSTimingCalibration_HPTDC_byPCL_v1_prompt": {}
+        "CTPPPSTimingCalibration_HPTDC_byPCL_prep_prompt": {}
     }, 
     "inputTag": "PPSDiamondTimingCalibration_pcl", 
     "since": null, 
diff --git a/CondFormats/Common/data/SiStripBadStripRcd_prep.json b/CondFormats/Common/data/SiStripBadStripRcd_prep.json
index 7a7031a6e720b..6b1313b955730 100644
--- a/CondFormats/Common/data/SiStripBadStripRcd_prep.json
+++ b/CondFormats/Common/data/SiStripBadStripRcd_prep.json
@@ -2,7 +2,7 @@
     "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
     "destinationTags": {
         "SiStripBadChannel_PCL_v1_hlt": {}, 
-        "SiStripBadChannel_PCL_v1_prompt": {}
+        "SiStripBadChannel_PCL_prep_prompt": {}
     }, 
     "inputTag": "SiStripBadStrip_pcl", 
     "since": null,