Make the rest of the Diameter AVP names unique.

In most cases this means prepending the application- or vendor-name to force
uniqueness.  A few vendors have duplicates within their namespace--append the
AVP code to these.

Also fix a few other invalid names (with spaces or parentheses in the names).

Change-Id: I5bb78d31526122dd5782055638af410cc497e49d
Reviewed-on: https://code.wireshark.org/review/15960
Reviewed-by: Anders Broman <a.broman58@gmail.com>

8 files changed, 101 insertions, 105 deletions

diff --git a/diameter/Cisco.xml b/diameter/Cisco.xml
index 317086ec23..d556c0f094 100644
--- a/diameter/Cisco.xml
+++ b/diameter/Cisco.xml
@@ -2,7 +2,7 @@
 
 <vendor vendor-id="Cisco" code="5771" name="Cisco">
 
-	<avp name="Flow-Description" code="507" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must">
+	<avp name="Cisco-Flow-Description-507" code="507" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must">
 		<type type-name="IPFilterRule"/>
 	</avp>
 
@@ -79,9 +79,9 @@
 			<gavp name="Dual-Billing-Basis"/>
 			<gavp name="Service-Reporting-Level"/>
 			<gavp name="Service-CDR-Threshold"/>
-			<gavp name="Service Activation"/>
+			<gavp name="Service-Activation"/>
 			<gavp name="Advice-Of-Charge"/>
-			<gavp name="Service-Class"/>
+			<gavp name="Cisco-Service-Class"/>
 			<gavp name="Service-Idle-Time"/>
 			<gavp name="Owner-Id"/>
 			<gavp name="Owner-Name"/>
@@ -95,7 +95,7 @@
 			<gavp name="Meter-Include-Imap"/>
 			<gavp name="Metering-Granularity"/>
 			<gavp name="Verify"/>
-			<gavp name="Quota-Consumption-Time"/>
+			<gavp name="Cisco-Quota-Consumption-Time"/>
 			<gavp name="Service-Rating-Group"/>
 			<gavp name="Cisco-QoS-Profile-Uplink"/>
 			<gavp name="Cisco-QoS-Profile-Downlink"/>
@@ -236,7 +236,7 @@
 	<avp name="Advice-Of-Charge" code="131097" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<grouped>
 			<gavp name="Append-URL"/>
-			<gavp name="Confirm-Token"/>
+			<gavp name="Confirm-Token-131099"/>
 		</grouped>
 	</avp>
 
@@ -246,12 +246,12 @@
 		<enum name="ENABLE_APPEND_URL" code="1"/>
 	</avp>
 
-	<avp name="Confirm-Token" code="131099" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+	<avp name="Confirm-Token-131099" code="131099" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<type type-name="OctetString"/>
 
 	</avp>
 
-	<avp name="Service-Class" code="131100" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+	<avp name="Cisco-Service-Class" code="131100" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
 
@@ -335,11 +335,11 @@
 
 	<avp name="Verify" code="131116" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<grouped>
-			<gavp name="Confirm-Token"/>
+			<gavp name="Confirm-Token-131117"/>
 		</grouped>
 	</avp>
 
-	<avp name="Confirm-Token" code="131117" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+	<avp name="Confirm-Token-131117" code="131117" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<type type-name="OctetString"/>
 	</avp>
 
@@ -392,7 +392,7 @@
 			<gavp name="Charging-Rule-Name"/>
 			<gavp name="Charging-Rule-Trigger-Type"/>
 			<gavp name="Volume-Usage"/>
-			<gavp name="Time-Usage"/>
+			<gavp name="Cisco-Time-Usage"/>
 			<gavp name="Cisco-Report-Usage"/>
 		</grouped>
 	</avp>
@@ -560,7 +560,7 @@
 		<type type-name="Unsigned64"/>
 	</avp>
 
-	<avp name="Time-Usage" code="131156" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+	<avp name="Cisco-Time-Usage" code="131156" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
 		<grouped>
 			<gavp name="Duration"/>
 			<gavp name="First-Packet-Timestanp"/>
