diff --git a/src/Model/Blog_Controller.php b/src/Model/BlogController.php
similarity index 99%
rename from src/Model/Blog_Controller.php
rename to src/Model/BlogController.php
index bd5e9b3..3dc2d26 100644
--- a/src/Model/Blog_Controller.php
+++ b/src/Model/BlogController.php
@@ -13,7 +13,7 @@ use SilverStripe\Security\Member;
  * @package    silverstripe
  * @subpackage blog
  */
-class Blog_Controller extends Page_Controller
+class BlogController extends Page_Controller
 {
     /**
      * @var array
diff --git a/src/Model/BlogPost_Controller.php b/src/Model/BlogPostController.php
similarity index 71%
rename from src/Model/BlogPost_Controller.php
rename to src/Model/BlogPostController.php
index 139d6ac..9891372 100644
--- a/src/Model/BlogPost_Controller.php
+++ b/src/Model/BlogPostController.php
@@ -8,7 +8,7 @@ use Page_Controller;
  * @package    silverstripe
  * @subpackage blog
  */
-class BlogPost_Controller extends Page_Controller
+class BlogPostController extends Page_Controller
 {
 
 }
diff --git a/tests/BlogTest.php b/tests/BlogTest.php
index f02e96c..9a64673 100755
--- a/tests/BlogTest.php
+++ b/tests/BlogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use SilverStripe\Blog\Model\Blog_Controller;
+use SilverStripe\Blog\Model\BlogController;
 use SilverStripe\CMS\Controllers\ContentController;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
@@ -148,7 +148,7 @@ class BlogTest extends SapphireTest
     public function testArchiveYear()
     {
         $blog = $this->objFromFixture('SilverStripe\\Blog\\Model\\Blog', 'FirstBlog');
-        $controller = new Blog_Controller($blog);
+        $controller = new BlogController($blog);
         $this->requestURL($controller, 'first-post/archive/');
         $this->assertEquals(2013, $controller->getArchiveYear(), 'getArchiveYear should return 2013');
     }
@@ -287,7 +287,7 @@ class BlogTest extends SapphireTest
     public function testFilteredCategories()
     {
         $blog = $this->objFromFixture('SilverStripe\\Blog\\Model\\Blog', 'FirstBlog');
-        $controller = new Blog_Controller($blog);
+        $controller = new BlogController($blog);
 
         // Root url
         $this->requestURL($controller, 'first-post');