diff --git a/.jenkins.sh b/.jenkins.sh
index 3193dce78a4f8e22765fb624a5f507078b631f1d..2292aca1aee0aae15922015646a649b6e8bf94f9 100644
--- a/.jenkins.sh
+++ b/.jenkins.sh
@@ -6,7 +6,7 @@
 # https://forge.etsi.org/etsi-software-license
 
 YANG_MODULES="yang/yang/*"
-OUTPUT="etsi-nfv.html"
+OUTPUT="etsi-nfv-descriptors.html"
 IMG_NAME="sol006"
 VERSION=latest
 IMG="$IMG_NAME:$VERSION"
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 24ed9984cd8cf209a27a0d888a0079bd90f034e0..fd415c094507b72a243761bc1a88b84310348968 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -1,4 +1,4 @@
-<nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">
+<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">
   <vnfd>
     <id>ASA</id>
     <provider>My Company</provider>
diff --git a/run-test.sh b/run-test.sh
index 36bc6ec0a2dcc6e991c125f4ff3fd8cfc96a66ae..13601993ccb8ed386d62cb8b72f374ed9848fce7 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -10,7 +10,7 @@ cd src
 echo "Testing compilation"
 CONFD_OPTS="--fail-on-warnings"
 CONFD_OPTS=""
-confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang
+confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-descriptors.yang
 
 echo "Starting ConfD"
 confd
diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 9fc55dc5f8e46a1bb09090214721d753836aacb8..f2edb411352c4006d8c6854a4605242ad142ad76 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-common {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
   description
diff --git a/src/yang/etsi-nfv.yang b/src/yang/etsi-nfv-descriptors.yang
similarity index 86%
rename from src/yang/etsi-nfv.yang
rename to src/yang/etsi-nfv-descriptors.yang
index 96d0db1afe03b81d01fd56e05d7021246ca3dcea..d6421299979a409fc26e768e82e031d1ff957132 100644
--- a/src/yang/etsi-nfv.yang
+++ b/src/yang/etsi-nfv-descriptors.yang
@@ -1,6 +1,6 @@
-module etsi-nfv {
+module etsi-nfv-descriptors {
   yang-version 1.1;
-  namespace "urn:etsi:params:xml:ns:yang:etsi-nfv";
+  namespace "urn:etsi:nfv:yang:etsi-nfv-descriptors";
   prefix nfv;
 
   include etsi-nfv-common;
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 8e77ebe3d285743d5e53d618b767459b5f627e34..ee44935947fb49f8aa802c6011360aee2a062ce1 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-ns {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 
diff --git a/src/yang/etsi-nfv-pnf.yang b/src/yang/etsi-nfv-pnf.yang
index c7a8ff01e49c21d2606581d34a19eb87e01b7e34..e4fb7d30d39d5d3664105cd610b1f8fbc4f02db2 100644
--- a/src/yang/etsi-nfv-pnf.yang
+++ b/src/yang/etsi-nfv-pnf.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-pnf {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }
 
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index ab3319ef1ea808427ec581f1d54ee9408bc97c9f..db7b36093de719e307d507461c7ff13859b895aa 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -1,6 +1,6 @@
 submodule etsi-nfv-vnf {
   yang-version 1.1;
-  belongs-to etsi-nfv {
+  belongs-to etsi-nfv-descriptors {
     prefix nfv;
   }