diff --git a/src/Form/Expression/ContextFormTrait.php b/src/Context/Form/ContextFormTrait.php
similarity index 95%
rename from src/Form/Expression/ContextFormTrait.php
rename to src/Context/Form/ContextFormTrait.php
index 61721a6..51ee229 100644
--- a/src/Form/Expression/ContextFormTrait.php
+++ b/src/Context/Form/ContextFormTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\rules\Form\Expression;
+namespace Drupal\rules\Context\Form;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\rules\Context\ContextConfig;
@@ -63,7 +63,7 @@ trait ContextFormTrait {
     $element = &$form['context'][$context_name]['setting'];
 
     if ($mode == ContextDefinitionInterface::ASSIGNMENT_RESTRICTION_SELECTOR) {
-      $element['#description'] = $this->t("The data selector helps you drill down into the data available to Rules. <em>To make entity fields appear in the data selector, you may have to use the condition 'entity has field' (or 'content is of type').</em> More useful tips about data selection is available in <a href=':url'>the online documentation</a>.", [
+      $element['#description'] = $this->t("The data selector helps you drill down into the available data. <em>To make entity fields appear in the data selector, you may have to use the condition 'entity has field' (or 'content is of type').</em> More useful tips about data selection is available in <a href=':url'>the online documentation</a>.", [
         ':url' => 'https://www.drupal.org/node/1300042',
       ]);
 
diff --git a/src/Form/Expression/ActionForm.php b/src/Form/Expression/ActionForm.php
index 96d27bc..8ad805e 100644
--- a/src/Form/Expression/ActionForm.php
+++ b/src/Form/Expression/ActionForm.php
@@ -4,6 +4,7 @@ namespace Drupal\rules\Form\Expression;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\rules\Context\Form\ContextFormTrait;
 use Drupal\rules\Core\RulesActionManagerInterface;
 use Drupal\rules\Engine\ActionExpressionInterface;
 use Drupal\rules\Ui\RulesUiHandlerTrait;
@@ -12,7 +13,6 @@ use Drupal\rules\Ui\RulesUiHandlerTrait;
  * UI form for adding/editing a Rules action.
  */
 class ActionForm implements ExpressionFormInterface {
-
   use ContextFormTrait;
   use StringTranslationTrait;
   use RulesUiHandlerTrait;
diff --git a/src/Form/Expression/ConditionForm.php b/src/Form/Expression/ConditionForm.php
index ee6add0..9131d2c 100644
--- a/src/Form/Expression/ConditionForm.php
+++ b/src/Form/Expression/ConditionForm.php
@@ -4,6 +4,7 @@ namespace Drupal\rules\Form\Expression;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\rules\Context\Form\ContextFormTrait;
 use Drupal\rules\Core\ConditionManager;
 use Drupal\rules\Engine\ConditionExpressionInterface;
 use Drupal\rules\Ui\RulesUiHandlerTrait;
@@ -12,7 +13,6 @@ use Drupal\rules\Ui\RulesUiHandlerTrait;
  * UI form for adding/editing a Rules condition.
  */
 class ConditionForm implements ExpressionFormInterface {
-
   use ContextFormTrait;
   use StringTranslationTrait;
   use RulesUiHandlerTrait;