Index: lams_learning/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
diff -u -r632620bf35f284cda4e979d77f2c5ecf7800cc78 -r828a4ddc11205137b7e537f1f83f6a56359d50dc
--- lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 632620bf35f284cda4e979d77f2c5ecf7800cc78)
+++ lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 828a4ddc11205137b7e537f1f83f6a56359d50dc)
@@ -28,7 +28,7 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="learnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
 		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
-		<property name="actionMappings"><ref local="actionMappings"/></property>
+		<property name="activityMapping"><ref local="activityMapping"/></property>
 	</bean>
 	
 	<bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
@@ -37,7 +37,7 @@
 	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" singleton="false">
 	</bean>
 	
-	<bean id="actionMappings" class="org.lamsfoundation.lams.learning.web.util.ActionMappingsWithToolWait" singleton="false">
+	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
 		<property name="toolService"><ref bean="toolService" /></property>
 		<property name="baseURL"><value>http://127.0.0.1:8080/lams_learning/</value></property>
 	</bean>