From c9a91acd707f39fb11d9d513d904cb1f6db52386 Mon Sep 17 00:00:00 2001
From: Eduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Date: Sun, 2 Apr 2017 20:29:35 +0200
Subject: [PATCH] Fix type: end-to-end instead of end-by-end

---
 dynamic/launcher/gx/00001/CCR-I.xml                       | 2 +-
 dynamic/launcher/gx/00001/CCR-T.xml                       | 2 +-
 dynamic/launcher/gx/00001/services/cerGx.xml              | 2 +-
 example/diameter/launcher/deployments/advanced/1.xml      | 2 +-
 .../launcher/deployments/advanced/data-initial.msk        | 2 +-
 .../launcher/deployments/advanced/data-termination.msk    | 2 +-
 .../launcher/deployments/advanced/data-update1.msk        | 2 +-
 .../launcher/deployments/advanced/data-update2.msk        | 2 +-
 example/diameter/launcher/deployments/advanced/sms.msk    | 2 +-
 .../deployments/st-client/services_example/cerGx.xml      | 2 +-
 .../deployments/st-client/services_example/cerRx.xml      | 2 +-
 .../scripts/tinyTestcase_source_example/13.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/17.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/22.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/31.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/33.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/38.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/42.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/44.hex.as.xml     | 2 +-
 .../scripts/tinyTestcase_source_example/6.hex.as.xml      | 2 +-
 .../st_examples/DynamicQualification/15.hex.as.xml.msk    | 2 +-
 .../st_examples/DynamicQualification/20.hex.as.xml.msk    | 2 +-
 .../st_examples/DynamicQualification/28.hex.as.xml.msk    | 2 +-
 .../st_examples/DynamicQualification/30.hex.as.xml.msk    | 2 +-
 .../st_examples/DynamicQualification/35.hex.as.xml.msk    | 2 +-
 .../st_examples/DynamicQualification/39.hex.as.xml.msk    | 2 +-
 .../st_examples/DynamicQualification/41.hex.as.xml.msk    | 2 +-
 .../launcher/resources/st_examples/Gx_CCR-I/ccr-i.xml.msk | 2 +-
 .../resources/st_examples/Gx_CCR-I_CCR-T/ccr-i.xml.msk    | 2 +-
 .../resources/st_examples/Gx_CCR-I_CCR-T/ccr-t.xml.msk    | 2 +-
 example/diameter/launcher/resources/xml_examples/aaa.xml  | 2 +-
 example/diameter/launcher/resources/xml_examples/aar.xml  | 2 +-
 example/diameter/launcher/resources/xml_examples/aar2.xml | 2 +-
 example/diameter/launcher/resources/xml_examples/ccr.xml  | 2 +-
 .../launcher/resources/xml_examples/regexp_for_aar.xml    | 2 +-
 include/anna/diameter/codec/Message.hpp                   | 2 +-
 include/anna/diameter/codec/functions.hpp                 | 8 ++++----
 include/anna/diameter/codec/message.dtd                   | 4 ++--
 source/diameter/codec/Message.cpp                         | 8 ++++----
 39 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/dynamic/launcher/gx/00001/CCR-I.xml b/dynamic/launcher/gx/00001/CCR-I.xml
index a57ef6d..3c5ed41 100644
--- a/dynamic/launcher/gx/00001/CCR-I.xml
+++ b/dynamic/launcher/gx/00001/CCR-I.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-by-end-id="120858624">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-to-end-id="120858624">
    <avp name="Session-Id" data="111110000000;BAT004;esmdx0900.gxrel10plusrealm.com;9020000000"/>
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
diff --git a/dynamic/launcher/gx/00001/CCR-T.xml b/dynamic/launcher/gx/00001/CCR-T.xml
index ac44202..d5cc2e7 100644
--- a/dynamic/launcher/gx/00001/CCR-T.xml
+++ b/dynamic/launcher/gx/00001/CCR-T.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="4" end-by-end-id="920291330">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="4" end-to-end-id="920291330">
    <avp name="Session-Id" data="111110000000;BAT004;esmdx0900.gxrel10plusrealm.com;9020000000"/>
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
diff --git a/dynamic/launcher/gx/00001/services/cerGx.xml b/dynamic/launcher/gx/00001/services/cerGx.xml
index 6e55b0a..6afbdfa 100644
--- a/dynamic/launcher/gx/00001/services/cerGx.xml
+++ b/dynamic/launcher/gx/00001/services/cerGx.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-by-end-id="120858368">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-to-end-id="120858368">
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
    <avp name="Host-IP-Address" data="1|10.1.27.231"/>
