diff --git a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/DelimitedTextReportRendererFormController.java b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/DelimitedTextReportRendererFormController.java
index 6e1b999d8c..e2b6580652 100644
--- a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/DelimitedTextReportRendererFormController.java
+++ b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/DelimitedTextReportRendererFormController.java
@@ -47,7 +47,7 @@ public DelimitedTextReportRendererFormController() { }
 	/**
 	 *  prepares a new form for the a DelimitedReportRenderer
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/delimitedTextReportRenderer")
+	@RequestMapping("/module/reporting/reports/renderers/delimitedTextReportRenderer.form")
 	public void delimitedTextReportRenderer(ModelMap model, 
 								@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid, 
 								@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
@@ -95,7 +95,7 @@ else if (successUrl.startsWith(pathToRemove)) {
 	 * @throws IllegalAccessException 
 	 * @throws InstantiationException 
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/saveDelimitedTextReportDesign")
+	@RequestMapping("/module/reporting/reports/renderers/saveDelimitedTextReportDesign.form")
 	public String saveDelimitedTextReportDesign(ModelMap model, HttpServletRequest request,
 					@RequestParam(required=false, value="uuid") String uuid,
 					@RequestParam(required=true,  value="name") String name,
diff --git a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/ExcelReportRendererFormController.java b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/ExcelReportRendererFormController.java
index 8840aeb49a..1bd867229e 100644
--- a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/ExcelReportRendererFormController.java
+++ b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/ExcelReportRendererFormController.java
@@ -57,7 +57,7 @@ public ExcelReportRendererFormController() { }
 	/**
 	 *  prepares a new form for the Excel report renderers
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/excelReportRenderer")
+	@RequestMapping("/module/reporting/reports/renderers/excelReportRenderer.form")
 	public void excelReportRenderer(ModelMap model, 
 								@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid, 
 								@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
@@ -110,7 +110,7 @@ else if (successUrl.startsWith(pathToRemove)) {
 	 * @throws InstantiationException 
 	 */
 	@SuppressWarnings("unchecked")
-	@RequestMapping("/module/reporting/reports/renderers/saveExcelReportRenderer")
+	@RequestMapping("/module/reporting/reports/renderers/saveExcelReportRenderer.form")
 	public String saveExcelReportRenderer(ModelMap model, HttpServletRequest request,
 					@RequestParam(required=false, value="uuid") String uuid,
 					@RequestParam(required=true,  value="name") String name,
diff --git a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/NonConfigurableReportRendererFormController.java b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/NonConfigurableReportRendererFormController.java
index acf49a3613..ffea5c5af0 100644
--- a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/NonConfigurableReportRendererFormController.java
+++ b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/NonConfigurableReportRendererFormController.java
@@ -42,7 +42,7 @@ public NonConfigurableReportRendererFormController() { }
 	/**
 	 *  prepares a new form for the a IndicatorReportRenderer
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/nonConfigurableReportRenderer")
+	@RequestMapping("/module/reporting/reports/renderers/nonConfigurableReportRenderer.form")
 	public void nonConfigurableReportRenderer(ModelMap model, 
 								@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid, 
 								@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
@@ -78,7 +78,7 @@ else if (successUrl.startsWith(pathToRemove)) {
 	/**
 	 * Saves report design
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/saveNonConfigurableReportRenderer")
+	@RequestMapping("/module/reporting/reports/renderers/saveNonConfigurableReportRenderer.form")
 	public String saveNonConfigurableReportRenderer(ModelMap model, HttpServletRequest request,
 					@RequestParam(required=false, value="uuid") String uuid,
 					@RequestParam(required=true,  value="name") String name,
diff --git a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/TextTemplateFormController.java b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/TextTemplateFormController.java
index b49e41adb0..3c35d4d8b6 100644
--- a/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/TextTemplateFormController.java
+++ b/omod/src/main/java/org/openmrs/module/reporting/web/reports/renderers/TextTemplateFormController.java
@@ -79,7 +79,7 @@ public void initBinder(WebDataBinder binder) {
 	 *  prepares a new form for the a TextTemplateRenderer
 	 * @throws UnsupportedEncodingException 
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/textTemplateReportRenderer")
+	@RequestMapping("/module/reporting/reports/renderers/textTemplateReportRenderer.form")
 	public void textTemplateReportRenderer(ModelMap model, 
 								@RequestParam(required=false, value="reportDesignUuid") String reportDesignUuid, 
 								@RequestParam(required=false, value="reportDefinitionUuid") String reportDefinitionUuid,
@@ -124,7 +124,7 @@ else if (successUrl.startsWith(pathToRemove)) {
 	 * Saves report design
 	 * @throws UnsupportedEncodingException 
 	 */
-	@RequestMapping("/module/reporting/reports/renderers/saveTextTemplateReportRendererDesign")
+	@RequestMapping("/module/reporting/reports/renderers/saveTextTemplateReportRendererDesign.form")
 	public String saveTextTemplateReportRendererDesign(ModelMap model, HttpServletRequest request,
 					@RequestParam(required=false, value="uuid") String uuid,
 					@RequestParam(required=true,  value="name") String name,
@@ -203,7 +203,7 @@ public UserParams userParams ( @RequestParam(required=false, value="userEnteredP
 		return userParams;
 	}
 	
-	@RequestMapping( value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer", method=RequestMethod.GET)
+	@RequestMapping( value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer.form", method=RequestMethod.GET)
 	public void initPreviewForm(ModelMap model, HttpServletRequest request,
 			@RequestParam(required=true, value="reportDefinition") String reportDefinitionUuid,
 			@RequestParam(required=false, value="uuid") String uuid,
@@ -257,7 +257,7 @@ public void initPreviewForm(ModelMap model, HttpServletRequest request,
 	}
 		
 	@SuppressWarnings("unchecked")
-	@RequestMapping(value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer", method=RequestMethod.POST)
+	@RequestMapping(value="/module/reporting/reports/renderers/previewTextTemplateReportRenderer.form", method=RequestMethod.POST)
 	public void previewScript(ModelMap model, HttpServletRequest request,
 			@RequestParam(required=true, value="reportDefinition") String reportDefinitionUuid,
 			@RequestParam(required=true, value="uuid") String uuid,