From 07207496d7201a366bead632d1a3c3434d7baed3 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Mon, 2 Jan 2012 15:52:40 +0000
Subject: [PATCH] // Rename correctly all hooks

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/ajax.php                            |  2 +-
 admin-dev/footer.inc.php                      |  2 +-
 admin-dev/header.inc.php                      |  4 ++--
 classes/AdminController.php                   |  6 ++---
 classes/Attribute.php                         |  6 ++---
 classes/AttributeGroup.php                    |  6 ++---
 classes/Cart.php                              |  4 ++--
 classes/Category.php                          | 10 ++++-----
 classes/Feature.php                           |  6 ++---
 classes/FeatureValue.php                      |  6 ++---
 classes/FileUploader.php                      |  5 ++---
 classes/FrontController.php                   |  4 ++--
 classes/Module.php                            |  2 +-
 classes/PaymentModule.php                     |  9 +++++++-
 classes/Product.php                           | 10 ++++-----
 classes/Tools.php                             |  2 +-
 classes/order/OrderPayment.php                |  2 +-
 .../admin/AdminCustomersController.php        |  2 +-
 controllers/admin/AdminFeaturesController.php | 10 ++++-----
 controllers/admin/AdminHomeController.php     |  2 +-
 controllers/admin/AdminImportController.php   |  2 +-
 controllers/admin/AdminMetaController.php     |  2 +-
 controllers/admin/AdminOrdersController.php   |  8 +++----
 controllers/admin/AdminProductsController.php | 10 ++++-----
 controllers/admin/AdminStatsTabController.php |  2 +-
 controllers/front/AuthController.php          | 12 +++++-----
 controllers/front/CartController.php          |  6 ++---
 controllers/front/CategoryController.php      |  2 +-
 controllers/front/CompareController.php       |  2 +-
 controllers/front/GuestTrackingController.php |  4 ++--
 controllers/front/OrderDetailController.php   |  4 ++--
 controllers/front/OrderFollowController.php   |  2 +-
 controllers/front/OrderOpcController.php      | 22 +++++++++----------
 controllers/front/ParentOrderController.php   | 18 ++++++++-------
 controllers/front/ProductController.php       | 14 ++++++------
 controllers/front/SearchController.php        |  6 ++---
 36 files changed, 112 insertions(+), 104 deletions(-)

diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php
index 389855fdd..abc02b7dc 100644
--- a/admin-dev/ajax.php
+++ b/admin-dev/ajax.php
@@ -240,7 +240,7 @@ if (Tools::isSubmit('ajaxCategoriesPositions'))
 	{
 		if (isset($position) && $category->updatePosition($way, $position))
 		{
-			Hook::exec('categoryUpdate');
+			Hook::exec('actionCategoryUpdate');
 			die(true);
 		}
 		else
diff --git a/admin-dev/footer.inc.php b/admin-dev/footer.inc.php
index cbc320b52..462644c73 100644
--- a/admin-dev/footer.inc.php
+++ b/admin-dev/footer.inc.php
@@ -27,7 +27,7 @@
 
 echo '			</div>
 			</div>
-			'.Hook::exec('backOfficeFooter').'
+			'.Hook::exec('displayBackOfficeFooter').'
 			<div id="footer">
 				<div style="float:left;margin-left:10px;padding-top:6px">
 					<a href="http://www.prestashop.com/" target="_blank" style="font-weight:700;color:#666666">PrestaShop&trade; '._PS_VERSION_.'</a><br />
diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index 602e51dd2..39dcc0a46 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -54,7 +54,7 @@ echo '
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
-		'.Hook::exec('backOfficeHeader').'
+		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin-ie.css" />
 		<![endif]-->
@@ -283,7 +283,7 @@ echo '			</select>
 			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
 
 		echo '</div>';
-			echo Hook::exec('backOfficeTop');
+			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
 
 if (empty($tab))
diff --git a/classes/AdminController.php b/classes/AdminController.php
index ec13fe07e..db0b3d569 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1330,8 +1330,8 @@ class AdminControllerCore extends Controller
 			'pic_dir' => _THEME_PROD_PIC_DIR_
 		));
 		$this->context->smarty->assign(array(
-			'HOOK_HEADER' => Hook::exec('backOfficeHeader'),
-			'HOOK_TOP' => Hook::exec('backOfficeTop'),
+			'HOOK_HEADER' => Hook::exec('displayBackOfficeHeader'),
+			'HOOK_TOP' => Hook::exec('displayBackOfficeTop'),
 		));
 	}
 
@@ -1421,7 +1421,7 @@ class AdminControllerCore extends Controller
 		));
 
 		$this->context->smarty->assign(array(
-			'HOOK_FOOTER' => Hook::exec('backOfficeFooter'),
+			'HOOK_FOOTER' => Hook::exec('displayBackOfficeFooter'),
 		));
 	}
 
diff --git a/classes/Attribute.php b/classes/Attribute.php
index 8392f60d9..a97778c0f 100644
--- a/classes/Attribute.php
+++ b/classes/Attribute.php
@@ -104,7 +104,7 @@ class AttributeCore extends ObjectModel
 
 		$return = parent::delete();
 		if ($return)
-			Hook::exec('afterDeleteAttribute', array('id_attribute' => $this->id));
+			Hook::exec('actionAttributeDelete', array('id_attribute' => $this->id));
 
 		return $return;
 	}
@@ -114,7 +114,7 @@ class AttributeCore extends ObjectModel
 		$return = parent::update($null_values);
 
 		if ($return)
-			Hook::exec('afterSaveAttribute', array('id_attribute' => $this->id));
+			Hook::exec('actionAttributeSave', array('id_attribute' => $this->id));
 
 		return $return;
 	}
@@ -127,7 +127,7 @@ class AttributeCore extends ObjectModel
 		$return = parent::add($autodate, $null_values);
 
 		if ($return)
