--- webform.components.inc.orig	2011-05-12 14:54:02.519297102 -0400
+++ webform.components.inc.final	2011-05-12 15:04:31.083541211 -0400
@@ -69,6 +69,11 @@
       '#title' => t('Weight'),
       '#default_value' => $component['weight'],
     );
+    $form['components'][$cid]['form_key'] = array(
+      '#type' => 'hidden',
+      '#size' => 24,
+      '#default_value' => $component['form_key'],
+    );
     $form['components'][$cid]['mandatory'] = array(
       '#type' => 'checkbox',
       '#title' => t('Mandatory'),
@@ -84,7 +89,6 @@
     '#type' => 'textfield',
     '#size' => 24,
   );
-
   $form['add']['type'] = array(
     '#type' => 'select',
     '#options' => webform_component_options(),
@@ -165,7 +169,7 @@
 
   $node = $form['#node'];
 
-  $header = array(t('Name'), t('Type'), t('Value'), t('Mandatory'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3));
+  $header = array(t('Name'), t('Field Key'), t('Type'), t('Value'), t('Mandatory'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3));
   $rows = array();
 
   // Add a row containing form elements for a new item.
@@ -218,7 +222,7 @@
 
       // Add each component to a table row.
       $row_data = array(
-        $indents . filter_xss($component['name']),
+	$indents . filter_xss($component['name']),filter_xss($component['form_key']),
         t($component['type']),
         ($component['value'] == '') ? '-' : $component['value'],
         drupal_render($form['components'][$cid]['mandatory']),