diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index c9d7649..56afa55 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -22,7 +22,9 @@
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Minerva\LanguagesHelper;
 use MediaWiki\Minerva\Menu\Definitions;
-use MediaWiki\Minerva\Menu\Main as MainMenu;
+use MediaWiki\Minerva\Menu\Main\MainMenuDirector;
+use MediaWiki\Minerva\Menu\Main\DefaultMainMenuBuilder;
+use MediaWiki\Minerva\Menu\Main\AdvancedMainMenuBuilder;
 use MediaWiki\Minerva\Menu\PageActions as PageActionsMenu;
 use MediaWiki\Minerva\Menu\User\AdvancedUserMenuBuilder;
 use MediaWiki\Minerva\Menu\User\DefaultUserMenuBuilder;
@@ -55,7 +57,7 @@ return [
 			$context->getSkin()
 		);
 	},
-	'Minerva.Menu.MainDirector' => function ( MediaWikiServices $services ): MainMenu\Director {
+	'Minerva.Menu.MainDirector' => function ( MediaWikiServices $services ): MainMenuDirector {
 		$context = RequestContext::getMain();
 		/** @var SkinOptions $options */
 		$options = $services->getService( 'Minerva.SkinOptions' );
@@ -63,10 +65,10 @@ return [
 		$showMobileOptions = $options->get( SkinOptions::MOBILE_OPTIONS );
 		$user = $context->getUser();
 		$builder = $options->get( SkinOptions::AMC_MODE ) ?
-			new MainMenu\AdvancedBuilder( $showMobileOptions, $user, $definitions ) :
-			new MainMenu\DefaultBuilder( $showMobileOptions, $user, $definitions );
+			new AdvancedMainMenuBuilder( $showMobileOptions, $user, $definitions ) :
+			new DefaultMainMenuBuilder( $showMobileOptions, $user, $definitions );
 
-		return new MainMenu\Director( $builder, $context, $services->getSpecialPageFactory() );
+		return new MainMenuDirector( $builder, $context, $services->getSpecialPageFactory() );
 	},
 	'Minerva.Menu.PageActionsDirector' =>
 		function ( MediaWikiServices $services ): PageActionsMenu\PageActionsDirector {
diff --git a/includes/menu/Main/AdvancedBuilder.php b/includes/menu/Main/AdvancedMainMenuBuilder.php
similarity index 97%
rename from includes/menu/Main/AdvancedBuilder.php
rename to includes/menu/Main/AdvancedMainMenuBuilder.php
index f1ddb85..d0c539a 100644
--- a/includes/menu/Main/AdvancedBuilder.php
+++ b/includes/menu/Main/AdvancedMainMenuBuilder.php
@@ -34,7 +34,7 @@ use MediaWiki\Minerva\Menu\Group;
  *
  * @package MediaWiki\Minerva\Menu\Main
  */
-final class AdvancedBuilder implements IBuilder {
+final class AdvancedMainMenuBuilder implements IMainMenuBuilder {
 	/**
 	 * @var bool
 	 */
diff --git a/includes/menu/Main/DefaultBuilder.php b/includes/menu/Main/DefaultMainMenuBuilder.php
similarity index 97%
rename from includes/menu/Main/DefaultBuilder.php
rename to includes/menu/Main/DefaultMainMenuBuilder.php
index 1695eac..b24baaa 100644
--- a/includes/menu/Main/DefaultBuilder.php
+++ b/includes/menu/Main/DefaultMainMenuBuilder.php
@@ -30,7 +30,7 @@ use MediaWiki\Minerva\Menu\Group;
 /**
  * Used to build default (available for everyone by default) main menu
  */
-final class DefaultBuilder implements IBuilder {
+final class DefaultMainMenuBuilder implements IMainMenuBuilder {
 
 	/**
 	 * @var bool
diff --git a/includes/menu/Main/IBuilder.php b/includes/menu/Main/IMainMenuBuilder.php
similarity index 97%
rename from includes/menu/Main/IBuilder.php
rename to includes/menu/Main/IMainMenuBuilder.php
index 96cf23e..9826f59 100644
--- a/includes/menu/Main/IBuilder.php
+++ b/includes/menu/Main/IMainMenuBuilder.php
@@ -22,7 +22,7 @@ namespace MediaWiki\Minerva\Menu\Main;
 
 use MediaWiki\Minerva\Menu\Group;
 
-interface IBuilder {
+interface IMainMenuBuilder {
 
 	/**
 	 * @return Group[]
diff --git a/includes/menu/Main/Director.php b/includes/menu/Main/MainMenuDirector.php
similarity index 96%
rename from includes/menu/Main/Director.php
rename to includes/menu/Main/MainMenuDirector.php
index b0b0733..b470b31 100644
--- a/includes/menu/Main/Director.php
+++ b/includes/menu/Main/MainMenuDirector.php
@@ -28,10 +28,10 @@ use \MediaWiki\Special\SpecialPageFactory;
 /**
  * Director responsible for building Main Menu
  */
-final class Director {
+final class MainMenuDirector {
 
 	/**
-	 * @var IBuilder
+	 * @var IMainMenuBuilder
 	 */
 	private $builder;
 
@@ -53,13 +53,13 @@ final class Director {
 	/**
 	 * Director responsible for Main Menu building
 	 *
-	 * @param IBuilder $builder
+	 * @param IMainMenuBuilder $builder
 	 * @param MessageLocalizer $messageLocalizer Used for translating texts in menu toggle
 	 * @param SpecialPageFactory $specialPageFactory Used to check for MobileMenu special page
 	 * existence
 	 */
 	public function __construct(
-		IBuilder $builder,
+		IMainMenuBuilder $builder,
 		MessageLocalizer $messageLocalizer,
 		SpecialPageFactory $specialPageFactory
 	) {
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b68c7b6..31ba1c0 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -19,7 +19,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Minerva\Menu\Main\Director as MainMenuDirector;
+use MediaWiki\Minerva\Menu\Main\MainMenuDirector;
 use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
 use MediaWiki\Minerva\SkinOptions;
 use MediaWiki\Minerva\SkinUserPageHelper;