=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataElement.java	2015-11-23 14:22:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataElement.java	2015-11-26 21:26:54 +0000
@@ -79,6 +79,12 @@
         return program.getDisplayName() + " " + dataElement.getDisplayName();
     }
 
+    @Override
+    public String getShortName()
+    {
+        return program.getDisplayName() + " " + dataElement.getDisplayShortName();
+    }
+    
     @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java	2015-11-23 14:22:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java	2015-11-26 21:26:54 +0000
@@ -109,6 +109,12 @@
         return program.getDisplayName() + " " + attribute.getDisplayName();
     }
 
+    @Override
+    public String getShortName()
+    {
+        return program.getDisplayName() + " " + attribute.getDisplayShortName();
+    }
+    
     @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )