diff --git a/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php b/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php
index 44ab2eaa27..1c1e5261e8 100644
--- a/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php
+++ b/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php
@@ -12,11 +12,9 @@
 namespace Symfony\Component\Validator\NodeTraverser;
 
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\NoSuchMetadataException;
 use Symfony\Component\Validator\Mapping\CascadingStrategy;
 use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
-use Symfony\Component\Validator\Mapping\CollectionMetadata;
 use Symfony\Component\Validator\Mapping\TraversalStrategy;
 use Symfony\Component\Validator\MetadataFactoryInterface;
 use Symfony\Component\Validator\Node\ClassNode;
@@ -132,7 +130,7 @@ class NodeTraverser implements NodeTraverserInterface
             return;
         }
 
-        // The "cascadedGroups" property is set by the NodeValidatorVisitor when
+        // The "cascadedGroups" property is set by the NodeValidationVisitor when
         // traversing group sequences
         $cascadedGroups = null !== $node->cascadedGroups
             ? $node->cascadedGroups
diff --git a/src/Symfony/Component/Validator/NodeVisitor/ContextRefresherVisitor.php b/src/Symfony/Component/Validator/NodeVisitor/ContextUpdateVisitor.php
similarity index 88%
rename from src/Symfony/Component/Validator/NodeVisitor/ContextRefresherVisitor.php
rename to src/Symfony/Component/Validator/NodeVisitor/ContextUpdateVisitor.php
index b28b2f542f..4fb7f1b33a 100644
--- a/src/Symfony/Component/Validator/NodeVisitor/ContextRefresherVisitor.php
+++ b/src/Symfony/Component/Validator/NodeVisitor/ContextUpdateVisitor.php
@@ -22,13 +22,13 @@ use Symfony\Component\Validator\Node\Node;
  * @since  2.5
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ContextRefresherVisitor extends AbstractVisitor
+class ContextUpdateVisitor extends AbstractVisitor
 {
     public function visit(Node $node, ExecutionContextInterface $context)
     {
         if (!$context instanceof NodeObserverInterface) {
             throw new RuntimeException(sprintf(
-                'The ContextRefresherVisitor only supports instances of class '.
+                'The ContextUpdateVisitor only supports instances of class '.
                 '"Symfony\Component\Validator\NodeVisitor\NodeObserverInterface". '.
                 'An instance of class "%s" was given.',
                 get_class($context)
diff --git a/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolverVisitor.php b/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolvingVisitor.php
similarity index 96%
rename from src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolverVisitor.php
rename to src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolvingVisitor.php
index 6b9330ec8d..2d9b68737a 100644
--- a/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolverVisitor.php
+++ b/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolvingVisitor.php
@@ -21,7 +21,7 @@ use Symfony\Component\Validator\Node\Node;
  * @since  %%NextVersion%%
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class GroupSequenceResolverVisitor extends AbstractVisitor
+class GroupSequenceResolvingVisitor extends AbstractVisitor
 {
     public function visit(Node $node, ExecutionContextInterface $context)
     {
diff --git a/src/Symfony/Component/Validator/NodeVisitor/NodeValidatorVisitor.php b/src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php
similarity index 98%
rename from src/Symfony/Component/Validator/NodeVisitor/NodeValidatorVisitor.php
rename to src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php
index 6cab8a3cac..c688295da6 100644
--- a/src/Symfony/Component/Validator/NodeVisitor/NodeValidatorVisitor.php
+++ b/src/Symfony/Component/Validator/NodeVisitor/NodeValidationVisitor.php
@@ -25,7 +25,7 @@ use Symfony\Component\Validator\NodeTraverser\NodeTraverserInterface;
  * @since  %%NextVersion%%
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class NodeValidatorVisitor extends AbstractVisitor implements GroupManagerInterface
+class NodeValidationVisitor extends AbstractVisitor implements GroupManagerInterface
 {
     private $validatedObjects = array();
 
diff --git a/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializerVisitor.php b/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializationVisitor.php
similarity index 96%
rename from src/Symfony/Component/Validator/NodeVisitor/ObjectInitializerVisitor.php
rename to src/Symfony/Component/Validator/NodeVisitor/ObjectInitializationVisitor.php
index 01a2a07b5e..05226ac6d3 100644
--- a/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializerVisitor.php
+++ b/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializationVisitor.php
@@ -20,7 +20,7 @@ use Symfony\Component\Validator\ObjectInitializerInterface;
  * @since  %%NextVersion%%
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class ObjectInitializerVisitor extends AbstractVisitor
+class ObjectInitializationVisitor extends AbstractVisitor
 {
     /**
      * @var ObjectInitializerInterface[]
diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
index 600a297947..e61daf9f93 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php
@@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
 use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor;
-use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor;
-use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor;
+use Symfony\Component\Validator\NodeVisitor\ContextUpdateVisitor;
+use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolvingVisitor;
+use Symfony\Component\Validator\NodeVisitor\NodeValidationVisitor;
 use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
 use Symfony\Component\Validator\Validator\LegacyValidator;
 
@@ -26,11 +26,11 @@ class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
     protected function createValidator(MetadataFactoryInterface $metadataFactory)
     {
         $nodeTraverser = new NodeTraverser($metadataFactory);
-        $nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory());
+        $nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
         $contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator());
         $validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory);
-        $groupSequenceResolver = new GroupSequenceResolverVisitor();
-        $contextRefresher = new ContextRefresherVisitor();
+        $groupSequenceResolver = new GroupSequenceResolvingVisitor();
+        $contextRefresher = new ContextUpdateVisitor();
 
         $nodeTraverser->addVisitor($groupSequenceResolver);
         $nodeTraverser->addVisitor($contextRefresher);
diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
index fc2fe0bb38..672f2ebf42 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php
@@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
 use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor;
-use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor;
-use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor;
+use Symfony\Component\Validator\NodeVisitor\ContextUpdateVisitor;
+use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolvingVisitor;
+use Symfony\Component\Validator\NodeVisitor\NodeValidationVisitor;
 use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
 use Symfony\Component\Validator\Validator\LegacyValidator;
 
@@ -26,11 +26,11 @@ class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest
     protected function createValidator(MetadataFactoryInterface $metadataFactory)
     {
         $nodeTraverser = new NodeTraverser($metadataFactory);
-        $nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory());
+        $nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
         $contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator());
         $validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory);
-        $groupSequenceResolver = new GroupSequenceResolverVisitor();
-        $contextRefresher = new ContextRefresherVisitor();
+        $groupSequenceResolver = new GroupSequenceResolvingVisitor();
+        $contextRefresher = new ContextUpdateVisitor();
 
         $nodeTraverser->addVisitor($groupSequenceResolver);
         $nodeTraverser->addVisitor($contextRefresher);
diff --git a/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php
index e3f92b8799..b49c380c98 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php
@@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor;
-use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor;
-use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor;
+use Symfony\Component\Validator\NodeVisitor\ContextUpdateVisitor;
+use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolvingVisitor;
+use Symfony\Component\Validator\NodeVisitor\NodeValidationVisitor;
 use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
 use Symfony\Component\Validator\Validator\Validator;
 
@@ -26,11 +26,11 @@ class Validator2Dot5ApiTest extends Abstract2Dot5ApiTest
     protected function createValidator(MetadataFactoryInterface $metadataFactory)
     {
         $nodeTraverser = new NodeTraverser($metadataFactory);
-        $nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory());
+        $nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
         $contextFactory = new ExecutionContextFactory($nodeValidator, new DefaultTranslator());
         $validator = new Validator($contextFactory, $nodeTraverser, $metadataFactory);
-        $groupSequenceResolver = new GroupSequenceResolverVisitor();
-        $contextRefresher = new ContextRefresherVisitor();
+        $groupSequenceResolver = new GroupSequenceResolvingVisitor();
+        $contextRefresher = new ContextUpdateVisitor();
 
         $nodeTraverser->addVisitor($groupSequenceResolver);
         $nodeTraverser->addVisitor($contextRefresher);