Adding 'name' to yamls and json in model

Issue-ID: POLICY-2052
Signed-off-by: aditya.puthuparambil <aditya.puthuparambil@est.tech>
Change-Id: I3629a2b6f9e93f6d8166e63862d15dd0198865af

53 files changed, 97 insertions, 6 deletions

diff --git a/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml b/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
index bb9022512..42287c2bc 100644
--- a/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/sdnc.policy.naming.input.tosca.yaml
@@ -5,6 +5,7 @@ topology_template:
             type: onap.policies.Naming
             version: 1.0.0
             type_version: 1.0.0
+            name: SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP
             properties:
                 policy-instance-name: ONAP_NF_NAMING_TIMESTAMP
                 naming-models:
diff --git a/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json b/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json
index f7acf1eef..8302ddff4 100644
--- a/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json
+++ b/models-examples/src/main/resources/policies/usecases.native.artifact.policy.input.tosca.json
@@ -3,7 +3,7 @@
     "topology_template": {
         "policies": [
             {
-                "usecases": {
+                "usecases.artifacts": {
                     "type": "onap.policies.native.drools.Artifact",
                     "type_version": "1.0.0",
                     "name": "usecases.artifacts",
diff --git a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json
index 406d12e13..19afd8cf2 100644
--- a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.json
@@ -7,6 +7,7 @@
                     "type": "onap.policies.optimization.resource.AffinityPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Affinity_Default",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.Affinity_Default",
                         "policy-version": 1
@@ -30,6 +31,7 @@
                     "type": "onap.policies.optimization.resource.AffinityPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Affinity_Default_US",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.Affinity_Default_US",
                         "policy-version": 1
@@ -55,6 +57,7 @@
                     "type": "onap.policies.optimization.resource.AffinityPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Affinity_Default_vCPE_US_0",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.Affinity_Default_vCPE_US_0",
                         "policy-version": 1
@@ -82,8 +85,9 @@
                     "type": "onap.policies.optimization.resource.AffinityPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Affinity_vCPE_US_Gold_1",
                     "metadata": {
-                        "policy-id": "OSDF_CASABLANCA.Affinity_vCPE_1",
+                        "policy-id": "OSDF_CASABLANCA.Affinity_vCPE_US_Gold_1",
                         "policy-version": 1
                     },
                     "properties": {
@@ -115,8 +119,9 @@
                     "type": "onap.policies.optimization.resource.AffinityPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Affinity_vCPE_US_Platinum_1",
                     "metadata": {
-                        "policy-id": "OSDF_CASABLANCA.Affinity_vCPE_1",
+                        "policy-id": "OSDF_CASABLANCA.Affinity_vCPE_US_Platinum_1",
                         "policy-version": 1
                     },
                     "properties": {
@@ -148,6 +153,7 @@
                     "type": "onap.policies.optimization.resource.Vim_fit",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Capacity_vG_1",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.Capacity_vG_1",
                         "policy-version": 1
@@ -178,6 +184,7 @@
                     "type": "onap.policies.optimization.resource.Vim_fit",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Capacity_vG_2",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.Capacity_vG_2",
                         "policy-version": 1
@@ -208,6 +215,7 @@
                     "type": "onap.policies.optimization.resource.DistancePolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.Distance_vG_1",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.Distance_vG_1",
                         "policy-version": 1
@@ -244,6 +252,7 @@
                     "type": "onap.policies.optimization.resource.HpaPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.hpa_policy_Default",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.hpa_policy_Default",
                         "policy-version": 1
@@ -321,6 +330,7 @@
                     "type": "onap.policies.optimization.resource.HpaPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.hpa_policy_vG_1",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.hpa_policy_vG_1",
                         "policy-version": 1
@@ -403,6 +413,7 @@
                     "type": "onap.policies.optimization.service.QueryPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.queryPolicy_vCPE",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.queryPolicy_vCPE",
                         "policy-version": 1
@@ -452,6 +463,7 @@
                     "type": "onap.policies.optimization.service.SubscriberPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.SubscriberPolicy_v1",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.SubscriberPolicy_v1",
                         "policy-version": 1
@@ -482,6 +494,7 @@
                     "type": "onap.policies.optimization.service.SubscriberPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.SubscriberPolicy_v2",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.SubscriberPolicy_v2",
                         "policy-version": 1
@@ -512,6 +525,7 @@
                     "type": "onap.policies.optimization.resource.VnfPolicy",
                     "version": "1.0.0",
                     "type_version": "1.0.0",
+                    "name": "OSDF_CASABLANCA.vnfPolicy_vG",
                     "metadata": {
                         "policy-id": "OSDF_CASABLANCA.vnfPolicy_vG",
                         "policy-version": 1
diff --git a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml
index d4969eb44..5e079159b 100644
--- a/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policies.optimization.input.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
             type: onap.policies.optimization.resource.AffinityPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Affinity_Default
             metadata:
                 policy-id: OSDF_CASABLANCA.Affinity_Default
                 policy-version: 1
@@ -24,6 +25,7 @@ topology_template:
             type: onap.policies.optimization.resource.AffinityPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Affinity_Default_US
             metadata:
                 policy-id: OSDF_CASABLANCA.Affinity_Default_US
                 policy-version: 1
@@ -42,6 +44,7 @@ topology_template:
             type: onap.policies.optimization.resource.AffinityPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Affinity_Default_vCPE_US_0
             metadata:
                 policy-id: OSDF_CASABLANCA.Affinity_Default_vCPE_US_0
                 policy-version: 1
@@ -60,6 +63,7 @@ topology_template:
             type: onap.policies.optimization.resource.AffinityPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Affinity_vCPE_US_Gold_1
             metadata:
                 policy-id: OSDF_CASABLANCA.Affinity_vCPE_1
                 policy-version: 1
@@ -78,6 +82,7 @@ topology_template:
             type: onap.policies.optimization.resource.AffinityPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Affinity_vCPE_US_Platinum_1
             metadata:
                 policy-id: OSDF_CASABLANCA.Affinity_vCPE_1
                 policy-version: 1
@@ -96,6 +101,7 @@ topology_template:
             type: onap.policies.optimization.resource.Vim_fit
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Capacity_vG_1
             metadata:
                 policy-id: OSDF_CASABLANCA.Capacity_vG_1
                 policy-version: 1
@@ -114,6 +120,7 @@ topology_template:
             type: onap.policies.optimization.resource.Vim_fit
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Capacity_vG_2
             metadata:
                 policy-id: OSDF_CASABLANCA.Capacity_vG_2
                 policy-version: 1
@@ -132,6 +139,7 @@ topology_template:
             type: onap.policies.optimization.resource.DistancePolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.Distance_vG_1
             metadata:
                 policy-id: OSDF_CASABLANCA.Distance_vG_1
                 policy-version: 1
@@ -153,6 +161,7 @@ topology_template:
             type: onap.policies.optimization.resource.HpaPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.hpa_policy_Default
             metadata:
                 policy-id: OSDF_CASABLANCA.hpa_policy_Default
                 policy-version: 1
@@ -201,6 +210,7 @@ topology_template:
             type: onap.policies.optimization.resource.HpaPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.hpa_policy_vG_1
             metadata:
                 policy-id: OSDF_CASABLANCA.hpa_policy_vG_1
                 policy-version: 1
@@ -249,6 +259,7 @@ topology_template:
             type: onap.policies.optimization.service.QueryPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.queryPolicy_vCPE
             metadata:
                 policy-id: OSDF_CASABLANCA.queryPolicy_vCPE
                 policy-version: 1
@@ -283,6 +294,7 @@ topology_template:
             type: onap.policies.optimization.service.SubscriberPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.SubscriberPolicy_v1
             metadata:
                 policy-id: OSDF_CASABLANCA.SubscriberPolicy_v1
                 policy-version: 1
@@ -299,6 +311,7 @@ topology_template:
             type: onap.policies.optimization.service.SubscriberPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.SubscriberPolicy_v2
             metadata:
                 policy-id: OSDF_CASABLANCA.SubscriberPolicy_v2
                 policy-version: 1
@@ -315,6 +328,7 @@ topology_template:
             type: onap.policies.optimization.resource.VnfPolicy
             version: 1.0.0
             type_version: 1.0.0
+            name: OSDF_CASABLANCA.vnfPolicy_vG
             metadata:
                 policy-id: OSDF_CASABLANCA.vnfPolicy_vG
                 policy-version: 1
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
index 5690a7b20..d8bd4d42f 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
@@ -7,8 +7,10 @@
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
                     "type_version": "1.0.0",
                     "version": "1.0.0",
+                    "name": "onap.restart.tca",
                     "metadata": {
-                        "policy-id": "onap.restart.tca"
+                        "policy-id": "onap.restart.tca",
+                        "policy-version": 1
                     },
                     "properties": {
                         "tca_policy" : {
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
index 44533e5fd..51fcd3221 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
@@ -6,8 +6,10 @@ topology_template:
            type: onap.policies.monitoring.cdap.tca.hi.lo.app
            type_version: 1.0.0
            version: 1.0.0
+           name: onap.restart.tca
            metadata:
              policy-id: onap.restart.tca
+             policy-version: 1
            properties:
              tca_policy:
                 domain: measurementsForVfScaling
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
index 4928bbe80..51fcd3221 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
            type: onap.policies.monitoring.cdap.tca.hi.lo.app
            type_version: 1.0.0
            version: 1.0.0
+           name: onap.restart.tca
            metadata:
              policy-id: onap.restart.tca
              policy-version: 1
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
index 06cd617a0..d5bae5f66 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
@@ -7,8 +7,10 @@
           "type": "onap.policies.controlloop.operational.common.Drools",
           "type_version": "1.0.0",
           "version": "1.0.0",
+          "name": "operational.restart",
           "metadata": {
-            "policy-id": "operational.restart"
+            "policy-id": "operational.restart",
+            "policy-version": 1
           },
           "properties": {
             "id": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
index 020daa9ec..700ef6c74 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml
@@ -5,8 +5,10 @@ topology_template:
             type: onap.policies.controlloop.operational.common.Drools
             type_version: 1.0.0
             version: 1.0.0
+            name: operational.restart
             metadata:
                 policy-id: operational.restart
+                policy-version: 1
             properties:
                 id: ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e
                 timeout: 3600
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
index c57103eb5..d03b126ae 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json
@@ -6,6 +6,7 @@
                 "operational.restart": {
                     "type": "onap.policies.controlloop.Operational",
                     "version": "1.0.0",
+                    "name": "operational.restart",
                     "metadata": {
                         "policy-id": "operational.restart",
                         "policy-version": 1
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml
index 1d8927d25..b48f49281 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
          type: onap.policies.controlloop.Operational
          type_version: 1.0.0
          version: 1.0.0
+         name: operational.restart
          metadata:
            policy-id: operational.restart
            policy-version: 1
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml
index 7cc6bc5a9..16ed72b3c 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml
@@ -5,6 +5,7 @@ topology_template:
             type: onap.policies.controlloop.guard.common.Blacklist
             type_version: 1.0.0
             version: 1.0.0
+            name: guard.blacklist.scaleout
             metadata:
                 policy-id: guard.blacklist.scaleout
             properties:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml
index 964e1811c..6926a6836 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequencylimiter.input.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
         type: onap.policies.controlloop.guard.common.FrequencyLimiter
         type_version: 1.0.0
         version: 1.0.0
+        name: guard.frequency.scaleout
         metadata:
           policy-id : guard.frequency.scaleout
         properties:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
index 4c3afb745..f8bd155c2 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
@@ -5,6 +5,7 @@ topology_template:
             type: onap.policies.controlloop.guard.common.MinMax
             type_version: 1.0.0
             version: 1.0.0
+            name: guard.minmax.scaleout
             metadata:
                 policy-id: guard.minmax.scaleout
             properties:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
index eba46b006..f17f32f0d 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
@@ -10,6 +10,7 @@
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
                     "type_version": "1.0.0",
                     "version": "1.0.0",
+                    "name": "onap.scaleout.tca",
                     "metadata":
                     {
                         "policy-id": "onap.scaleout.tca"
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
index c47c0f301..d2a28f627 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
             type: onap.policies.monitoring.cdap.tca.hi.lo.app
             type_version: 1.0.0
             version: 1.0.0
+            name: onap.scaleout.tca
             metadata:
                policy-id: onap.scaleout.tca
             properties:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
index d2f07ce57..ce37151f4 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
             type: onap.policies.monitoring.cdap.tca.hi.lo.app
             type_version: 1.0.0
             version: 1.0.0
+            name: onap.scaleout.tca
             metadata:
                policy-id: onap.scaleout.tca
                policy-version: 1
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
index 5860fe26a..b2cf26cb9 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.json
@@ -7,6 +7,7 @@
                     "type": "onap.policies.controlloop.operational.common.Drools",
                     "type_version": "1.0.0",
                     "version": "1.0.0",
+                    "name": "operational.scaleout",
                     "metadata": {
                         "policy-id": "operational.scaleout"
                     },
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
index abe6b2193..b1b8ca5b4 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml
@@ -5,6 +5,7 @@ topology_template:
             type: onap.policies.controlloop.operational.common.Drools
             type_version: 1.0.0
             version: 1.0.0
+            name: operational.scaleout
             metadata:
                 policy-id: operational.scaleout
             properties:
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
index 5c9bbfd57..66ce2706e 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json
@@ -6,6 +6,7 @@
                 "operational.scaleout": {
                     "type": "onap.policies.controlloop.operational.common.Drools",
                     "type_version": "1.0.0",
+                    "name": "operational.scaleout",
                     "metadata": {
                         "policy-id": "operational.scaleout"
                     },
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
index 1fe2132df..33adaec29 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml
@@ -5,6 +5,7 @@ topology_template:
              type: onap.policies.controlloop.operational.common.Drools
              type_version: 1.0.0
              version: 1.0.0
+             name: operational.scaleout
              metadata:
                 policy-id: operational.scaleout
              properties:
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
index b4f8ee039..ffb5c25fb 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
@@ -10,6 +10,7 @@
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
                     "type_version": "1.0.0",
                     "version": "1.0.0",
+                    "name": "onap.vfirewall.tca",
                     "metadata":
                     {
                         "policy-id": "onap.vfirewall.tca"
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
index 1468d75ee..7831380f3 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
         type: onap.policies.monitoring.cdap.tca.hi.lo.app
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.vfirewall.tca
         metadata:
            policy-id: onap.vfirewall.tca
         properties:
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
index 496e3147d..c52ddac9d 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
@@ -6,6 +6,7 @@ topology_template:
         type: onap.policy.monitoring.cdap.tca.hi.lo.app
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.vfirewall.tca
         metadata:
            policy-id: onap.vfirewall.tca
            policy-version: 1
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
index 2b41b7dce..d21c763b5 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json
@@ -7,6 +7,7 @@
                     "type": "onap.policies.controlloop.operational.common.Drools",
                     "type_version": "1.0.0",
                     "version": "1.0.0",
+                    "name": "operational.modifyconfig",
                     "metadata": {
                         "policy-id": "operational.modifyconfig"
                     },
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
index e96e86a4b..67caf9471 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml
@@ -5,6 +5,7 @@ topology_template:
             type: onap.policies.controlloop.operational.common.Drools
             type_version: 1.0.0
             version: 1.0.0
+            name: operational.modifyconfig
             metadata:
                 policy-id: operational.modifyconfig
             properties:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.Naming.yaml b/models-examples/src/main/resources/policytypes/onap.policies.Naming.yaml
index 748e0c052..a44435111 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.Naming.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.Naming.yaml
@@ -3,6 +3,7 @@ policy_types:
     onap.policies.Naming:
         derived_from: tosca.policies.Root
         version: 1.0.0
+        name: onap.policies.Naming
         description: Virtual policy node for naming
         properties:
             policy-instance-name:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.Optimization.yaml b/models-examples/src/main/resources/policytypes/onap.policies.Optimization.yaml
index 9d91685e3..55b206164 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.Optimization.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.Optimization.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.Optimization:
       derived_from: tosca.policies.Root
       version: 1.0.0
+      name: onap.policies.Optimization
       description: The base policy type for all policies that govern optimization
       properties:
          scope:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.Operational.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.Operational.yaml
index 391abb4d9..f47934de5 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.Operational.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.Operational.yaml
@@ -3,4 +3,5 @@ policy_types:
    onap.policies.controlloop.Operational:
       derived_from: tosca.policies.Root
       version: 1.0.0
+      name: onap.policies.controlloop.Operational
       description: Operational Policy for Control Loops Supporting Legacy YAML Policy Definition.
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.Common.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.Common.yaml
index b26287939..fe4b81719 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.Common.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.Common.yaml
@@ -3,6 +3,7 @@ policy_types:
     onap.policies.controlloop.guard.Common:
         derived_from: tosca.policies.Root
         version: 1.0.0
+        name: onap.policies.controlloop.guard.Common
         description: |
             This is the base Policy Type for Guard policies that guard the execution of Operational
             Policies.
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
index 0456f43cb..2c6e6e4ae 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
@@ -4,6 +4,7 @@ policy_types:
         derived_from: onap.policies.controlloop.guard.Common
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.policies.controlloop.guard.common.Blacklist
         description: Supports blacklist of entity id's from performing control loop actions on.
         properties:
             blacklist:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
index bda3e4cc5..dadef6f00 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
@@ -4,6 +4,7 @@ policy_types:
         derived_from: onap.policies.controlloop.guard.Common
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.policies.controlloop.guard.common.FrequencyLimiter
         description: Supports limiting the frequency of actions being taken by a Actor.
         properties:
             timeWindow:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
index fb376d432..5c76891f5 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
@@ -4,6 +4,7 @@ policy_types:
         derived_from: onap.policies.controlloop.guard.Common
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.policies.controlloop.guard.common.MinMax
         description: |
             Supports Min/Max number of entity for scaling operations. Although min and max fields are marked as not
             required, you need to have at least one or the other.
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml
index 936cc6535..ca2a402d1 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml
@@ -3,14 +3,17 @@ policy_types:
    onap.policies.controlloop.Guard:
       derived_from: tosca.policies.Root
       version: 1.0.0
+      name: onap.policies.controlloop.Guard
       description: Guard Policies for Control Loop Operational Policies
    onap.policies.controlloop.guard.Coordination:
       derived_from: onap.policies.controlloop.Guard
       version: 1.0.0
+      name: onap.policies.controlloop.guard.Coordination
       description: Guard Policies for Control Loop Coordination
    onap.policies.controlloop.guard.coordination.FirstBlocksSecond:
       derived_from: onap.policies.controlloop.guard.Coordination
       version: 1.0.0
+      name: onap.policies.controlloop.guard.coordination.FirstBlocksSecond
       description: Supports one Control Loop blocking another
       properties:
          controlLoop:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
index 2d7de069f..fe6f974bb 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
@@ -3,6 +3,7 @@ policy_types:
     onap.policies.controlloop.operational.Common:
         derived_from: tosca.policies.Root
         version: 1.0.0
+        name: onap.policies.controlloop.operational.Common
         description: |
             Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant
             Policy Types. This does NOT support the legacy Policy YAML policy type.
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml
index 5303f5639..54b69c2d8 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml
@@ -4,6 +4,7 @@ policy_types:
         derived_from: onap.policies.controlloop.operational.Common
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.policies.controlloop.operational.common.Apex
         description: Operational policies for Apex PDP
         properties:
             engineServiceParameters:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml
index acdecc29c..69d73db58 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Drools.yaml
@@ -4,6 +4,7 @@ policy_types:
         derived_from: onap.policies.controlloop.operational.Common
         type_version: 1.0.0
         version: 1.0.0
+        name: onap.policies.controlloop.operational.common.Drools
         description: Operational policies for Drools PDP
         properties:
             controllerName:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
index 3c17c9004..f614ca469 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
@@ -3,10 +3,12 @@ policy_types:
    onap.policies.Monitoring:
       derived_from: tosca.policies.Root
       version: 1.0.0
+      name: onap.policies.Monitoring
       description: a base policy type for all policies that govern monitoring provisioning
    onap.policies.monitoring.cdap.tca.hi.lo.app:
       derived_from: onap.policies.Monitoring
       version: 1.0.0
+      name: onap.policies.monitoring.cdap.tca.hi.lo.app
       properties:
          tca_policy:
             type: onap.datatypes.monitoring.tca_policy
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
index 98bba9eae..f5c181645 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml
@@ -4,9 +4,11 @@ policy_types:
       derived_from: tosca.policies.Root
       description: a base policy type for all policies that govern monitoring provisioning
       version: 1.0.0
+      name: onap.policies.Monitoring
    onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:
       derived_from: onap.policies.Monitoring
       version: 1.0.0
+      name: onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server
       properties:
          buscontroller_feed_publishing_endpoint:
             type: string
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
index 75533ed61..9a17eceea 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
@@ -4,10 +4,12 @@ policy_types:
         derived_from: tosca.policies.Root
         description: a base policy type for all native PDP policies
         version: 1.0.0
+        name: onap.policies.Native
     onap.policies.native.Apex:
         derived_from: onap.policies.Native
         description: a policy type for native apex policies
         version: 1.0.0
+        name: onap.policies.native.Apex
         properties:
             engine_service:
                 type: onap.datatypes.native.apex.EngineService
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
index 38b18cf32..382999f10 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
@@ -4,14 +4,17 @@ policy_types:
         derived_from: tosca.policies.Root
         description: a base policy type for all native PDP policies
         version: 1.0.0
+        name: onap.policies.Native
     onap.policies.native.Drools:
         derived_from: onap.policies.Native
         description: a base policy type for all native PDP policies
         version: 1.0.0
+        name: onap.policies.native.Drools
     onap.policies.native.drools.Controller:
         derived_from: onap.policies.native.Drools
         description: a policy type for a drools controller configuration
         version: 1.0.0
+        name: onap.policies.native.drools.Controller
         properties:
             controllerName:
                 type: string
@@ -39,6 +42,7 @@ policy_types:
         derived_from: onap.policies.native.Drools
         description: a policy type for native drools artifact policies
         version: 1.0.0
+        name: onap.policies.native.drools.Artifact
         properties:
             rulesArtifact:
                 type: onap.datatypes.native.rules_artifact
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Xacml.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Xacml.yaml
index 415735df3..4eefa4e43 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Xacml.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Xacml.yaml
@@ -4,10 +4,12 @@ policy_types:
         derived_from: tosca.policies.Root
         description: a base policy type for all native PDP policies
         version: 1.0.0
+        name: onap.policies.Native
     onap.policies.native.Xacml:
         derived_from: onap.policies.Native
         description: a policy type for native xacml policies
         version: 1.0.0
+        name: onap.policies.native.Xacml
         properties:
             policy:
                 type: string
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.Resource.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.Resource.yaml
index 3aaa6075c..f4879e3f6 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.Resource.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.Resource.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.Resource:
       derived_from: onap.policies.Optimization
       version: 1.0.0
+      name: onap.policies.optimization.Resource
       description: The base policy type for all policies that govern optimization for a Resource in a Service.
       properties:
          services:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.Service.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.Service.yaml
index 67f7dd6e2..69d86df69 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.Service.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.Service.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.Service:
       derived_from: onap.policies.Optimization
       version: 1.0.0
+      name: onap.policies.optimization.Service
       description: The base policy type for all policies that govern optimization for a Service.
       properties:
          services:
@@ -12,4 +13,4 @@ policy_types:
                matchable: true
             required: true
             entry_schema:
-               type: string               
\ No newline at end of file
+               type: string
\ No newline at end of file
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml
index 3fb8525f7..b01a145ce 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.AffinityPolicy:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.AffinityPolicy
       properties:
          applicableResources:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml
index 196ba9e31..d6773667b 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.DistancePolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.DistancePolicy:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.DistancePolicy
       properties:
          applicableResources:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml
index 0c8283380..d3ed97e00 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.HpaPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.HpaPolicy:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.HpaPolicy
       properties:
          flavorFeatures:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml
index fae050b46..1ef7480f1 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.OptimizationPolicy:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.OptimizationPolicy
       properties:
          objective:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml
index 021cff966..4e672df06 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.PciPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.PciPolicy:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.PciPolicy
       properties:
          pciProperties:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml
index 6ba2ae18c..6054cd470 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.Vim_fit.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.Vim_fit:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.Vim_fit
       properties:
          applicableResources:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml
index 1c7d3b666..4f4e40413 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.resource.VnfPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.resource.VnfPolicy:
       derived_from: onap.policies.optimization.Resource
       version: 1.0.0
+      name: onap.policies.optimization.resource.VnfPolicy
       properties:
          applicableResources:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml
index 2a615abad..97af745ac 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.QueryPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
    onap.policies.optimization.service.QueryPolicy:
       derived_from: onap.policies.optimization.Service
       version: 1.0.0
+      name: onap.policies.optimization.service.QueryPolicy
       properties:
          queryProperties:
             type: list
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml b/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml
index 60da74286..f128aca45 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml
@@ -3,6 +3,7 @@ policy_types:
     onap.policies.optimization.service.SubscriberPolicy:
         derived_from: onap.policies.optimization.Service
         version: 1.0.0
+        name: onap.policies.optimization.service.SubscriberPolicy
         properties:
             subscriberProperties:
                 type: policy.data.subscriberProperties_properties