Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -rdca5a925b3daeb95e5c471749b006331f373b3b0 -r48cee0960880d01325c05aeb93dfa28896f8a36a
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision dca5a925b3daeb95e5c471749b006331f373b3b0)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 48cee0960880d01325c05aeb93dfa28896f8a36a)
@@ -96,6 +96,7 @@
     @Qualifier("workspaceManagementService")
     protected IWorkspaceManagementService workspaceManagementService;
     @Autowired
+    @Qualifier("authoringService")
     protected IAuthoringFullService authoringFullService;
     @Autowired
     @Qualifier("toolDAO")
@@ -148,7 +149,8 @@
 
     @RequestMapping("")
     @ResponseBody
-    public final String unspecified(HttpServletRequest request, HttpServletResponse response, HttpSession httpSession) throws Exception {
+    public final String unspecified(HttpServletRequest request, HttpServletResponse response, HttpSession httpSession)
+	    throws Exception {
 	ObjectNode responseJSON = null;
 	try {
 	    responseJSON = createLearningDesign(request, httpSession);
@@ -190,7 +192,8 @@
 	return "authoring/template/tbl/tbl";
     }
 
-    protected abstract ObjectNode createLearningDesign(HttpServletRequest request, HttpSession httpSession) throws Exception;
+    protected abstract ObjectNode createLearningDesign(HttpServletRequest request, HttpSession httpSession)
+	    throws Exception;
 
     /**
      * Creates transitions between activities in the order they were created.
@@ -325,7 +328,7 @@
      *
      * @throws IOException
      * @
-     *       @throws
+     * @throws
      *       HttpException
      */
     protected ObjectNode saveLearningDesign(String templateCode, String userEnteredTitleString,
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r48cee0960880d01325c05aeb93dfa28896f8a36a
--- lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java	(.../WorkspaceController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java	(.../WorkspaceController.java)	(revision 48cee0960880d01325c05aeb93dfa28896f8a36a)
@@ -59,7 +59,7 @@
     protected Logger log = Logger.getLogger(WorkspaceController.class.getName());
 
     @Autowired
-    @Qualifier("IWorkspaceManagementService")
+    @Qualifier("workspaceManagementService")
     private IWorkspaceManagementService workspaceManagementService;
 
     public static final String RESOURCE_ID = "resourceID";