From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 31 Oct 2007 17:51:35 +0000 (+0000)
Subject: Update the platform files: the root tag is now called 'platform', not 'platform_descr... 
X-Git-Tag: v3.3~868
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e88eac1cbcd65de4fed7073b110f3730d4cccf31

Update the platform files: the root tag is now called 'platform', not 'platform_description'. Everyone knows that XML is a descriptive language, right?

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4946 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/doc/gtut-files/03-args.xml b/doc/gtut-files/03-args.xml
index ce7d7a7246..569ba54eb9 100644
--- a/doc/gtut-files/03-args.xml
+++ b/doc/gtut-files/03-args.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="server">
     <argument value="12345"/>
   </process>
@@ -8,5 +8,5 @@
     <argument value="Jacquelin"/>
     <argument value="12345"/>
   </process>
-</platform_description>
+</platform>
 
diff --git a/doc/gtut-files/11-explicitwait.xml b/doc/gtut-files/11-explicitwait.xml
index 738ab3eaf4..5ce5aab1cf 100644
--- a/doc/gtut-files/11-explicitwait.xml
+++ b/doc/gtut-files/11-explicitwait.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="server">
     <argument value="12345"/>
   </process>
@@ -12,5 +12,5 @@
     <argument value="Jacquelin"/>
     <argument value="12345"/>
   </process>
-</platform_description>
+</platform>
 
diff --git a/doc/gtut-files/gtut-platform-3nodes.xml b/doc/gtut-files/gtut-platform-3nodes.xml
index 1c4367075a..ddee793a89 100644
--- a/doc/gtut-files/gtut-platform-3nodes.xml
+++ b/doc/gtut-files/gtut-platform-3nodes.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Jacquelin" power="137333000"/>
   <host id="Boivin"    power="98095000"/>
   <host id="Geoff"     power="42917000"/>
@@ -17,5 +17,5 @@
 
   <route src="Geoff"  dst="Boivin">      <link:ctn id="3"/></route>
   <route src="Boivin" dst="Geoff">       <link:ctn id="3"/></route>
-</platform_description>
+</platform>
 
diff --git a/doc/gtut-files/gtut-platform.xml b/doc/gtut-files/gtut-platform.xml
index 61601fe77e..2271f761dc 100644
--- a/doc/gtut-files/gtut-platform.xml
+++ b/doc/gtut-files/gtut-platform.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Jacquelin" power="137333000"/>
   <host id="Boivin" power="98095000"/>
   <link id="1" bandwidth="3430125" latency="0.000536941"/>
   <route src="Jacquelin" dst="Boivin"><link:ctn id="1"/></route>
   <route src="Boivin" dst="Jacquelin"><link:ctn id="1"/></route>
-</platform_description>
+</platform>
 
diff --git a/doc/gtut-files/test.xml b/doc/gtut-files/test.xml
index 91d01fce42..b281dd8395 100644
--- a/doc/gtut-files/test.xml
+++ b/doc/gtut-files/test.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="server">
   </process>
   <process host="Boivin" function="client">
   </process>
-</platform_description>
+</platform>
 
diff --git a/examples/amok/bandwidth/bandwidth.xml b/examples/amok/bandwidth/bandwidth.xml
index 40449640af..03b7deb502 100644
--- a/examples/amok/bandwidth/bandwidth.xml
+++ b/examples/amok/bandwidth/bandwidth.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="sensor">
      <argument value="Ginette:4000"/>       <!-- maestro -->
   </process>
@@ -10,4 +10,4 @@
   <process host="Ginette" function="maestro">
      <argument value="4000"/>   <!-- my port -->
   </process>
-</platform_description>
+</platform>
diff --git a/examples/amok/saturate/medium_deployment.xml b/examples/amok/saturate/medium_deployment.xml
index aa9bd184cf..9b52d008fd 100644
--- a/examples/amok/saturate/medium_deployment.xml
+++ b/examples/amok/saturate/medium_deployment.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Apple" function="maestro">
      <argument value="Anne_Marie:4000"/>
      <argument value="Audy:4000"/>
@@ -87,4 +87,4 @@
   <process host="Jeannine" function="sensor">
      <argument value="4000"/>
   </process>
-</platform_description>
+</platform>
diff --git a/examples/amok/saturate/medium_platform.xml b/examples/amok/saturate/medium_platform.xml
index 08363701b1..fb1e431fba 100644
--- a/examples/amok/saturate/medium_platform.xml
+++ b/examples/amok/saturate/medium_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Apple" power="76296000"/>
   <host id="Anne_Marie" power="42917000"/>
   <host id="Audy" power="98095000"/>
