diff --git a/src/module-elasticsuite-core/Block/Adminhtml/Healthcheck/Healthcheck.php b/src/module-elasticsuite-core/Block/Adminhtml/Healthcheck/Healthcheck.php
index d9dae75a0..cb3c5f951 100644
--- a/src/module-elasticsuite-core/Block/Adminhtml/Healthcheck/Healthcheck.php
+++ b/src/module-elasticsuite-core/Block/Adminhtml/Healthcheck/Healthcheck.php
@@ -17,7 +17,7 @@
 use Magento\Backend\Block\Template;
 use Magento\Backend\Block\Template\Context;
 use Smile\ElasticsuiteCore\Api\Healthcheck\CheckInterface;
-use Smile\ElasticsuiteCore\Healthcheck\HealthcheckList;
+use Smile\ElasticsuiteCore\Model\Healthcheck\HealthcheckList;
 
 /**
  * Class Healthcheck.
diff --git a/src/module-elasticsuite-core/Model/Healthcheck/GhostIndicesCheck.php b/src/module-elasticsuite-core/Model/Healthcheck/GhostIndicesCheck.php
index 37fbe2b08..deea5db57 100644
--- a/src/module-elasticsuite-core/Model/Healthcheck/GhostIndicesCheck.php
+++ b/src/module-elasticsuite-core/Model/Healthcheck/GhostIndicesCheck.php
@@ -12,7 +12,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Healthcheck;
+namespace Smile\ElasticsuiteCore\Model\Healthcheck;
 
 use Exception;
 use Magento\Framework\UrlInterface;
diff --git a/src/module-elasticsuite-core/Model/Healthcheck/HealthcheckList.php b/src/module-elasticsuite-core/Model/Healthcheck/HealthcheckList.php
index 5f0573d4c..66db18651 100644
--- a/src/module-elasticsuite-core/Model/Healthcheck/HealthcheckList.php
+++ b/src/module-elasticsuite-core/Model/Healthcheck/HealthcheckList.php
@@ -12,7 +12,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Healthcheck;
+namespace Smile\ElasticsuiteCore\Model\Healthcheck;
 
 use Smile\ElasticsuiteCore\Api\Healthcheck\CheckInterface;
 
diff --git a/src/module-elasticsuite-core/Model/Healthcheck/ReplicasConfigCheck.php b/src/module-elasticsuite-core/Model/Healthcheck/ReplicasConfigCheck.php
index e9909fbf9..383c04d32 100644
--- a/src/module-elasticsuite-core/Model/Healthcheck/ReplicasConfigCheck.php
+++ b/src/module-elasticsuite-core/Model/Healthcheck/ReplicasConfigCheck.php
@@ -12,7 +12,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Healthcheck;
+namespace Smile\ElasticsuiteCore\Model\Healthcheck;
 
 use Magento\Framework\UrlInterface;
 use Smile\ElasticsuiteCore\Api\Healthcheck\CheckInterface;
diff --git a/src/module-elasticsuite-core/Model/Healthcheck/ShardsConfigCheck.php b/src/module-elasticsuite-core/Model/Healthcheck/ShardsConfigCheck.php
index 66e04fe9f..56954a76d 100644
--- a/src/module-elasticsuite-core/Model/Healthcheck/ShardsConfigCheck.php
+++ b/src/module-elasticsuite-core/Model/Healthcheck/ShardsConfigCheck.php
@@ -12,7 +12,7 @@
  * @license   Open Software License ("OSL") v. 3.0
  */
 
-namespace Smile\ElasticsuiteCore\Healthcheck;
+namespace Smile\ElasticsuiteCore\Model\Healthcheck;
 
 use Exception;
 use Magento\Framework\UrlInterface;
diff --git a/src/module-elasticsuite-core/Model/System/Message/GenericHealthcheckWarning.php b/src/module-elasticsuite-core/Model/System/Message/GenericHealthcheckWarning.php
index 675a7fe53..a807adf06 100644
--- a/src/module-elasticsuite-core/Model/System/Message/GenericHealthcheckWarning.php
+++ b/src/module-elasticsuite-core/Model/System/Message/GenericHealthcheckWarning.php
@@ -16,12 +16,12 @@
 
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Notification\MessageInterface;
-use Smile\ElasticsuiteCore\Healthcheck\HealthcheckList;
+use Smile\ElasticsuiteCore\Model\Healthcheck\HealthcheckList;
 
 /**
  * Class GenericWarningAboutClusterMisconfig
  */
-class GenericWarningAboutClusterMisconfig implements MessageInterface
+class GenericHealthcheckWarning implements MessageInterface
 {
     /**
      * Route to Elasticsuite -> Healthcheck page.
diff --git a/src/module-elasticsuite-core/etc/adminhtml/di.xml b/src/module-elasticsuite-core/etc/adminhtml/di.xml
index 3d28f5a80..9c27a577a 100644
--- a/src/module-elasticsuite-core/etc/adminhtml/di.xml
+++ b/src/module-elasticsuite-core/etc/adminhtml/di.xml
@@ -23,18 +23,18 @@
             <argument name="messages" xsi:type="array">
                 <item name="elasticsuite" xsi:type="string">Smile\ElasticsuiteCore\Model\System\Message\NotificationAboutVersions</item>
                 <!-- Generic warning class -->
-                <item name="elasticsuite_cluster_generic_misconfig_warning" xsi:type="string">Smile\ElasticsuiteCore\Model\System\Message\GenericWarningAboutClusterMisconfig</item>
+                <item name="elasticsuite_generic_healthcheck_warning" xsi:type="string">Smile\ElasticsuiteCore\Model\System\Message\GenericHealthcheckWarning</item>
             </argument>
         </arguments>
     </type>
 
     <!-- Elasticsuite Health Check -->
-    <type name="Smile\ElasticsuiteCore\Healthcheck\HealthcheckList">
+    <type name="Smile\ElasticsuiteCore\Model\Healthcheck\HealthcheckList">
         <arguments>
             <argument name="checks" xsi:type="array">
-                <item name="ghost_indices_check" xsi:type="object">Smile\ElasticsuiteCore\Healthcheck\GhostIndicesCheck</item>
-                <item name="shards_config_check" xsi:type="object">Smile\ElasticsuiteCore\Healthcheck\ShardsConfigCheck</item>
-                <item name="replicas_config_check" xsi:type="object">Smile\ElasticsuiteCore\Healthcheck\ReplicasConfigCheck</item>
+                <item name="ghost_indices_check" xsi:type="object">Smile\ElasticsuiteCore\Model\Healthcheck\GhostIndicesCheck</item>
+                <item name="shards_config_check" xsi:type="object">Smile\ElasticsuiteCore\Model\Healthcheck\ShardsConfigCheck</item>
+                <item name="replicas_config_check" xsi:type="object">Smile\ElasticsuiteCore\Model\Healthcheck\ReplicasConfigCheck</item>
             </argument>
         </arguments>
     </type>