diff --git a/src/Form/Expression/ContextFormTrait.php b/src/Form/ContextFormTrait.php
similarity index 99%
rename from src/Form/Expression/ContextFormTrait.php
rename to src/Form/ContextFormTrait.php
index 61721a62..8f03a7a7 100644
--- a/src/Form/Expression/ContextFormTrait.php
+++ b/src/Form/ContextFormTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rules\Form\Expression;
+namespace Drupal\rules\Form;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\rules\Context\ContextConfig;
diff --git a/src/Form/Expression/ActionForm.php b/src/Form/Expression/ActionForm.php
index 96d27bca..2a554ed1 100644
--- a/src/Form/Expression/ActionForm.php
+++ b/src/Form/Expression/ActionForm.php
@@ -6,6 +6,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\rules\Core\RulesActionManagerInterface;
 use Drupal\rules\Engine\ActionExpressionInterface;
+use Drupal\rules\Form\ContextFormTrait;
 use Drupal\rules\Ui\RulesUiHandlerTrait;
 
 /**
diff --git a/src/Form/Expression/ConditionForm.php b/src/Form/Expression/ConditionForm.php
index ee6add0d..1a8798a0 100644
--- a/src/Form/Expression/ConditionForm.php
+++ b/src/Form/Expression/ConditionForm.php
@@ -6,6 +6,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\rules\Core\ConditionManager;
 use Drupal\rules\Engine\ConditionExpressionInterface;
+use Drupal\rules\Form\ContextFormTrait;
 use Drupal\rules\Ui\RulesUiHandlerTrait;
 
 /**