diff --git a/framework/core/src/Api/Actions/ActionInterface.php b/framework/core/src/Api/Actions/Action.php
similarity index 91%
rename from framework/core/src/Api/Actions/ActionInterface.php
rename to framework/core/src/Api/Actions/Action.php
index 27e33bc6b..602e45376 100644
--- a/framework/core/src/Api/Actions/ActionInterface.php
+++ b/framework/core/src/Api/Actions/Action.php
@@ -2,7 +2,7 @@
 
 use Flarum\Api\Request;
 
-interface ActionInterface
+interface Action
 {
     /**
      * Handle a request to the API, returning an HTTP response.
diff --git a/framework/core/src/Api/Actions/JsonApiAction.php b/framework/core/src/Api/Actions/JsonApiAction.php
index 406a51f11..5697d8f22 100644
--- a/framework/core/src/Api/Actions/JsonApiAction.php
+++ b/framework/core/src/Api/Actions/JsonApiAction.php
@@ -7,7 +7,7 @@ use Flarum\Core\Exceptions\ValidationFailureException;
 use Flarum\Core\Exceptions\PermissionDeniedException;
 use Zend\Diactoros\Response\JsonResponse;
 
-abstract class JsonApiAction implements ActionInterface
+abstract class JsonApiAction implements Action
 {
     /**
      * Handle an API request and return an API response, handling any relevant
diff --git a/framework/core/src/Assets/AssetManager.php b/framework/core/src/Assets/AssetManager.php
index 181207f98..78ae0f8e1 100644
--- a/framework/core/src/Assets/AssetManager.php
+++ b/framework/core/src/Assets/AssetManager.php
@@ -8,7 +8,7 @@ class AssetManager
 
     protected $js;
 
-    public function __construct(CompilerInterface $js, CompilerInterface $less)
+    public function __construct(Compiler $js, Compiler $less)
     {
         $this->js = $js;
         $this->less = $less;
diff --git a/framework/core/src/Assets/CompilerInterface.php b/framework/core/src/Assets/Compiler.php
similarity index 83%
rename from framework/core/src/Assets/CompilerInterface.php
rename to framework/core/src/Assets/Compiler.php
index a5946dde0..11db8d5e4 100644
--- a/framework/core/src/Assets/CompilerInterface.php
+++ b/framework/core/src/Assets/Compiler.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Assets;
 
-interface CompilerInterface
+interface Compiler
 {
     public function addFile($file);
 
diff --git a/framework/core/src/Assets/RevisionCompiler.php b/framework/core/src/Assets/RevisionCompiler.php
index ba76ad2ca..1a92176a3 100644
--- a/framework/core/src/Assets/RevisionCompiler.php
+++ b/framework/core/src/Assets/RevisionCompiler.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Support\Str;
 
-class RevisionCompiler implements CompilerInterface
+class RevisionCompiler implements Compiler
 {
     protected $files = [];
 
diff --git a/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php b/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php
index 1384d211c..088dd2c6a 100644
--- a/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php
+++ b/framework/core/src/Core/Discussions/Search/Gambits/FulltextGambit.php
@@ -3,10 +3,10 @@
 use Flarum\Core\Discussions\Search\DiscussionSearch;
 use Flarum\Core\Posts\PostRepository;
 use Flarum\Core\Search\Search;
-use Flarum\Core\Search\GambitInterface;
+use Flarum\Core\Search\Gambit;
 use LogicException;
 
-class FulltextGambit implements GambitInterface
+class FulltextGambit implements Gambit
 {
     /**
      * @var PostRepository
diff --git a/framework/core/src/Core/Formatter/FormatterInterface.php b/framework/core/src/Core/Formatter/Formatter.php
similarity index 96%
rename from framework/core/src/Core/Formatter/FormatterInterface.php
rename to framework/core/src/Core/Formatter/Formatter.php
index 352e93618..fe114424e 100644
--- a/framework/core/src/Core/Formatter/FormatterInterface.php
+++ b/framework/core/src/Core/Formatter/Formatter.php
@@ -2,7 +2,7 @@
 
 use Flarum\Core\Model;
 
-interface FormatterInterface
+interface Formatter
 {
     /**
      * Configure the formatter manager before formatting takes place.
diff --git a/framework/core/src/Core/Formatter/FormatterManager.php b/framework/core/src/Core/Formatter/FormatterManager.php
index 20e1bb8df..f2daabcf9 100644
--- a/framework/core/src/Core/Formatter/FormatterManager.php
+++ b/framework/core/src/Core/Formatter/FormatterManager.php
@@ -90,7 +90,7 @@ class FormatterManager
     /**
      * Instantiate the collected formatters.
      *
-     * @return FormatterInterface[]
+     * @return Formatter[]
      */
     protected function getFormatters()
     {
@@ -99,9 +99,9 @@ class FormatterManager
         foreach ($this->formatters as $formatter) {
             $formatter = $this->container->make($formatter);
 
-            if (! $formatter instanceof FormatterInterface) {
+            if (! $formatter instanceof Formatter) {
                 throw new LogicException('Formatter ' . get_class($formatter)
-                    . ' does not implement ' . FormatterInterface::class);
+                    . ' does not implement ' . Formatter::class);
             }
 
             $formatters[] = $formatter;
diff --git a/framework/core/src/Core/Formatter/TextFormatter.php b/framework/core/src/Core/Formatter/TextFormatter.php
index adc352e31..1f006802f 100644
--- a/framework/core/src/Core/Formatter/TextFormatter.php
+++ b/framework/core/src/Core/Formatter/TextFormatter.php
@@ -6,7 +6,7 @@ use Flarum\Core\Model;
  * A formatter which formats a block of HTML, while leaving the contents
  * of specific tags like <code> and <pre> untouched.
  */
-abstract class TextFormatter implements FormatterInterface
+abstract class TextFormatter implements Formatter
 {
     /**
      * A list of tags to ignore when applying formatting.
diff --git a/framework/core/src/Core/Search/GambitInterface.php b/framework/core/src/Core/Search/Gambit.php
similarity index 92%
rename from framework/core/src/Core/Search/GambitInterface.php
rename to framework/core/src/Core/Search/Gambit.php
index 547ed983f..2f98c5a6f 100644
--- a/framework/core/src/Core/Search/GambitInterface.php
+++ b/framework/core/src/Core/Search/Gambit.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Core\Search;
 
-interface GambitInterface
+interface Gambit
 {
     /**
      * Apply conditions to the searcher for a bit of the search string.
diff --git a/framework/core/src/Core/Search/GambitManager.php b/framework/core/src/Core/Search/GambitManager.php
index 1f6a0e0f1..39f410a47 100644
--- a/framework/core/src/Core/Search/GambitManager.php
+++ b/framework/core/src/Core/Search/GambitManager.php
@@ -90,9 +90,9 @@ class GambitManager
 
         foreach ($bits as $k => $bit) {
             foreach ($gambits as $gambit) {
-                if (! $gambit instanceof GambitInterface) {
+                if (! $gambit instanceof Gambit) {
                     throw new LogicException('Gambit ' . get_class($gambit)
-                        . ' does not implement ' . GambitInterface::class);
+                        . ' does not implement ' . Gambit::class);
                 }
 
                 if ($gambit->apply($search, $bit)) {
diff --git a/framework/core/src/Core/Search/RegexGambit.php b/framework/core/src/Core/Search/RegexGambit.php
index 6265f0362..594ced2a9 100644
--- a/framework/core/src/Core/Search/RegexGambit.php
+++ b/framework/core/src/Core/Search/RegexGambit.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Core\Search;
 
-abstract class RegexGambit implements GambitInterface
+abstract class RegexGambit implements Gambit
 {
     /**
      * The regex pattern to match the bit against.
diff --git a/framework/core/src/Core/Search/Search.php b/framework/core/src/Core/Search/Search.php
index 5f65f2e35..b6702ce2f 100644
--- a/framework/core/src/Core/Search/Search.php
+++ b/framework/core/src/Core/Search/Search.php
@@ -26,7 +26,7 @@ abstract class Search
     protected $defaultSort = [];
 
     /**
-     * @var GambitInterface[]
+     * @var Gambit[]
      */
     protected $activeGambits = [];
 
@@ -87,7 +87,7 @@ abstract class Search
     /**
      * Get a list of the gambits that are active in this search.
      *
-     * @return GambitInterface[]
+     * @return Gambit[]
      */
     public function getActiveGambits()
     {
@@ -97,10 +97,10 @@ abstract class Search
     /**
      * Add a gambit as being active in this search.
      *
-     * @param GambitInterface $gambit
+     * @param Gambit $gambit
      * @return void
      */
-    public function addActiveGambit(GambitInterface $gambit)
+    public function addActiveGambit(Gambit $gambit)
     {
         $this->activeGambits[] = $gambit;
     }
diff --git a/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php b/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php
index c383cf807..a0966fd52 100644
--- a/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php
+++ b/framework/core/src/Core/Users/Search/Gambits/FulltextGambit.php
@@ -2,9 +2,9 @@
 
 use Flarum\Core\Users\UserRepository;
 use Flarum\Core\Search\Search;
-use Flarum\Core\Search\GambitInterface;
+use Flarum\Core\Search\Gambit;
 
-class FulltextGambit implements GambitInterface
+class FulltextGambit implements Gambit
 {
     /**
      * @var UserRepository