Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.442
diff -u -p -r1.442 form.inc
--- includes/form.inc	13 Mar 2010 22:33:05 -0000	1.442
+++ includes/form.inc	18 Mar 2010 14:27:16 -0000
@@ -196,8 +196,8 @@ function drupal_build_form($form_id, &$f
       // menu_get_item() is not available at installation time.
       if (!isset($form_state['build_info']['file']) && !defined('MAINTENANCE_MODE')) {
         $item = menu_get_item();
-        if (!empty($item['file'])) {
-          $form_state['build_info']['file'] = $item['file'];
+        if (!empty($item['include_file'])) {
+          $form_state['build_info']['file'] = $item['include_file'];
         }
       }
 
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.382
diff -u -p -r1.382 menu.inc
--- includes/menu.inc	12 Mar 2010 05:14:14 -0000	1.382
+++ includes/menu.inc	18 Mar 2010 14:27:16 -0000
@@ -460,8 +460,8 @@ function menu_execute_active_handler($pa
       // to make alterations just for this request.
       drupal_alter('menu_active_handler', $router_item, $path);
       if ($router_item['access']) {
-        if ($router_item['file']) {
-          require_once DRUPAL_ROOT . '/' . $router_item['file'];
+        if ($router_item['include_file']) {
+          require_once DRUPAL_ROOT . '/' . $router_item['include_file'];
         }
         $page_callback_result = call_user_func_array($router_item['page_callback'], $router_item['page_arguments']);
       }
@@ -3254,7 +3254,7 @@ function _menu_router_save($menu, $masks
       'description',
       'position',
       'weight',
-      'file',
+      'include_file',
     ));
 
   $num_records = 0;
@@ -3285,7 +3285,7 @@ function _menu_router_save($menu, $masks
       'description' => $item['description'],
       'position' => $item['position'],
       'weight' => $item['weight'],
-      'file' => $item['include file'],
+      'include_file' => $item['include file'],
     ));
 
     // Execute in batches to avoid the memory overhead of all of those records
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.455
diff -u -p -r1.455 system.install
--- modules/system/system.install	8 Mar 2010 15:44:36 -0000	1.455
+++ modules/system/system.install	18 Mar 2010 14:27:17 -0000
@@ -983,13 +983,13 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
-      'file' => array(
+      'include_file' => array(
         'description' => 'The file to include for this element, usually the page callback function lives in this file.',
         'type' => 'text',
         'size' => 'medium'
       ),
     ),
-    'indexes' => array(
+    'Indexes' => array(
       'fit' => array('fit'),
       'tab_parent' => array(array('tab_parent', 64), 'weight', 'title'),
       'tab_root_weight_title' => array(array('tab_root', 64), 'weight', 'title'),
@@ -2388,6 +2388,16 @@ function system_update_7050() {
 }
 
 /**
+ * Rename file to include_file in menu_router
+ */
+function system_update_7051() {
+  db_change_field('menu_router', 'file', 'include_file', array(
+        'description' => 'The file to include for this element, usually the page callback function lives in this file.',
+        'type' => 'text',
+        'size' => 'medium'
+      ));
+}
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */