diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 2fc4e84e424b..11b3ff927a10 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -1257,16 +1257,16 @@ def rename(self, trans, payload=None, **kwd):
             return {
                 'title'  : 'Change history name(s)',
                 'inputs' : [{
-                    'name'  : trans.security.encode_id(h.id),
+                    'name'  : 'name_%i' % i,
                     'label' : 'Current: %s' % h.name,
                     'value' : h.name
-                } for h in histories]
+                } for i, h in enumerate(histories)]
             }
         else:
             messages = []
-            for h in histories:
+            for i, h in enumerate(histories):
                 cur_name = h.get_display_name()
-                new_name = payload.get(trans.security.encode_id(h.id))
+                new_name = payload.get('name_%i' % i)
                 # validate name is empty
                 if not isinstance(new_name, string_types) or not new_name.strip():
                     messages.append('You must specify a valid name for History \'%s\'.' % cur_name)