diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php
index bced30ed..dd34d2ff 100644
--- a/includes/Api/ApiWebappManifest.php
+++ b/includes/Api/ApiWebappManifest.php
@@ -20,7 +20,7 @@
  * @file
  */
 
-namespace Citizen\Api;
+namespace MediaWiki\Skins\Citizen\Api;
 
 use ApiBase;
 use ApiFormatJson;
diff --git a/includes/GetConfigTrait.php b/includes/GetConfigTrait.php
index 99589c28..274b86fb 100644
--- a/includes/GetConfigTrait.php
+++ b/includes/GetConfigTrait.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen;
+namespace MediaWiki\Skins\Citizen;
 
 use ConfigException;
 use OutputPage;
diff --git a/includes/Hooks/ResourceLoaderHooks.php b/includes/Hooks/ResourceLoaderHooks.php
index 676b0ccc..d789ed49 100644
--- a/includes/Hooks/ResourceLoaderHooks.php
+++ b/includes/Hooks/ResourceLoaderHooks.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Hooks;
+namespace MediaWiki\Skins\Citizen\Hooks;
 
 use Config;
 use ResourceLoaderContext;
diff --git a/includes/Hooks/SkinHooks.php b/includes/Hooks/SkinHooks.php
index 43909261..b23372e1 100644
--- a/includes/Hooks/SkinHooks.php
+++ b/includes/Hooks/SkinHooks.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Hooks;
+namespace MediaWiki\Skins\Citizen\Hooks;
 
 use MediaWiki\Hook\BeforePageDisplayHook;
 use MediaWiki\Skins\Hook\SkinPageReadyConfigHook;
diff --git a/includes/Partials/BodyContent.php b/includes/Partials/BodyContent.php
index ec8e388a..a1c5d3b2 100644
--- a/includes/Partials/BodyContent.php
+++ b/includes/Partials/BodyContent.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use DOMDocument;
 use DOMElement;
diff --git a/includes/Partials/Drawer.php b/includes/Partials/Drawer.php
index 67ee368b..07db7e4a 100644
--- a/includes/Partials/Drawer.php
+++ b/includes/Partials/Drawer.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use Exception;
 use ExtensionRegistry;
diff --git a/includes/Partials/Footer.php b/includes/Partials/Footer.php
index 9dbd3b53..c30afb83 100644
--- a/includes/Partials/Footer.php
+++ b/includes/Partials/Footer.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 /**
  * Footer partial of Skin Citizen
diff --git a/includes/Partials/Header.php b/includes/Partials/Header.php
index d4d4a429..eec5576c 100644
--- a/includes/Partials/Header.php
+++ b/includes/Partials/Header.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use MediaWiki\MediaWikiServices;
 use MWException;
diff --git a/includes/Partials/Logos.php b/includes/Partials/Logos.php
index 290ce690..7738f31a 100644
--- a/includes/Partials/Logos.php
+++ b/includes/Partials/Logos.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use ResourceLoaderSkinModule;
 
diff --git a/includes/Partials/Metadata.php b/includes/Partials/Metadata.php
index 6dc17a1a..563c5825 100644
--- a/includes/Partials/Metadata.php
+++ b/includes/Partials/Metadata.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use Exception;
 
diff --git a/includes/Partials/PageTools.php b/includes/Partials/PageTools.php
index 426d4bbe..fbd6dde9 100644
--- a/includes/Partials/PageTools.php
+++ b/includes/Partials/PageTools.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use Action;
 use Exception;
diff --git a/includes/Partials/Partial.php b/includes/Partials/Partial.php
index bc0f0b45..fa6c8b78 100644
--- a/includes/Partials/Partial.php
+++ b/includes/Partials/Partial.php
@@ -23,11 +23,11 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
-use Citizen\GetConfigTrait;
+use MediaWiki\Skins\Citizen\GetConfigTrait;
+use MediaWiki\Skins\Citizen\SkinCitizen;
 use OutputPage;
-use SkinCitizen;
 use Title;
 
 /**
diff --git a/includes/Partials/Tagline.php b/includes/Partials/Tagline.php
index 1637c5f7..43295673 100644
--- a/includes/Partials/Tagline.php
+++ b/includes/Partials/Tagline.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use Title;
 use User;
diff --git a/includes/Partials/Theme.php b/includes/Partials/Theme.php
index 216399c1..2d66b550 100644
--- a/includes/Partials/Theme.php
+++ b/includes/Partials/Theme.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 /**
  * Theme switcher partial of Skin Citizen
diff --git a/includes/Partials/Title.php b/includes/Partials/Title.php
index f0ca1d60..57117a83 100644
--- a/includes/Partials/Title.php
+++ b/includes/Partials/Title.php
@@ -23,7 +23,7 @@
 
 declare( strict_types=1 );
 
-namespace Citizen\Partials;
+namespace MediaWiki\Skins\Citizen\Partials;
 
 use Html;
 use MediaWiki\MediaWikiServices;
diff --git a/includes/SkinCitizen.php b/includes/SkinCitizen.php
index 02e23c16..c27593f0 100644
--- a/includes/SkinCitizen.php
+++ b/includes/SkinCitizen.php
@@ -21,17 +21,23 @@
  * @ingroup Skins
  */
 
