From b346bf56f55ff853f343d29abb3b2a4b1267151f Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@haswell.coppice.org>
Date: Mon, 19 Aug 2013 02:04:13 +0800
Subject: [PATCH] Some tweaks to colour FAXing and some alterations to the
 supervisory tones tables.

---
 libs/spandsp/spandsp/global-tones.xml | 820 +++++++++++++-------------
 libs/spandsp/spandsp/tones.dtd        |  88 ++-
 libs/spandsp/spandsp/tsb85.xml        |   4 +-
 3 files changed, 471 insertions(+), 441 deletions(-)

diff --git a/libs/spandsp/spandsp/global-tones.xml b/libs/spandsp/spandsp/global-tones.xml
index 466dae5d2f..5b376d1e86 100644
--- a/libs/spandsp/spandsp/global-tones.xml
+++ b/libs/spandsp/spandsp/global-tones.xml
@@ -5,12 +5,12 @@
     <dial-tone>
       <step freq="425"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.3"/>
@@ -25,12 +25,12 @@
     </congestion-tone>
   </tone-set>
   <tone-set country="Algeria" uncode="dz">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="25 || 50" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.5"/>
@@ -42,12 +42,12 @@
     <dial-tone>
       <step freq="400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="25" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -82,12 +82,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -142,12 +142,12 @@
     <dial-tone type="recall">
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -180,12 +180,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.3"/>
@@ -230,12 +230,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -273,12 +273,12 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -306,14 +306,14 @@
     <dial-tone domain="PABX">
       <step freq="154" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="383+417" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="383+417" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -377,12 +377,12 @@
     <dial-tone type="recall">
       <step freq="420" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="420 || 450" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="420" level="-12" length="0.4"/>
@@ -448,12 +448,12 @@
     <!-- Billing signal: 12kHz/~2Vrms, differential/~125ms -->
   </tone-set>
   <tone-set country="Bahamas" uncode="bs">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480 || 400+440 || 400" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480 || 400" level="-12" length="0.5"/>
@@ -469,14 +469,14 @@
     <dial-tone>
       <step freq="330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440 || 450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="440 || 450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -533,12 +533,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -553,12 +553,12 @@
     </congestion-tone>
   </tone-set>
   <tone-set country="Belarus" uncode="by">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.8"/>
         <step length="3.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -575,12 +575,12 @@
       <step freq="1020" level="-12" length="0.333"/>
       <step freq="1140" level="-12" length="0.333"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.5"/>
@@ -601,12 +601,12 @@
     <!-- Billing signal: 16kHz/~2Vrms, differential/~125ms -->
   </tone-set>
   <tone-set country="Benin" uncode="bj">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <payphone-recognition-tone>
       <step freq="1100+1750" level="-12" length="0.2"/>
       <step length="0.2"/>
@@ -618,12 +618,12 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -655,14 +655,14 @@
     <dial-tone>
       <step freq="400+25" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+25" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+25" level="-12" length="0.4"/>
         <step length="2.6"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.6"/>
@@ -689,14 +689,14 @@
     <dial-tone>
       <step freq="350+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400 || 450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -735,12 +735,12 @@
       <step freq="425" level="-12" length="0.975"/>
       <step length="0.05"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -784,12 +784,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -841,14 +841,14 @@
     <dial-tone type="transmission">
       <step freq="1000" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.3"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -907,24 +907,24 @@
         <step length="1.0"/>
       </step>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="9.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.83"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -995,18 +995,18 @@
     <dial-tone domain="analogue">
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="analogue">
+    </ringing-tone>
+    <ringing-tone domain="analogue">
       <step cycles="endless">
         <step freq="440+480" level="-12" length="0.2"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1038,12 +1038,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.25"/>
@@ -1067,12 +1067,12 @@
     <dial-tone type="second">
       <step freq="330 || 440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -1096,18 +1096,18 @@
       <step freq="350+440" level="-12" length="0.1"/>
       <step length="0.1"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="PABX">
