Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.19.2.5 -r1.19.2.6
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	4 Dec 2016 01:31:27 -0000	1.19.2.5
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	30 Jan 2017 14:37:25 -0000	1.19.2.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.19.2.2 -r1.19.2.3
--- lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	4 Dec 2016 01:31:27 -0000	1.19.2.2
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties	30 Jan 2017 14:37:25 -0000	1.19.2.3
@@ -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/wikiApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml,v
diff -u -r1.6.2.5 -r1.6.2.6
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	5 Aug 2015 17:45:15 -0000	1.6.2.5
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	30 Jan 2017 14:37:25 -0000	1.6.2.6
@@ -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>
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java,v
diff -u -r1.2.2.2 -r1.2.2.3
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java	11 May 2016 07:37:41 -0000	1.2.2.2
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java	30 Jan 2017 14:37:25 -0000	1.2.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v
diff -u -r1.25.2.9 -r1.25.2.10
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	11 Jan 2017 08:46:17 -0000	1.25.2.9
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	30 Jan 2017 14:37:25 -0000	1.25.2.10
@@ -967,10 +967,6 @@
     }
 
     public WikiOutputFactory getWikiOutputFactory() {
-
-	if (wikiOutputFactory == null) {
-	    wikiOutputFactory = new WikiOutputFactory();
-	}
 	return wikiOutputFactory;
     }