Make source-db consistent across samples

Issue-Id: CCSDK-1623 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf
author: Oleg Mitsura <oleg.mitsura@amdocs.com> 2019-08-15 16:41:17 -0400
committer: Oleg Mitsura <oleg.mitsura@amdocs.com> 2019-08-27 12:35:23 -0400
commit: 54426584a02e6fbfec5f7685c92e1a3fde62309f (patch)
tree: d5af6cfb361d2f1d782c109b7f141a4720fcf25b
parent: 68676761d63eefc4dccc96dd2df6853cb8e10c42 (diff)
184 files changed, 1340 insertions, 1296 deletions
diff --git a/cds-ui/client/src/assets/sample-licenses.json b/cds-ui/client/src/assets/sample-licenses.json
index c0f78ac55..86a8e5d0b 100644
--- a/cds-ui/client/src/assets/sample-licenses.json
+++ b/cds-ui/client/src/assets/sample-licenses.json
@@ -11,7 +11,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -26,4 +26,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
index f94214ada..599e37704 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
@@ -127,7 +127,7 @@
       "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
@@ -250,4 +250,4 @@
       "derived_from" : "tosca.nodes.Root"
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
index 18d0acb4f..22761501c 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
@@ -26,7 +26,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -56,7 +56,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -107,7 +107,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
@@ -132,7 +132,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -157,7 +157,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private\"",
@@ -180,7 +180,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -210,7 +210,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -238,7 +238,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
@@ -259,7 +259,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -280,7 +280,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -303,7 +303,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -372,7 +372,7 @@
         "properties" : { }
       },
       "any-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -382,7 +382,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -411,7 +411,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -432,7 +432,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -468,7 +468,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
@@ -508,7 +508,7 @@
     "updated-by" : "adetalhouet",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
@@ -537,7 +537,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
@@ -562,7 +562,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
@@ -602,7 +602,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
@@ -645,7 +645,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -677,7 +677,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -720,7 +720,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -774,7 +774,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -810,7 +810,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -838,7 +838,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -863,7 +863,7 @@
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -906,7 +906,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -968,7 +968,7 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -1001,4 +1001,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
index 258174882..5829aec1c 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
@@ -209,7 +209,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -264,4 +264,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
index c07007cbc..6315959eb 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -380,7 +380,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -405,7 +405,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -430,7 +430,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -455,7 +455,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -480,7 +480,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -778,4 +778,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
index d3cfdebf8..5782faaa8 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -380,7 +380,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -405,7 +405,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -430,7 +430,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -455,7 +455,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -480,7 +480,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -553,7 +553,7 @@
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -578,7 +578,7 @@
     },
     "input-param": false,
     "dictionary-name": "vsn_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -653,7 +653,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -805,4 +805,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
index 84bc73185..fedf0babd 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -355,7 +355,7 @@
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -406,7 +406,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -431,7 +431,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -456,7 +456,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -481,7 +481,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -629,7 +629,7 @@
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -805,4 +805,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
index 0897af526..7a44860e2 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
@@ -212,7 +212,7 @@
       "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
@@ -387,4 +387,4 @@
       "derived_from" : "tosca.nodes.Vnf"
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
index 4fa179f9c..fdff0d89f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
@@ -30,7 +30,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -58,7 +58,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -75,7 +75,7 @@
           "key-dependencies" : [ "vf-module-id", "service-instance-id", "vnf-id" ]
         }
       },
-      "primary-aai-data" : {
+      "aai-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "PATCH",
@@ -108,7 +108,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -143,7 +143,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -178,7 +178,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -213,7 +213,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -248,7 +248,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -283,7 +283,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -318,7 +318,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -353,7 +353,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -388,7 +388,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -423,7 +423,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -458,7 +458,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -493,7 +493,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -528,7 +528,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -546,7 +546,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -575,7 +575,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -610,7 +610,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -646,7 +646,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -679,7 +679,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -690,7 +690,7 @@
           }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -725,7 +725,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -760,7 +760,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -795,7 +795,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -831,7 +831,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
@@ -842,7 +842,7 @@
           "input-key-mapping" : { }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -877,7 +877,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -895,7 +895,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -924,7 +924,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -942,7 +942,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -971,7 +971,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1006,7 +1006,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1041,7 +1041,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1074,7 +1074,7 @@
         "properties" : { }
       },
       "any-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -1084,7 +1084,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
@@ -1119,7 +1119,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1154,7 +1154,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1190,7 +1190,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1225,7 +1225,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1258,7 +1258,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1275,7 +1275,7 @@
           "key-dependencies" : [ "service-instance-id", "vnf-id" ]
         }
       },
-      "primary-aai-data" : {
+      "aai-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1325,7 +1325,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
@@ -1376,7 +1376,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
@@ -1405,7 +1405,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1423,7 +1423,7 @@
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1474,7 +1474,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1506,7 +1506,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1541,7 +1541,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1576,7 +1576,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1611,7 +1611,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1646,7 +1646,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1681,7 +1681,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1717,7 +1717,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1728,7 +1728,7 @@
           }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1764,7 +1764,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -1796,7 +1796,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1846,7 +1846,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1882,7 +1882,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -1915,7 +1915,7 @@
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
@@ -1947,7 +1947,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -1982,7 +1982,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2017,7 +2017,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2052,7 +2052,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -2071,4 +2071,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
index 5a3da4efd..3cf9ae94b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
@@ -78,7 +78,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -223,7 +223,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -246,7 +246,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -269,7 +269,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -292,7 +292,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -399,11 +399,11 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
index 246cb40a0..193bc2195 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
@@ -55,7 +55,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_vf_module_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -78,7 +78,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
@@ -102,7 +102,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
@@ -110,4 +110,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
index 914565a43..ce8db223c 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
@@ -55,7 +55,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_vf_module_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
        "service-instance-id",
       "vnf-id"
@@ -78,7 +78,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
@@ -102,7 +102,7 @@
     },
     "input-param": false,
     "dictionary-name": "vdns_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id",
@@ -110,4 +110,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
index 57152c9bd..d241aaf4b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
@@ -55,11 +55,11 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
index c59c13411..8e84897a3 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
@@ -15,7 +15,7 @@
     },
     "input-param": false,
     "dictionary-name": "cloud_env",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -38,7 +38,7 @@
     },
     "input-param": false,
     "dictionary-name": "create-md-sal-vnf-param",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
        "service-instance-id",
 	  "vnf-id",
@@ -105,7 +105,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -150,7 +150,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	 "service-instance-id",
       "vnf-id"
@@ -258,7 +258,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -281,7 +281,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -304,7 +304,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -327,7 +327,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -539,7 +539,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -585,7 +585,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -608,7 +608,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -631,7 +631,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -654,7 +654,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -737,7 +737,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -782,7 +782,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -811,4 +811,4 @@
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
index 8ec07e92b..9767296c2 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
@@ -81,7 +81,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -128,7 +128,7 @@
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -172,7 +172,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -195,7 +195,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -303,7 +303,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -326,7 +326,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -349,7 +349,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -372,7 +372,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -395,7 +395,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -418,7 +418,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -547,7 +547,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -635,7 +635,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -658,7 +658,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -681,7 +681,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -725,7 +725,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -748,7 +748,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -875,7 +875,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -924,4 +924,4 @@
     "dependencies": [],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
index 472d76625..8edac3cb3 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
@@ -57,7 +57,7 @@
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -80,7 +80,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -208,7 +208,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -231,7 +231,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -254,7 +254,7 @@
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -277,7 +277,7 @@
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -300,7 +300,7 @@
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -323,7 +323,7 @@
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -346,7 +346,7 @@
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -369,7 +369,7 @@
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -496,7 +496,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -563,7 +563,7 @@
 	  },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
 	  "service-instance-id",
       "vnf-id"
@@ -586,7 +586,7 @@
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -609,7 +609,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -799,7 +799,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -822,11 +822,11 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
index 67d2a914e..9b155c23d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index 67d2a914e..9b155c23d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index 3595a9f67..c57ebe768 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -332,7 +332,7 @@
       "properties": {},
       "derived_from": "tosca.nodes.ResourceSource"
     },
