diff --git a/Resources/config/routing.xml b/Resources/config/routing.xml
index 9120e74..52a27f8 100644
--- a/Resources/config/routing.xml
+++ b/Resources/config/routing.xml
@@ -5,11 +5,11 @@
     xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
   <route id="_webservice_call" pattern="/{webservice}">
-    <default key="_controller">webservice_controller:handle</default>
+    <default key="_controller">webservice.controller:handle</default>
     <requirement key="_method">POST</requirement>
   </route>
   <route id="_webservice_definition" pattern="/{webservice}">
-    <default key="_controller">webservice_controller:definition</default>
+    <default key="_controller">webservice.controller:definition</default>
     <requirement key="_method">GET</requirement>
   </route>
 </routes>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 4cb4bf6..ba52356 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -14,17 +14,11 @@
 		<parameter key="webservice.definition.dumper.class">Bundle\WebServiceBundle\ServiceDefinition\Dumper\WsdlFileDumper</parameter>
 	</parameters>
 	
-	<services>
-		<!-- redefine FrameworkBundle 'http_kernel' service with different id -->
-        <service id="symfony_http_kernel" class="%http_kernel.class%">
-            <argument type="service" id="event_dispatcher" />
-            <argument type="service" id="controller_resolver" />
-        </service>
-        
-		<service id="webservice.kernel" class="Bundle\WebServiceBundle\SoapKernel">
+	<services>        
+		<service id="webservice_controller" class="Bundle\WebServiceBundle\Controller\SoapWebServiceController">
             <argument type="service" id="webservice.binder" />
             <argument type="service" id="webservice.server.factory" />
-            <argument type="service" id="symfony_http_kernel" />
+            <argument type="service" id="http_kernel" />
 		</service>
 		
 		<service id="webservice.binder" class="Bundle\WebServiceBundle\ServiceBinding\ServiceBinder">
@@ -61,4 +55,4 @@
 			<argument type="string">%webservice.definition.wsdl%</argument>
 		</service>
 	</services>
-</container>
\ No newline at end of file
+</container>