diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json
index f2cb919..98073e9 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json
@@ -365,7 +365,7 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP"
+      "default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
     },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
@@ -626,4 +626,4 @@
     "dependencies": [],
     "version": 0
   }
-]
\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Templates/vnf-mapping.json
index 5509d7d..44f5c26 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Templates/vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Templates/vnf-mapping.json
@@ -596,7 +596,7 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP"
+      "default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
     },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
@@ -709,4 +709,4 @@
     "dependencies": [],
     "version": 0
   }
-]
\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Templates/vnf-mapping.json
index 3863002..4c793f5 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Templates/vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Templates/vnf-mapping.json
@@ -596,7 +596,7 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP"
+      "default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
     },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
@@ -709,4 +709,4 @@
     "dependencies": [],
     "version": 0
   }
-]
\ No newline at end of file
+]