=== modified file 'includes/common.inc'
--- includes/common.inc	2009-04-26 07:50:51 +0000
+++ includes/common.inc	2009-04-26 15:50:35 +0000
@@ -3310,7 +3310,7 @@ function drupal_render_page($page) {
  *
  * #theme is the theme function called first. If it is set and the element has any
  * children, they have to be rendered there. For elements that are not allowed
- * to have any children, e.g. buttons or textfields, it can be used to render
+ * to have any children, e.g. buttons or text fields, it can be used to render
  * the element itself. If #theme is not present and the element has children,
  * they are rendered and concatenated into a string by drupal_render_children().
  *
@@ -3747,7 +3747,7 @@ function drupal_common_theme() {
     'hidden' => array(
       'arguments' => array('element' => NULL),
     ),
-    'textfield' => array(
+    'text' => array(
       'arguments' => array('element' => NULL),
     ),
     'form' => array(

=== modified file 'includes/form.inc'
--- includes/form.inc	2009-04-22 09:12:44 +0000
+++ includes/form.inc	2009-04-26 15:50:35 +0000
@@ -1366,7 +1366,7 @@ function form_type_select_value($form, $
 }
 
 /**
- * Helper function to determine the value for a textfield form element.
+ * Helper function to determine the value for a text form element.
  *
  * @param $form
  *   The form element whose value is being populated.
@@ -1377,7 +1377,7 @@ function form_type_select_value($form, $
  *   The data that will appear in the $form_state['values'] collection
  *   for this element. Return nothing to use the default.
  */
-function form_type_textfield_value($form, $edit = FALSE) {
+function form_type_text_value($form, $edit = FALSE) {
   if ($edit !== FALSE) {
     // Equate $edit to the form value to ensure it's marked for
     // validation.
@@ -2002,7 +2002,7 @@ function form_process_ahah($element) {
         $element['#ahah']['keypress'] = TRUE;
         break;
       case 'password':
-      case 'textfield':
+      case 'text':
       case 'textarea':
         $element['#ahah']['event'] = 'blur';
         break;
@@ -2450,17 +2450,17 @@ function theme_hidden($element) {
 }
 
 /**
- * Format a textfield.
+ * Format a text field.
  *
  * @param $element
  *   An associative array containing the properties of the element.
  *   Properties used:  title, value, description, size, maxlength, required, attributes autocomplete_path
  * @return
- *   A themed HTML string representing the textfield.
+ *   A themed HTML string representing the text field.
  *
  * @ingroup themeable
  */
-function theme_textfield($element) {
+function theme_text($element) {
   $size = empty($element['#size']) ? '' : ' size="' . $element['#size'] . '"';
   $maxlength = empty($element['#maxlength']) ? '' : ' maxlength="' . $element['#maxlength'] . '"';
   $class = array('form-text');

=== modified file 'includes/locale.inc'
--- includes/locale.inc	2009-04-22 16:07:03 +0000
+++ includes/locale.inc	2009-04-26 15:50:35 +0000
@@ -251,7 +251,7 @@ function _locale_languages_common_contro
     );
   }
   else {
-    $form['langcode'] = array('#type' => 'textfield',
+    $form['langcode'] = array('#type' => 'text',
       '#title' => t('Language code'),
       '#size' => 12,
       '#maxlength' => 60,
@@ -261,27 +261,27 @@ function _locale_languages_common_contro
       '#description' => t('<a href="@rfc4646">RFC 4646</a> compliant language identifier. Language codes typically use a country code, and optionally, a script or regional variant name. <em>Examples: "en", "en-US" and "zh-Hant".</em>', array('@rfc4646' => 'http://www.ietf.org/rfc/rfc4646.txt')),
     );
   }
-  $form['name'] = array('#type' => 'textfield',
+  $form['name'] = array('#type' => 'text',
     '#title' => t('Language name in English'),
     '#maxlength' => 64,
     '#default_value' => @$language->name,
     '#required' => TRUE,
     '#description' => t('Name of the language in English. Will be available for translation in all languages.'),
   );
-  $form['native'] = array('#type' => 'textfield',
+  $form['native'] = array('#type' => 'text',
     '#title' => t('Native language name'),
     '#maxlength' => 64,
     '#default_value' => @$language->native,
     '#required' => TRUE,
     '#description' => t('Name of the language in the language being added.'),
   );
-  $form['prefix'] = array('#type' => 'textfield',
+  $form['prefix'] = array('#type' => 'text',
     '#title' => t('Path prefix'),
     '#maxlength' => 64,
     '#default_value' => @$language->prefix,
     '#description' => t('Language code or other custom string for pattern matching within the path. With language negotiation set to <em>Path prefix only</em> or <em>Path prefix with language fallback</em>, this site is presented in this language when the Path prefix value matches an element in the path. For the default language, this value may be left blank. <strong>Modifying this value will break existing URLs and should be used with caution in a production environment.</strong> <em>Example: Specifying "deutsch" as the path prefix for German results in URLs in the form "www.example.com/deutsch/node".</em>')
   );
-  $form['domain'] = array('#type' => 'textfield',
+  $form['domain'] = array('#type' => 'text',
     '#title' => t('Language domain'),
     '#maxlength' => 128,
     '#default_value' => @$language->domain,
@@ -628,7 +628,7 @@ function locale_translation_filter_form(
     // Special case for 'string' filter.
     if ($key == 'string') {
       $form['filters']['status']['string'] = array(
-        '#type' => 'textfield',
+        '#type' => 'text',
         '#title' => $filter['title'],
         '#description' => $filter['description'],
       );

=== modified file 'install.php'
--- install.php	2009-04-26 00:59:24 +0000
+++ install.php	2009-04-26 15:50:35 +0000
@@ -252,7 +252,7 @@ function install_settings_form(&$form_st
 
     // Database name
     $form['basic_options']['database'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => st('Database name'),
       '#default_value' => empty($database['database']) ? '' : $database['database'],
       '#size' => 45,
@@ -262,7 +262,7 @@ function install_settings_form(&$form_st
 
     // Database username
     $form['basic_options']['username'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => st('Database username'),
       '#default_value' => empty($database['username']) ? '' : $database['username'],
       '#size' => 45,
@@ -286,7 +286,7 @@ function install_settings_form(&$form_st
 
     // Database host
     $form['advanced_options']['host'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => st('Database host'),
       '#default_value' => empty($database['host']) ? 'localhost' : $database['host'],
       '#size' => 45,
@@ -298,7 +298,7 @@ function install_settings_form(&$form_st
 
     // Database port
     $form['advanced_options']['port'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => st('Database port'),
       '#default_value' => empty($database['port']) ? '' : $database['port'],
       '#size' => 45,
@@ -310,7 +310,7 @@ function install_settings_form(&$form_st
     // Table prefix
     $db_prefix = ($profile == 'default') ? 'drupal_' : $profile . '_';
     $form['advanced_options']['db_prefix'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => st('Table prefix'),
       '#default_value' => '',
       '#size' => 45,
@@ -961,13 +961,13 @@ function install_configure_form(&$form_s
     '#collapsible' => FALSE,
   );
   $form['site_information']['site_name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => st('Site name'),
     '#required' => TRUE,
     '#weight' => -20,
   );
   $form['site_information']['site_mail'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => st('Site e-mail address'),
     '#default_value' => ini_get('sendmail_from'),
     '#description' => st("The <em>From</em> address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"),
@@ -985,7 +985,7 @@ function install_configure_form(&$form_s
     '#weight' => -10,
   );
 
-  $form['admin_account']['account']['name'] = array('#type' => 'textfield',
+  $form['admin_account']['account']['name'] = array('#type' => 'text',
     '#title' => st('Username'),
     '#maxlength' => USERNAME_MAX_LENGTH,
     '#description' => st('Spaces are allowed; punctuation is not allowed except for periods, hyphens, and underscores.'),
@@ -994,7 +994,7 @@ function install_configure_form(&$form_s
     '#attributes' => array('class' => 'username'),
   );
 
-  $form['admin_account']['account']['mail'] = array('#type' => 'textfield',
+  $form['admin_account']['account']['mail'] = array('#type' => 'text',
     '#title' => st('E-mail address'),
     '#maxlength' => EMAIL_MAX_LENGTH,
     '#description' => st('All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'),

=== modified file 'misc/autocomplete.js'
--- misc/autocomplete.js	2009-03-13 23:15:08 +0000
+++ misc/autocomplete.js	2009-04-26 15:50:35 +0000
@@ -197,7 +197,7 @@ Drupal.jsAC.prototype.populatePopup = fu
  * Fills the suggestion popup with any matches received.
  */
 Drupal.jsAC.prototype.found = function (matches) {
-  // If no value in the textfield, do not show the popup.
+  // If no value in the text field, do not show the popup.
   if (!this.input.value.length) {
     return false;
   }

=== modified file 'modules/aggregator/aggregator.admin.inc'
--- modules/aggregator/aggregator.admin.inc	2009-02-24 16:48:18 +0000
+++ modules/aggregator/aggregator.admin.inc	2009-04-26 15:50:35 +0000
@@ -63,14 +63,14 @@ function aggregator_form_feed(&$form_sta
     $feed->refresh = 3600;
   }
 
-  $form['title'] = array('#type' => 'textfield',
+  $form['title'] = array('#type' => 'text',
     '#title' => t('Title'),
     '#default_value' => isset($feed->title) ? $feed->title : '',
     '#maxlength' => 255,
     '#description' => t('The name of the feed (or the name of the website providing the feed).'),
     '#required' => TRUE,
   );
-  $form['url'] = array('#type' => 'textfield',
+  $form['url'] = array('#type' => 'text',
     '#title' => t('URL'),
     '#default_value' => isset($feed->url) ? $feed->url : '',
     '#maxlength' => 255,
@@ -242,7 +242,7 @@ function aggregator_form_opml(&$form_sta
     '#description' => t('Upload an OPML file containing a list of feeds to be imported.'),
   );
   $form['remote'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('OPML Remote URL'),
     '#description' => t('Enter the URL of an OPML file. This file will be downloaded and processed only once on submission of the form.'),
   );
@@ -500,7 +500,7 @@ function aggregator_admin_form_submit($f
  * @see aggregator_form_category_submit()
  */
 function aggregator_form_category(&$form_state, $edit = array('title' => '', 'description' => '', 'cid' => NULL)) {
-  $form['title'] = array('#type' => 'textfield',
+  $form['title'] = array('#type' => 'text',
     '#title' => t('Title'),
     '#default_value' => $edit['title'],
     '#maxlength' => 64,

=== modified file 'modules/block/block.admin.inc'
--- modules/block/block.admin.inc	2009-02-11 03:38:46 +0000
+++ modules/block/block.admin.inc	2009-04-26 15:50:35 +0000
@@ -162,7 +162,7 @@ function block_admin_configure(&$form_st
     '#collapsible' => TRUE,
   );
   $form['block_settings']['title'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Block title'),
     '#maxlength' => 64,
     '#description' => $module == 'block' ? t('The title of the block as shown to the user.') : t('Override the default title for the block. Use <em>&lt;none&gt;</em> to display no title, or leave blank to use the default block title.'),

=== modified file 'modules/block/block.module'
--- modules/block/block.module	2009-04-26 01:15:03 +0000
+++ modules/block/block.module	2009-04-26 15:50:35 +0000
@@ -374,7 +374,7 @@ function block_box_form($edit = array())
     'body' => '',
   );
   $form['info'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Block description'),
     '#default_value' => $edit['info'],
     '#maxlength' => 64,

=== modified file 'modules/blog/blog.module'
--- modules/blog/blog.module	2009-04-15 13:50:07 +0000
+++ modules/blog/blog.module	2009-04-26 15:50:35 +0000
@@ -76,7 +76,7 @@ function blog_form($node, $form_state) {
   global $nid;
   $type = node_get_types('type', $node);
 
-  $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#required' => TRUE, '#default_value' => !empty($node->title) ? $node->title : NULL, '#weight' => -5);
+  $form['title'] = array('#type' => 'text', '#title' => check_plain($type->title_label), '#required' => TRUE, '#default_value' => !empty($node->title) ? $node->title : NULL, '#weight' => -5);
   $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
   return $form;
 }

=== modified file 'modules/blogapi/blogapi.module'
--- modules/blogapi/blogapi.module	2009-04-26 09:14:31 +0000
+++ modules/blogapi/blogapi.module	2009-04-26 15:50:35 +0000
@@ -741,7 +741,7 @@ function blogapi_admin_settings() {
   );
 
   $form['settings_general']['blogapi_extensions_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default permitted file extensions'),
     '#default_value' => $blogapi_extensions_default,
     '#maxlength' => 255,
@@ -749,7 +749,7 @@ function blogapi_admin_settings() {
   );
 
   $form['settings_general']['blogapi_uploadsize_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default maximum file size per upload'),
     '#default_value' => $blogapi_uploadsize_default,
     '#size' => 5,
@@ -759,7 +759,7 @@ function blogapi_admin_settings() {
   );
 
   $form['settings_general']['blogapi_usersize_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default total file size per user'),
     '#default_value' => $blogapi_usersize_default,
     '#size' => 5,
@@ -781,14 +781,14 @@ function blogapi_admin_settings() {
       '#collapsed' => TRUE,
     );
     $form['settings_role_' . $rid]['blogapi_extensions_' . $rid] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Permitted file extensions'),
       '#default_value' => variable_get('blogapi_extensions_' . $rid, $blogapi_extensions_default),
       '#maxlength' => 255,
       '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'),
     );
     $form['settings_role_' . $rid]['blogapi_uploadsize_' . $rid] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Maximum file size per upload'),
       '#default_value' => variable_get('blogapi_uploadsize_' . $rid, $blogapi_uploadsize_default),
       '#size' => 5,
@@ -796,7 +796,7 @@ function blogapi_admin_settings() {
       '#description' => t('The maximum size of a file a user can upload (in megabytes).'),
     );
     $form['settings_role_' . $rid]['blogapi_usersize_' . $rid] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Total file size per user'),
       '#default_value' => variable_get('blogapi_usersize_' . $rid, $blogapi_usersize_default),
       '#size' => 5,

=== modified file 'modules/book/book.admin.inc'
--- modules/book/book.admin.inc	2009-03-14 20:13:26 +0000
+++ modules/book/book.admin.inc	2009-04-26 15:50:35 +0000
@@ -188,7 +188,7 @@ function _book_admin_table_tree($tree, &
       'depth' => array('#type' => 'value', '#value' => $data['link']['depth']),
       'href' => array('#type' => 'value', '#value' => $data['link']['href']),
       'title' => array(
-        '#type' => 'textfield',
+        '#type' => 'text',
         '#default_value' => $data['link']['link_title'],
         '#maxlength' => 255,
         '#size' => 40,
@@ -199,7 +199,7 @@ function _book_admin_table_tree($tree, &
         '#delta' => 15,
       ),
       'plid' => array(
-        '#type' => 'textfield',
+        '#type' => 'text',
         '#default_value' => $data['link']['plid'],
         '#size' => 6,
       ),

=== modified file 'modules/color/color.module'
--- modules/color/color.module	2009-04-20 20:02:29 +0000
+++ modules/color/color.module	2009-04-26 15:50:35 +0000
@@ -205,7 +205,7 @@ function color_scheme_form(&$form_state,
   $form['palette']['#tree'] = TRUE;
   foreach ($palette as $name => $value) {
     $form['palette'][$name] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => $names[$name],
       '#default_value' => $value,
       '#size' => 8,

=== modified file 'modules/comment/comment.module'
--- modules/comment/comment.module	2009-04-26 06:00:31 +0000
+++ modules/comment/comment.module	2009-04-26 15:50:35 +0000
@@ -1431,7 +1431,7 @@ function comment_form(&$form_state, $edi
       if ($edit['registered_name'] != '') {
         // The comment is by a registered user.
         $form['admin']['author'] = array(
-          '#type' => 'textfield',
+          '#type' => 'text',
           '#title' => t('Authored by'),
           '#size' => 30,
           '#maxlength' => 60,
@@ -1447,7 +1447,7 @@ function comment_form(&$form_state, $edi
           '#value' => TRUE,
         );
         $form['admin']['name'] = array(
-          '#type' => 'textfield',
+          '#type' => 'text',
           '#title' => t('Authored by'),
           '#size' => 30,
           '#maxlength' => 60,
@@ -1455,7 +1455,7 @@ function comment_form(&$form_state, $edi
           '#weight' => -1,
         );
         $form['admin']['mail'] = array(
-          '#type' => 'textfield',
+          '#type' => 'text',
           '#title' => t('E-mail'),
           '#maxlength' => 64,
           '#size' => 30,
@@ -1463,7 +1463,7 @@ function comment_form(&$form_state, $edi
           '#description' => t('The content of this field is kept private and will not be shown publicly.'),
         );
         $form['admin']['homepage'] = array(
-          '#type' => 'textfield',
+          '#type' => 'text',
           '#title' => t('Homepage'),
           '#maxlength' => 255,
           '#size' => 30,
@@ -1471,7 +1471,7 @@ function comment_form(&$form_state, $edi
         );
       }
       $form['admin']['date'] = array(
-        '#type' => 'textfield',
+        '#type' => 'text',
         '#parents' => array('date'),
         '#title' => t('Authored on'),
         '#size' => 20,
@@ -1502,21 +1502,21 @@ function comment_form(&$form_state, $edi
   }
   elseif (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) {
     $form['name'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Your name'),
       '#maxlength' => 60,
       '#size' => 30,
       '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')),
     );
     $form['mail'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('E-mail'),
       '#maxlength' => 64,
       '#size' => 30,
       '#default_value' => $edit['mail'], '#description' => t('The content of this field is kept private and will not be shown publicly.'),
     );
     $form['homepage'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Homepage'),
       '#maxlength' => 255,
       '#size' => 30,
@@ -1525,7 +1525,7 @@ function comment_form(&$form_state, $edi
   }
   elseif (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) {
     $form['name'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Your name'),
       '#maxlength' => 60,
       '#size' => 30,
@@ -1533,7 +1533,7 @@ function comment_form(&$form_state, $edi
       '#required' => TRUE,
     );
     $form['mail'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('E-mail'),
       '#maxlength' => 64,
       '#size' => 30,
@@ -1541,7 +1541,7 @@ function comment_form(&$form_state, $edi
       '#required' => TRUE,
     );
     $form['homepage'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Homepage'),
       '#maxlength' => 255,
       '#size' => 30,
@@ -1551,7 +1551,7 @@ function comment_form(&$form_state, $edi
 
   if (variable_get('comment_subject_field_' . $node->type, 1) == 1) {
     $form['subject'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Subject'),
       '#maxlength' => 64,
       '#default_value' => !empty($edit['subject']) ? $edit['subject'] : '',

=== modified file 'modules/contact/contact.admin.inc'
--- modules/contact/contact.admin.inc	2009-03-25 13:45:00 +0000
+++ modules/contact/contact.admin.inc	2009-04-26 15:50:35 +0000
@@ -52,7 +52,7 @@ function contact_admin_edit($form_state 
     );
   }
   $form['contact_op'] = array('#type' => 'value', '#value' => $op);
-  $form['category'] = array('#type' => 'textfield',
+  $form['category'] = array('#type' => 'text',
     '#title' => t('Category'),
     '#maxlength' => 255,
     '#default_value' => $contact['category'],

=== modified file 'modules/contact/contact.pages.inc'
--- modules/contact/contact.pages.inc	2009-04-21 09:27:52 +0000
+++ modules/contact/contact.pages.inc	2009-04-26 15:53:20 +0000
@@ -51,21 +51,21 @@ function contact_mail_page() {
     '#markup' => filter_xss_admin(variable_get('contact_form_information', t('You can leave a message using the contact form below.'))),
   );
   $form['name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Your name'),
     '#maxlength' => 255,
     '#default_value' => $user->uid ? $user->name : '',
     '#required' => TRUE,
   );
   $form['mail'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Your e-mail address'),
     '#maxlength' => 255,
     '#default_value' => $user->uid ? $user->mail : '',
     '#required' => TRUE,
   );
   $form['subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#maxlength' => 255,
     '#required' => TRUE,
@@ -180,7 +180,7 @@ function contact_mail_user(&$form_state,
     '#title' => t('To'),
     '#markup' => check_plain($recipient->name),
   );
-  $form['subject'] = array('#type' => 'textfield',
+  $form['subject'] = array('#type' => 'text',
     '#title' => t('Subject'),
     '#maxlength' => 50,
     '#required' => TRUE,

=== modified file 'modules/field/field.test'
--- modules/field/field.test	2009-04-20 02:46:22 +0000
+++ modules/field/field.test	2009-04-26 15:50:35 +0000
@@ -560,8 +560,8 @@ class FieldAttachTestCase extends Drupal
 
     $this->assertEqual($form[$this->field_name]['#title'], $this->instance['label'], "Form title is {$this->instance['label']}");
     for ($delta = 0; $delta < $this->field['cardinality']; $delta++) {
-      // field_test_widget uses 'textfield'
-      $this->assertEqual($form[$this->field_name][$delta]['value']['#type'], 'textfield', "Form delta $delta widget is textfield");
+      // field_test_widget uses 'text'
+      $this->assertEqual($form[$this->field_name][$delta]['value']['#type'], 'text', "Form delta $delta widget is text");
     }
   }
 
@@ -909,7 +909,7 @@ class FieldFormTestCase extends DrupalWe
     // Test with several multiple fields in a form
   }
 
-  // check with a multiple widget (implement a textfield with comma separated values)
+  // check with a multiple widget (implement a text field with comma separated values)
 
   // check inaccessible fields are preserved on update
   // check inaccessible fields get default value on insert (not implemented yet)

=== modified file 'modules/field/modules/number/number.module'
--- modules/field/modules/number/number.module	2009-04-12 02:18:51 +0000
+++ modules/field/modules/number/number.module	2009-04-26 15:50:35 +0000
@@ -303,7 +303,7 @@ function number_process($element, $form_
   }
 
   $element[$field_key] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => $value,
     // Need to allow a slightly larger size that the field length to allow
     // for some configurations where all characters won't fit in input field.
@@ -420,7 +420,7 @@ function number_decimal_validate($elemen
 /**
  * FAPI theme for an individual number element.
  *
- * The textfield is already rendered by the textfield
+ * The text field is already rendered by the text field
  * theme and the HTML output lives in $element['#children'].
  * Override this theme to make custom changes to the output.
  *
@@ -429,4 +429,4 @@ function number_decimal_validate($elemen
  */
 function theme_number($element) {
   return $element['#children'];
-}
\ No newline at end of file
+}

=== modified file 'modules/field/modules/text/text.module'
--- modules/field/modules/text/text.module	2009-04-12 02:18:51 +0000
+++ modules/field/modules/text/text.module	2009-04-26 15:50:35 +0000
@@ -312,7 +312,7 @@ function text_textfield_process($element
   $delta = $element['#delta'];
 
   $element[$field_key] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
     '#autocomplete_path' => $element['#autocomplete_path'],
     '#size' => $instance['widget']['settings']['size'],

=== modified file 'modules/filter/filter.admin.inc'
--- modules/filter/filter.admin.inc	2009-04-26 06:00:31 +0000
+++ modules/filter/filter.admin.inc	2009-04-26 15:50:35 +0000
@@ -117,7 +117,7 @@ function filter_admin_format_form(&$form
     $form['default_format'] = array('#type' => 'hidden', '#value' => 1);
   }
 
-  $form['name'] = array('#type' => 'textfield',
+  $form['name'] = array('#type' => 'text',
     '#title' => t('Name'),
     '#default_value' => $format->name,
     '#description' => t('Specify a unique name for this text format.'),

=== modified file 'modules/filter/filter.module'
--- modules/filter/filter.module	2009-04-25 18:01:10 +0000
+++ modules/filter/filter.module	2009-04-26 15:50:35 +0000
@@ -665,7 +665,7 @@ function _filter_html_settings($format) 
     '#collapsible' => TRUE,
   );
   $form['filter_html']["allowed_html_$format"] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Allowed HTML tags'),
     '#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
     '#size' => 64,
@@ -711,7 +711,7 @@ function _filter_url_settings($format) {
     '#collapsible' => TRUE,
   );
   $form['filter_urlfilter']['filter_url_length_' . $format] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Maximum link text length'),
     '#default_value' => variable_get('filter_url_length_' . $format, 72),
     '#maxlength' => 4,

=== modified file 'modules/forum/forum.admin.inc'
--- modules/forum/forum.admin.inc	2009-01-28 01:09:58 +0000
+++ modules/forum/forum.admin.inc	2009-04-26 15:50:35 +0000
@@ -34,7 +34,7 @@ function forum_form_forum(&$form_state, 
     'tid' => NULL,
     'weight' => 0,
   );
-  $form['name'] = array('#type' => 'textfield',
+  $form['name'] = array('#type' => 'text',
     '#title' => t('Forum name'),
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
@@ -115,7 +115,7 @@ function forum_form_container(&$form_sta
   // Handle a delete operation.
   $form['name'] = array(
     '#title' => t('Container name'),
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
     '#description' => t('Short but meaningful name for this collection of related forums.'),

=== modified file 'modules/forum/forum.module'
--- modules/forum/forum.module	2009-04-21 10:57:48 +0000
+++ modules/forum/forum.module	2009-04-26 15:50:35 +0000
@@ -540,7 +540,7 @@ function forum_block_view($delta = '') {
  */
 function forum_form(&$node, $form_state) {
   $type = node_get_types('type', $node);
-  $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);
+  $form['title'] = array('#type' => 'text', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);
 
   if (!empty($node->nid)) {
     $vid = variable_get('forum_nav_vocabulary', '');

=== modified file 'modules/menu/menu.admin.inc'
--- modules/menu/menu.admin.inc	2009-04-21 09:31:30 +0000
+++ modules/menu/menu.admin.inc	2009-04-26 15:50:35 +0000
@@ -102,7 +102,7 @@ function _menu_overview_tree_form($tree)
         '#value' => $item['mlid'],
       );
       $form[$mlid]['plid'] = array(
-        '#type' => 'textfield',
+        '#type' => 'text',
         '#default_value' => isset($form_state[$mlid]['plid']) ? $form_state[$mlid]['plid'] : $item['plid'],
         '#size' => 6,
       );
@@ -253,7 +253,7 @@ function menu_edit_item(&$form_state, $t
     // This is an add form, initialize the menu link.
     $item = array('link_title' => '', 'mlid' => 0, 'plid' => 0, 'menu_name' => $menu['menu_name'], 'weight' => 0, 'link_path' => '', 'options' => array(), 'module' => 'menu', 'expanded' => 0, 'hidden' => 0, 'has_children' => 0);
   }
-  $form['menu']['link_title'] = array('#type' => 'textfield',
+  $form['menu']['link_title'] = array('#type' => 'text',
     '#title' => t('Menu link title'),
     '#default_value' => $item['link_title'],
     '#description' => t('The text to be used for this link in the menu.'),
@@ -275,7 +275,7 @@ function menu_edit_item(&$form_state, $t
   }
   if ($item['module'] == 'menu') {
     $form['menu']['link_path'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Path'),
       '#default_value' => $path,
       '#description' => t('The path for this menu link. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '<front>', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')),
@@ -415,7 +415,7 @@ function menu_edit_menu(&$form_state, $t
   else {
     $menu = array('menu_name' => '', 'title' => '', 'description' => '');
     $form['menu_name'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Menu name'),
       '#maxsize' => MENU_MAX_MENU_NAME_LENGTH_UI,
       '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name must contain only lowercase letters, numbers, and hyphens, and must be unique.'),
@@ -432,7 +432,7 @@ function menu_edit_menu(&$form_state, $t
   }
   else {
     $form['title'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Title'),
       '#default_value' => $menu['title'],
       '#required' => TRUE,

=== modified file 'modules/menu/menu.module'
--- modules/menu/menu.module	2009-04-11 22:19:44 +0000
+++ modules/menu/menu.module	2009-04-26 15:50:35 +0000
@@ -419,7 +419,7 @@ function menu_form_alter(&$form, $form_s
     }
     $form['menu']['#item'] = $item;
 
-    $form['menu']['link_title'] = array('#type' => 'textfield',
+    $form['menu']['link_title'] = array('#type' => 'text',
       '#title' => t('Menu link title'),
       '#default_value' => $item['link_title'],
       '#description' => t('The link text corresponding to this item that should appear in the menu. Leave blank if you do not wish to add this post to the menu.'),

=== modified file 'modules/node/content_types.inc'
--- modules/node/content_types.inc	2009-04-26 05:26:17 +0000
+++ modules/node/content_types.inc	2009-04-26 15:50:35 +0000
@@ -67,7 +67,7 @@ function node_type_form(&$form_state, $t
   );
   $form['identity']['name'] = array(
     '#title' => t('Name'),
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => $type->name,
     '#description' => t('The human-readable name of this content type. This text will be displayed as part of the list on the <em>create content</em> page. It is recommended that this name begin with a capital letter and contain only letters, numbers, and <strong>spaces</strong>. This name must be unique.'),
     '#required' => TRUE,
@@ -77,7 +77,7 @@ function node_type_form(&$form_state, $t
   if (!$type->locked) {
     $form['identity']['type'] = array(
       '#title' => t('Machine name'),
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#default_value' => $type->type,
       '#maxlength' => 32,
       '#required' => TRUE,
@@ -112,7 +112,7 @@ function node_type_form(&$form_state, $t
   );
   $form['submission']['title_label'] = array(
     '#title' => t('Title field label'),
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => $type->title_label,
     '#required' => TRUE,
   );
@@ -125,7 +125,7 @@ function node_type_form(&$form_state, $t
   }
   $form['submission']['body_label'] = array(
     '#title' => t('Body field label'),
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => isset($type->body_label) ? $type->body_label : '',
     '#description' => t('To omit the body field for this content type, remove any text and leave this field blank.'),
   );

=== modified file 'modules/node/node.api.php'
--- modules/node/node.api.php	2009-04-25 16:33:48 +0000
+++ modules/node/node.api.php	2009-04-26 15:50:35 +0000
@@ -635,7 +635,7 @@ function hook_form(&$node, $form_state) 
   $type = node_get_types('type', $node);
 
   $form['title'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => check_plain($type->title_label),
     '#required' => TRUE,
   );
@@ -646,7 +646,7 @@ function hook_form(&$node, $form_state) 
     '#required' => TRUE,
   );
   $form['field1'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Custom field'),
     '#default_value' => $node->field1,
     '#maxlength' => 127,

=== modified file 'modules/node/node.module'
--- modules/node/node.module	2009-04-26 09:14:31 +0000
+++ modules/node/node.module	2009-04-26 15:50:35 +0000
@@ -2200,19 +2200,19 @@ function node_form_search_form_alter(&$f
       '#suffix' => '</div>',
     );
     $form['advanced']['keywords']['or'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Containing any of the words'),
       '#size' => 30,
       '#maxlength' => 255,
     );
     $form['advanced']['keywords']['phrase'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Containing the phrase'),
       '#size' => 30,
       '#maxlength' => 255,
     );
     $form['advanced']['keywords']['negative'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Containing none of the words'),
       '#size' => 30,
       '#maxlength' => 255,
@@ -2872,7 +2872,7 @@ function node_content_form($node, $form_
 
   if ($type->has_title) {
     $form['title'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => check_plain($type->title_label),
       '#required' => TRUE,
       '#default_value' => $node->title,
@@ -3138,7 +3138,7 @@ function node_assign_owner_action_form($
   }
   else {
     $form['owner_name'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Username'),
       '#default_value' => $owner_name,
       '#autocomplete_path' => 'user/autocomplete',

=== modified file 'modules/node/node.pages.inc'
--- modules/node/node.pages.inc	2009-04-26 09:14:31 +0000
+++ modules/node/node.pages.inc	2009-04-26 15:50:35 +0000
@@ -198,7 +198,7 @@ function node_form(&$form_state, $node) 
     '#weight' => 90,
   );
   $form['author']['name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Authored by'),
     '#maxlength' => 60,
     '#autocomplete_path' => 'user/autocomplete',
@@ -207,7 +207,7 @@ function node_form(&$form_state, $node) 
     '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))),
   );
   $form['author']['date'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Authored on'),
     '#maxlength' => 25,
     '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => !empty($node->date) ? $node->date : format_date($node->created, 'custom', 'Y-m-d H:i:s O'))),

=== modified file 'modules/openid/openid.module'
--- modules/openid/openid.module	2009-03-17 15:26:29 +0000
+++ modules/openid/openid.module	2009-04-26 15:50:35 +0000
@@ -111,7 +111,7 @@ function _openid_user_login_form_alter(&
   $form['links']['#weight'] = 2;
 
   $form['openid_identifier'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Log in using OpenID'),
     '#size' => $form['name']['#size'],
     '#maxlength' => 255,

=== modified file 'modules/openid/openid.pages.inc'
--- modules/openid/openid.pages.inc	2009-03-18 09:49:31 +0000
+++ modules/openid/openid.pages.inc	2009-04-26 15:50:35 +0000
@@ -66,7 +66,7 @@ function openid_user_identities($account
  */
 function openid_user_add() {
   $form['openid_identifier'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('OpenID'),
   );
   $form['submit'] = array('#type' => 'submit', '#value' => t('Add an OpenID'));

=== modified file 'modules/path/path.admin.inc'
--- modules/path/path.admin.inc	2009-04-22 15:53:00 +0000
+++ modules/path/path.admin.inc	2009-04-26 15:50:35 +0000
@@ -98,7 +98,7 @@ function path_admin_form(&$form_state, $
   $form['#alias'] = $edit;
 
   $form['src'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Existing system path'),
     '#default_value' => $edit['src'],
     '#maxlength' => 128,
@@ -108,7 +108,7 @@ function path_admin_form(&$form_state, $
     '#required' => TRUE,
   );
   $form['dst'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Path alias'),
     '#default_value' => $edit['dst'],
     '#maxlength' => 128,
@@ -204,7 +204,7 @@ function path_admin_filter_form(&$form_s
   );
   $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
   $form['basic']['inline']['filter'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => '',
     '#default_value' => $keys,
     '#maxlength' => 128,

=== modified file 'modules/path/path.module'
--- modules/path/path.module	2009-04-22 15:53:00 +0000
+++ modules/path/path.module	2009-04-26 15:50:35 +0000
@@ -200,7 +200,7 @@ function path_form_alter(&$form, $form_s
       '#weight' => 30,
     );
     $form['path']['path'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('URL alias'),
       '#default_value' => $path,
       '#maxlength' => 128,

=== modified file 'modules/poll/poll.module'
--- modules/poll/poll.module	2009-04-20 03:41:36 +0000
+++ modules/poll/poll.module	2009-04-26 15:50:35 +0000
@@ -213,7 +213,7 @@ function poll_form(&$node, $form_state) 
   );
 
   $form['title'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => check_plain($type->title_label),
     '#required' => TRUE,
     '#default_value' => $node->title,
@@ -341,13 +341,13 @@ function _poll_choice_form($key, $chid =
   );
 
   $form['chtext'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => $value,
     '#parents' => array('choice', $key, 'chtext'),
   );
 
   $form['chvotes'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => $votes,
     '#size' => 5,
     '#maxlength' => 7,

=== modified file 'modules/profile/profile-block.tpl.php'
--- modules/profile/profile-block.tpl.php	2008-10-13 12:31:42 +0000
+++ modules/profile/profile-block.tpl.php	2009-04-26 15:50:35 +0000
@@ -13,7 +13,7 @@
  * Each $field in $profile contains:
  * - $field->title: Title of the profile field.
  * - $field->value: Value of the profile field.
- * - $field->type: Type of the profile field, i.e., checkbox, textfield,
+ * - $field->type: Type of the profile field, i.e., checkbox, text,
  *   textarea, selection, list, url or date.
  *
  * Since $profile is keyed, a direct print of the field is possible. Not

=== modified file 'modules/profile/profile-listing.tpl.php'
--- modules/profile/profile-listing.tpl.php	2009-02-18 14:28:21 +0000
+++ modules/profile/profile-listing.tpl.php	2009-04-26 15:50:35 +0000
@@ -19,7 +19,7 @@
  * Each $field in $profile contains:
  * - $field->title: Title of the profile field.
  * - $field->value: Value of the profile field.
- * - $field->type: Type of the profile field, i.e., checkbox, textfield,
+ * - $field->type: Type of the profile field, i.e., checkbox, text,
  *   textarea, selection, list, url or date.
  *
  * Since $profile is keyed, a direct print of the field is possible. Not

=== modified file 'modules/profile/profile.admin.inc'
--- modules/profile/profile.admin.inc	2009-02-26 07:30:26 +0000
+++ modules/profile/profile.admin.inc	2009-04-26 15:50:35 +0000
@@ -210,20 +210,20 @@ function profile_field_form(&$form_state
   $form['fields'] = array('#type' => 'fieldset',
     '#title' => t('Field settings'),
   );
-  $form['fields']['category'] = array('#type' => 'textfield',
+  $form['fields']['category'] = array('#type' => 'text',
     '#title' => t('Category'),
     '#default_value' => $edit['category'],
     '#autocomplete_path' => 'admin/user/profile/autocomplete',
     '#description' => t('The category the new field should be part of. Categories are used to group fields logically. An example category is "Personal information".'),
     '#required' => TRUE,
   );
-  $form['fields']['title'] = array('#type' => 'textfield',
+  $form['fields']['title'] = array('#type' => 'text',
     '#title' => t('Title'),
     '#default_value' => $edit['title'],
     '#description' => t('The title of the new field. The title will be shown to the user. An example title is "Favorite color".'),
     '#required' => TRUE,
   );
-  $form['fields']['name'] = array('#type' => 'textfield',
+  $form['fields']['name'] = array('#type' => 'text',
     '#title' => t('Form name'),
     '#default_value' => $edit['name'],
     '#description' => t('The name of the field. The form name is not shown to the user but used internally in the HTML code and URLs.
@@ -247,15 +247,15 @@ Unless you know what you are doing, it i
     '#default_value' => isset($edit['visibility']) ? $edit['visibility'] : PROFILE_PUBLIC,
     '#options' => array(PROFILE_HIDDEN => t('Hidden profile field, only accessible by administrators, modules and themes.'), PROFILE_PRIVATE => t('Private field, content only available to privileged users.'), PROFILE_PUBLIC => t('Public field, content shown on profile page but not used on member list pages.'), PROFILE_PUBLIC_LISTINGS => t('Public field, content shown on profile page and on member list pages.')),
   );
-  if ($type == 'selection' || $type == 'list' || $type == 'textfield') {
-    $form['fields']['page'] = array('#type' => 'textfield',
+  if ($type == 'selection' || $type == 'list' || $type == 'text') {
+    $form['fields']['page'] = array('#type' => 'text',
       '#title' => t('Page title'),
       '#default_value' => $edit['page'],
       '#description' => t('To enable browsing this field by value, enter a title for the resulting page. The word <code>%value</code> will be substituted with the corresponding value. An example page title is "People whose favorite color is %value" . This is only applicable for a public field.'),
     );
   }
   elseif ($type == 'checkbox') {
-    $form['fields']['page'] = array('#type' => 'textfield',
+    $form['fields']['page'] = array('#type' => 'text',
       '#title' => t('Page title'),
       '#default_value' => $edit['page'],
       '#description' => t('To enable browsing this field by value, enter a title for the resulting page. An example page title is "People who are employed" . This is only applicable for a public field.'),

=== modified file 'modules/profile/profile.install'
--- modules/profile/profile.install	2009-02-26 07:30:26 +0000
+++ modules/profile/profile.install	2009-04-26 15:50:35 +0000
@@ -158,3 +158,10 @@ function profile_update_7001() {
   db_rename_table($ret, 'profile_values', 'profile_value');
   return $ret;
 }
+
+function profile_update_7002() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {profile_field} SET type = 'text' WHERE type = 'textfield'");
+  db_change_field($ret, 'profile_field', 'type', 'type', array('type' => 'varchar', 'length' => 128, 'not null' => FALSE));
+  return $ret;
+}

=== modified file 'modules/profile/profile.module'
--- modules/profile/profile.module	2009-03-14 23:01:36 +0000
+++ modules/profile/profile.module	2009-04-26 15:50:35 +0000
@@ -34,8 +34,8 @@ function profile_help($path, $arg) {
     case 'admin/help#profile':
       $output = '<p>' . t('The profile module allows custom fields (such as country, full name, or age) to be defined and displayed in the <em>My Account</em> section. This permits users of a site to share more information about themselves, and can help community-based sites organize users around specific information.') . '</p>';
       $output .= '<p>' . t('The following types of fields can be added to a user profile:') . '</p>';
-      $output .= '<ul><li>' . t('single-line textfield') . '</li>';
-      $output .= '<li>' . t('multi-line textfield') . '</li>';
+      $output .= '<ul><li>' . t('single-line text') . '</li>';
+      $output .= '<li>' . t('multi-line text') . '</li>';
       $output .= '<li>' . t('checkbox') . '</li>';
       $output .= '<li>' . t('list selection') . '</li>';
       $output .= '<li>' . t('freeform list') . '</li>';
@@ -300,7 +300,7 @@ function profile_view_field($user, $fiel
     switch ($field->type) {
       case 'textarea':
         return check_markup($value);
-      case 'textfield':
+      case 'text':
       case 'selection':
         return $browse ? l($value, 'profile/' . $field->name . '/' . $value) : check_plain($value);
       case 'checkbox':
@@ -395,9 +395,9 @@ function profile_form_profile($edit, $us
       $fields[$category] = array('#type' => 'fieldset', '#title' => check_plain($category), '#weight' => $weight++);
     }
     switch ($field->type) {
-      case 'textfield':
+      case 'text':
       case 'url':
-        $fields[$category][$field->name] = array('#type' => 'textfield',
+        $fields[$category][$field->name] = array('#type' => 'text',
           '#title' => check_plain($field->title),
           '#default_value' => isset($edit[$field->name]) ? $edit[$field->name] : '',
           '#maxlength' => 255,
@@ -583,8 +583,8 @@ function template_preprocess_profile_wra
 }
 
 function _profile_field_types($type = NULL) {
-  $types = array('textfield' => t('single-line textfield'),
-                 'textarea' => t('multi-line textfield'),
+  $types = array('text' => t('single-line text'),
+                 'textarea' => t('multi-line text'),
                  'checkbox' => t('checkbox'),
                  'selection' => t('list selection'),
                  'list' => t('freeform list'),

=== modified file 'modules/profile/profile.pages.inc'
--- modules/profile/profile.pages.inc	2009-03-14 23:01:36 +0000
+++ modules/profile/profile.pages.inc	2009-04-26 15:50:35 +0000
@@ -40,7 +40,7 @@ function profile_browse() {
       case 'checkbox':
         $query = 'v.value = 1';
         break;
-      case 'textfield':
+      case 'text':
       case 'selection':
         $query = "v.value = '%s'";
         $arguments[] = $value;
@@ -68,7 +68,7 @@ function profile_browse() {
     $output = theme('profile_wrapper', $content);
     $output .= theme('pager', NULL, 20);
 
-    if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'textfield') {
+    if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'text') {
       $title = strtr(check_plain($field->page), array('%value' => theme('placeholder', $value)));
     }
     else {

=== modified file 'modules/profile/profile.test'
--- modules/profile/profile.test	2009-03-31 01:49:50 +0000
+++ modules/profile/profile.test	2009-04-26 15:50:35 +0000
@@ -30,7 +30,7 @@ class ProfileTestCase extends DrupalWebT
    * @return
    *   The fid of the field that was just created.
    */
-  function createProfileField($type = 'textfield', $category = 'simpletest', $edit = array()) {
+  function createProfileField($type = 'text', $category = 'simpletest', $edit = array()) {
     $edit['title'] = $title = $this->randomName(4, $type . '_');
     $edit['name'] = $form_name = 'profile_' . $title;
     $edit['category'] = $category;
@@ -117,7 +117,7 @@ class ProfileTestFields extends ProfileT
   public static function getInfo() {
     return array(
       'name' => 'Test single fields',
-      'description' => t('Testing profile module with add/edit/delete textfield, textarea, list, checkbox, and url fields into profile page') ,
+      'description' => t('Testing profile module with add/edit/delete text, textarea, list, checkbox, and url fields into profile page') ,
       'group' => t('Profile'));
   }
 
@@ -130,7 +130,7 @@ class ProfileTestFields extends ProfileT
 
     // Set test values for every field type.
     $field_types = array(
-      'textfield' => $this->randomName(),
+      'text' => $this->randomName(),
       'textarea' => $this->randomName(),
       'list' => $this->randomName(),
       'checkbox' => 1,
@@ -221,8 +221,8 @@ class ProfileTestWeights extends Profile
     $this->drupalLogin($this->admin_user);
 
     $category = $this->randomName();
-    $field1 = $this->createProfileField('textfield', $category, array('weight' => 1));
-    $field2 = $this->createProfileField('textfield', $category, array('weight' => -1));
+    $field1 = $this->createProfileField('text', $category, array('weight' => 1));
+    $field2 = $this->createProfileField('text', $category, array('weight' => -1));
 
     $this->setProfileField($field1, $this->randomName(4, 'first_'));
     $this->setProfileField($field2, $this->randomName(4, 'second_'));
@@ -255,7 +255,7 @@ class ProfileTestAutocomplete extends Pr
 
     // Create a new profile field with autocompletion enabled.
     $category = $this->randomName();
-    $field = $this->createProfileField('textfield', $category, array('weight' => 1, 'autocomplete' => 1));
+    $field = $this->createProfileField('text', $category, array('weight' => 1, 'autocomplete' => 1));
 
     // Enter profile field value.
     $field['value'] = $this->randomName();

=== modified file 'modules/search/search.admin.inc'
--- modules/search/search.admin.inc	2009-01-11 21:19:16 +0000
+++ modules/search/search.admin.inc	2009-04-26 15:50:35 +0000
@@ -73,7 +73,7 @@ function search_admin_settings() {
     '#markup' => t('<p><em>Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed.</em></p><p><em>The default settings should be appropriate for the majority of sites.</em></p>')
   );
   $form['indexing_settings']['minimum_word_size'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Minimum word length to index'),
     '#default_value' => 3,
     '#size' => 5,

=== modified file 'modules/search/search.module'
--- modules/search/search.module	2009-04-20 21:28:13 +0000
+++ modules/search/search.module	2009-04-26 15:50:35 +0000
@@ -1079,7 +1079,7 @@ function search_form(&$form_state, $acti
   $form['basic'] = array('#type' => 'item', '#title' => $prompt, '#id' => 'edit-keys');
   $form['basic']['inline'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>');
   $form['basic']['inline']['keys'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => '',
     '#default_value' => $keys,
     '#size' => $prompt ? 40 : 20,
@@ -1103,7 +1103,7 @@ function search_form(&$form_state, $acti
 function search_box(&$form_state, $form_id) {
   $form[$form_id] = array(
     '#title' => t('Search this site'),
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#size' => 15,
     '#default_value' => '',
     '#attributes' => array('title' => t('Enter the terms you wish to search for.')),

=== modified file 'modules/simpletest/tests/field_test.module'
--- modules/simpletest/tests/field_test.module	2009-03-26 13:31:24 +0000
+++ modules/simpletest/tests/field_test.module	2009-04-26 15:50:35 +0000
@@ -300,7 +300,7 @@ function field_test_entity_form_submit_b
 /**
  * Implementation of hook_field_info().
  *
- * This field provides a textfield which only accepts the value 1.
+ * This field provides a text field which only accepts the value 1.
  */
 function field_test_field_info() {
   return array(
@@ -439,7 +439,7 @@ function field_test_field_widget(&$form,
   $element = array(
     'value' => array(
       '#title' => $instance['label'],
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#default_value' => isset($items[$delta]['value']) ? $items[$delta]['value'] : '',
       '#required' => $instance['required'],
     ),
@@ -518,4 +518,4 @@ function theme_field_formatter_field_tes
   }
   $output = implode('|', $items);
   return $settings['test_formatter_setting_multiple'] . '|' . $output;
-}
\ No newline at end of file
+}

=== modified file 'modules/simpletest/tests/form.test'
--- modules/simpletest/tests/form.test	2009-04-22 09:12:44 +0000
+++ modules/simpletest/tests/form.test	2009-04-26 15:50:35 +0000
@@ -27,8 +27,8 @@ class FormsTestCase extends DrupalWebTes
     $empty_strings = array('""' => "", '"\n"' => "\n", '" "' => " ", '"\t"' => "\t", '" \n\t "' => " \n\t ", '"\n\n\n\n\n"' => "\n\n\n\n\n");
     $empty_arrays = array('array()' => array());
 
-    $elements['textfield']['element'] = array('#title' => $this->randomName(), '#type' => 'textfield', '#required' => TRUE);
-    $elements['textfield']['empty_values'] = $empty_strings;
+    $elements['text']['element'] = array('#title' => $this->randomName(), '#type' => 'text', '#required' => TRUE);
+    $elements['text']['empty_values'] = $empty_strings;
 
     $elements['password']['element'] = array('#title' => $this->randomName(), '#type' => 'password', '#required' => TRUE);
     $elements['password']['empty_values'] = $empty_strings;

=== modified file 'modules/simpletest/tests/form_test.module'
--- modules/simpletest/tests/form_test.module	2009-04-22 09:12:44 +0000
+++ modules/simpletest/tests/form_test.module	2009-04-26 15:50:35 +0000
@@ -261,13 +261,13 @@ function form_test_batch_callback($value
 }
 
 /**
- * A simple form with a textfield and submit button.
+ * A simple form with a text field and submit button.
  */
 function form_test_mock_form($form_state) {
   $form = array();
 
   $form['test_value'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#default_value' => 'initial_state',
   );
 

=== modified file 'modules/system/image.gd.inc'
--- modules/system/image.gd.inc	2009-03-10 09:43:01 +0000
+++ modules/system/image.gd.inc	2009-04-26 15:50:35 +0000
@@ -22,7 +22,7 @@ function image_gd_settings() {
     );
 
     $form['image_jpeg_quality'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('JPEG quality'),
       '#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.'),
       '#size' => 10,

=== modified file 'modules/system/system.admin.inc'
--- modules/system/system.admin.inc	2009-04-26 09:14:31 +0000
+++ modules/system/system.admin.inc	2009-04-26 15:50:35 +0000
@@ -414,7 +414,7 @@ function system_theme_settings(&$form_st
       '#description' => t('Check here if you want the theme to use the logo supplied with it.')
     );
     $form['logo']['logo_path'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Path to custom logo'),
       '#default_value' => $settings['logo_path'],
       '#description' => t('The path to the file you would like to use as your logo file instead of the default logo.'));
@@ -440,7 +440,7 @@ function system_theme_settings(&$form_st
       '#description' => t('Check here if you want the theme to use the default shortcut icon.')
     );
     $form['favicon']['favicon_path'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Path to custom icon'),
       '#default_value' => $settings['favicon_path'],
       '#description' => t('The path to the image file you would like to use as your custom shortcut icon.')
@@ -1102,7 +1102,7 @@ function system_ip_blocking() {
 function system_ip_blocking_form($form_state) {
   $form['ip'] = array(
     '#title' => t('IP address'),
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#size' => 64,
     '#maxlength' => 32,
     '#default_value' => arg(3),
@@ -1170,21 +1170,21 @@ function system_ip_blocking_delete_submi
  */
 function system_site_information_settings() {
   $form['site_name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Name'),
     '#default_value' => 'Drupal',
     '#description' => t('The name of this website.'),
     '#required' => TRUE
   );
   $form['site_mail'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('E-mail address'),
     '#default_value' => ini_get('sendmail_from'),
     '#description' => t("The <em>From</em> address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"),
     '#required' => TRUE,
   );
   $form['site_slogan'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Slogan'),
     '#default_value' => '',
     '#description' => t("Your site's motto, tag line, or catchphrase (often displayed alongside the title of the site).")
@@ -1202,14 +1202,14 @@ function system_site_information_setting
     '#description' => t('This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.')
   );
   $form['anonymous'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Anonymous user'),
     '#default_value' => t('Anonymous'),
     '#description' => t('The name used to indicate anonymous users.'),
     '#required' => TRUE,
   );
   $form['site_frontpage'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default front page'),
     '#default_value' => 'node',
     '#size' => 40,
@@ -1218,7 +1218,7 @@ function system_site_information_setting
     '#required' => TRUE,
   );
   $form['site_403'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default 403 (access denied) page'),
     '#default_value' => '',
     '#size' => 40,
@@ -1226,7 +1226,7 @@ function system_site_information_setting
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q=')
   );
   $form['site_404'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default 404 (not found) page'),
     '#default_value' => '',
     '#size' => 40,
@@ -1392,7 +1392,7 @@ function system_clear_cache_submit(&$for
 function system_file_system_settings() {
 
   $form['file_directory_path'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('File system path'),
     '#default_value' => file_directory_path(),
     '#maxlength' => 255,
@@ -1401,7 +1401,7 @@ function system_file_system_settings() {
   );
 
   $form['file_directory_temp'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Temporary directory'),
     '#default_value' => file_directory_temp(),
     '#maxlength' => 255,
@@ -1616,7 +1616,7 @@ function system_regional_settings() {
   $form['date_formats']['date_format_short_custom'] = array(
     '#prefix' => '<div class="custom-container">',
     '#suffix' => '</div></div>',
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Custom short date format'),
     '#attributes' => array('class' => 'custom-format'),
     '#default_value' => $default_short_custom,
@@ -1639,7 +1639,7 @@ function system_regional_settings() {
   $form['date_formats']['date_format_medium_custom'] = array(
     '#prefix' => '<div class="custom-container">',
     '#suffix' => '</div></div>',
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Custom medium date format'),
     '#attributes' => array('class' => 'custom-format'),
     '#default_value' => $default_medium_custom,
@@ -1662,7 +1662,7 @@ function system_regional_settings() {
   $form['date_formats']['date_format_long_custom'] = array(
     '#prefix' => '<div class="custom-container">',
     '#suffix' => '</div></div>',
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Custom long date format'),
     '#attributes' => array('class' => 'custom-format'),
     '#default_value' => $default_long_custom,

=== modified file 'modules/system/system.module'
--- modules/system/system.module	2009-04-26 09:25:42 +0000
+++ modules/system/system.module	2009-04-26 15:50:35 +0000
@@ -283,13 +283,13 @@ function system_elements() {
     '#theme_wrapper' => 'image_button',
   );
 
-  $type['textfield'] = array(
+  $type['text'] = array(
     '#input' => TRUE,
     '#size' => 60,
     '#maxlength' => 128,
     '#autocomplete_path' => FALSE,
     '#process' => array('form_process_text_format', 'form_process_ahah'),
-    '#theme' => 'textfield',
+    '#theme' => 'text',
     '#theme_wrapper' => 'form_element',
   );
 
@@ -1787,7 +1787,7 @@ function system_actions_configure($form_
   }
 
   $form['actions_description'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Description'),
     '#default_value' => $edit['actions_description'],
     '#maxlength' => '255',
@@ -1930,14 +1930,14 @@ function system_send_email_action_form($
   }
 
   $form['recipient'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Recipient'),
     '#default_value' => $context['recipient'],
     '#maxlength' => '254',
     '#description' => t('The email address to which the message should be sent OR enter %author if you would like to send an e-mail to the author of the original post.', array('%author' => '%author')),
   );
   $form['subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => $context['subject'],
     '#maxlength' => '254',
@@ -2166,7 +2166,7 @@ function system_message_action(&$object,
  */
 function system_goto_action_form($context) {
   $form['url'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('URL'),
     '#description' => t('The URL to which the user should be redirected. This can be an internal URL like node/1234 or an external URL like http://drupal.org.'),
     '#default_value' => isset($context['url']) ? $context['url'] : '',

=== modified file 'modules/taxonomy/taxonomy.admin.inc'
--- modules/taxonomy/taxonomy.admin.inc	2009-04-15 14:12:55 +0000
+++ modules/taxonomy/taxonomy.admin.inc	2009-04-26 15:50:35 +0000
@@ -121,7 +121,7 @@ function taxonomy_form_vocabulary(&$form
     return taxonomy_vocabulary_confirm_delete($form_state, $form_state['values']['vid']);
   }
   $form['name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Vocabulary name'),
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
@@ -129,14 +129,14 @@ function taxonomy_form_vocabulary(&$form
     '#required' => TRUE,
   );
   $form['help'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Help text'),
     '#maxlength' => 255,
     '#default_value' => $edit['help'],
     '#description' => t('Instructions to present to the user when selecting terms, e.g., <em>"Enter a comma separated list of words"</em>.'),
   );
   $form['description'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Description'),
     '#default_value' => $edit['description'],
     '#description' => t('Description of the vocabulary; can be used by modules.'),
@@ -436,7 +436,7 @@ function taxonomy_overview_terms(&$form_
 /**
  * Submit handler for terms overview form.
  *
- * Rather than using a textfield or weight field, this form depends entirely
+ * Rather than using a text or weight field, this form depends entirely
  * upon the order of form elements on the page to determine new weights.
  *
  * Because there might be hundreds or thousands of taxonomy terms that need to
@@ -659,7 +659,7 @@ function taxonomy_form_term(&$form_state
     '#collapsible' => TRUE,
   );
   $form['identification']['name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Term name'),
     '#default_value' => $edit['name'],
     '#maxlength' => 255,
@@ -701,7 +701,7 @@ function taxonomy_form_term(&$form_state
     '#default_value' => implode("\n", taxonomy_get_synonyms($edit['tid'])),
     '#description' => t('Synonyms of this term, one synonym per line.'));
   $form['advanced']['weight'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Weight'),
     '#size' => 6,
     '#default_value' => $edit['weight'],

=== modified file 'modules/taxonomy/taxonomy.module'
--- modules/taxonomy/taxonomy.module	2009-04-18 06:32:24 +0000
+++ modules/taxonomy/taxonomy.module	2009-04-26 15:50:35 +0000
@@ -588,7 +588,7 @@ function taxonomy_form_alter(&$form, $fo
         else {
           $help = t('A comma-separated list of terms describing this content. Example: funny, bungee jumping, "Company, Inc."');
         }
-        $form['taxonomy']['tags'][$vocabulary->vid] = array('#type' => 'textfield',
+        $form['taxonomy']['tags'][$vocabulary->vid] = array('#type' => 'text',
           '#title' => $vocabulary->name,
           '#description' => $help,
           '#required' => $vocabulary->required,

=== modified file 'modules/upload/upload.admin.inc'
--- modules/upload/upload.admin.inc	2009-01-11 21:19:16 +0000
+++ modules/upload/upload.admin.inc	2009-04-26 15:50:35 +0000
@@ -65,7 +65,7 @@ function upload_admin_settings() {
     '#collapsible' => TRUE,
   );
   $form['settings_general']['upload_max_resolution'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Maximum resolution for uploaded images'),
     '#default_value' => variable_get('upload_max_resolution', 0),
     '#size' => 15,
@@ -82,14 +82,14 @@ function upload_admin_settings() {
   );
 
   $form['settings_general']['upload_extensions_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default permitted file extensions'),
     '#default_value' => $upload_extensions_default,
     '#maxlength' => 255,
     '#description' => t('Default extensions that users can upload. Separate extensions with a space and do not include the leading dot.'),
   );
   $form['settings_general']['upload_uploadsize_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default maximum file size per upload'),
     '#default_value' => $upload_uploadsize_default,
     '#size' => 5,
@@ -98,7 +98,7 @@ function upload_admin_settings() {
     '#field_suffix' => t('MB'),
   );
   $form['settings_general']['upload_usersize_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default total file size per user'),
     '#default_value' => $upload_usersize_default,
     '#size' => 7,
@@ -120,14 +120,14 @@ function upload_admin_settings() {
       '#collapsed' => TRUE,
     );
     $form['settings_role_' . $rid]['upload_extensions_' . $rid] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Permitted file extensions'),
       '#default_value' => variable_get('upload_extensions_' . $rid, $upload_extensions_default),
       '#maxlength' => 255,
       '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'),
     );
     $form['settings_role_' . $rid]['upload_uploadsize_' . $rid] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Maximum file size per upload'),
       '#default_value' => variable_get('upload_uploadsize_' . $rid, $upload_uploadsize_default),
       '#size' => 5,
@@ -136,7 +136,7 @@ function upload_admin_settings() {
       '#field_suffix' => t('MB'),
     );
     $form['settings_role_' . $rid]['upload_usersize_' . $rid] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Total file size per user'),
       '#default_value' => variable_get('upload_usersize_' . $rid, $upload_usersize_default),
       '#size' => 7,

=== modified file 'modules/upload/upload.module'
--- modules/upload/upload.module	2009-04-26 09:14:31 +0000
+++ modules/upload/upload.module	2009-04-26 15:50:35 +0000
@@ -549,7 +549,7 @@ function _upload_form($node) {
       $file = (object)$file;
       $key = $file->fid;
 
-      $form['files'][$key]['description'] = array('#type' => 'textfield', '#default_value' => !empty($file->description) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => '<small>' . file_create_url($file->filepath) . '</small>');
+      $form['files'][$key]['description'] = array('#type' => 'text', '#default_value' => !empty($file->description) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => '<small>' . file_create_url($file->filepath) . '</small>');
       $form['files'][$key]['size'] = array('#markup' => format_size($file->filesize));
       $form['files'][$key]['remove'] = array('#type' => 'checkbox', '#default_value' => !empty($file->remove));
       $form['files'][$key]['list'] = array('#type' => 'checkbox',  '#default_value' => $file->list);

=== modified file 'modules/user/user.admin.inc'
--- modules/user/user.admin.inc	2009-04-13 12:14:57 +0000
+++ modules/user/user.admin.inc	2009-04-26 15:50:35 +0000
@@ -286,7 +286,7 @@ function user_admin_settings() {
     '#description' => t('Customize welcome e-mail messages sent to new member accounts created by an administrator.') . ' ' . $email_token_help,
   );
   $form['email']['admin_created']['user_mail_register_admin_created_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('register_admin_created_subject'),
     '#maxlength' => 180,
@@ -306,7 +306,7 @@ function user_admin_settings() {
     '#description' => t('Customize welcome e-mail messages sent to new members upon registering, when no administrator approval is required.') . ' ' . $email_token_help
   );
   $form['email']['no_approval_required']['user_mail_register_no_approval_required_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('register_no_approval_required_subject'),
     '#maxlength' => 180,
@@ -326,7 +326,7 @@ function user_admin_settings() {
     '#description' => t('Customize welcome e-mail messages sent to new members upon registering, when administrative approval is required.') . ' ' . $email_token_help,
   );
   $form['email']['pending_approval']['user_mail_register_pending_approval_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('register_pending_approval_subject'),
     '#maxlength' => 180,
@@ -346,7 +346,7 @@ function user_admin_settings() {
     '#description' => t('Customize e-mail messages sent to users who request a new password.') . ' ' . $email_token_help,
   );
   $form['email']['password_reset']['user_mail_password_reset_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('password_reset_subject'),
     '#maxlength' => 180,
@@ -371,7 +371,7 @@ function user_admin_settings() {
     '#default_value' => variable_get('user_mail_status_activated_notify', TRUE),
   );
   $form['email']['activated']['user_mail_status_activated_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('status_activated_subject'),
     '#maxlength' => 180,
@@ -396,7 +396,7 @@ function user_admin_settings() {
     '#default_value' => variable_get('user_mail_status_blocked_notify', FALSE),
   );
   $form['email']['blocked']['user_mail_status_blocked_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('status_blocked_subject'),
     '#maxlength' => 180,
@@ -416,7 +416,7 @@ function user_admin_settings() {
     '#description' => t('Customize e-mail messages sent to users when they attempt to cancel their accounts.') . ' ' . $email_token_help,
   );
   $form['email']['cancel_confirm']['user_mail_cancel_confirm_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('cancel_confirm_subject'),
     '#maxlength' => 180,
@@ -441,7 +441,7 @@ function user_admin_settings() {
     '#default_value' => variable_get('user_mail_status_canceled_notify', FALSE),
   );
   $form['email']['canceled']['user_mail_status_canceled_subject'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Subject'),
     '#default_value' => _user_mail_text('status_canceled_subject'),
     '#maxlength' => 180,
@@ -497,7 +497,7 @@ function user_admin_settings() {
     '#suffix' => '</div>',
   );
   $form['pictures']['settings']['user_picture_path'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Picture image path'),
     '#default_value' => variable_get('user_picture_path', 'pictures'),
     '#size' => 30,
@@ -505,7 +505,7 @@ function user_admin_settings() {
     '#description' => t('Subdirectory in the directory %dir where pictures will be stored.', array('%dir' => file_directory_path() . '/')),
   );
   $form['pictures']['settings']['user_picture_default'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Default picture'),
     '#default_value' => variable_get('user_picture_default', ''),
     '#size' => 30,
@@ -513,7 +513,7 @@ function user_admin_settings() {
     '#description' => t('URL of picture to display for users with no custom picture selected. Leave blank for none.'),
   );
   $form['pictures']['settings']['user_picture_dimensions'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Picture maximum dimensions'),
     '#default_value' => variable_get('user_picture_dimensions', '85x85'),
     '#size' => 15,
@@ -521,7 +521,7 @@ function user_admin_settings() {
     '#description' => t('Maximum dimensions for pictures, in pixels.'),
   );
   $form['pictures']['settings']['user_picture_file_size'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Picture maximum file size'),
     '#default_value' => variable_get('user_picture_file_size', '30'),
     '#size' => 15,
@@ -681,7 +681,7 @@ function user_admin_role() {
     // Display the edit role form.
     $role = db_query('SELECT * FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchObject();
     $form['name'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#title' => t('Role name'),
       '#default_value' => $role->name,
       '#size' => 30,
@@ -704,7 +704,7 @@ function user_admin_role() {
   }
   else {
     $form['name'] = array(
-      '#type' => 'textfield',
+      '#type' => 'text',
       '#size' => 32,
       '#maxlength' => 64,
     );

=== modified file 'modules/user/user.module'
--- modules/user/user.module	2009-04-26 09:53:50 +0000
+++ modules/user/user.module	2009-04-26 15:50:35 +0000
@@ -996,7 +996,7 @@ function user_login_block() {
     '#validate' => user_login_default_validators(),
     '#submit' => array('user_login_submit'),
   );
-  $form['name'] = array('#type' => 'textfield',
+  $form['name'] = array('#type' => 'text',
     '#title' => t('Username'),
     '#maxlength' => USERNAME_MAX_LENGTH,
     '#size' => 15,
@@ -1576,7 +1576,7 @@ function user_login(&$form_state) {
   }
 
   // Display login form:
-  $form['name'] = array('#type' => 'textfield',
+  $form['name'] = array('#type' => 'text',
     '#title' => t('Username'),
     '#size' => 60,
     '#maxlength' => USERNAME_MAX_LENGTH,
@@ -1791,7 +1791,7 @@ function user_edit_form(&$form_state, $u
   );
   // Only show name field when: registration page; or user is editing own account and can change username; or an admin user.
   if ($register || ($GLOBALS['user']->uid == $uid && user_access('change own username')) || $admin) {
-    $form['account']['name'] = array('#type' => 'textfield',
+    $form['account']['name'] = array('#type' => 'text',
       '#title' => t('Username'),
       '#default_value' => $edit['name'],
       '#maxlength' => USERNAME_MAX_LENGTH,
@@ -1800,7 +1800,7 @@ function user_edit_form(&$form_state, $u
       '#attributes' => array('class' => 'username'),
     );
   }
-  $form['account']['mail'] = array('#type' => 'textfield',
+  $form['account']['mail'] = array('#type' => 'text',
     '#title' => t('E-mail address'),
     '#default_value' => $edit['mail'],
     '#maxlength' => EMAIL_MAX_LENGTH,

=== modified file 'modules/user/user.pages.inc'
--- modules/user/user.pages.inc	2009-04-20 04:41:35 +0000
+++ modules/user/user.pages.inc	2009-04-26 15:50:35 +0000
@@ -30,7 +30,7 @@ function user_autocomplete($string = '')
  */
 function user_pass() {
   $form['name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'text',
     '#title' => t('Username or e-mail address'),
     '#size' => 60,
     '#maxlength' => max(USERNAME_MAX_LENGTH, EMAIL_MAX_LENGTH),