@@ -1453,4 +1453,4 @@
   <route src="Jeannine" dst="Olivier">
     <link:ctn id="23"/><link:ctn id="9"/><link:ctn id="8"/><link:ctn id="5"/><link:ctn id="4"/><link:ctn id="2"/><link:ctn id="0"/><link:ctn id="1"/><link:ctn id="19"/><link:ctn id="14"/><link:ctn id="16"/><link:ctn id="37"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/amok/saturate/saturate.xml b/examples/amok/saturate/saturate.xml
index 9caee9f6c2..0c6c6cd09f 100644
--- a/examples/amok/saturate/saturate.xml
+++ b/examples/amok/saturate/saturate.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
   <process host="Tremblay" function="sensor">  <argument value="Bourassa:4000"/> </process>
   <process host="Jupiter"  function="sensor">  <argument value="Bourassa:4000"/> </process>
@@ -9,4 +9,4 @@
 
   <process host="Bourassa" function="maestro"> <argument value="4000"/>          </process>
 
-</platform_description>
+</platform>
diff --git a/examples/gras/all2all/all2all.xml b/examples/gras/all2all/all2all.xml
index 46bf362b0c..3d6e3dba17 100644
--- a/examples/gras/all2all/all2all.xml
+++ b/examples/gras/all2all/all2all.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- For each host, we have a sender and a receiver (because we use a
        1-port model and still don't want any deadlocks neither synchronization
        delays).
@@ -71,4 +71,4 @@
      <argument value="4000"/>
      <argument value="4"/>
   </process>
-</platform_description>
+</platform>
diff --git a/examples/gras/chrono/chrono.xml b/examples/gras/chrono/chrono.xml
index 6aead32f38..b0ddc533e4 100644
--- a/examples/gras/chrono/chrono.xml
+++ b/examples/gras/chrono/chrono.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="multiplier"/>
-</platform_description>
+</platform>
diff --git a/examples/gras/mmrpc/mmrpc.xml b/examples/gras/mmrpc/mmrpc.xml
index 0b4d690e3d..f94097519a 100644
--- a/examples/gras/mmrpc/mmrpc.xml
+++ b/examples/gras/mmrpc/mmrpc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="server">
      <argument value="4000"/>       <!-- port number -->
   </process>
@@ -8,4 +8,4 @@
      <argument value="Tremblay"/>   <!-- server host -->
      <argument value="4000"/>       <!-- port number -->
   </process>
-</platform_description>
+</platform>
diff --git a/examples/gras/mutual_exclusion/simple_token/simple_token.xml b/examples/gras/mutual_exclusion/simple_token/simple_token.xml
index 1a139313fb..904f68b9c2 100644
--- a/examples/gras/mutual_exclusion/simple_token/simple_token.xml
+++ b/examples/gras/mutual_exclusion/simple_token/simple_token.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
  <process host="Tremblay" function="node">
   <argument value="4000"/>                           <!-- port on which I am listening -->
@@ -28,4 +28,4 @@
   <argument value="Tremblay"/><argument value="4000"/><!-- peer (successor) host id and port-->
  </process>
  
-</platform_description>
+</platform>
diff --git a/examples/gras/p2p/can/can.xml b/examples/gras/p2p/can/can.xml
index a84afff230..3f49cd03ad 100644
--- a/examples/gras/p2p/can/can.xml
+++ b/examples/gras/p2p/can/can.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
 
@@ -40,5 +40,5 @@
     <argument value="4000"/>         <!-- my port -->
   </process>
 
-</platform_description>
+</platform>
 
diff --git a/examples/gras/p2p/chord/chord.xml b/examples/gras/p2p/chord/chord.xml
index 7b1bfd7a33..34836e9c48 100644
--- a/examples/gras/p2p/chord/chord.xml
+++ b/examples/gras/p2p/chord/chord.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
   <process host="Gatien" function="node">
     <argument value="48"/>           <!-- my id -->
@@ -142,4 +142,4 @@
     <argument value="4000"/>         <!-- my port -->
   </process>
 
-</platform_description>
+</platform>
diff --git a/examples/gras/ping/ping.xml b/examples/gras/ping/ping.xml
index 0b4d690e3d..f94097519a 100644
--- a/examples/gras/ping/ping.xml
+++ b/examples/gras/ping/ping.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="server">
      <argument value="4000"/>       <!-- port number -->
   </process>
@@ -8,4 +8,4 @@
      <argument value="Tremblay"/>   <!-- server host -->
      <argument value="4000"/>       <!-- port number -->
   </process>
-</platform_description>
+</platform>
diff --git a/examples/gras/pmm/pmm.xml b/examples/gras/pmm/pmm.xml
index da270daf94..d15212d02f 100644
--- a/examples/gras/pmm/pmm.xml
+++ b/examples/gras/pmm/pmm.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
   <process host="Jacquelin" function="master">
      <argument value="4242"/>
@@ -26,4 +26,4 @@
   <process host="Paul"       function="slave"><argument value="Jacquelin:4242"/></process>
   <process host="St_Jean"    function="slave"><argument value="Jacquelin:4242"/></process>
   <process host="Jill"       function="slave"><argument value="Jacquelin:4242"/></process>