diff --git a/example/diameter/launcher/deployments/advanced/1.xml b/example/diameter/launcher/deployments/advanced/1.xml
index dcd18b9..04c98fe 100644
--- a/example/diameter/launcher/deployments/advanced/1.xml
+++ b/example/diameter/launcher/deployments/advanced/1.xml
@@ -1,4 +1,4 @@
-<message version="1" code="265" flags="0" application-id="0" hop-by-hop-id="1" end-by-end-id="2">
+<message version="1" code="265" flags="0" application-id="0" hop-by-hop-id="1" end-to-end-id="2">
    <avp name="Session-Id" data="ocs3;1332909618;0;1332909618"/>
    <avp name="Auth-Application-Id" data="16777236"/>
    <avp name="Origin-Host" data="OCS3"/>
diff --git a/example/diameter/launcher/deployments/advanced/data-initial.msk b/example/diameter/launcher/deployments/advanced/data-initial.msk
index fa6d324..aa663f7 100644
--- a/example/diameter/launcher/deployments/advanced/data-initial.msk
+++ b/example/diameter/launcher/deployments/advanced/data-initial.msk
@@ -1,4 +1,4 @@
-<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-by-end-id="__HBH_ETE__">
+<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-to-end-id="__HBH_ETE__">
    <avp name="Session-Id" data="__SID_DI__;__SID_HIGH__;__SID_LOW__;__SID_SUFFIX__"/>
    <avp name="Origin-Host" data="__SID_DI__"/>
    <avp name="Origin-Realm" data="sandvine.com"/>
diff --git a/example/diameter/launcher/deployments/advanced/data-termination.msk b/example/diameter/launcher/deployments/advanced/data-termination.msk
index f15396f..2bc8e36 100644
--- a/example/diameter/launcher/deployments/advanced/data-termination.msk
+++ b/example/diameter/launcher/deployments/advanced/data-termination.msk
@@ -1,4 +1,4 @@
-<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-by-end-id="__HBH_ETE__">
+<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-to-end-id="__HBH_ETE__">
    <avp name="Session-Id" data="__SID_DI__;__SID_HIGH__;__SID_LOW__;__SID_SUFFIX__"/>
    <avp name="Origin-Host" data="__SID_DI__"/>
    <avp name="Origin-Realm" data="sandvine.com"/>
diff --git a/example/diameter/launcher/deployments/advanced/data-update1.msk b/example/diameter/launcher/deployments/advanced/data-update1.msk
index 8883c60..f55c7f8 100644
--- a/example/diameter/launcher/deployments/advanced/data-update1.msk
+++ b/example/diameter/launcher/deployments/advanced/data-update1.msk
@@ -1,4 +1,4 @@
-<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-by-end-id="__HBH_ETE__">
+<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-to-end-id="__HBH_ETE__">
    <avp name="Session-Id" data="__SID_DI__;__SID_HIGH__;__SID_LOW__;__SID_SUFFIX__"/>
    <avp name="Origin-Host" data="__SID_DI__"/>
    <avp name="Origin-Realm" data="sandvine.com"/>
diff --git a/example/diameter/launcher/deployments/advanced/data-update2.msk b/example/diameter/launcher/deployments/advanced/data-update2.msk
index 8784172..2684c11 100644
--- a/example/diameter/launcher/deployments/advanced/data-update2.msk
+++ b/example/diameter/launcher/deployments/advanced/data-update2.msk
@@ -1,4 +1,4 @@
-<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-by-end-id="__HBH_ETE__">
+<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-to-end-id="__HBH_ETE__">
    <avp name="Session-Id" data="__SID_DI__;__SID_HIGH__;__SID_LOW__;__SID_SUFFIX__"/>
    <avp name="Origin-Host" data="__SID_DI__"/>
    <avp name="Origin-Realm" data="sandvine.com"/>
