diff --git a/includes/nodequeue.admin.inc b/includes/nodequeue.admin.inc
index 2e032e2..aed6eba 100644
--- a/includes/nodequeue.admin.inc
+++ b/includes/nodequeue.admin.inc
@@ -330,7 +330,7 @@ function nodequeue_edit_queue_form($form, &$form_state, $queue) {
     '#description' => t('Enter the name of the queue'),
   );
 
-  $form['name'] = array(
+  $form['machine_name'] = array(
     '#type' => 'machine_name',
     '#maxlength' => 32,
     '#machine_name' => array(
@@ -341,9 +341,9 @@ function nodequeue_edit_queue_form($form, &$form_state, $queue) {
   );
 
   if (isset($queue->name)) {
-    $form['name']['#default_value'] = $queue->name;
-    $form['name']['#disabled'] = TRUE;
-    $form['name']['#value'] = $queue->name;
+    $form['machine_name']['#default_value'] = $queue->name;
+    $form['machine_name']['#disabled'] = TRUE;
+    $form['machine_name']['#value'] = $queue->name;
   }
 
   // This is a value; as the default nodequeue implementation has just one
@@ -531,6 +531,9 @@ function nodequeue_edit_queue_form_submit($formid, &$form_state) {
   $queue->roles = array_keys(array_filter($queue->roles));
   $queue->types = array_keys(array_filter($queue->types));
 
+  // machine_name is used in the form but not in nodequeue objects.
+  $queue->name =  $queue->machine_name;
+
   if (!isset($queue->qid)) {
     $queue->new = TRUE;
   }