=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml	2014-01-20 15:33:31 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientAttribute.hbm.xml	2014-01-22 18:41:47 +0000
@@ -11,7 +11,7 @@
     </id>
     
     <many-to-one name="patientAttribute" class="org.hisp.dhis.patient.PatientAttribute" 
-       column="patientattributeid" foreign-key="fk_program_attributeid" />
+        column="attributeid" foreign-key="fk_program_attributeid" />
 
     <property name="sortOrder" column="sort_order" />
     

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.hbm.xml	2014-01-20 15:33:31 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramPatientIdentifierType.hbm.xml	2014-01-22 18:41:47 +0000
@@ -11,7 +11,7 @@
     </id>
     
 	<many-to-one name="patientIdentifierType" class="org.hisp.dhis.patient.PatientIdentifierType" 
-	   column="patientidentifiertypeid" foreign-key="fk_program_identifiertypeid" />
+	   column="identifiertypeid" foreign-key="fk_program_identifiertypeid" />
 
     <property name="sortOrder" column="sort_order" />