=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2015-11-19 05:41:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2015-11-19 05:50:14 +0000
@@ -275,7 +275,7 @@
 
     List<AttributeValue> getAllAttributeValuesByAttribute( Attribute attribute );
 
-    List<AttributeValue> getAllByAttributeAndValue( Attribute attribute, String value );
+    List<AttributeValue> getAllAttributeValuesByAttributeAndValue( Attribute attribute, String value );
 
     /**
      * Gets the number of attribute values.

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java	2015-11-19 05:41:44 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java	2015-11-19 05:50:14 +0000
@@ -303,7 +303,7 @@
     }
 
     @Override
-    public List<AttributeValue> getAllByAttributeAndValue( Attribute attribute, String value )
+    public List<AttributeValue> getAllAttributeValuesByAttributeAndValue( Attribute attribute, String value )
     {
         return attributeValueStore.getAllByAttributeAndValue( attribute, value );
     }