Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.49
diff -u -p -r1.49 content_types.inc
--- modules/node/content_types.inc	22 Dec 2007 23:24:25 -0000	1.49
+++ modules/node/content_types.inc	4 Jan 2008 00:11:00 -0000
@@ -270,7 +270,7 @@ function node_type_form_submit($form, &$
   $type->has_title = ($type->title_label != '');
   $type->has_body = ($type->body_label != '');
 
-  $type->module = !empty($form_state['values']['module']) ? $form_state['values']['module'] : 'node';
+  $type->module = !empty($form_state['values']['module']) ? $form_state['values']['module'] : 'node_content';
   $type->custom = $form_state['values']['custom'];
   $type->modified = TRUE;
   $type->locked = $form_state['values']['locked'];
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.4
diff -u -p -r1.4 node.install
--- modules/node/node.install	18 Dec 2007 12:59:21 -0000	1.4
+++ modules/node/node.install	4 Jan 2008 00:11:00 -0000
@@ -333,3 +333,13 @@ function node_schema() {
   return $schema;
 }
 
+/**
+ * Fix node type 'module' attribute to avoid name-space conflicts.
+ */
+function node_update_6000() {
+  $ret = array();
+
+  $ret[] = update_sql("UPDATE {node_type} SET module = 'node_content' WHERE module = 'node'");
+  
+  return $ret;
+}
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.935
diff -u -p -r1.935 node.module
--- modules/node/node.module	1 Jan 2008 17:46:29 -0000	1.935
+++ modules/node/node.module	4 Jan 2008 00:11:00 -0000
@@ -505,8 +505,8 @@ function _node_types_build() {
   while ($type_object = db_fetch_object($type_result)) {
     // Check for node types from disabled modules and mark their types for removal.
     // Types defined by the node module in the database (rather than by a separate
-    // module using hook_node_info) have a module value of 'node'.
-    if ($type_object->module != 'node' && empty($info_array[$type_object->type])) {
+    // module using hook_node_info) have a module value of 'node_content'.
+    if ($type_object->module != 'node_content' && empty($info_array[$type_object->type])) {
       $type_object->disabled = TRUE;
     }
     if (!isset($_node_types[$type_object->type]) || $type_object->modified) {
@@ -577,9 +577,6 @@ function _node_type_set_defaults($info) 
  */
 function node_hook(&$node, $hook) {
   $module = node_get_types('module', $node);
-  if ($module == 'node') {
-    $module = 'node_content'; // Avoid function name collisions.
-  }
   return module_hook($module, $hook);
 }
 
@@ -598,9 +595,6 @@ function node_hook(&$node, $hook) {
 function node_invoke(&$node, $hook, $a2 = NULL, $a3 = NULL, $a4 = NULL) {
   if (node_hook($node, $hook)) {
     $module = node_get_types('module', $node);
-    if ($module == 'node') {
-      $module = 'node_content'; // Avoid function name collisions.
-    }
     $function = $module .'_'. $hook;
     return ($function($node, $a2, $a3, $a4));
   }
@@ -1075,7 +1069,7 @@ function node_perm() {
   $perms = array('administer content types', 'administer nodes', 'access content', 'view revisions', 'revert revisions', 'delete revisions');
 
   foreach (node_get_types() as $type) {
-    if ($type->module == 'node') {
+    if ($type->module == 'node_content') {
       $name = check_plain($type->type);
       $perms[] = 'create '. $name .' content';
       $perms[] = 'delete own '. $name .' content';
@@ -1934,9 +1928,6 @@ function node_access($op, $node, $accoun
   // Can't use node_invoke(), because the access hook takes the $op parameter
   // before the $node parameter.
   $module = node_get_types('module', $node);
-  if ($module == 'node') {
-    $module = 'node_content'; // Avoid function name collisions.
-  }
   $access = module_invoke($module, 'access', $op, $node, $account);
   if (!is_null($access)) {
     return $access;