diff --git a/src/XML/wsa_200508/AbstractWsaElement.php b/src/XML/wsa_200508/AbstractWsaElement.php
index b2c648d8..78df1b33 100644
--- a/src/XML/wsa_200508/AbstractWsaElement.php
+++ b/src/XML/wsa_200508/AbstractWsaElement.php
@@ -18,5 +18,5 @@ abstract class AbstractWsaElement extends AbstractElement
     public const NS = C::NS_ADDR_200508;
 
     /** @var string */
-    public const NS_PREFIX = 'wsa';
+    public const NS_PREFIX = 'wsa10';
 }
diff --git a/src/XML/wst_200502/Issuer.php b/src/XML/wst_200502/Issuer.php
index c3fd31c7..114473df 100644
--- a/src/XML/wst_200502/Issuer.php
+++ b/src/XML/wst_200502/Issuer.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa_200408\AbstractEndpointReferenceType;
 
 /**
  * An Issuer element
@@ -22,8 +22,7 @@ final class Issuer extends AbstractEndpointReferenceType
 
     /** The exclusions for the xs:any element */
     public const XS_ANY_ELT_EXCLUSIONS = [
-        ['http://www.w3.org/2005/08/addressing', 'Address'],
-        ['http://www.w3.org/2005/08/addressing', 'Metadata'],
-        ['http://www.w3.org/2005/08/addressing', 'ReferenceParameters'],
+        ['http://schemas.xmlsoap.org/ws/2004/08/addressing', 'Address'],
+        ['http://schemas.xmlsoap.org/ws/2004/08/addressing', 'ReferenceParameters'],
     ];
 }
diff --git a/tests/WSSecurity/XML/wsa_200508/MetadataTest.php b/tests/WSSecurity/XML/wsa_200508/MetadataTest.php
index 2edb601d..d41e4298 100644
--- a/tests/WSSecurity/XML/wsa_200508/MetadataTest.php
+++ b/tests/WSSecurity/XML/wsa_200508/MetadataTest.php
@@ -76,7 +76,7 @@ public function testMarshallingWithNoContent(): void
     {
         $metadata = new Metadata([], []);
         $this->assertEquals(
-            '<wsa:Metadata xmlns:wsa="http://www.w3.org/2005/08/addressing"/>',
+            '<wsa10:Metadata xmlns:wsa10="http://www.w3.org/2005/08/addressing"/>',
             strval($metadata),
         );
         $this->assertTrue($metadata->isEmptyElement());
diff --git a/tests/WSSecurity/XML/wsa_200508/ProblemActionTest.php b/tests/WSSecurity/XML/wsa_200508/ProblemActionTest.php
index fb0909f6..d72c8d8d 100644
--- a/tests/WSSecurity/XML/wsa_200508/ProblemActionTest.php
+++ b/tests/WSSecurity/XML/wsa_200508/ProblemActionTest.php
@@ -81,7 +81,7 @@ public function testMarshallingEmptyElement(): void
         $wsans = C::NS_ADDR_200508;
         $problemAction = new ProblemAction();
         $this->assertEquals(
-            "<wsa:ProblemAction xmlns:wsa=\"$wsans\"/>",
+            "<wsa10:ProblemAction xmlns:wsa10=\"$wsans\"/>",
             strval($problemAction),
         );
         $this->assertTrue($problemAction->isEmptyElement());
diff --git a/tests/WSSecurity/XML/wsa_200508/ProblemHeaderQNameTest.php b/tests/WSSecurity/XML/wsa_200508/ProblemHeaderQNameTest.php
index ac86d129..b837c3b9 100644
--- a/tests/WSSecurity/XML/wsa_200508/ProblemHeaderQNameTest.php
+++ b/tests/WSSecurity/XML/wsa_200508/ProblemHeaderQNameTest.php
@@ -57,7 +57,7 @@ public function testMarshalling(): void
     {
         $attr1 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'attr1', 'value1');
 
-        $problemHeaderQName = new ProblemHeaderQName('wsa:Action', [$attr1]);
+        $problemHeaderQName = new ProblemHeaderQName('wsa10:Action', [$attr1]);
 
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
diff --git a/tests/WSSecurity/XML/wsa_200508/ReferenceParametersTest.php b/tests/WSSecurity/XML/wsa_200508/ReferenceParametersTest.php
index b147033c..6cfb9960 100644
--- a/tests/WSSecurity/XML/wsa_200508/ReferenceParametersTest.php
+++ b/tests/WSSecurity/XML/wsa_200508/ReferenceParametersTest.php
@@ -76,7 +76,7 @@ public function testMarshallingWithNoContent(): void
     {
         $referenceParameters = new ReferenceParameters([], []);
         $this->assertEquals(
-            '<wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing"/>',
+            '<wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing"/>',
             strval($referenceParameters),
         );
         $this->assertTrue($referenceParameters->isEmptyElement());
diff --git a/tests/WSSecurity/XML/wsa_200508/RelatesToTest.php b/tests/WSSecurity/XML/wsa_200508/RelatesToTest.php
index 6f7170b5..e43c52ef 100644
--- a/tests/WSSecurity/XML/wsa_200508/RelatesToTest.php
+++ b/tests/WSSecurity/XML/wsa_200508/RelatesToTest.php
@@ -66,7 +66,7 @@ public function testMarshallingWithNoContent(): void
     {
         $relatesTo = new RelatesTo(null, []);
         $this->assertEquals(
-            '<wsa:RelatesTo xmlns:wsa="http://www.w3.org/2005/08/addressing"/>',
+            '<wsa10:RelatesTo xmlns:wsa10="http://www.w3.org/2005/08/addressing"/>',
             strval($relatesTo),
         );
         $this->assertTrue($relatesTo->isEmptyElement());
diff --git a/tests/WSSecurity/XML/wst_200502/AuthenticatorTest.php b/tests/WSSecurity/XML/wst_200502/AuthenticatorTest.php
index 8cbe4699..8e15f5e2 100644
--- a/tests/WSSecurity/XML/wst_200502/AuthenticatorTest.php
+++ b/tests/WSSecurity/XML/wst_200502/AuthenticatorTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractAuthenticatorType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Authenticator;
diff --git a/tests/WSSecurity/XML/wst_200502/ClaimsTest.php b/tests/WSSecurity/XML/wst_200502/ClaimsTest.php
index 786e1bc4..e5a994b2 100644
--- a/tests/WSSecurity/XML/wst_200502/ClaimsTest.php
+++ b/tests/WSSecurity/XML/wst_200502/ClaimsTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractClaimsType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Claims;
diff --git a/tests/WSSecurity/XML/wst_200502/DelegateToTest.php b/tests/WSSecurity/XML/wst_200502/DelegateToTest.php
index 2f6810e2..b4325e9c 100644
--- a/tests/WSSecurity/XML/wst_200502/DelegateToTest.php
+++ b/tests/WSSecurity/XML/wst_200502/DelegateToTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractDelegateToType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\DelegateTo;
diff --git a/tests/WSSecurity/XML/wst_200502/EncryptionTest.php b/tests/WSSecurity/XML/wst_200502/EncryptionTest.php
index 68391f4b..e733095e 100644
--- a/tests/WSSecurity/XML/wst_200502/EncryptionTest.php
+++ b/tests/WSSecurity/XML/wst_200502/EncryptionTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractEncryptionType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Encryption;
diff --git a/tests/WSSecurity/XML/wst_200502/EntropyTest.php b/tests/WSSecurity/XML/wst_200502/EntropyTest.php
index 9972026d..43cf49b2 100644
--- a/tests/WSSecurity/XML/wst_200502/EntropyTest.php
+++ b/tests/WSSecurity/XML/wst_200502/EntropyTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractEntropyType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Entropy;
diff --git a/tests/WSSecurity/XML/wst_200502/IssuedTokensTest.php b/tests/WSSecurity/XML/wst_200502/IssuedTokensTest.php
index 1d8203b5..6dfdb8d3 100644
--- a/tests/WSSecurity/XML/wst_200502/IssuedTokensTest.php
+++ b/tests/WSSecurity/XML/wst_200502/IssuedTokensTest.php
@@ -9,8 +9,8 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\AbstractEndpointReferenceType;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\IssuedTokens;
 use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse;
diff --git a/tests/WSSecurity/XML/wst_200502/IssuerTest.php b/tests/WSSecurity/XML/wst_200502/IssuerTest.php
index 58709364..c7aae1ea 100644
--- a/tests/WSSecurity/XML/wst_200502/IssuerTest.php
+++ b/tests/WSSecurity/XML/wst_200502/IssuerTest.php
@@ -8,10 +8,9 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
-use SimpleSAML\WSSecurity\XML\wsa_200508\AbstractEndpointReferenceType;
-use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
-use SimpleSAML\WSSecurity\XML\wsa_200508\Metadata;
-use SimpleSAML\WSSecurity\XML\wsa_200508\ReferenceParameters;
+use SimpleSAML\WSSecurity\XML\wsa_200408\AbstractEndpointReferenceType;
+use SimpleSAML\WSSecurity\XML\wsa_200408\Address;
+use SimpleSAML\WSSecurity\XML\wsa_200408\ReferenceParameters;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Issuer;
 use SimpleSAML\XML\Attribute;
@@ -59,10 +58,6 @@ public static function setUpBeforeClass(): void
             '<m:GetPrice xmlns:m="https://www.w3schools.com/prices"><m:Item>Pears</m:Item></m:GetPrice>',
         )->documentElement;
 
-        self::$metadataContent = DOMDocumentFactory::fromString(
-            '<m:GetPrice xmlns:m="https://www.w3schools.com/prices"><m:Item>Apples</m:Item></m:GetPrice>',
-        )->documentElement;
-
         self::$customContent = DOMDocumentFactory::fromString(
             '<ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>',
         )->documentElement;
@@ -77,21 +72,20 @@ public static function setUpBeforeClass(): void
      */
     public function testMarshalling(): void
     {
-        $attr1 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'test1', 'value1');
         $attr2 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'test2', 'value2');
-        $attr3 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'test3', 'value3');
         $attr4 = new Attribute('urn:x-simplesamlphp:namespace', 'ssp', 'test4', 'value4');
 
