diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index cf8048d9ed6ecdf8099420b9fb2e393ad4a0151e..e1eaac635bcc9c3bc42f513da8ff7695446b0452 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -240,7 +240,7 @@
       </lcm-operations-configuration>
       <affinity-or-anti-affinity-group>
         <id>control-plane</id>
-        <type>anti-affinity</type>
+        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
         <scope>nfvi-node</scope>
       </affinity-or-anti-affinity-group>
     </df>
@@ -328,7 +328,7 @@
       </lcm-operations-configuration>
       <affinity-or-anti-affinity-group>
         <id>control-plane</id>
-        <type>anti-affinity</type>
+        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
         <scope>nfvi-node</scope>
       </affinity-or-anti-affinity-group>
     </df>
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 67100d91d55eba5004920232f2940f699a129fc1..f5ab8034c563c3748144f600683f032361d99369 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -1158,12 +1158,15 @@ submodule etsi-nfv-ns {
              information element";
         }
 
-        leaf type {
+        leaf affinityorAntiaffinity {
           mandatory true;
           type affinity-type;
           description
             "Specifies the type of relationship that the members of
-             the group have: 'affinity' or 'anti-affinity.'";
+             the group have.
+             Values:
+                • AFFINITY
+                • ANTI-AFFINITY";
           reference
             "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
              information element";
@@ -1174,8 +1177,12 @@ submodule etsi-nfv-ns {
           type affinity-scope;
           description
             "Specifies the scope of the affinity or anti-affinity
-             relationship e.g. a NFVI node, an NFVI PoP,
-             network-link-and-node etc.";
+             relationship.
+             Values:
+                • NFVI_NODE
+                • NFVI_POP
+                • NETWORK_LINK_AND_NODE
+                • etc.";
           reference
             "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
              information element";
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 6b5f2dc9374bf377237e2b22f39e3dabf34693f4..05ca161ce83dfb0fdc67192f45902442c683eca0 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -2535,12 +2535,15 @@ submodule etsi-nfv-vnf {
              AffinityOrAntiAffinityGroup information element";
         }
 
-        leaf type {
+        leaf affinityorAntiaffinity {
           mandatory true;
           type affinity-type;
           description
             "Specifies the type of relationship that the members of
-             the group have: 'affinity' or 'anti-affinity'.";
+             the group have.
+             Values:
+                • AFFINITY
+                • ANTI-AFFINITY";
           reference
             "GS NFV IFA011: Section 7.1.8.12
              AffinityOrAntiAffinityGroup information element";
@@ -2551,8 +2554,13 @@ submodule etsi-nfv-vnf {
           type affinity-scope;
           description
             "Specifies the scope of the affinity or anti-affinity
-             relationship. Possible values are 'NFVI-PoP', 'Zone',
-             'ZoneGroup', 'NFVI-node' and 'network-link-and-node'.";
+             relationship.
+             Values:
+                • NFVI-PoP
+                • Zone
+                • ZoneGroup
+                • NFVI-node
+                • network-link-and-node";
           reference
             "GS NFV IFA011: Section 7.1.8.12
              AffinityOrAntiAffinityGroup information element";