diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index a8ea9d6fa..83de585b5 100644
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -411,8 +411,8 @@ function runAdminTab($tab, $ajaxMode = false)
 	$cookie = Context::getContext()->cookie;
 	if (empty($tab) && !sizeof($_POST))
 	{
-		$tab = 'AdminHome';
-		$_POST['tab'] = 'AdminHome';
+		$tab = 'AdminDashboard';
+		$_POST['tab'] = $tab;
 		$_POST['token'] = Tools::getAdminTokenLite($tab);
 	}
 	// $tab = $_REQUEST['tab'];
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 68b90619f..1f8fb2076 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -334,7 +334,7 @@ class AdminControllerCore extends Controller
 		if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
 		$this->tabAccess = Profile::getProfileAccess($this->context->employee->id_profile, $this->id);
 
-		// Fix for AdminHome
+		// Fix for homepage
 		if ($this->controller_name == 'AdminDashboard')
 			$_POST['token'] = $this->token;
 
@@ -1284,7 +1284,7 @@ class AdminControllerCore extends Controller
 			if (false === strpos($url, '?token=') && false === strpos($url, '&token='))
 				$url .= '&token='.$this->token;
 			if (strpos($url, '?') === false)
-				$url = str_replace('&token', '?controller=AdminHome&token', $url);
+				$url = str_replace('&token', '?controller=AdminDashboard&token', $url);
 
 			$this->context->smarty->assign('url', htmlentities($url));
 			return false;
diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php
index 76126c7b5..2ab95ac77 100644
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -184,7 +184,7 @@ class AdminEmailsControllerCore extends AdminController
 		$this->initPageHeaderToolbar();
 		$this->addToolBarModulesListButton();
 		unset($this->toolbar_btn['save']);
-		$back = $this->context->link->getAdminLink('AdminHome');
+		$back = $this->context->link->getAdminLink('AdminDashboard');
 		
 		$this->toolbar_btn['back'] = array(
 			'href' => $back,
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index b8bf28e44..b4c5d573b 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -113,7 +113,7 @@ class AdminEmployeesControllerCore extends AdminController
 			if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css')))
 				$this->themes[] = $theme;
 
-		$home_tab = Tab::getInstanceFromClassName('adminHome');
+		$home_tab = Tab::getInstanceFromClassName('AdminDashboard');
 		$this->tabs_list[$home_tab->id] = array(
 				'name' => $home_tab->name[$this->context->language->id],
 				'id_tab' => $home_tab->id,
diff --git a/install-dev/upgrade/sql/1.6.0.1.sql b/install-dev/upgrade/sql/1.6.0.1.sql
index f03d2a719..58c5e5411 100644
--- a/install-dev/upgrade/sql/1.6.0.1.sql
+++ b/install-dev/upgrade/sql/1.6.0.1.sql
@@ -31,3 +31,5 @@ CREATE TABLE `PREFIX_configuration_kpi_lang` (
 /* PHP:ps1600_add_missing_index(); */;
 
 UPDATE `PREFIX_configuration` SET `value`='-' WHERE `name` = 'PS_ATTRIBUTE_ANCHOR_SEPARATOR';
+
+UPDATE `PREFIX_tab` SET class_name = 'AdminDashboard' WHERE class_name = 'AdminHome';