+    </ringing-tone>
+    <ringing-tone domain="PABX">
       <step cycles="endless">
         <step freq="440+480" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -1141,12 +1141,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1173,12 +1173,12 @@
     <dial-tone type="second">
       <step freq="330+425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1211,14 +1211,14 @@
     <dial-tone>
       <step freq="350+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -1255,12 +1255,12 @@
     <dial-tone type="second">
       <step freq="330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -1310,12 +1310,12 @@
     <dial-tone type="second">
       <step freq="450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.35"/>
@@ -1364,12 +1364,12 @@
     <dial-tone type="second">
       <step freq="850" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.71"/>
         <step length="3.31"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1385,12 +1385,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="4.6"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.3"/>
@@ -1409,12 +1409,12 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1483,24 +1483,24 @@
     <dial-tone type="second">
       <step freq="1050" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480 || 440+620 || 480+620" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="380+460" level="-12" length="1.0"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+720 || 620+480 || 425" level="-12" length="0.5"/>
@@ -1537,20 +1537,20 @@
     <dial-tone>
       <step freq="350+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.5"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="375+425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="375+425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1604,12 +1604,12 @@
         <step length="0.660"/>
       </step>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.333"/>
@@ -1658,12 +1658,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -1717,12 +1717,12 @@
         <step freq="480+620" level="-12" length="interrupted at 60 ipm"/>
       </step>
     </busy-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <number-unobtainable-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="interrupted at 120 ipm"/>
@@ -1733,12 +1733,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -1761,12 +1761,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -1818,14 +1818,14 @@
       <step freq="33" level="-12" length="0.0166"/>
       <step length="0.0166"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400 || 450" level="-12" length="0.4"/>
         <step length="2.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.8"/>
@@ -1860,12 +1860,12 @@
     <dial-tone>
       <step freq="425" level="-12" length="15.0"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="4.65"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.333"/>
@@ -1884,12 +1884,12 @@
     </waiting-tone>
   </tone-set>
   <tone-set country="Egypt" uncode="eg">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="375+475" level="-12" length="2.0"/>
         <step length="1.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="375+475" level="-12" length="1.0"/>
@@ -1922,12 +1922,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.333"/>
@@ -1939,12 +1939,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.3"/>
@@ -1980,12 +1980,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -2011,12 +2011,12 @@
     <dial-tone>
       <step freq="350+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -2050,12 +2050,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -2083,22 +2083,22 @@
     <dial-tone domain="PABX">
       <step freq="33.33" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="116.33+149.67 || 375+425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="116.33+149.67 || 375+425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="PABX">
+    </ringing-tone>
+    <ringing-tone domain="PABX">
       <step cycles="endless">
         <step freq="383.33+416.67" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="383.33+416.67" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -2146,12 +2146,12 @@
       <step freq="425" level="-12" length="0.65"/>
       <step length="0.025"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.3"/>
@@ -2195,12 +2195,12 @@
     <dial-tone>
       <step freq="330+440 || 440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -2225,12 +2225,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -2260,18 +2260,18 @@
     <dial-tone type="second">
       <step freq="330+440" level="-12" length="7.0"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -2303,12 +2303,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -2323,7 +2323,7 @@
     <dial-tone type="special">
       <step freq="400+425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.25"/>
         <step length="4.0"/>
@@ -2332,8 +2332,8 @@
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.5"/>
         <step length="4.0"/>
@@ -2342,19 +2342,19 @@
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="1.0"/>
         <step length="9.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.48"/>
@@ -2435,12 +2435,12 @@
     <dial-tone>
       <step freq="400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.25"/>
@@ -2482,14 +2482,14 @@
     <dial-tone>
       <step freq="350+400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -2531,12 +2531,12 @@
         <step length="0.8"/>
       </step>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.3"/>