-</platform_description>
+</platform>
diff --git a/examples/gras/pmm/pmm_plateform.xml b/examples/gras/pmm/pmm_plateform.xml
index e20778db7e..1db8499a5a 100644
--- a/examples/gras/pmm/pmm_plateform.xml
+++ b/examples/gras/pmm/pmm_plateform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 	<host id="Jacquelin" power="137333000"/>
 	<host id="Boivin" power="98095000"/>
 	<host id="Jean_Yves" power="98095000"/>
@@ -323,5 +323,5 @@
   <route src="Laroche" dst="iRMX"><link:ctn id="91"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="89"/><link:ctn id="172"/></route>
   <route src="Laroche" dst="McGee"><link:ctn id="91"/><link:ctn id="82"/><link:ctn id="80"/><link:ctn id="78"/><link:ctn id="79"/><link:ctn id="9"/><link:ctn id="8"/><link:ctn id="48"/><link:ctn id="38"/><link:ctn id="41"/></route>
   <route src="Laroche" dst="Gatien"><link:ctn id="91"/><link:ctn id="82"/><link:ctn id="80"/><link:ctn id="78"/><link:ctn id="79"/><link:ctn id="9"/><link:ctn id="8"/><link:ctn id="48"/><link:ctn id="38"/><link:ctn id="40"/><link:ctn id="115"/></route>
-</platform_description>
+</platform>
   
diff --git a/examples/gras/rpc/rpc.xml b/examples/gras/rpc/rpc.xml
index 92d074a763..152517b6a1 100644
--- a/examples/gras/rpc/rpc.xml
+++ b/examples/gras/rpc/rpc.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="server">
      <argument value="4000"/>       <!-- port number -->
   </process>
@@ -17,4 +17,4 @@
      <argument value="Ginette"/>   <!-- forwarder host -->
      <argument value="4000"/>       <!-- forwarder port number -->
   </process>
-</platform_description>
+</platform>
diff --git a/examples/gras/spawn/spawn.xml b/examples/gras/spawn/spawn.xml
index 33f984a6e1..3c8fd84fcb 100644
--- a/examples/gras/spawn/spawn.xml
+++ b/examples/gras/spawn/spawn.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="father">
      <argument value="4000"/>       <!-- port number -->
      <argument value="5"/>          <!-- number of childs -->
   </process>
-</platform_description>
+</platform>
diff --git a/examples/gras/synchro/synchro.xml b/examples/gras/synchro/synchro.xml
index 75b5d70883..8cbf8dbadd 100644
--- a/examples/gras/synchro/synchro.xml
+++ b/examples/gras/synchro/synchro.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="philosopher">
      <argument value="5"/>          <!-- amount of pals to create -->
   </process>
-</platform_description>
+</platform>
diff --git a/examples/gras/timer/timer.xml b/examples/gras/timer/timer.xml
index e7c2a6692d..476cf91733 100644
--- a/examples/gras/timer/timer.xml
+++ b/examples/gras/timer/timer.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Fafard" function="client"></process>
-</platform_description>
+</platform>
diff --git a/examples/java/basic/basic_deployment.xml b/examples/java/basic/basic_deployment.xml
index 7846761da0..ff372c1671 100644
--- a/examples/java/basic/basic_deployment.xml
+++ b/examples/java/basic/basic_deployment.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="Master">
      <argument value="5"/>
      <argument value="50000"/>
@@ -30,4 +30,4 @@
   <process host="Robert" function="Slave"/>
   <process host="Sirois" function="Slave"/>
   <process host="Monique" function="Slave"/>
-</platform_description>
+</platform>
diff --git a/examples/java/basic/basic_platform.xml b/examples/java/basic/basic_platform.xml
index 85be94b5d9..1b8ceceed7 100644
--- a/examples/java/basic/basic_platform.xml
+++ b/examples/java/basic/basic_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Jacquelin" power="137333000"/>
   <host id="Boivin" power="98095000"/>
   <host id="Jean_Yves" power="98095000"/>
@@ -8293,4 +8293,4 @@
   <route src="Dodge" dst="Doyon"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="78"/><link:ctn id="79"/><link:ctn id="9"/><link:ctn id="6"/><link:ctn id="10"/><link:ctn id="16"/><link:ctn id="17"/><link:ctn id="54"/><link:ctn id="56"/><link:ctn id="58"/><link:ctn id="62"/><link:ctn id="132"/></route>
   <route src="Dodge" dst="Fafard"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="90"/><link:ctn id="179"/></route>
   <route src="Dodge" dst="Croteau"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="89"/><link:ctn id="175"/></route>
