diff --git a/xep-0080.xml b/xep-0080.xml
index d67fe04e..75ba9d94 100644
--- a/xep-0080.xml
+++ b/xep-0080.xml
@@ -260,9 +260,9 @@
     </tr>
     <tr>
       <td>speed</td>
+      <td>xs:decimal</td>
       <td>The speed at which the entity is moving, in meters per second</td>
       <td>52.69</td>
-      <td>xs:decimal</td>
     </tr>
     <tr>
       <td>street</td>
@@ -284,9 +284,9 @@
     </tr>
     <tr>
       <td>uri</td>
+      <td>xs:anyURI</td>
       <td>A URI or URL pointing to information about the location</td>
       <td>http://beta.plazes.com/plazes/1940:jabber_inc</td>
-      <td>xs:anyURI</td>
     </tr>
   </table>
   <p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p>