@@ -2591,12 +2591,12 @@
     <dial-tone type="second">
       <step freq="445 || 425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="445 || 425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="445 || 425" level="-12" length="0.25"/>
@@ -2630,12 +2630,12 @@
     </pay-tone>
   </tone-set>
   <tone-set country="Grenada" uncode="gd">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="460+620" level="-12" length="0.5"/>
@@ -2652,12 +2652,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -2681,12 +2681,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -2707,12 +2707,12 @@
     </route-tone>
   </tone-set>
   <tone-set country="Guinea" uncode="gn">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.4"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.2"/>
@@ -2727,12 +2727,12 @@
       <step freq="360+400" level="-12" length="0.2"/>
       <step length="0.5"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.75"/>
         <step length="3.25"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -2758,14 +2758,14 @@
       <step freq="440" level="-12" length="0.135"/>
       <step length="0.135"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
         <step length="4.0"/>
         <step freq="440" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -2796,14 +2796,14 @@
       </step>
       <step freq="350+440 [1%]" level="-13 [-15 -5]" recognition-length="0.3"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480 [1%]" level="-13" length="0.4 [10%]"/>
         <step length="0.2 [10%]"/>
         <step freq="440+480 [1%]" level="-13" length="0.4 [10%]"/>
         <step length="3.0 [10%]" recognition-length="0.6"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620 [1%]" level="-13" length="0.5 [10%]"/>
@@ -2839,12 +2839,12 @@
     <dial-tone type="special">
       <step freq="350+375+400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="3.7"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.3"/>
@@ -2898,12 +2898,12 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="4.7"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -2938,22 +2938,22 @@
     <dial-tone>
       <step freq="33 || 50 || 375+425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="375+425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="375+425" level="-12" length="0.4"/>
         <step length="2.6"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="133 || 375+425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="133 || 375+425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -2982,12 +2982,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3037,12 +3037,12 @@
     <dial-tone type="recall">
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3096,11 +3096,11 @@
       <step freq="133" level="-12" length="0.4"/>
       <step length="1.5"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
@@ -3112,14 +3112,14 @@
     <dial-tone>
       <step freq="400+425+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 450 || 400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400 || 450 || 400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3172,12 +3172,12 @@
       <step freq="400" level="-12" length="1.0"/>
       <step length="0.25"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 425 || 440" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400 || 425 || 440" level="-12" length="0.5"/>
@@ -3249,12 +3249,12 @@
       <step freq="425" level="-12" length="0.2"/>
       <step length="0.2"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.2"/>
@@ -3267,12 +3267,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="50 || 375+475" level="-12" length="1.66"/>
         <step length="3.33"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3289,32 +3289,32 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="1.5"/>
         <step length="4.5"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 133" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400 || 133" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -3381,18 +3381,18 @@
     <dial-tone type="recall">
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="384+416" level="-12" length="1.0"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="PABX">
+    </ringing-tone>
+    <ringing-tone domain="PABX">
       <step cycles="endless">
         <step freq="380+420" level="-12" length="1.0"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -3450,20 +3450,20 @@
     <dial-tone>
       <step freq="380+460 || 400+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="380+460 || 400+440" level="-12" length="1.2"/>
         <step length="4.8"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="383.33+416.67" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="383.33+416.67" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -3526,7 +3526,7 @@
       <step freq="425" level="-12" length="0.75"/>
       <step length="0.75"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
@@ -3537,7 +3537,7 @@
         <step freq="425" level="-12" length="0.4"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3583,14 +3583,14 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3628,12 +3628,12 @@
       <step freq="400 || 450" level="-12" length="1.0"/>
       <step length="2.0"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="1.0"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -3682,18 +3682,18 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3742,12 +3742,12 @@
     </acceptance-tone>
   </tone-set>
   <tone-set country="Kyrgyzstan" uncode="kg">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.8"/>
         <step length="3.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -3775,12 +3775,12 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
