Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rccb28f5087067f1902b1a8b8a7e1f82d3eb6bc84 -r09dafa805c15b342353c81b85f9d3a237581df2e
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ccb28f5087067f1902b1a8b8a7e1f82d3eb6bc84)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
@@ -118,8 +118,8 @@
 monitor.summary.td.notebookInstructions  =Notebook instructions
 monitor.nosessions  =There are no sessions running yet for this Wiki.
 monitor.notebooks  =Notebook reflections
-output.learner.number.of.edits  =Number of page edits
-output.learner.number.of.add  =Number of pages added
+output.desc.number.of.edits  =Number of page edits
+output.desc.number.of.add  =Number of pages added
 notify.pageEdited.subject  =LAMS Wiki page has been edited by {0}.
 notify.pageAdded.subject  =LAMS Wiki page has been added by {0}.
 notify.pageRemoved.subject  =LAMS Wiki page has been removed by {0}.
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rccb28f5087067f1902b1a8b8a7e1f82d3eb6bc84 -r09dafa805c15b342353c81b85f9d3a237581df2e
--- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision ccb28f5087067f1902b1a8b8a7e1f82d3eb6bc84)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
@@ -118,8 +118,8 @@
 monitor.summary.td.notebookInstructions  =Notebook instructions
 monitor.nosessions  =There are no sessions running yet for this Wiki.
 monitor.notebooks  =Notebook reflections
-output.learner.number.of.edits  =Number of page edits
-output.learner.number.of.add  =Number of pages added
+output.desc.number.of.edits  =Number of page edits
+output.desc.number.of.add  =Number of pages added
 notify.pageEdited.subject  =LAMS Wiki page has been edited by {0}.
 notify.pageAdded.subject  =LAMS Wiki page has been added by {0}.
 notify.pageRemoved.subject  =LAMS Wiki page has been removed by {0}.
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r09dafa805c15b342353c81b85f9d3a237581df2e
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java	(.../WikiOutputFactory.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java	(.../WikiOutputFactory.java)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
@@ -38,10 +38,10 @@
 public class WikiOutputFactory extends OutputFactory {
 
     /** The number of edit the learner has made in one wiki activity. */
-    protected final static String OUTPUT_NAME_LEARNER_NUM_EDITS = "output.learner.number.of.edits";
+    protected final static String OUTPUT_NAME_LEARNER_NUM_EDITS = "number.of.edits";
 
     /** The number of wiki pages added by the learner. */
-    protected final static String OUTPUT_NAME_LEARNER_NUM_ADDS = "output.learner.number.of.adds";
+    protected final static String OUTPUT_NAME_LEARNER_NUM_ADDS = "number.of.add";
 
     /**
      * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object)
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r09dafa805c15b342353c81b85f9d3a237581df2e
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
@@ -967,10 +967,6 @@
     }
 
     public WikiOutputFactory getWikiOutputFactory() {
-
-	if (wikiOutputFactory == null) {
-	    wikiOutputFactory = new WikiOutputFactory();
-	}
 	return wikiOutputFactory;
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -r09dafa805c15b342353c81b85f9d3a237581df2e
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 324b7c421823a48f491b38eed2470525fd3fc52c)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
@@ -32,6 +32,7 @@
 		   		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 		   		<property name="messageService"><ref bean="wikiMessageService"/></property>
 		   		<property name="lessonService"><ref bean="lessonService"/></property>
+		   		<property name="wikiOutputFactory"><ref bean="wikiOutputFactory"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -55,6 +56,11 @@
 		</property>
 	</bean>
 	
+	<!-- OutputFactory -->
+	<bean id="wikiOutputFactory" class="org.lamsfoundation.lams.tool.wiki.service.WikiOutputFactory">  
+    	<property name="toolMessageService"><ref bean="wikiMessageService"/></property>  
+	</bean> 
+	
 	<!--  DAO classes -->
 	<bean id="wikiDAO" class="org.lamsfoundation.lams.tool.wiki.dao.hibernate.WikiDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>