diff --git a/acp/portal_info.php b/acp/portal_info.php
index fd04a0e2..5f7ff4b4 100644
--- a/acp/portal_info.php
+++ b/acp/portal_info.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace board3\portal\acp;
+
 if (!defined('IN_PHPBB'))
 {
 	exit;
@@ -15,12 +17,12 @@ if (!defined('IN_PHPBB'))
 /**
 * @package module_install
 */
-class phpbb_ext_board3_portal_acp_portal_info
+class portal_info
 {
 	public function module()
 	{
 		return array(
-			'filename'	=> 'phpbb_ext_board3_portal_acp_portal_module',
+			'filename'	=> '\board3\portal\acp\portal_module',
 			'title'		=> 'ACP_PORTAL',
 			'version'	=> '2.0.0b2',
 			'modes'		=> array(
diff --git a/acp/portal_module.php b/acp/portal_module.php
index 1ee7efb1..a8db8838 100644
--- a/acp/portal_module.php
+++ b/acp/portal_module.php
@@ -7,6 +7,8 @@
 *
 */
 
+namespace board3\portal\acp;
+
 /**
 * @ignore
 */
@@ -15,7 +17,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-class phpbb_ext_board3_portal_acp_portal_module
+class portal_module
 {
 	public $u_action;
 	public $new_config = array();
diff --git a/migrations/v210_beta1.php b/migrations/v210_beta1.php
index f8a50357..4b214b94 100644
--- a/migrations/v210_beta1.php
+++ b/migrations/v210_beta1.php
@@ -154,7 +154,7 @@ class v210_beta1 extends \phpbb\db\migration\migration
 				'acp',
 				'ACP_PORTAL',
 				array(
-					'module_basename'	=> 'phpbb_ext_board3_portal_acp_portal_module',
+					'module_basename'	=> '\board3\portal\acp\portal_module',
 					'module_mode'		=> 'config',
 					'module_auth'		=> 'acl_a_manage_portal',
 					'module_langname'	=> 'ACP_PORTAL_GENERAL_INFO',
@@ -164,7 +164,7 @@ class v210_beta1 extends \phpbb\db\migration\migration
 				'acp',
 				'ACP_PORTAL',
 				array(
-					'module_basename'	=> 'phpbb_ext_board3_portal_acp_portal_module',
+					'module_basename'	=> '\board3\portal\acp\portal_module',
 					'module_mode'		=> 'modules',
 					'module_auth'		=> 'acl_a_manage_portal',
 					'module_langname'	=> 'ACP_PORTAL_MODULES',
@@ -174,7 +174,7 @@ class v210_beta1 extends \phpbb\db\migration\migration
 				'acp',
 				'ACP_PORTAL',
 				array(
-					'module_basename'	=> 'phpbb_ext_board3_portal_acp_portal_module',
+					'module_basename'	=> '\board3\portal\acp\portal_module',
 					'module_mode'		=> 'upload_module',
 					'module_auth'		=> 'acl_a_manage_portal',
 					'module_langname'	=> 'ACP_PORTAL_UPLOAD',