Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r7576d54325b4bb5d3083e38c30353982c85a953b -rc8cc5634569081a7155793f609254e41fd632933
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 7576d54325b4bb5d3083e38c30353982c85a953b)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision c8cc5634569081a7155793f609254e41fd632933)
@@ -84,8 +84,8 @@
     </property>
 
     <!-- Associations -->
-    <one-to-one name="transitionTo" class="org.lamsfoundation.lams.learningdesign.Transition" property-ref="activityByToActivityId"/>
-    <one-to-one name="transitionFrom" class="org.lamsfoundation.lams.learningdesign.Transition" property-ref="activityByFromActivityId"/>
+    <one-to-one name="transitionTo" class="org.lamsfoundation.lams.learningdesign.Transition" property-ref="toActivity"/>
+    <one-to-one name="transitionFrom" class="org.lamsfoundation.lams.learningdesign.Transition" property-ref="fromActivity"/>
     
     <!-- bi-directional many-to-one association to LearningLibrary -->
     <many-to-one name="learningLibrary" class="org.lamsfoundation.lams.learningdesign.LearningLibrary">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r7f203b0b0a2e56896f7eee5367b52d1ec4db483e -rc8cc5634569081a7155793f609254e41fd632933
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 7f203b0b0a2e56896f7eee5367b52d1ec4db483e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision c8cc5634569081a7155793f609254e41fd632933)
@@ -89,15 +89,15 @@
     <!-- Associations -->
   
     <!-- bi-directional many-to-one association to Activity -->
-    <many-to-one name="activityByToActivityId" class="org.lamsfoundation.lams.learningdesign.Activity" unique="true">
+    <many-to-one name="toActivity" class="org.lamsfoundation.lams.learningdesign.Activity" unique="true">
         <meta attribute="field-description">@hibernate.many-to-one unique="true" 
         									@hibernate.column name="to_activity_id"         
         </meta>
         <column name="to_activity_id" />
     </many-to-one>
     
     <!-- bi-directional many-to-one association to Activity -->
-    <many-to-one name="activityByFromActivityId" class="org.lamsfoundation.lams.learningdesign.Activity" unique="true">
+    <many-to-one name="fromActivity" class="org.lamsfoundation.lams.learningdesign.Activity" unique="true">
         <meta attribute="field-description">@hibernate.many-to-one unique="true"
         							        @hibernate.column name="from_activity_id"         
         </meta>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java
===================================================================
diff -u -rf054be2fc08e3395d60db0453974d3e651336f7c -rc8cc5634569081a7155793f609254e41fd632933
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision f054be2fc08e3395d60db0453974d3e651336f7c)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision c8cc5634569081a7155793f609254e41fd632933)
@@ -34,10 +34,10 @@
 	private Date createDateTime;
 
 	/** persistent field */
-	Activity activityByToActivityId;
+	Activity toActivity;
 
 	/** persistent field */
-	Activity activityByFromActivityId;
+	Activity fromActivity;
 
 	/** persistent field */
 	LearningDesign learningDesign;
@@ -49,8 +49,8 @@
 			String description,
 			String title,
 			Date createDateTime,
-			Activity activityByToActivityId,
-			Activity activityByFromActivityId,
+			Activity toActivity,
+			Activity fromActivity,
 			LearningDesign learningDesign,
 			Integer toUIID,
 			Integer fromUIID) {
@@ -59,8 +59,8 @@
 		this.description = description;
 		this.title = title;
 		this.createDateTime = createDateTime;
-		this.activityByToActivityId = activityByToActivityId;
-		this.activityByFromActivityId = activityByFromActivityId;
+		this.toActivity = toActivity;
+		this.fromActivity = fromActivity;
 		this.learningDesign = learningDesign;
 		this.toUIID = toUIID;
 		this.fromUIID = fromUIID;
@@ -74,13 +74,13 @@
 	public Transition(
 			Long transitionId,
 			Date createDateTime,
-			Activity activityByToActivityId,
-			Activity activityByFromActivityId,
+			Activity toActivity,
+			Activity fromActivity,
 			LearningDesign learningDesign) {
 		this.transitionId = transitionId;
 		this.createDateTime = createDateTime;
-		this.activityByToActivityId = activityByToActivityId;
-		this.activityByFromActivityId = activityByFromActivityId;
+		this.toActivity = toActivity;
+		this.fromActivity = fromActivity;
 		this.learningDesign = learningDesign;
 	}
 	
@@ -168,27 +168,27 @@
 	 * @hibernate.column name="to_activity_id"
 	 *  
 	 */
-	public org.lamsfoundation.lams.learningdesign.Activity getActivityByToActivityId() {
-		return this.activityByToActivityId;
+	public org.lamsfoundation.lams.learningdesign.Activity getToActivity() {
+		return this.toActivity;
 	}
 
 	public void setActivityByToActivityId(
-			org.lamsfoundation.lams.learningdesign.Activity activityByToActivityId) {
-		this.activityByToActivityId = activityByToActivityId;
+			org.lamsfoundation.lams.learningdesign.Activity toActivity) {
+		this.toActivity = toActivity;
 	}
 
 	/**
 	 * @hibernate.many-to-one not-null="true"
 	 * @hibernate.column name="from_activity_id"
 	 *  
 	 */
-	public org.lamsfoundation.lams.learningdesign.Activity getActivityByFromActivityId() {
-		return this.activityByFromActivityId;
+	public org.lamsfoundation.lams.learningdesign.Activity getFromActivity() {
+		return this.fromActivity;
 	}
 
-	public void setActivityByFromActivityId(
-			org.lamsfoundation.lams.learningdesign.Activity activityByFromActivityId) {
-		this.activityByFromActivityId = activityByFromActivityId;
+	public void setFromActivity(
+			org.lamsfoundation.lams.learningdesign.Activity fromActivity) {
+		this.fromActivity = fromActivity;
 	}
 
 	/**