diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 659c577d43..ece30cda49 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -46,7 +46,7 @@ class Configuration implements ConfigurationInterface
 
         $rootNode
             ->children()
-                ->scalarNode('charset')->setInfo('general configuration')->end()
+                ->scalarNode('charset')->info('general configuration')->end()
                 ->scalarNode('trust_proxy_headers')->defaultFalse()->end()
                 ->scalarNode('secret')->isRequired()->end()
                 ->scalarNode('ide')->defaultNull()->end()
@@ -73,7 +73,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('form')
-                    ->setInfo('form configuration')
+                    ->info('form configuration')
                     ->canBeUnset()
                     ->treatNullLike(array('enabled' => true))
                     ->treatTrueLike(array('enabled' => true))
@@ -99,7 +99,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('esi')
-                    ->setInfo('esi configuration')
+                    ->info('esi configuration')
                     ->canBeUnset()
                     ->treatNullLike(array('enabled' => true))
                     ->treatTrueLike(array('enabled' => true))
@@ -116,7 +116,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('profiler')
-                    ->setInfo('profiler configuration')
+                    ->info('profiler configuration')
                     ->canBeUnset()
                     ->children()
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
@@ -131,8 +131,8 @@ class Configuration implements ConfigurationInterface
                             ->children()
                                 ->scalarNode('ip')->end()
                                 ->scalarNode('path')
-                                    ->setInfo('use the urldecoded format')
-                                    ->setExample('^/path to resource/')
+                                    ->info('use the urldecoded format')
+                                    ->example('^/path to resource/')
                                 ->end()
                                 ->scalarNode('service')->end()
                             ->end()
@@ -148,7 +148,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('router')
-                    ->setInfo('router configuration')
+                    ->info('router configuration')
                     ->canBeUnset()
                     ->children()
                         ->scalarNode('resource')->isRequired()->end()
@@ -166,7 +166,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('session')
-                    ->setInfo('session configuration')
+                    ->info('session configuration')
                     ->canBeUnset()
                     ->children()
                         ->booleanNode('auto_start')->defaultFalse()->end()
@@ -182,11 +182,11 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('gc_probability')->end()
                         ->scalarNode('gc_maxlifetime')->end()
                         ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
-                        ->scalarNode('lifetime')->setInfo('DEPRECATED! Please use: cookie_lifetime')->end()
-                        ->scalarNode('path')->setInfo('DEPRECATED! Please use: cookie_path')->end()
-                        ->scalarNode('domain')->setInfo('DEPRECATED! Please use: cookie_domain')->end()
-                        ->booleanNode('secure')->setInfo('DEPRECATED! Please use: cookie_secure')->end()
-                        ->booleanNode('httponly')->setInfo('DEPRECATED! Please use: cookie_httponly')->end()
+                        ->scalarNode('lifetime')->info('DEPRECATED! Please use: cookie_lifetime')->end()
+                        ->scalarNode('path')->info('DEPRECATED! Please use: cookie_path')->end()
+                        ->scalarNode('domain')->info('DEPRECATED! Please use: cookie_domain')->end()
+                        ->booleanNode('secure')->info('DEPRECATED! Please use: cookie_secure')->end()
+                        ->booleanNode('httponly')->info('DEPRECATED! Please use: cookie_httponly')->end()
                     ->end()
                 ->end()
             ->end()
@@ -218,7 +218,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('templating')
-                    ->setInfo('templating configuration')
+                    ->info('templating configuration')
                     ->canBeUnset()
                     ->children()
                         ->scalarNode('assets_version')->defaultValue(null)->end()
@@ -268,7 +268,7 @@ class Configuration implements ConfigurationInterface
                     ->fixXmlConfig('engine')
                     ->children()
                         ->arrayNode('engines')
-                            ->setExample(array('twig'))
+                            ->example(array('twig'))
                             ->isRequired()
                             ->requiresAtLeastOneElement()
                             ->beforeNormalization()
@@ -331,7 +331,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('translator')
-                    ->setInfo('translator configuration')
+                    ->info('translator configuration')
                     ->canBeUnset()
                     ->treatNullLike(array('enabled' => true))
                     ->treatTrueLike(array('enabled' => true))
@@ -349,7 +349,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('validation')
-                    ->setInfo('validation configuration')
+                    ->info('validation configuration')
                     ->canBeUnset()
                     ->treatNullLike(array('enabled' => true))
                     ->treatTrueLike(array('enabled' => true))
@@ -368,7 +368,7 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->arrayNode('annotations')
-                    ->setInfo('annotation configuration')
+                    ->info('annotation configuration')
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->scalarNode('cache')->defaultValue('file')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
index 607ebee527..c0e8736978 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -57,8 +57,8 @@ class MainConfiguration implements ConfigurationInterface
 
         $rootNode
             ->children()
-                ->scalarNode('access_denied_url')->defaultNull()->setExample('/foo/error403')->end()
-                ->scalarNode('session_fixation_strategy')->cannotBeEmpty()->setInfo('strategy can be: none, migrate, invalidate')->defaultValue('migrate')->end()
+                ->scalarNode('access_denied_url')->defaultNull()->example('/foo/error403')->end()
+                ->scalarNode('session_fixation_strategy')->cannotBeEmpty()->info('strategy can be: none, migrate, invalidate')->defaultValue('migrate')->end()
                 ->booleanNode('hide_user_not_found')->defaultTrue()->end()
                 ->booleanNode('always_authenticate_before_granting')->defaultFalse()->end()
                 ->booleanNode('erase_credentials')->defaultTrue()->end()
@@ -91,7 +91,7 @@ class MainConfiguration implements ConfigurationInterface
                     ->children()
                         ->scalarNode('connection')
                             ->defaultNull()
-                            ->setInfo('any name configured in doctrine.dbal section')
+                            ->info('any name configured in doctrine.dbal section')
                         ->end()
                         ->arrayNode('cache')
                             ->addDefaultsIfNotSet()
@@ -156,8 +156,8 @@ class MainConfiguration implements ConfigurationInterface
                             ->scalarNode('requires_channel')->defaultNull()->end()
                             ->scalarNode('path')
                                 ->defaultNull()
-                                ->setInfo('use the urldecoded format')
-                                ->setExample('^/path to resource/')
+                                ->info('use the urldecoded format')
+                                ->example('^/path to resource/')
                             ->end()
                             ->scalarNode('host')->defaultNull()->end()
                             ->scalarNode('ip')->defaultNull()->end()
@@ -300,7 +300,7 @@ class MainConfiguration implements ConfigurationInterface
             ->fixXmlConfig('provider')
             ->children()
                 ->arrayNode('providers')
-                    ->setExample(array(
+                    ->example(array(
                         'memory' => array(
                             'name' => 'memory',
                             'users' => array(
@@ -360,7 +360,7 @@ class MainConfiguration implements ConfigurationInterface
             ->fixXmlConfig('encoder')
             ->children()
                 ->arrayNode('encoders')
-                    ->setExample(array(
+                    ->example(array(
                         'Acme\DemoBundle\Entity\User1' => 'sha512',
                         'Acme\DemoBundle\Entity\User2' => array(
                             'algorithm' => 'sha512',