diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
index 86e32726c..5304e2d2a 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
@@ -208,13 +208,13 @@
   </wadl:doc>
 </param>'>
 <!ENTITY flavor_idTemplateParameter '
-<param name="flavor_id" style="template" type="csapi:UUID"
+<param name="flavor_id" style="template" type="xsd:int"
    xmlns="http://wadl.dev.java.net/2009/02">
    <wadl:doc xmlns="http://docbook.org/ns/docbook"
       xml:lang="EN"
       xmlns:wadl="http://wadl.dev.java.net/2009/02">
       <para>
-         The UUID of the flavor.
+         The ID of the flavor.
       </para>
    </wadl:doc>
 </param>'>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/xsd/flavor.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/flavor.xsd
index 6fe852e77..e9a5577b9 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/xsd/flavor.xsd
+++ b/api-ref/src/wadls/compute-api/src/v2.1/xsd/flavor.xsd
@@ -67,12 +67,12 @@
       <any namespace="##other" processContents="lax" minOccurs="0"
         maxOccurs="unbounded"/>
     </sequence>
-    <attribute type="csapi:UUID" name="id" use="required">
+    <attribute type="xsd:int" name="id" use="required">
       <annotation>
         <xsd:documentation xml:lang="EN"
           xmlns="http://www.w3.org/1999/xhtml">
           <p>
-            The UUID of the flavor.
+            The ID of the flavor.
           </p>
         </xsd:documentation>
       </annotation>