Index: extensions/dict_dcca_3gpp/dict_dcca_3gpp.c
===================================================================
--- extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	(revision 1484)
+++ extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	(revision 1485)
@@ -1408,4 +1408,6 @@
 	/*==================================================================*/
 	/* 3GPP TS 29.140 Table 6.3.1: Diameter MM10 Application AVPs       */
+	/*                                                                  */
+	/* Note: AVPs referenced from other sources are not added here.     */
 	/*==================================================================*/
 
@@ -1423,6 +1425,4 @@
 	};
 
-	/* Note: Uses 3GPP TS 29.329 MSISDN (701).                          */
-
 	/* VASP-ID, UTF8String, code 1101, section 6.3.3                    */
 	{
@@ -1467,6 +1467,4 @@
 	};
 
-	/* Note: Uses 3GPP TS 29.061 3GPP-IMSI (1).                         */
-
 	/* Sender-Address, UTF8String, code 1104, section 6.3.7             */
 	{
@@ -1509,4 +1507,5 @@
 
 	/* Note: Name conflict with 3GPP TS 32.329 Sequence-Number (716).   */
+	/* Sequence-Number (1107) renamed to Sequence-Number-29.140 (1107). */
 	/* Sequence-Number-29.140, Unsigned32, code 1107, section 6.3.10    */
 	{
@@ -1523,4 +1522,5 @@
 
 	/* Note: Name conflict with 3GPP TS 32.299 Recipient-Address (1201). */
+	/* Recipient-Address (1108) renamed to Recipient-Address-29.140 (1108). */
 	/* Recipient-Address-29.140, UTF8String, code 1108, section 6.3.11  */
 	{
Index: extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
===================================================================
--- extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	(revision 1484)
+++ extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	(revision 1485)
@@ -135,20 +135,20 @@
 #=,,,,,,,,
 # 3GPP TS 29.140 Table 6.3.1: Diameter MM10 Application AVPs,,,,,,,,
+# ,,,,,,,,
+# Note: AVPs referenced from other sources are not added here.,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
 Served-User-Identity,1100,6.3.1,Grouped,"M,V",,,,N
-# Note: Uses 3GPP TS 29.329 MSISDN (701).,701,6.3.2,OctetString,"M,V",,,,N
-#,,,,,,,,
 VASP-ID,1101,6.3.3,UTF8String,"M,V",,,,N
 VAS-ID,1102,6.3.4,UTF8String,"M,V",,,,N
 Trigger-Event,1103,6.3.5,Enumerated,"M,V",,,,N
-# Note: Uses 3GPP TS 29.061 3GPP-IMSI (1).,1,6.3.6,UTF8String,"M,V",,,,N
-#,,,,,,,,
 Sender-Address,1104,6.3.7,UTF8String,"M,V",,,,N
 Initial-Recipient-Address,1105,6.3.8,Grouped,"M,V",,,,N
 Result-Recipient-Address,1106,6.3.9,Grouped,"M,V",,,,N
 # Note: Name conflict with 3GPP TS 32.329 Sequence-Number (716).,,,,,,,,
+# Sequence-Number (1107) renamed to Sequence-Number-29.140 (1107).,,,,,,,,
 Sequence-Number-29.140,1107,6.3.10,Unsigned32,"M,V",,,,N
 # Note: Name conflict with 3GPP TS 32.299 Recipient-Address (1201).,,,,,,,,
+# Recipient-Address (1108) renamed to Recipient-Address-29.140 (1108).,,,,,,,,
 Recipient-Address-29.140,1108,6.3.11,UTF8String,"M,V",,,,N
 Routeing-Address,1109,6.3.12,UTF8String,"M,V",,,,N
@@ -160,4 +160,5 @@
 Billing-Information,1115,6.3.18,UTF8String,"M,V",,,,N
 # Note: Name conflict with 3GPP TS 32.299 Status (2702).,,,,,,,,
+# Status (1116) renamed to Status-29.140 (1116).,,,,,,,,
 Status-29.140,1116,6.3.19,Grouped,"M,V",,,,N
 Status-Code,1117,6.3.20,UTF8String,"M,V",,,,N
@@ -284,5 +285,5 @@
 PCC-Rule-Status,1019,5.3.19,Enumerated,"M,V",P,,,Y
 # Note: 3GPP TS 29.212 table 5.3.0.1 row PDN-Connection-ID (1065),,,,,,,,
-"# missing M.",,,,,,,,
+# missing M.,,,,,,,,
 PDN-Connection-ID,1065,5.3.58,OctetString,V,P,,,Y
 PRA-Install,2845,5.3.130,Grouped,V,P,,M,
@@ -298,5 +299,5 @@
 Priority-Level,1046,5.3.45,Unsigned32,V,P,,M,Y
 # Note: 3GPP TS 29.212 table 5.3.0.1 row PS-to-CS-Session-Continuity (1099),,,,,,,,
-"# missing M.",,,,,,,,
+# missing M.,,,,,,,,
 PS-to-CS-Session-Continuity,1099,5.3.84,Enumerated,V,P,,,Y
 QoS-Class-Identifier,1028,5.3.17,Enumerated,"M,V",P,,,Y
@@ -472,4 +473,6 @@
 #=,,,,,,,,
 # 3GPP TS 29.229 Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,,
+# ,,,,,,,,
+# Note: AVPs referenced from other sources are not added here.,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
@@ -512,9 +515,4 @@
 SIP-Digest-Authenticate,635,6.3.36,Grouped,V,,,M,No
 Wildcarded-IMPU,636,6.3.43,UTF8String,V,,,M,N
-# Note: Uses RFC 4590 Digest-Realm (104).,104,6.3.37,UTF8String,M,,,V,No
-# Note: Uses RFC 4590 Digest-Algorithm (111).,111,6.3.39,UTF8String,M,,,V,No
-# Note: Uses RFC 4590 Digest-QoP (110).,110,6.3.40,UTF8String,M,,,V,No
-# Note: Uses RFC 4590 Digest-HA1 (121).,121,6.3.41,UTF8String,M,,,V,No
-#,,,,,,,,
 UAR-Flags,637,6.3.44,Unsigned32,V,,,M,No
 Loose-Route-Indication,638,6.3.45,Enumerated,V,,,M,No
@@ -534,7 +532,4 @@
 Priviledged-Sender-Indication,652,6.3.58,Enumerated,V,,,M,No
 LIA-Flags,653,6.3.59,Unsigned32,V,,,M,No
-# Note: Uses RFC 7683 OC-Supported-Features (621).,621,6.3.60,Grouped,,,,"M, V",No
-# Note: Uses RFC 7683 OC-OLR (623).,623,6.3.61,Grouped,,,,"M, V",No
-#,,,,,,,,
 Initial-CSeq-Sequence-Number,654,6.3.62,Unsigned32,V,,,M,No
 SAR-Flags,655,6.3.63,Unsigned32,V,,,M,No
@@ -542,7 +537,4 @@
 WebRTC-Authentication-Function-Name,657,6.3.65,UTF8String,V,,,M,No
 WebRTC-Web-Server-Function-Name,658,6.3.66,UTF8String,V,,,M,No
-# Note: Uses RFC 7944 DRMP (301).,301,6.3.67,Enumerated,,,,"M, V",No
-# Note: Uses RFC 8583 Load (650).,,6.3.68,Grouped,,,,"M, V",No
-#,,,,,,,,
 RTR-Flags,659,6.3.69,Unsigned32,V,,,M,No
 ,,,,,,,,
@@ -632,5 +624,5 @@
 # Note: 3GPP TS 29.272 V12.5.0 (2014-06) table 7.3.1/1,,,,,,,,
 # changed row SS-Status (1477) to be OctetString instead of Grouped.,,,,,,,,
-# Clause 7.3.88 already described SS-Status as OctetString.,,,,,,,,
+# Clause 7.3.88 already described SS-Status (1147) as OctetString.,,,,,,,,
 SS-Status,1477,7.3.88,OctetString,"M,V",,,,N
 Notification-To-UE-User,1478,7.3.89,Enumerated,"M,V",,,,N
@@ -778,4 +770,6 @@
 #=,,,,,,,,
 # 3GPP TS 29.329 Table 6.3.1: Table 6.3.1: Diameter Multimedia Application AVPs,,,,,,,,
+# ,,,,,,,,
+# Note: AVPs referenced from other sources are not added here.,,,,,,,,
 #=,,,,,,,,
 #,,,,,,,,
@@ -783,4 +777,5 @@
 MSISDN,701,6.3.2,OctetString,"M, V",,,,No
 # Note: Name conflict with 3GPP TS 29.229 User-Data (606).,,,,,,,,
+# User-Data (702) renamed to User-Data-29.329 (702).,,,,,,,,
 User-Data-29.329,702,6.3.3,OctetString,"M, V",,,,No
 Data-Reference,703,6.3.4,Enumerated,"M, V",,,,No
@@ -792,16 +787,5 @@
 Expiry-Time,709,6.3.16,Time,V,,,M,No
 Send-Data-Indication,710,6.3.17,Enumerated,V,,,M,No
-# Note: Uses 3GPP TS 29.229 Server-Name (602).,602,6.3.9,UTF8String,"M, V",,,,No
-# Note: Uses 3GPP TS 29.229 Supported-Features (628).,628,6.3.11,Grouped,V,M,,,No
-# Note: Uses 3GPP TS 29.229 Feature-List-ID (629).,629,6.3.12,Unsigned32,V,,,M,No
-# Note: Uses 3GPP TS 29.229 Feature-List (630).,630,6.3.13,Unsigned32,V,,,M,No
-# Note: Uses 3GPP TS 29.229 Supported-Applications (631).,631,6.3.14,Grouped,V,,,M,No
-# Note: Uses 3GPP TS 29.229 Public-Identity (601).,601,6.3.15,UTF8String,"M, V",,,,No
-#,,,,,,,,
 DSAI-Tag,711,6.3.18,OctetString,"M, V",,,,No
-# Note: Uses 3GPP TS 29.229 Wildcarded-Public-Identity (634).,634,6.3.19,UTF8String,V,,,M,No
-# Note: Uses 3GPP TS 29.229 Wildcarded-IMPU (636).,636,6.3.20,UTF8String,V,,,M,No
-# Note: Uses 3GPP TS 29.229 Session-Priority (650).,650,6.3.21,Enumerated,V,,,M,No
-#,,,,,,,,
 One-Time-Notification,712,6.3.22,Enumerated,V,,,M,No
 Requested-Nodes,713,6.3.7A,Unsigned32,V,,,M,No
@@ -844,4 +828,5 @@
 3GPP-OC-Request-Type,1322,,Enumerated,V,,,M
 # Note: Name conflict with 3GPP TS 29.212 3GPP-PS-Data-Off-Status (2847).,,,,,,,,
+# 3GPP-PS-Data-Off-Status (4406) renamed to 3GPP-PS-Data-Off-Status-32.299 (4406).,,,,,,,,
 3GPP-PS-Data-Off-Status-32.299,4406,,Enumerated,"V,M",,,
 Access-Network-Info-Change,4401,,Grouped,"V,M",,,