-</platform_description>
+</platform>
diff --git a/examples/java/comm_time/comm_time_deployment.xml b/examples/java/comm_time/comm_time_deployment.xml
index e406291664..0d8cf2e12b 100644
--- a/examples/java/comm_time/comm_time_deployment.xml
+++ b/examples/java/comm_time/comm_time_deployment.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="Master">
      <argument value="10000"/>
      <argument value="50000"/>
@@ -46,4 +46,4 @@
   <process host="Pointe_Claire" function="Slave"/>
   <process host="Kansas" function="Slave"/>
   <process host="King" function="Slave"/>
-</platform_description>
+</platform>
diff --git a/examples/java/comm_time/comm_time_platform.xml b/examples/java/comm_time/comm_time_platform.xml
index 85be94b5d9..1b8ceceed7 100644
--- a/examples/java/comm_time/comm_time_platform.xml
+++ b/examples/java/comm_time/comm_time_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Jacquelin" power="137333000"/>
   <host id="Boivin" power="98095000"/>
   <host id="Jean_Yves" power="98095000"/>
@@ -8293,4 +8293,4 @@
   <route src="Dodge" dst="Doyon"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="78"/><link:ctn id="79"/><link:ctn id="9"/><link:ctn id="6"/><link:ctn id="10"/><link:ctn id="16"/><link:ctn id="17"/><link:ctn id="54"/><link:ctn id="56"/><link:ctn id="58"/><link:ctn id="62"/><link:ctn id="132"/></route>
   <route src="Dodge" dst="Fafard"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="90"/><link:ctn id="179"/></route>
   <route src="Dodge" dst="Croteau"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="89"/><link:ctn id="175"/></route>
-</platform_description>
+</platform>
diff --git a/examples/java/ping_pong/ping_pong_deployment.xml b/examples/java/ping_pong/ping_pong_deployment.xml
index bbae6e737c..1292a6e1fb 100644
--- a/examples/java/ping_pong/ping_pong_deployment.xml
+++ b/examples/java/ping_pong/ping_pong_deployment.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Inmos" function="Sender">
       <argument value="Bellevue"/>
   </process>
 <process host="Bellevue" function="Receiver"/>
-</platform_description>
+</platform>
diff --git a/examples/java/ping_pong/ping_pong_platform.xml b/examples/java/ping_pong/ping_pong_platform.xml
index 399345e33a..c4f80d0cc7 100644
--- a/examples/java/ping_pong/ping_pong_platform.xml
+++ b/examples/java/ping_pong/ping_pong_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- ljlkj -->
   <host id="Inmos" power="98095000"/>
   <host id="Bellevue" power="76296000"/>
@@ -87,4 +87,4 @@
   <route src="Bourassa" dst="Ginette">
     <link:ctn id="7"/><link:ctn id="6"/><link:ctn id="1"/><link:ctn id="0"/><link:ctn id="2"/><link:ctn id="5"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/java/suspend/suspend_deployment.xml b/examples/java/suspend/suspend_deployment.xml
index 4f1d09d619..5e4274247c 100644
--- a/examples/java/suspend/suspend_deployment.xml
+++ b/examples/java/suspend/suspend_deployment.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="DreamMaster"/>
-</platform_description>
+</platform>
diff --git a/examples/java/suspend/suspend_platform.xml b/examples/java/suspend/suspend_platform.xml
index 85be94b5d9..1b8ceceed7 100644
--- a/examples/java/suspend/suspend_platform.xml
+++ b/examples/java/suspend/suspend_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Jacquelin" power="137333000"/>
   <host id="Boivin" power="98095000"/>
   <host id="Jean_Yves" power="98095000"/>
@@ -8293,4 +8293,4 @@
   <route src="Dodge" dst="Doyon"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="78"/><link:ctn id="79"/><link:ctn id="9"/><link:ctn id="6"/><link:ctn id="10"/><link:ctn id="16"/><link:ctn id="17"/><link:ctn id="54"/><link:ctn id="56"/><link:ctn id="58"/><link:ctn id="62"/><link:ctn id="132"/></route>
   <route src="Dodge" dst="Fafard"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="90"/><link:ctn id="179"/></route>
   <route src="Dodge" dst="Croteau"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="89"/><link:ctn id="175"/></route>
-</platform_description>
+</platform>
diff --git a/examples/msg/gtnets/dogbone-d.xml b/examples/msg/gtnets/dogbone-d.xml
index 3ab11bf489..74047ce4e8 100644
--- a/examples/msg/gtnets/dogbone-d.xml
+++ b/examples/msg/gtnets/dogbone-d.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
   <process host="S1" function="master">
       <argument value="10000000"/>
@@ -15,4 +15,4 @@
   <process host="C1" function="slave"/>
   <process host="C2" function="slave"/>
 
