diff --git a/README.md b/README.md
index 62723da891592490d4bcfe807a63688f248f6232..d3369636aee83061c55de6729532e36299c0331f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ config twamp_reflector 'reflector_1'
         option max_ttl '1'
 ```
 
-Detailed UCI parameter description available in [RAW format](https://dev.iopsys.eu/iopsys/twamp-light/-/tree/devel/schemas/uci/twamp.json) or [UCI documentation](./docs/api/uci/twamp.md)
+Detailed UCI parameter description available in [RAW format](./schemas/uci/twamp.json) or [UCI documentation](./docs/api/uci/twamp.md)
 
 ## Dependencies
 
@@ -28,5 +28,5 @@ To successfully build `twampd`, the following libraries are needed:
 | libuci      | https://git.openwrt.org/project/uci.git     | LGPL 2.1       |
 | libubox     | https://git.openwrt.org/project/libubox.git | BSD            |
 | libubus     | https://git.openwrt.org/project/ubus.git    | LGPL 2.1       |
-| libbbfdm    | https://dev.iopsys.eu/iopsys/bbf.git        | LGPL 2.1       |
+| libbbfdm    | https://dev.iopsys.eu/bbf/bbfdm.git           | BSD-3       |
 
diff --git a/docs/.pages b/docs/.pages
index f94c3c726251b8d48e629c52d044b2bee226f68a..c46f2d33f8b3e4819cc33e9a81d8516826a98f17 100644
--- a/docs/.pages
+++ b/docs/.pages
@@ -1,6 +1,7 @@
-title: "TWAMP Light documentation"
+title: "TWAMP"
 
 nav:
+    - "arch"
     - "api"
     - "guide"
     - "spec"
diff --git a/docs/api/.pages b/docs/api/.pages
index 16a2104179e72919789bc0f770dd3fedadd49045..402526e28bc12967de0b0b98951a761f83e6329e 100644
--- a/docs/api/.pages
+++ b/docs/api/.pages
@@ -1,4 +1,4 @@
-title: "TWAMP Light API"
+title: "TWAMP"
 
 nav:
     - "uci"
diff --git a/docs/api/ubus/.pages b/docs/api/ubus/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..998083fa4bb8d34c48d43bf35f28a11314f6d520 100644
--- a/docs/api/ubus/.pages
+++ b/docs/api/ubus/.pages
@@ -1 +1,2 @@
+title: "TWAMP"
 hide: true
diff --git a/docs/api/uci/.pages b/docs/api/uci/.pages
index 94ce3df159a6b0c75f02c29259e3c33dff229300..5b94e459b09f2e96373478abdd441fb0b6ebcf7b 100644
--- a/docs/api/uci/.pages
+++ b/docs/api/uci/.pages
@@ -1,4 +1,4 @@
-title: "TWAMP UCI"
+title: "TWAMP"
 
 nav:
     - "..."
diff --git a/docs/arch/.pages b/docs/arch/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..998083fa4bb8d34c48d43bf35f28a11314f6d520 100644
--- a/docs/arch/.pages
+++ b/docs/arch/.pages
@@ -1 +1,2 @@
+title: "TWAMP"
 hide: true
diff --git a/docs/guide/.pages b/docs/guide/.pages
index e2d5ae91273a09583d8cd5c10d92a22ab5b0f6c5..998083fa4bb8d34c48d43bf35f28a11314f6d520 100644
--- a/docs/guide/.pages
+++ b/docs/guide/.pages
@@ -1 +1,2 @@
+title: "TWAMP"
 hide: true
diff --git a/docs/spec/.pages b/docs/spec/.pages
index 72f1e91ff29b3b26493141cb4fd8d27b78a8be35..5b94e459b09f2e96373478abdd441fb0b6ebcf7b 100644
--- a/docs/spec/.pages
+++ b/docs/spec/.pages
@@ -1,4 +1,4 @@
-title: "TWAMP Light"
+title: "TWAMP"
 
 nav:
     - "..."
diff --git a/mkdocs.yml b/mkdocs.yml
index a15f2b1ad9b5928c2818104c634d30b163fea576..6c5f3e7945f4a4783252d667c7a9d956c42b6224 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: TR-x69
+site_name: TR-x69 TWAMP
 site_url: https://dev.iopsys.eu/bbf/twamp-light
 edit_uri: "https://dev.iopsys.eu/bbf/twamp-light"