diff --git a/doc/manuals/gb/ns.adoc b/doc/manuals/gb/ns.adoc
index c94e018..1dc2ed8 100644
--- a/doc/manuals/gb/ns.adoc
+++ b/doc/manuals/gb/ns.adoc
@@ -3,18 +3,18 @@
 === List of Messages
 
 The following tables list the NS messages used by OsmoPCU, grouped by their
-level of compliance with 3GPP TS 08.16.
+level of compliance with 3GPP TS 48.016.
 
-==== Messages Compliant With 3GPP TS 08.16
+==== Messages Compliant With 3GPP TS 48.016
 
 The NS protocol is implemented inside libosmocore so none of the messages below are sent by OsmoPCU explicitly.
 Instead corresponding functions from libosmocore are called which send and receive messages as necessary. See <<ns_init>> for details
 on establishing NS connection.
 
-.Messages compliant with 3GPP TS 08.16
+.Messages compliant with 3GPP TS 48.016
 [options="header",cols="10%,10%,20%,35%,5%,20%"]
 |===
-| TS 08.16 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoPCU
+| TS 48.016 § | type code (hex) | This document § | Message | <-/-> | Received/Sent by OsmoPCU
 | 9.2.10 | 0x00 | <<ns_unit_data>> | NS-UNITDATA | <-/-> | Received/Sent
 | 9.2.5 | 0x02 | <<ns_reset>> | NS-RESET | <-/-> | Received/Sent
 | 9.2.6 | 0x03 | <<ns_reset_ack>> | NS-RESET-ACK | <-/-> | Received/Sent
@@ -33,7 +33,7 @@
 
 ==== Messages Not Implemented by OsmoPCU
 
-All the NS protocol messages from 3GPP TS 08.16 are implemented in OsmoPCU.
+All the NS protocol messages from 3GPP TS 48.016 are implemented in OsmoPCU.
 
 === Details on Compliant NS Messages
 
@@ -51,13 +51,13 @@
 ==== NS-RESET
 
 This message is send by OsmoPCU in order to initiate reset procedure
-described in 3GPP TS 08.16 § 7.3. The expected reply is NS-RESET-ACK
+described in 3GPP TS 48.016 § 7.3. The expected reply is NS-RESET-ACK
 (<<ns_reset_ack>>) message. If no expected reply is received in 3
 seconds than the sending is retried up to 3 times.  When this message
 is received it is replied with NS-RESET-ACK (<<ns_reset_ack>>).
-It might be ignored under conditions described in 3GPP TS 08.16 § 7.3.1.
+It might be ignored under conditions described in 3GPP TS 48.016 § 7.3.1.
 
-The message conforms to 3GPP TS 08.16 § 9.2.5 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.5 specification.
 
 It contains Cause (<<ie_cause>>), NSVCI (<<ie_nsvci>>) and NSEI (<<ie_nsei>>) IEs.
 
@@ -67,7 +67,7 @@
 This message is sent as a response to proper NS-RESET (<<ns_reset>>)
 message initiating reset procedure.
 
-The message conforms to 3GPP TS 08.16 § 9.2.6 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.6 specification.
 
 It contains NSVCI (<<ie_nsvci>>) and NSEI (<<ie_nsei>>) IEs.
 
@@ -79,9 +79,9 @@
 When this message is sent by OsmoPCU corresponding NS-BLOCK-ACK
 (<<ns_block_ack>>) reply is expected before NS-VC is actually marked
 as blocked.  This behavior follows the blocking procedure described in
-3GPP TS 08.16 § 7.2.
+3GPP TS 48.016 § 7.2.
 
-The message conforms to 3GPP TS 08.16 § 9.2.3 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.3 specification.
 
 It contains Cause (<<ie_cause>>) and NSVCI (<<ie_nsvci>>) IEs.
 
@@ -92,7 +92,7 @@
 correct NS-BLOCK (<<ns_block>>) message.  It is expected as a reply
 for NS-BLOCK (<<ns_block>>) message sent by OsmoPCU.
 
-The message conforms to 3GPP TS 08.16 § 9.2.4 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.4 specification.
 
 It contains NSVCI (<<ie_nsvci>>) IE.
 
@@ -104,9 +104,9 @@
 this message is sent by OsmoPCU corresponding NS-UNBLOCK-ACK
 (<<ns_unblock_ack>>) reply is expected before NS-VC is actually marked
 as unblocked.  This behavior follows the blocking procedure described
-in 3GPP TS 08.16 § 7.2.
+in 3GPP TS 48.016 § 7.2.
 
-The message conforms to 3GPP TS 08.16 § 9.2.8 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.8 specification.
 
 [[ns_unblock_ack]]
 ==== NS-UNBLOCK-ACK
@@ -115,7 +115,7 @@
 is confirmed and thus NS-VC is marked as unblocked.  This message is
 also sent as a reply to NS-UNBLOCK (<<ns_unblock>>) message.
 
