diff --git a/docs/.pages b/docs/.pages
index 8ffe072a889c9a097b3424de4feb95a4400a8bb2..db0ac1bc19cf4c7f3e29b6041042b547573c7dae 100644
--- a/docs/.pages
+++ b/docs/.pages
@@ -1,4 +1,4 @@
-title: "STUN Client documentation"
+title: "STUNC"
 
 nav:
     - "api"
diff --git a/docs/api/.pages b/docs/api/.pages
index e96c0a6bbdb36f917defd7c73b89c97e862a8ce3..78b4dfaf0ac70a39ae38780c4779264e571966d2 100644
--- a/docs/api/.pages
+++ b/docs/api/.pages
@@ -1,4 +1,4 @@
-title: "STUN Client API"
+title: "STUNC"
 
 nav:
     - "ubus"
diff --git a/docs/api/ubus/.pages b/docs/api/ubus/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..08f02a8083ca55dc2d9b9979e801c8fba5d63570 100644
--- a/docs/api/ubus/.pages
+++ b/docs/api/ubus/.pages
@@ -1 +1,2 @@
+title: "STUNC"
 hide: true
diff --git a/docs/api/uci/.pages b/docs/api/uci/.pages
index 9370ea5e5a292ab3e0a5e83893622a88960e92da..3db2037593c00555530b9f97f64827f05f9fe92c 100644
--- a/docs/api/uci/.pages
+++ b/docs/api/uci/.pages
@@ -1,4 +1,4 @@
-title: "STUN Client UCI"
+title: "STUNC"
 
 nav:
     - "..."
diff --git a/docs/arch/.pages b/docs/arch/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..08f02a8083ca55dc2d9b9979e801c8fba5d63570 100644
--- a/docs/arch/.pages
+++ b/docs/arch/.pages
@@ -1 +1,2 @@
+title: "STUNC"
 hide: true
diff --git a/docs/guide/.pages b/docs/guide/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..08f02a8083ca55dc2d9b9979e801c8fba5d63570 100644
--- a/docs/guide/.pages
+++ b/docs/guide/.pages
@@ -1 +1,2 @@
+title: "STUNC"
 hide: true
diff --git a/docs/index.md b/docs/index.md
new file mode 120000
index 0000000000000000000000000000000000000000..32d46ee883b58d6a383eed06eb98f33aa6530ded
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/docs/spec/.pages b/docs/spec/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..08f02a8083ca55dc2d9b9979e801c8fba5d63570 100644
--- a/docs/spec/.pages
+++ b/docs/spec/.pages
@@ -1 +1,2 @@
+title: "STUNC"
 hide: true
diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh
index 08ca246ddb9483780c9610ec9bf52ac39960f3e2..a0bc2c37006d07967945ccec23a18d5d8e07608b 100755
--- a/gitlab-ci/install-dependencies.sh
+++ b/gitlab-ci/install-dependencies.sh
@@ -10,5 +10,5 @@ exec_cmd apt update
 exec_cmd apt install -y python3-pip
 exec_cmd pip3 install pexpect ubus
 
-# install bbfdm
-install_bbfdm
+# install cwmp client
+install_icwmp
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index c24c4eae67f145c95947b9c44355beda7ca97e97..4ecd966e4217c2c9c52352a7e9d9351859af2174 100644
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -51,17 +51,19 @@ function build_stunc()
 	exec_cmd ln -s ${PWD}/src/stunc /usr/sbin/stunc
 }
 
-function install_bbfdm()
+function install_icwmp()
 {
-	[ -d "/opt/dev/bbfdm" ] && rm -rf /opt/dev/bbfdm
+	[ -d "/opt/dev/icwmp" ] && rm -rf /opt/dev/icwmp
 
-	if [ -n "${BBFDM_BRANCH}" ]; then
-		exec_cmd git clone -b ${BBFDM_BRANCH} https://dev.iopsys.eu/bbf/bbfdm.git /opt/dev/bbfdm
+	if [ -n "${CWMP_BRANCH}" ]; then
+		exec_cmd git clone -b ${CWMP_BRANCH} https://dev.iopsys.eu/bbf/icwmp.git /opt/dev/icwmp
 	else
-		exec_cmd git clone https://dev.iopsys.eu/bbf/bbfdm.git /opt/dev/bbfdm
+		exec_cmd git clone https://dev.iopsys.eu/bbf/icwmp.git /opt/dev/icwmp
 	fi
 
-	cd /opt/dev/bbfdm
-	./gitlab-ci/install-dependencies.sh install
-	./gitlab-ci/setup.sh install
+	cd /opt/dev/icwmp
+	./gitlab-ci/install-dependencies.sh
+	./gitlab-ci/setup.sh
+	. ./gitlab-ci/shared.sh
+	build_icwmp
 }
diff --git a/mkdocs.yml b/mkdocs.yml
index 8b06ce8a8993128cebde6391506068dd9204acf8..7f01584fd79ef6651e1be070a6d31fb784508124 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: TR-x69
+site_name: TR-x69 STUNC
 site_url: https://docs.iopsys.eu/bbf/stunc/
 edit_uri: "https://dev.iopsys.eu/bbf/stunc"
 
diff --git a/src/datamodel.c b/src/datamodel.c
index dc18d4b932c2f6f02f4552d7208f913aa6f3b7cc..7fc5d7e79f0ed3c853b2ab039f21ead233959b8a 100644
--- a/src/datamodel.c
+++ b/src/datamodel.c
@@ -9,8 +9,8 @@
  *
  */
 
-#include <libbbf_api.h>
-#include <libbbf_api/dmuci.h>
+#include <libbbfdm_api.h>
+#include <libbbfdm-api/dmuci.h>
 
 /*
  * STUN parameters