-			Hook::exec('afterSaveAttribute', array('id_attribute' => $this->id));
+			Hook::exec('actionAttributeSave', array('id_attribute' => $this->id));
 
 		return $return;
 	}
diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php
index c85c3aa2d..9365a3667 100644
--- a/classes/AttributeGroup.php
+++ b/classes/AttributeGroup.php
@@ -75,14 +75,14 @@ class AttributeGroupCore extends ObjectModel
 			$this->position = AttributeGroup::getHigherPosition() + 1;
 
 		$return = parent::add($autodate, true);
-		Hook::exec('afterSaveAttributeGroup', array('id_attribute_group' => $this->id));
+		Hook::exec('actionAttributeGroupSave', array('id_attribute_group' => $this->id));
 		return $return;
 	}
 
 	public function update($nullValues = false)
 	{
 		$return = parent::update($nullValues);
-		Hook::exec('afterSaveAttributeGroup', array('id_attribute_group' => $this->id));
+		Hook::exec('actionAttributeGroupSave', array('id_attribute_group' => $this->id));
 		return $return;
 	}
 
@@ -137,7 +137,7 @@ class AttributeGroupCore extends ObjectModel
 			return false;
 		$return = parent::delete();
 		if ($return)
-			Hook::exec('afterDeleteAttributeGroup', array('id_attribute_group' => $this->id));
+			Hook::exec('actionAttributeGroupDelete', array('id_attribute_group' => $this->id));
 		return $return;
 	}
 
diff --git a/classes/Cart.php b/classes/Cart.php
index 978b279ff..db1e6b5a9 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -170,7 +170,7 @@ class CartCore extends ObjectModel
 			$this->id_lang = Configuration::get('PS_LANG_DEFAULT');
 
 		$return = parent::add($autodate);
-		Hook::exec('cart');
+		Hook::exec('actionCartSave');
 
 		return $return;
 	}
@@ -185,7 +185,7 @@ class CartCore extends ObjectModel
 
 		$this->_products = null;
 		$return = parent::update();
-		Hook::exec('cart');
+		Hook::exec('actionCartSave');
 
 		return $return;
 	}
diff --git a/classes/Category.php b/classes/Category.php
index 2943ddc9d..ca5eb0797 100644
--- a/classes/Category.php
+++ b/classes/Category.php
@@ -149,7 +149,7 @@ class CategoryCore extends ObjectModel
 		if (!isset($this->doNotRegenerateNTree) || !$this->doNotRegenerateNTree)
 			self::regenerateEntireNtree();
 		$this->updateGroup($this->groupBox);
-		Hook::exec('categoryAddition', array('category' => $this));
+		Hook::exec('actionCategoryAdd', array('category' => $this));
 		return $ret;
 	}
 
@@ -176,7 +176,7 @@ class CategoryCore extends ObjectModel
 			self::regenerateEntireNtree();
 			$this->recalculateLevelDepth($this->id_category);
 		}
-		Hook::exec('categoryUpdate', array('category' => $this));
+		Hook::exec('actionCategoryUpdate', array('category' => $this));
 		return $ret;
 	}
 
@@ -186,7 +186,7 @@ class CategoryCore extends ObjectModel
 	public function toggleStatus()
 	{
 		$result = parent::toggleStatus();
-		Hook::exec('categoryUpdate');
+		Hook::exec('actionCategoryUpdate');
 		return $result;
 	}
 
@@ -316,7 +316,7 @@ class CategoryCore extends ObjectModel
 		if (!isset($this->doNotRegenerateNTree) || !$this->doNotRegenerateNTree)
 			self::regenerateEntireNtree();
 
-		Hook::exec('categoryDeletion', array('category' => $this));
+		Hook::exec('actionCategoryDelete', array('category' => $this));
 
 		/* Delete Categories in GroupReduction */
 		foreach ($to_delete as $category)
@@ -1029,7 +1029,7 @@ class CategoryCore extends ObjectModel
 			SET `position` = '.(int)$position.'
 			WHERE `id_parent` = '.(int)$moved_category['id_parent'].'
 			AND `id_category`='.(int)$moved_category['id_category']));
-		Hook::exec('categoryUpdate');
+		Hook::exec('actionCategoryUpdate');
 		return $result;
 	}
 
diff --git a/classes/Feature.php b/classes/Feature.php
index cf556a8a3..c7cca5327 100644
--- a/classes/Feature.php
+++ b/classes/Feature.php
@@ -114,7 +114,7 @@ class FeatureCore extends ObjectModel
 			$this->position = Feature::getHigherPosition() + 1;
 
 		$return = parent::add($autodate, true);
-		Hook::exec('afterSaveFeature', array('id_feature' => $this->id));
+		Hook::exec('actionFeatureSave', array('id_feature' => $this->id));
 		return $return;
 	}
 
@@ -137,7 +137,7 @@ class FeatureCore extends ObjectModel
 
 		$return = parent::delete();
 		if ($return)
-			Hook::exec('afterDeleteFeature', array('id_feature' => $this->id));
+			Hook::exec('actionFeatureDelete', array('id_feature' => $this->id));
 
 		/* Reinitializing position */
 		$this->cleanPositions();
@@ -169,7 +169,7 @@ class FeatureCore extends ObjectModel
 				'`'.$this->def['primary'].'` = '.(int)$this->id.' AND `id_lang` = '.(int)$field['id_lang']
 			);
 		}
-		Hook::exec('afterSaveFeature', array('id_feature' => $this->id));
+		Hook::exec('actionFeatureSave', array('id_feature' => $this->id));
 		return $result;
 	}
 
diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php
index 8312a69f9..72a85fb77 100644
--- a/classes/FeatureValue.php
+++ b/classes/FeatureValue.php
@@ -164,7 +164,7 @@ class FeatureValueCore extends ObjectModel
 	{
 		$return = parent::add($autodate, $nullValues);
 		if ($return)
-			Hook::exec('afterSaveFeatureValue', array('id_feature_value' => $this->id));
+			Hook::exec('actionFeatureValueSave', array('id_feature_value' => $this->id));
 		return $return;
 	}
 
