=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java	2015-11-19 04:01:09 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java	2015-11-23 01:05:22 +0000
@@ -34,6 +34,7 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import org.hisp.dhis.attribute.AttributeValue;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.IdentifiableObject;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java	2015-11-19 04:01:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java	2015-11-23 01:05:22 +0000
@@ -226,7 +226,7 @@
                 }
                 break;
             case TrackedEntityInstanceReminder.SEND_TO_ATTRIBUTE_TYPE_USERS:
-                if ( entityInstance.getAttributeValues() != null )
+                if ( entityInstance.getTrackedEntityAttributeValues() != null )
                 {
                     for ( TrackedEntityAttributeValue attributeValue : entityInstance.getTrackedEntityAttributeValues() )
                     {
@@ -259,7 +259,7 @@
                 }
                 break;
             default:
-                if ( entityInstance.getAttributeValues() != null )
+                if ( entityInstance.getTrackedEntityAttributeValues() != null )
                 {
                     for ( TrackedEntityAttributeValue attributeValue : entityInstance.getTrackedEntityAttributeValues() )
                     {
@@ -286,7 +286,7 @@
                 users.addAll( entityInstance.getOrganisationUnit().getUsers() );
                 break;
             case TrackedEntityInstanceReminder.SEND_TO_ATTRIBUTE_TYPE_USERS:
-                if ( entityInstance.getAttributeValues() != null )
+                if ( entityInstance.getTrackedEntityAttributeValues() != null )
                 {
                     for ( TrackedEntityAttributeValue attributeValue : entityInstance.getTrackedEntityAttributeValues() )
                     {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java	2015-11-19 04:01:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java	2015-11-23 01:05:22 +0000
@@ -659,7 +659,7 @@
             }
         }
 
-        if ( instance.getAttributeValues() != null && instance.getAttributeValues().size() > 0 )
+        if ( instance.getTrackedEntityAttributeValues() != null && instance.getTrackedEntityAttributeValues().size() > 0 )
         {
             for ( TrackedEntityAttributeValue attributeValue : instance.getTrackedEntityAttributeValues() )
             {

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2015-11-21 11:27:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java	2015-11-23 01:05:22 +0000
@@ -500,7 +500,7 @@
         }
 
         // ignore attributes which do not belong to this program
-        trackedEntityInstance.getAttributeValues().stream()
+        trackedEntityInstance.getTrackedEntityAttributeValues().stream()
             .filter( value -> mandatoryMap.containsKey( value.getAttribute() ) )
             .forEach( value -> attributeValueMap.put( value.getAttribute().getUid(), value.getValue() ) );
 

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2015-11-19 04:01:09 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2015-11-23 01:05:22 +0000
@@ -1566,7 +1566,7 @@
         if ( attributes != null && attributes.size() > 0 )
         {
             valuesForDelete = attValueService.getTrackedEntityAttributeValues( entityInstance );
-            tempTEI.getAttributeValues().clear();
+            tempTEI.getTrackedEntityAttributeValues().clear();
 
             for ( TrackedEntityAttribute attribute : attributes )
             {
@@ -1913,7 +1913,7 @@
             programStageInstanceService.updateProgramStageInstance( programStageInstance );
 
             // send SMS
-            if ( programStageInstance.getProgramInstance().getEntityInstance().getAttributeValues() != null
+            if ( programStageInstance.getProgramInstance().getEntityInstance().getTrackedEntityAttributeValues() != null
                 && lostEvent.getSMS() != null )
             {
                 List<User> recipientsList = new ArrayList<>();