=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java	2014-01-21 06:32:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java	2014-02-03 04:08:11 +0000
@@ -44,7 +44,7 @@
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
-@JacksonXmlRootElement(localName = "attributeType", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement(localName = "attribute", namespace = DxfNamespaces.DXF_2_0)
 public class Attribute
     extends BaseIdentifiableObject
 {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java	2014-02-03 04:08:11 +0000
@@ -42,9 +42,9 @@
 import java.io.Serializable;
 
 /**
- * @author mortenoh
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
-@JacksonXmlRootElement( localName = "attribute", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "attributeValue", namespace = DxfNamespaces.DXF_2_0)
 public class AttributeValue
     implements Serializable
 {