@@ -178,7 +178,7 @@ class FeatureValueCore extends ObjectModel
 		$return = parent::delete();
 
 		if ($return)
-			Hook::exec('afterDeleteFeatureValue', array('id_feature_value' => $this->id));
+			Hook::exec('actionFeatureValueDelete', array('id_feature_value' => $this->id));
 		return $return;
 	}
 
@@ -186,7 +186,7 @@ class FeatureValueCore extends ObjectModel
 	{
 		$return = parent::update($nullValues);
 		if ($return)
-			Hook::exec('afterSaveFeatureValue', array('id_feature_value' => $this->id));
+			Hook::exec('actionFeatureValueSave', array('id_feature_value' => $this->id));
 		return $return;
 	}
 }
diff --git a/classes/FileUploader.php b/classes/FileUploader.php
index a5494236b..d55091661 100755
--- a/classes/FileUploader.php
+++ b/classes/FileUploader.php
@@ -141,7 +141,7 @@ class qqUploadedFileForm {
 			}
 		}
 		unlink($tmpName);
-		Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
+		Hook::exec('actionWatermark', array('id_image' => $id_image, 'id_product' => $id_product));
 		$lang = Context::getContext()->employee->id_lang;
 
 		if (!$image->update())
@@ -229,8 +229,7 @@ class qqUploadedFileXhr
 			}
 		}
 		unlink($tmpName);
-		Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
-		$lang = Context::getContext()->employee->id_lang;
+		Hook::exec('actionWatermark', array('id_image' => $id_image, 'id_product' => $id_product));
 
 		if (!$image->update())
 			return array('error' => Tools::displayError('Error while updating status'));
diff --git a/classes/FrontController.php b/classes/FrontController.php
index c3cbc5d40..7e01da1e3 100755
--- a/classes/FrontController.php
+++ b/classes/FrontController.php
@@ -433,7 +433,7 @@ class FrontControllerCore extends Controller
 		Tools::displayAsDeprecated();
 		$this->context->smarty->assign(array(
 			'HOOK_RIGHT_COLUMN' => Hook::exec('displayRightColumn', array('cart' => $this->context->cart)),
-			'HOOK_FOOTER' => Hook::exec('footer'),
+			'HOOK_FOOTER' => Hook::exec('displayFooter'),
 		));
 		$this->context->smarty->display(_PS_THEME_DIR_.'footer.tpl');
 	}
@@ -652,7 +652,7 @@ class FrontControllerCore extends Controller
 	public function initFooter()
 	{
 		$this->context->smarty->assign(array(
-			'HOOK_FOOTER' => Hook::exec('footer'),
+			'HOOK_FOOTER' => Hook::exec('displayFooter'),
 		));
 
 	}
diff --git a/classes/Module.php b/classes/Module.php
index eb1a8a66d..ae0244542 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -1135,7 +1135,7 @@ abstract class ModuleCore
 	public static function hookExecPayment()
 	{
 		Tools::displayAsDeprecated();
-		return Hook::exec('payment');
+		return Hook::exec('displayPayment');
 	}
 
 
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 9048d273a..8185001a5 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -353,7 +353,14 @@ abstract class PaymentModuleCore extends Module
 					}
 
 					// Hook validate order
-					Hook::exec('newOrder', array('cart' => $cart, 'order' => $order, 'customer' => $customer, 'currency' => $currency, 'orderStatus' => $order_status));
+					Hook::exec('actionValidateOrder', array(
+						'cart' => $cart,
+						'order' => $order,
+						'customer' => $customer,
+						'currency' => $currency,
+						'orderStatus' => $order_status
+					));
+
 					foreach ($cart->getProducts() AS $product)
 						if ($order_status->logable)
 							ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']);
diff --git a/classes/Product.php b/classes/Product.php
index 221f96948..aaeb2c732 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -418,14 +418,14 @@ class ProductCore extends ObjectModel
 	{
 		if (!parent::add($autodate, $null_values))
 			return false;
-		Hook::exec('afterSaveProduct', array('id_product' => $this->id));
+		Hook::exec('actionProductSave', array('id_product' => $this->id));
 		return true;
 	}
 
 	public function update($null_values = false)
 	{
 		$return = parent::update($null_values);
-		Hook::exec('afterSaveProduct', array('id_product' => $this->id));
+		Hook::exec('actionProductSave', array('id_product' => $this->id));
 		return $return;
 	}
 
@@ -626,7 +626,7 @@ class ProductCore extends ObjectModel
 		if (!GroupReduction::deleteProductReduction($this->id))
 			return false;
 
