diff --git a/app/Http/Controllers/Bo/ContactMessagesController.php b/app/Http/Controllers/Bo/ContactMessagesController.php
index ccc8004..637f380 100644
--- a/app/Http/Controllers/Bo/ContactMessagesController.php
+++ b/app/Http/Controllers/Bo/ContactMessagesController.php
@@ -64,7 +64,7 @@ class ContactMessagesController extends Controller
         $contact->done = true;
         if ($contact->saveOrFail()) {
             return response()->redirectToRoute('bo.contacts.index')->with(
-                'success',
+                'bo.success',
                 trans('Le message à été marqué comme traité')
             );
         }
@@ -82,7 +82,7 @@ class ContactMessagesController extends Controller
         if ($contact->deleteOrFail()) {
             return redirect()
                 ->route('bo.contacts.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => __('Message de contact')]
                 ));
diff --git a/app/Http/Controllers/Bo/DeliveryModeController.php b/app/Http/Controllers/Bo/DeliveryModeController.php
index 1a815c4..a197a04 100644
--- a/app/Http/Controllers/Bo/DeliveryModeController.php
+++ b/app/Http/Controllers/Bo/DeliveryModeController.php
@@ -49,7 +49,7 @@ class DeliveryModeController extends Controller
         $deliveryMode->fill($request->validated());
         if ($deliveryMode->saveOrFail()) {
             return redirect()->back()
-                ->with('success', trans(
+                ->with('bo.success', trans(
                     ':model a été mis à jour',
                     ['model' => Str::singular(trans('models.classes.delivery_modes'))]
                 ));
diff --git a/app/Http/Controllers/Bo/DiscountController.php b/app/Http/Controllers/Bo/DiscountController.php
index af117e6..80e39ee 100644
--- a/app/Http/Controllers/Bo/DiscountController.php
+++ b/app/Http/Controllers/Bo/DiscountController.php
@@ -94,7 +94,7 @@ class DiscountController extends Controller
                 $discount->saveOrFail();
                 return redirect()
                     ->route('bo.discounts.edit', $discount)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.discounts'))]
                     ));
@@ -141,7 +141,7 @@ class DiscountController extends Controller
             if ($discount->saveOrFail()) {
                 return redirect()
                     ->route('bo.discounts.edit', $discount)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.discounts'))]
                     ));
@@ -161,7 +161,7 @@ class DiscountController extends Controller
         if ($discount->deleteOrFail()) {
             return redirect()
                 ->route('bo.discounts.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.discounts'))]
                 ));
diff --git a/app/Http/Controllers/Bo/GeneralConfigController.php b/app/Http/Controllers/Bo/GeneralConfigController.php
index 875bed1..4ff19e7 100644
--- a/app/Http/Controllers/Bo/GeneralConfigController.php
+++ b/app/Http/Controllers/Bo/GeneralConfigController.php
@@ -46,6 +46,6 @@ class GeneralConfigController extends Controller
         ));
         $config->saveOrFail();
         return redirect()->route('bo.general_configs.edit', $config)
-            ->with('success', 'Enregistré !');
+            ->with('bo.success', 'Enregistré !');
     }
 }
diff --git a/app/Http/Controllers/Bo/OrderController.php b/app/Http/Controllers/Bo/OrderController.php
index 0270cab..a0b3622 100644
--- a/app/Http/Controllers/Bo/OrderController.php
+++ b/app/Http/Controllers/Bo/OrderController.php
@@ -100,12 +100,12 @@ class OrderController extends Controller
                 case ValidationStatus::validated()->value:
                 case ValidationStatus::cancelled()->value:
                     $order->saveOrFail();
-                    return \back()->with('success', trans(
+                    return \back()->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.orders'))]
                     ));
                 case ValidationStatus::pending()->value:
-                    return \back()->with('errors', \trans('Il faut choisir un statut pour cette commande.'));
+                    return \back()->with('bo.errors', \trans('Il faut choisir un statut pour cette commande.'));
                 default:
                     throw new \RuntimeException("Unhandled status `{$request->validation_status}`");
             }
@@ -143,12 +143,12 @@ class OrderController extends Controller
                 case DeliveryStatus::preparation()->value:
                 case DeliveryStatus::ready()->value:
                     $order->saveOrFail();
-                    return \back()->with('success', trans(
+                    return \back()->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.orders'))]
                     ));
                 case DeliveryStatus::pending()->value:
-                    return \back()->with('errors', \trans('Il faut choisir un statut pour cette commande.'));
+                    return \back()->with('bo.errors', \trans('Il faut choisir un statut pour cette commande.'));
                 default:
                     throw new \RuntimeException("Unhandled status `{$request->delivery_status}`");
             }//end switch
