Index: modules/blog/blog.install
===================================================================
RCS file: modules/blog/blog.install
diff -N modules/blog/blog.install
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/blog/blog.install	31 Mar 2009 20:27:19 -0000
@@ -0,0 +1 @@
+<?php
// $Id$

/**
 * @file blog.install
 * Contains install and update functions for Blog.
 */
 
function blog_update_7000() {
  $blog_type = node_type_get_type('blog');
  $blog_type->old_type = $blog_type->type;
  $blog_type->type = 'blog_entry';
  node_type_save($blog_type);
  return array();
}
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.322
diff -u -p -r1.322 blog.module
--- modules/blog/blog.module	4 Jun 2009 03:33:27 -0000	1.322
+++ modules/blog/blog.module	7 Jun 2009 04:22:01 -0000
@@ -11,9 +11,9 @@
  */
 function blog_node_info() {
   return array(
-    'blog' => array(
+    'blog_entry' => array(
       'name' => t('Blog entry'),
-      'base' => 'blog',
+      'base' => 'blog_entry',
       'description' => t('A <em>blog entry</em> is a single post to an online journal, or <em>blog</em>.'),
     )
   );
@@ -23,21 +23,21 @@ function blog_node_info() {
  * Implement hook_perm().
  */
 function blog_perm() {
-  return node_list_permissions('blog');
+  return node_list_permissions('blog_entry');
 }
 
 /**
  * Implement hook_access().
  */
-function blog_access($op, $node, $account) {
+function blog_entry_access($op, $node, $account) {
   switch ($op) {
     case 'create':
       // Anonymous users cannot post even if they have the permission.
-      return user_access('create blog content', $account) && $account->uid;
+      return user_access('create blog_entry content', $account) && $account->uid;
     case 'update':
-      return user_access('edit any blog content', $account) || (user_access('edit own blog content', $account) && ($node->uid == $account->uid));
+      return user_access('edit any blog_entry content', $account) || (user_access('edit own blog_entry content', $account) && ($node->uid == $account->uid));
     case 'delete':
-      return user_access('delete any blog content', $account) || (user_access('delete own blog content', $account) && ($node->uid == $account->uid));
+      return user_access('delete any blog_entry content', $account) || (user_access('delete own blog_entry content', $account) && ($node->uid == $account->uid));
   }
 }
 
@@ -45,12 +45,12 @@ function blog_access($op, $node, $accoun
  * Implement hook_user_view().
  */
 function blog_user_view(&$edit, &$user, $category) {
-  if (user_access('create blog content', $user)) {
-    $user->content['summary']['blog'] =  array(
+  if (user_access('create blog_entry content', $user)) {
+    $user->content['summary']['blog_entry'] =  array(
       '#type' => 'user_profile_item',
       '#title' => t('Blog'),
       '#markup' => l(t('View recent blog entries'), "blog/$user->uid", array('attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => $user->name))))),
-      '#attributes' => array('class' => 'blog'),
+      '#attributes' => array('class' => 'blog_entry'),
     );
   }
 }
@@ -72,7 +72,7 @@ function blog_help($path, $arg) {
 /**
  * Implement hook_form().
  */
-function blog_form($node, $form_state) {
+function blog_entry_form($node, $form_state) {
   global $nid;
   $type = node_type_get_type($node);
 
@@ -84,7 +84,7 @@ function blog_form($node, $form_state) {
 /**
  * Implement hook_view().
  */
-function blog_view($node, $teaser) {
+function blog_entry_view($node, $teaser) {
   if ((bool)menu_get_object()) {
     // Breadcrumb navigation.
     drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("!name's blog", array('!name' => $node->name)), 'blog/' . $node->uid)));
@@ -98,13 +98,13 @@ function blog_view($node, $teaser) {
  */
 function blog_node_view($node, $teaser = FALSE) {
   if ($node->build_mode != NODE_BUILD_RSS) {
-    if ($node->type == 'blog' && arg(0) != 'blog' || arg(1) != $node->uid) {
+    if ($node->type == 'blog_entry' && arg(0) != 'blog' || arg(1) != $node->uid) {
       $links['blog_usernames_blog'] = array(
         'title' => t("!username's blog", array('!username' => $node->name)),
         'href' => "blog/$node->uid",
         'attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => $node->name))),
       );
-      $node->content['links']['blog'] = array(
+      $node->content['links']['blog_entry'] = array(
         '#type' => 'node_links',
         '#value' => $links,
       );
@@ -154,7 +154,7 @@ function blog_page_user_access($account)
   // The visitor must be able to access the site's content.
   // For a blog to 'exist' the user must either be able to
   // create new blog entries, or it must have existing posts.
-  return $account->uid && user_access('access content') && (user_access('create blog content', $account) || _blog_post_exists($account));
+  return $account->uid && user_access('access content') && (user_access('create blog_entry content', $account) || _blog_post_exists($account));
 }
 
 /**
@@ -163,7 +163,7 @@ function blog_page_user_access($account)
 function _blog_post_exists($account) {
   return (bool)db_select('node', 'n')
     ->fields('n', array('nid'))
-    ->condition('type', 'blog')
+    ->condition('type', 'blog_entry')
     ->condition('uid', $account->uid)
     ->condition('status', 1)
     ->range(0, 1)
@@ -191,7 +191,7 @@ function blog_block_view($delta = '') {
   if (user_access('access content')) {
     $result = db_select('node', 'n')
       ->fields('n', array('nid', 'title', 'created'))
-      ->condition('type', 'blog')
+      ->condition('type', 'blog_entry')
       ->condition('status', 1)
       ->orderBy('created', 'DESC')
       ->range(0, 10)
Index: modules/blog/blog.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v
retrieving revision 1.19
diff -u -p -r1.19 blog.pages.inc
--- modules/blog/blog.pages.inc	21 May 2009 21:12:23 -0000	1.19
+++ modules/blog/blog.pages.inc	7 Jun 2009 04:22:01 -0000
@@ -16,7 +16,7 @@ function blog_page_user($account) {
 
   $items = array();
 
-  if (($account->uid == $user->uid) && user_access('create blog content')) {
+  if (($account->uid == $user->uid) && user_access('create blog_entry content')) {
     $items[] = l(t('Post new blog entry.'), "node/add/blog");
   }
   elseif ($account->uid == $user->uid) {
@@ -32,7 +32,7 @@ function blog_page_user($account) {
   $query = db_select('node', 'n')->extend('PagerDefault');
   $nids = $query
     ->fields('n', array('nid', 'sticky', 'created'))
-    ->condition('type', 'blog')
+    ->condition('type', 'blog_entry')
     ->condition('uid', $account->uid)
     ->condition('status', 1)
     ->orderBy('sticky', 'DESC')
@@ -70,7 +70,7 @@ function blog_page_last() {
   global $user;
   $build = array();
 
-  if (user_access('create blog content')) {
+  if (user_access('create blog_entry content')) {
     $items[] = l(t('Create new blog entry.'), "node/add/blog");
     $build['blog_actions'] = array(
       '#items' => $items,
@@ -82,7 +82,7 @@ function blog_page_last() {
   $query = db_select('node', 'n')->extend('PagerDefault');
   $nids = $query
     ->fields('n', array('nid', 'sticky', 'created'))
-    ->condition('type', 'blog')
+    ->condition('type', 'blog_entry')
     ->condition('status', 1)
     ->orderBy('sticky', 'DESC')
     ->orderBy('created', 'DESC')
@@ -114,7 +114,7 @@ function blog_feed_user($account) {
 
   $nids = db_select('node', 'n')
     ->fields('n', array('nid', 'created'))
-    ->condition('type', 'blog')
+    ->condition('type', 'blog_entry')
     ->condition('uid', $account->uid)
     ->condition('status', 1)
     ->orderBy('created', 'DESC')
Index: modules/blog/blog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.test,v
retrieving revision 1.12
diff -u -p -r1.12 blog.test
--- modules/blog/blog.test	24 May 2009 17:39:31 -0000	1.12
+++ modules/blog/blog.test	7 Jun 2009 04:22:01 -0000
@@ -21,8 +21,8 @@ class BlogTestCase extends DrupalWebTest
     parent::setUp('blog');
     // Create users.
     $this->big_user = $this->drupalCreateUser(array('administer blocks'));
-    $this->own_user = $this->drupalCreateUser(array('create blog content', 'edit own blog content', 'delete own blog content'));
-    $this->any_user = $this->drupalCreateUser(array('create blog content', 'edit any blog content', 'delete any blog content', 'access administration pages'));
+    $this->own_user = $this->drupalCreateUser(array('create blog_entry content', 'edit own blog_entry content', 'delete own blog_entry content'));
+    $this->any_user = $this->drupalCreateUser(array('create blog_entry content', 'edit any blog_entry content', 'delete any blog_entry content', 'access administration pages'));
   }
 
   /**
@@ -32,7 +32,7 @@ class BlogTestCase extends DrupalWebTest
    */
   function testUnprivilegedUser() {
     // Create a blog node for a user with no blog permissions.
-    $this->drupalCreateNode(array('type' => 'blog', 'uid' => $this->big_user->uid));
+    $this->drupalCreateNode(array('type' => 'blog_entry', 'uid' => $this->big_user->uid));
 
     $this->drupalLogin($this->big_user);
 
@@ -71,12 +71,12 @@ class BlogTestCase extends DrupalWebTest
     $this->doBasicTests($this->own_user, FALSE);
 
     // Create another blog node for the any blog user.
-    $node = $this->drupalCreateNode(array('type' => 'blog', 'uid' => $this->any_user->uid));
+    $node = $this->drupalCreateNode(array('type' => 'blog_entry', 'uid' => $this->any_user->uid));
     // Verify the own blog user only has access to the blog view node.
     $this->verifyBlogs($this->any_user, $node, FALSE, 403);
 
     // Create another blog node for the own blog user.
-    $node = $this->drupalCreateNode(array('type' => 'blog', 'uid' => $this->own_user->uid));
+    $node = $this->drupalCreateNode(array('type' => 'blog_entry', 'uid' => $this->own_user->uid));
     // Login the any blog user.
     $this->drupalLogin($this->any_user);
     // Verify the any blog user has access to all the blog nodes.
@@ -95,11 +95,11 @@ class BlogTestCase extends DrupalWebTest
     // Login the user.
     $this->drupalLogin($user);
     // Create blog node.
-    $node = $this->drupalCreateNode(array('type' => 'blog'));
+    $node = $this->drupalCreateNode(array('type' => 'blog_entry'));
     // Verify the user has access to all the blog nodes.
     $this->verifyBlogs($user, $node, $admin);
     // Create one more node to test the blog page with more than one node
-    $this->drupalCreateNode(array('type' => 'blog', 'uid' => $user->uid));
+    $this->drupalCreateNode(array('type' => 'blog_entry', 'uid' => $user->uid));
     // Verify the blog links are displayed.
     $this->verifyBlogLinks($user);
   }
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.154
diff -u -p -r1.154 blogapi.module
--- modules/blogapi/blogapi.module	4 Jun 2009 03:33:27 -0000	1.154
+++ modules/blogapi/blogapi.module	7 Jun 2009 04:22:01 -0000
@@ -720,7 +720,7 @@ function blogapi_blogger_title(&$content
  */
 function blogapi_admin_settings() {
   $node_types = array_map('check_plain', node_type_get_names());
-  $defaults = isset($node_types['blog']) ? array('blog' => 1) : array();
+  $defaults = isset($node_types['blog_entry']) ? array('blog_entry' => 1) : array();
   $form['blogapi_node_types'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Enable for external blogging clients'),
@@ -957,7 +957,7 @@ function _blogapi_validate_blogid($blogi
 }
 
 function _blogapi_get_node_types() {
-  $available_types = array_keys(array_filter(variable_get('blogapi_node_types', array('blog' => 1))));
+  $available_types = array_keys(array_filter(variable_get('blogapi_node_types', array('blog_entry' => 1))));
   $types = array();
   foreach (node_type_get_types() as $type => $name) {
     if (node_access('create', $type) && in_array($type, $available_types)) {
Index: modules/blogapi/blogapi.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.test,v
retrieving revision 1.11
diff -u -p -r1.11 blogapi.test
--- modules/blogapi/blogapi.test	4 May 2009 10:38:47 -0000	1.11
+++ modules/blogapi/blogapi.test	7 Jun 2009 04:22:01 -0000
@@ -30,7 +30,7 @@ class BlogAPITestCase extends DrupalWebT
     $this->drupalLogout();
 
     // Create user.
-    $web_user = $this->drupalCreateUser(array('create blog content', 'delete own blog content', 'edit own blog content', 'administer content with blog api'));
+    $web_user = $this->drupalCreateUser(array('create blog_entry content', 'delete own blog_entry content', 'edit own blog_entry content', 'administer content with blog api'));
     $this->drupalLogin($web_user);
 
     // Init common variables.
@@ -114,7 +114,7 @@ class BlogAPITestCase extends DrupalWebT
   function addVocabulary($vocab) {
     $edit = array();
     $edit['name'] = $vocab;
-    $edit['nodes[blog]'] = TRUE;
+    $edit['nodes[blog_entry]'] = TRUE;
     $this->drupalPost('admin/content/taxonomy/add', $edit, t('Save'));
     $this->assertRaw(t('Created new vocabulary %vocab.', array('%vocab' => $edit['name'])), t('Taxonomy vocabulary added.'));
 
Index: modules/dblog/dblog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v
retrieving revision 1.20
diff -u -p -r1.20 dblog.test
--- modules/dblog/dblog.test	24 May 2009 17:39:32 -0000	1.20
+++ modules/dblog/dblog.test	7 Jun 2009 04:22:01 -0000
@@ -161,7 +161,7 @@ class DBLogTestCase extends DrupalWebTes
     // Invoke events.
     $this->doUser();
     $this->doNode('article');
-    $this->doNode('blog');
+    $this->doNode('blog_entry');
     $this->doNode('page');
     $this->doNode('poll');