-		Hook::exec('deleteProduct', array('product' => $this));
+		Hook::exec('actionProductDelete', array('product' => $this));
 		if (!parent::delete() ||
 			!$this->deleteCategories(true) ||
 			!$this->deleteImages() ||
@@ -1282,7 +1282,7 @@ class ProductCore extends ObjectModel
 			return false;
 
 		//if ($quantity)
-			Hook::exec('updateProductAttribute', array('id_product_attribute' => $id_product_attribute));
+			Hook::exec('actionProductAttributeUpdate', array('id_product_attribute' => $id_product_attribute));
 
 		Product::updateDefaultAttribute($this->id);
 
@@ -1322,7 +1322,7 @@ class ProductCore extends ObjectModel
 	*/
 	public function deleteProductAttributes()
 	{
-		Hook::exec('deleteProductAttribute', array('id_product_attribute' => 0, 'id_product' => $this->id, 'deleteAllAttributes' => true));
+		Hook::exec('actionProductAttributeDelete', array('id_product_attribute' => 0, 'id_product' => $this->id, 'deleteAllAttributes' => true));
 
 		$result = Db::getInstance()->execute('
 			DELETE FROM `'._DB_PREFIX_.'product_attribute_combination`
diff --git a/classes/Tools.php b/classes/Tools.php
index 5449b8f60..2f3c275d2 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1656,7 +1656,7 @@ FileETag INode MTime Size
 		fwrite($write_fd, "\n\n".trim($specific_after));
 		fclose($write_fd);
 
-		Hook::exec('afterCreateHtaccess');
+		Hook::exec('actionHtaccessCreate');
 
 		return true;
 	}
diff --git a/classes/order/OrderPayment.php b/classes/order/OrderPayment.php
index 2bd557976..b437cb3a5 100644
--- a/classes/order/OrderPayment.php
+++ b/classes/order/OrderPayment.php
@@ -66,7 +66,7 @@ class OrderPaymentCore extends ObjectModel
 	{
 		if (parent::add($autodate, $nullValues))
 		{
-			Hook::exec('paymentCCAdded', array('paymentCC' => $this));
+			Hook::exec('actionPaymentCCAdd', array('paymentCC' => $this));
 			return true;
 		}
 		return false;
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 86452875d..e1c06cc83 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -658,7 +658,7 @@ class AdminCustomersControllerCore extends AdminController
 			'messages' => $messages,
 
 			// Display hook specified to this page : AdminCustomers
-			'hook' => Hook::exec('adminCustomers', array('id_customer' => $customer->id)),
+			'hook' => Hook::exec('displayAdminCustomers', array('id_customer' => $customer->id)),
 
 			// Groups
 			'groups' => $groups,
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index 7c6f7d6ca..7ec595ad6 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -264,7 +264,7 @@ class AdminFeaturesControllerCore extends AdminController
 		$feature_value = new FeatureValue(Tools::getValue('id_feature_value'));
 
 		$this->tpl_vars = array(
-			'hook' => Hook::exec('featureValueForm', array('id_feature_value' => $feature_value->id))
+			'hook' => Hook::exec('displayFeatureValueForm', array('id_feature_value' => $feature_value->id))
 		);
 
 		$this->getlanguages();
@@ -350,8 +350,8 @@ class AdminFeaturesControllerCore extends AdminController
 
 		if (Tools::isSubmit('deletefeature_value') || Tools::isSubmit('submitAddfeature_value'))
 		{
-			Hook::exec('postProcessFeatureValue',
-				array('errors' => &$this->_errors)); // send _errors as reference to allow postProcessFeatureValue to stop saving process
+			Hook::exec('displayFeatureValuePostProcess',
+				array('errors' => &$this->_errors)); // send _errors as reference to allow displayFeatureValuePostProcess to stop saving process
 
 			if (Tools::isSubmit('deletefeature_value'))
 			{
@@ -407,8 +407,8 @@ class AdminFeaturesControllerCore extends AdminController
 		}
 		else
 		{
-			Hook::exec('postProcessFeature',
-				array('errors' => &$this->_errors)); // send _errors as reference to allow postProcessFeature to stop saving process
+			Hook::exec('displayFeaturePostProcess',
+				array('errors' => &$this->_errors)); // send _errors as reference to allow displayFeaturePostProcess to stop saving process
 
 			if (Tools::getValue('submitDel'.$this->table))
 			{
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index a2d86ad83..9ae6707b5 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -564,7 +564,7 @@ class AdminHomeControllerCore extends AdminController
 		$tpl_vars['last_orders'] =$this->getLastOrders();
 		$tpl_vars['tips_optimization'] =  $this->_displayOptimizationTips();
 
-		$HOOK_BACKOFFICEHOME = Hook::exec('backOfficeHome');
+		$HOOK_BACKOFFICEHOME = Hook::exec('displayBackOfficeHome');
 		$tpl_vars['HOOK_BACKOFFICEHOME'] = $HOOK_BACKOFFICEHOME;
 		$smarty->assign($tpl_vars);
 
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 33f6f447a..6934d00ea 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -784,7 +784,7 @@ class AdminImportControllerCore extends AdminController
 				imageResize($tmpfile, $path.'-'.stripslashes($image_type['name']).$theme.'.jpg', $image_type['width'], $image_type['height']);
 			}
 			if (in_array($image_type['id_image_type'], $watermark_types))
-				Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_entity));
+				Hook::exec('actionWatermark', array('id_image' => $id_image, 'id_product' => $id_entity));
 		}
 		else
 		{
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
index 10ba841e5..0a61235d2 100644
--- a/controllers/admin/AdminMetaController.php
+++ b/controllers/admin/AdminMetaController.php
@@ -208,7 +208,7 @@ class AdminMetaControllerCore extends AdminController
 					else
 						$_POST['url_rewrite_'.$lang['id_lang']] = Tools::getValue('url_rewrite_1');
 			}
-			Hook::exec('afterSaveAdminMeta');
+			Hook::exec('actionAdminMetaSave');
 		}
 
 		return parent::postProcess();
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index fc6c01e7a..339f38e01 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -478,7 +478,7 @@ class AdminOrdersControllerCore extends AdminController
 							$orderDetail = new OrderDetail((int)($id_order_detail));
 							if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct))
 								$this->_errors[] = Tools::displayError('An error occurred during deletion of the product.').' <span class="bold">'.$orderDetail->product_name.'</span>';
-							Hook::exec('cancelProduct', array('order' => $order, 'id_order_detail' => $id_order_detail));
+							Hook::exec('actionProductCancel', array('order' => $order, 'id_order_detail' => $id_order_detail));
 						}
 					if (!sizeof($this->_errors) AND $customizationList)
 						foreach ($customizationList AS $id_customization => $id_order_detail)