-</platform_description>
+</platform>
diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml
index eca6d01178..979e60247a 100644
--- a/examples/msg/gtnets/dogbone-p.xml
+++ b/examples/msg/gtnets/dogbone-p.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2"><!--- 
+<platform version="2"><!--- 
   dogbone
 -->
 
@@ -62,4 +62,4 @@
   <route src="R2" dst="C2">
      <link:ctn id="5"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/msg/gtnets/onelink-d.xml b/examples/msg/gtnets/onelink-d.xml
index 0483e6a529..fcf23245fd 100644
--- a/examples/msg/gtnets/onelink-d.xml
+++ b/examples/msg/gtnets/onelink-d.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
   <process host="S1" function="master">
       <argument value="100000000"/>
@@ -9,4 +9,4 @@
 
   <process host="C1" function="slave"/>
 
-</platform_description>
+</platform>
diff --git a/examples/msg/gtnets/onelink-p.xml b/examples/msg/gtnets/onelink-p.xml
index b372764c83..04e9db2e4d 100644
--- a/examples/msg/gtnets/onelink-p.xml
+++ b/examples/msg/gtnets/onelink-p.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2"><!--- 
+<platform version="2"><!--- 
    S1  --------- C1
         link 1
         100MB, 5ms
@@ -16,4 +16,4 @@
      <link:ctn id="1"/>
   </route>
 
-</platform_description>
+</platform>
diff --git a/examples/msg/gtnets/r-n200-f50-s4-2-d.xml b/examples/msg/gtnets/r-n200-f50-s4-2-d.xml
index d1431f3b6a..0f8d6e0299 100644
--- a/examples/msg/gtnets/r-n200-f50-s4-2-d.xml
+++ b/examples/msg/gtnets/r-n200-f50-s4-2-d.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="S1" function="master">
       <argument value="100000"/>
       <argument value="C1"/>
@@ -251,4 +251,4 @@
   <process host="C48" function="slave"/>
   <process host="C49" function="slave"/>
   <process host="C50" function="slave"/>
-</platform_description>
+</platform>
diff --git a/examples/msg/gtnets/r-n200-f50-s4-2-p.xml b/examples/msg/gtnets/r-n200-f50-s4-2-p.xml
index 303c69820f..58d2a8c24c 100644
--- a/examples/msg/gtnets/r-n200-f50-s4-2-p.xml
+++ b/examples/msg/gtnets/r-n200-f50-s4-2-p.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="S1" power="100"/>
   <host id="C1" power="100"/>
   <host id="S2" power="100"/>
@@ -1869,4 +1869,4 @@
   <route src="R169" dst="C50">
      <link:ctn id="451"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/msg/masterslave/deployment_masterslave.xml b/examples/msg/masterslave/deployment_masterslave.xml
index e5d68e83ac..1a5967a787 100644
--- a/examples/msg/masterslave/deployment_masterslave.xml
+++ b/examples/msg/masterslave/deployment_masterslave.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- The master process (with some arguments) -->
   <process host="Tremblay" function="master">
      <argument value="20"/>       <!-- Number of tasks -->
@@ -18,4 +18,4 @@
   <process host="Fafard" function="slave"/>
   <process host="Ginette" function="slave"/>
   <process host="Bourassa" function="slave"/>
-</platform_description>
+</platform>
diff --git a/examples/msg/masterslave/deployment_masterslave_forwarder.xml b/examples/msg/masterslave/deployment_masterslave_forwarder.xml
index bcdace664c..8d40731ee4 100644
--- a/examples/msg/masterslave/deployment_masterslave_forwarder.xml
+++ b/examples/msg/masterslave/deployment_masterslave_forwarder.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="master">
      <argument value="20"/>       <!-- Number of tasks -->
      <argument value="5000000"/>  <!-- Computation size of tasks -->
@@ -30,4 +30,4 @@
   <process host="Robert" function="slave"/>
   <process host="Sirois" function="slave"/>
   <process host="Monique" function="slave"/>
-</platform_description>
+</platform>
diff --git a/examples/msg/msg_platform.xml b/examples/msg/msg_platform.xml
index 85be94b5d9..1b8ceceed7 100644
--- a/examples/msg/msg_platform.xml
+++ b/examples/msg/msg_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Jacquelin" power="137333000"/>
   <host id="Boivin" power="98095000"/>
   <host id="Jean_Yves" power="98095000"/>
@@ -8293,4 +8293,4 @@
   <route src="Dodge" dst="Doyon"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="78"/><link:ctn id="79"/><link:ctn id="9"/><link:ctn id="6"/><link:ctn id="10"/><link:ctn id="16"/><link:ctn id="17"/><link:ctn id="54"/><link:ctn id="56"/><link:ctn id="58"/><link:ctn id="62"/><link:ctn id="132"/></route>
   <route src="Dodge" dst="Fafard"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="90"/><link:ctn id="179"/></route>
   <route src="Dodge" dst="Croteau"><link:ctn id="180"/><link:ctn id="81"/><link:ctn id="80"/><link:ctn id="82"/><link:ctn id="87"/><link:ctn id="88"/><link:ctn id="89"/><link:ctn id="175"/></route>
