diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 52b887f7a8a2db41753b91b7f66dc971d96cf56a..3406dbeb748f4d06cc53bc7a41c006d15ae96134 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -1105,7 +1105,7 @@ submodule etsi-nfv-ns {
              information element";
         }
 
-        leaf affinity-type {
+        leaf type {
           mandatory true;
           type affinity-type;
           description
@@ -1116,7 +1116,7 @@ submodule etsi-nfv-ns {
              information element";
         }
 
-        leaf affinity-scope {
+        leaf scope {
           mandatory true;
           type affinity-scope;
           description