@@ -504,7 +504,7 @@ class AdminOrdersControllerCore extends AdminController
 							$this->_errors[] = Tools::displayError('Cannot generate credit slip');
 						else
 						{
-							Hook::exec('orderSlip', array('order' => $order, 'productList' => $full_product_list, 'qtyList' => $full_quantity_list));
+							Hook::exec('actionOrderSlipAdd', array('order' => $order, 'productList' => $full_product_list, 'qtyList' => $full_quantity_list));
 							@Mail::Send((int)$order->id_lang, 'credit_slip', Mail::l('New credit slip regarding your order', $order->id_lang),
 							$params, $customer->email, $customer->firstname.' '.$customer->lastname, NULL, NULL, NULL, NULL,
 							_PS_MAIL_DIR_, true);
@@ -1044,8 +1044,8 @@ class AdminOrdersControllerCore extends AdminController
 			'invoices_collection' => $order->getInvoicesCollection(),
 			'not_paid_invoices_collection' => $order->getNotPaidInvoicesCollection(),
 			'payment_methods' => $payment_methods,
-			'HOOK_INVOICE' => Hook::exec('invoice', array('id_order' => $order->id)),
-			'HOOK_ADMIN_ORDER' => Hook::exec('adminOrder', array('id_order' => $order->id))
+			'HOOK_INVOICE' => Hook::exec('displayInvoice', array('id_order' => $order->id)),
+			'HOOK_ADMIN_ORDER' => Hook::exec('displayAdminOrder', array('id_order' => $order->id))
 		);
 
 		return parent::renderView();
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 0340ed4d1..adc740eda 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -438,7 +438,7 @@ class AdminProductsControllerCore extends AdminController
 					$this->_errors[] = Tools::displayError('An error occurred while copying images.');
 				else
 				{
-					Hook::exec('addProduct', array('product' => $product));
+					Hook::exec('actionProductAdd', array('product' => $product));
 					Search::indexation(false, $product->id);
 					$this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=19&token='.($token ? $token : $this->token);
 				}
@@ -611,7 +611,7 @@ class AdminProductsControllerCore extends AdminController
 									if (!$product->addStockMvt(Tools::getValue('attribute_mvt_quantity'), $id_reason, $id_product_attribute, null, $this->context->employee->id))
 										$this->_errors[] = Tools::displayError('An error occurred while updating qty.');
 								}
-								Hook::exec('updateProductAttribute', array('id_product_attribute' => (int)$id_product_attribute));
+								Hook::exec('actionProductAttributeUpdate', array('id_product_attribute' => (int)$id_product_attribute));
 								$this->updateDownloadProduct($product, 1, $id_product_attribute);
 							}
 							else
@@ -1383,7 +1383,7 @@ class AdminProductsControllerCore extends AdminController
 			}
 
 			@unlink($tmpName);
-			Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
+			Hook::exec('actionWatermark', array('id_image' => $id_image, 'id_product' => $id_product));
 		}
 	}
 
@@ -1415,7 +1415,7 @@ class AdminProductsControllerCore extends AdminController
 					$this->_errors[] = Tools::displayError('An error occurred while adding tags.');
 				else
 				{
-					Hook::exec('addProduct', array('product' => $object));
+					Hook::exec('actionProductAdd', array('product' => $object));
 					Search::indexation(false, $object->id);
 				}
 
@@ -1498,7 +1498,7 @@ class AdminProductsControllerCore extends AdminController
 					else
 					{
 						//self::$currentIndex .= '&image_updated='.$id_image;
-						Hook::exec('updateProduct', array('product' => $object));
+						Hook::exec('actionProductUpdate', array('product' => $object));
 						Search::indexation(false, $object->id);
 						//if (Tools::getValue('resizer') == 'man' && isset($id_image) && is_int($id_image) && $id_image)
 						//	$this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&edit='.strval(Tools::getValue('productCreated')).'&id_image='.$id_image.'&imageresize&toconf=4&submitAddAndStay='.((Tools::isSubmit('submitAdd'.$this->table.'AndStay') || Tools::getValue('productCreated') == 'on') ? 'on' : 'off').'&token='.(($token ? $token : $this->token));
diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php
index 4f8902ffd..fbc70da43 100644
--- a/controllers/admin/AdminStatsTabController.php
+++ b/controllers/admin/AdminStatsTabController.php
@@ -165,7 +165,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
 				$module_instance = Module::getInstanceByName($module_name);
 
 			if ($module_instance && $module_instance->active)
-				$hook = Hook::exec('AdminStatsModules', NULL, $module_instance->id);
+				$hook = Hook::exec('displayAdminStatsModules', null, $module_instance->id);
 		}
 
 		$tpl->assign(array(
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index f13ee2509..09dee369d 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -125,8 +125,8 @@ class AuthControllerCore extends FrontController
 
 		// Call a hook to display more information on form
 		$this->context->smarty->assign(array(
-			'HOOK_CREATE_ACCOUNT_FORM' => Hook::exec('createAccountForm'),
-			'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('createAccountTop')
+			'HOOK_CREATE_ACCOUNT_FORM' => Hook::exec('displayCustomerAccountForm'),
+			'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('displayCustomerAccountFormTop')
 		));
 		
 		if ($this->ajax)
@@ -260,7 +260,7 @@ class AuthControllerCore extends FrontController
 	 */
 	protected function processSubmitLogin()
 	{
-		Hook::exec('beforeAuthentication');
+		Hook::exec('actionBeforeAuthentication');
 		$passwd = trim(Tools::getValue('passwd'));
 		$email = trim(Tools::getValue('email'));
 		if (empty($email))
@@ -319,7 +319,7 @@ class AuthControllerCore extends FrontController
 				$this->context->cart->update();
 				$this->context->cart->autosetProductAddress();
 
-				Hook::exec('authentication');
+				Hook::exec('actionAuthentication');
 
 				// Login information have changed, so we check if the cart rules still apply
 				CartRule::autoRemoveFromCart();
@@ -411,7 +411,7 @@ class AuthControllerCore extends FrontController
 						$this->updateContext($customer);
 
 						$this->context->cart->update();
-						Hook::exec('createAccount', array(
+						Hook::exec('actionCustomerAccountAdd', array(
 							'_POST' => $_POST,
 							'newCustomer' => $customer
 						));
@@ -546,7 +546,7 @@ class AuthControllerCore extends FrontController
 
 							// If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated
 							$this->context->cart->update();
-							Hook::exec('createAccount', array(
+							Hook::exec('actionCustomerAccountAdd', array(
 								'_POST' => $_POST,
 								'newCustomer' => $customer
 							));
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index f12a838e5..8a2b1b4a4 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -268,12 +268,12 @@ class CartControllerCore extends FrontController
 					$deliveryAddress = new Address($this->context->cart->id_address_delivery);
 				$id_country = (isset($deliveryAddress) && $deliveryAddress->id) ? $deliveryAddress->id_country : Configuration::get('PS_COUNTRY_DEFAULT');
 
-				$result['HOOK_EXTRACARRIER'] = Hook::exec('extraCarrier', array('address' => (isset($deliveryAddress) && (int)$deliveryAddress->id) ? $deliveryAddress : null));
+				$result['HOOK_EXTRACARRIER'] = Hook::exec('displayCarrierList', array('address' => (isset($deliveryAddress) && (int)$deliveryAddress->id) ? $deliveryAddress : null));
 			}
 			$result['summary'] = $this->context->cart->getSummaryDetails();
 			$result['customizedDatas'] = Product::getAllCustomizedDatas($this->context->cart->id, null, true);
-			$result['HOOK_SHOPPING_CART'] = Hook::exec('shoppingCart', $result['summary']);
-			$result['HOOK_SHOPPING_CART_EXTRA'] = Hook::exec('shoppingCartExtra', $result['summary']);
+			$result['HOOK_SHOPPING_CART'] = Hook::exec('displayShoppingCartFooter', $result['summary']);
+			$result['HOOK_SHOPPING_CART_EXTRA'] = Hook::exec('displayShoppingCart', $result['summary']);
 
 			// Display reduced price (or not) without quantity discount
 			if (Tools::getIsset('getproductprice'))
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index c88f79e61..df5a4162d 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -162,7 +162,7 @@ class CategoryControllerCore extends FrontController
 	public function assignProductList()
 	{
 		$hookExecuted = false;
-		Hook::exec('productListAssign', array(
+		Hook::exec('actionProductListOverride', array(
 			'nbProducts' => &$this->nbProducts,
 			'catProducts' => &$this->cat_products,
 			'hookExecuted' => &$hookExecuted,
diff --git a/controllers/front/CompareController.php b/controllers/front/CompareController.php
index d42b51112..0988eaf55 100644
--- a/controllers/front/CompareController.php
+++ b/controllers/front/CompareController.php
@@ -146,7 +146,7 @@ class CompareControllerCore extends FrontController
 						'width' => $width,
 						'homeSize' => Image::getSize('home')
 					));
-					$this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('extraProductComparison', array('list_ids_product' => $ids)));
+					$this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids)));
 				}
 			}
 		}
diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index 6072413eb..826925b53 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -157,8 +157,8 @@ class GuestTrackingControllerCore extends FrontController
 			'deliveryAddressFormatedValues' => $deliveryAddressFormatedValues));
 		if ($carrier->url && $order->shipping_number)
 			$this->context->smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url));