@@ -3808,12 +3808,12 @@
     </confirmation-tone>
   </tone-set>
   <tone-set country="Lebanon" uncode="lb">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="435" level="-12" length="1.2"/>
         <step length="4.4"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="435" level="-12" length="0.4"/>
@@ -3825,12 +3825,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3852,12 +3852,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.8"/>
         <step length="3.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -3875,12 +3875,12 @@
     <dial-tone>
       <step freq="425 || 450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.5"/>
@@ -3924,12 +3924,12 @@
       <step freq="425" level="-12" length="1.8"/>
       <step length="0.2"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -3960,12 +3960,12 @@
     </payphone-recognition-tone>
   </tone-set>
   <tone-set country="Madagascar" uncode="mg">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="25" level="-12" length="1.66"/>
         <step length="3.33"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.5"/>
@@ -3981,20 +3981,20 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 133" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400 || 133" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -4034,14 +4034,14 @@
       <step length="0.25"/>
       <step freq="425" level="-12" length="2.0"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -4098,14 +4098,14 @@
     <dial-tone>
       <step freq="350+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -4139,12 +4139,12 @@
       <step freq="425" level="-12" length="0.40"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -4166,14 +4166,14 @@
     </acceptance-tone>
   </tone-set>
   <tone-set country="Malta" uncode="mt">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450 || 375+425 || 383.33+416.67" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450 || 375+425 || 383.33+416.67" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -4203,12 +4203,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -4232,12 +4232,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -4253,12 +4253,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.75"/>
@@ -4274,12 +4274,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -4303,12 +4303,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -4329,12 +4329,12 @@
     </warning-tone>
   </tone-set>
   <tone-set country="Moldova" uncode="md">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.8"/>
         <step length="3.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -4359,12 +4359,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -4419,12 +4419,12 @@
       <step freq="740" level="-12" length="0.3"/>
       <step length="0.2"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.66"/>
         <step length="3.33"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -4437,12 +4437,12 @@
     </route-tone>
   </tone-set>
   <tone-set country="Mozambique" uncode="mz">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -4460,14 +4460,14 @@
     <dial-tone>
       <step freq="407+473" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="407+473" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="407+473" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -4517,20 +4517,20 @@
     <dial-tone type="recall" domain="PABX">
       <step freq="33" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="PABX">
+    </ringing-tone>
+    <ringing-tone domain="PABX">
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -4562,12 +4562,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.1"/>
         <step length="3.1"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -4595,12 +4595,12 @@
       <step freq="425 || 450" level="-12" length="0.5"/>
       <step length="0.05"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.5"/>
@@ -4645,12 +4645,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -4674,14 +4674,14 @@
     <dial-tone>
       <step freq="400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -4752,12 +4752,12 @@
     <dial-tone type="second">
       <step freq="330 || 440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -4785,12 +4785,12 @@
     <dial-tone type="recall">
       <step freq="400 || 425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 425 || 450" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -4832,18 +4832,18 @@
     </holding-tone>
   </tone-set>
   <tone-set country="Norway" uncode="no">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400 || 450" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -4885,14 +4885,14 @@
     <dial-tone type="second">
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -4927,20 +4927,20 @@
     </line-lockout-tone>
   </tone-set>
   <tone-set country="Pakistan" uncode="pk">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="383.33+416.67" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="383.33+416.67" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -4960,12 +4960,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.20"/>
         <step length="4.65"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.32"/>
@@ -5002,14 +5002,14 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 375+425 || 383.33+416.67 || 400+450 || 390+430" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="425 || 375+425 || 383.33+416.67 || 400+450 || 390+430" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425 || 400" level="-12" length="0.375"/>
@@ -5074,12 +5074,12 @@
     </payphone-recognition-tone>
   </tone-set>
   <tone-set country="Paraguay" uncode="py">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
@@ -5123,18 +5123,18 @@
     <dial-tone type="special">
       <step freq="400+425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="1.0"/>
         <step length="10.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425+480" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+720 || 425" level="-12" length="0.5"/>
