=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeDimension.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeDimension.hbm.xml	2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeDimension.hbm.xml	2015-12-11 15:30:28 +0000
@@ -11,10 +11,10 @@
     </id>
 
     <many-to-one name="attribute" class="org.hisp.dhis.trackedentity.TrackedEntityAttribute" 
-        column="trackedentityattributeid" foreign-key="fk_attributedimension_attributeid" />
+        column="trackedentityattributeid" foreign-key="fk_teattributedimension_attributeid" />
     
     <many-to-one name="legendSet" class="org.hisp.dhis.legend.LegendSet"
-    	column="legendsetid" foreign-key="fk_attributedimension_legendsetid" />
+    	column="legendsetid" foreign-key="fk_teattributedimension_legendsetid" />
     
     <property name="filter" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityDataElementDimension.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityDataElementDimension.hbm.xml	2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityDataElementDimension.hbm.xml	2015-12-11 15:30:28 +0000
@@ -11,10 +11,10 @@
     </id>
 
     <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" 
-        column="dataelementid" foreign-key="fk_dataelementdimension_dataelementid" />
+        column="dataelementid" foreign-key="fk_tedataelementdimension_dataelementid" />
 
 	<many-to-one name="legendSet" class="org.hisp.dhis.legend.LegendSet"
-		column="legendsetid" foreign-key="fk_dataelementdimension_legendsetid" />
+		column="legendsetid" foreign-key="fk_tedataelementdimension_legendsetid" />
 
     <property name="filter" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityProgramIndicatorDimension.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityProgramIndicatorDimension.hbm.xml	2015-11-19 22:18:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityProgramIndicatorDimension.hbm.xml	2015-12-11 15:30:28 +0000
@@ -11,10 +11,10 @@
     </id>
 
     <many-to-one name="programIndicator" class="org.hisp.dhis.program.ProgramIndicator" 
-        column="programindicatorid" foreign-key="fk_programindicatordimension_programindicatorid" />
+        column="programindicatorid" foreign-key="fk_teprogramindicatordimension_programindicatorid" />
 
 	<many-to-one name="legendSet" class="org.hisp.dhis.legend.LegendSet"
-		column="legendsetid" foreign-key="fk_programindicatordimension_legendsetid" />
+		column="legendsetid" foreign-key="fk_teprogramindicatordimension_legendsetid" />
 
     <property name="filter" />