diff --git a/CHANGELOG.md b/CHANGELOG.md
index b99aeec..23e0d6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * refactor: rename the term 'safe' to 'large'
 * refactor(`RecollectionDecorator`): rename `withCriteria` to `applyCriteria`
 * refactor: rename the term 'large' to 'basic'
+* refactor: rename query classes
 
 ## 0.3.0
 
diff --git a/packages/collections-orm/src/QueryPageable.php b/packages/collections-orm/src/BasicQueryRecollection.php
similarity index 97%
rename from packages/collections-orm/src/QueryPageable.php
rename to packages/collections-orm/src/BasicQueryRecollection.php
index 964ecc5..f1b3745 100644
--- a/packages/collections-orm/src/QueryPageable.php
+++ b/packages/collections-orm/src/BasicQueryRecollection.php
@@ -24,7 +24,7 @@
  * @template T
  * @implements PageableInterface<TKey,T>
  */
-class QueryPageable implements PageableInterface
+class BasicQueryRecollection implements PageableInterface
 {
     /** @use QueryBuilderTrait<TKey,T> */
     use QueryBuilderTrait;
diff --git a/packages/collections-orm/src/QueryCollection.php b/packages/collections-orm/src/QueryRecollection.php
similarity index 98%
rename from packages/collections-orm/src/QueryCollection.php
rename to packages/collections-orm/src/QueryRecollection.php
index 6511e00..610723d 100644
--- a/packages/collections-orm/src/QueryCollection.php
+++ b/packages/collections-orm/src/QueryRecollection.php
@@ -29,7 +29,7 @@
  * @template T
  * @implements ReadableRecollection<TKey,T>
  */
-class QueryCollection implements ReadableRecollection
+class QueryRecollection implements ReadableRecollection
 {
     /** @use QueryBuilderTrait<TKey,T> */
     use QueryBuilderTrait;
diff --git a/psalm.xml b/psalm.xml
index 5f89a63..8330496 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -40,8 +40,8 @@
                 <file name="packages/collections-domain/src/CriteriaRecollection.php" />
                 <file name="packages/collections-domain/src/BasicRecollectionDecorator.php" />
                 <file name="packages/collections-domain/src/BasicCriteriaRecollection.php" />
-                <file name="packages/collections-orm/src/QueryCollection.php" />
-                <file name="packages/collections-orm/src/QueryPageable.php" />
+                <file name="packages/collections-orm/src/QueryRecollection.php" />
+                <file name="packages/collections-orm/src/BasicQueryRecollection.php" />
             </errorLevel>
         </UnsafeInstantiation>
         <MoreSpecificReturnType>