diff --git a/example/diameter/launcher/deployments/advanced/sms.msk b/example/diameter/launcher/deployments/advanced/sms.msk
index 7bec3c8..c255d42 100644
--- a/example/diameter/launcher/deployments/advanced/sms.msk
+++ b/example/diameter/launcher/deployments/advanced/sms.msk
@@ -1,4 +1,4 @@
-<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-by-end-id="__HBH_ETE__">
+<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="__HBH_ETE__" end-to-end-id="__HBH_ETE__">
    <avp name="Session-Id" data="gbg.acision.com;421411;__SID_LOW__"/>
    <avp name="Origin-Host" data="gbg.acision.com"/>
    <avp name="Origin-Realm" data="SMSC.orig.OCS2.o2online.de"/>
diff --git a/example/diameter/launcher/deployments/st-client/services_example/cerGx.xml b/example/diameter/launcher/deployments/st-client/services_example/cerGx.xml
index 29b0fbe..0132179 100644
--- a/example/diameter/launcher/deployments/st-client/services_example/cerGx.xml
+++ b/example/diameter/launcher/deployments/st-client/services_example/cerGx.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CER" application-id="0" hop-by-hop-id="722470" end-by-end-id="539510">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="722470" end-to-end-id="539510">
    <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
    <avp name="Auth-Application-Id" data="16777238"/>
diff --git a/example/diameter/launcher/deployments/st-client/services_example/cerRx.xml b/example/diameter/launcher/deployments/st-client/services_example/cerRx.xml
index e16b236..bb1e0df 100644
--- a/example/diameter/launcher/deployments/st-client/services_example/cerRx.xml
+++ b/example/diameter/launcher/deployments/st-client/services_example/cerRx.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CER" application-id="0" hop-by-hop-id="956775" end-by-end-id="968247">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="956775" end-to-end-id="968247">
    <avp name="Origin-Host" data="afNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
    <avp name="Auth-Application-Id" data="16777236"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/13.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/13.hex.as.xml
index fcb07d3..18038e4 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/13.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/13.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CER" application-id="0" hop-by-hop-id="743350" end-by-end-id="411478">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="743350" end-to-end-id="411478">
    <avp name="Origin-Host" data="afNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
    <avp name="Auth-Application-Id" data="16777236"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/17.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/17.hex.as.xml
index 9611c13..043443d 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/17.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/17.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="15" end-by-end-id="143351">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="15" end-to-end-id="143351">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/22.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/22.hex.as.xml
index f8d7846..a796976 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/22.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/22.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="AA-Request" application-id="16777236" hop-by-hop-id="20" end-by-end-id="163097">
+<message version="1" name="AA-Request" application-id="16777236" hop-by-hop-id="20" end-to-end-id="163097">
    <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/31.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/31.hex.as.xml
index 198e222..6a5f2dc 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/31.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/31.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878460" end-by-end-id="3244878460">
+<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878460" end-to-end-id="3244878460">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/33.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/33.hex.as.xml
index b4e5c80..ba6861b 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/33.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/33.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="30" end-by-end-id="3244878461">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="30" end-to-end-id="3244878461">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/38.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/38.hex.as.xml
index b011378..414deb2 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/38.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/38.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="ST-Request" application-id="16777236" hop-by-hop-id="35" end-by-end-id="163097">
+<message version="1" name="ST-Request" application-id="16777236" hop-by-hop-id="35" end-to-end-id="163097">
    <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/42.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/42.hex.as.xml
index e2a1e6a..409e5cb 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/42.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/42.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878461" end-by-end-id="3244878461">
+<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878461" end-to-end-id="3244878461">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/44.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/44.hex.as.xml
index 0f07d0c..816455d 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/44.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/44.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="41" end-by-end-id="3244878462">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="41" end-to-end-id="3244878462">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;100000000"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/6.hex.as.xml b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/6.hex.as.xml
index 9d53d43..50dc219 100644
--- a/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/6.hex.as.xml
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase_source_example/6.hex.as.xml
@@ -1,4 +1,4 @@
-<message version="1" name="CER" application-id="0" hop-by-hop-id="840233" end-by-end-id="630062">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="840233" end-to-end-id="630062">
    <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
    <avp name="Auth-Application-Id" data="16777238"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk
index 8e6072d..0ac578c 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="15" end-by-end-id="143351">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="15" end-to-end-id="143351">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk
index 7f69493..8dc1105 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="AA-Request" application-id="16777236" hop-by-hop-id="20" end-by-end-id="163097">
+<message version="1" name="AA-Request" application-id="16777236" hop-by-hop-id="20" end-to-end-id="163097">
    <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk
index 1e40290..3fef670 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878460" end-by-end-id="3244878460">
+<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878460" end-to-end-id="3244878460">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk
index f3cf84b..e30d0ad 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="30" end-by-end-id="3244878461">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="30" end-to-end-id="3244878461">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk
index b9fa05e..618c199 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="ST-Request" application-id="16777236" hop-by-hop-id="35" end-by-end-id="163097">
+<message version="1" name="ST-Request" application-id="16777236" hop-by-hop-id="35" end-to-end-id="163097">
    <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk
index 09410f2..41c0afc 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878461" end-by-end-id="3244878461">
+<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878461" end-to-end-id="3244878461">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.nodeHostRealm.com"/>
    <avp name="Origin-Realm" data="nodeHostRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk
index 3348af6..0ad663c 100644
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="41" end-by-end-id="3244878462">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="41" end-to-end-id="3244878462">
    <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.nodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/Gx_CCR-I/ccr-i.xml.msk b/example/diameter/launcher/resources/st_examples/Gx_CCR-I/ccr-i.xml.msk
index 40c5d70..59091e8 100644
--- a/example/diameter/launcher/resources/st_examples/Gx_CCR-I/ccr-i.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/Gx_CCR-I/ccr-i.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-by-end-id="120858624">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-to-end-id="120858624">
    <avp name="Session-Id" data="11111__SEQ8__;BAT004;esmdx0900.gxrel10plusrealm.com;90__SEQ8__"/>
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-i.xml.msk b/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-i.xml.msk
index 40c5d70..59091e8 100644
--- a/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-i.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-i.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-by-end-id="120858624">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-to-end-id="120858624">
    <avp name="Session-Id" data="11111__SEQ8__;BAT004;esmdx0900.gxrel10plusrealm.com;90__SEQ8__"/>
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
diff --git a/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-t.xml.msk b/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-t.xml.msk
index 345977c..012b0cf 100644
--- a/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-t.xml.msk
+++ b/example/diameter/launcher/resources/st_examples/Gx_CCR-I_CCR-T/ccr-t.xml.msk
@@ -1,4 +1,4 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-by-end-id="920291329">
+<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="3" end-to-end-id="920291329">
    <avp name="Session-Id" data="11111__SEQ8__;BAT004;esmdx0900.gxrel10plusrealm.com;90__SEQ8__"/>
    <avp name="Origin-Host" data="esmdx0900.gxrel10plusrealm.com"/>
    <avp name="Origin-Realm" data="gxrel10plusrealm.com"/>
diff --git a/example/diameter/launcher/resources/xml_examples/aaa.xml b/example/diameter/launcher/resources/xml_examples/aaa.xml
index 9cd059f..974af0a 100644
--- a/example/diameter/launcher/resources/xml_examples/aaa.xml
+++ b/example/diameter/launcher/resources/xml_examples/aaa.xml
@@ -1,4 +1,4 @@
-<message version="1" name="AA-Answer" application-id="16777236" hop-by-hop-id="202475" end-by-end-id="509476">
+<message version="1" name="AA-Answer" application-id="16777236" hop-by-hop-id="202475" end-to-end-id="509476">
    <avp name="Session-Id" data="test1;afNodeHostname.nodeHostRealm.com;1;8033450"/>
    <avp name="Auth-Application-Id" data="16777236"/>
    <avp name="Origin-Host" data="ownHostId.operatorRealm.com"/>
diff --git a/example/diameter/launcher/resources/xml_examples/aar.xml b/example/diameter/launcher/resources/xml_examples/aar.xml
index 27b631c..b233fc5 100644
--- a/example/diameter/launcher/resources/xml_examples/aar.xml
+++ b/example/diameter/launcher/resources/xml_examples/aar.xml
@@ -1,4 +1,4 @@
-<message version="1" name="AA-Request" p-bit="yes" application-id="16777236" hop-by-hop-id="0" end-by-end-id="0">
+<message version="1" name="AA-Request" p-bit="yes" application-id="16777236" hop-by-hop-id="0" end-to-end-id="0">
    <avp name="Session-Id" data="ocs3;1332774430;1;1332774430"/>
    <avp name="Auth-Application-Id" data="16777236"/>
    <avp name="Origin-Host" data="OCS3"/>