-The message conforms to 3GPP TS 08.16 § 9.2.9 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.9 specification.
 
 [[ns_status]]
 ==== NS-STATUS
@@ -123,10 +123,10 @@
 This message is sent to inform other party about error conditions as a
 response to various unexpected PDUs or PDUs with unexpected/missing
 data. If this message is received for unknown NS-VC it is ignored in
-accordance with 3GPP TS 08.16 § 7.5.1, otherwise the error cause is
+accordance with 3GPP TS 48.016 § 7.5.1, otherwise the error cause is
 logged if present in NS-STATUS.
 
-The message conforms to 3GPP TS 08.16 § 9.2.7 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.7 specification.
 
 It contains Cause (<<ie_cause>>) and might (depending on actual error)
 contain NSVCI (<<ie_nsvci>>), NS PDU (<<ie_nspdu>>) and BVCI
@@ -136,13 +136,13 @@
 ==== NS-ALIVE
 
 This message is sent periodically to test connectivity according to
-3GPP TS 08.16 § 4.5.3. The expected response is NS-ALIVE-ACK
+3GPP TS 48.016 § 4.5.3. The expected response is NS-ALIVE-ACK
 (<<ns_alive_ack>>). If no such response arrives within given amount of
 time (3 seconds) than another NS-ALIVE message is sent and failed test
 attempt is recorded.  After 10 failed attempts NS connection is
 considered dead and OsmoPCU tries to reconnect.
 
-The message conforms to 3GPP TS 08.16 § 9.2.1 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.1 specification.
 
 [[ns_alive_ack]]
 ==== NS-ALIVE-ACK
@@ -150,21 +150,21 @@
 This message is sent automatically in reply to NS-ALIVE (<<ns_alive>>)
 message.
 
-The message conforms to 3GPP TS 08.16 § 9.2.2 specification.
+The message conforms to 3GPP TS 48.016 § 9.2.2 specification.
 
 === Information Elements Overview
 
 All of the IEs handled by OsmoPCU are listed below, with limitations and
-additions to 3GPP TS 08.16 specified in more detail.
+additions to 3GPP TS 48.016 specified in more detail.
 
-==== IEs Conforming to 3GPP TS 08.16
+==== IEs Conforming to 3GPP TS 48.016
 
 The following Information Elements are accepted by OsmoPCU.
 
-.IEs conforming to 3GPP TS 08.16
+.IEs conforming to 3GPP TS 48.016
 [options="header",cols="5%,10%,40%,5%,40%"]
 |===
-| tag (hex) | TS 08.16 § | IE name | <-/-> | Received/Sent by OsmoPCU
+| tag (hex) | TS 48.016 § | IE name | <-/-> | Received/Sent by OsmoPCU
 | 0x00 | 10.3.2 | Cause | <-/-> | Received/Sent
 | 0x01 | 10.3.5 | NSVCI | <-/-> | Received/Sent
 | 0x02 | 10.3.3 | NS PDU | <-/-> | Received/Sent
@@ -172,9 +172,9 @@
 | 0x04 | 10.3.6 | NSEI | <-/-> | Received/Sent
 |===
 
-==== IEs Not Conforming to 3GPP TS 08.16
+==== IEs Not Conforming to 3GPP TS 48.016
 
-All IEs defined in 3GPP TS 08.16 § 10.3 are supported by OsmoPCU.
+All IEs defined in 3GPP TS 48.016 § 10.3 are supported by OsmoPCU.
 
 ==== Additional Attributes and Parameters
 
@@ -185,18 +185,18 @@
 [[ie_cause]]
 ==== Cause
 
-This IE contains reason for a procedure or error as described in 3GPP TS 08.16 § 10.3.2.
+This IE contains reason for a procedure or error as described in 3GPP TS 48.016 § 10.3.2.
 
 [[ie_nsvci]]
 ==== NSVCI
 
-This IE represents NSVCI identity described in <<ident>> and 3GPP TS 08.16 § 10.3.5.
+This IE represents NSVCI identity described in <<ident>> and 3GPP TS 48.016 § 10.3.5.
 
 [[ie_nspdu]]
 ==== NS PDU
 
 This IE contains PDU (possibly truncated) which cause error described
-in NS-STATUS message (<<ns_status>>) as described in 3GPP TS 08.16 §
+in NS-STATUS message (<<ns_status>>) as described in 3GPP TS 48.016 §
 10.3.3.
 
 [[ie_nssdu]]
@@ -207,13 +207,13 @@
 [[ie_bvci]]
 ==== BVCI
 
-This IE represents BSSGP identity described in <<ident>> and 3GPP TS 08.16
+This IE represents BSSGP identity described in <<ident>> and 3GPP TS 48.016
 § 10.3.1.
 
 [[ie_nsei]]
 ==== NSEI
 
-This IE represents NSEI identity described in <<ident>> and 3GPP TS 08.16 §
+This IE represents NSEI identity described in <<ident>> and 3GPP TS 48.016 §
 10.3.6.
 
 [[ns_init]]