@@ -5167,12 +5167,12 @@
     <dial-tone type="second">
       <step freq="350+425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -5213,18 +5213,18 @@
       <step freq="425" level="-12" length="1.0"/>
       <step length="0.2"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="analogue">
+    </ringing-tone>
+    <ringing-tone domain="analogue">
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -5281,22 +5281,22 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.2"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400 || 450" level="-12" length="0.8"/>
@@ -5327,12 +5327,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -5356,12 +5356,12 @@
     <dial-tone>
       <step freq="400 || 450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="384+416 || 425+475" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="133 || 450" level="-12" length="0.15"/>
@@ -5380,12 +5380,12 @@
     </number-unobtainable-tone>
   </tone-set>
   <tone-set country="Russia" uncode="ru">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.8"/>
         <step length="3.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -5408,12 +5408,12 @@
     <dial-tone type="second">
       <step freq="340" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -5438,12 +5438,12 @@
     <dial-tone>
       <step freq="350+400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -5477,12 +5477,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -5531,14 +5531,14 @@
     <dial-tone type="second">
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.375"/>
         <step length="0.25"/>
         <step freq="425" level="-12" length="0.375"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -5576,12 +5576,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -5605,12 +5605,12 @@
     <dial-tone>
       <step freq="350+450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.2"/>
         <step length="0.4"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -5633,12 +5633,12 @@
       <step freq="425" level="-12" length="0.2"/>
       <step length="0.2"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.2"/>
@@ -5650,12 +5650,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -5679,12 +5679,12 @@
     <dial-tone type="recall">
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="4.6"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -5724,12 +5724,12 @@
     <dial-tone type="second">
       <step freq="330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.7"/>
         <step length="3.3"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -5745,14 +5745,14 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.375"/>
@@ -5777,12 +5777,12 @@
     <dial-tone>
       <step freq="425 || 450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425 || 450" level="-12" length="0.5"/>
@@ -5809,14 +5809,14 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="401+449" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="401+449" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.75"/>
@@ -5874,12 +5874,12 @@
       <step freq="425" level="-12" length="0.660"/>
       <step length="0.660"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.333"/>
@@ -5932,12 +5932,12 @@
       <step freq="425" level="-12" length="0.2"/>
       <step length="0.3"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -5961,12 +5961,12 @@
     <dial-tone>
       <step freq="400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.4"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -6005,14 +6005,14 @@
       </step>
       <step freq="367+433" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="367+433" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="367+433" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -6090,12 +6090,12 @@
       <step freq="425" level="-12" length="1.0"/>
       <step length="0.1"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.5"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.2"/>
@@ -6176,12 +6176,12 @@
       <step freq="425" level="-12" length="0.65"/>
       <step length="0.03"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
         <step length="0.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.75"/>
@@ -6214,12 +6214,12 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="15.0"/>
         <step length="0.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -6242,14 +6242,14 @@
     <dial-tone>
       <step freq="50" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400" level="-12" length="0.4"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -6297,18 +6297,18 @@
         <step length="0.01"/>
       </step>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="5.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="analogue">
+    </ringing-tone>
+    <ringing-tone domain="analogue">
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="9.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -6389,12 +6389,12 @@
     <dial-tone domain="PABX">
       <step freq="500" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 500" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -6450,18 +6450,18 @@
     <dial-tone type="recall">
       <step freq="450" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425 || 475" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450 || 50" level="-12" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.5"/>
@@ -6504,12 +6504,12 @@
     </number-unobtainable-tone>
   </tone-set>
   <tone-set country="Tajikistan" uncode="tj">
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.8"/>
         <step length="3.2"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -6527,15 +6527,15 @@
     <dial-tone>
       <step freq="50" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step freq="400" level="-12"/>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -6559,12 +6559,12 @@
     <dial-tone>
       <step freq="350+450 || 400" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.5"/>