diff --git a/example/diameter/launcher/resources/xml_examples/aar2.xml b/example/diameter/launcher/resources/xml_examples/aar2.xml
index c163fb4..c0ca2c6 100644
--- a/example/diameter/launcher/resources/xml_examples/aar2.xml
+++ b/example/diameter/launcher/resources/xml_examples/aar2.xml
@@ -1,4 +1,4 @@
-<message version="1" name="AA-Request" p-bit="yes" application-id="16777236" hop-by-hop-id="0" end-by-end-id="0">
+<message version="1" name="AA-Request" p-bit="yes" application-id="16777236" hop-by-hop-id="0" end-to-end-id="0">
    <avp name="Session-Id" data="ocs3;1332774430;1;1332774430"/>
    <avp name="Auth-Application-Id" data="16777236"/>
    <avp name="Origin-Host" data="OCS3"/>
diff --git a/example/diameter/launcher/resources/xml_examples/ccr.xml b/example/diameter/launcher/resources/xml_examples/ccr.xml
index 46483a2..2b9d18d 100644
--- a/example/diameter/launcher/resources/xml_examples/ccr.xml
+++ b/example/diameter/launcher/resources/xml_examples/ccr.xml
@@ -1,4 +1,4 @@
-<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="1" end-by-end-id="1">
+<message version="1" name="Credit-Control-Request" p-bit="yes" application-id="4" hop-by-hop-id="1" end-to-end-id="1">
    <avp name="Session-Id" data="module-2.PTS2-BOG.sandvine.com;1287115741;0;0"/>
    <avp name="Origin-Host" data="module-2.PTS2-BOG.sandvine.com"/>
    <avp name="Origin-Realm" data="sandvine.com"/>
diff --git a/example/diameter/launcher/resources/xml_examples/regexp_for_aar.xml b/example/diameter/launcher/resources/xml_examples/regexp_for_aar.xml
index 6c06e35..d260da7 100644
--- a/example/diameter/launcher/resources/xml_examples/regexp_for_aar.xml
+++ b/example/diameter/launcher/resources/xml_examples/regexp_for_aar.xml
@@ -1,4 +1,4 @@
-<message version="1" name="AA-Request" p-bit="yes" application-id="16777236" hop-by-hop-id="[0-9]+" end-by-end-id="[0-9]+">
+<message version="1" name="AA-Request" p-bit="yes" application-id="16777236" hop-by-hop-id="[0-9]+" end-to-end-id="[0-9]+">
    <avp name="Session-Id" data="ocs3;1332774430;1;1332774430"/>
    <avp name="Auth-Application-Id" data="16777236"/>
    <avp name="Origin-Host" data="OCS3"/>
diff --git a/include/anna/diameter/codec/Message.hpp b/include/anna/diameter/codec/Message.hpp
index e7edc85..376fa39 100644
--- a/include/anna/diameter/codec/Message.hpp
+++ b/include/anna/diameter/codec/Message.hpp
@@ -753,7 +753,7 @@ public:
      during hexadecimal read. Normally only printable 'data' fields are used for matching issues.
 
      For example, imagine a 'pattern.xml' file like:
-     <message version="1" name="Credit-Control-Request" application-id="16777236" hop-by-hop-id="0" end-by-end-id="0">
+     <message version="1" name="Credit-Control-Request" application-id="16777236" hop-by-hop-id="0" end-to-end-id="0">
         <avp name="Subscription-Id">
            <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
            <avp name="Subscription-Id-Data" data="616[0-9]{6,6}"/>
diff --git a/include/anna/diameter/codec/functions.hpp b/include/anna/diameter/codec/functions.hpp
index 9c4c5a8..563b501 100644
--- a/include/anna/diameter/codec/functions.hpp
+++ b/include/anna/diameter/codec/functions.hpp
@@ -48,7 +48,7 @@ static const char *MessageDTD = "\
 <!ELEMENT message (avp*)>\n\
 <!ELEMENT avp (avp*)>\n\
 \n\
-<!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>\n\
+<!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>\n\
 <!--\n\
    version: Diameter version. Sets '1' by default\n\
    name:    Command name within working stack (dictionary identifier)\n\
@@ -65,7 +65,7 @@ static const char *MessageDTD = "\
 \n\
    application-id:   Message application id\n\
    hop-by-hop-id:    Message hop by hop id. Sets '0' by default\n\
