--- includes/module.inc	2010-01-07 15:54:18.000000000 +1100
+++ includes/module.inc	2010-01-12 22:06:47.000000000 +1100
@@ -469,7 +469,7 @@
   if ($reset) {
     $implementations = array();
     cache_set('module_implements', array(), 'cache_bootstrap');
-    drupal_static_reset('module_hook_info');
+    drupal_static_reset('module_define_hooks');
     drupal_static_reset('drupal_alter');
     cache_clear_all('hook_info', 'cache_bootstrap');
     return;
@@ -487,7 +487,7 @@
   }
 
   if (!isset($implementations[$hook])) {
-    $hook_info = module_hook_info();
+    $hook_info = module_define_hooks();
     $implementations[$hook] = array();
     $list = module_list(FALSE, FALSE, $sort);
     foreach ($list as $module) {
@@ -524,7 +524,7 @@
 /**
  * Retrieve a list of what hooks are explicitly declared.
  */
-function module_hook_info() {
+function module_define_hooks() {
   $hook_info = &drupal_static(__FUNCTION__, array());
 
   if (empty($hook_info)) {
@@ -534,7 +534,7 @@
       // We can't use module_invoke_all() here or it would cause an infinite
       // loop.
       foreach (module_list() as $module) {
-        $function = $module . '_hook_info';
+        $function = $module . '_define_hooks';
         if (function_exists($function)) {
           $result = $function();
           if (isset($result) && is_array($result)) {
@@ -544,7 +544,7 @@
       }
       // We can't use drupal_alter() for the same reason as above.
       foreach (module_list() as $module) {
-        $function = $module . '_hook_info_alter';
+        $function = $module . '_define_hooks_alter';
         if (function_exists($function)) {
           $function($hook_info);
         }