@@ -582,7 +582,7 @@
 
 	<avp name="Cisco-Flow-Description" code="131160" vendor-id="Cisco" mandatory="must" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<grouped>
-			<gavp name="Flow-Description"/>
+			<gavp name="Cisco-Flow-Description-507"/>
 			<gavp name="Content-Name"/>
 			<gavp name="Precedence"/>
 			<gavp name="Flow-Information"/>
@@ -679,26 +679,26 @@
 
 	<avp name="Rate-Limit-Conform-Action" code="131175" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
 		<grouped>
-			<gavp name="Rate-Limit-Action"/>
-			<gavp name="DSCP"/>
+			<gavp name="Cisco-Rate-Limit-Action"/>
+			<gavp name="Cisco-DSCP"/>
 		</grouped>
 	</avp>
 
 	<avp name="Rate-Limit-Exceed-Action" code="131176" vendor-id="Cisco" mandatory="must" protected="mustnot" may-encrypt="yes" vendor-bit="must">
 		<grouped>
-			<gavp name="Rate-Limit-Action"/>
-			<gavp name="DSCP"/>
+			<gavp name="Cisco-Rate-Limit-Action"/>
+			<gavp name="Cisco-DSCP"/>
 		</grouped>
 	</avp>
 
-	<avp name="Rate-Limit-Action" code="131177" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
+	<avp name="Cisco-Rate-Limit-Action" code="131177" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
 		<type type-name="Enumerated"/>
 		<enum name="FORWARD" code="0"/>
 		<enum name="DROP" code="1"/>
 		<enum name="MARK_DSCP" code="2"/>
 	</avp>
 
-	<avp name="DSCP" code="131178" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+	<avp name="Cisco-DSCP" code="131178" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
 
@@ -815,7 +815,7 @@
 			<gavp name="Cisco-Event-Trigger-Type"/>
 			<gavp name="TCP-SYN"/>
 			<gavp name="Volume-Usage"/>
-			<gavp name="Time-Usage"/>
+			<gavp name="Cisco-Time-Usage"/>
 			<gavp name="Cisco-Report-Usage"/>
 			<gavp name="User-Agent"/>
 		</grouped>
@@ -851,7 +851,7 @@
 		<enum name="ENABLED" code="1"/>
 	</avp>
 
-	<avp name="Priority" code="131201" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+	<avp name="Cisco-Priority" code="131201" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
 
@@ -862,7 +862,7 @@
 	<avp name="Domain-Group-Definition" code="131203" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
 		<grouped>
 			<gavp name="Domain-Group-Name"/>
-			<gavp name="Priority"/>
+			<gavp name="Cisco-Priority"/>
 			<gavp name="Match-String"/>
 		</grouped>
 	</avp>
@@ -919,7 +919,7 @@
 		<enum name="ENABLED" code="1"/>
 	</avp>
 
-	<avp name="Quota-Consumption-Time" code="131213" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
+	<avp name="Cisco-Quota-Consumption-Time" code="131213" vendor-id="Cisco" mandatory="mustnot" may-encrypt="yes" protected="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
 
@@ -1141,7 +1141,7 @@
 		<grouped>
 			<gavp name="Cisco-Request-Usage-Type"/>
 			<gavp name="Volume-Usage"/>
-			<gavp name="Time-Usage"/>
+			<gavp name="Cisco-Time-Usage"/>
 		</grouped>
 	</avp>
 
@@ -1171,7 +1171,7 @@
 			<gavp name="Charging-Rule-Name"/>
 			<gavp name="Cisco-Request-Usage-Type"/>
 			<gavp name="Volume-Usage"/>
-			<gavp name="Time-Usage"/>
+			<gavp name="Cisco-Time-Usage"/>
 		</grouped>
 	</avp>
 	<avp name="Cisco-Answer-Service-Group-Usage" code="131255" vendor-id="Cisco" mandatory="mustnot" protected="mustnot" may-encrypt="yes" vendor-bit="must">
@@ -1179,7 +1179,7 @@
 			<gavp name="Service-Group-Name"/>
 			<gavp name="Cisco-Request-Usage-Type"/>
 			<gavp name="Volume-Usage"/>
-			<gavp name="Time-Usage"/>
+			<gavp name="Cisco-Time-Usage"/>
 		</grouped>
 	</avp>
 
diff --git a/diameter/Ericsson.xml b/diameter/Ericsson.xml
index d47fc13418..56718fad77 100644
--- a/diameter/Ericsson.xml
+++ b/diameter/Ericsson.xml
@@ -135,8 +135,8 @@
 	</avp>
 	<avp name="SCAP-Unit-Value" code="612" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
 		<grouped>
-			<gavp name="Value-Digits"/>
-			<gavp name="Exponent"/>
+			<gavp name="SCAP-Value-Digits"/>
+			<gavp name="SCAP-Exponent"/>
 		</grouped>
 	</avp>
 	<avp name="SCAP-Used-Service-Unit" code="613" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
@@ -161,7 +161,7 @@
 	<avp name="SCAP-Exponent" code="616" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
 		<type type-name="Integer32"/>
 	</avp>
-	<avp name="Value-Digits" code="617" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
+	<avp name="SCAP-Value-Digits" code="617" mandatory="must" vendor-bit="must" vendor-id="Ericsson" protected="may" may-encrypt="yes">
 		<type type-name="Unsigned64"/>
 	</avp>
 	<!-- ************************ END SCAP AVPS ******************* -->
@@ -201,7 +201,7 @@
 	<avp name="Gx-Capability-List" code="1060" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
+	<avp name="Ericsson-Customer-Id" code="1146" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no" protected="mustnot">
 		<type type-name="UTF8String"/>
 	</avp>
 
diff --git a/diameter/Nokia.xml b/diameter/Nokia.xml
index 0359c6387b..64ca2645f3 100644
--- a/diameter/Nokia.xml
+++ b/diameter/Nokia.xml
@@ -11,27 +11,27 @@
 		<type type-name="Unsigned32"/>
 	</avp>
 
-	<avp name="Time-Of-First-Usage" code="5103" vendor-id="Nokia">
+	<avp name="Nokia-Time-Of-First-Usage" code="5103" vendor-id="Nokia">
 		<type type-name="Time"/>
 	</avp>
 
-	<avp name="Time-Of-Last-Usage" code="5104" vendor-id="Nokia">
+	<avp name="Nokia-Time-Of-Last-Usage" code="5104" vendor-id="Nokia">
 		<type type-name="Time"/>
 	</avp>
 
-	<avp name="Session-Start-Indicator" code="5105" vendor-id="Nokia">
+	<avp name="Nokia-Session-Start-Indicator" code="5105" vendor-id="Nokia">
 		<type type-name="OctetString"/>
 	</avp>
 
-	<avp name="Rulebase-Id" code="5106" vendor-id="Nokia">
+	<avp name="Nokia-Rulebase-Id" code="5106" vendor-id="Nokia">
 		<type type-name="UTF8String"/>
 	</avp>
 
-	<avp name="Quota-Consumption-Time" code="5109" vendor-id="Nokia">
+	<avp name="Nokia-Quota-Consumption-Time" code="5109" vendor-id="Nokia">
 		<type type-name="Unsigned32"/>
 	</avp>
 
-	<avp name="Quota-Holding-Time" code="5110" vendor-id="Nokia">
+	<avp name="Nokia-Quota-Holding-Time" code="5110" vendor-id="Nokia">
 		<type type-name="Unsigned32"/>
 	</avp>
 
diff --git a/diameter/Starent.xml b/diameter/Starent.xml
index 80833f71da..0e2ed2c100 100644
--- a/diameter/Starent.xml
+++ b/diameter/Starent.xml
@@ -18,7 +18,7 @@
 		<type type-name="OctetString"/>
 	</avp>
 
-	<avp name="Customer-Id" code="1146" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Customer-Id" code="1146" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 		<type type-name="UTF8String"/>
 	</avp>
 
@@ -44,11 +44,11 @@
 		<type type-name="OctetString"/>
 	</avp>
 
