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	10 Jul 2009 18:18:51 -0000
@@ -0,0 +1,18 @@
+<?php
+// $Id$
+
+/**
+ * @file blog.install
+ * Contains install and update functions for Blog.
+ */
+
+/**
+ * Change blog machine name to blog_entry.
+ */
+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.327
diff -u -p -r1.327 blog.module
--- modules/blog/blog.module	5 Jul 2009 18:00:07 -0000	1.327
+++ modules/blog/blog.module	10 Jul 2009 18:18:51 -0000
@@ -11,9 +11,9 @@
  */
 function blog_node_info() {
   return array(
-    'blog' => array(
-      'name' => t('Blog entry'),
-      'base' => 'blog',
+    'blog_post' => array(
+      'name' => t('Blog post'),
+      'base' => 'blog_post',
       'description' => t('Use for multi-user blogs. Every user gets a personal blog.'),
     )
   );
@@ -23,21 +23,21 @@ function blog_node_info() {
  * Implement hook_permission().
  */
 function blog_permission() {
-  return node_list_permissions('blog');
+  return node_list_permissions('blog_post');
 }
 
 /**
  * Implement hook_access().
  */
-function blog_access($op, $node, $account) {
+function blog_post_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_post 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_post content', $account) || (user_access('edit own blog_post 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_post content', $account) || (user_access('delete own blog_post 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)) {
+  if (user_access('create blog_post content', $user)) {
     $user->content['summary']['blog'] =  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_post'),
     );
   }
 }
@@ -72,14 +72,14 @@ function blog_help($path, $arg) {
 /**
  * Implement hook_form().
  */
-function blog_form($node, $form_state) {
+function blog_post_form($node, $form_state) {
   return node_content_form($node, $form_state);
 }
 
 /**
  * Implement hook_view().
  */
-function blog_view($node, $build_mode) {
+function blog_post_view($node, $build_mode) {
   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)));
@@ -92,13 +92,13 @@ function blog_view($node, $build_mode) {
  */
 function blog_node_view($node, $build_mode = 'full') {
   if ($build_mode != 'rss') {
-    if ($node->type == 'blog' && arg(0) != 'blog' || arg(1) != $node->uid) {
+    if ($node->type == 'blog_post' && 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_post'] = array(
         '#theme' => 'links',
         '#links' => $links,
         '#attributes' => array('class' => 'links inline'),
@@ -149,7 +149,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_post content', $account) || _blog_post_exists($account));
 }
 
 /**
@@ -158,7 +158,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_post')
     ->condition('uid', $account->uid)
     ->condition('status', 1)
     ->range(0, 1)
@@ -186,7 +186,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_post')
       ->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.20
diff -u -p -r1.20 blog.pages.inc
--- modules/blog/blog.pages.inc	2 Jul 2009 04:27:22 -0000	1.20
+++ modules/blog/blog.pages.inc	10 Jul 2009 18:18:51 -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_post 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_post')
     ->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_post 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_post')
     ->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_post')
     ->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.13
diff -u -p -r1.13 blog.test
--- modules/blog/blog.test	12 Jun 2009 08:39:35 -0000	1.13
+++ modules/blog/blog.test	10 Jul 2009 18:18:51 -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_post content', 'edit own blog_post content', 'delete own blog_post content'));
+    $this->any_user = $this->drupalCreateUser(array('create blog_post content', 'edit any blog_post content', 'delete any blog_post 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_post', '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_post', '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_post', '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_post'));
     // 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_post', '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.158
diff -u -p -r1.158 blogapi.module
--- modules/blogapi/blogapi.module	5 Jul 2009 18:00:07 -0000	1.158
+++ modules/blogapi/blogapi.module	10 Jul 2009 18:18:51 -0000
@@ -719,7 +719,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_post']) ? array('blog_post' => 1) : array();
   $form['blogapi_node_types'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Enable for external blogging clients'),
@@ -958,7 +958,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_post' => 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.14
diff -u -p -r1.14 blogapi.test
--- modules/blogapi/blogapi.test	2 Jul 2009 20:23:28 -0000	1.14
+++ modules/blogapi/blogapi.test	10 Jul 2009 18:18:51 -0000
@@ -23,7 +23,7 @@ class BlogAPITestCase extends DrupalWebT
   function testBlogAPI() {
     global $base_url;
     // 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_post content', 'delete own blog_post content', 'edit own blog_post content', 'administer content with blog api'));
     // Create admin user and taxonomy for later use.
     $admin_user = $this->drupalCreateUser(array('administer taxonomy'));
     $this->drupalLogin($admin_user);
@@ -147,7 +147,7 @@ class BlogAPITestCase extends DrupalWebT
     $vocabulary->description = $this->randomName();
     $vocabulary->machine_name = $this->randomName();
     $vocabulary->help = '';
-    $vocabulary->nodes = array('blog' => 'blog');
+    $vocabulary->nodes = array('blog_post' => 'blog_post');
     $vocabulary->weight = mt_rand(0, 10);
     taxonomy_vocabulary_save($vocabulary);
 
Index: modules/dblog/dblog.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v
retrieving revision 1.21
diff -u -p -r1.21 dblog.test
--- modules/dblog/dblog.test	12 Jun 2009 08:39:36 -0000	1.21
+++ modules/dblog/dblog.test	10 Jul 2009 18:18:51 -0000
@@ -161,7 +161,7 @@ class DBLogTestCase extends DrupalWebTes
     // Invoke events.
     $this->doUser();
     $this->doNode('article');
-    $this->doNode('blog');
+    $this->doNode('blog_post');
     $this->doNode('page');
     $this->doNode('poll');