-</platform_description>
+</platform>
diff --git a/examples/msg/priority/deployment_priority.xml b/examples/msg/priority/deployment_priority.xml
index f8d0230e75..8085feaa55 100644
--- a/examples/msg/priority/deployment_priority.xml
+++ b/examples/msg/priority/deployment_priority.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2"><!-- For using with ping_pong, platform_sendrecv.xml -->
+<platform version="2"><!-- For using with ping_pong, platform_sendrecv.xml -->
 
   <process host="Fafard" function="test">
 	<argument value="76296000"/>
@@ -10,4 +10,4 @@
 	<argument value="76296000"/>
 	<argument value="2.0"/>
   </process>
-</platform_description>
+</platform>
diff --git a/examples/msg/sendrecv/deployment_sendrecv.xml b/examples/msg/sendrecv/deployment_sendrecv.xml
index fb0f83f22f..350aeed14a 100644
--- a/examples/msg/sendrecv/deployment_sendrecv.xml
+++ b/examples/msg/sendrecv/deployment_sendrecv.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2"><!-- For using with ping_pong, platform_sendrecv.xml -->
+<platform version="2"><!-- For using with ping_pong, platform_sendrecv.xml -->
 
   <process host="Inmos" function="sender">
 	<argument value="Bellevue"/>
   </process>
   <process host="Bellevue" function="receiver"/>
-</platform_description>
+</platform>
diff --git a/examples/msg/sendrecv/platform_sendrecv.xml b/examples/msg/sendrecv/platform_sendrecv.xml
index c52a4e7bbc..4fb9e898e5 100644
--- a/examples/msg/sendrecv/platform_sendrecv.xml
+++ b/examples/msg/sendrecv/platform_sendrecv.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- For using with ping_pong example, very simple platform -->
   <host id="Inmos" power="98095000"/>
   <host id="Bellevue" power="76296000"/>
@@ -11,4 +11,4 @@
   <route src="Bellevue" dst="Inmos">
     <link:ctn id="link"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/msg/small_platform.xml b/examples/msg/small_platform.xml
index 00f2050e04..5a11fd5e77 100644
--- a/examples/msg/small_platform.xml
+++ b/examples/msg/small_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- ljlkj -->
   <host id="Tremblay" power="98095000"/>
   <host id="Jupiter" power="76296000"/>
@@ -86,4 +86,4 @@
   <route src="Bourassa" dst="Ginette">
     <link:ctn id="7"/><link:ctn id="6"/><link:ctn id="1"/><link:ctn id="0"/><link:ctn id="2"/><link:ctn id="5"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/msg/small_platform_with_failures.xml b/examples/msg/small_platform_with_failures.xml
index 5bb407b6fd..86ed9fa09e 100644
--- a/examples/msg/small_platform_with_failures.xml
+++ b/examples/msg/small_platform_with_failures.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- ljlkj -->
   <host id="Tremblay" power="98095000"/>
   <host id="Jupiter" power="76296000" state_file="jupiter_state.trace"/>
@@ -87,4 +87,4 @@
   <route src="Bourassa" dst="Ginette">
     <link:ctn id="7"/><link:ctn id="6"/><link:ctn id="1"/><link:ctn id="0"/><link:ctn id="2"/><link:ctn id="5"/>
   </route>
-</platform_description>
+</platform>
diff --git a/examples/msg/suspend/deployment_suspend.xml b/examples/msg/suspend/deployment_suspend.xml
index 78c80851e1..ef49194a78 100644
--- a/examples/msg/suspend/deployment_suspend.xml
+++ b/examples/msg/suspend/deployment_suspend.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Jacquelin" function="dream_master"/>
-</platform_description>
+</platform>
diff --git a/examples/simdag/2clusters.xml b/examples/simdag/2clusters.xml
index d46c3191dd..64ca01ef4a 100644
--- a/examples/simdag/2clusters.xml
+++ b/examples/simdag/2clusters.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="C2-06" power="5000000000"/>
   <host id="C1-03" power="1000000000"/>
   <host id="C2-07" power="5000000000"/>
@@ -116,4 +116,4 @@
   <route src="C2-05" dst="C1-01"><link:ctn id="5"/><link:ctn id="11"/><link:ctn id="13"/><link:ctn id="14"/><link:ctn id="12"/><link:ctn id="10"/><link:ctn id="1"/>  </route>
   <route src="C2-05" dst="C1-04"><link:ctn id="5"/><link:ctn id="11"/><link:ctn id="13"/><link:ctn id="14"/><link:ctn id="12"/><link:ctn id="10"/><link:ctn id="4"/>  </route>
   <route src="C2-05" dst="C1-00"><link:ctn id="5"/><link:ctn id="11"/><link:ctn id="13"/><link:ctn id="14"/><link:ctn id="12"/><link:ctn id="10"/><link:ctn id="0"/>  </route>
