diff --git a/src/Core/CoreServiceProvider.php b/src/Core/CoreServiceProvider.php
index dda6e1a28..f5b364f28 100644
--- a/src/Core/CoreServiceProvider.php
+++ b/src/Core/CoreServiceProvider.php
@@ -109,7 +109,7 @@ class CoreServiceProvider extends AbstractServiceProvider
         $events->subscribe('Flarum\Core\Listener\SelfDemotionGuard');
         $events->subscribe('Flarum\Discussion\DiscussionMetadataUpdater');
         $events->subscribe('Flarum\User\UserMetadataUpdater');
-        $events->subscribe('Flarum\Core\Listener\ExtensionValidator');
+        $events->subscribe('Flarum\Extension\DefaultLanguagePackGuard');
         $events->subscribe('Flarum\User\EmailConfirmationMailer');
         $events->subscribe('Flarum\Discussion\DiscussionRenamedNotifier');
 
diff --git a/src/Core/Listener/ExtensionValidator.php b/src/Extension/DefaultLanguagePackGuard.php
similarity index 95%
rename from src/Core/Listener/ExtensionValidator.php
rename to src/Extension/DefaultLanguagePackGuard.php
index b7e3634d6..68afffd91 100644
--- a/src/Core/Listener/ExtensionValidator.php
+++ b/src/Extension/DefaultLanguagePackGuard.php
@@ -9,13 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\Listener;
+namespace Flarum\Extension;
 
 use Flarum\Event\ExtensionWillBeDisabled;
 use Flarum\Http\Exception\ForbiddenException;
 use Illuminate\Contracts\Events\Dispatcher;
 
-class ExtensionValidator
+class DefaultLanguagePackGuard
 {
     /**
      * @param Dispatcher $events