Index: components/grid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/grid.inc,v
retrieving revision 1.17
diff -u -r1.17 grid.inc
--- components/grid.inc	16 Mar 2010 00:11:59 -0000	1.17
+++ components/grid.inc	20 Mar 2010 00:08:53 -0000
@@ -37,7 +37,7 @@
 function _webform_theme_grid() {
   return array(
     'webform_grid' => array(
-      'render element' => 'grid_element',
+      'render element' => 'element',
     ),
     'webform_display_grid' => array(
       'render element' => 'element',
@@ -119,7 +119,7 @@
         '#required'      => $component['mandatory'],
         '#options'       => $options,
         '#type'          => 'radios',
-        '#process'       => array('expand_radios', 'webform_expand_select_ids'),
+        '#process'       => array('form_process_radios', 'webform_expand_select_ids'),
         '#validated'     => TRUE, // Webform handles validation separately.
       );
     }
@@ -336,7 +336,7 @@
     $row = array(array('data' => _webform_filter_xss($question_element['#title']), 'class' => 'webform-grid-question'));
 
     // Render each radio button in the row.
-    $radios = expand_radios($question_element);
+    $radios = form_process_radios($question_element);
     foreach (element_children($radios) as $key) {
       unset($radios[$key]['#title']);
       $row[] = array('data' => drupal_render($radios[$key]), 'class' => 'checkbox webform-grid-option');
Index: components/select.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v
retrieving revision 1.44
diff -u -r1.44 select.inc
--- components/select.inc	16 Mar 2010 00:11:59 -0000	1.44
+++ components/select.inc	20 Mar 2010 00:08:53 -0000
@@ -255,7 +255,7 @@
     else {
       // Set display as a radio set.
       $element['#type'] = 'radios';
-      $element['#process'] = array('expand_radios', 'webform_expand_select_ids');
+      $element['#process'] = array('form_process_radios', 'webform_expand_select_ids');
     }
   }
 
@@ -280,7 +280,7 @@
     }
   }
 
-  $element = expand_checkboxes($element);
+  $element = form_process_checkboxes($element);
 
   // Escape the values of checkboxes.
   foreach (element_children($element) as $key) {
Index: components/date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/date.inc,v
retrieving revision 1.32
diff -u -r1.32 date.inc
--- components/date.inc	16 Mar 2010 00:11:59 -0000	1.32
+++ components/date.inc	20 Mar 2010 00:08:53 -0000
@@ -183,7 +183,7 @@
   }
 
   // Let Drupal do it's normal expansion.
-  $element = expand_date($element);
+  $element = form_process_date($element);
 
   // Set default values.
   foreach ($default_values as $type => $value) {