diff --git a/src/Event/ConfigureFormatter.php b/src/Formatter/Event/Configuring.php
similarity index 90%
rename from src/Event/ConfigureFormatter.php
rename to src/Formatter/Event/Configuring.php
index 1efd761c8..9d0efeb28 100644
--- a/src/Event/ConfigureFormatter.php
+++ b/src/Formatter/Event/Configuring.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\Formatter\Event;
 
 use s9e\TextFormatter\Configurator;
 
-class ConfigureFormatter
+class Configuring
 {
     /**
      * @var Configurator
diff --git a/src/Event/ConfigureFormatterParser.php b/src/Formatter/Event/Parsing.php
similarity index 92%
rename from src/Event/ConfigureFormatterParser.php
rename to src/Formatter/Event/Parsing.php
index 642ab7a0f..e462021b8 100644
--- a/src/Event/ConfigureFormatterParser.php
+++ b/src/Formatter/Event/Parsing.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\Formatter\Event;
 
 use s9e\TextFormatter\Parser;
 
-class ConfigureFormatterParser
+class Parsing
 {
     /**
      * @var Parser
diff --git a/src/Event/ConfigureFormatterRenderer.php b/src/Formatter/Event/Rendering.php
similarity index 92%
rename from src/Event/ConfigureFormatterRenderer.php
rename to src/Formatter/Event/Rendering.php
index 9c2aced54..97ae53687 100644
--- a/src/Event/ConfigureFormatterRenderer.php
+++ b/src/Formatter/Event/Rendering.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Event;
+namespace Flarum\Formatter\Event;
 
 use s9e\TextFormatter\Renderer;
 
-class ConfigureFormatterRenderer
+class Rendering
 {
     /**
      * @var Renderer
diff --git a/src/Formatter/Formatter.php b/src/Formatter/Formatter.php
index 2de082af9..c080dcc08 100644
--- a/src/Formatter/Formatter.php
+++ b/src/Formatter/Formatter.php
@@ -11,9 +11,9 @@
 
 namespace Flarum\Formatter;
 
-use Flarum\Event\ConfigureFormatter;
-use Flarum\Event\ConfigureFormatterParser;
-use Flarum\Event\ConfigureFormatterRenderer;
+use Flarum\Formatter\Event\Configuring;
+use Flarum\Formatter\Event\Parsing;
+use Flarum\Formatter\Event\Rendering;
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
 use s9e\TextFormatter\Configurator;
@@ -59,7 +59,7 @@ class Formatter
     {
         $parser = $this->getParser($context);
 
-        $this->events->fire(new ConfigureFormatterParser($parser, $context, $text));
+        $this->events->fire(new Parsing($parser, $context, $text));
 
         return $parser->parse($text);
     }
@@ -75,7 +75,7 @@ class Formatter
     {
         $renderer = $this->getRenderer($context);
 
-        $this->events->fire(new ConfigureFormatterRenderer($renderer, $context, $xml));
+        $this->events->fire(new Rendering($renderer, $context, $xml));
 
         return $renderer->render($xml);
     }
@@ -117,7 +117,7 @@ class Formatter
         $configurator->Autolink;
         $configurator->tags->onDuplicate('replace');
 
-        $this->events->fire(new ConfigureFormatter($configurator));
+        $this->events->fire(new Configuring($configurator));
 
         $this->configureExternalLinks($configurator);