-        $referenceParameters = new ReferenceParameters([new Chunk(self::$referenceParametersContent)], [$attr4]);
-        $metadata = new Metadata([new Chunk(self::$metadataContent)], [$attr3]);
+        $referenceParameters = new ReferenceParameters([new Chunk(self::$referenceParametersContent)]);
         $chunk = new Chunk(self::$customContent);
 
         $issuer = new Issuer(
             new Address('https://login.microsoftonline.com/login.srf', [$attr2]),
+            null,
             $referenceParameters,
-            $metadata,
+            null,
+            null,
             [$chunk],
-            [$attr1],
+            [$attr4],
         );
 
         $this->assertEquals(
diff --git a/tests/WSSecurity/XML/wst_200502/KeyExchangeTokenTest.php b/tests/WSSecurity/XML/wst_200502/KeyExchangeTokenTest.php
index a2e0788a..109fc2de 100644
--- a/tests/WSSecurity/XML/wst_200502/KeyExchangeTokenTest.php
+++ b/tests/WSSecurity/XML/wst_200502/KeyExchangeTokenTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractKeyExchangeTokenType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\KeyExchangeToken;
diff --git a/tests/WSSecurity/XML/wst_200502/OnBehalfOfTest.php b/tests/WSSecurity/XML/wst_200502/OnBehalfOfTest.php
index 88774311..745080ce 100644
--- a/tests/WSSecurity/XML/wst_200502/OnBehalfOfTest.php
+++ b/tests/WSSecurity/XML/wst_200502/OnBehalfOfTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractOnBehalfOfType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\OnBehalfOf;
diff --git a/tests/WSSecurity/XML/wst_200502/ParticipantTest.php b/tests/WSSecurity/XML/wst_200502/ParticipantTest.php
index fce43df8..b73803ed 100644
--- a/tests/WSSecurity/XML/wst_200502/ParticipantTest.php
+++ b/tests/WSSecurity/XML/wst_200502/ParticipantTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractParticipantType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Participant;
diff --git a/tests/WSSecurity/XML/wst_200502/ParticipantsTest.php b/tests/WSSecurity/XML/wst_200502/ParticipantsTest.php
index b3e0f7cd..97af1c63 100644
--- a/tests/WSSecurity/XML/wst_200502/ParticipantsTest.php
+++ b/tests/WSSecurity/XML/wst_200502/ParticipantsTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractParticipantsType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Participant;
diff --git a/tests/WSSecurity/XML/wst_200502/PrimaryTest.php b/tests/WSSecurity/XML/wst_200502/PrimaryTest.php
index eea202a1..7aa94f55 100644
--- a/tests/WSSecurity/XML/wst_200502/PrimaryTest.php
+++ b/tests/WSSecurity/XML/wst_200502/PrimaryTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractParticipantType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Primary;
diff --git a/tests/WSSecurity/XML/wst_200502/ProofEncryptionTest.php b/tests/WSSecurity/XML/wst_200502/ProofEncryptionTest.php
index 3b1e15f5..2748339c 100644
--- a/tests/WSSecurity/XML/wst_200502/ProofEncryptionTest.php
+++ b/tests/WSSecurity/XML/wst_200502/ProofEncryptionTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractProofEncryptionType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\ProofEncryption;
diff --git a/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php b/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php
index b1a3adfc..582232f2 100644
--- a/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php
+++ b/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseCollectionTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractRequestSecurityTokenResponseCollectionType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse;
diff --git a/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseTest.php b/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseTest.php
index 54f511f2..3ae0f45b 100644
--- a/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseTest.php
+++ b/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenResponseTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractRequestSecurityTokenResponseType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse;
diff --git a/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenTest.php b/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenTest.php
index ab635bc6..6308484d 100644
--- a/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wst_200502/RequestSecurityTokenTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractRequestSecurityTokenType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityToken;
diff --git a/tests/WSSecurity/XML/wst_200502/RequestedProofTokenTest.php b/tests/WSSecurity/XML/wst_200502/RequestedProofTokenTest.php
index ecd8b9a8..fd6ee803 100644
--- a/tests/WSSecurity/XML/wst_200502/RequestedProofTokenTest.php
+++ b/tests/WSSecurity/XML/wst_200502/RequestedProofTokenTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractRequestedProofTokenType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\RequestedProofToken;
diff --git a/tests/WSSecurity/XML/wst_200502/RequestedSecurityTokenTest.php b/tests/WSSecurity/XML/wst_200502/RequestedSecurityTokenTest.php
index 7e791532..949cecba 100644
--- a/tests/WSSecurity/XML/wst_200502/RequestedSecurityTokenTest.php
+++ b/tests/WSSecurity/XML/wst_200502/RequestedSecurityTokenTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractRequestedSecurityTokenType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\RequestedSecurityToken;
diff --git a/tests/WSSecurity/XML/wst_200502/SignChallengeResponseTest.php b/tests/WSSecurity/XML/wst_200502/SignChallengeResponseTest.php
index 86445fc7..59ee1f1f 100644
--- a/tests/WSSecurity/XML/wst_200502/SignChallengeResponseTest.php
+++ b/tests/WSSecurity/XML/wst_200502/SignChallengeResponseTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractSignChallengeType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Challenge;
diff --git a/tests/WSSecurity/XML/wst_200502/SignChallengeTest.php b/tests/WSSecurity/XML/wst_200502/SignChallengeTest.php
index 6c5b54f6..fe5999de 100644
--- a/tests/WSSecurity/XML/wst_200502/SignChallengeTest.php
+++ b/tests/WSSecurity/XML/wst_200502/SignChallengeTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractSignChallengeType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\Challenge;
diff --git a/tests/WSSecurity/XML/wst_200502/UseKeyTest.php b/tests/WSSecurity/XML/wst_200502/UseKeyTest.php
index 7a987930..b28ac832 100644
--- a/tests/WSSecurity/XML/wst_200502/UseKeyTest.php
+++ b/tests/WSSecurity/XML/wst_200502/UseKeyTest.php
@@ -9,7 +9,7 @@
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SOAP\Constants as SOAP;
 use SimpleSAML\Test\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200408\MessageID;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractUseKeyType;
 use SimpleSAML\WSSecurity\XML\wst_200502\AbstractWstElement;
 use SimpleSAML\WSSecurity\XML\wst_200502\UseKey;
diff --git a/tests/resources/xml/fed_ApplicationServiceEndpoint.xml b/tests/resources/xml/fed_ApplicationServiceEndpoint.xml
index c379f671..186204ce 100644
--- a/tests/resources/xml/fed_ApplicationServiceEndpoint.xml
+++ b/tests/resources/xml/fed_ApplicationServiceEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:ApplicationServiceEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:ApplicationServiceEndpoint>
diff --git a/tests/resources/xml/fed_AttributeServiceEndpoint.xml b/tests/resources/xml/fed_AttributeServiceEndpoint.xml
index 743deaa7..360ed792 100644
--- a/tests/resources/xml/fed_AttributeServiceEndpoint.xml
+++ b/tests/resources/xml/fed_AttributeServiceEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:AttributeServiceEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:AttributeServiceEndpoint>
diff --git a/tests/resources/xml/fed_AttributeServiceEndpoints.xml b/tests/resources/xml/fed_AttributeServiceEndpoints.xml
index dbefd0ce..55aded81 100644
--- a/tests/resources/xml/fed_AttributeServiceEndpoints.xml
+++ b/tests/resources/xml/fed_AttributeServiceEndpoints.xml
@@ -1,16 +1,16 @@
 <fed:AttributeServiceEndpoints xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:AttributeServiceEndpoints>
diff --git a/tests/resources/xml/fed_PassiveRequestorEndpoint.xml b/tests/resources/xml/fed_PassiveRequestorEndpoint.xml
index 26111b71..213a89a3 100644
--- a/tests/resources/xml/fed_PassiveRequestorEndpoint.xml
+++ b/tests/resources/xml/fed_PassiveRequestorEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:PassiveRequestorEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:PassiveRequestorEndpoint>
diff --git a/tests/resources/xml/fed_PassiveRequestorEndpoints.xml b/tests/resources/xml/fed_PassiveRequestorEndpoints.xml
index d3a83317..e2d380ae 100644
--- a/tests/resources/xml/fed_PassiveRequestorEndpoints.xml
+++ b/tests/resources/xml/fed_PassiveRequestorEndpoints.xml
@@ -1,16 +1,16 @@
 <fed:PassiveRequestorEndpoints xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:PassiveRequestorEndpoints>
diff --git a/tests/resources/xml/fed_PseudonymServiceEndpoint.xml b/tests/resources/xml/fed_PseudonymServiceEndpoint.xml
index 258037ba..48f3bfd9 100644
--- a/tests/resources/xml/fed_PseudonymServiceEndpoint.xml
+++ b/tests/resources/xml/fed_PseudonymServiceEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:PseudonymServiceEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:PseudonymServiceEndpoint>
diff --git a/tests/resources/xml/fed_PseudonymServiceEndpoints.xml b/tests/resources/xml/fed_PseudonymServiceEndpoints.xml
index f7ab0412..2f5715b3 100644
--- a/tests/resources/xml/fed_PseudonymServiceEndpoints.xml
+++ b/tests/resources/xml/fed_PseudonymServiceEndpoints.xml
@@ -1,16 +1,16 @@
 <fed:PseudonymServiceEndpoints xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:PseudonymServiceEndpoints>
diff --git a/tests/resources/xml/fed_ReferenceEPR.xml b/tests/resources/xml/fed_ReferenceEPR.xml
index ea92ae2e..e5cf7b91 100644
--- a/tests/resources/xml/fed_ReferenceEPR.xml
+++ b/tests/resources/xml/fed_ReferenceEPR.xml
@@ -1,14 +1,14 @@
 <fed:ReferenceEPR xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-  <wsa:Address xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:attr2="testval2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:attr3="testval3">
+  <wsa10:Address xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:attr2="testval2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:attr3="testval3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:attr4="testval4">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:attr4="testval4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
 </fed:ReferenceEPR>
diff --git a/tests/resources/xml/fed_ReferenceToken.xml b/tests/resources/xml/fed_ReferenceToken.xml
index c2e718aa..24170883 100644
--- a/tests/resources/xml/fed_ReferenceToken.xml
+++ b/tests/resources/xml/fed_ReferenceToken.xml
@@ -1,16 +1,16 @@
-<fed:ReferenceToken xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:m="https://www.w3schools.com/prices" ssp:attr1="testval1">
+<fed:ReferenceToken xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:m="https://www.w3schools.com/prices" ssp:attr1="testval1">
   <fed:ReferenceEPR ssp:attr2="testval2">
-    <wsa:Address ssp:attr3="testval3">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters ssp:attr4="testval4">
+    <wsa10:Address ssp:attr3="testval3">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters ssp:attr4="testval4">
       <m:GetPrice>
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:attr5="testval5">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:attr5="testval5">
       <m:GetPrice>
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk>SomeChunk</ssp:Chunk>
   </fed:ReferenceEPR>
   <fed:ReferenceDigest ssp:attr6="testval6">/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</fed:ReferenceDigest>
diff --git a/tests/resources/xml/fed_SecurityTokenServiceEndpoint.xml b/tests/resources/xml/fed_SecurityTokenServiceEndpoint.xml
index 00c25db4..0b9b22dd 100644
--- a/tests/resources/xml/fed_SecurityTokenServiceEndpoint.xml
+++ b/tests/resources/xml/fed_SecurityTokenServiceEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:SecurityTokenServiceEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:SecurityTokenServiceEndpoint>
diff --git a/tests/resources/xml/fed_SingleSignOutNotificationEndpoint.xml b/tests/resources/xml/fed_SingleSignOutNotificationEndpoint.xml
index fda7b348..f3303fc0 100644
--- a/tests/resources/xml/fed_SingleSignOutNotificationEndpoint.xml
+++ b/tests/resources/xml/fed_SingleSignOutNotificationEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:SingleSignOutNotificationEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:SingleSignOutNotificationEndpoint>
diff --git a/tests/resources/xml/fed_SingleSignOutNotificationEndpoints.xml b/tests/resources/xml/fed_SingleSignOutNotificationEndpoints.xml
index 6c2a6d0c..2c719398 100644
--- a/tests/resources/xml/fed_SingleSignOutNotificationEndpoints.xml
+++ b/tests/resources/xml/fed_SingleSignOutNotificationEndpoints.xml
@@ -1,16 +1,16 @@
 <fed:SingleSignOutNotificationEndpoints xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:SingleSignOutNotificationEndpoints>
diff --git a/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoint.xml b/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoint.xml
index 4d0b77d4..7896d018 100644
--- a/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoint.xml
+++ b/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoint.xml
@@ -1,16 +1,16 @@
 <fed:SingleSignOutSubscriptionEndpoint xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:SingleSignOutSubscriptionEndpoint>
diff --git a/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoints.xml b/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoints.xml
index 72db0e3f..e9f501e1 100644
--- a/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoints.xml
+++ b/tests/resources/xml/fed_SingleSignOutSubscriptionEndpoints.xml
@@ -1,16 +1,16 @@
 <fed:SingleSignOutSubscriptionEndpoints xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:SingleSignOutSubscriptionEndpoints>
diff --git a/tests/resources/xml/fed_TargetScopes.xml b/tests/resources/xml/fed_TargetScopes.xml
index b6ad394f..0dee9e47 100644
--- a/tests/resources/xml/fed_TargetScopes.xml
+++ b/tests/resources/xml/fed_TargetScopes.xml
@@ -1,16 +1,16 @@
 <fed:TargetScopes xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-    <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+    <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Pears</m:Item>
       </m:GetPrice>
-    </wsa:ReferenceParameters>
-    <wsa:Metadata ssp:test3="value3">
+    </wsa10:ReferenceParameters>
+    <wsa10:Metadata ssp:test3="value3">
       <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
         <m:Item>Apples</m:Item>
       </m:GetPrice>
-    </wsa:Metadata>
+    </wsa10:Metadata>
     <ssp:Chunk xmlns:ssp="urn:x-simplesamlphp:namespace">SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </fed:TargetScopes>
diff --git a/tests/resources/xml/sp/200702/Issuer.xml b/tests/resources/xml/sp/200702/Issuer.xml
index 4fd8d0b9..1bbf720d 100644
--- a/tests/resources/xml/sp/200702/Issuer.xml
+++ b/tests/resources/xml/sp/200702/Issuer.xml
@@ -1,14 +1,14 @@
 <sp:Issuer xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:Address xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test3="value3">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test3="value3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
 </sp:Issuer>
diff --git a/tests/resources/xml/wsa/200508/Action.xml b/tests/resources/xml/wsa/200508/Action.xml
index 391b2341..82118cfa 100644
--- a/tests/resources/xml/wsa/200508/Action.xml
+++ b/tests/resources/xml/wsa/200508/Action.xml
@@ -1 +1 @@
-<wsa:Action xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">https://login.microsoftonline.com/login.srf</wsa:Action>
+<wsa10:Action xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">https://login.microsoftonline.com/login.srf</wsa10:Action>
diff --git a/tests/resources/xml/wsa/200508/Address.xml b/tests/resources/xml/wsa/200508/Address.xml
index 0566c856..c155957f 100644
--- a/tests/resources/xml/wsa/200508/Address.xml
+++ b/tests/resources/xml/wsa/200508/Address.xml
@@ -1 +1 @@
-<wsa:Address xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">https://login.microsoftonline.com/login.srf</wsa:Address>
+<wsa10:Address xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">https://login.microsoftonline.com/login.srf</wsa10:Address>
diff --git a/tests/resources/xml/wsa/200508/EndpointReference.xml b/tests/resources/xml/wsa/200508/EndpointReference.xml
index 5b8423b9..70fa00c8 100644
--- a/tests/resources/xml/wsa/200508/EndpointReference.xml
+++ b/tests/resources/xml/wsa/200508/EndpointReference.xml
@@ -1,14 +1,14 @@
-<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+<wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+  <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata ssp:test3="value3">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata ssp:test3="value3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
-</wsa:EndpointReference>
+</wsa10:EndpointReference>
diff --git a/tests/resources/xml/wsa/200508/FaultTo.xml b/tests/resources/xml/wsa/200508/FaultTo.xml
index c745037d..5b0e6ea4 100644
--- a/tests/resources/xml/wsa/200508/FaultTo.xml
+++ b/tests/resources/xml/wsa/200508/FaultTo.xml
@@ -1,14 +1,14 @@
-<wsa:FaultTo xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+<wsa10:FaultTo xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+  <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata ssp:test3="value3">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata ssp:test3="value3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
-</wsa:FaultTo>
+</wsa10:FaultTo>
diff --git a/tests/resources/xml/wsa/200508/From.xml b/tests/resources/xml/wsa/200508/From.xml
index 516eb0b7..320a2a0b 100644
--- a/tests/resources/xml/wsa/200508/From.xml
+++ b/tests/resources/xml/wsa/200508/From.xml
@@ -1,14 +1,14 @@
-<wsa:From xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+<wsa10:From xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+  <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata ssp:test3="value3">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata ssp:test3="value3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
-</wsa:From>
+</wsa10:From>
diff --git a/tests/resources/xml/wsa/200508/MessageID.xml b/tests/resources/xml/wsa/200508/MessageID.xml
index 1dce8155..5dad329b 100644
--- a/tests/resources/xml/wsa/200508/MessageID.xml
+++ b/tests/resources/xml/wsa/200508/MessageID.xml
@@ -1 +1 @@
-<wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+<wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
diff --git a/tests/resources/xml/wsa/200508/Metadata.xml b/tests/resources/xml/wsa/200508/Metadata.xml
index 46b2b92d..ae1cc617 100644
--- a/tests/resources/xml/wsa/200508/Metadata.xml
+++ b/tests/resources/xml/wsa/200508/Metadata.xml
@@ -1,5 +1,5 @@
-<wsa:Metadata xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">
+<wsa10:Metadata xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">
   <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
     <m:Item>Apples</m:Item>
   </m:GetPrice>
-</wsa:Metadata>
+</wsa10:Metadata>
diff --git a/tests/resources/xml/wsa/200508/ProblemAction.xml b/tests/resources/xml/wsa/200508/ProblemAction.xml
index 3ea4295c..d9ed3a91 100644
--- a/tests/resources/xml/wsa/200508/ProblemAction.xml
+++ b/tests/resources/xml/wsa/200508/ProblemAction.xml
@@ -1,4 +1,4 @@
-<wsa:ProblemAction xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">
-  <wsa:Action ssp:test="value">https://login.microsoftonline.com/login.srf</wsa:Action>
-  <wsa:SoapAction>http://www.example.com/</wsa:SoapAction>
-</wsa:ProblemAction>
+<wsa10:ProblemAction xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">
+  <wsa10:Action ssp:test="value">https://login.microsoftonline.com/login.srf</wsa10:Action>
+  <wsa10:SoapAction>http://www.example.com/</wsa10:SoapAction>
+</wsa10:ProblemAction>
diff --git a/tests/resources/xml/wsa/200508/ProblemHeaderQName.xml b/tests/resources/xml/wsa/200508/ProblemHeaderQName.xml
index 5410c00b..451af81c 100644
--- a/tests/resources/xml/wsa/200508/ProblemHeaderQName.xml
+++ b/tests/resources/xml/wsa/200508/ProblemHeaderQName.xml
@@ -1 +1 @@
-<wsa:ProblemHeaderQName xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">wsa:Action</wsa:ProblemHeaderQName>
+<wsa10:ProblemHeaderQName xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">wsa10:Action</wsa10:ProblemHeaderQName>
diff --git a/tests/resources/xml/wsa/200508/ProblemIRI.xml b/tests/resources/xml/wsa/200508/ProblemIRI.xml
index 46a2d3bd..327723d2 100644
--- a/tests/resources/xml/wsa/200508/ProblemIRI.xml
+++ b/tests/resources/xml/wsa/200508/ProblemIRI.xml
@@ -1 +1 @@
-<wsa:ProblemIRI xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">https://login.microsoftonline.com/login.srf</wsa:ProblemIRI>
+<wsa10:ProblemIRI xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">https://login.microsoftonline.com/login.srf</wsa10:ProblemIRI>
diff --git a/tests/resources/xml/wsa/200508/ReferenceParameters.xml b/tests/resources/xml/wsa/200508/ReferenceParameters.xml
index 3cc43371..1b5f6b02 100644
--- a/tests/resources/xml/wsa/200508/ReferenceParameters.xml
+++ b/tests/resources/xml/wsa/200508/ReferenceParameters.xml
@@ -1,5 +1,5 @@
-<wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:test="urn:test:something" test:attr1="testval1">
+<wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:test="urn:test:something" test:attr1="testval1">
   <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
     <m:Item>Apples</m:Item>
   </m:GetPrice>
-</wsa:ReferenceParameters>
+</wsa10:ReferenceParameters>
diff --git a/tests/resources/xml/wsa/200508/RelatesTo.xml b/tests/resources/xml/wsa/200508/RelatesTo.xml
index bd673640..19c57de6 100644
--- a/tests/resources/xml/wsa/200508/RelatesTo.xml
+++ b/tests/resources/xml/wsa/200508/RelatesTo.xml
@@ -1 +1 @@
-<wsa:RelatesTo xmlns:wsa="http://www.w3.org/2005/08/addressing" RelationshipType="http://www.w3.org/2005/08/addressing/reply" xmlns:test="urn:test:something" test:attr1="testval1" />
+<wsa10:RelatesTo xmlns:wsa10="http://www.w3.org/2005/08/addressing" RelationshipType="http://www.w3.org/2005/08/addressing/reply" xmlns:test="urn:test:something" test:attr1="testval1" />
diff --git a/tests/resources/xml/wsa/200508/ReplyTo.xml b/tests/resources/xml/wsa/200508/ReplyTo.xml
index d2137a9c..21e197d3 100644
--- a/tests/resources/xml/wsa/200508/ReplyTo.xml
+++ b/tests/resources/xml/wsa/200508/ReplyTo.xml
@@ -1,14 +1,14 @@
-<wsa:ReplyTo xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters ssp:test4="value4">
+<wsa10:ReplyTo xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+  <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters ssp:test4="value4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata ssp:test3="value3">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata ssp:test3="value3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
-</wsa:ReplyTo>
+</wsa10:ReplyTo>
diff --git a/tests/resources/xml/wsa/200508/RetryAfter.xml b/tests/resources/xml/wsa/200508/RetryAfter.xml
index 9d5f8c89..6d6650fe 100644
--- a/tests/resources/xml/wsa/200508/RetryAfter.xml
+++ b/tests/resources/xml/wsa/200508/RetryAfter.xml
@@ -1 +1 @@
-<wsa:RetryAfter xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">1234567890</wsa:RetryAfter>
+<wsa10:RetryAfter xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test="value">1234567890</wsa10:RetryAfter>
diff --git a/tests/resources/xml/wsa/200508/SoapAction.xml b/tests/resources/xml/wsa/200508/SoapAction.xml
index 146a9630..25eb43a2 100644
--- a/tests/resources/xml/wsa/200508/SoapAction.xml
+++ b/tests/resources/xml/wsa/200508/SoapAction.xml
@@ -1 +1 @@
-<wsa:SoapAction xmlns:wsa="http://www.w3.org/2005/08/addressing">http://www.example.com/</wsa:SoapAction>
+<wsa10:SoapAction xmlns:wsa10="http://www.w3.org/2005/08/addressing">http://www.example.com/</wsa10:SoapAction>
diff --git a/tests/resources/xml/wsa/200508/To.xml b/tests/resources/xml/wsa/200508/To.xml
index 9be40aba..7c134c7b 100644
--- a/tests/resources/xml/wsa/200508/To.xml
+++ b/tests/resources/xml/wsa/200508/To.xml
@@ -1 +1 @@
-<wsa:To xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:attr="test" xmlns:ssp="urn:x-simplesamlphp:namespace">https://login.microsoftonline.com/login.srf</wsa:To>
+<wsa10:To xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:attr="test" xmlns:ssp="urn:x-simplesamlphp:namespace">https://login.microsoftonline.com/login.srf</wsa10:To>
diff --git a/tests/resources/xml/wsp_AppliesTo.xml b/tests/resources/xml/wsp_AppliesTo.xml
index 70345fce..c4aef33b 100644
--- a/tests/resources/xml/wsp_AppliesTo.xml
+++ b/tests/resources/xml/wsp_AppliesTo.xml
@@ -1,5 +1,5 @@
 <wsp:AppliesTo xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:attr1="value1">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
-    <wsa:Address>http://www.fabrikam123.example.com/acct</wsa:Address>
-  </wsa:EndpointReference>
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing">
+    <wsa10:Address>http://www.fabrikam123.example.com/acct</wsa10:Address>
+  </wsa10:EndpointReference>
 </wsp:AppliesTo>
diff --git a/tests/resources/xml/wsp_PolicyAttachment.xml b/tests/resources/xml/wsp_PolicyAttachment.xml
index ac5e54db..642fda22 100644
--- a/tests/resources/xml/wsp_PolicyAttachment.xml
+++ b/tests/resources/xml/wsp_PolicyAttachment.xml
@@ -1,8 +1,8 @@
-<wsp:PolicyAttachment xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" ssp:attr1="testval1">
+<wsp:PolicyAttachment xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" ssp:attr1="testval1">
   <wsp:AppliesTo ssp:attr2="testval2">
-    <wsa:EndpointReference>
-      <wsa:Address>http://www.fabrikam123.example.com/acct</wsa:Address>
-    </wsa:EndpointReference>
+    <wsa10:EndpointReference>
+      <wsa10:Address>http://www.fabrikam123.example.com/acct</wsa10:Address>
+    </wsa10:EndpointReference>
   </wsp:AppliesTo>
   <wsp:Policy Name="phpunit" wsu:Id="MyId" ssp:attr3="testval3">
     <wsp:ExactlyOne />
diff --git a/tests/resources/xml/wst/200502/Authenticator.xml b/tests/resources/xml/wst/200502/Authenticator.xml
index a837cfce..73809aa4 100644
--- a/tests/resources/xml/wst/200502/Authenticator.xml
+++ b/tests/resources/xml/wst/200502/Authenticator.xml
@@ -1,4 +1,4 @@
 <t:Authenticator xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
   <t:CombinedHash>/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</t:CombinedHash>
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Authenticator>
diff --git a/tests/resources/xml/wst/200502/Claims.xml b/tests/resources/xml/wst/200502/Claims.xml
index 6fcc5d27..92964edc 100644
--- a/tests/resources/xml/wst/200502/Claims.xml
+++ b/tests/resources/xml/wst/200502/Claims.xml
@@ -1,3 +1,3 @@
-<t:Claims xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" Dialect="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
+<t:Claims xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" Dialect="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
   <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Claims>
diff --git a/tests/resources/xml/wst/200502/DelegateTo.xml b/tests/resources/xml/wst/200502/DelegateTo.xml
index f070ba25..5af4856f 100644
--- a/tests/resources/xml/wst/200502/DelegateTo.xml
+++ b/tests/resources/xml/wst/200502/DelegateTo.xml
@@ -1,3 +1,3 @@
 <t:DelegateTo xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:DelegateTo>
diff --git a/tests/resources/xml/wst/200502/Encryption.xml b/tests/resources/xml/wst/200502/Encryption.xml
index a05a1852..ac9605e1 100644
--- a/tests/resources/xml/wst/200502/Encryption.xml
+++ b/tests/resources/xml/wst/200502/Encryption.xml
@@ -1,3 +1,3 @@
 <t:Encryption xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Encryption>
diff --git a/tests/resources/xml/wst/200502/Entropy.xml b/tests/resources/xml/wst/200502/Entropy.xml
index 1555a08e..f4bc387b 100644
--- a/tests/resources/xml/wst/200502/Entropy.xml
+++ b/tests/resources/xml/wst/200502/Entropy.xml
@@ -1,3 +1,3 @@
-<t:Entropy xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
+<t:Entropy xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
   <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Entropy>
diff --git a/tests/resources/xml/wst/200502/IssuedTokens.xml b/tests/resources/xml/wst/200502/IssuedTokens.xml
index 9240bfab..9ddb5249 100644
--- a/tests/resources/xml/wst/200502/IssuedTokens.xml
+++ b/tests/resources/xml/wst/200502/IssuedTokens.xml
@@ -1,4 +1,4 @@
-<t:IssuedTokens xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
+<t:IssuedTokens xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
   <t:RequestSecurityTokenResponse Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
     <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
   </t:RequestSecurityTokenResponse>
diff --git a/tests/resources/xml/wst/200502/Issuer.xml b/tests/resources/xml/wst/200502/Issuer.xml
index 36455907..01557133 100644
--- a/tests/resources/xml/wst/200502/Issuer.xml
+++ b/tests/resources/xml/wst/200502/Issuer.xml
@@ -1,14 +1,9 @@
-<t:Issuer xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+<t:Issuer xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test4="value4">
+  <wsa:Address xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
+  <wsa:ReferenceParameters xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
   </wsa:ReferenceParameters>
-  <wsa:Metadata xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test3="value3">
-    <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
-      <m:Item>Apples</m:Item>
-    </m:GetPrice>
-  </wsa:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
 </t:Issuer>
diff --git a/tests/resources/xml/wst/200502/KeyExchangeToken.xml b/tests/resources/xml/wst/200502/KeyExchangeToken.xml
index a7e7b89b..1e244361 100644
--- a/tests/resources/xml/wst/200502/KeyExchangeToken.xml
+++ b/tests/resources/xml/wst/200502/KeyExchangeToken.xml
@@ -1,3 +1,3 @@
 <t:KeyExchangeToken xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:KeyExchangeToken>
diff --git a/tests/resources/xml/wst/200502/OnBehalfOf.xml b/tests/resources/xml/wst/200502/OnBehalfOf.xml
index 06842b29..ae77c8be 100644
--- a/tests/resources/xml/wst/200502/OnBehalfOf.xml
+++ b/tests/resources/xml/wst/200502/OnBehalfOf.xml
@@ -1,3 +1,3 @@
 <t:OnBehalfOf xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:OnBehalfOf>
diff --git a/tests/resources/xml/wst/200502/Participant.xml b/tests/resources/xml/wst/200502/Participant.xml
index e404f832..93a8505c 100644
--- a/tests/resources/xml/wst/200502/Participant.xml
+++ b/tests/resources/xml/wst/200502/Participant.xml
@@ -1,3 +1,3 @@
 <t:Participant xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Participant>
diff --git a/tests/resources/xml/wst/200502/Participants.xml b/tests/resources/xml/wst/200502/Participants.xml
index c84e3ba3..f880db69 100644
--- a/tests/resources/xml/wst/200502/Participants.xml
+++ b/tests/resources/xml/wst/200502/Participants.xml
@@ -1,9 +1,9 @@
 <t:Participants xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
   <t:Primary>
-    <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
   </t:Primary>
   <t:Participant>
-    <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
   </t:Participant>
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Participants>
diff --git a/tests/resources/xml/wst/200502/Primary.xml b/tests/resources/xml/wst/200502/Primary.xml
index f2a2daf4..68da9af0 100644
--- a/tests/resources/xml/wst/200502/Primary.xml
+++ b/tests/resources/xml/wst/200502/Primary.xml
@@ -1,3 +1,3 @@
 <t:Primary xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:Primary>
diff --git a/tests/resources/xml/wst/200502/ProofEncryption.xml b/tests/resources/xml/wst/200502/ProofEncryption.xml
index bf99fe41..d32fd451 100644
--- a/tests/resources/xml/wst/200502/ProofEncryption.xml
+++ b/tests/resources/xml/wst/200502/ProofEncryption.xml
@@ -1,3 +1,3 @@
 <t:ProofEncryption xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:ProofEncryption>
diff --git a/tests/resources/xml/wst/200502/RequestSecurityToken.xml b/tests/resources/xml/wst/200502/RequestSecurityToken.xml
index 33d0d05f..6779655e 100644
--- a/tests/resources/xml/wst/200502/RequestSecurityToken.xml
+++ b/tests/resources/xml/wst/200502/RequestSecurityToken.xml
@@ -1,3 +1,3 @@
 <t:RequestSecurityToken xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:RequestSecurityToken>
diff --git a/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml b/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml
index 2b9b11c2..40b9ec2a 100644
--- a/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml
+++ b/tests/resources/xml/wst/200502/RequestSecurityTokenResponse.xml
@@ -1,3 +1,3 @@
 <t:RequestSecurityTokenResponse xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:RequestSecurityTokenResponse>
diff --git a/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml b/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml
index b17babed..2cb47e75 100644
--- a/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml
+++ b/tests/resources/xml/wst/200502/RequestSecurityTokenResponseCollection.xml
@@ -1,4 +1,4 @@
-<t:RequestSecurityTokenResponseCollection xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
+<t:RequestSecurityTokenResponseCollection xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
   <t:RequestSecurityTokenResponse Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
     <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
   </t:RequestSecurityTokenResponse>
diff --git a/tests/resources/xml/wst/200502/RequestedProofToken.xml b/tests/resources/xml/wst/200502/RequestedProofToken.xml
index 6fc7b986..34bcc821 100644
--- a/tests/resources/xml/wst/200502/RequestedProofToken.xml
+++ b/tests/resources/xml/wst/200502/RequestedProofToken.xml
@@ -1,3 +1,3 @@
 <t:RequestedProofToken xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:RequestedProofToken>
diff --git a/tests/resources/xml/wst/200502/RequestedSecurityToken.xml b/tests/resources/xml/wst/200502/RequestedSecurityToken.xml
index ea5080b1..f0ce634d 100644
--- a/tests/resources/xml/wst/200502/RequestedSecurityToken.xml
+++ b/tests/resources/xml/wst/200502/RequestedSecurityToken.xml
@@ -1,3 +1,3 @@
 <t:RequestedSecurityToken xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:RequestedSecurityToken>
diff --git a/tests/resources/xml/wst/200502/SignChallenge.xml b/tests/resources/xml/wst/200502/SignChallenge.xml
index b0dcf186..285fd6a1 100644
--- a/tests/resources/xml/wst/200502/SignChallenge.xml
+++ b/tests/resources/xml/wst/200502/SignChallenge.xml
@@ -1,4 +1,4 @@
-<t:SignChallenge xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
+<t:SignChallenge xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
   <t:Challenge>accepted</t:Challenge>
   <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:SignChallenge>
diff --git a/tests/resources/xml/wst/200502/SignChallengeResponse.xml b/tests/resources/xml/wst/200502/SignChallengeResponse.xml
index dd084297..6116428b 100644
--- a/tests/resources/xml/wst/200502/SignChallengeResponse.xml
+++ b/tests/resources/xml/wst/200502/SignChallengeResponse.xml
@@ -1,4 +1,4 @@
-<t:SignChallengeResponse xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
+<t:SignChallengeResponse xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
   <t:Challenge>accepted</t:Challenge>
   <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:SignChallengeResponse>
diff --git a/tests/resources/xml/wst/200502/UseKey.xml b/tests/resources/xml/wst/200502/UseKey.xml
index 7bbd65c8..54474e5a 100644
--- a/tests/resources/xml/wst/200502/UseKey.xml
+++ b/tests/resources/xml/wst/200502/UseKey.xml
@@ -1,3 +1,3 @@
 <t:UseKey xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" Sig="urn:x-simplesamlphp:namespace">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa:MessageID xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
 </t:UseKey>
diff --git a/tests/resources/xml/wst/200512/Authenticator.xml b/tests/resources/xml/wst/200512/Authenticator.xml
index 5187d2ae..77969174 100644
--- a/tests/resources/xml/wst/200512/Authenticator.xml
+++ b/tests/resources/xml/wst/200512/Authenticator.xml
@@ -1,4 +1,4 @@
 <trust:Authenticator xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
   <trust:CombinedHash>/CTj03d1DB5e2t7CTo9BEzCf5S9NRzwnBgZRlm32REI=</trust:CombinedHash>
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Authenticator>
diff --git a/tests/resources/xml/wst/200512/CancelTarget.xml b/tests/resources/xml/wst/200512/CancelTarget.xml
index 2cedc2fb..29c3da18 100644
--- a/tests/resources/xml/wst/200512/CancelTarget.xml
+++ b/tests/resources/xml/wst/200512/CancelTarget.xml
@@ -1,3 +1,3 @@
 <trust:CancelTarget xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:CancelTarget>
diff --git a/tests/resources/xml/wst/200512/Claims.xml b/tests/resources/xml/wst/200512/Claims.xml
index 13257b96..25c6d237 100644
--- a/tests/resources/xml/wst/200512/Claims.xml
+++ b/tests/resources/xml/wst/200512/Claims.xml
@@ -1,3 +1,3 @@
-<trust:Claims xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" Dialect="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-  <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+<trust:Claims xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" Dialect="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
+  <wsa10:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Claims>
diff --git a/tests/resources/xml/wst/200512/DelegateTo.xml b/tests/resources/xml/wst/200512/DelegateTo.xml
index fcf76b6a..40804dfd 100644
--- a/tests/resources/xml/wst/200512/DelegateTo.xml
+++ b/tests/resources/xml/wst/200512/DelegateTo.xml
@@ -1,3 +1,3 @@
 <trust:DelegateTo xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:DelegateTo>
diff --git a/tests/resources/xml/wst/200512/Encryption.xml b/tests/resources/xml/wst/200512/Encryption.xml
index b8fd2637..b9c397e7 100644
--- a/tests/resources/xml/wst/200512/Encryption.xml
+++ b/tests/resources/xml/wst/200512/Encryption.xml
@@ -1,3 +1,3 @@
 <trust:Encryption xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Encryption>
diff --git a/tests/resources/xml/wst/200512/Entropy.xml b/tests/resources/xml/wst/200512/Entropy.xml
index 914f068b..502011e7 100644
--- a/tests/resources/xml/wst/200512/Entropy.xml
+++ b/tests/resources/xml/wst/200512/Entropy.xml
@@ -1,3 +1,3 @@
-<trust:Entropy xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
-  <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+<trust:Entropy xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
+  <wsa10:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Entropy>
diff --git a/tests/resources/xml/wst/200512/IssuedTokens.xml b/tests/resources/xml/wst/200512/IssuedTokens.xml
index f2f88709..4910c249 100644
--- a/tests/resources/xml/wst/200512/IssuedTokens.xml
+++ b/tests/resources/xml/wst/200512/IssuedTokens.xml
@@ -1,5 +1,5 @@
-<trust:IssuedTokens xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
+<trust:IssuedTokens xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
   <trust:RequestSecurityTokenResponse Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-    <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa10:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
   </trust:RequestSecurityTokenResponse>
 </trust:IssuedTokens>
diff --git a/tests/resources/xml/wst/200512/Issuer.xml b/tests/resources/xml/wst/200512/Issuer.xml
index 3bced6a4..43de3c34 100644
--- a/tests/resources/xml/wst/200512/Issuer.xml
+++ b/tests/resources/xml/wst/200512/Issuer.xml
@@ -1,14 +1,14 @@
 <trust:Issuer xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-  <wsa:Address xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
-  <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
+  <wsa10:Address xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
+  <wsa10:ReferenceParameters xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test4="value4">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Pears</m:Item>
     </m:GetPrice>
-  </wsa:ReferenceParameters>
-  <wsa:Metadata xmlns:wsa="http://www.w3.org/2005/08/addressing" ssp:test3="value3">
+  </wsa10:ReferenceParameters>
+  <wsa10:Metadata xmlns:wsa10="http://www.w3.org/2005/08/addressing" ssp:test3="value3">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>
     </m:GetPrice>
-  </wsa:Metadata>
+  </wsa10:Metadata>
   <ssp:Chunk>SomeChunk</ssp:Chunk>
 </trust:Issuer>
diff --git a/tests/resources/xml/wst/200512/KeyExchangeToken.xml b/tests/resources/xml/wst/200512/KeyExchangeToken.xml
index 01dcf7de..90bb2e47 100644
--- a/tests/resources/xml/wst/200512/KeyExchangeToken.xml
+++ b/tests/resources/xml/wst/200512/KeyExchangeToken.xml
@@ -1,3 +1,3 @@
 <trust:KeyExchangeToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:KeyExchangeToken>
diff --git a/tests/resources/xml/wst/200512/OnBehalfOf.xml b/tests/resources/xml/wst/200512/OnBehalfOf.xml
index 9c5b2b88..87805a6e 100644
--- a/tests/resources/xml/wst/200512/OnBehalfOf.xml
+++ b/tests/resources/xml/wst/200512/OnBehalfOf.xml
@@ -1,3 +1,3 @@
 <trust:OnBehalfOf xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:OnBehalfOf>
diff --git a/tests/resources/xml/wst/200512/Participant.xml b/tests/resources/xml/wst/200512/Participant.xml
index 54890b62..514dbfb6 100644
--- a/tests/resources/xml/wst/200512/Participant.xml
+++ b/tests/resources/xml/wst/200512/Participant.xml
@@ -1,3 +1,3 @@
 <trust:Participant xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Participant>
diff --git a/tests/resources/xml/wst/200512/Participants.xml b/tests/resources/xml/wst/200512/Participants.xml
index 2123556e..f8a0168e 100644
--- a/tests/resources/xml/wst/200512/Participants.xml
+++ b/tests/resources/xml/wst/200512/Participants.xml
@@ -1,9 +1,9 @@
 <trust:Participants xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
   <trust:Primary>
-    <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
   </trust:Primary>
   <trust:Participant>
-    <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
   </trust:Participant>
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Participants>
diff --git a/tests/resources/xml/wst/200512/Primary.xml b/tests/resources/xml/wst/200512/Primary.xml
index 7036fed2..c3086ab2 100644
--- a/tests/resources/xml/wst/200512/Primary.xml
+++ b/tests/resources/xml/wst/200512/Primary.xml
@@ -1,3 +1,3 @@
 <trust:Primary xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:Primary>
diff --git a/tests/resources/xml/wst/200512/ProofEncryption.xml b/tests/resources/xml/wst/200512/ProofEncryption.xml
index 3897f754..38f5b27e 100644
--- a/tests/resources/xml/wst/200512/ProofEncryption.xml
+++ b/tests/resources/xml/wst/200512/ProofEncryption.xml
@@ -1,3 +1,3 @@
 <trust:ProofEncryption xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:ProofEncryption>
diff --git a/tests/resources/xml/wst/200512/RenewTarget.xml b/tests/resources/xml/wst/200512/RenewTarget.xml
index daacc107..1bbc923f 100644
--- a/tests/resources/xml/wst/200512/RenewTarget.xml
+++ b/tests/resources/xml/wst/200512/RenewTarget.xml
@@ -1,3 +1,3 @@
 <trust:RenewTarget xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:RenewTarget>
diff --git a/tests/resources/xml/wst/200512/RequestSecurityToken.xml b/tests/resources/xml/wst/200512/RequestSecurityToken.xml
index 32da4f42..95ff109d 100644
--- a/tests/resources/xml/wst/200512/RequestSecurityToken.xml
+++ b/tests/resources/xml/wst/200512/RequestSecurityToken.xml
@@ -1,3 +1,3 @@
 <trust:RequestSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:RequestSecurityToken>
diff --git a/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml
index 0e908419..48b24e73 100644
--- a/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml
+++ b/tests/resources/xml/wst/200512/RequestSecurityTokenCollection.xml
@@ -1,8 +1,8 @@
 <trust:RequestSecurityTokenCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
   <trust:RequestSecurityToken xmlns:ssp="urn:x-simplesamlphp:namespace" Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-    <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
   </trust:RequestSecurityToken>
   <trust:RequestSecurityToken xmlns:ssp="urn:x-simplesamlphp:namespace" Context="urn:x-simplesamlphp:namespace" ssp:attr2="testval2">
-    <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7df</wsa:MessageID>
+    <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7df</wsa10:MessageID>
   </trust:RequestSecurityToken>
 </trust:RequestSecurityTokenCollection>
diff --git a/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml
index 28caa45b..d00d29bf 100644
--- a/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml
+++ b/tests/resources/xml/wst/200512/RequestSecurityTokenResponse.xml
@@ -1,3 +1,3 @@
 <trust:RequestSecurityTokenResponse xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:RequestSecurityTokenResponse>
diff --git a/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml b/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml
index c35af8b9..67a127f8 100644
--- a/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml
+++ b/tests/resources/xml/wst/200512/RequestSecurityTokenResponseCollection.xml
@@ -1,5 +1,5 @@
-<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
+<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr2="testval2">
   <trust:RequestSecurityTokenResponse Context="urn:x-simplesamlphp:namespace" ssp:attr1="testval1">
-    <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+    <wsa10:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
   </trust:RequestSecurityTokenResponse>
 </trust:RequestSecurityTokenResponseCollection>
diff --git a/tests/resources/xml/wst/200512/RequestedProofToken.xml b/tests/resources/xml/wst/200512/RequestedProofToken.xml
index 77752a2d..ec561bc3 100644
--- a/tests/resources/xml/wst/200512/RequestedProofToken.xml
+++ b/tests/resources/xml/wst/200512/RequestedProofToken.xml
@@ -1,3 +1,3 @@
 <trust:RequestedProofToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:RequestedProofToken>
diff --git a/tests/resources/xml/wst/200512/RequestedSecurityToken.xml b/tests/resources/xml/wst/200512/RequestedSecurityToken.xml
index bcf42aff..a2f6feb5 100644
--- a/tests/resources/xml/wst/200512/RequestedSecurityToken.xml
+++ b/tests/resources/xml/wst/200512/RequestedSecurityToken.xml
@@ -1,3 +1,3 @@
 <trust:RequestedSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:RequestedSecurityToken>
diff --git a/tests/resources/xml/wst/200512/SignChallenge.xml b/tests/resources/xml/wst/200512/SignChallenge.xml
index 19d10efa..c6e26b84 100644
--- a/tests/resources/xml/wst/200512/SignChallenge.xml
+++ b/tests/resources/xml/wst/200512/SignChallenge.xml
@@ -1,4 +1,4 @@
-<trust:SignChallenge xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
+<trust:SignChallenge xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
   <trust:Challenge>accepted</trust:Challenge>
-  <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:SignChallenge>
diff --git a/tests/resources/xml/wst/200512/SignChallengeResponse.xml b/tests/resources/xml/wst/200512/SignChallengeResponse.xml
index aca665ee..79e35a50 100644
--- a/tests/resources/xml/wst/200512/SignChallengeResponse.xml
+++ b/tests/resources/xml/wst/200512/SignChallengeResponse.xml
@@ -1,4 +1,4 @@
-<trust:SignChallengeResponse xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
+<trust:SignChallengeResponse xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:ssp="urn:x-simplesamlphp:namespace" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" ssp:attr1="testval1">
   <trust:Challenge>accepted</trust:Challenge>
-  <wsa:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID soapenv:mustUnderstand="1">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:SignChallengeResponse>
diff --git a/tests/resources/xml/wst/200512/UseKey.xml b/tests/resources/xml/wst/200512/UseKey.xml
index 096626c7..8658b5d5 100644
--- a/tests/resources/xml/wst/200512/UseKey.xml
+++ b/tests/resources/xml/wst/200512/UseKey.xml
@@ -1,3 +1,3 @@
 <trust:UseKey xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" Sig="urn:x-simplesamlphp:namespace">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:UseKey>
diff --git a/tests/resources/xml/wst/200512/ValidateTarget.xml b/tests/resources/xml/wst/200512/ValidateTarget.xml
index 9729b19e..711035de 100644
--- a/tests/resources/xml/wst/200512/ValidateTarget.xml
+++ b/tests/resources/xml/wst/200512/ValidateTarget.xml
@@ -1,3 +1,3 @@
 <trust:ValidateTarget xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
-  <wsa:MessageID xmlns:wsa="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa:MessageID>
+  <wsa10:MessageID xmlns:wsa10="http://www.w3.org/2005/08/addressing" soapenv:mustUnderstand="1" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">uuid:d0ccf3cd-2dce-4c1a-a5d6-be8912ecd7de</wsa10:MessageID>
 </trust:ValidateTarget>
diff --git a/tests/resources/xml/wsx_MetadataReference.xml b/tests/resources/xml/wsx_MetadataReference.xml
index 25972d9c..7692170c 100644
--- a/tests/resources/xml/wsx_MetadataReference.xml
+++ b/tests/resources/xml/wsx_MetadataReference.xml
@@ -1,6 +1,6 @@
 <wsx:MetadataReference xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
-  <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
-    <wsa:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa:Address>
+  <wsa10:EndpointReference xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:ssp="urn:x-simplesamlphp:namespace" ssp:test1="value1">
+    <wsa10:Address ssp:test2="value2">https://login.microsoftonline.com/login.srf</wsa10:Address>
     <ssp:Chunk>SomeChunk</ssp:Chunk>
-  </wsa:EndpointReference>
+  </wsa10:EndpointReference>
 </wsx:MetadataReference>