diff --git a/app/Http/Controllers/Bo/PaymentModeController.php b/app/Http/Controllers/Bo/PaymentModeController.php
index e96111e..5116a08 100644
--- a/app/Http/Controllers/Bo/PaymentModeController.php
+++ b/app/Http/Controllers/Bo/PaymentModeController.php
@@ -52,7 +52,7 @@ class PaymentModeController extends Controller
         ));
         if ($paymentMode->saveOrFail()) {
             return redirect()->back()
-                ->with('success', trans(
+                ->with('bo.success', trans(
                     ':model a été mis à jour',
                     ['model' => Str::singular(trans('models.classes.payment_modes'))]
                 ));
diff --git a/app/Http/Controllers/Bo/ProductController.php b/app/Http/Controllers/Bo/ProductController.php
index b4134e1..6614ecc 100644
--- a/app/Http/Controllers/Bo/ProductController.php
+++ b/app/Http/Controllers/Bo/ProductController.php
@@ -162,7 +162,7 @@ class ProductController extends Controller
                 $product->saveOrFail();
                 return redirect()
                     ->route('bo.products.edit', $product)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.products'))]
                     ));
@@ -221,7 +221,7 @@ class ProductController extends Controller
             if ($product->saveOrFail()) {
                 return redirect()
                     ->route('bo.products.edit', $product)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.products'))]
                     ));
@@ -241,7 +241,7 @@ class ProductController extends Controller
         if ($product->deleteOrFail()) {
             return redirect()
                 ->route('bo.products.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.products'))]
                 ));
@@ -267,7 +267,7 @@ class ProductController extends Controller
         $product->xmlInco()->associate($xml_inco);
         $product->saveOrFail();
         return redirect()->route('bo.products.edit', $product)
-            ->with('success', trans(
+            ->with('bo.success', trans(
                 ':model est associé avec fiche inco \':incoId\' \':descriptif\'',
                 [
                     'model' => Str::singular(trans('models.classes.slides')),
diff --git a/app/Http/Controllers/Bo/RangeController.php b/app/Http/Controllers/Bo/RangeController.php
index c32b928..4790c8b 100644
--- a/app/Http/Controllers/Bo/RangeController.php
+++ b/app/Http/Controllers/Bo/RangeController.php
@@ -70,7 +70,7 @@ class RangeController extends Controller
             if ($range->saveOrFail()) {
                 return redirect()
                     ->route('bo.ranges.edit', $range)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.ranges'))]
                     ));
@@ -106,7 +106,7 @@ class RangeController extends Controller
             if ($range->saveOrFail()) {
                 return redirect()
                     ->route('bo.ranges.edit', $range)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.ranges'))]
                     ));
@@ -131,7 +131,7 @@ class RangeController extends Controller
         if ($range->deleteOrFail()) {
             return redirect()
                 ->route('bo.ranges.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.ranges'))]
                 ));
diff --git a/app/Http/Controllers/Bo/ShopController.php b/app/Http/Controllers/Bo/ShopController.php
index 7f3990b..cc54aea 100644
--- a/app/Http/Controllers/Bo/ShopController.php
+++ b/app/Http/Controllers/Bo/ShopController.php
@@ -74,7 +74,7 @@ class ShopController extends Controller
             if ($shop->saveOrFail()) {
                 return redirect()
                     ->route('bo.shops.edit', $shop)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.shops'))]
                     ));
@@ -112,7 +112,7 @@ class ShopController extends Controller
             if ($shop->saveOrFail()) {
                 return redirect()
                     ->route('bo.shops.edit', $shop)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.shops'))]
                     ));
@@ -136,7 +136,7 @@ class ShopController extends Controller
         if ($shop->deleteOrFail()) {
             return redirect()
                 ->route('bo.shops.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.shops'))]
                 ));
diff --git a/app/Http/Controllers/Bo/SlideController.php b/app/Http/Controllers/Bo/SlideController.php
index 64bb88e..16b9597 100644
--- a/app/Http/Controllers/Bo/SlideController.php
+++ b/app/Http/Controllers/Bo/SlideController.php
@@ -67,7 +67,7 @@ class SlideController extends Controller
             if ($slide->saveOrFail()) {
                 return redirect()
                     ->route('bo.slides.edit', $slide)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.slides'))]
                     ));
@@ -103,7 +103,7 @@ class SlideController extends Controller
             if ($slide->saveOrFail()) {
                 return redirect()
                     ->route('bo.slides.edit', $slide)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => Str::singular(trans('models.classes.slides'))]
                     ));