-</platform_description>
+</platform>
diff --git a/teshsuite/gras/msg_handle/msg_handle.xml b/teshsuite/gras/msg_handle/msg_handle.xml
index 0d1dbccfa2..180b2841c0 100644
--- a/teshsuite/gras/msg_handle/msg_handle.xml
+++ b/teshsuite/gras/msg_handle/msg_handle.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <process host="Tremblay" function="server">
      <argument value="4000"/>       <!-- my port number -->
      <argument value="Fafard:4000"/>   <!-- client location -->
@@ -9,4 +9,4 @@
      <argument value="4000"/>       <!-- my port number -->
      <argument value="Tremblay:4000"/>   <!-- server location -->
   </process>
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/basic_platform.xml b/teshsuite/simdag/basic_platform.xml
index 1a0eef38d1..75bdbddde3 100644
--- a/teshsuite/simdag/basic_platform.xml
+++ b/teshsuite/simdag/basic_platform.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="4e+09"/>
@@ -18,4 +18,4 @@
   <route src="cpu1" dst="cpu1">
     <link:ctn id="link0"/>
   </route>
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
index 3b9a773b11..d10b5a8d3c 100644
--- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
+++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="1"/>
@@ -86,4 +86,4 @@
     <link:ctn id="link2"/>
   </route>
   
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
index 040aef65a5..844aae51dd 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 	
 	<host id="cpu0" power="1" />
 	<host id="cpu1" power="1" />
@@ -24,4 +24,4 @@
 		<link:ctn id="link0" />
 	</route>
 	
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
index 8baca3c493..a9ee850160 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="1"/>
@@ -12,4 +12,4 @@
   <route src="cpu1" dst="cpu0">
     <link:ctn id="link0"/>
   </route>
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
index 489b6f424c..55756a5ed4 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="1"/>
@@ -12,4 +12,4 @@
   <route src="cpu1" dst="cpu0">
     <link:ctn id="link0"/>
   </route>
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
index 3b0beeab81..e9a19cc921 100644
--- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="1"/>
@@ -22,4 +22,4 @@
     <link:ctn id="link0"/>
   </route>
   
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/network/platform_2p_1sl.xml b/teshsuite/simdag/network/platform_2p_1sl.xml
index 76368ae5a6..5a3f296541 100644
--- a/teshsuite/simdag/network/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/platform_2p_1sl.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="1"/>
@@ -15,4 +15,4 @@
   <route src="cpu1" dst="cpu0">
     <link:ctn id="link0"/>
   </route>
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml
index 489b6f424c..55756a5ed4 100644
--- a/teshsuite/simdag/partask/platform_2p_1sl.xml
+++ b/teshsuite/simdag/partask/platform_2p_1sl.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 
   <host id="cpu0" power="1"/>
@@ -12,4 +12,4 @@
   <route src="cpu1" dst="cpu0">
     <link:ctn id="link0"/>
   </route>
-</platform_description>
+</platform>
diff --git a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
index 4b63be22b6..09031eacc1 100644
--- a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
+++ b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
 
 	<host id="cpu0" power="1" />
 	<host id="cpu1" power="2" />
@@ -13,4 +13,4 @@
 	<route src="cpu1" dst="cpu0">
 		<link:ctn id="link0" />
 	</route>
-</platform_description>
+</platform>
diff --git a/testsuite/simdag/small_platform_variable.xml b/testsuite/simdag/small_platform_variable.xml
index 473553cb24..9759318232 100644
--- a/testsuite/simdag/small_platform_variable.xml
+++ b/testsuite/simdag/small_platform_variable.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <!-- ljlkj -->
   <host id="Tremblay" power="98095000" availability_file="availability_tremblay.txt"/>
   <host id="Jupiter" power="76296000"/>
@@ -87,4 +87,4 @@
   <route src="Bourassa" dst="Ginette">
     <link:ctn id="7"/><link:ctn id="6"/><link:ctn id="1"/><link:ctn id="0"/><link:ctn id="2"/><link:ctn id="5"/>
   </route>
-</platform_description>
+</platform>
diff --git a/testsuite/surf/platform.xml b/testsuite/surf/platform.xml
index e09f248cea..98b7734636 100644
--- a/testsuite/surf/platform.xml
+++ b/testsuite/surf/platform.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Cpu A" power="100000000" availability_file="trace_A.txt" state_file="trace_A_failure.txt"/>
   <host id="Cpu B" power="100000000" availability_file="trace_B.txt"/>
   <link id="LinkA" bandwidth="10000000" latency="0.2"/>
   <route src="Cpu A" dst="Cpu B"><link:ctn id="LinkA"/></route>
