diff --git a/src/Model/Table/SoftDeleteTrait.php b/src/Model/Table/SoftDeleteTrait.php
index 5f76444..aaf6acc 100644
--- a/src/Model/Table/SoftDeleteTrait.php
+++ b/src/Model/Table/SoftDeleteTrait.php
@@ -4,7 +4,7 @@
 use Cake\ORM\RulesChecker;
 use Cake\Datasource\EntityInterface;
 use SoftDelete\Error\MissingColumnException;
-use SoftDelete\ORM\Query;
+use SoftDelete\ORM\SelectQuery;
 
 trait SoftDeleteTrait
 {
@@ -12,7 +12,7 @@ trait SoftDeleteTrait
      * Get the configured deletion field
      *
      * @return string
-     * @throws \SoftDelete\Error\MissingFieldException
+     * @throws \SoftDelete\Error\MissingColumnException
      */
     public function getSoftDeleteField()
     {
@@ -41,11 +41,11 @@ public function getSoftDeleteField()
      * Fatal error: Declaration of SoftDelete\Model\Table\SoftDeleteTrait::query(): SoftDelete\ORM\Query must be compatible with Cake\ORM\Table::query(): Cake\ORM\Query
      * 上記エラー回避のため戻り値の型宣言では実体と異なるがCakePHP本体のquery()で定義されている上書き元の型（\Cake\ORM\Query）を明示する
      *
-     * @return \SoftDelete\ORM\Query
+     * @return \SoftDelete\ORM\SelectQuery
      */
-    public function query(): \Cake\ORM\Query
+    public function SelectQuery(): SelectQuery
     {
-        return new Query($this->getConnection(), $this);
+        return new SelectQuery($this->getConnection(), $this);
     }
 
     /**
diff --git a/src/ORM/Query.php b/src/ORM/SelectQuery.php
similarity index 92%
rename from src/ORM/Query.php
rename to src/ORM/SelectQuery.php
index 4e27d31..3387235 100644
--- a/src/ORM/Query.php
+++ b/src/ORM/SelectQuery.php
@@ -1,12 +1,12 @@
 <?php
 namespace SoftDelete\ORM;
 
-use Cake\ORM\Query as CakeQuery;
+use Cake\ORM\Query\SelectQuery as CakeQuery;
 
 /**
  * Soft delete-aware query
  */
-class Query extends CakeQuery
+class SelectQuery extends CakeQuery
 {
     /**
      * Overwriting triggerBeforeFind() to let queries not return soft deleted records