@@ -6603,12 +6603,12 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -6619,14 +6619,14 @@
       <step freq="440" level="-12" length="0.3"/>
       <step length="10.0"/>
     </waiting-tone>
-    <re-order-tone>
+    <reorder-tone>
       <step freq="480+620" level="-12" length="0.3"/>
       <step length="0.2"/>
-    </re-order-tone>
-    <re-order-tone>
+    </reorder-tone>
+    <reorder-tone>
       <step freq="480+620" level="-12" length="0.2"/>
       <step length="0.3"/>
-    </re-order-tone>
+    </reorder-tone>
   </tone-set>
   <tone-set country="Tunisia" uncode="tn">
     <dial-tone>
@@ -6636,12 +6636,12 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.2"/>
         <step length="4.6"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.25"/>
@@ -6672,12 +6672,12 @@
       <step freq="450" level="-12" length="1.0"/>
       <step length="0.25"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="450" level="-12" length="0.5"/>
@@ -6736,12 +6736,12 @@
     <dial-tone type="second">
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="25" level="-12" length="0.4"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.4"/>
@@ -6776,12 +6776,12 @@
       </step>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480" level="-12" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620" level="-12" length="0.5"/>
@@ -6829,14 +6829,14 @@
     <dial-tone>
       <step freq="33 || 50" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="133+17 || 400+17 || 400+450" level="-12" length="0.25"/>
         <step length="0.5"/>
         <step freq="133+17 || 400+17 || 400+450" level="-12" length="0.25"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -6865,14 +6865,14 @@
     <dial-tone>
       <step freq="350+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450 || 425" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450 || 425" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400 || 425" level="-12" length="0.375"/>
@@ -6897,14 +6897,14 @@
     <dial-tone>
       <step freq="350+440 || 50" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450 || 375+425 || 383.33+416.67" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450 || 375+425 || 383.33+416.67" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
@@ -6957,18 +6957,18 @@
       </step>
       <step freq="350+440" level="-16 [0.75dB]"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440+480 || 380+460" level="-19 [1.5dB]" length="2.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone domain="PABX">
+    </ringing-tone>
+    <ringing-tone domain="PABX">
       <step cycles="endless">
         <step freq="440+480" level="-16 [1.5dB]" length="1.0"/>
         <step length="3.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="480+620 || 480+720" level="-24 [1.5dB]" length="0.5"/>
@@ -7069,12 +7069,12 @@
       <step freq="450" level="-12" length="0.2"/>
       <step length="0.3"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -7126,20 +7126,20 @@
       <step freq="425" level="-12" length="0.4"/>
       <step length="0.04"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450 || 116.33+149.67" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450 || 116.33+149.67" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.75"/>
@@ -7187,12 +7187,12 @@
     <dial-tone>
       <step freq="440 || 330+440" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="1.5"/>
         <step length="3.5"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="440" level="-12" length="0.5"/>
@@ -7216,14 +7216,14 @@
     <dial-tone>
       <step freq="425" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450" level="-12" length="0.375"/>
         <step length="0.25"/>
         <step freq="400+450" level="-12" length="0.375"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <congestion-tone>
       <step cycles="endless">
         <step recorded-announcement="true"/>
@@ -7244,18 +7244,18 @@
         <step length="0.3"/>
       </step>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425+475" level="-12" length="1.0"/>
         <step length="9.0"/>
       </step>
-    </ringback-tone>
-    <ringback-tone>
+    </ringing-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -7280,12 +7280,12 @@
     <dial-tone>
       <step freq="425 || 50" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="1.0"/>
         <step length="4.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="425" level="-12" length="0.5"/>
@@ -7329,14 +7329,14 @@
     <dial-tone type="second">
       <step freq="400+450 || 367+433" level="-12"/>
     </dial-tone>
