diff --git a/src/contracts/Repository/Iterator/BatchIterator.php b/src/contracts/Repository/Iterator/BatchIterator.php
index 7abe4177cb..9745e8bf10 100644
--- a/src/contracts/Repository/Iterator/BatchIterator.php
+++ b/src/contracts/Repository/Iterator/BatchIterator.php
@@ -12,19 +12,15 @@
 
 final class BatchIterator implements Iterator
 {
-    public const DEFAULT_BATCH_SIZE = 25;
+    public const int DEFAULT_BATCH_SIZE = 25;
 
-    /** @var \Ibexa\Contracts\Core\Repository\Iterator\BatchIteratorAdapter */
-    private $adapter;
+    private BatchIteratorAdapter $adapter;
 
-    /** @var \Iterator|null */
-    private $innerIterator;
+    private ?Iterator $innerIterator = null;
 
-    /** @var int */
-    private $batchSize;
+    private int $batchSize;
 
-    /** @var int */
-    private $position;
+    private int $position;
 
     public function __construct(
         BatchIteratorAdapter $adapter,
diff --git a/src/contracts/Repository/Iterator/BatchIteratorAdapter/ContentFilteringAdapter.php b/src/contracts/Repository/Iterator/BatchIteratorAdapter/ContentFilteringAdapter.php
index 5040118493..55844b4533 100644
--- a/src/contracts/Repository/Iterator/BatchIteratorAdapter/ContentFilteringAdapter.php
+++ b/src/contracts/Repository/Iterator/BatchIteratorAdapter/ContentFilteringAdapter.php
@@ -15,14 +15,12 @@
 
 final class ContentFilteringAdapter implements BatchIteratorAdapter
 {
-    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
-    private $contentService;
+    private ContentService $contentService;
 
-    /** @var \Ibexa\Contracts\Core\Repository\Values\Filter\Filter */
-    private $filter;
+    private Filter $filter;
 
     /** @var string[]|null */
-    private $languages;
+    private ?array $languages;
 
     public function __construct(ContentService $contentService, Filter $filter, ?array $languages = null)
     {
diff --git a/src/contracts/Repository/Iterator/BatchIteratorAdapter/LocationFilteringAdapter.php b/src/contracts/Repository/Iterator/BatchIteratorAdapter/LocationFilteringAdapter.php
index 16467431c1..f98bdaa9c2 100644
--- a/src/contracts/Repository/Iterator/BatchIteratorAdapter/LocationFilteringAdapter.php
+++ b/src/contracts/Repository/Iterator/BatchIteratorAdapter/LocationFilteringAdapter.php
@@ -15,14 +15,12 @@
 
 final class LocationFilteringAdapter implements BatchIteratorAdapter
 {
-    /** @var \Ibexa\Contracts\Core\Repository\LocationService */
-    private $locationService;
+    private LocationService $locationService;
 
-    /** @var \Ibexa\Contracts\Core\Repository\Values\Filter\Filter */
-    private $filter;
+    private Filter $filter;
 
     /** @var string[]|null */
-    private $languages;
+    private ?array $languages;
 
     public function __construct(LocationService $locationService, Filter $filter, ?array $languages = null)
     {