Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml
===================================================================
diff -u -r65dc0e557544d65bf37488fbd11567599181ad84 -re85181291cff7762b523cdb6773d03ba9fc1e0c8
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml	(.../CompletedActivityProgress.hbm.xml)	(revision 65dc0e557544d65bf37488fbd11567599181ad84)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgress.hbm.xml	(.../CompletedActivityProgress.hbm.xml)	(revision e85181291cff7762b523cdb6773d03ba9fc1e0c8)
@@ -4,11 +4,18 @@
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
 <hibernate-mapping>
-	<class name="org.lamsfoundation.lams.lesson.CompletedActivityProgressArchive"
-		table="lams_progress_completed_archive">
+	<!-- 
+		Created by the Middlegen Hibernate plugin 2.1
+		
+		http://boss.bekk.no/boss/middlegen/
+		http://www.hibernate.org/
+	-->
 
+	<class name="org.lamsfoundation.lams.lesson.CompletedActivityProgress"
+		table="lams_progress_completed">
+
 		<composite-id>
-			<key-many-to-one name="learnerProgress" class="org.lamsfoundation.lams.lesson.LearnerProgressArchive" column="learner_progress_id"/>
+			<key-many-to-one name="learnerProgress" class="org.lamsfoundation.lams.lesson.LearnerProgress" column="learner_progress_id"/>
 			<key-many-to-one name="activity" class="org.lamsfoundation.lams.learningdesign.Activity" column="activity_id"/>
 		</composite-id>
 		
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml
===================================================================
diff -u -r65dc0e557544d65bf37488fbd11567599181ad84 -re85181291cff7762b523cdb6773d03ba9fc1e0c8
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml	(.../CompletedActivityProgressArchive.hbm.xml)	(revision 65dc0e557544d65bf37488fbd11567599181ad84)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/CompletedActivityProgressArchive.hbm.xml	(.../CompletedActivityProgressArchive.hbm.xml)	(revision e85181291cff7762b523cdb6773d03ba9fc1e0c8)
@@ -4,18 +4,11 @@
     "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
 
 <hibernate-mapping>
-	<!-- 
-		Created by the Middlegen Hibernate plugin 2.1
-		
-		http://boss.bekk.no/boss/middlegen/
-		http://www.hibernate.org/
-	-->
+	<class name="org.lamsfoundation.lams.lesson.CompletedActivityProgressArchive"
+		table="lams_progress_completed_archive">
 
-	<class name="org.lamsfoundation.lams.lesson.CompletedActivityProgress"
-		table="lams_progress_completed">
-
 		<composite-id>
-			<key-many-to-one name="learnerProgress" class="org.lamsfoundation.lams.lesson.LearnerProgress" column="learner_progress_id"/>
+			<key-many-to-one name="learnerProgress" class="org.lamsfoundation.lams.lesson.LearnerProgressArchive" column="learner_progress_id"/>
 			<key-many-to-one name="activity" class="org.lamsfoundation.lams.learningdesign.Activity" column="activity_id"/>
 		</composite-id>