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 a956b2b51ebb5f5c36cab9095f918b8eefc8bded..b29a39616e3bb354bf3665b70a47a164fc929499 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 2f6a69a9329b3a886411cb0e17c6bf6d1763cf20..7916efae463a8b9fff4386b4abcd85ea5c13983c 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 3b8aef3cfb092781b9b22457fcc037d98c1fd7ec..0d50f7e1969999a6b227abf4bf19df9627c16e42 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 ae7ef81fd3c4659ed7555fcc33202a7355113396..48499039c3757431b4ed89d5a83bccc246d73d3e 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 28e81604b242e555174edc0c35932dbccc565928..dcc618e68cc7a64cedc8dc15a56c39f2c3f24fbe 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;
   }