diff --git a/src/BeSimple/SoapCommon/Definition/Method.php b/src/BeSimple/SoapCommon/Definition/Method.php
index 5c10f56..99b1f4c 100644
--- a/src/BeSimple/SoapCommon/Definition/Method.php
+++ b/src/BeSimple/SoapCommon/Definition/Method.php
@@ -12,8 +12,6 @@
 
 namespace BeSimple\SoapCommon\Definition;
 
-use BeSimple\SoapCommon\Definition\Type\TypeRepository;
-
 /**
  * @author Francis Besset <francis.besset@gmail.com>
  */
@@ -53,7 +51,7 @@ class Method
 
     public function getUse()
     {
-        return \SOAP_ENCODED;
+        return \SOAP_LITERAL;
     }
 
     public function addHeader($name, $type)
@@ -68,11 +66,7 @@ class Method
 
     public function setOutput($type, $name = 'return')
     {
-        if ('return' !== $name) {
-            $this->output = new Message($name);
-        }
-
-        $this->output->add($name, $type);
+        $this->output->add('return', $type);
     }
 
     public function getHeaders()
diff --git a/src/BeSimple/SoapWsdl/Dumper/AbstractVersion.php b/src/BeSimple/SoapWsdl/Dumper/AbstractVersion.php
index e56f2df..c67c035 100644
--- a/src/BeSimple/SoapWsdl/Dumper/AbstractVersion.php
+++ b/src/BeSimple/SoapWsdl/Dumper/AbstractVersion.php
@@ -61,7 +61,7 @@ abstract class AbstractVersion implements VersionInterface
     {
         if (!$this->bindingNode) {
             $this->bindingNode = $this->document->createElement('binding');
-            $this->bindingNode->setAttribute('name', $this->name.'_SOAP');
+            $this->bindingNode->setAttribute('name', $this->name.'Binding');
             $this->bindingNode->setAttribute('type', $this->portTypeName);
 
             $this->addSoapBinding();
@@ -75,7 +75,7 @@ abstract class AbstractVersion implements VersionInterface
         if (!$this->servicePortNode) {
             $this->servicePortNode = $this->document->createElement('port');
             $this->servicePortNode->setAttribute('name', $this->name.'Port');
-            $this->servicePortNode->setAttribute('binding', $this->typeNs.':'.$this->name.'_SOAP');
+            $this->servicePortNode->setAttribute('binding', $this->typeNs.':'.$this->name.'Binding');
 
             $this->addSoapAddress();
         }