@@ -123,7 +123,7 @@ class SlideController extends Controller
         if ($slide->deleteOrFail()) {
             return redirect()
                 ->route('bo.slides.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.slides'))]
                 ));
diff --git a/app/Http/Controllers/Bo/StaticPageController.php b/app/Http/Controllers/Bo/StaticPageController.php
index b51a9c2..0506b53 100644
--- a/app/Http/Controllers/Bo/StaticPageController.php
+++ b/app/Http/Controllers/Bo/StaticPageController.php
@@ -73,7 +73,7 @@ class StaticPageController extends Controller
                         \App\Models\Site\StaticPage::getBoRouteForType($static_page->type, 'edit') ??
                             route('bo.static_pages.edit', $static_page->id)
                     )
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.static_pages'))]
                     ));
@@ -107,7 +107,7 @@ class StaticPageController extends Controller
                 $static_page->fill($request->validated());
             } catch (\ErrorException $e) {
                 return back()
-                    ->with('danger', trans(
+                    ->with('bo.danger', trans(
                         ':model n\'a pas pu être enregistré car l\'image n\'a pu être transférée.',
                         ['model' => Str::singular(trans('models.classes.pages'))]
                     ));
@@ -119,7 +119,7 @@ class StaticPageController extends Controller
                         \App\Models\Site\StaticPage::getBoRouteForType($static_page->type, 'edit') ??
                             route('bo.static_pages.edit', $static_page->id)
                     )
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été mis à jour',
                         ['model' => trans('Page')]
                     ));
@@ -139,7 +139,7 @@ class StaticPageController extends Controller
         if ($static_page->deleteOrFail()) {
             return redirect()
                 ->route('bo.static_pages.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.static_pages'))]
                 ));
diff --git a/app/Http/Controllers/Bo/TagController.php b/app/Http/Controllers/Bo/TagController.php
index 123466a..5ccc1da 100644
--- a/app/Http/Controllers/Bo/TagController.php
+++ b/app/Http/Controllers/Bo/TagController.php
@@ -71,7 +71,7 @@ class TagController extends Controller
                 $tag->products()->sync($request->product_list);
                 return redirect()
                     ->route('bo.tags.edit', $tag)
-                    ->with('success', trans(
+                    ->with('bo.success', trans(
                         ':model a été créé',
                         ['model' => Str::singular(trans('models.classes.tags'))]
                     ));
@@ -112,7 +112,7 @@ class TagController extends Controller
      * Update the specified resource in storage.
      *
      * @param  \App\Http\Requests\Bo\Tags\UpdateTagRequest $request
-     * @param  \App\Models\Merchandise\Tag                             $tag
+     * @param  \App\Models\Merchandise\Tag                 $tag
      * @return \Illuminate\Http\Response
      */
     public function update(UpdateTagRequest $request, Tag $tag)
@@ -144,7 +144,7 @@ class TagController extends Controller
         if ($tag->deleteOrFail()) {
             return redirect()
                 ->route('bo.tags.index')
-                ->with('warning', trans(
+                ->with('bo.warning', trans(
                     ':model a bien été supprimé',
                     ['model' => Str::singular(trans('models.classes.tags'))]
                 ));
diff --git a/app/Http/Controllers/Bo/TimeslotController.php b/app/Http/Controllers/Bo/TimeslotController.php
index 543832d..8d7bd05 100644
--- a/app/Http/Controllers/Bo/TimeslotController.php
+++ b/app/Http/Controllers/Bo/TimeslotController.php
@@ -50,7 +50,7 @@ class TimeslotController extends Controller
             }
 
             return redirect()->route('bo.timeslots.settings', $shop)
-            ->with('success', 'Modifications enregistrées !');
+            ->with('bo.success', 'Modifications enregistrées !');
         });
     }
 }
diff --git a/app/Traits/Controllers/ChangesModelOrder.php b/app/Traits/Controllers/ChangesModelOrder.php
index a34b1fc..5c4276d 100644
--- a/app/Traits/Controllers/ChangesModelOrder.php
+++ b/app/Traits/Controllers/ChangesModelOrder.php
@@ -27,7 +27,7 @@ trait ChangesModelOrder
             $tmp = (\get_class($model))::where('order', $request->direction ? '<' : '>', $model->order)
                 ->orderBy('order', $request->direction ? 'DESC' : 'ASC')->first();
             if (!$tmp) {
-                return back()->with('error', trans('L\'ordre n\'a pas pu être modifié'));
+                return back()->with('bo.error', trans('L\'ordre n\'a pas pu être modifié'));
             }
             $oldOrder = $model->order;
             $newOrder = $tmp->order;