=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java	2011-12-09 18:30:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java	2011-12-13 15:44:16 +0000
@@ -58,11 +58,6 @@
     protected int id;
 
     /**
-     * The Universally Unique Identifer for this Object.
-     */
-    protected String uuid;
-
-    /**
      * The Unique Identifer for this Object.
      */
     protected String uid;
@@ -90,10 +85,10 @@
     {
     }
 
-    public BaseIdentifiableObject( int id, String uuid, String name )
+    public BaseIdentifiableObject( int id, String uid, String name )
     {
         this.id = id;
-        this.uuid = uuid;
+        this.uid = uid;
         this.name = name;
     }