-		$this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Hook::exec('orderDetailDisplayed', array('order' => $order)));
-		Hook::exec('OrderDetail', array('carrier' => $carrier, 'order' => $order));
+		$this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Hook::exec('displayOrderDetail', array('order' => $order)));
+		Hook::exec('actionOrderDetail', array('carrier' => $carrier, 'order' => $order));
 	}
 
 	public function setMedia()
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index eadb3f705..607574080 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -192,8 +192,8 @@ class OrderDetailControllerCore extends FrontController
 				));
 				if ($carrier->url && $order->shipping_number)
 					$this->context->smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url));
-				$this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Hook::exec('orderDetailDisplayed', array('order' => $order)));
-				Hook::exec('OrderDetail', array('carrier' => $carrier, 'order' => $order));
+				$this->context->smarty->assign('HOOK_ORDERDETAILDISPLAYED', Hook::exec('displayOrderDetail', array('order' => $order)));
+				Hook::exec('actionOrderDetail', array('carrier' => $carrier, 'order' => $order));
 
 				unset($carrier, $addressInvoice, $addressDelivery);
 			}
diff --git a/controllers/front/OrderFollowController.php b/controllers/front/OrderFollowController.php
index 3d6be67fe..e97c52144 100644
--- a/controllers/front/OrderFollowController.php
+++ b/controllers/front/OrderFollowController.php
@@ -67,7 +67,7 @@ class OrderFollowControllerCore extends FrontController
 			$orderReturn->state = 1;
 			$orderReturn->add();
 			$orderReturn->addReturnDetail($ids_order_detail, $order_qte_input, $customizationIds, $customizationQtyInput);
