diff --git a/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php b/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php
index e058547..6f8b36e 100644
--- a/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php
+++ b/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralRequestMessageBinder.php
@@ -98,7 +98,7 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
         $this->messageRefs[$hash] = $message;
 
         $messageBinder = new MessageBinder($message);
-        foreach ($this->definitionComplexTypes[$phpType] as $type) {
+        foreach ($this->definitionComplexTypes[$phpType]['properties'] as $type) {
             $property = $type->getName();
             $value = $messageBinder->readProperty($property);
 
diff --git a/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralResponseMessageBinder.php b/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralResponseMessageBinder.php
index dfdd509..34d1edd 100644
--- a/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralResponseMessageBinder.php
+++ b/src/BeSimple/SoapBundle/ServiceBinding/RpcLiteralResponseMessageBinder.php
@@ -83,7 +83,7 @@ class RpcLiteralResponseMessageBinder implements MessageBinderInterface
         }
 
         $messageBinder = new MessageBinder($message);
-        foreach ($this->definitionComplexTypes[$phpType] as $type) {
+        foreach ($this->definitionComplexTypes[$phpType]['properties'] as $type) {
             $property = $type->getName();
             $value = $messageBinder->readProperty($property);
 
diff --git a/src/BeSimple/SoapBundle/ServiceDefinition/Strategy/ComplexType.php b/src/BeSimple/SoapBundle/ServiceDefinition/Strategy/ComplexType.php
index ab824ad..d38d871 100644
--- a/src/BeSimple/SoapBundle/ServiceDefinition/Strategy/ComplexType.php
+++ b/src/BeSimple/SoapBundle/ServiceDefinition/Strategy/ComplexType.php
@@ -84,6 +84,6 @@ class ComplexType extends AbstractComplexTypeStrategy
         $complexType->appendChild($all);
         $this->getContext()->getSchema()->appendChild($complexType);
 
-        $this->definition->addDefinitionComplexType($type, $definitionComplexType);
+        $this->definition->addDefinitionComplexType($classname, $definitionComplexType);
     }
 }