diff --git a/ext/handle_404/info.php b/ext/four_oh_four/info.php
similarity index 82%
rename from ext/handle_404/info.php
rename to ext/four_oh_four/info.php
index 00482a6e..4fba0195 100644
--- a/ext/handle_404/info.php
+++ b/ext/four_oh_four/info.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-class Handle404Info extends ExtensionInfo
+class FourOhFourInfo extends ExtensionInfo
 {
-    public const KEY = "handle_404";
+    public const KEY = "four_oh_four";
 
     public $key = self::KEY;
     public $name = "404 Detector";
diff --git a/ext/handle_404/main.php b/ext/four_oh_four/main.php
similarity index 90%
rename from ext/handle_404/main.php
rename to ext/four_oh_four/main.php
index 292a7acf..08ae677d 100644
--- a/ext/handle_404/main.php
+++ b/ext/four_oh_four/main.php
@@ -1,7 +1,6 @@
 <?php declare(strict_types=1);
 
-
-class Handle404 extends Extension
+class FourOhFour extends Extension
 {
     public function onPageRequest(PageRequestEvent $event)
     {
@@ -9,7 +8,7 @@ class Handle404 extends Extension
         // hax.
         if ($page->mode == PageMode::PAGE && (!isset($page->blocks) || $this->count_main($page->blocks) == 0)) {
             $h_pagename = html_escape(implode('/', $event->args));
-            log_debug("handle_404", "Hit 404: $h_pagename");
+            log_debug("four_oh_four", "Hit 404: $h_pagename");
             $page->set_code(404);
             $page->set_title("404");
             $page->set_heading("404 - No Handler Found");
diff --git a/ext/handle_404/test.php b/ext/four_oh_four/test.php
similarity index 85%
rename from ext/handle_404/test.php
rename to ext/four_oh_four/test.php
index 60deb6d1..fd9761b2 100644
--- a/ext/handle_404/test.php
+++ b/ext/four_oh_four/test.php
@@ -1,5 +1,6 @@
 <?php declare(strict_types=1);
-class Handle404Test extends ShimmiePHPUnitTestCase
+
+class FourOhFourTest extends ShimmiePHPUnitTestCase
 {
     public function test404Handler()
     {