-    "source-processor-db": {
+    "source-db": {
       "description": "This is Database Resource Source Node Type",
       "version": "1.0.0",
       "properties": {
@@ -527,4 +527,4 @@
       "derived_from": "tosca.nodes.Vnf"
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index fe364f974..ecd48289d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -27,7 +27,7 @@
         "properties": {}
       },
       "processor-db": {
-        "type": "source-processor-db",
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -65,7 +65,7 @@
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
     "sources": {
-      "primary-config-data": {
+      "config-data": {
         "type": "source-rest",
         "properties": {
           "verb": "GET",
@@ -96,7 +96,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -124,7 +124,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -154,7 +154,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -174,4 +174,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
index 37bad8d0a..178d2be3a 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
@@ -1,9 +1,9 @@
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data.token=sampletoken
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data.userId=sampleuser
+blueprintsprocessor.restclient.config-data.token=sampletoken
 
-blueprintsprocessor.restclient.primary-config-data1.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data1.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data1.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data1.token=sampletoken
-\ No newline at end of file
+blueprintsprocessor.restclient.config-data1.type=basic-auth
+blueprintsprocessor.restclient.config-data1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data1.userId=sampleuser
+blueprintsprocessor.restclient.config-data1.token=sampletoken
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
index 3d10a7c5f..4c128a9b4 100755
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
@@ -12,8 +12,8 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-db": {
-        "type": "source-processor-db",
+      "processor-db": {
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -50,4 +50,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
index 6ec3b4105..da498e35e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
@@ -1,11 +1,5 @@
 {
   "artifact_types" : {
-    "artifact-directed-graph" : {
-      "description" : "Directed Graph File",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json", "xml" ]
-    },
     "artifact-mapping-resource" : {
       "description" : "Resource Mapping File used along with Configuration template",
       "version" : "1.0.0",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
index 5c0f1b351..2a4f39447 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
@@ -13,6 +13,9 @@
         "interface-name" : {
           "type" : "string"
         },
+        "golden-vf-module-type" : {
+          "type" : "string"
+        },
         "interface-description" : {
           "type" : "string"
         },
@@ -23,9 +26,6 @@
           "type" : "string",
           "default" : "6"
         },
-        "vf-module-type" : {
-          "type" : "string"
-        },
         "vf-module-number" : {
           "type" : "string",
           "default" : "3"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
index 7e1bd8b30..7c73752a3 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
@@ -1,319 +1,296 @@
 {
-  "metadata": {
-    "template_author": "Alexis de Talhouët",
-    "author-email": "adetalhouet89@gmail.com",
-    "user-groups": "ADMIN, OPERATION",
-    "template_name": "golden",
-    "template_version": "1.0.0",
-    "template_tags": "test"
+  "tosca_definitions_version" : "controller_blueprint_1_0_0",
+  "metadata" : {
+    "template_author" : "Alexis de Talhouët",
+    "author-email" : "adetalhouet89@gmail.com",
+    "user-groups" : "ADMIN, OPERATION",
+    "template_name" : "golden",
+    "template_version" : "1.0.0",
+    "template_tags" : "test"
   },
-  "imports": [
-    {
-      "file": "Definitions/data_types.json"
+  "imports" : [ {
+    "file" : "Definitions/data_types.json"
+  }, {
+    "file" : "Definitions/relationship_types.json"
+  }, {
+    "file" : "Definitions/artifact_types.json"
+  }, {
+    "file" : "Definitions/node_types.json"
+  }, {
+    "file" : "Definitions/policy_types.json"
+  } ],
+  "dsl_definitions" : {
+    "ipam-1" : {
+      "type" : "token-auth",
+      "url" : "http://netbox-nginx:8080",
+      "token" : "Token 0123456789abcdef0123456789abcdef01234567"
     },
-    {
-      "file": "Definitions/relationship_types.json"
-    },
-    {
-      "file": "Definitions/artifact_types.json"
-    },
-    {
-      "file": "Definitions/node_types.json"
-    },
-    {
-      "file": "Definitions/policy_types.json"
-    }
-  ],
-  "dsl_definitions": {
-    "ipam-1": {
-      "type": "token-auth",
-      "url": "http://netbox-nginx:8080",
-      "token": "Token 0123456789abcdef0123456789abcdef01234567"
-    },
-    "config-deploy-properties": {
-      "resolution-key": {
-        "get_input": "resolution-key"
+    "config-deploy-properties" : {
+      "resolution-key" : {
+        "get_input" : "resolution-key"
       }
     }
   },
-  "topology_template": {
-    "workflows": {
-      "resource-assignment": {
-        "steps": {
-          "resource-assignment": {
-            "description": "Resource Assign Workflow",
-            "target": "resource-assignment",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+  "topology_template" : {
+    "workflows" : {
+      "resource-assignment" : {
+        "steps" : {
+          "resource-assignment" : {
+            "description" : "Resource Assign Workflow",
+            "target" : "resource-assignment",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resource-assignment-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(resource-assignment).",
-            "required": true,
-            "type": "dt-resource-assignment-properties"
+        "inputs" : {
+          "resource-assignment-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(resource-assignment).",
+            "required" : true,
+            "type" : "dt-resource-assignment-properties"
           }
         },
-        "outputs": {
-          "meshed-template": {
-            "type": "json",
-            "value": {
-              "get_attribute": [
-                "resource-assignment",
-                "assignment-params"
-              ]
+        "outputs" : {
+          "meshed-template" : {
+            "type" : "json",
+            "value" : {
+              "get_attribute" : [ "resource-assignment", "assignment-params" ]
             }
           }
         }
       },
-      "config-assign": {
-        "steps": {
-          "config-assign": {
-            "description": "Config Assign Workflow",
-            "target": "config-assign",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "config-assign" : {
+        "steps" : {
+          "config-assign" : {
+            "description" : "Config Assign Workflow",
+            "target" : "config-assign",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": true,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : true,
+            "type" : "string"
           },
-          "config-assign-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(config-assign).",
-            "required": true,
-            "type": "dt-config-assign-properties"
+          "config-assign-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(config-assign).",
+            "required" : true,
+            "type" : "dt-config-assign-properties"
           }
         },
-        "outputs": {
-          "dry-run": {
-            "type": "json",
-            "value": {
-              "get_attribute": [
-                "config-assign",
-                "assignment-params"
-              ]
+        "outputs" : {
+          "dry-run" : {
+            "type" : "json",
+            "value" : {
+              "get_attribute" : [ "config-assign", "assignment-params" ]
             }
           }
         }
       },
-      "config-deploy": {
-        "steps": {
-          "config-deploy": {
-            "description": "Resource Assign and Python Netconf Activation Workflow",
-            "target": "config-deploy",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "config-deploy" : {
+        "steps" : {
+          "config-deploy" : {
+            "description" : "Resource Assign and Python Netconf Activation Workflow",
+            "target" : "config-deploy",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": false,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : false,
+            "type" : "string"
           },
-          "password": {
-            "required": true,
-            "type": "string"
+          "password" : {
+            "required" : true,
+            "type" : "string"
           },
-          "username": {
-            "required": true,
-            "type": "string"
+          "username" : {
+            "required" : true,
+            "type" : "string"
           },
-          "ip": {
-            "required": true,
-            "type": "string"
+          "ip" : {
+            "required" : true,
+            "type" : "string"
           }
         }
       },
-      "rollback": {
-        "steps": {
-          "rollback": {
-            "description": "Rollback Workflow",
-            "target": "rollback",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "rollback" : {
+        "steps" : {
+          "rollback" : {
+            "description" : "Rollback Workflow",
+            "target" : "rollback",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": false,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : false,
+            "type" : "string"
           },
-          "password": {
-            "required": true,
-            "type": "string"
+          "password" : {
+            "required" : true,
+            "type" : "string"
           },
-          "username": {
-            "required": true,
-            "type": "string"
+          "username" : {
+            "required" : true,
+            "type" : "string"
           },
-          "ip": {
-            "required": true,
-            "type": "string"
+          "ip" : {
+            "required" : true,
+            "type" : "string"
           },
-          "rollback-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(rollback).",
-            "required": true,
-            "type": "dt-rollback-properties"
+          "rollback-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(rollback).",
+            "required" : true,
+            "type" : "dt-rollback-properties"
           }
         }
       }
     },
-    "node_templates": {
-      "resource-assignment": {
-        "type": "component-resource-resolution",
-        "interfaces": {
-          "ResourceResolutionComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "artifact-prefix-names": [
-                    "vf-module-1"
-                  ]
+    "node_templates" : {
+      "resource-assignment" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "artifact-prefix-names" : [ "vf-module-1" ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "vf-module-1-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vf-module-1-template.vtl"
+        "artifacts" : {
+          "vf-module-1-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/vf-module-1-template.vtl"
           },
-          "vf-module-1-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vf-module-1-mapping.json"
+          "vf-module-1-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/vf-module-1-mapping.json"
           }
         }
       },
-      "config-assign": {
-        "type": "component-resource-resolution",
-        "interfaces": {
-          "ResourceResolutionComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "resolution-key": {
-                    "get_input": "resolution-key"
+      "config-assign" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "resolution-key" : {
+                    "get_input" : "resolution-key"
                   },
-                  "store-result": true,
-                  "artifact-prefix-names": [
-                    "hostname", "vfw-interface"
-                  ]
+                  "store-result" : true,
+                  "artifact-prefix-names" : [ "hostname", "vfw-interface" ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "hostname-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/hostname-template.vtl"
+        "artifacts" : {
+          "hostname-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/hostname-template.vtl"
           },
-          "hostname-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/hostname-mapping.json"
+          "hostname-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/hostname-mapping.json"
           },
-          "vfw-interface-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vfw-interface-template.vtl"
+          "vfw-interface-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/vfw-interface-template.vtl"
           },
-          "vfw-interface-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vfw-interface-mapping.json"
+          "vfw-interface-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/vfw-interface-mapping.json"
           }
         }
       },
-      "config-deploy": {
-        "type": "component-netconf-executor",
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
+      "config-deploy" : {
+        "type" : "component-netconf-executor",
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
           }
         },
-        "interfaces": {
-          "ComponentNetconfExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "script-type": "jython",
-                  "script-class-reference": "Scripts/python/ConfigDeploy.py",
-                  "instance-dependencies": [],
-                  "dynamic-properties": "*config-deploy-properties"
+        "interfaces" : {
+          "ComponentNetconfExecutor" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "script-type" : "jython",
+                  "script-class-reference" : "Scripts/python/ConfigDeploy.py",
+                  "instance-dependencies" : [ ],
+                  "dynamic-properties" : "*config-deploy-properties"
                 }
               }
             }
           }
         }
       },
-      "rollback": {
-        "type": "component-netconf-executor",
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
+      "rollback" : {
+        "type" : "component-netconf-executor",
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
           }
         },
-        "interfaces": {
-          "ComponentNetconfExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "script-type": "jython",
-                  "script-class-reference": "Scripts/python/Rollback.py",
-                  "instance-dependencies": []
+        "interfaces" : {
+          "ComponentNetconfExecutor" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "script-type" : "jython",
+                  "script-class-reference" : "Scripts/python/Rollback.py",
+                  "instance-dependencies" : [ ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "junos-rollback-RPC-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/junos-rollback-RPC-template.vtl"
+        "artifacts" : {
+          "junos-rollback-RPC-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/junos-rollback-RPC-template.vtl"
           },
-          "junos-rollback-RPC-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/junos-rollback-RPC-mapping.json"
+          "junos-rollback-RPC-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/junos-rollback-RPC-mapping.json"
           }
         }
       },
-      "netconf-device": {
-        "type": "vnf-netconf-device",
-        "capabilities": {
-          "netconf": {
-            "properties": {
-              "login-key": {
-                "get_input": "password"
+      "netconf-device" : {
+        "type" : "vnf-netconf-device",
+        "capabilities" : {
+          "netconf" : {
+            "properties" : {
+              "login-key" : {
+                "get_input" : "password"
               },
-              "login-account": {
-                "get_input": "username"
+              "login-account" : {
+                "get_input" : "username"
               },
-              "target-ip-address": {
-                "get_input": "ip"
+              "target-ip-address" : {
+                "get_input" : "ip"
               },
-              "port-number": 830,
-              "connection-time-out": 5
+              "port-number" : 830,
+              "connection-time-out" : 5
             }
           }
         }
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
index c1cded219..80ae5d76e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
@@ -3,6 +3,12 @@
     "component-netconf-executor" : {
       "description" : "This is Netconf Transaction Configuration Component API",
       "version" : "1.0.0",
+      "attributes" : {
+        "response-data" : {
+          "required" : false,
+          "type" : "json"
+        }
+      },
       "capabilities" : {
         "component-node" : {
           "type" : "tosca.capabilities.Node"
@@ -29,11 +35,6 @@
                   } ],
                   "default" : "internal"
                 },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                },
                 "script-class-reference" : {
                   "description" : "Kotlin Script class name or jython script name.",
                   "required" : true,
@@ -46,6 +47,11 @@
                   "entry_schema" : {
                     "type" : "string"
                   }
+                },
+                "dynamic-properties" : {
+                  "description" : "Dynamic Json Content or DSL Json reference.",
+                  "required" : false,
+                  "type" : "json"
                 }
               },
               "outputs" : {
@@ -90,6 +96,12 @@
                   "required" : false,
                   "type" : "string"
                 },
+                "occurrence" : {
+                  "description" : "Number of time to perform the resolution.",
+                  "required" : false,
+                  "type" : "integer",
+                  "default" : 1
+                },
                 "store-result" : {
                   "description" : "Whether or not to store the output.",
                   "required" : false,
@@ -145,25 +157,6 @@
       },
       "derived_from" : "tosca.nodes.Component"
     },
-    "dg-generic" : {
-      "description" : "This is Generic Directed Graph Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "content" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "dependency-node-templates" : {
-          "description" : "Dependent Step Components NodeTemplate name.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Workflow"
-    },
     "source-capability" : {
       "description" : "This is Component Resource Source Node Type",
       "version" : "1.0.0",
@@ -200,43 +193,7 @@
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-default" : {
-      "description" : "This is Default Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
@@ -245,7 +202,8 @@
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "SQL", "PLSQL" ]
-          } ]
+          } ],
+          "default" : "SQL"
         },
         "endpoint-selector" : {
           "required" : false,
@@ -279,12 +237,24 @@
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
+    "source-default" : {
+      "description" : "This is Default Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-input" : {
+      "description" : "This is Input Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
     "source-rest" : {
       "description" : "This is Rest Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
         "type" : {
-          "required" : false,
+          "required" : true,
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "JSON" ]
@@ -292,7 +262,7 @@
           "default" : "JSON"
         },
         "verb" : {
-          "required" : false,
+          "required" : true,
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
@@ -353,11 +323,6 @@
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.Workflow" : {
-      "description" : "This is Directed Graph Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
     "tosca.nodes.ResourceSource" : {
       "description" : "TOSCA base type for Resource Sources",
       "version" : "1.0.0",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
index 1169a8d58..73ee86174 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
@@ -8,7 +8,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -28,6 +28,31 @@
       }
     }
   },
+  "golden-vf-module-type" : {
+    "tags" : "golden-vf-module-type",
+    "name" : "golden-vf-module-type",
+    "property" : {
+      "description" : "golden-vf-module-type",
+      "type" : "string"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
+          "input-key-mapping" : {
+            "vfmoduleid" : "vf-module-number"
+          },
+          "output-key-mapping" : {
+            "golden-vf-module-type" : "value"
+          },
+          "key-dependencies" : [ "vf-module-number" ]
+        }
+      }
+    }
+  },
   "hostname" : {
     "tags" : "hostname",
     "name" : "hostname",
@@ -35,7 +60,7 @@
       "description" : "hostname",
       "type" : "string"
     },
-    "updated-by" : "adetalhouet",
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
         "type" : "source-input"
@@ -119,30 +144,5 @@
         "properties" : { }
       }
     }
-  },
-  "vf-module-type" : {
-    "tags" : "vf-module-type",
-    "name" : "vf-module-type",
-    "property" : {
-      "description" : "vf-module-type",
-      "type" : "string"
-    },
-    "updated-by" : "adetalhouet",
-    "sources" : {
-      "processor-db" : {
-        "type" : "source-processor-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
-          "input-key-mapping" : {
-            "vfmoduleid" : "vf-module-number"
-          },
-          "output-key-mapping" : {
-            "vf-module-type" : "value"
-          },
-          "key-dependencies" : [ "vf-module-number" ]
-        }
-      }
-    }
   }
 }
 \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
index f4fc9ab1e..738b0d4d6 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
@@ -17,7 +17,7 @@
     "property": {
       "type": "string"
     },
-    "dictionary-name": "vf-module-type",
+    "dictionary-name": "golden-vf-module-type",
     "dictionary-source": "processor-db",
     "dependencies": [
       "vf-module-number"
@@ -33,7 +33,7 @@
     "dictionary-name": "vf-module-number",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -46,7 +46,7 @@
     "dictionary-name": "prefix-id",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -56,9 +56,9 @@
         "type": "dt-netbox-ip"
     },
     "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "prefix-id"
     ]
   }
-]
-\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
index 9de84441f..427df73f2 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
@@ -1,88 +1,80 @@
-[
-  {
-    "name": "interface-description",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-description",
-    "dictionary-source": "capability",
-    "dependencies": [
-      "vf-module-type"
-    ]
+[{
+  "name": "interface-description",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "interface-name",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-name",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-description",
+  "dictionary-source": "capability",
+  "dependencies": [
+    "golden-vf-module-type"
+  ]
+}, {
+  "name": "interface-name",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "unit-number",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "unit-number",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-name",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "unit-number",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "prefix-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "6"
-    },
-    "dictionary-name": "prefix-id",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "unit-number",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "prefix-id",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "6"
   },
-  {
-    "name": "vf-module-type",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-number"
-    ]
+  "dictionary-name": "prefix-id",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "golden-vf-module-type",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "vf-module-number",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "3"
-    },
-    "dictionary-name": "vf-module-number",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "golden-vf-module-type",
+  "dictionary-source": "processor-db",
+  "dependencies": [
+    "vf-module-number"
+  ]
+}, {
+  "name": "vf-module-number",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "3"
   },
-  {
-    "name": "vfw_interface_ip",
-    "input-param": true,
-    "property": {
-        "type": "dt-netbox-ip"
-    },
-    "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
-    "dependencies": [
-      "prefix-id"
-    ]
-  }
-]
-\ No newline at end of file
+  "dictionary-name": "vf-module-number",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "vfw_interface_ip",
+  "input-param": true,
+  "property": {
+    "type": "dt-netbox-ip"
+  },
+  "dictionary-name": "create_netbox_ip",
+  "dictionary-source": "config-data",
+  "dependencies": [
+    "prefix-id"
+  ]
+}]
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-db.json
index 02e403bc2..02e403bc2 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-db.json
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
index adb8bd402..9a63905e6 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
new file mode 100644
index 000000000..fea6862fb
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
@@ -0,0 +1,29 @@
+{
+    "tags" : "oam-local-ipv4-address",
+    "name" : "create_netbox_ip",
+    "property" : {
+      "description" : "netbox ip",
+      "type" : "dt-netbox-ip"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "verb" : "POST",
+          "endpoint-selector" : "ipam-1",
+          "url-path" : "/api/ipam/prefixes/$prefix-id/available-ips/",
+          "path" : "",
+          "input-key-mapping" : {
+            "prefix-id" : "prefix-id"
+          },
+          "output-key-mapping" : {
+            "address" : "address",
+            "id" : "id"
+          },
+          "key-dependencies" : [ "prefix-id" ]
+        }
+      }
+    }
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
index 007dc53d8..9a498d888 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
index 7b598614d..9f4097601 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
new file mode 100644
index 000000000..dd1490167
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
@@ -0,0 +1,30 @@
+{
+  "tags": "oam-local-ipv4-address",
+  "name": "delete_netbox_ip",
+  "property": {
+    "description": "delete netbox ip",
+    "type": "string"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "config-data": {
+      "type": "source-rest",
+      "properties": {
+        "type": "JSON",
+        "verb": "DELETE",
+        "endpoint-selector": "ipam-1",
+        "url-path": "/api/ipam/ip-addresses/$ip-address-id",
+        "path": "/address",
+        "input-key-mapping": {
+          "ip-address-id": "ip-address-id"
+        },
+        "output-key-mapping": {
+
+        },
+        "key-dependencies": [
+          "ip-address-id"
+        ]
+      }
+    }
+  }
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
index 83ee0353a..bb18688d5 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json
new file mode 100644
index 000000000..4d335776e
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json
@@ -0,0 +1,25 @@
+{
+  "tags" : "golden-vf-module-type",
+  "name" : "golden-vf-module-type",
+  "property" : {
+    "description" : "golden-vf-module-type",
+    "type" : "string"
+  },
+  "updated-by" : "adetalhouet",
+  "sources" : {
+    "processor-db" : {
+      "type" : "source-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
+        "input-key-mapping" : {
+          "vfmoduleid" : "vf-module-number"
+        },
+        "output-key-mapping" : {
+          "golden-vf-module-type" : "value"
+        },
+        "key-dependencies" : [ "vf-module-number" ]
+      }
+    }
+  }
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
index 7a57153aa..55fbf5e53 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
index 57a0ef391..84a632f72 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -30,4 +30,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
index 90bccfba1..9e76f28ff 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
index 6d6524100..fca01280e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
index dc810347b..892b69805 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
index 9110f038d..2bd83e17a 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
index 202a55563..8c6d5f8f9 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json b/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json
new file mode 100644
index 000000000..5b3fa4413
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json
@@ -0,0 +1,19 @@
+{
+  "tags": "interface-description",
+  "name": "interface-description",
+  "property": {
+    "description": "interface-description",
+    "type": "string"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "capability": {
+      "type": "source-capability",
+      "properties": {
+        "script-type": "jython",
+        "script-class-reference": "Scripts/python/DescriptionExample.py",
+        "instance-dependencies": []
+      }
+    }
+  }
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json
new file mode 100644
index 000000000..53a11ed70
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json
@@ -0,0 +1,15 @@
+{
+  "name" : "interface-name",
+  "tags" : "interface-name",
+  "updated-by" : "adetalhouet",
+  "property" : {
+    "description" : "interface-name",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : { }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
index 6eb8d929b..2f80c0620 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -30,4 +30,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
index 03109abab..af84802e1 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
index 751e99305..486abfd2c 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,7 +34,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -46,4 +46,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
index ee67b9256..c783cacf1 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
index a4e6c11a7..336399b9b 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
index 3709c0b65..0af32e14a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
index a26b82ff2..90f5b4943 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
@@ -13,7 +13,7 @@
       }
     },
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
index 4cc28dc43..ba74e2d76 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -15,7 +15,7 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 90d674c50..85c2e6098 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,7 +34,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -46,4 +46,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
index c805e326d..37691e3cc 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,4 @@
         }
       }
     
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
index 80f62ea8b..0f6b55e82 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
index d1a4b79f9..2d58eb3da 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
index 6210bf903..d67ede526 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,7 +35,7 @@
         },
       
       "processor-db": {
-        "type": "source-processor-db",
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "type": "SQL",
@@ -48,4 +48,3 @@
       }
     }
   }
- 
-\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
index a81938866..7ac8bc88e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,3 @@
         }
       }
     }
-  
-\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json
new file mode 100644
index 000000000..e515eca55
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json
@@ -0,0 +1,16 @@
+{
+  "tags": "prefix-id",
+  "name": "prefix-id",
+  "property" :{
+    "description": "prefix-id",
+    "type": "integer"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
index 31ab6a909..de90ab926 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
@@ -15,7 +15,7 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
index 7eff98ddb..ec52973a7 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,7 +34,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -46,4 +46,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
index f3f0ae107..83d91c316 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,7 +34,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -46,4 +46,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
index 8ddf98737..dc6af51fd 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
index ac12ad28f..62fc05d06 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
index 441a3c805..3c8f133e2 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
index 7c274132f..1242e1074 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,4 @@
         }
       }
     
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json
index c9544edad..72abf788f 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json
@@ -1,24 +1,24 @@
-{
-  "name": "sample-db-source",
-  "property" :{
-    "description": "name of the ",
-    "type": "string"
-  },
-  "updated-by": "brindasanth@onap.com",
-  "tags": "processor-db-source, brindasanth@onap.com",
-  "sources": {
-    "processor-db": {
-      "type": "source-processor-db",
-      "properties": {
-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-        "input-key-mapping": {
-          "profile_name": "profile_name"
-        },
-        "output-key-mapping": {
-          "db-country": "country",
-          "db-state": "state"
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
+{
+  "name": "sample-db-source",
+  "property" :{
+    "description": "name of the ",
+    "type": "string"
+  },
+  "updated-by": "brindasanth@onap.com",
+  "tags": "processor-db, brindasanth@onap.com",
+  "sources": {
+    "processor-db": {
+      "type": "source-db",
+      "properties": {
+        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+        "input-key-mapping": {
+          "profile_name": "profile_name"
+        },
+        "output-key-mapping": {
+          "db-country": "country",
+          "db-state": "state"
+        }
+      }
+    }
+  }
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
index c0f78ac55..86a8e5d0b 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
@@ -11,7 +11,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -26,4 +26,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
index 75d7ca050..22d3da551 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
index 14437c913..50776c1ef 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,4 @@
         }
       }
     
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
index 4aa022379..f78771a60 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
@@ -12,7 +12,7 @@
       "properties" : { }
     },
     "any-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
         "input-key-mapping": {
@@ -23,7 +23,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
         "input-key-mapping": {
@@ -42,4 +42,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json b/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json
new file mode 100644
index 000000000..333fd78eb
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json
@@ -0,0 +1,14 @@
+{
+    "tags": "unit-number",
+    "name": "unit-number",
+    "property": {
+      "description": "unit-number",
+      "type": "string"
+    },
+    "updated-by": "adetalhouet",
+    "sources": {
+      "input": {
+        "type": "source-input"
+      }
+    }
+  }
+\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
index 7d3475d8c..895d31c56 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
index 60b846d7b..ff68a1940 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
index 323c33e44..d1c2c6c71 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
@@ -15,7 +15,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -36,4 +36,4 @@
         }
       }
     
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
index bc7089160..4ab006ff4 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
index 715cbc7bb..a9c504709 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
index c02e09d60..5145cc6ac 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,4 @@
         }
       }
     
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
index 420df6a9f..17cee3114 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
index 5e5f0719e..6f268abd4 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -15,9 +15,8 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
-        "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
         "query": "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
         "input-key-mapping": {
@@ -32,4 +31,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json
new file mode 100644
index 000000000..cdd40f669
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json
@@ -0,0 +1,16 @@
+{
+  "tags": "vf-module-number",
+  "name": "vf-module-number",
+  "property" :{
+    "description": "vf-module-number",
+    "type": "string"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    }
+  }
+}
+\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
index f9706820d..1e95963e3 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -15,9 +15,8 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
-        "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
         "query": "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
         "input-key-mapping": {
@@ -32,4 +31,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
index cae11172c..6c9639cae 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
@@ -13,7 +13,7 @@
       }
     },
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
index 2f839ac88..1bf36ef39 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
index 1f8c1d21f..8cf1838be 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -15,7 +15,7 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
index 4c227f91f..b95545474 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
index 0df08c000..2472590e2 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
index cbc0c5b82..82a5835a5 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
index 74fae4619..b693147da 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
index c1bdb601b..9b9dceb3e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
index e04697fd9..d174df7ce 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
index 99448b8cf..9de05ea40 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,3 @@
         }
       }
     }
-  
-\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
index 9c0855bac..f75eb1bc7 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,4 @@
         }
       }
     
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
index 4be4c8249..dcbedfec7 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
index 5a38f92c4..94dbc841f 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
index 3cda76743..00b8aaa90 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,7 +34,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -46,4 +46,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
index 563dd4579..8cccda4d2 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
index 58e7105e2..7c3ac0829 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
@@ -15,7 +15,7 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
index f1799579f..2a4908a5d 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -14,7 +14,7 @@
           "type": "source-default",
           "properties": {}
         },
-        "primary-config-data": {
+        "config-data": {
           "type": "source-rest",
           "properties": {
             "type": "JSON",
@@ -35,4 +35,3 @@
         }
       }
     }
-  
-\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
index 09b738033..d16b7b9d7 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -33,7 +33,7 @@
         ]
       }
     },
-    "primary-aai-data": {
+    "aai-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -52,4 +52,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
index 2174914e8..b4486e8dc 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -17,7 +17,7 @@
       "properties": {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
index 855ca2223..da4bc6508 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
@@ -15,7 +15,7 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
index b6027fef1..1f854871f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -15,7 +15,7 @@
       "properties": {}
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
index 6a4b1bc73..1e6489408 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
index cfeab71ca..c7e26713a 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
index d35cc1e4f..6a823bf91 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
index b6865acf4..66a9daa87 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
@@ -14,7 +14,7 @@
       "type": "source-default",
       "properties": {}
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -34,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
index 586aa0c9c..85706f2c7 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
index 1fe479717..a7ad5fba0 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
index 297a8ef87..fea6862fb 100644
--- a/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
@@ -7,7 +7,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -26,4 +26,4 @@
         }
       }
     }
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
index 35a8a351c..dd1490167 100644
--- a/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "adetalhouet",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
index 9e8c4096f..358644330 100644
--- a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
@@ -8,7 +8,7 @@
   "updated-by": "adetalhouet",
   "sources": {
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "type": "SQL",
         "query": "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
@@ -24,4 +24,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/docs/datadictionary/create_netbox_ip_address.rst b/docs/datadictionary/create_netbox_ip_address.rst
index f17ddb407..f6d83c500 100644
--- a/docs/datadictionary/create_netbox_ip_address.rst
+++ b/docs/datadictionary/create_netbox_ip_address.rst
@@ -5,35 +5,32 @@
 create_netbox_ip_address code
 =============================
 
-.. code-block:: json
-   :linenos:
-   
-   {
-       "tags" : "oam-local-ipv4-address",
-       "name" : "create_netbox_ip",
-       "property" : {
-         "description" : "netbox ip",
-         "type" : "dt-netbox-ip"
-       },
-       "updated-by" : "adetalhouet",
-       "sources" : {
-         "primary-config-data" : {
-           "type" : "source-rest",
-           "properties" : {
-             "type" : "JSON",
-             "verb" : "POST",
-             "endpoint-selector" : "ipam-1",
-             "url-path" : "/api/ipam/prefixes/$prefixId/available-ips/",
-             "path" : "",
-             "input-key-mapping" : {
-               "prefixId" : "prefix-id"
-             },
-             "output-key-mapping" : {
-               "address" : "address",
-               "id" : "id"
-             },
-             "key-dependencies" : [ "prefix-id" ]
-           }
-         }
-       }
-   }
-\ No newline at end of file
+{
+    "tags" : "oam-local-ipv4-address",
+    "name" : "create_netbox_ip",
+    "property" : {
+      "description" : "netbox ip",
+      "type" : "dt-netbox-ip"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "verb" : "POST",
+          "endpoint-selector" : "ipam-1",
+          "url-path" : "/api/ipam/prefixes/$prefixId/available-ips/",
+          "path" : "",
+          "input-key-mapping" : {
+            "prefixId" : "prefix-id"
+          },
+          "output-key-mapping" : {
+            "address" : "address",
+            "id" : "id"
+          },
+          "key-dependencies" : [ "prefix-id" ]
+        }
+      }
+    }
+  }
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index 16e5b32d3..3405edab7 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
@@ -26,7 +26,7 @@ server.port=8081
 
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=blueprints/deploy
@@ -67,14 +67,14 @@ blueprintsprocessor.blueprintDeployPath=blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=blueprints/work
 # Primary Database Configuration
-blueprintsprocessor.db.primary.url=jdbc:mysql://localhost:3306/sdnctl
-blueprintsprocessor.db.primary.username=sdnctl
-blueprintsprocessor.db.primary.password=sdnctl
-blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=update
-blueprintsprocessor.db.primary.hibernateDDLAuto=none
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
+blueprintsprocessor.db.url=jdbc:mysql://localhost:3306/sdnctl
+blueprintsprocessor.db.username=sdnctl
+blueprintsprocessor.db.password=sdnctl
+blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=update
+blueprintsprocessor.db.hibernateDDLAuto=none
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Python executor
 ### If testing in docker, use the absolute paths as Docker view of filesystem will not respect relative paths.
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties
index bc297efb4..3ea588da3 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 # Web server config
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@ -48,14 +48,14 @@ blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/working
 
 # Primary Database Configuration
-blueprintsprocessor.db.primary.url=jdbc:mysql://db:3306/sdnctl
-blueprintsprocessor.db.primary.username=sdnctl
-blueprintsprocessor.db.primary.password=sdnctl
-blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=update
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
+blueprintsprocessor.db.url=jdbc:mysql://db:3306/sdnctl
+blueprintsprocessor.db.username=sdnctl
+blueprintsprocessor.db.password=sdnctl
+blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=update
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Python executor
 blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
@@ -85,16 +85,16 @@ blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXB
 
 
 # Primary Config Data REST client settings
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://sdnc:8282
-blueprintsprocessor.restclient.primary-config-data.username=admin
-blueprintsprocessor.restclient.primary-config-data.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://sdnc:8282
+blueprintsprocessor.restclient.config-data.username=admin
+blueprintsprocessor.restclient.config-data.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Primary AAI Data REST Client settings
-blueprintsprocessor.restclient.primary-aai-data.type=basic-auth
-blueprintsprocessor.restclient.primary-aai-data.url=https://aai.onap:8443
-blueprintsprocessor.restclient.primary-aai-data.username=aai@aai.onap.org
-blueprintsprocessor.restclient.primary-aai-data.password=demo123456!
+blueprintsprocessor.restclient.aai-data.type=basic-auth
+blueprintsprocessor.restclient.aai-data.url=https://aai.onap:8443
+blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
+blueprintsprocessor.restclient.aai-data.password=demo123456!
 
 # Kafka-message-lib Configuration
 blueprintsprocessor.messageclient.self-service-api.topic=producer.t
diff --git a/ms/blueprintsprocessor/application/src/test/resources/application-test.properties b/ms/blueprintsprocessor/application/src/test/resources/application-test.properties
index b8b80f2dd..74c8a2380 100644
--- a/ms/blueprintsprocessor/application/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/application/src/test/resources/application-test.properties
@@ -20,14 +20,14 @@ blueprintsprocessor.httpPort=0
 blueprintsprocessor.grpcEnable=true
 blueprintsprocessor.grpcPort=0
 
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 
 # The properties bellow are set programmatically
 #blueprintsprocessor.blueprintDeployPath=
@@ -47,4 +47,4 @@ blueprints.processor.functions.python.executor.modulePaths=\
 blueprintsprocessor.cliExecutor.enabled=true
 blueprintprocessor.netconfExecutor.enabled=true
 
-blueprintsprocessor.restconfEnabled=true
-\ No newline at end of file
+blueprintsprocessor.restconfEnabled=true
diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties
index 06f3e948c..e50ebdefb 100644
--- a/ms/blueprintsprocessor/application/src/test/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties
@@ -19,7 +19,7 @@
 server.port=8080
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@ -49,14 +49,14 @@ blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/work
 # Primary Database Configuration
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Python executor
 blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
 blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints
diff --git a/ms/blueprintsprocessor/distribution/src/main/dc/docker-compose.yaml b/ms/blueprintsprocessor/distribution/src/main/dc/docker-compose.yaml
index 1e1974427..848083e63 100755
--- a/ms/blueprintsprocessor/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/blueprintsprocessor/distribution/src/main/dc/docker-compose.yaml
@@ -14,17 +14,3 @@ services:
       MYSQL_DATABASE: sdnctl
       MYSQL_USER: sdnctl
       MYSQL_PASSWORD: sdnctl
-  blueprints-processor:
-    depends_on:
-    - db
-    image: onap/ccsdk-blueprintsprocessor:latest
-    container_name: bp-rest
-    ports:
-    - "8000:8080"
-    restart: always
-    environment:
-      APPLICATIONNAME: BlueprintsProcessor
-      BUNDLEVERSION: 1.0.0
-      APP_CONFIG_HOME: /opt/app/onap/config
-      STICKYSELECTORKEY:
-      ENVCONTEXT: dev
-\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
index 527eb8a26..2bbe31b3c 100644
--- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -32,4 +32,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
-\ No newline at end of file
+blueprintprocessor.netconfExecutor.enabled=true
diff --git a/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
index ce5b4e39f..74c478a2a 100644
--- a/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -29,4 +29,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
-\ No newline at end of file
+blueprintprocessor.netconfExecutor.enabled=true
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
index 527eb8a26..2bbe31b3c 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -32,4 +32,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
-\ No newline at end of file
+blueprintprocessor.netconfExecutor.enabled=true
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
index f8193b7f9..6645a631a 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
@@ -123,12 +123,16 @@ open class DatabaseResourceAssignmentProcessor(private val bluePrintDBLibPropert
         checkNotEmpty(resourceAssignment.dictionaryName) {
             "resource assignment dictionary name is not defined for template key (${resourceAssignment.name})"
         }
-        check(resourceAssignment.dictionarySource in arrayOf(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, ResourceDictionaryConstants.SOURCE_PRIMARY_DB))
+        check(resourceAssignment.dictionarySource in getListOfDBSources())
         {
-            "resource assignment source is not ${ResourceDictionaryConstants.SOURCE_PROCESSOR_DB} but it is ${resourceAssignment.dictionarySource}"
+            "resource assignment source is not ${ResourceDictionaryConstants.PROCESSOR_DB} but it is ${resourceAssignment.dictionarySource}"
         }
     }
 
+    //placeholder to get the list of DB sources.
+    //TODO: This will be replaced with a DB
+    private fun getListOfDBSources(): Array<String> =  arrayOf(ResourceDictionaryConstants.PROCESSOR_DB)
+
     private fun populateNamedParameter(inputKeyMapping: Map<String, String>): Map<String, Any> {
         val namedParameters = HashMap<String, Any>()
         inputKeyMapping.forEach {
@@ -163,4 +167,4 @@ open class DatabaseResourceAssignmentProcessor(private val bluePrintDBLibPropert
     override suspend fun recoverNB(runtimeException: RuntimeException, resourceAssignment: ResourceAssignment) {
         raRuntimeService.getBluePrintError().addError(runtimeException.message!!)
     }
-}
-\ No newline at end of file
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
index 7e7e65635..9c6aae250 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
@@ -73,7 +73,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-name"
                 dictionaryName = "vnf_name"
-                dictionarySource = "primary-config-data"
+                dictionarySource = "config-data"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
@@ -106,7 +106,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-aai"
                 dictionaryName = "aai-get-resource"
-                dictionarySource = "primary-aai-data"
+                dictionarySource = "aai-data"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
@@ -139,7 +139,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-aai"
                 dictionaryName = "aai-put-resource"
-                dictionarySource = "primary-aai-data"
+                dictionarySource = "aai-data"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
@@ -150,4 +150,4 @@ class RestResourceResolutionProcessorTest {
             println(processorName)
         }
     }
-}
-\ No newline at end of file
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
index 5deea31e1..3218a585d 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -30,12 +30,12 @@ blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
 blueprints.processor.functions.python.executor.executionPath=./../../../../components/scripts/python/ccsdk_blueprints
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9911
-blueprintsprocessor.restclient.primary-config-data.username=sampleuser
-blueprintsprocessor.restclient.primary-config-data.password=sampletoken
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9911
+blueprintsprocessor.restclient.config-data.username=sampleuser
+blueprintsprocessor.restclient.config-data.password=sampletoken
 
-blueprintsprocessor.restclient.primary-aai-data.type=basic-auth
-blueprintsprocessor.restclient.primary-aai-data.url=http://127.0.0.1:30800
-blueprintsprocessor.restclient.primary-aai-data.username=admin
-blueprintsprocessor.restclient.primary-aai-data.password=aaiTest
-\ No newline at end of file
+blueprintsprocessor.restclient.aai-data.type=basic-auth
+blueprintsprocessor.restclient.aai-data.url=http://127.0.0.1:30800
+blueprintsprocessor.restclient.aai-data.username=admin
+blueprintsprocessor.restclient.aai-data.password=aaiTest
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/dt-location.json b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/dt-location.json
index 52e0a7967..256830ef9 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/dt-location.json
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/dt-location.json
@@ -1,15 +1,15 @@
-{
-	"version": "1.0.0",
-	"description": "test Data Type",
-	"properties": {
-		"country": {
-			"required": true,
-			"type": "string"
-		},
-		"state": {
-			"required": false,
-			"type": "string"
-		}
-	},
-	"derived_from": "tosca.datatypes.Root"
-}
+{
+	"version": "1.0.0",
+	"description": "test Data Type",
+	"properties": {
+		"country": {
+			"required": true,
+			"type": "string"
+		},
+		"state": {
+			"required": false,
+			"type": "string"
+		}
+	},
+	"derived_from": "tosca.datatypes.Root"
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-array.json b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-array.json
index 7082a4341..16788c3ba 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-array.json
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-array.json
@@ -1,35 +1,35 @@
-{
-	"locations": {
-		"name": "locations",
-		"data-type": "list",
-		"entry-schema": "dt-location",
-		"source": {
-			"primary-db": {
-				"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-				"input-key-mapping": {
-					"profile_name": "profile_name"
-				},
-				"output-key-mapping": {
-					"db-country": "country",
-					"db-state": "state"
-				}
-			}
-		},
-		"candidate-dependency": {
-			"primary-db": {
-				"names": [
-					"profile_name"
-				]
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"data-type": "string",
-		"source": {
-			"input": {
-				
-			}
-		}
-	}
-}
+{
+	"locations": {
+		"name": "locations",
+		"data-type": "list",
+		"entry-schema": "dt-location",
+		"source": {
+			"processor-db": {
+				"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+				"input-key-mapping": {
+					"profile_name": "profile_name"
+				},
+				"output-key-mapping": {
+					"db-country": "country",
+					"db-state": "state"
+				}
+			}
+		},
+		"candidate-dependency": {
+			"processor-db": {
+				"names": [
+					"profile_name"
+				]
+			}
+		}
+	},
+	"profile_name": {
+		"name": "profile_name",
+		"data-type": "string",
+		"source": {
+			"input": {
+				
+			}
+		}
+	}
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-complex.json b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-complex.json
index 53e2a11c3..bccf250f1 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-complex.json
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-complex.json
@@ -1,27 +1,27 @@
-{
-	"location": {
-		"name": "location",
-		"data-type": "dt-location",
-		"source": {
-			"primary-db": {
-				"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-				"input-key-mapping": {
-					"profile_name": "profile_name"
-				},
-				"output-key-mapping": {
-					"db-country": "country",
-					"db-state": "state"
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"data-type": "string",
-		"source": {
-			"input": {
-				
-			}
-		}
-	}
-}
+{
+	"location": {
+		"name": "location",
+		"data-type": "dt-location",
+		"source": {
+			"processor-db": {
+				"query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+				"input-key-mapping": {
+					"profile_name": "profile_name"
+				},
+				"output-key-mapping": {
+					"db-country": "country",
+					"db-state": "state"
+				}
+			}
+		}
+	},
+	"profile_name": {
+		"name": "profile_name",
+		"data-type": "string",
+		"source": {
+			"input": {
+				
+			}
+		}
+	}
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-simple.json b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-simple.json
index fad088877..843adc1fa 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-simple.json
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-simple.json
@@ -1,26 +1,26 @@
-{
-	"country": {
-		"name": "country",
-		"data-type": "string",
-		"source": {
-			"primary-db": {
-				"query": "SELECT country FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-				"input-key-mapping": {
-					"profile_name": "profile_name"
-				},
-				"output-key-mapping": {
-					"country": "country"
-				}
-			}
-		}
-	},
-	"profile_name": {
-		"name": "profile_name",
-		"data-type": "string",
-		"source": {
-			"input": {
-				
-			}
-		}
-	}
-}
+{
+	"country": {
+		"name": "country",
+		"data-type": "string",
+		"source": {
+			"processor-db": {
+				"query": "SELECT country FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+				"input-key-mapping": {
+					"profile_name": "profile_name"
+				},
+				"output-key-mapping": {
+					"country": "country"
+				}
+			}
+		}
+	},
+	"profile_name": {
+		"name": "profile_name",
+		"data-type": "string",
+		"source": {
+			"input": {
+				
+			}
+		}
+	}
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/resource-assignments-simple.json b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/resource-assignments-simple.json
index bb392d7be..9d7d44c9c 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/resource-assignments-simple.json
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/resource-assignments-simple.json
@@ -1,22 +1,22 @@
-[
-  {
-    "name": "country",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "country",
-    "dictionary-source": "primary-db",
-    "dependencies": ["state"]
-  },
-  {
-    "name": "state",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "state",
-    "dictionary-source": "input",
-    "dependencies": []
-  }
-]
+[
+  {
+    "name": "country",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "country",
+    "dictionary-source": "processor-db",
+    "dependencies": ["state"]
+  },
+  {
+    "name": "state",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "state",
+    "dictionary-source": "input",
+    "dependencies": []
+  }
+]
diff --git a/ms/blueprintsprocessor/functions/restconf-executor/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/restconf-executor/src/test/resources/application-test.properties
index 6d8b62ff9..60c6fef50 100644
--- a/ms/blueprintsprocessor/functions/restconf-executor/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/restconf-executor/src/test/resources/application-test.properties
@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibConfiguration.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibConfiguration.kt
index fd889bfbf..11abf7b2e 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibConfiguration.kt
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibConfiguration.kt
@@ -32,7 +32,7 @@ open class BluePrintDBLibConfiguration(private var bluePrintProperties: BluePrin
 
     @Bean("primary-database-properties")
     open fun getPrimaryProperties(): PrimaryDataSourceProperties {
-        return bluePrintProperties.propertyBeanType(DBLibConstants.PREFIX_DB_PRIMARY,
+        return bluePrintProperties.propertyBeanType(DBLibConstants.PREFIX_DB,
                 PrimaryDataSourceProperties::class.java)
     }
 }
@@ -49,11 +49,11 @@ fun BluePrintDependencyService.primaryDBLibGenericService(): BluePrintDBLibGener
 
 class DBLibConstants {
     companion object {
-        const val PREFIX_DB_PRIMARY: String = "blueprintsprocessor.db.primary"
+        const val PREFIX_DB: String = "blueprintsprocessor.db"
 
         //list of database
         const val MARIA_DB: String = "maria-db"
-        const val PRIMARY_DB: String = "primary-db"
+        const val PRIMARY_DB: String = "processor-db"
         const val MYSQL_DB: String = "mysql-db"
         const val ORACLE_DB: String = "oracle-db"
         const val POSTGRES_DB: String = "postgres-db"
@@ -64,4 +64,4 @@ class DBLibConstants {
         const val DRIVER_ORACLE_DB = "oracle.jdbc.driver.OracleDriver"
         const val DRIVER_POSTGRES_DB = "org.postgresql.Driver"
     }
-}
-\ No newline at end of file
+}
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt
index b71287d6e..b1ac5cee4 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt
@@ -49,4 +49,3 @@ open class MySqlDataSourceProperties: DBDataSourceProperties() {
     lateinit var hibernateDialect: String
     override var driverClassName = DBLibConstants.DRIVER_MYSQL_DB
 }
-
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties
index 9dda71eb2..90cf03517 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties
@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/resources/application-test.properties b/ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/resources/application-test.properties
index e02ed89f9..ebd394cc2 100644
--- a/ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/resources/application-test.properties
@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/test/resources/application-test.properties b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/test/resources/application-test.properties
index ebd5dc859..7d74687ab 100644
--- a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/test/resources/application-test.properties
@@ -1,7 +1,7 @@
 #
-# Copyright � 2017-2018 AT&T Intellectual Property.
+# Copyright � 2017-2018 AT&T Intellectual Property.
 #
-# Modifications Copyright � 2019 IBM, Bell Canada.
+# Modifications Copyright � 2019 IBM, Bell Canada.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/mock/Mock.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/mock/Mock.kt
index 29d4f48a5..27130a7bc 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/mock/Mock.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/mock/Mock.kt
@@ -54,10 +54,10 @@ open class MockResourceSource {
     @Bean(name = [
         "rr-processor-source-input",
         "rr-processor-source-default",
-        "rr-processor-source-processor-db",
+        "rr-processor-source-db",
         "rr-processor-source-rest"])
     open fun sourceInstance(): ResourceAssignmentProcessor {
         return mockk<ResourceAssignmentProcessor>()
     }
 
-}
-\ No newline at end of file
+}
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/application-test.properties b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/application-test.properties
index d532b1582..ab3bac88f 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/application-test.properties
@@ -15,14 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
diff --git a/ms/controllerblueprints/application/src/main/resources/application-dev.properties b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
index 09d10dc69..1ee8e3f54 100755
--- a/ms/controllerblueprints/application/src/main/resources/application-dev.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
@@ -49,11 +49,11 @@ spring.jpa.hibernate.ddl-auto=none
 spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
-controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy
-controllerblueprints.blueprintArchivePath=/etc/blueprints/archive
-controllerblueprints.blueprintWorkingPath=/etc/blueprints/work
+controllerblueprints.blueprintDeployPath=blueprints/deploy
+controllerblueprints.blueprintArchivePath=blueprints/archive
+controllerblueprints.blueprintWorkingPath=blueprints/work
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
@@ -67,4 +67,4 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../components/model-cat
 controllerblueprints.loadCbaExtension=zip
 
 # Web server config
-server.port=8080
-\ No newline at end of file
+server.port=8082
diff --git a/ms/controllerblueprints/application/src/main/resources/application.properties b/ms/controllerblueprints/application/src/main/resources/application.properties
index 4be06d81f..0ccec68bb 100755
--- a/ms/controllerblueprints/application/src/main/resources/application.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application.properties
@@ -52,7 +52,7 @@ spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy
@@ -72,4 +72,4 @@ controllerblueprints.loadResourceDictionaryPaths=/opt/app/onap//model-catalog/re
 controllerblueprints.loadCbaExtension=zip
 
 # Web server config
-server.port=8080
-\ No newline at end of file
+server.port=8080
diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 0e96343d5..0ccd1cf92 100755
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -33,7 +33,7 @@ swagger.contact.url=www.onap.com
 swagger.contact.email=brindasanth@onap.com
 
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
@@ -55,4 +55,4 @@ controllerblueprints.loadCbaExtension=zip
 controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
 
 # Web server config
-server.port=8080
-\ No newline at end of file
+server.port=8080
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt
index b368c01aa..99c80f8e6 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt
@@ -101,12 +101,12 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) {
 
     fun workflowStepFirstCallOperation(workFlowName: String, stepName: String): String {
         return workflowStepByName(workFlowName, stepName).activities?.filter { it.callOperation != null }?.single()?.callOperation
-                ?: throw BluePrintException("could't get first callOperation for WorkFlow($workFlowName) ")
+                ?: throw BluePrintException("couldn't get first callOperation for WorkFlow($workFlowName) ")
     }
 
     // DSL
     fun dslPropertiesByName(name: String): JsonNode = dslDefinitions()?.get(name)
-            ?: throw BluePrintException("could't get policy type for the dsl($name)")
+            ?: throw BluePrintException("couldn't get policy type for the dsl($name)")
 
     // Data Type
     fun dataTypeByName(name: String): DataType? = dataTypes()?.get(name)
@@ -269,4 +269,4 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) {
         return BluePrintChainedService(this).nodeTypeChainedProperties(nodeTypeName)
     }
 
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
index 73dff9379..23b0a1758 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
@@ -243,7 +243,8 @@ class JacksonUtils {
                 BluePrintConstants.DATA_TYPE_FLOAT,
                 BluePrintConstants.DATA_TYPE_DOUBLE,
                 BluePrintConstants.DATA_TYPE_TIMESTAMP,
-                BluePrintConstants.DATA_TYPE_STRING ->
+                BluePrintConstants.DATA_TYPE_STRING,
+                BluePrintConstants.DATA_TYPE_NULL ->
                     objectNode.set(key, value)
                 else -> throw BluePrintException("populatePrimitiveValues expected only primitive values! Received: ($value)")
             }
@@ -256,7 +257,9 @@ class JacksonUtils {
                 BluePrintConstants.DATA_TYPE_FLOAT,
                 BluePrintConstants.DATA_TYPE_DOUBLE,
                 BluePrintConstants.DATA_TYPE_TIMESTAMP,
-                BluePrintConstants.DATA_TYPE_STRING -> arrayNode.add(value)
+                BluePrintConstants.DATA_TYPE_STRING,
+                BluePrintConstants.DATA_TYPE_NULL ->
+                    arrayNode.add(value)
                 else -> throw BluePrintException("populatePrimitiveValues expected only primitive values! Received: ($value)")
             }
         }
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
index 0e1f84278..e8394a085 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
@@ -51,7 +51,7 @@
 				"default": {
 					"type": "any"
 				},
-				"primary-aai-data": {
+				"aai-data": {
 					"type": "object",
 					"properties": {
 						"verb": {
@@ -92,7 +92,7 @@
 						}
 					}
 				},
-				"primary-config-data": {
+				"config-data": {
 					"type": "object",
 					"properties": {
 						"path": {
@@ -142,7 +142,7 @@
 						}
 					}
 				},
-				"primary-db": {
+				"processor-db": {
 					"type": "object",
 					"properties": {
 						"query": {
@@ -215,7 +215,7 @@
 						}
 					}
 				},
-				"primary-aai-data": {
+				"aai-data": {
 					"type": "object",
 					"properties": {
 						"names": {
@@ -226,7 +226,7 @@
 						}
 					}
 				},
-				"primary-config-data": {
+				"config-data": {
 					"type": "object",
 					"properties": {
 						"names": {
@@ -248,7 +248,7 @@
 						}
 					}
 				},
-				"primary-db": {
+				"processor-db": {
 					"type": "object",
 					"properties": {
 						"names": {
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
index 67661ecd0..1600dfa01 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -31,4 +31,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
index 9b20c1dc5..51c45961b 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
index 97d591bef..f2450becb 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
index 87448eb20..15648adc2 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = private",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
deleted file mode 100644
index 0fd436bfb..000000000
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "primary-db-source",
-  "property" :{
-    "description": "name of the ",
-    "type": "string"
-  },
-  "updated-by": "brindasanth@onap.com",
-  "tags": "bundle-id, brindasanth@onap.com",
-  "sources": {
-    "primary-db": {
-      "type": "source-processor-db",
-      "properties": {
-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-        "input-key-mapping": {
-          "profile_name": "profile_name"
-        },
-        "output-key-mapping": {
-          "db-country": "country",
-          "db-state": "state"
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
index 5776b1b06..38e4ae1c6 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = private",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/processor-db-source.json
index adba4ce3a..c946165bf 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/processor-db-source.json
@@ -8,7 +8,7 @@
   "tags": "bundle-id, brindasanth@onap.com",
   "sources": {
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
         "input-key-mapping": {
@@ -21,4 +21,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
index d291715a8..1ddad0920 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = protected",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
index bea7f25fb..badc9484d 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = protected",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
index b4bf22e02..2e135679a 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = unprotected",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
index 362f627d4..acb379b52 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = unprotected",
@@ -18,4 +18,4 @@
 	  }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
index 038921835..95b78aff6 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
index c06e307e2..6aa6db114 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
index e332d3bf1..df00ba2db 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
index 52359a41d..1bf36ef39 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
index b87473c73..bf14f74b7 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
index 59f51516d..f1d85fedc 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
index 6dda72f7c..de2d81b4b 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_1"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
index b0d2a01da..d67ab1a25 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
index bcfea9f24..991c45fd9 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -26,7 +26,7 @@
         ]
       }
     },
-    "primary-aai-data": {
+    "aai-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -45,4 +45,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
index c90f5b8a7..ae7413e0c 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -25,4 +25,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
index 44a5c99a7..022face08 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
index 267dea39b..02c487cc9 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
index 9bef3c791..bb8b7da2e 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vpg_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
index 52a4542c5..4dd09557a 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vsn_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
index f83bdaece..25b161e47 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
@@ -24,11 +24,7 @@ package org.onap.ccsdk.cds.controllerblueprints.resource.dict
 object ResourceDictionaryConstants {
     const val SOURCE_INPUT = "input"
     const val SOURCE_DEFAULT = "default"
-    //const val SOURCE_PRIMARY_CONFIG_DATA = "rest"
-    const val SOURCE_PROCESSOR_DB = "processor-db"
-    const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
-    const val SOURCE_PRIMARY_DB = "primary-db"
-    const val SOURCE_PRIMARY_AAI_DATA = "primary-aai-data"
+    const val PROCESSOR_DB = "processor-db"
 
     const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
 
@@ -38,4 +34,4 @@ object ResourceDictionaryConstants {
     const val PROPERTY_KEY_DEPENDENCIES = "key-dependencies"
 
     const val PATH_RESOURCE_DEFINITION_TYPE = "resources_definition_types"
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
index b8185c46a..26a3a2871 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -46,9 +46,9 @@ public class ResourceDefinitionTest {
     @Test
     public void testDictionaryDefinitionDBSource(){
 
-        String fileName = basePath + "/primary-db-source.json";
+        String fileName = basePath + "/processor-db-source.json";
         ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for processor-db type", resourceDefinition);
     }
 
     @Test
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
index 8c4173182..cb7ff88a3 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -25,15 +25,14 @@ public class ResourceSourceMappingFactoryTest {
     @Test
     public void testRegisterResourceMapping() {
 
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-processor-db");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-processor-db");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-db");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-aai-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("config-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("aai-data", "source-rest");
 
-        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
-        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("processor-db");
+        Assert.notNull(nodeTypeName, "Failed to get processor-db mapping");
 
         ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
         Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
index 93c42445f..ce479d6df 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -60,9 +60,9 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());
 
         // To Check Assigned Source
-        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB);
+        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.PROCESSOR_DB);
         ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
-        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, resourceAssignment.getDictionarySource());
+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.PROCESSOR_DB, resourceAssignment.getDictionarySource());
 
     }
 
@@ -79,7 +79,7 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);
 
         // TO check the multiple Source
-        sources.put(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, new NodeTemplate());
+        sources.put(ResourceDictionaryConstants.PROCESSOR_DB, new NodeTemplate());
         String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);
 
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
index 57394173b..fa82f839b 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -22,11 +22,10 @@ object ResourceDictionaryTestUtils {
 
     @JvmStatic
     fun setUpResourceSourceMapping() {
-        ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-processor-db")
-        ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-processor-db")
+        ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-db")
         ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
         ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
-        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")
-        ResourceSourceMappingFactory.registerSourceMapping("primary-aai-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("config-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("aai-data", "source-rest")
     }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
index 3bfa4167d..fb2637e1f 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -102,7 +102,7 @@
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac",
       "managed-ip1"
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
index 473920d6d..9bef60d2d 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -102,7 +102,7 @@
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac"
     ]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
index f8fe623fd..8a212abe4 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -102,7 +102,7 @@
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac"
     ]
diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ControllerBlueprintExceptionHandler.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ControllerBlueprintExceptionHandler.kt
index 5b92369f8..4537dbb9d 100644
--- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ControllerBlueprintExceptionHandler.kt
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ControllerBlueprintExceptionHandler.kt
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler
 @RestControllerAdvice("org.onap.ccsdk.cds.controllerblueprints")
 open class ControllerBlueprintExceptionHandler {
 
-    companion object ControllerBlueprintExeptionHandler {
+    companion object ControllerBlueprintExceptionHandler {
         val LOG = LoggerFactory.getLogger(ControllerBlueprintExceptionHandler::class.java)
     }
 
@@ -55,4 +55,3 @@ open class ControllerBlueprintExceptionHandler {
         return ResponseEntity(errorMessage, HttpStatus.resolve(errorCode!!.httpCode))
     }
 }
-
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt
index b35a86b37..3f52d9183 100644
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt
@@ -46,7 +46,7 @@ class ResourceDictionaryReactRepositoryTest {
     @Test
     @Commit
     fun test01Save() {
-        val resourceDefinition = JacksonUtils.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json", ResourceDefinition::class.java)
+        val resourceDefinition = JacksonUtils.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json", ResourceDefinition::class.java)
         Assert.assertNotNull("Failed to get resourceDefinition from content", resourceDefinition)
         resourceDefinition!!.name = sourceName
 
@@ -91,4 +91,4 @@ class ResourceDictionaryReactRepositoryTest {
         resourceDictionary.definition = resourceDefinition
         return resourceDictionary
     }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
index 2b16fc05e..5ddc8a60f 100755
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
@@ -20,7 +20,7 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate.SQL=warn
 logging.level.org.hibernate.type.descriptor.sql=debug
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
 controllerblueprints.blueprintArchivePath=./target/blueprints/archive
@@ -38,4 +38,4 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-
 controllerblueprints.loadCbaExtension=zip
 
 # CBA examples for tests cases
-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
-\ No newline at end of file
+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
index 3ed188b9a..31f729da8 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
@@ -7,7 +7,7 @@
       "required": true
     },
     "dictionary-name": "sample-db-source",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "input-source"
     ]
@@ -56,7 +56,7 @@
       "required": true
     },
     "dictionary-name": "sample-mdsal-source",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": []
   }
 ]
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
index 2e48b6d8b..c9351237d 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
@@ -225,7 +225,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "sample-db-source",
-                  "dictionary-source": "primary-db",
+                  "dictionary-source": "processor-db",
                   "dependencies": [
                     "hostname"
                   ],
@@ -243,7 +243,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "sample-mdsal-source",
-                  "dictionary-source": "primary-config-data",
+                  "dictionary-source": "config-data",
                   "dependencies": [
                     "service-instance-id"
                   ],
@@ -314,7 +314,7 @@
                   },
                   "input-param": false,
                   "dictionary-name": "sample-licenses",
-                  "dictionary-source": "primary-config-data",
+                  "dictionary-source": "config-data",
                   "dependencies": [
                     "service-instance-id"
                   ],
@@ -348,4 +348,4 @@
   },
   "data_types": {
   }
-}
-\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
index 6937c719b..b0a6e0979 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
@@ -227,7 +227,7 @@
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-db-source",
-                "dictionary-source" : "primary-db",
+                "dictionary-source" : "processor-db",
                 "dependencies" : [ "hostname" ],
                 "version" : 0
               }, {
@@ -242,7 +242,7 @@
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-mdsal-source",
-                "dictionary-source" : "primary-config-data",
+                "dictionary-source" : "config-data",
                 "dependencies" : [ "service-instance-id" ],
                 "version" : 0
               }, {
@@ -304,7 +304,7 @@
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-licenses",
-                "dictionary-source" : "primary-config-data",
+                "dictionary-source" : "config-data",
                 "dependencies" : [ "service-instance-id" ],
                 "version" : 0
               }, {
@@ -324,4 +324,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
author	Oleg Mitsura <oleg.mitsura@amdocs.com>	2019-08-15 16:41:17 -0400
committer	Oleg Mitsura <oleg.mitsura@amdocs.com>	2019-08-27 12:35:23 -0400
commit	54426584a02e6fbfec5f7685c92e1a3fde62309f (patch)
tree	d5af6cfb361d2f1d782c109b7f141a4720fcf25b
parent	68676761d63eefc4dccc96dd2df6853cb8e10c42 (diff)