-use Citizen\GetConfigTrait;
-use Citizen\Partials\BodyContent;
-use Citizen\Partials\Drawer;
-use Citizen\Partials\Footer;
-use Citizen\Partials\Header;
-use Citizen\Partials\Logos;
-use Citizen\Partials\Metadata;
-use Citizen\Partials\PageTools;
-use Citizen\Partials\Tagline;
-use Citizen\Partials\Theme;
-use Citizen\Partials\Title;
+namespace MediaWiki\Skins\Citizen;
+
+use Linker;
+use MediaWiki\Skins\Citizen\GetConfigTrait;
+use MediaWiki\Skins\Citizen\Partials\BodyContent;
+use MediaWiki\Skins\Citizen\Partials\Drawer;
+use MediaWiki\Skins\Citizen\Partials\Footer;
+use MediaWiki\Skins\Citizen\Partials\Header;
+use MediaWiki\Skins\Citizen\Partials\Logos;
+use MediaWiki\Skins\Citizen\Partials\Metadata;
+use MediaWiki\Skins\Citizen\Partials\PageTools;
+use MediaWiki\Skins\Citizen\Partials\Tagline;
+use MediaWiki\Skins\Citizen\Partials\Theme;
+use MediaWiki\Skins\Citizen\Partials\Title;
+use Sanitizer;
+use SkinMustache;
+use Xml;
 
 /**
  * Skin subclass for Citizen
@@ -99,7 +105,7 @@ class SkinCitizen extends SkinMustache {
 			'msg-sitetitle' => $this->msg( 'sitetitle' )->text(),
 			'html-mainpage-attributes' => Xml::expandAttributes(
 				Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) + [
-					'href' => Skin::makeMainPageUrl(),
+					'href' => parent::makeMainPageUrl(),
 				]
 			),
 			'data-logos' => $logos->getLogoData(),
diff --git a/skin.json b/skin.json
index 0a675369..4ab2c996 100644
--- a/skin.json
+++ b/skin.json
@@ -16,8 +16,7 @@
 	},
 	"ValidSkinNames": {
 		"citizen": {
-			"class": "SkinCitizen",
-			"@args": "See SkinCitizen::__construct for more detail.",
+			"class": "MediaWiki\\Skins\\Citizen\\SkinCitizen",
 			"args": [
 				{
 					"name": "citizen",
@@ -54,23 +53,20 @@
 			"i18n"
 		]
 	},
-	"AutoloadClasses": {
-		"SkinCitizen": "includes/SkinCitizen.php"
-	},
 	"AutoloadNamespaces": {
-		"Citizen\\": "includes/"
+		"MediaWiki\\Skins\\Citizen\\": "includes/"
 	},
 	"ConfigRegistry": {
-		"Citizen": "GlobalVarConfig::newInstance"
+		"citizen": "GlobalVarConfig::newInstance"
 	},
 	"APIModules": {
 		"webapp-manifest": {
-			"class": "Citizen\\Api\\ApiWebappManifest"
+			"class": "MediaWiki\\Skins\\Citizen\\Api\\ApiWebappManifest"
 		}
 	},
 	"HookHandlers": {
 		"SkinHooks": {
-			"class": "Citizen\\Hooks\\SkinHooks"
+			"class": "MediaWiki\\Skins\\Citizen\\Hooks\\SkinHooks"
 		}
 	},
 	"Hooks": {