diff --git a/src/Form/Control/ScopeBuilder.php b/src/Form/Control/ScopeBuilder.php
index 30be01b20e..8fe965b608 100644
--- a/src/Form/Control/ScopeBuilder.php
+++ b/src/Form/Control/ScopeBuilder.php
@@ -528,7 +528,7 @@ public function queryToScope(array $query): Scope\AbstractScope
     /**
      * Converts an VueQueryBuilder rule array to Condition or Scope.
      */
-    public function queryToCondition(array $query): Scope\Condition
+    public function queryToCondition(array $query): Condition
     {
         $key = $query['rule'];
         $operator = $query['operator'];
@@ -566,7 +566,7 @@ public function queryToCondition(array $query): Scope\Condition
 
         $operator = $operator ? ($operatorsMap[strtolower($operator)] ?? '=') : null;
 
-        return new Scope\Condition($key, $operator, $value);
+        return new Condition($key, $operator, $value);
     }
 
     /**
@@ -575,7 +575,7 @@ public function queryToCondition(array $query): Scope\Condition
     public function scopeToQuery(Scope\AbstractScope $scope, array $inputsMap = []): array
     {
         $query = [];
-        if ($scope instanceof Scope\Condition) {
+        if ($scope instanceof Condition) {
             $query = [
                 'type' => 'query-builder-rule',
                 'query' => $this->conditionToQuery($scope, $inputsMap),
@@ -603,7 +603,7 @@ public function scopeToQuery(Scope\AbstractScope $scope, array $inputsMap = []):
     /**
      * Converts a Condition to VueQueryBuilder query array.
      */
-    public function conditionToQuery(Scope\Condition $condition, array $inputsMap = []): array
+    public function conditionToQuery(Condition $condition, array $inputsMap = []): array
     {
         if (is_string($condition->key)) {
             $rule = $condition->key;
diff --git a/src/Grid.php b/src/Grid.php
index 31a2808aae..d4fa9b981e 100644
--- a/src/Grid.php
+++ b/src/Grid.php
@@ -361,7 +361,7 @@ public function addActionButton($button, $action = null, string $confirmMsg = ''
      *
      * @return View
      */
-    public function addExecutorButton(UserAction\ExecutorInterface $executor, Button $button = null)
+    public function addExecutorButton(ExecutorInterface $executor, Button $button = null)
     {
         if ($button !== null) {
             $this->add($button);
@@ -536,7 +536,7 @@ private function explodeSelectionValue(string $value): array
     public function addBulkAction($item, \Closure $callback, $args = [])
     {
         $menuItem = $this->menu->addItem($item);
-        $menuItem->on('click', function (Js\Jquery $j, string $value) use ($callback) {
+        $menuItem->on('click', function (Jquery $j, string $value) use ($callback) {
             return $callback($j, $this->explodeSelectionValue($value));
         }, [$this->selection->jsChecked()]);
 
diff --git a/src/Table/Column/FilterPopup.php b/src/Table/Column/FilterPopup.php
index 25169a21ad..47fde32a08 100644
--- a/src/Table/Column/FilterPopup.php
+++ b/src/Table/Column/FilterPopup.php
@@ -68,7 +68,7 @@ protected function init(): void
         $this->form->onSubmit(function (Form $form) {
             $form->model->save();
 
-            return new jsReload($this->reload);
+            return new JsReload($this->reload);
         });
 
         Button::addTo($this->form, ['Clear', 'class.clear' => true])
diff --git a/src/UserAction/ConfirmationExecutor.php b/src/UserAction/ConfirmationExecutor.php
index bed8afba48..269ce33913 100644
--- a/src/UserAction/ConfirmationExecutor.php
+++ b/src/UserAction/ConfirmationExecutor.php
@@ -5,7 +5,6 @@
 namespace Atk4\Ui\UserAction;
 
 use Atk4\Core\HookTrait;
-use Atk4\Data\Model;
 use Atk4\Data\Model\UserAction;
 use Atk4\Ui\Button;
 use Atk4\Ui\Exception;
@@ -26,7 +25,7 @@ class ConfirmationExecutor extends Modal implements JsExecutorInterface
     use CommonExecutorTrait;
     use HookTrait;
 
-    /** @var Model\UserAction|null Action to execute */
+    /** @var UserAction|null Action to execute */
     public $action;
 
     /** @var Loader|null Loader to add content to modal. */
@@ -107,7 +106,7 @@ public function getAction(): UserAction
     }
 
     #[\Override]
-    public function setAction(Model\UserAction $action)
+    public function setAction(UserAction $action)
     {
         $this->action = $action;
         $this->afterActionInit();