-</platform_description>
+</platform>
diff --git a/win32_testsuite/borland/builder6/simulation/surf/maxmin_bench/platform.xml b/win32_testsuite/borland/builder6/simulation/surf/maxmin_bench/platform.xml
index e09f248cea..98b7734636 100644
--- a/win32_testsuite/borland/builder6/simulation/surf/maxmin_bench/platform.xml
+++ b/win32_testsuite/borland/builder6/simulation/surf/maxmin_bench/platform.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Cpu A" power="100000000" availability_file="trace_A.txt" state_file="trace_A_failure.txt"/>
   <host id="Cpu B" power="100000000" availability_file="trace_B.txt"/>
   <link id="LinkA" bandwidth="10000000" latency="0.2"/>
   <route src="Cpu A" dst="Cpu B"><link:ctn id="LinkA"/></route>
-</platform_description>
+</platform>
diff --git a/win32_testsuite/borland/builder6/simulation/surf/maxmin_usage/platform.xml b/win32_testsuite/borland/builder6/simulation/surf/maxmin_usage/platform.xml
index e09f248cea..98b7734636 100644
--- a/win32_testsuite/borland/builder6/simulation/surf/maxmin_usage/platform.xml
+++ b/win32_testsuite/borland/builder6/simulation/surf/maxmin_usage/platform.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Cpu A" power="100000000" availability_file="trace_A.txt" state_file="trace_A_failure.txt"/>
   <host id="Cpu B" power="100000000" availability_file="trace_B.txt"/>
   <link id="LinkA" bandwidth="10000000" latency="0.2"/>
   <route src="Cpu A" dst="Cpu B"><link:ctn id="LinkA"/></route>
-</platform_description>
+</platform>
diff --git a/win32_testsuite/borland/builder6/simulation/surf/surf_usage/platform.xml b/win32_testsuite/borland/builder6/simulation/surf/surf_usage/platform.xml
index e09f248cea..98b7734636 100644
--- a/win32_testsuite/borland/builder6/simulation/surf/surf_usage/platform.xml
+++ b/win32_testsuite/borland/builder6/simulation/surf/surf_usage/platform.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Cpu A" power="100000000" availability_file="trace_A.txt" state_file="trace_A_failure.txt"/>
   <host id="Cpu B" power="100000000" availability_file="trace_B.txt"/>
   <link id="LinkA" bandwidth="10000000" latency="0.2"/>
   <route src="Cpu A" dst="Cpu B"><link:ctn id="LinkA"/></route>
-</platform_description>
+</platform>
diff --git a/win32_testsuite/borland/builder6/simulation/surf/surf_usage2/platform.xml b/win32_testsuite/borland/builder6/simulation/surf/surf_usage2/platform.xml
index e09f248cea..98b7734636 100644
--- a/win32_testsuite/borland/builder6/simulation/surf/surf_usage2/platform.xml
+++ b/win32_testsuite/borland/builder6/simulation/surf/surf_usage2/platform.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Cpu A" power="100000000" availability_file="trace_A.txt" state_file="trace_A_failure.txt"/>
   <host id="Cpu B" power="100000000" availability_file="trace_B.txt"/>
   <link id="LinkA" bandwidth="10000000" latency="0.2"/>
   <route src="Cpu A" dst="Cpu B"><link:ctn id="LinkA"/></route>
-</platform_description>
+</platform>
diff --git a/win32_testsuite/borland/builder6/simulation/surf/trace_usage/platform.xml b/win32_testsuite/borland/builder6/simulation/surf/trace_usage/platform.xml
index e09f248cea..98b7734636 100644
--- a/win32_testsuite/borland/builder6/simulation/surf/trace_usage/platform.xml
+++ b/win32_testsuite/borland/builder6/simulation/surf/trace_usage/platform.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2">
+<platform version="2">
   <host id="Cpu A" power="100000000" availability_file="trace_A.txt" state_file="trace_A_failure.txt"/>
   <host id="Cpu B" power="100000000" availability_file="trace_B.txt"/>
   <link id="LinkA" bandwidth="10000000" latency="0.2"/>
   <route src="Cpu A" dst="Cpu B"><link:ctn id="LinkA"/></route>
-</platform_description>
+</platform>
diff --git a/win32_testsuite/borland/builder6/simulation/xbt/graphxml_usage/graph.xml b/win32_testsuite/borland/builder6/simulation/xbt/graphxml_usage/graph.xml
index 9d577ac62a..9c17e2ee43 100644
--- a/win32_testsuite/borland/builder6/simulation/xbt/graphxml_usage/graph.xml
+++ b/win32_testsuite/borland/builder6/simulation/xbt/graphxml_usage/graph.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="2"><graph>
+<platform version="2"><graph>
   <node id="A" label="A"/>
   <node id="B" label="B"/>
   <node id="C" label="C"/>