-	<avp name="SN-Fast-Reauth-Username" code="11010" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Fast-Reauth-Username-11010" code="11010" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 		<type type-name="OctetString"/>
 	</avp>
 
-	<avp name="SN-Firewall-Policy" code="515" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Firewall-Policy-515" code="515" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 		<type type-name="UTF8String"/>
 	</avp>
 
@@ -60,7 +60,7 @@
 		<type type-name="UTF8String"/>
 	</avp>
 
-	<avp name="SN-Pseudonym-Username" code="11011" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Pseudonym-Username-11011" code="11011" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 		<type type-name="OctetString"/>
 	</avp>
 
@@ -139,7 +139,7 @@
 		<type type-name="Unsigned32"/>
 	</avp>
 
-	<avp name="Session-Start-Indicator" code="522" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Session-Start-Indicator" code="522" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 		<type type-name="OctetString"/>
 	</avp>
 
@@ -989,7 +989,7 @@
 	<type type-name="IPAddress"/>
 	</avp>
 
-	<avp name="SN-Fast-Reauth-Username" code="304" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Fast-Reauth-Username-304" code="304" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 	<type type-name="OctetString"/>
 	</avp>
 
@@ -999,7 +999,7 @@
 	<enum name="True" code="1"/>
 	</avp>
 
-	<avp name="SN-Firewall-Policy" code="239" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Firewall-Policy-239" code="239" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 	<type type-name="OctetString"/>
 	</avp>
 
@@ -1638,7 +1638,7 @@
 	<enum name="Enabled" code="1"/>
 	</avp>
 
-	<avp name="SN-Pseudonym-Username" code="305" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
+	<avp name="SN-Pseudonym-Username-305" code="305" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
 	<type type-name="OctetString"/>
 	</avp>
 
@@ -2222,8 +2222,4 @@
 	<type type-name="OctetString"/>
 	</avp>
 
-	<avp name="SN-Home-Behavior" code="119" vendor-id="Starent" mandatory="must" protected="may" may-encrypt="yes" vendor-bit="must">
-	<type type-name="Unsigned32"/>
-	</avp>
-
 </vendor>
diff --git a/diameter/TGPP.xml b/diameter/TGPP.xml
index 251ecab823..9dda48b239 100644
--- a/diameter/TGPP.xml
+++ b/diameter/TGPP.xml
@@ -200,61 +200,61 @@
 <!--
 	These AVPs collide(share AVP code number) with other 3GPP AVPs (above).
 	Uncomment 1 - 28 here and comment out the ones above if you want to use these.
-	<avp name="Visited-Network-Identifier(Obsolete CN#25)" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="Visited-Network-Identifier-OBSOLETE-CN25" code="1" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="Public-Identity(Obsolete CN#25)" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Public-Identity-OBSOLETE-CN25" code="2" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Server-Name(Obsolete CN#25)" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Server-Name-OBSOLETE-CN25" code="3" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Server-Capabilities(Obsolete CN#25)" code="4" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Server-Capabilities-OBSOLETE-CN25" code="4" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
 			<gavp name="Mandatory-Capability"/>
 			<gavp name="Optional-Capability"/>
 			<gavp name="Server-Name"/>
 		</grouped>
 	</avp>