-    <ringback-tone>
+    <ringing-tone>
       <step cycles="endless">
         <step freq="400+450 || 367+433" level="-12" length="0.4"/>
         <step length="0.2"/>
         <step freq="400+450 || 367+433" level="-12" length="0.4"/>
         <step length="2.0"/>
       </step>
-    </ringback-tone>
+    </ringing-tone>
     <busy-tone>
       <step cycles="endless">
         <step freq="400" level="-12" length="0.375"/>
diff --git a/libs/spandsp/spandsp/tones.dtd b/libs/spandsp/spandsp/tones.dtd
index 023f8d0783..b751d2387d 100644
--- a/libs/spandsp/spandsp/tones.dtd
+++ b/libs/spandsp/spandsp/tones.dtd
@@ -1,21 +1,64 @@
 <!-- Global PSTN supervisory tones -->
 <!ELEMENT global-tones (tone-set)* >
-<!ELEMENT tone-set (dial-tone|ringback-tone|busy-tone|congestion-tone|number-unobtainable-tone|special-information-tone|call-waiting-tone|waiting-tone|payphone-recognition-tone|test-number-tone|end-of-three-party-service-tone|service-activated-tone|record-tone|facilities-tone|offering-tone|positive-indication-tone|negative-indication-tone|route-tone|pay-tone|confirmation-tone|intrusion-tone|intercept-tone|warning-tone|holding-tone|search-tone|acceptance-tone|executive-override-tone|function-acknowledge-tone|queue-tone|valid-tone-radio-paging|notify-tone|re-order-tone|preemption-tone|comfort-tone|connection-tone|refusal-tone|line-lockout-tone|permanent-signal-tone|identification-tone|reorder-tone|recall-dial-tone|special-ringback-tone|busy-verification-tone)* >
-
+<!ELEMENT tone-set (dial-tone
+                   |ringing-tone
+                   |busy-tone
+                   |congestion-tone
+                   |number-unobtainable-tone
+                   |special-information-tone
+                   |call-waiting-tone
+                   |waiting-tone
+                   |pay-tone
+                   |payphone-recognition-tone
+                   |warning-tone
+                   |test-number-tone
+                   |end-of-three-party-service-tone
+                   |service-activated-tone
+                   |record-tone
+                   |facilities-tone
+                   |offering-tone
+                   |route-tone
+                   |confirmation-tone
+                   |intrusion-tone
+                   |intercept-tone
+                   |reorder-tone
+                   |holding-tone
+                   |search-tone
+                   |acceptance-tone
+                   |executive-override-tone
+                   |function-acknowledge-tone
+                   |queue-tone
+                   |valid-tone-radio-paging
+                   |notify-tone
+                   |preemption-tone
+                   |comfort-tone
+                   |connection-tone
+                   |refusal-tone
+                   |line-lockout-tone
+                   |permanent-signal-tone
+                   |identification-tone
+                   |positive-indication-tone
+                   |negative-indication-tone)* >
 <!ATTLIST tone-set
   country   CDATA   #REQUIRED
   uncode    CDATA   #REQUIRED
   >
 
+<!-- Dialing tones -->
 <!ELEMENT dial-tone (step)* >
 <!ATTLIST dial-tone
   domain    CDATA   #IMPLIED
   type      CDATA   #IMPLIED
   >
-<!ELEMENT ringback-tone (step)* >
-<!ATTLIST ringback-tone
+
+<!-- Post-dialing tones -->
+<!ELEMENT ringing-tone (step)* >
+<!ATTLIST ringing-tone
   domain    CDATA   #IMPLIED
+  type      CDATA   #IMPLIED
   >
+
+<!-- Dial result tones -->
 <!ELEMENT busy-tone (step)* >
 <!ATTLIST busy-tone
   domain    CDATA   #IMPLIED
@@ -32,11 +75,14 @@
 <!ATTLIST special-information-tone
   domain    CDATA   #IMPLIED
   >
+
 <!ELEMENT call-waiting-tone (step)* >
 <!ATTLIST call-waiting-tone
   domain    CDATA   #IMPLIED
   type      CDATA   #IMPLIED
   >
