diff --git a/WNPRC_EHR/resources/views/dataEntry.html b/WNPRC_EHR/resources/views/dataEntry.html
index d98873716..fbb697eac 100644
--- a/WNPRC_EHR/resources/views/dataEntry.html
+++ b/WNPRC_EHR/resources/views/dataEntry.html
@@ -335,7 +335,7 @@
         var makeExt4DataEntryURL = function(formName, params) {
             params = params || {};
             params.formType = formName;
-            params.returnURL = LABKEY.ActionURL.buildURL("wnprc_ehr", "dataEntry");
+            params.returnUrl = LABKEY.ActionURL.buildURL("wnprc_ehr", "dataEntry");
 
             return makeURL("dataEntryForm", params);
         };
diff --git a/WNPRC_EHR/resources/web/ehr/ext3/ehrImportPanel.js b/WNPRC_EHR/resources/web/ehr/ext3/ehrImportPanel.js
index 2f47abef7..77a25ca46 100644
--- a/WNPRC_EHR/resources/web/ehr/ext3/ehrImportPanel.js
+++ b/WNPRC_EHR/resources/web/ehr/ext3/ehrImportPanel.js
@@ -440,7 +440,7 @@ Ext.extend(EHR.ext.ImportPanel.Base, Ext.Panel, {
                     var extraContext = {
                         targetQC : o.targetQC,
                         errorThreshold: o.errorThreshold,
-                        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+                        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
                         importPathway: 'ehr-ext3DataEntry'
                     };
 
@@ -802,7 +802,7 @@ EHR.ext.ImportPanel.Buttons = {
         //targetQC: 'In Progress',
         requiredQC: 'In Progress',
         errorThreshold: 'WARN',
-        //successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        //successURL: LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'saveDraftBtn',
         handler: this.onSubmit,
@@ -820,7 +820,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredPermission: 'admin',
         targetQC: 'Completed',
         errorThreshold: 'INFO',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'submitBtn',
         handler: function(o){
@@ -842,7 +842,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredQC: 'Completed',
         targetQC: 'Completed',
         errorThreshold: 'INFO',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'submitBtn',
         handler: function(o){
@@ -864,7 +864,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredQC: 'Completed',
         targetQC: 'Completed',
         errorThreshold: 'INFO',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'submitBtn',
         handler: function(o){
@@ -887,7 +887,7 @@ EHR.ext.ImportPanel.Buttons = {
         targetQC: 'Completed',
         requiredPermission: 'admin',
         errorThreshold: 'ERROR',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'foreceSubmitBtn',
         handler: function(o){
@@ -930,7 +930,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredQC: 'Completed',
         targetQC: 'Completed',
         errorThreshold: 'INFO',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'submitBtn',
         handler: function(o){
@@ -980,7 +980,7 @@ EHR.ext.ImportPanel.Buttons = {
         targetQC: 'Request: Pending',
         requiredQC: 'Request: Pending',
         errorThreshold: 'ERROR',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
         disabled: true,
         ref: 'requestBtn',
         handler: function(o){
@@ -1032,7 +1032,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredQC: 'Completed',
         //targetQC: 'Completed',
         errorThreshold: 'INFO',
-        //successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        //successURL: LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'finalizeDeathBtn',
         handler: function(o){
@@ -1235,7 +1235,7 @@ EHR.ext.ImportPanel.Buttons = {
         name: 'basicsubmit',
         requiredQC: 'Completed',
         errorThreshold: 'INFO',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'submitBtn',
         handler: function(o){
@@ -1275,7 +1275,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredQC: 'Review Required',
         targetQC: 'Review Required',
         errorThreshold: 'WARN',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'reviewBtn',
         disableOn: 'ERROR',
@@ -1356,7 +1356,7 @@ EHR.ext.ImportPanel.Buttons = {
         requiredQC: 'Scheduled',
         targetQC: 'Scheduled',
         errorThreshold: 'WARN',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'scheduledBtn',
         disableOn: 'ERROR',
@@ -1389,7 +1389,7 @@ EHR.ext.ImportPanel.Buttons = {
         ref: 'discardBtn',
         targetQC: 'Delete Requested',
         requiredQC: 'Delete Requested',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         handler: this.requestDelete,
         //handler: this.onSubmit,
         scope: this
@@ -1404,7 +1404,7 @@ EHR.ext.ImportPanel.Buttons = {
         ref: 'deleteBtn',
         targetQC: 'Delete Requested',
         requiredQC: 'Delete Requested',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         handler: this.requestDelete,
         //handler: this.onSubmit,
         scope: this
@@ -1419,7 +1419,7 @@ EHR.ext.ImportPanel.Buttons = {
         //targetQC: 'In Progress',
         requiredQC: 'In Progress',
         errorThreshold: 'WARN',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'closeBtn',
         handler: this.onSubmit,
@@ -1460,7 +1460,7 @@ EHR.ext.ImportPanel.Buttons = {
         targetQC: 'Request: Pending',
         requiredQC: 'Request: Pending',
         errorThreshold: 'WARN',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "requestServices.view"),
         disabled: true,
         ref: 'requestBtn',
         handler: this.onSubmit,
@@ -1477,7 +1477,7 @@ EHR.ext.ImportPanel.Buttons = {
         targetQC: 'Request: Approved',
         requiredQC: 'Request: Approved',
         errorThreshold: 'WARN',
-        successURL : LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
+        successURL : LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL("ehr", "dataEntry.view"),
         disabled: true,
         ref: 'approveBtn',
         handler: this.onSubmit,
diff --git a/WNPRC_EHR/resources/web/wnprc_ehr/ext4/components/buttons/husbandryButtons.js b/WNPRC_EHR/resources/web/wnprc_ehr/ext4/components/buttons/husbandryButtons.js
index e543bdc1e..b300f7dec 100644
--- a/WNPRC_EHR/resources/web/wnprc_ehr/ext4/components/buttons/husbandryButtons.js
+++ b/WNPRC_EHR/resources/web/wnprc_ehr/ext4/components/buttons/husbandryButtons.js
@@ -159,7 +159,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('FOOD_STARTED', {
     requiredQC: 'Scheduled',
     targetQC: 'Started',
     errorThreshold: 'WARN',
-    successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
+    successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
     disabled: true,
     itemId: 'depriveBtn',
     disableOn: 'ERROR',
@@ -259,7 +259,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('SUBMIT_WATER', {
     requiredQC: 'Completed',
     targetQC: 'Completed',
     errorThreshold: 'WARN',
-    successURL: LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
+    successURL: LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('wnprc_ehr', 'dataEntry.view'),
     disabled: true,
     itemId: 'submitWtrBtn',
     disableOn: 'WARN',
diff --git a/WNPRC_EHR/resources/web/wnprc_ehr/ext4/utils/DataEntryButtons.js b/WNPRC_EHR/resources/web/wnprc_ehr/ext4/utils/DataEntryButtons.js
index 2078018f6..f09cd212d 100644
--- a/WNPRC_EHR/resources/web/wnprc_ehr/ext4/utils/DataEntryButtons.js
+++ b/WNPRC_EHR/resources/web/wnprc_ehr/ext4/utils/DataEntryButtons.js
@@ -3,7 +3,7 @@
  */
 (function() {
     var getReturnURL = function() {
-        return LABKEY.ActionURL.getParameter('srcURL') || LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.getParameter('returnURL') || LABKEY.ActionURL.buildURL('project', 'start');
+        return LABKEY.ActionURL.getParameter('returnUrl') || LABKEY.ActionURL.buildURL('project', 'start');
     };
 
     var registerBtn = function(name, config) {
diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/NotificationToolkit.java b/WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/NotificationToolkit.java
index 34912b9f8..7cf88fdda 100644
--- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/NotificationToolkit.java
+++ b/WNPRC_EHR/src/org/labkey/wnprc_ehr/notification/NotificationToolkit.java
@@ -915,10 +915,10 @@ else if (currentClause instanceof SimpleFilter.InClause) {
         }
 
         //Creates URL to return.
-        Path returnURL = new Path(new ActionURL().getBaseServerURI(), queryURL.toString());
+        Path returnUrl = new Path(new ActionURL().getBaseServerURI(), queryURL.toString());
 
         //Returns URL.
-        return returnURL.toString();
+        return returnUrl.toString();
     }
 
     public String createFormURL(Container c, String formType, String taskID) {
@@ -929,10 +929,10 @@ public String createFormURL(Container c, String formType, String taskID) {
         formURL.addParameter("taskid", taskID);
 
         // Creates path.
-        Path returnURL = new Path(new ActionURL().getBaseServerURI(), formURL.toString());
+        Path returnUrl = new Path(new ActionURL().getBaseServerURI(), formURL.toString());
 
         // Returns URL.
-        return returnURL.toString();
+        return returnUrl.toString();
     }
 
     public String createAnimalHistoryURL(Container c, String subject) {
@@ -947,10 +947,10 @@ public String createAnimalHistoryURL(Container c, String subject) {
 //        animalHistoryURL.addParameter("activeReport", "abstract");
 
         // Creates path.
-        Path returnURL = new Path(new ActionURL().getBaseServerURI(), animalHistoryURLWithID);
+        Path returnUrl = new Path(new ActionURL().getBaseServerURI(), animalHistoryURLWithID);
 
         // Returns URL.
-        return returnURL.toString();
+        return returnUrl.toString();
     }
 
     // TODO: COMMENT!!!