-			Hook::exec('orderReturn', array('orderReturn' => $orderReturn));
+			Hook::exec('actionOrderReturn', array('orderReturn' => $orderReturn));
 			Tools::redirect('index.php?controller=order-follow');
 		}
 	}
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 269c04918..850d847d5 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -70,7 +70,7 @@ class OrderOpcControllerCore extends ParentOrderController
 								{
 									$return = array(
 										'summary' => $this->context->cart->getSummaryDetails(),
-										'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
+										'HOOK_TOP_PAYMENT' => Hook::exec('displayPaymentTop'),
 										'HOOK_PAYMENT' => $this->_getPaymentMethods(),
 										'carrier_data' => $this->_getCarrierList(),
 									);
@@ -88,7 +88,7 @@ class OrderOpcControllerCore extends ParentOrderController
 							{
 								$this->context->cookie->checkedTOS = (int)(Tools::getValue('checked'));
 								die(Tools::jsonEncode(array(
-									'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
+									'HOOK_TOP_PAYMENT' => Hook::exec('displayPaymentTop'),
 									'HOOK_PAYMENT' => $this->_getPaymentMethods()
 								)));
 							}
@@ -141,7 +141,7 @@ class OrderOpcControllerCore extends ParentOrderController
 									'order_opc_adress' => $this->context->smarty->fetch(_PS_THEME_DIR_.'order-address.tpl'),
 									'block_user_info' => (isset($blockUserInfo) ? $blockUserInfo->hookTop(array()) : ''),
 									'carrier_data' => $this->_getCarrierList(),
-									'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
+									'HOOK_TOP_PAYMENT' => Hook::exec('displayPaymentTop'),
 									'HOOK_PAYMENT' => $this->_getPaymentMethods(),
 									'no_address' => 0,
 									'gift_price' => Tools::displayPrice(Tools::convertPrice(Product::getTaxCalculationMethod() == 1 ? $wrapping_fees : $wrapping_fees_tax_inc, new Currency((int)($this->context->cookie->id_currency))))
@@ -194,7 +194,7 @@ class OrderOpcControllerCore extends ParentOrderController
 										$wrapping_fees_tax_inc = $wrapping_fees * (1 + (((float)($wrapping_fees_tax->rate) / 100)));
 										$result = array_merge($result, array(
 											'summary' => $this->context->cart->getSummaryDetails(),
-											'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
+											'HOOK_TOP_PAYMENT' => Hook::exec('displayPaymentTop'),
 											'HOOK_PAYMENT' => $this->_getPaymentMethods(),
 											'gift_price' => Tools::displayPrice(Tools::convertPrice(Product::getTaxCalculationMethod() == 1 ? $wrapping_fees : $wrapping_fees_tax_inc, new Currency((int)($this->context->cookie->id_currency)))),
 											'carrier_data' => $this->_getCarrierList()
@@ -287,8 +287,8 @@ class OrderOpcControllerCore extends ParentOrderController
 		));
 		/* Call a hook to display more information on form */
 		self::$smarty->assign(array(
-			'HOOK_CREATE_ACCOUNT_FORM' => Hook::exec('createAccountForm'),
-			'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('createAccountTop')
+			'HOOK_CREATE_ACCOUNT_FORM' => Hook::exec('displayCustomerAccountForm'),
+			'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('displayCustomerAccountFormTop')
 		));
 		$years = Tools::dateYears();
 		$months = Tools::dateMonths();
@@ -362,7 +362,7 @@ class OrderOpcControllerCore extends ParentOrderController
 			$carriers = $this->context->cart->simulateCarriersOutput();
 			$this->context->smarty->assign(array(
 				'HOOK_EXTRACARRIER' => NULL,
-				'HOOK_BEFORECARRIER' => Hook::exec('beforeCarrier', array(
+				'HOOK_BEFORECARRIER' => Hook::exec('displayBeforeCarrier', array(
 					'carriers' => $carriers,
 					'checked' => $this->context->cart->simulateCarrierSelectedOutput(),
 					'delivery_option_list' => $this->context->cart->getDeliveryOptionList(),
@@ -377,7 +377,7 @@ class OrderOpcControllerCore extends ParentOrderController
 	protected function _assignPayment()
 	{
 		$this->context->smarty->assign(array(
-			'HOOK_TOP_PAYMENT' => ($this->isLogged ? Hook::exec('paymentTop') : ''),
+			'HOOK_TOP_PAYMENT' => ($this->isLogged ? Hook::exec('displayPaymentTop') : ''),
 			'HOOK_PAYMENT' => $this->_getPaymentMethods()
 		));
 	}
@@ -424,7 +424,7 @@ class OrderOpcControllerCore extends ParentOrderController
 		if ($this->context->cart->getOrderTotal() <= 0)
 			return '<p class="center"><input type="button" class="exclusive_large" name="confirmOrder" id="confirmOrder" value="'.Tools::displayError('I confirm my order').'" onclick="confirmFreeOrder();" /></p>';
 
-		$return = Hook::exec('payment');
+		$return = Hook::exec('displayPayment');
 		if (!$return)
 			return '<p class="warning">'.Tools::displayError('No payment method is available').'</p>';
 		return $return;
@@ -470,13 +470,13 @@ class OrderOpcControllerCore extends ParentOrderController
 		else
 		{
 			$result = array(
-				'HOOK_BEFORECARRIER' => Hook::exec('beforeCarrier', array(
+				'HOOK_BEFORECARRIER' => Hook::exec('displayBeforeCarrier', array(
 					'carriers' => $carriers,
 					'delivery_option_list' => $this->context->cart->getDeliveryOptionList(),
 					'delivery_option' => $this->context->cart->getDeliveryOption()
 				)),
 				'carrier_block' => $this->context->smarty->fetch(_PS_THEME_DIR_.'order-carrier.tpl'),
-				'HOOK_EXTRACARRIER' => Hook::exec('extraCarrier', array('address' => $address_delivery))
+				'HOOK_EXTRACARRIER' => Hook::exec('displayCarrierList', array('address' => $address_delivery))
 			);
 			return $result;
 		}
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index d49977b73..4b73911a3 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -236,7 +236,7 @@ class ParentOrderControllerCore extends FrontController
 			}
 		}
 
-		Hook::exec('processCarrier', array('cart' => $this->context->cart));
+		Hook::exec('actionCarrierProcess', array('cart' => $this->context->cart));
 
 		if (!$this->context->cart->update())
 			return false;
@@ -309,10 +309,12 @@ class ParentOrderControllerCore extends FrontController
 			'currencySign' => $this->context->currency->sign,
 			'currencyRate' => $this->context->currency->conversion_rate,
 			'currencyFormat' => $this->context->currency->format,
-			'currencyBlank' => $this->context->currency->blank));
+			'currencyBlank' => $this->context->currency->blank,
+		));
+
 		$this->context->smarty->assign(array(
-			'HOOK_SHOPPING_CART' => Hook::exec('shoppingCart', $summary),
-			'HOOK_SHOPPING_CART_EXTRA' => Hook::exec('shoppingCartExtra', $summary)
+			'HOOK_SHOPPING_CART' => Hook::exec('displayShoppingCartFooter', $summary),
+			'HOOK_SHOPPING_CART_EXTRA' => Hook::exec('displayShoppingCart', $summary)
 		));
 	}
 
@@ -405,8 +407,8 @@ class ParentOrderControllerCore extends FrontController
 			'delivery_option' => $this->context->cart->getDeliveryOption()
 		));
 		$this->context->smarty->assign(array(
-			'HOOK_EXTRACARRIER' => Hook::exec('extraCarrier', array('address' => $address)),
-			'HOOK_BEFORECARRIER' => Hook::exec('beforeCarrier', array(
+			'HOOK_EXTRACARRIER' => Hook::exec('displayCarrierList', array('address' => $address)),
+			'HOOK_BEFORECARRIER' => Hook::exec('displayBeforeCarrier', array(
 				'carriers' => $carriers,
 				'checked' => $checked,
 				'delivery_option_list' => $delivery_option_list,
@@ -451,8 +453,8 @@ class ParentOrderControllerCore extends FrontController
 	protected function _assignPayment()
 	{
 		$this->context->smarty->assign(array(
-			'HOOK_TOP_PAYMENT' => Hook::exec('paymentTop'),
-			'HOOK_PAYMENT' => Hook::exec('payment'),
+			'HOOK_TOP_PAYMENT' => Hook::exec('displayPaymentTop'),
+			'HOOK_PAYMENT' => Hook::exec('displayPayment'),
 		));
 	}
 
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 6ebd21fa9..33f567e17 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -178,12 +178,12 @@ class ProductControllerCore extends FrontController
 				'attachments' => (($this->product->cache_has_attachments) ? $this->product->getAttachments($this->context->language->id) : array()),
 				'allow_oosp' => $this->product->isAvailableWhenOutOfStock((int)$this->product->out_of_stock),
 				'last_qties' =>  (int)Configuration::get('PS_LAST_QTIES'),
-				'HOOK_EXTRA_LEFT' => Hook::exec('extraLeft'),
-				'HOOK_EXTRA_RIGHT' => Hook::exec('extraRight'),
-				'HOOK_PRODUCT_OOS' => Hook::exec('productOutOfStock', array('product' => $this->product)),
-				'HOOK_PRODUCT_ACTIONS' => Hook::exec('productActions'),
-				'HOOK_PRODUCT_TAB' =>  Hook::exec('productTab'),
-				'HOOK_PRODUCT_TAB_CONTENT' =>  Hook::exec('productTabContent'),
+				'HOOK_EXTRA_LEFT' => Hook::exec('displayLeftColumnProduct'),
+				'HOOK_EXTRA_RIGHT' => Hook::exec('displayRightColumnProduct'),
+				'HOOK_PRODUCT_OOS' => Hook::exec('actionProductOutOfStock', array('product' => $this->product)),
+				'HOOK_PRODUCT_ACTIONS' => Hook::exec('displayProductButtons'),
+				'HOOK_PRODUCT_TAB' =>  Hook::exec('displayProductTab'),
+				'HOOK_PRODUCT_TAB_CONTENT' =>  Hook::exec('displayProductTabContent'),
 				'display_qties' => (int)Configuration::get('PS_DISPLAY_QTIES'),
 				'display_ht' => !Tax::excludeTaxeOption(),
 				'currencySign' => $this->context->currency->sign,
@@ -437,7 +437,7 @@ class ProductControllerCore extends FrontController
 			$this->context->smarty->assign('path', Tools::getPath((int)$this->product->id_category_default, $this->product->name));
 
 		$this->context->smarty->assign('categories', Category::getHomeCategories($this->context->language->id));
-		$this->context->smarty->assign(array('HOOK_PRODUCT_FOOTER' => Hook::exec('productFooter', array('product' => $this->product, 'category' => $category))));
+		$this->context->smarty->assign(array('HOOK_PRODUCT_FOOTER' => Hook::exec('displayFooterProduct', array('product' => $this->product, 'category' => $category))));
 	}
 
 	public function transformDescriptionWithImg($desc)
diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php
index 8e85bba2f..f45cd8b90 100644
--- a/controllers/front/SearchController.php
+++ b/controllers/front/SearchController.php
@@ -64,7 +64,7 @@ class SearchControllerCore extends FrontController
 			$this->n = abs((int)(Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE'))));
 			$this->p = abs((int)(Tools::getValue('p', 1)));
 			$search = Search::find($this->context->language->id, $query, $this->p, $this->n, $this->orderBy, $this->orderWay);
-			Hook::exec('search', array('expr' => $query, 'total' => $search['total']));
+			Hook::exec('actionSearch', array('expr' => $query, 'total' => $search['total']));
 			$nbProducts = $search['total'];
 			$this->pagination($nbProducts);
 			$this->context->smarty->assign(array(
@@ -81,7 +81,7 @@ class SearchControllerCore extends FrontController
 			$this->n = abs((int)(Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE'))));
 			$this->p = abs((int)(Tools::getValue('p', 1)));
 			$search = Search::find($this->context->language->id, $query, $this->p, $this->n, $this->orderBy, $this->orderWay);
-			Hook::exec('search', array('expr' => $query, 'total' => $search['total']));
+			Hook::exec('actionSearch', array('expr' => $query, 'total' => $search['total']));
 			$nbProducts = $search['total'];
 			$this->pagination($nbProducts);
 			$this->context->smarty->assign(array(
@@ -96,7 +96,7 @@ class SearchControllerCore extends FrontController
 			$nbProducts = (int)(Search::searchTag($this->context->language->id, $tag, true));
 			$this->pagination($nbProducts);
 			$result = Search::searchTag($this->context->language->id, $tag, false, $this->p, $this->n, $this->orderBy, $this->orderWay);
-			Hook::exec('search', array('expr' => $tag, 'total' => count($result)));
+			Hook::exec('actionSearch', array('expr' => $tag, 'total' => count($result)));
 			$this->context->smarty->assign(array(
 				'search_tag' => $tag,
 				'products' => $result, // DEPRECATED (since to 1.4), not use this: conflict with block_cart module