diff --git a/cms/static/coffee/src/models/module.coffee b/cms/static/coffee/src/models/module.coffee
index 4e1a926445..52357795ed 100644
--- a/cms/static/coffee/src/models/module.coffee
+++ b/cms/static/coffee/src/models/module.coffee
@@ -23,6 +23,6 @@ class CMS.Models.Module extends Backbone.Model
       _metadata = {}
       # walk through the set of elments which have the 'xmetadata_name' attribute and
       # build up a object to pass back to the server on the subsequent POST
-      _metadata[el.getAttribute("xmetadata_name")]=el.value for el in $('[xmetadata_name]')
+      _metadata[$(el).data("metadata-name")]=el.value for el in $('[data-metadata-name]', @metadata_elt)
       @set(metadata: _metadata)
     super(args...)
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index 368959022a..296b16e9c0 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/cms/templates/widgets/metadata-edit.html
@@ -3,7 +3,7 @@
   <h3>Metadata</h3>
   <ul>
     % for keyname in metadata.keys():
-    <li>${keyname}: <input type='text' xmetadata_name='${keyname}' value='${metadata[keyname]}' size='60' /></li>
+    <li>${keyname}: <input type='text' data-metadata-name='${keyname}' value='${metadata[keyname]}' size='60' /></li>
     % endfor
   </ul>
 </section>