diff --git a/plugins/Blog/BlogPlugin.php b/plugins/Blog/BlogPlugin.php
index 7f8e8fd1d0..89619b5f54 100644
--- a/plugins/Blog/BlogPlugin.php
+++ b/plugins/Blog/BlogPlugin.php
@@ -62,7 +62,7 @@ class BlogPlugin extends MicroAppPlugin
     {
         $schema = Schema::get();
 
-        $schema->ensureTable('blog_entry', BlogEntry::schemaDef());
+        $schema->ensureTable('blog_entry', Blog_entry::schemaDef());
 
         return true;
     }
@@ -88,7 +88,7 @@ class BlogPlugin extends MicroAppPlugin
         case 'BlogEntryListItem':
             include_once $dir . '/'.strtolower($cls).'.php';
             return false;
-        case 'BlogEntry':
+        case 'Blog_entry':
             include_once $dir . '/'.$cls.'.php';
             return false;
         default:
@@ -136,7 +136,7 @@ class BlogPlugin extends MicroAppPlugin
 
     function types()
     {
-        return array(BlogEntry::TYPE);
+        return array(Blog_entry::TYPE);
     }
 
     function saveNoticeFromActivity($activity, $actor, $options=array())
@@ -148,7 +148,7 @@ class BlogPlugin extends MicroAppPlugin
 
         $entryObj = $activity->objects[0];
 
-        if ($entryObj->type != BlogEntry::TYPE) {
+        if ($entryObj->type != Blog_entry::TYPE) {
             // TRANS: Exception thrown when blog plugin comes across a non-event type object.
             throw new ClientException(_m('Wrong type for object.'));
         }
@@ -157,7 +157,7 @@ class BlogPlugin extends MicroAppPlugin
 
         switch ($activity->verb) {
         case ActivityVerb::POST:
-            $notice = BlogEntry::saveNew($actor,
+            $notice = Blog_entry::saveNew($actor,
                                          $entryObj->title,
                                          $entryObj->content,
                                          $options);
@@ -172,7 +172,7 @@ class BlogPlugin extends MicroAppPlugin
 
     function activityObjectFromNotice($notice)
     {
-        $entry = BlogEntry::fromNotice($notice);
+        $entry = Blog_entry::fromNotice($notice);
 
         if (empty($entry)) {
             throw new ClientException(sprintf(_('No blog entry for notice %s'),
@@ -189,8 +189,8 @@ class BlogPlugin extends MicroAppPlugin
 
     function deleteRelated($notice)
     {
-        if ($notice->object_type == BlogEntry::TYPE) {
-            $entry = BlogEntry::fromNotice($notice);
+        if ($notice->object_type == Blog_entry::TYPE) {
+            $entry = Blog_entry::fromNotice($notice);
             if (exists($entry)) {
                 $entry->delete();
             }
@@ -201,7 +201,7 @@ class BlogPlugin extends MicroAppPlugin
     {
         $notice = $nli->notice;
 
-        if ($notice->object_type == BlogEntry::TYPE) {
+        if ($notice->object_type == Blog_entry::TYPE) {
             return new BlogEntryListItem($nli);
         }
         
diff --git a/plugins/Blog/BlogEntry.php b/plugins/Blog/Blog_entry.php
similarity index 98%
rename from plugins/Blog/BlogEntry.php
rename to plugins/Blog/Blog_entry.php
index 32915dc9c7..34e4ea294e 100644
--- a/plugins/Blog/BlogEntry.php
+++ b/plugins/Blog/Blog_entry.php
@@ -45,7 +45,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class BlogEntry extends Managed_DataObject
+class Blog_entry extends Managed_DataObject
 {
     public $__table = 'blog_entry';
 
@@ -115,7 +115,7 @@ class BlogEntry extends Managed_DataObject
             $options = array();
         }
         
-        $be             = new BlogEntry();
+        $be             = new Blog_entry();
         $be->id         = (string) new UUID();
         $be->profile_id = $profile->id;
         $be->title      = htmlspecialchars($title);
@@ -209,7 +209,7 @@ class BlogEntry extends Managed_DataObject
 
     static function fromNotice($notice)
     {
-        return BlogEntry::staticGet('uri', $notice->uri);
+        return Blog_entry::staticGet('uri', $notice->uri);
     }
 
     function getNotice()
diff --git a/plugins/Blog/blogentrylistitem.php b/plugins/Blog/blogentrylistitem.php
index 287339f8c2..97a06acfa7 100644
--- a/plugins/Blog/blogentrylistitem.php
+++ b/plugins/Blog/blogentrylistitem.php
@@ -61,7 +61,7 @@ class BlogEntryListItem extends NoticeListItemAdapter
         $notice = $this->nli->notice;
         $out    = $this->nli->out;
 
-        $entry  = BlogEntry::fromNotice($notice);
+        $entry  = Blog_entry::fromNotice($notice);
 
         if (empty($entry)) {
             throw new Exception('BlogEntryListItem used for non-blog notice.');
diff --git a/plugins/Blog/newblogentry.php b/plugins/Blog/newblogentry.php
index 94988c5335..c33c69d109 100644
--- a/plugins/Blog/newblogentry.php
+++ b/plugins/Blog/newblogentry.php
@@ -114,7 +114,7 @@ class NewblogentryAction extends Action
             
         $profile = $this->user->getProfile();
 
-        $saved = BlogEntry::saveNew($profile,
+        $saved = Blog_entry::saveNew($profile,
                                     $this->title,
                                     $this->content,
                                     $options);
diff --git a/plugins/Blog/showblogentry.php b/plugins/Blog/showblogentry.php
index 4ddf7963e0..c5aa54a4c2 100644
--- a/plugins/Blog/showblogentry.php
+++ b/plugins/Blog/showblogentry.php
@@ -54,7 +54,7 @@ class ShowblogentryAction extends ShownoticeAction
     {
         $this->id = $this->trimmed('id');
 
-        $this->entry = BlogEntry::staticGet('id', $this->id);
+        $this->entry = Blog_entry::staticGet('id', $this->id);
 
         if (empty($this->entry)) {
             // TRANS: Client exception thrown when referring to a non-existing blog entry.