+
+<!-- Payment related tones -->
 <!ELEMENT pay-tone (step)* >
 <!ATTLIST pay-tone
   domain    CDATA   #IMPLIED
@@ -45,6 +91,7 @@
 <!ATTLIST payphone-recognition-tone
   domain    CDATA   #IMPLIED
   >
+
 <!ELEMENT warning-tone (step)* >
 <!ATTLIST warning-tone
   type      CDATA   #IMPLIED
@@ -54,19 +101,6 @@
 <!ATTLIST reorder-tone
   domain    CDATA   #IMPLIED
   >
-<!ELEMENT recall-dial-tone (step)* >
-<!ATTLIST recall-dial-tone
-  domain    CDATA   #IMPLIED
-  >
-<!ELEMENT special-ringback-tone (step)* >
-<!ATTLIST special-ringback-tone
-  domain    CDATA   #IMPLIED
-  >
-<!ELEMENT busy-verification-tone (step)* >
-<!ATTLIST busy-verification-tone
-  domain    CDATA   #IMPLIED
-  >
-
 <!ELEMENT waiting-tone (step)* >
 <!ATTLIST waiting-tone
   domain    CDATA   #IMPLIED
@@ -95,14 +129,6 @@
 <!ATTLIST offering-tone
   domain    CDATA   #IMPLIED
   >
-<!ELEMENT positive-indication-tone (step)* >
-<!ATTLIST positive-indication-tone
-  domain    CDATA   #IMPLIED
-  >
-<!ELEMENT negative-indication-tone (step)* >
-<!ATTLIST negative-indication-tone
-  domain    CDATA   #IMPLIED
-  >
 <!ELEMENT route-tone (step)* >
 <!ATTLIST route-tone
   domain    CDATA   #IMPLIED
@@ -151,10 +177,6 @@
 <!ATTLIST notify-tone
   domain    CDATA   #IMPLIED
   >
-<!ELEMENT re-order-tone (step)* >
-<!ATTLIST re-order-tone
-  domain    CDATA   #IMPLIED
-  >
 <!ELEMENT preemption-tone (step)* >
 <!ATTLIST preemption-tone
   domain    CDATA   #IMPLIED
@@ -183,6 +205,14 @@
 <!ATTLIST identification-tone
   domain    CDATA   #IMPLIED
   >
+<!ELEMENT positive-indication-tone (step)* >
+<!ATTLIST positive-indication-tone
+  domain    CDATA   #IMPLIED
+  >
+<!ELEMENT negative-indication-tone (step)* >
+<!ATTLIST negative-indication-tone
+  domain    CDATA   #IMPLIED
+  >
 
 <!ELEMENT step (step|EMPTY)* >
 <!ATTLIST step
diff --git a/libs/spandsp/spandsp/tsb85.xml b/libs/spandsp/spandsp/tsb85.xml
index af38a9a3fe..8826098946 100644
--- a/libs/spandsp/spandsp/tsb85.xml
+++ b/libs/spandsp/spandsp/tsb85.xml
@@ -2534,7 +2534,7 @@
         <!-- UNKNOWN_BCS_3 -->
         <step dir="T" type="PREAMBLE" modem="V.21" value="37"/>
         <step dir="T" type="HDLC" tag="GARBAGE" value="A2 02 B5 C9 7E 67"/>
- 
+
         <step dir="R" type="HDLC" modem="V.21" tag="DIS" value="FF C8 01 ..." timeout="60000"/>
         <step dir="R" type="SILENCE"/>
 
@@ -6123,7 +6123,7 @@
         <step type="ANSWER" value="etsi_300_242_a4_white.tif"/>
 
         <step dir="R" type="CNG"/>
- 
+
         <step dir="T" type="CED"/>
         <step type="WAIT" value="75"/>
         <step dir="T" type="PREAMBLE" modem="V.21"/>