-	<avp name="Mandatory-Capability(Obsolete CN#25)" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="Mandatory-Capability-OBSOLETE-CN25" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Optional-Capability(Obsolete CN#25)" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Optional-Capability-OBSOLETE-CN25" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="User-Data(Obsolete CN#25)" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-OBSOLETE-CN25" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Number-Auth-Items(Obsolete CN#25)" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="SIP-Number-Auth-Items-OBSOLETE-CN25" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="SIP-Authentication-Scheme(Obsolete CN#25)" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authentication-Scheme-OBSOLETE-CN25" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="SIP-Authenticate(Obsolete CN#25)" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authenticate-OBSOLETE-CN25" code="10" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Authorization(Obsolete CN#25)" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authorization-OBSOLETE-CN25" code="11" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Authentication-Context(Obsolete CN#25)" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Authentication-Context-OBSOLETE-CN25" code="12" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="SIP-Auth-Data-Item(Obsolete CN#25)" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Auth-Data-Item-OBSOLETE-CN25" code="13" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
-			<gavp name="SIP-Item-Number(Obsolete CN#25)"/>
-			<gavp name="SIP-Authentication-Scheme(Obsolete CN#25)"/>
-			<gavp name="SIP-Authenticate(Obsolete CN#25)"/>
-			<gavp name="SIP-Authorization(Obsolete CN#25)"/>
-			<gavp name="SIP-Authentication-Context(Obsolete CN#25)"/>
-			<gavp name="Confidentiality-Key(Obsolete CN#25)"/>
-			<gavp name="Integrity-Key(Obsolete CN#25)"/>
+			<gavp name="SIP-Item-Number-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authentication-Scheme-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authenticate-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authorization-OBSOLETE-CN25"/>
+			<gavp name="SIP-Authentication-Context-OBSOLETE-CN25"/>
+			<gavp name="Confidentiality-Key-OBSOLETE-CN25"/>
+			<gavp name="Integrity-Key-OBSOLETE-CN25"/>
 		</grouped>
 	</avp>
-	<avp name="SIP-Item-Number(Obsolete CN#25)" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="SIP-Item-Number-OBSOLETE-CN25" code="14" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Server-Assignment-Type(Obsolete CN#25)" code="15" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Server-Assignment-Type-OBSOLETE-CN25" code="15" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="No-Assignment" code="0"/>
 		<enum name="Registration" code="1"/>
@@ -269,23 +269,23 @@
 		<enum name="Authentication-Timeout" code="10"/>
 		<enum name="Deregistration-Too-Much-Data" code="11"/>
 	</avp>
-	<avp name="Deregistration-Reason(Obsolete CN#25)" code="16" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Deregistration-Reason-OBSOLETE-CN25" code="16" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
 			<gavp name="Reason-Code"/>
 			<gavp name="Reason-Info"/>
 		</grouped>
 	</avp>
-	<avp name="Reason-Code(Obsolete CN#25)" code="17" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Reason-Code-OBSOLETE-CN25" code="17" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Permanent-Termination" code="0"/>
 		<enum name="New-Server-Assigned" code="1"/>
 		<enum name="Server-Change" code="2"/>
 		<enum name="Remove-S-CSCF" code="3"/>
 	</avp>
-	<avp name="Reason-Info(Obsolete CN#25)" code="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Reason-Info-OBSOLETE-CN25" code="18" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Charging-Information(Obsolete CN#25)" code="19" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Charging-Information-OBSOLETE-CN25" code="19" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<grouped>
 			<gavp name="Primary-Event-Charging-Function-Name"/>
 			<gavp name="Secondary-Event-Charging-Function-Name"/>
@@ -293,39 +293,39 @@
 			<gavp name="Secondary-Charging-Collection-Function-Name"/>
 		</grouped>
 	</avp>
-	<avp name="Primary-Event-Charging-Function-Name(Obsolete CN#25)" code="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Primary-Event-Charging-Function-Name-OBSOLETE-CN25" code="20" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="Secondary-Event-Charging-Function-Name(Obsolete CN#25)" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Secondary-Event-Charging-Function-Name-OBSOLETE-CN25" code="21" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="Primary-Charging-Collection-Function-Name(Obsolete CN#25)" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Primary-Charging-Collection-Function-Name-OBSOLETE-CN25" code="22" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="Secondary-Charging-Collection-Function-Name(Obsolete CN#25)" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Secondary-Charging-Collection-Function-Name-OBSOLETE-CN25" code="23" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="DiameterURI"/>
 	</avp>
-	<avp name="User-Authorization-Type(Obsolete CN#25)" code="24" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Authorization-Type-OBSOLETE-CN25" code="24" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Registration" code="0"/>
 		<enum name="De-Registration" code="1"/>
 		<enum name="Registration-And-Capabilities" code="2"/>
 	</avp>
-	<avp name="User-Data-Request-Type(Obsolete CN#25)" code="25" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-Request-Type-OBSOLETE-CN25" code="25" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Complete-Profile" code="0"/>
 		<enum name="Registered-Profile" code="1"/>
 		<enum name="Unregistered-Profile" code="2"/>
 	</avp>
-	<avp name="User-Data-Already-Available(Obsolete CN#25)" code="26" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-Already-Available-OBSOLETE-CN25" code="26" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="User-Data-Not-Available" code="0"/>
 		<enum name="User-Data-Already-Available" code="1"/>
 	</avp>
-	<avp name="Confidentiality-Key(Obsolete CN#25)" code="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Confidentiality-Key-OBSOLETE-CN25" code="27" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="Integrity-Key(Obsolete CN#25)" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Integrity-Key-OBSOLETE-CN25" code="28" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
 -->
@@ -511,7 +511,7 @@
 
 <!-- The AVP codes from 500 to 599 are reserved for TS 29.209, 29.211, and 29.229. -->
 <application id="16777236" name="3GPP Rx" uri="http://www.3gpp.org/DynaReport/29214.htm">
-	<avp name="Codec-Data AVP" code="524" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="Codec-Data" code="524" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="UTF8String" />
 	</avp>
 
@@ -656,7 +656,7 @@
 			<gavp name="Line-Identifier"/>
 			<gavp name="Authentication-Method"/>
 			<gavp name="Authentication-Information-SIM"/>
-			<gavp name="Authorization -Information-SIM"/>
+			<gavp name="Authorization-Information-SIM"/>
 		</grouped>
 	</avp>
 	<avp name="3GPP-SIP-Item-Number" code="613" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
@@ -732,7 +732,7 @@
 	<avp name="Integrity-Key" code="626" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="User-Data-Request-Type(Obsolete)" code="627" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+	<avp name="User-Data-Request-Type-OBSOLETE" code="627" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="Complete-Profile" code="0"/>
 		<enum name="Registered-Profile" code="1"/>
@@ -770,7 +770,7 @@
 	<avp name="Wildcarded-PSI" code="634" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="SIP-Digest-Authenticate AVP" code="635" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
+	<avp name="SIP-Digest-Authenticate" code="635" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
 		<grouped>
 			<gavp name="Digest-Realm"/>
 			<gavp name="Digest-Algorithm"/>
diff --git a/diameter/Vodafone.xml b/diameter/Vodafone.xml
index a5fca04fe3..f421baa6db 100644
--- a/diameter/Vodafone.xml
+++ b/diameter/Vodafone.xml
@@ -9,13 +9,13 @@
 		<enum name="PRIMARY" code="0"/>
 		<enum name="SECONDARY" code="1"/>
 	</avp>
-	<avp name="Quota-Consumption-Time" code="257" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Quota-Consumption-Time" code="257" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Quota-Holding-Time" code="258" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Quota-Holding-Time" code="258" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Time-Quota-Threshold" code="259" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Time-Quota-Threshold" code="259" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
 	<avp name="Radio-Access-Technology" code="260" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
@@ -24,7 +24,7 @@
 		<enum name="GERAN" code="1"/>
 		<enum name="WLAN" code="2"/>
 	</avp>
-	<avp name="Reporting-Reason" code="261" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Reporting-Reason" code="261" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Enumerated"/>
 		<enum name="THRESHOLD" code="0"/>
 		<enum name="QHT" code="1"/>
@@ -35,21 +35,21 @@
 		<enum name="RATING_CONDITION_CHANGE" code="6"/>
 		<enum name="FORCED_REAUTHORISATION " code="7"/>
 	</avp>
-	<avp name="Rulebase-Id" code="262" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Rulebase-Id" code="262" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="UTF8String"/>
 	</avp>
-	<avp name="Time-Of-First-Usage" code="263" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Time-Of-First-Usage" code="263" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Time"/>
 	</avp>
-	<avp name="Time-Of-Last-Usage" code="264" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Time-Of-Last-Usage" code="264" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Time"/>
 	</avp>
-	<avp name="Trigger" code="265" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Trigger" code="265" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<grouped>
-			<gavp name="Trigger-Type"/>
+			<gavp name="Vodafone-Trigger-Type"/>
 		</grouped>
 	</avp>
-	<avp name="Trigger-Type" code="266" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Trigger-Type" code="266" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Enumerated"/>
 		<enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
 		<enum name="CHANGEINQOS_ANY" code="2"/>
@@ -70,7 +70,7 @@
 	<avp name="User-Location-Information" code="267" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="Volume-Quota-Threshold" code="268" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
+	<avp name="Vodafone-Volume-Quota-Threshold" code="268" vendor-id="Vodafone" mandatory="mustnot" vendor-bit="must">
 		<type type-name="Unsigned32"/>
 	</avp>
 
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 1abd6e22f7..acb4e19af9 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -2885,7 +2885,7 @@
 		<avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Unsigned32"/>
 		</avp>
-		<avp name="Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
+		<avp name="3GPP-Reporting-Reason" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Enumerated"/>
 			<enum name="THRESHOLD" code="0"/>
 			<enum name="QHT" code="1"/>
diff --git a/diameter/etsie2e4.xml b/diameter/etsie2e4.xml
index a8339ed4e5..a4f5807236 100644
--- a/diameter/etsie2e4.xml
+++ b/diameter/etsie2e4.xml
@@ -91,7 +91,7 @@
 		<type type-name="Unsigned32"/>
 	</avp>
 	<!-- Removed from ETSI ES 283 034 V1.2.0 (2007-05) -->
-	<avp name="Maximum-Priority(deprecated)" code="310" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="Maximum-Priority-DEPRECATED" code="310" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="Unsigned32"/>
 	</avp>
 	<avp name="Transport-Class" code="311" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
@@ -112,7 +112,7 @@
 
 	<!-- ************************* e2 AVPs ************************ -->
 
-	<avp name="Location-Information" code="350" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="ETSI-Location-Information" code="350" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<grouped>
 			<gavp name="Line-Identifier"/>
 		</grouped>
@@ -123,7 +123,7 @@
 	<avp name="Terminal-Type" code="352" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="OctetString"/>
 	</avp>
-	<avp name="Requested-Information" code="353" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="Requested-Information-353" code="353" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="SUBSCRIBER-ID" code="0"/>
 		<enum name="LOCATION-INFORMATION" code="1"/>
@@ -139,7 +139,7 @@
 		<enum name="QOS-PROFILE" code="9"/>
 		<enum name="IP-CONNECTIVITY-STATUS" code="10"/>
 	</avp>
-	<avp name="Event-Type" code="354" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="ETSI-Event-Type-354" code="354" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="USER-LOGON" code="0"/>
 		<enum name="LOCATION-INFORMATION-CHANGED" code="1"/>
@@ -166,7 +166,7 @@
 	</avp>
 
 	<!--- ETSI TS 183 066 V2.1.1 (2009-01) -->
-	<avp name="Event-Type" code="420" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="ETSI-Event-Type-420" code="420" mandatory="must" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="UPDATE" code="0"/>
 		<enum name="REMOVE" code="1"/>
@@ -209,7 +209,7 @@
 	<avp name="Reservation-Class" code="456" mandatory="may" vendor-bit="must" vendor-id="ETSI" may-encrypt="no">
 		<type type-name="Unsigned32"/>
 	</avp>
-	<avp name="Requested-Information" code="457" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="Requested-Information-457" code="457" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="Enumerated"/>
 		<enum name="LATCH" code="0"/>
 		<enum name="RELATCH" code="1"/>
@@ -225,7 +225,7 @@
 		<enum name="PRIORITY-SIX" code="6"/>
 		<enum name="PRIORITY-SEVEN" code="7"/>
 	</avp>
-	<avp name="Service-Class" code="459" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
+	<avp name="ETSI-Service-Class" code="459" mandatory="mustnot" vendor-bit="must" vendor-id="ETSI" may-encrypt="yes">
 		<type type-name="UTF8String"/>
 	</avp>