-   end-by-end-id:    Message end by end id. Sets '0' by default\n\
+   end-to-end-id:    Message end to end id. Sets '0' by default\n\
 -->\n\
 \n\
 <!ATTLIST avp name CDATA #IMPLIED code CDATA #IMPLIED vendor-code CDATA #IMPLIED flags CDATA #IMPLIED data CDATA #IMPLIED hex-data CDATA #IMPLIED alias CDATA #IMPLIED>\n\
@@ -243,7 +243,7 @@ struct functions {
      <!ELEMENT message (avp*)>
      <!ELEMENT avp (avp*)>
 
-     <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+     <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
      <!--
         version: Diameter version. Sets '1' by default
         name:    Command name within working stack (dictionary identifier)
@@ -257,7 +257,7 @@ struct functions {
 
         application-id:   Message application id
         hop-by-hop-id:    Message hop by hop id. Sets '0' by default
-        end-by-end-id:    Message end by end id. Sets '0' by default
+        end-to-end-id:    Message end to end id. Sets '0' by default
      -->
 
      <!ATTLIST avp name CDATA #IMPLIED code CDATA #IMPLIED vendor-code CDATA #IMPLIED flags CDATA #IMPLIED data CDATA #IMPLIED hex-data CDATA #IMPLIED>
diff --git a/include/anna/diameter/codec/message.dtd b/include/anna/diameter/codec/message.dtd
index c4bdb17..50ad1c2 100755
--- a/include/anna/diameter/codec/message.dtd
+++ b/include/anna/diameter/codec/message.dtd
@@ -4,7 +4,7 @@
 <!ELEMENT message (avp*)>
 <!ELEMENT avp (avp*)>
 
-<!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+<!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
 <!--
    version: Diameter version. Sets '1' by default
    name:    Command name within working stack (dictionary identifier)
@@ -20,7 +20,7 @@
 
    application-id:   Message application id
    hop-by-hop-id:    Message hop by hop id. Sets '0' by default
-   end-by-end-id:    Message end by end id. Sets '0' by default
+   end-to-end-id:    Message end to end id. Sets '0' by default
 -->
 
 <!ATTLIST avp name CDATA #IMPLIED code CDATA #IMPLIED vendor-code CDATA #IMPLIED flags CDATA #IMPLIED data CDATA #IMPLIED hex-data CDATA #IMPLIED alias CDATA #IMPLIED>
diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp
index ddf7694..0b4d802 100644
--- a/source/diameter/codec/Message.cpp
+++ b/source/diameter/codec/Message.cpp
@@ -772,7 +772,7 @@ void Message::loadXML(const std::string &xmlPathFile) throw(anna::RuntimeExcepti
 //----------------------------------------------------------- Message::fromXML()
 //------------------------------------------------------------------------------
 void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeException) {
-  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
   const anna::xml::Attribute *version, *name, *code, *flags, *pbit, *ebit, *tbit, *appid, *hbh, *ete;
   version = messageNode->getAttribute("version", false /* no exception */);
   name = messageNode->getAttribute("name", false /* no exception */);
@@ -783,7 +783,7 @@ void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeExc
   tbit = messageNode->getAttribute("t-bit", false /* no exception */);
   appid = messageNode->getAttribute("application-id"); // required
   hbh = messageNode->getAttribute("hop-by-hop-id", false /* no exception */);
-  ete = messageNode->getAttribute("end-by-end-id", false /* no exception */);
+  ete = messageNode->getAttribute("end-to-end-id", false /* no exception */);
   int i_aux;
   unsigned int u_aux;
 
@@ -950,7 +950,7 @@ void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeExc
 //------------------------------------------------------------- Message::asXML()
 //------------------------------------------------------------------------------
 anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() {
-  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
   anna::xml::Node* result = parent->createChild("message");
   // Dictionary stack command:
   const stack::Command *stackCommand = getStackCommand();
@@ -972,7 +972,7 @@ anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() {
 
   result->createAttribute("application-id", anna::functions::asString(a_applicationId));
   result->createAttribute("hop-by-hop-id", anna::functions::asString(a_hopByHop));
-  result->createAttribute("end-by-end-id", anna::functions::asString(a_endToEnd));
+  result->createAttribute("end-to-end-id", anna::functions::asString(a_endToEnd));
 
   // Avps:
   for(const_avp_iterator it = avp_begin(); it != avp_end(); it++) {
-- 
2.20.1