diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a9c9a2..9146629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,7 @@
 - Chg #330: Rename `insertWithReturningPks()` to `insertReturningPks()` in `Command` and `DMLQueryBuilder` classes (@Tigrov)
 - Enh #336: Provide `yiisoft/db-implementation` virtual package (@vjik)
 - Enh #340: Adapt to `Param` refactoring in `yiisoft/db` package (@vjik)
-- Enh #341, #342: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
+- Enh #341, #342, #345: Adapt to conditions refactoring in `yiisoft/db` package (@vjik)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/Builder/InConditionBuilder.php b/src/Builder/InBuilder.php
similarity index 85%
rename from src/Builder/InConditionBuilder.php
rename to src/Builder/InBuilder.php
index 1f96705..fc79c70 100644
--- a/src/Builder/InConditionBuilder.php
+++ b/src/Builder/InBuilder.php
@@ -9,7 +9,7 @@
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\QueryBuilder\Condition\InCondition;
+use Yiisoft\Db\QueryBuilder\Condition\In;
 
 use function array_slice;
 use function array_unshift;
@@ -17,14 +17,14 @@
 use function is_array;
 
 /**
- * Build an object of {@see InCondition} into SQL expressions for Oracle Server.
+ * Build an object of {@see In} into SQL expressions for Oracle Server.
  */
-final class InConditionBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\InConditionBuilder
+final class InBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\InBuilder
 {
     /**
      * The Method builds the raw SQL from the $expression that won't be additionally escaped or quoted.
      *
-     * @param InCondition $expression The expression to build.
+     * @param In $expression The expression to build.
      * @param array $params The binding parameters.
      *
      * @throws Exception
@@ -55,7 +55,7 @@ public function build(ExpressionInterface $expression, array &$params = []): str
      *
      * @return string|null `null` when split isn't required. Otherwise - built SQL condition.
      */
-    protected function splitCondition(InCondition $condition, array &$params): string|null
+    protected function splitCondition(In $condition, array &$params): string|null
     {
         $operator = $condition->operator;
         $values = $condition->values;
diff --git a/src/Builder/LikeConditionBuilder.php b/src/Builder/LikeBuilder.php
similarity index 81%
rename from src/Builder/LikeConditionBuilder.php
rename to src/Builder/LikeBuilder.php
index 744a79b..4f7c12e 100644
--- a/src/Builder/LikeConditionBuilder.php
+++ b/src/Builder/LikeBuilder.php
@@ -5,21 +5,21 @@
 namespace Yiisoft\Db\Oracle\Builder;
 
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
+use Yiisoft\Db\QueryBuilder\Condition\Like;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 use Yiisoft\Db\Schema\Quoter;
 
 use function substr;
 
 /**
- * Build an object of {@see LikeCondition} into SQL expressions for Oracle Server.
+ * Build an object of {@see Like} into SQL expressions for Oracle Server.
  */
-final class LikeConditionBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeConditionBuilder
+final class LikeBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeBuilder
 {
     private string $escapeCharacter = '!';
 
     /**
-     * `\` is initialized in {@see buildLikeCondition()} method since there is a need to choose replacement value
+     * `\` is initialized in {@see buildLike()} method since there is a need to choose replacement value
      * based on {@see Quoter::quoteValue()}.
      */
     protected array $escapingReplacements = [
@@ -46,7 +46,7 @@ public function build(ExpressionInterface $expression, array &$params = []): str
         return parent::build($expression, $params);
     }
 
-    protected function prepareColumn(LikeCondition $expression, array &$params): string
+    protected function prepareColumn(Like $expression, array &$params): string
     {
         $column = parent::prepareColumn($expression, $params);
 
@@ -59,7 +59,7 @@ protected function prepareColumn(LikeCondition $expression, array &$params): str
 
     protected function preparePlaceholderName(
         string|ExpressionInterface $value,
-        LikeCondition $expression,
+        Like $expression,
         ?array $escape,
         array &$params,
     ): string {
diff --git a/src/DQLQueryBuilder.php b/src/DQLQueryBuilder.php
index 84db066..0588069 100644
--- a/src/DQLQueryBuilder.php
+++ b/src/DQLQueryBuilder.php
@@ -5,12 +5,12 @@
 namespace Yiisoft\Db\Oracle;
 
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\Oracle\Builder\InConditionBuilder;
-use Yiisoft\Db\Oracle\Builder\LikeConditionBuilder;
+use Yiisoft\Db\Oracle\Builder\InBuilder;
+use Yiisoft\Db\Oracle\Builder\LikeBuilder;
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\QueryBuilder\AbstractDQLQueryBuilder;
-use Yiisoft\Db\QueryBuilder\Condition\InCondition;
-use Yiisoft\Db\QueryBuilder\Condition\LikeCondition;
+use Yiisoft\Db\QueryBuilder\Condition\In;
+use Yiisoft\Db\QueryBuilder\Condition\Like;
 
 use function implode;
 
@@ -83,8 +83,8 @@ protected function defaultExpressionBuilders(): array
     {
         return [
             ...parent::defaultExpressionBuilders(),
-            InCondition::class => InConditionBuilder::class,
-            LikeCondition::class => LikeConditionBuilder::class,
+            In::class => InBuilder::class,
+            Like::class => LikeBuilder::class,
         ];
     }
 }