diff --git a/src/Behat/MinkExtension/services/mink.xml b/src/Behat/MinkExtension/services/mink.xml
index 9abace9..b7961b5 100644
--- a/src/Behat/MinkExtension/services/mink.xml
+++ b/src/Behat/MinkExtension/services/mink.xml
@@ -8,7 +8,12 @@
         <parameter key="behat.mink.parameters" type="collection"></parameter>
         <parameter key="behat.mink.class">Behat\Mink\Mink</parameter>
         <parameter key="behat.mink.session.class">Behat\Mink\Session</parameter>
-        <parameter key="behat.mink.selectors_handler.class">Behat\Mink\Selector\SelectorsHandler</parameter>
+        <parameter key="behat.mink.selector.handler.class">Behat\Mink\Selector\SelectorsHandler</parameter>
+        <parameter key="behat.mink.selector.css.class">Behat\Mink\Selector\CssSelector</parameter>
+        <parameter key="behat.mink.selector.named.class">Behat\Mink\Selector\NamedSelector</parameter>
+
+        <parameter key="behat.mink.context.class_guesser.class">Behat\MinkExtension\Context\ClassGuesser\MinkContextClassGuesser</parameter>
+        <parameter key="behat.mink.context.initializer.class">Behat\MinkExtension\Context\Initializer\MinkAwareInitializer</parameter>
 
         <parameter key="behat.mink.default_session">goutte</parameter>
         <parameter key="behat.mink.javascript_session">selenium2</parameter>
@@ -22,25 +27,22 @@
 
         <service id="behat.mink" class="%behat.mink.class%" />
 
-        <service id="behat.mink.selectors_handler" class="%behat.mink.selectors_handler.class%" />
-
-        <service id="behat.mink.selector.css" class="Behat\Mink\Selector\CssSelector">
+        <service id="behat.mink.selector.handler" class="%behat.mink.selector.handler.class%" />
+        <service id="behat.mink.selector.css" class="%behat.mink.selector.css.class%">
             <tag name="behat.mink.selector" alias="css" />
         </service>
-
-        <service id="behat.mink.selector.named" class="Behat\Mink\Selector\NamedSelector">
+        <service id="behat.mink.selector.named" class="%behat.mink.selector.named.class%">
             <tag name="behat.mink.selector" alias="named" />
         </service>
 
-        <service id="behat.mink.context.initializer" class="Behat\MinkExtension\Context\Initializer\MinkAwareInitializer">
+        <service id="behat.mink.context.class_guesser" class="%behat.mink.context.class_guesser.class%">
+            <tag name="behat.context.class_guesser" priority="-1" />
+        </service>
+        <service id="behat.mink.context.initializer" class="%behat.mink.context.initializer.class%">
             <argument type="service" id="behat.mink" />
             <argument>%behat.mink.parameters%</argument>
             <tag name="behat.context.initializer" />
         </service>
 
-        <service id="behat.mink.context.class_guesser" class="Behat\MinkExtension\Context\ClassGuesser\MinkContextClassGuesser">
-            <tag name="behat.context.class_guesser" priority="-1" />
-        </service>
-
     </services>
 </container>
diff --git a/src/Behat/MinkExtension/services/sessions/goutte.xml b/src/Behat/MinkExtension/services/sessions/goutte.xml
index 7866b1f..20b87e8 100644
--- a/src/Behat/MinkExtension/services/sessions/goutte.xml
+++ b/src/Behat/MinkExtension/services/sessions/goutte.xml
@@ -18,7 +18,7 @@
                     <argument type="service" id="behat.mink.goutte" />
                 </service>
             </argument>
-            <argument type="service" id="behat.mink.selectors_handler" />
+            <argument type="service" id="behat.mink.selector.handler" />
             <tag name="behat.mink.session" alias="goutte" />
         </service>
 
diff --git a/src/Behat/MinkExtension/services/sessions/sahi.xml b/src/Behat/MinkExtension/services/sessions/sahi.xml
index 1918429..4df461d 100644
--- a/src/Behat/MinkExtension/services/sessions/sahi.xml
+++ b/src/Behat/MinkExtension/services/sessions/sahi.xml
@@ -22,7 +22,7 @@
                     <argument type="service" id="behat.mink.sahi" />
                 </service>
             </argument>
-            <argument type="service" id="behat.mink.selectors_handler" />
+            <argument type="service" id="behat.mink.selector.handler" />
             <tag name="behat.mink.session" alias="sahi" />
         </service>
 
diff --git a/src/Behat/MinkExtension/services/sessions/selenium.xml b/src/Behat/MinkExtension/services/sessions/selenium.xml
index 0268970..0fe04e7 100644
--- a/src/Behat/MinkExtension/services/sessions/selenium.xml
+++ b/src/Behat/MinkExtension/services/sessions/selenium.xml
@@ -22,7 +22,7 @@
                     <argument type="service" id="behat.mink.selenium" />
                 </service>
             </argument>
-            <argument type="service" id="behat.mink.selectors_handler" />
+            <argument type="service" id="behat.mink.selector.handler" />
             <tag name="behat.mink.session" alias="selenium" />
         </service>
 
diff --git a/src/Behat/MinkExtension/services/sessions/selenium2.xml b/src/Behat/MinkExtension/services/sessions/selenium2.xml
index 3fc20e0..8bf6842 100644
--- a/src/Behat/MinkExtension/services/sessions/selenium2.xml
+++ b/src/Behat/MinkExtension/services/sessions/selenium2.xml
@@ -27,7 +27,7 @@
                     <argument type="string">%behat.mink.selenium2.wd_host%</argument>
                 </service>
             </argument>
-            <argument type="service" id="behat.mink.selectors_handler" />
+            <argument type="service" id="behat.mink.selector.handler" />
             <tag name="behat.mink.session" alias="selenium2" />
         </service>
 
diff --git a/src/Behat/MinkExtension/services/sessions/zombie.xml b/src/Behat/MinkExtension/services/sessions/zombie.xml
index a6de69d..bbf38ad 100644
--- a/src/Behat/MinkExtension/services/sessions/zombie.xml
+++ b/src/Behat/MinkExtension/services/sessions/zombie.xml
@@ -24,7 +24,7 @@
                     <argument>%behat.mink.zombie.auto_server%</argument>
                 </service>
             </argument>
-            <argument type="service" id="behat.mink.selectors_handler" />
+            <argument type="service" id="behat.mink.selector.handler" />
             <tag name="behat.mink.session" alias="zombie" />
         </service>