diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index ebb289aa113..1b2ed29335a 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -763,7 +763,7 @@ CKAN.View.ResourceAddUpload = Backbone.View.extend({
       error: function(jqXHR, textStatus, errorThrown) {
         // TODO: more graceful error handling (e.g. of 409)
         self.setMessage('Failed to get credentials for storage upload. Upload cannot proceed', 'error');
-        self.el.find('input[name="upload"]').hide();
+        self.el.find('input[name="add-resource-upload"]').hide();
       }
     });
   },
@@ -844,8 +844,8 @@ CKAN.View.ResourceAddUrl = Backbone.View.extend({
      var self = this;
      var newResource = new CKAN.Model.Resource({});
 
-     this.el.find('input[name=save]').addClass("disabled");
-     var urlVal = this.el.find('input[name=url]').val();
+     this.el.find('input[name="add-resource-save"]').addClass("disabled");
+     var urlVal = this.el.find('input[name="add-resource-url"]').val();
      var qaEnabled = $.inArray('qa',CKAN.plugins)>=0;
 
      if(qaEnabled && this.options.mode=='file') {
@@ -883,8 +883,8 @@ CKAN.View.ResourceAddUrl = Backbone.View.extend({
   },
 
   resetForm: function() {
-     this.el.find('input[name=save]').removeClass("disabled");
-     this.el.find('input[name=url]').val('');
+     this.el.find('input[name="add-resource-save"]').removeClass("disabled");
+     this.el.find('input[name="add-resource-url"]').val('');
   },
 
   events: {
diff --git a/ckan/public/scripts/templates.js b/ckan/public/scripts/templates.js
index fdcd4a954de..b27cabc3387 100644
--- a/ckan/public/scripts/templates.js
+++ b/ckan/public/scripts/templates.js
@@ -11,7 +11,7 @@ CKAN.Templates.resourceUpload = ' \
     <input type="file" name="file" /> \
     <br /> \
     <div class="fileinfo"></div> \
-    <input id="upload" name="upload" type="submit" class="btn btn-primary" value="'+CKAN.Strings.upload+'" /> \
+    <input id="upload" name="add-resource-upload" type="submit" class="btn btn-primary" value="'+CKAN.Strings.upload+'" /> \
   </form> \
   <div class="alert alert-block" style="display: none;"></div> \
 </div>';
diff --git a/ckan/templates/package/new_package_form.html b/ckan/templates/package/new_package_form.html
index 53a6dcf28fa..bd5d751c458 100644
--- a/ckan/templates/package/new_package_form.html
+++ b/ckan/templates/package/new_package_form.html
@@ -160,15 +160,15 @@ <h2>Errors in form</h2>
         <div class="tab-pane" id="link-file">
           <div class="form-inline js-add-url-form">
             <label class="field_opt" for="url">File URL</label>
-            <input name="url" type="text" class="input-small" placeholder="http://mydataset.com/file.csv"/>
-            <input name="save" type="submit" class="btn btn-primary" value="Add" />
+            <input name="add-resource-url" type="text" class="input-small" placeholder="http://mydataset.com/file.csv"/>
+            <input name="add-resource-save" type="submit" class="btn btn-primary" value="Add" />
           </div>
         </div>
         <div class="tab-pane" id="link-api">
           <div class="form-inline js-add-api-form">
             <label class="field_opt" for="url">API URL</label>
-            <input name="url" type="text" class="input-small" placeholder="http://mydataset.com/api/"/>
-            <input name="save" type="submit" class="btn btn-primary" value="Add" />
+            <input name="add-resource-url" type="text" class="input-small" placeholder="http://mydataset.com/api/"/>
+            <input name="add-resource-save" type="submit" class="btn btn-primary" value="Add" />
           </div>
         </div>
         <div class="tab-pane" id="upload-file">