diff --git a/eZ/Publish/Core/Persistence/Cache/BookmarkHandler.php b/eZ/Publish/Core/Persistence/Cache/BookmarkHandler.php
index 1661edab9b..9c901b6f54 100644
--- a/eZ/Publish/Core/Persistence/Cache/BookmarkHandler.php
+++ b/eZ/Publish/Core/Persistence/Cache/BookmarkHandler.php
@@ -85,7 +85,7 @@ function (Bookmark $bookmark) {
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
+     * @deprecated The "BookmarkHandler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
@@ -101,7 +101,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "BookmarkHandler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway.php
index b11ba470a0..d7355417f1 100644
--- a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway.php
+++ b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway.php
@@ -44,7 +44,7 @@ abstract public function loadBookmarkDataByUserIdAndLocationId(int $userId, arra
     /**
      * Load data for all bookmarks owned by given $userId.
      *
-     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
+     * @deprecated Gateway::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * @param int $userId ID of user
      * @param int $offset Offset to start listing from, 0 by default
@@ -57,7 +57,7 @@ abstract public function loadUserBookmarks(int $userId, int $offset = 0, int $li
     /**
      * Count bookmarks owned by given $userId.
      *
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "Gateway::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * @param int $userId ID of user
      *
diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/DoctrineDatabase.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/DoctrineDatabase.php
index bbb8f6d056..25b98677a3 100644
--- a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/DoctrineDatabase.php
+++ b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/DoctrineDatabase.php
@@ -101,7 +101,7 @@ public function loadBookmarkDataByUserIdAndLocationId(int $userId, array $locati
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
+     * @deprecated The "DoctrineDatabase::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
@@ -125,7 +125,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "DoctrineDatabase::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/ExceptionConversion.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/ExceptionConversion.php
index 072de51cad..b9f299fd56 100644
--- a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/ExceptionConversion.php
+++ b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/ExceptionConversion.php
@@ -57,7 +57,7 @@ public function loadBookmarkDataByUserIdAndLocationId(int $userId, array $locati
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
+     * @deprecated The "ExceptionConversion::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * @return array
      */
@@ -71,7 +71,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "ExceptionConversion::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      */
     public function countUserBookmarks(int $userId): int
     {
diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Handler.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Handler.php
index afeb52a133..c40d7a2217 100644
--- a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Handler.php
+++ b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Handler.php
@@ -74,7 +74,7 @@ public function loadByUserIdAndLocationId(int $userId, array $locationIds): arra
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
+     * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
@@ -86,7 +86,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
diff --git a/eZ/Publish/SPI/Persistence/Bookmark/Handler.php b/eZ/Publish/SPI/Persistence/Bookmark/Handler.php
index 2b111c412c..9b69dae436 100644
--- a/eZ/Publish/SPI/Persistence/Bookmark/Handler.php
+++ b/eZ/Publish/SPI/Persistence/Bookmark/Handler.php
@@ -41,7 +41,7 @@ public function loadByUserIdAndLocationId(int $userId, array $locationIds): arra
     /**
      * Loads bookmarks owned by user.
      *
-     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
+     * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * @param int $userId
      * @param int $offset the start offset for paging
@@ -54,7 +54,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     /**
      * Count bookmarks owned by user.
      *
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * @param int $userId
      *