diff --git a/plugin/xapi/src/Hook/XApiLearningPathEndHook.php b/plugin/xapi/src/Hook/XApiLearningPathEndHookObserver.php
similarity index 95%
rename from plugin/xapi/src/Hook/XApiLearningPathEndHook.php
rename to plugin/xapi/src/Hook/XApiLearningPathEndHookObserver.php
index a3d89571d3..8e0cabe6d8 100644
--- a/plugin/xapi/src/Hook/XApiLearningPathEndHook.php
+++ b/plugin/xapi/src/Hook/XApiLearningPathEndHookObserver.php
@@ -9,9 +9,9 @@ use Xabbuh\XApi\Model\Result as ActivityResult;
 use Xabbuh\XApi\Model\Score;
 
 /**
- * Class XApiLearningPathEndHook.
+ * Class XApiLearningPathEndHookObserver.
  */
-class XApiLearningPathEndHook extends XApiActivityHookObserver implements HookLearningPathEndObserverInterface
+class XApiLearningPathEndHookObserver extends XApiActivityHookObserver implements HookLearningPathEndObserverInterface
 {
     use XApiStatementTrait;
 
diff --git a/plugin/xapi/src/Hook/XApiLearningPathItemViewedHook.php b/plugin/xapi/src/Hook/XApiLearningPathItemViewedHookObserver.php
similarity index 97%
rename from plugin/xapi/src/Hook/XApiLearningPathItemViewedHook.php
rename to plugin/xapi/src/Hook/XApiLearningPathItemViewedHookObserver.php
index 9cb16cf657..b384cb37e4 100644
--- a/plugin/xapi/src/Hook/XApiLearningPathItemViewedHook.php
+++ b/plugin/xapi/src/Hook/XApiLearningPathItemViewedHookObserver.php
@@ -9,9 +9,9 @@ use Xabbuh\XApi\Model\LanguageMap;
 use Xabbuh\XApi\Model\Result as ActivityResult;
 
 /**
- * Class XApiLearningPathItemViewedHook.
+ * Class XApiLearningPathItemViewedHookObserver.
  */
-class XApiLearningPathItemViewedHook
+class XApiLearningPathItemViewedHookObserver
     extends XApiActivityHookObserver
     implements HookLearningPathItemViewedObserverInterface
 {
diff --git a/plugin/xapi/src/Hook/XApiQuizEndHook.php b/plugin/xapi/src/Hook/XApiQuizEndHookObserver.php
similarity index 96%
rename from plugin/xapi/src/Hook/XApiQuizEndHook.php
rename to plugin/xapi/src/Hook/XApiQuizEndHookObserver.php
index ea9a127f02..5f91236f4a 100644
--- a/plugin/xapi/src/Hook/XApiQuizEndHook.php
+++ b/plugin/xapi/src/Hook/XApiQuizEndHookObserver.php
@@ -9,9 +9,9 @@ use Xabbuh\XApi\Model\Result as ActivityResult;
 use Xabbuh\XApi\Model\Score;
 
 /**
- * Class XApiQuizEndHook.
+ * Class XApiQuizEndHookObserver.
  */
-class XApiQuizEndHook extends XApiActivityHookObserver implements HookQuizEndObserverInterface
+class XApiQuizEndHookObserver extends XApiActivityHookObserver implements HookQuizEndObserverInterface
 {
     use XApiStatementTrait;
 
diff --git a/plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHook.php b/plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHookObserver.php
similarity index 99%
rename from plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHook.php
rename to plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHookObserver.php
index 7b6df2da6d..b491a1b117 100644
--- a/plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHook.php
+++ b/plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHookObserver.php
@@ -12,7 +12,7 @@ use Xabbuh\XApi\Model\Score;
 /**
  * Class XApiQuizQuestionAnsweredHook.
  */
-class XApiQuizQuestionAnsweredHook
+class XApiQuizQuestionAnsweredHookObserver
     extends XApiActivityHookObserver
     implements HookQuizQuestionAnsweredObserverInterface
 {
diff --git a/plugin/xapi/src/XApiPlugin.php b/plugin/xapi/src/XApiPlugin.php
index bcec84cd59..a2865d6213 100644
--- a/plugin/xapi/src/XApiPlugin.php
+++ b/plugin/xapi/src/XApiPlugin.php
@@ -152,10 +152,10 @@ class XApiPlugin extends Plugin implements HookPluginInterface
      */
     public function uninstallHook()
     {
-        $learningPathItemViewedHook = XApiLearningPathItemViewedHook::create();
-        $learningPathEndHook = XApiLearningPathEndHook::create();
-        $quizQuestionAnsweredHook = XApiQuizQuestionAnsweredHook::create();
-        $quizEndHook = XApiQuizEndHook::create();
+        $learningPathItemViewedHook = XApiLearningPathItemViewedHookObserver::create();
+        $learningPathEndHook = XApiLearningPathEndHookObserver::create();
+        $quizQuestionAnsweredHook = XApiQuizQuestionAnsweredHookObserver::create();
+        $quizEndHook = XApiQuizEndHookObserver::create();
 
         HookLearningPathItemViewed::create()->attach($learningPathItemViewedHook);
         HookLearningPathEnd::create()->detach($learningPathEndHook);
@@ -235,10 +235,10 @@ class XApiPlugin extends Plugin implements HookPluginInterface
      */
     public function performActionsAfterConfigure()
     {
-        $learningPathItemViewedHook = XApiLearningPathItemViewedHook::create();
-        $learningPathEndHook = XApiLearningPathEndHook::create();
-        $quizQuestionAnsweredHook = XApiQuizQuestionAnsweredHook::create();
-        $quizEndHook = XApiQuizEndHook::create();
+        $learningPathItemViewedHook = XApiLearningPathItemViewedHookObserver::create();
+        $learningPathEndHook = XApiLearningPathEndHookObserver::create();
+        $quizQuestionAnsweredHook = XApiQuizQuestionAnsweredHookObserver::create();
+        $quizEndHook = XApiQuizEndHookObserver::create();
 
         $learningPathItemViewedEvent = HookLearningPathItemViewed::create();
         $learningPathEndEvent = HookLearningPathEnd::create();