diff --git a/composer.json b/composer.json
index 34d55cf..77345ad 100644
--- a/composer.json
+++ b/composer.json
@@ -14,14 +14,14 @@
         "ext-dom": "*",
         "ext-spl": "*",
 
-        "simplesamlphp/assert": "~1.7.0",
-        "simplesamlphp/composer-xmlprovider-installer": "~1.0.0",
+        "simplesamlphp/assert": "~1.8.1",
+        "simplesamlphp/composer-xmlprovider-installer": "~1.0.1",
         "simplesamlphp/saml2": "^5@dev",
-        "simplesamlphp/xml-security": "~1.12.0",
-        "simplesamlphp/xml-common": "~1.23.2"
+        "simplesamlphp/xml-security": "~1.13.0",
+        "simplesamlphp/xml-common": "~1.24.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.8"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Assert/Assert.php b/src/Assert/Assert.php
new file mode 100644
index 0000000..eafe62f
--- /dev/null
+++ b/src/Assert/Assert.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\WSSecurity\Assert;
+
+use SimpleSAML\XMLSecurity\Assert\Assert as BaseAssert;
+
+/**
+ * @package simplesamlphp/ws-security
+ */
+class Assert extends BaseAssert
+{
+}
diff --git a/src/XML/ReferenceIdentifierTrait.php b/src/XML/ReferenceIdentifierTrait.php
index 65b3d2d..5f7e049 100644
--- a/src/XML/ReferenceIdentifierTrait.php
+++ b/src/XML/ReferenceIdentifierTrait.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/auth/AbstractAdditionalContextType.php b/src/XML/auth/AbstractAdditionalContextType.php
index fc25bb8..92eec23 100644
--- a/src/XML/auth/AbstractAdditionalContextType.php
+++ b/src/XML/auth/AbstractAdditionalContextType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\auth\ContextItem;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/auth/AbstractClaimType.php b/src/XML/auth/AbstractClaimType.php
index c24fe0f..998ee11 100644
--- a/src/XML/auth/AbstractClaimType.php
+++ b/src/XML/auth/AbstractClaimType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\auth\ConstrainedValue;
 use SimpleSAML\WSSecurity\XML\auth\Description;
 use SimpleSAML\WSSecurity\XML\auth\DisplayName;
diff --git a/src/XML/auth/AbstractConstrainedManyValueType.php b/src/XML/auth/AbstractConstrainedManyValueType.php
index 8c662b4..af27423 100644
--- a/src/XML/auth/AbstractConstrainedManyValueType.php
+++ b/src/XML/auth/AbstractConstrainedManyValueType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 /**
diff --git a/src/XML/auth/AbstractConstrainedSingleValueType.php b/src/XML/auth/AbstractConstrainedSingleValueType.php
index 5c45484..eb4af4b 100644
--- a/src/XML/auth/AbstractConstrainedSingleValueType.php
+++ b/src/XML/auth/AbstractConstrainedSingleValueType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 
diff --git a/src/XML/auth/AbstractConstrainedValueType.php b/src/XML/auth/AbstractConstrainedValueType.php
index d6e449d..a2939ca 100644
--- a/src/XML/auth/AbstractConstrainedValueType.php
+++ b/src/XML/auth/AbstractConstrainedValueType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/auth/AbstractContextItemType.php b/src/XML/auth/AbstractContextItemType.php
index 46e4c9a..eac4f84 100644
--- a/src/XML/auth/AbstractContextItemType.php
+++ b/src/XML/auth/AbstractContextItemType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/auth/AbstractDescriptionType.php b/src/XML/auth/AbstractDescriptionType.php
index 74745fe..624228d 100644
--- a/src/XML/auth/AbstractDescriptionType.php
+++ b/src/XML/auth/AbstractDescriptionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/auth/AbstractDisplayNameType.php b/src/XML/auth/AbstractDisplayNameType.php
index 9c1aa88..28bdb85 100644
--- a/src/XML/auth/AbstractDisplayNameType.php
+++ b/src/XML/auth/AbstractDisplayNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/auth/AbstractDisplayValueType.php b/src/XML/auth/AbstractDisplayValueType.php
index c925c6f..77118ad 100644
--- a/src/XML/auth/AbstractDisplayValueType.php
+++ b/src/XML/auth/AbstractDisplayValueType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/auth/AbstractEncryptedValueType.php b/src/XML/auth/AbstractEncryptedValueType.php
index 5992d3d..caaa1b7 100644
--- a/src/XML/auth/AbstractEncryptedValueType.php
+++ b/src/XML/auth/AbstractEncryptedValueType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/auth/AbstractStructuredValueType.php b/src/XML/auth/AbstractStructuredValueType.php
index 2741d0a..fd7c93a 100644
--- a/src/XML/auth/AbstractStructuredValueType.php
+++ b/src/XML/auth/AbstractStructuredValueType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/auth/AbstractValueInRangeType.php b/src/XML/auth/AbstractValueInRangeType.php
index f659c74..e7bd0b4 100644
--- a/src/XML/auth/AbstractValueInRangeType.php
+++ b/src/XML/auth/AbstractValueInRangeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\auth;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 use function array_pop;
diff --git a/src/XML/fed/AbstractApplicationServiceType.php b/src/XML/fed/AbstractApplicationServiceType.php
index 6c08252..e94b34a 100644
--- a/src/XML/fed/AbstractApplicationServiceType.php
+++ b/src/XML/fed/AbstractApplicationServiceType.php
@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\XML\md\Extensions;
 use SimpleSAML\SAML2\XML\md\Organization;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/fed/AbstractAssertionType.php b/src/XML/fed/AbstractAssertionType.php
index ec3d981..90be0b6 100644
--- a/src/XML/fed/AbstractAssertionType.php
+++ b/src/XML/fed/AbstractAssertionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/fed/AbstractAttributeExtensibleString.php b/src/XML/fed/AbstractAttributeExtensibleString.php
index b170a07..d54cdd6 100644
--- a/src/XML/fed/AbstractAttributeExtensibleString.php
+++ b/src/XML/fed/AbstractAttributeExtensibleString.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/fed/AbstractAttributeExtensibleURI.php b/src/XML/fed/AbstractAttributeExtensibleURI.php
index 144265a..a7498fc 100644
--- a/src/XML/fed/AbstractAttributeExtensibleURI.php
+++ b/src/XML/fed/AbstractAttributeExtensibleURI.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\URIElementTrait;
diff --git a/src/XML/fed/AbstractAttributeServiceType.php b/src/XML/fed/AbstractAttributeServiceType.php
index 4011a03..c3b4274 100644
--- a/src/XML/fed/AbstractAttributeServiceType.php
+++ b/src/XML/fed/AbstractAttributeServiceType.php
@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\XML\md\Extensions;
 use SimpleSAML\SAML2\XML\md\Organization;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/fed/AbstractClaimDialectType.php b/src/XML/fed/AbstractClaimDialectType.php
index 9ea3317..77f38ad 100644
--- a/src/XML/fed/AbstractClaimDialectType.php
+++ b/src/XML/fed/AbstractClaimDialectType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractClaimDialectsOfferedType.php b/src/XML/fed/AbstractClaimDialectsOfferedType.php
index 3fcf08a..0d81f62 100644
--- a/src/XML/fed/AbstractClaimDialectsOfferedType.php
+++ b/src/XML/fed/AbstractClaimDialectsOfferedType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\fed\ClaimDialect;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/fed/AbstractClaimTypesOfferedType.php b/src/XML/fed/AbstractClaimTypesOfferedType.php
index f6943ad..7622281 100644
--- a/src/XML/fed/AbstractClaimTypesOfferedType.php
+++ b/src/XML/fed/AbstractClaimTypesOfferedType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/fed/AbstractClaimTypesRequestedType.php b/src/XML/fed/AbstractClaimTypesRequestedType.php
index 7baaf34..36ae5a7 100644
--- a/src/XML/fed/AbstractClaimTypesRequestedType.php
+++ b/src/XML/fed/AbstractClaimTypesRequestedType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\auth\ClaimType;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/fed/AbstractClientPseudonymType.php b/src/XML/fed/AbstractClientPseudonymType.php
index 5417a61..252e35c 100644
--- a/src/XML/fed/AbstractClientPseudonymType.php
+++ b/src/XML/fed/AbstractClientPseudonymType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractEndpointType.php b/src/XML/fed/AbstractEndpointType.php
index 88b3936..119158e 100644
--- a/src/XML/fed/AbstractEndpointType.php
+++ b/src/XML/fed/AbstractEndpointType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/fed/AbstractFederationMetadataHandlerType.php b/src/XML/fed/AbstractFederationMetadataHandlerType.php
index 3433f6f..a73b956 100644
--- a/src/XML/fed/AbstractFederationMetadataHandlerType.php
+++ b/src/XML/fed/AbstractFederationMetadataHandlerType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/fed/AbstractFederationMetadataType.php b/src/XML/fed/AbstractFederationMetadataType.php
index 0e95a74..90a1d27 100644
--- a/src/XML/fed/AbstractFederationMetadataType.php
+++ b/src/XML/fed/AbstractFederationMetadataType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/fed/AbstractFederationType.php b/src/XML/fed/AbstractFederationType.php
index 2ad33df..95f3e38 100644
--- a/src/XML/fed/AbstractFederationType.php
+++ b/src/XML/fed/AbstractFederationType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractFilterPseudonymsType.php b/src/XML/fed/AbstractFilterPseudonymsType.php
index 26195e2..72899a7 100644
--- a/src/XML/fed/AbstractFilterPseudonymsType.php
+++ b/src/XML/fed/AbstractFilterPseudonymsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractFreshnessType.php b/src/XML/fed/AbstractFreshnessType.php
index 6b7aa74..46f7219 100644
--- a/src/XML/fed/AbstractFreshnessType.php
+++ b/src/XML/fed/AbstractFreshnessType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractIssuerNameType.php b/src/XML/fed/AbstractIssuerNameType.php
index 9267880..7e893b6 100644
--- a/src/XML/fed/AbstractIssuerNameType.php
+++ b/src/XML/fed/AbstractIssuerNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractLogicalServiceNamesOfferedType.php b/src/XML/fed/AbstractLogicalServiceNamesOfferedType.php
index 243b18d..99e1833 100644
--- a/src/XML/fed/AbstractLogicalServiceNamesOfferedType.php
+++ b/src/XML/fed/AbstractLogicalServiceNamesOfferedType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\fed\IssuerName;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/fed/AbstractProofTokenType.php b/src/XML/fed/AbstractProofTokenType.php
index cdeb86d..ae5ef5a 100644
--- a/src/XML/fed/AbstractProofTokenType.php
+++ b/src/XML/fed/AbstractProofTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractPseudonymBasisType.php b/src/XML/fed/AbstractPseudonymBasisType.php
index 140ef6f..816c9d0 100644
--- a/src/XML/fed/AbstractPseudonymBasisType.php
+++ b/src/XML/fed/AbstractPseudonymBasisType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/fed/AbstractPseudonymServiceType.php b/src/XML/fed/AbstractPseudonymServiceType.php
index 8e7c350..b2cc134 100644
--- a/src/XML/fed/AbstractPseudonymServiceType.php
+++ b/src/XML/fed/AbstractPseudonymServiceType.php
@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\XML\md\Extensions;
 use SimpleSAML\SAML2\XML\md\Organization;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/fed/AbstractPseudonymType.php b/src/XML/fed/AbstractPseudonymType.php
index decae52..20955d4 100644
--- a/src/XML/fed/AbstractPseudonymType.php
+++ b/src/XML/fed/AbstractPseudonymType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractReferenceDigestType.php b/src/XML/fed/AbstractReferenceDigestType.php
index d57aa99..ba478a8 100644
--- a/src/XML/fed/AbstractReferenceDigestType.php
+++ b/src/XML/fed/AbstractReferenceDigestType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractReferenceTokenType.php b/src/XML/fed/AbstractReferenceTokenType.php
index a2f9a40..615863c 100644
--- a/src/XML/fed/AbstractReferenceTokenType.php
+++ b/src/XML/fed/AbstractReferenceTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/fed/AbstractRelativeToType.php b/src/XML/fed/AbstractRelativeToType.php
index f83f3cb..e0d1651 100644
--- a/src/XML/fed/AbstractRelativeToType.php
+++ b/src/XML/fed/AbstractRelativeToType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/fed/AbstractRequestProofTokenType.php b/src/XML/fed/AbstractRequestProofTokenType.php
index 1350191..a273d8a 100644
--- a/src/XML/fed/AbstractRequestProofTokenType.php
+++ b/src/XML/fed/AbstractRequestProofTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/fed/AbstractRequestPseudonymType.php b/src/XML/fed/AbstractRequestPseudonymType.php
index 6d9847c..6000648 100644
--- a/src/XML/fed/AbstractRequestPseudonymType.php
+++ b/src/XML/fed/AbstractRequestPseudonymType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/fed/AbstractSecurityTokenServiceType.php b/src/XML/fed/AbstractSecurityTokenServiceType.php
index f897581..9548142 100644
--- a/src/XML/fed/AbstractSecurityTokenServiceType.php
+++ b/src/XML/fed/AbstractSecurityTokenServiceType.php
@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\XML\md\Extensions;
 use SimpleSAML\SAML2\XML\md\Organization;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/fed/AbstractSecurityTokenType.php b/src/XML/fed/AbstractSecurityTokenType.php
index 3bc8418..5f43439 100644
--- a/src/XML/fed/AbstractSecurityTokenType.php
+++ b/src/XML/fed/AbstractSecurityTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractSignOutBasisType.php b/src/XML/fed/AbstractSignOutBasisType.php
index 918e5e7..6ec44b4 100644
--- a/src/XML/fed/AbstractSignOutBasisType.php
+++ b/src/XML/fed/AbstractSignOutBasisType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractSignOutType.php b/src/XML/fed/AbstractSignOutType.php
index d32ca35..6d43496 100644
--- a/src/XML/fed/AbstractSignOutType.php
+++ b/src/XML/fed/AbstractSignOutType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/fed/AbstractTokenType.php b/src/XML/fed/AbstractTokenType.php
index 934daa4..53e5ecb 100644
--- a/src/XML/fed/AbstractTokenType.php
+++ b/src/XML/fed/AbstractTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/fed/AbstractTokenTypesOfferedType.php b/src/XML/fed/AbstractTokenTypesOfferedType.php
index 5420ca5..0adc180 100644
--- a/src/XML/fed/AbstractTokenTypesOfferedType.php
+++ b/src/XML/fed/AbstractTokenTypesOfferedType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\fed\TokenType;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/fed/AutomaticPseudonyms.php b/src/XML/fed/AutomaticPseudonyms.php
index a7b4225..ca6fe42 100644
--- a/src/XML/fed/AutomaticPseudonyms.php
+++ b/src/XML/fed/AutomaticPseudonyms.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\fed;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/fed/SecurityTokenServiceType.php b/src/XML/fed/SecurityTokenServiceType.php
index 17afe12..b6f9693 100644
--- a/src/XML/fed/SecurityTokenServiceType.php
+++ b/src/XML/fed/SecurityTokenServiceType.php
@@ -6,9 +6,9 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\XML\md\{ContactPerson, Extensions, KeyDescriptor, Organization};
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/sp_200507/AbstractEmptyType.php b/src/XML/sp_200507/AbstractEmptyType.php
index c0e389f..9dd8431 100644
--- a/src/XML/sp_200507/AbstractEmptyType.php
+++ b/src/XML/sp_200507/AbstractEmptyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 use function sprintf;
diff --git a/src/XML/sp_200507/AbstractHeaderType.php b/src/XML/sp_200507/AbstractHeaderType.php
index 937544d..2bea742 100644
--- a/src/XML/sp_200507/AbstractHeaderType.php
+++ b/src/XML/sp_200507/AbstractHeaderType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/sp_200507/AbstractHttpsTokenType.php b/src/XML/sp_200507/AbstractHttpsTokenType.php
index 73712e9..304a957 100644
--- a/src/XML/sp_200507/AbstractHttpsTokenType.php
+++ b/src/XML/sp_200507/AbstractHttpsTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200507/AbstractIssuedTokenType.php b/src/XML/sp_200507/AbstractIssuedTokenType.php
index fc10a55..decb031 100644
--- a/src/XML/sp_200507/AbstractIssuedTokenType.php
+++ b/src/XML/sp_200507/AbstractIssuedTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/sp_200507/AbstractNestedPolicyType.php b/src/XML/sp_200507/AbstractNestedPolicyType.php
index b6ff34e..15588da 100644
--- a/src/XML/sp_200507/AbstractNestedPolicyType.php
+++ b/src/XML/sp_200507/AbstractNestedPolicyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200507/AbstractQNameAssertionType.php b/src/XML/sp_200507/AbstractQNameAssertionType.php
index 5a311ef..e85200e 100644
--- a/src/XML/sp_200507/AbstractQNameAssertionType.php
+++ b/src/XML/sp_200507/AbstractQNameAssertionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/sp_200507/AbstractRequestSecurityTokenTemplateType.php b/src/XML/sp_200507/AbstractRequestSecurityTokenTemplateType.php
index 0a2743b..3cba15e 100644
--- a/src/XML/sp_200507/AbstractRequestSecurityTokenTemplateType.php
+++ b/src/XML/sp_200507/AbstractRequestSecurityTokenTemplateType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200507/AbstractSePartsType.php b/src/XML/sp_200507/AbstractSePartsType.php
index 980f026..24bdbda 100644
--- a/src/XML/sp_200507/AbstractSePartsType.php
+++ b/src/XML/sp_200507/AbstractSePartsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/sp_200507/AbstractSecureConversationTokenType.php b/src/XML/sp_200507/AbstractSecureConversationTokenType.php
index 8031523..8a5944c 100644
--- a/src/XML/sp_200507/AbstractSecureConversationTokenType.php
+++ b/src/XML/sp_200507/AbstractSecureConversationTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200507/AbstractSerElementsType.php b/src/XML/sp_200507/AbstractSerElementsType.php
index c77ab63..54ab0ca 100644
--- a/src/XML/sp_200507/AbstractSerElementsType.php
+++ b/src/XML/sp_200507/AbstractSerElementsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/sp_200507/AbstractSpnegoContextTokenType.php b/src/XML/sp_200507/AbstractSpnegoContextTokenType.php
index 4daea34..84ca9d9 100644
--- a/src/XML/sp_200507/AbstractSpnegoContextTokenType.php
+++ b/src/XML/sp_200507/AbstractSpnegoContextTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200507/AbstractTokenAssertionType.php b/src/XML/sp_200507/AbstractTokenAssertionType.php
index c25a25d..b6564da 100644
--- a/src/XML/sp_200507/AbstractTokenAssertionType.php
+++ b/src/XML/sp_200507/AbstractTokenAssertionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200507/IncludeTokenTypeTrait.php b/src/XML/sp_200507/IncludeTokenTypeTrait.php
index 458c01e..770f995 100644
--- a/src/XML/sp_200507/IncludeTokenTypeTrait.php
+++ b/src/XML/sp_200507/IncludeTokenTypeTrait.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\sp_200507;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 
 use function is_string;
 
diff --git a/src/XML/sp_200507/XPath.php b/src/XML/sp_200507/XPath.php
index 290b5df..0d5e56c 100644
--- a/src/XML/sp_200507/XPath.php
+++ b/src/XML/sp_200507/XPath.php
@@ -6,7 +6,7 @@
 
 use DOMNodeList;
 use DOMXPath;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\StringElementTrait;
 
diff --git a/src/XML/sp_200702/AbstractEmptyType.php b/src/XML/sp_200702/AbstractEmptyType.php
index 04aa918..5b1f8b4 100644
--- a/src/XML/sp_200702/AbstractEmptyType.php
+++ b/src/XML/sp_200702/AbstractEmptyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 use function sprintf;
diff --git a/src/XML/sp_200702/AbstractHeaderType.php b/src/XML/sp_200702/AbstractHeaderType.php
index b5a5413..e5c5543 100644
--- a/src/XML/sp_200702/AbstractHeaderType.php
+++ b/src/XML/sp_200702/AbstractHeaderType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/sp_200702/AbstractIssuedTokenType.php b/src/XML/sp_200702/AbstractIssuedTokenType.php
index de39da7..b6bcf3b 100644
--- a/src/XML/sp_200702/AbstractIssuedTokenType.php
+++ b/src/XML/sp_200702/AbstractIssuedTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/sp_200702/AbstractKeyValueTokenType.php b/src/XML/sp_200702/AbstractKeyValueTokenType.php
index 3c5bea9..b651fc5 100644
--- a/src/XML/sp_200702/AbstractKeyValueTokenType.php
+++ b/src/XML/sp_200702/AbstractKeyValueTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200702/AbstractNestedPolicyType.php b/src/XML/sp_200702/AbstractNestedPolicyType.php
index 91f5795..c2a81c3 100644
--- a/src/XML/sp_200702/AbstractNestedPolicyType.php
+++ b/src/XML/sp_200702/AbstractNestedPolicyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200702/AbstractQNameAssertionType.php b/src/XML/sp_200702/AbstractQNameAssertionType.php
index ecc9a71..0146e59 100644
--- a/src/XML/sp_200702/AbstractQNameAssertionType.php
+++ b/src/XML/sp_200702/AbstractQNameAssertionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/sp_200702/AbstractReqPartsType.php b/src/XML/sp_200702/AbstractReqPartsType.php
index a55cbfc..7b26279 100644
--- a/src/XML/sp_200702/AbstractReqPartsType.php
+++ b/src/XML/sp_200702/AbstractReqPartsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/sp_200702/AbstractRequestSecurityTokenTemplateType.php b/src/XML/sp_200702/AbstractRequestSecurityTokenTemplateType.php
index 46bf654..654dada 100644
--- a/src/XML/sp_200702/AbstractRequestSecurityTokenTemplateType.php
+++ b/src/XML/sp_200702/AbstractRequestSecurityTokenTemplateType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200702/AbstractSePartsType.php b/src/XML/sp_200702/AbstractSePartsType.php
index b275ecd..8f2992a 100644
--- a/src/XML/sp_200702/AbstractSePartsType.php
+++ b/src/XML/sp_200702/AbstractSePartsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/sp_200702/AbstractSecureConversationTokenType.php b/src/XML/sp_200702/AbstractSecureConversationTokenType.php
index 19bde06..dad6cb2 100644
--- a/src/XML/sp_200702/AbstractSecureConversationTokenType.php
+++ b/src/XML/sp_200702/AbstractSecureConversationTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200702/AbstractSerElementsType.php b/src/XML/sp_200702/AbstractSerElementsType.php
index f703b95..ff2b65c 100644
--- a/src/XML/sp_200702/AbstractSerElementsType.php
+++ b/src/XML/sp_200702/AbstractSerElementsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/sp_200702/AbstractSpnegoContextTokenType.php b/src/XML/sp_200702/AbstractSpnegoContextTokenType.php
index 8815304..179dfa0 100644
--- a/src/XML/sp_200702/AbstractSpnegoContextTokenType.php
+++ b/src/XML/sp_200702/AbstractSpnegoContextTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200702/AbstractTokenAssertionType.php b/src/XML/sp_200702/AbstractTokenAssertionType.php
index 1d08b2b..e58f2e0 100644
--- a/src/XML/sp_200702/AbstractTokenAssertionType.php
+++ b/src/XML/sp_200702/AbstractTokenAssertionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/sp_200702/IncludeTokenTypeTrait.php b/src/XML/sp_200702/IncludeTokenTypeTrait.php
index 31e1bab..be22e91 100644
--- a/src/XML/sp_200702/IncludeTokenTypeTrait.php
+++ b/src/XML/sp_200702/IncludeTokenTypeTrait.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\sp_200702;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 
 use function is_string;
 
diff --git a/src/XML/sp_200702/XPath.php b/src/XML/sp_200702/XPath.php
index 31c8b64..e9ee1e7 100644
--- a/src/XML/sp_200702/XPath.php
+++ b/src/XML/sp_200702/XPath.php
@@ -6,7 +6,7 @@
 
 use DOMNodeList;
 use DOMXPath;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\StringElementTrait;
 
diff --git a/src/XML/wsa_200408/AbstractAttributedQNameType.php b/src/XML/wsa_200408/AbstractAttributedQNameType.php
index 9814458..1295ad0 100644
--- a/src/XML/wsa_200408/AbstractAttributedQNameType.php
+++ b/src/XML/wsa_200408/AbstractAttributedQNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\QNameElementTrait;
diff --git a/src/XML/wsa_200408/AbstractAttributedURIType.php b/src/XML/wsa_200408/AbstractAttributedURIType.php
index 9e4d0a3..88358d3 100644
--- a/src/XML/wsa_200408/AbstractAttributedURIType.php
+++ b/src/XML/wsa_200408/AbstractAttributedURIType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\URIElementTrait;
diff --git a/src/XML/wsa_200408/AbstractEndpointReferenceType.php b/src/XML/wsa_200408/AbstractEndpointReferenceType.php
index dcea4bc..0047752 100644
--- a/src/XML/wsa_200408/AbstractEndpointReferenceType.php
+++ b/src/XML/wsa_200408/AbstractEndpointReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wsa_200408/AbstractRelationshipType.php b/src/XML/wsa_200408/AbstractRelationshipType.php
index 0a24d08..fd3fecf 100644
--- a/src/XML/wsa_200408/AbstractRelationshipType.php
+++ b/src/XML/wsa_200408/AbstractRelationshipType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\URIElementTrait;
diff --git a/src/XML/wsa_200408/AbstractRetryAfterType.php b/src/XML/wsa_200408/AbstractRetryAfterType.php
index c69912d..4d42a47 100644
--- a/src/XML/wsa_200408/AbstractRetryAfterType.php
+++ b/src/XML/wsa_200408/AbstractRetryAfterType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsa_200408/AbstractServiceNameType.php b/src/XML/wsa_200408/AbstractServiceNameType.php
index 069c5c2..7cb04d5 100644
--- a/src/XML/wsa_200408/AbstractServiceNameType.php
+++ b/src/XML/wsa_200408/AbstractServiceNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsa_200408/ReferenceParameters.php b/src/XML/wsa_200408/ReferenceParameters.php
index deed2e4..837d4f3 100644
--- a/src/XML/wsa_200408/ReferenceParameters.php
+++ b/src/XML/wsa_200408/ReferenceParameters.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wsa_200408/ReferenceProperties.php b/src/XML/wsa_200408/ReferenceProperties.php
index e1e51d5..0ad6a8f 100644
--- a/src/XML/wsa_200408/ReferenceProperties.php
+++ b/src/XML/wsa_200408/ReferenceProperties.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200408;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wsa_200508/AbstractAttributedLongType.php b/src/XML/wsa_200508/AbstractAttributedLongType.php
index 14bff1f..0176e7a 100644
--- a/src/XML/wsa_200508/AbstractAttributedLongType.php
+++ b/src/XML/wsa_200508/AbstractAttributedLongType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsa_200508/AbstractAttributedQNameType.php b/src/XML/wsa_200508/AbstractAttributedQNameType.php
index 16e403a..e551a00 100644
--- a/src/XML/wsa_200508/AbstractAttributedQNameType.php
+++ b/src/XML/wsa_200508/AbstractAttributedQNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\QNameElementTrait;
diff --git a/src/XML/wsa_200508/AbstractAttributedURIType.php b/src/XML/wsa_200508/AbstractAttributedURIType.php
index b9d7294..4477124 100644
--- a/src/XML/wsa_200508/AbstractAttributedURIType.php
+++ b/src/XML/wsa_200508/AbstractAttributedURIType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\URIElementTrait;
diff --git a/src/XML/wsa_200508/AbstractEndpointReferenceType.php b/src/XML/wsa_200508/AbstractEndpointReferenceType.php
index 126d51d..1dd4341 100644
--- a/src/XML/wsa_200508/AbstractEndpointReferenceType.php
+++ b/src/XML/wsa_200508/AbstractEndpointReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wsa_200508/Metadata.php b/src/XML/wsa_200508/Metadata.php
index 627790b..687ef12 100644
--- a/src/XML/wsa_200508/Metadata.php
+++ b/src/XML/wsa_200508/Metadata.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsa_200508/ProblemAction.php b/src/XML/wsa_200508/ProblemAction.php
index fc2e077..326c82c 100644
--- a/src/XML/wsa_200508/ProblemAction.php
+++ b/src/XML/wsa_200508/ProblemAction.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
diff --git a/src/XML/wsa_200508/ReferenceParameters.php b/src/XML/wsa_200508/ReferenceParameters.php
index 99cce1c..5494170 100644
--- a/src/XML/wsa_200508/ReferenceParameters.php
+++ b/src/XML/wsa_200508/ReferenceParameters.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsa_200508/RelatesTo.php b/src/XML/wsa_200508/RelatesTo.php
index 724027b..1d9e5a9 100644
--- a/src/XML/wsa_200508/RelatesTo.php
+++ b/src/XML/wsa_200508/RelatesTo.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsa_200508/SoapAction.php b/src/XML/wsa_200508/SoapAction.php
index 5f07a2b..16fca55 100644
--- a/src/XML/wsa_200508/SoapAction.php
+++ b/src/XML/wsa_200508/SoapAction.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsa_200508;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\URIElementTrait;
 
diff --git a/src/XML/wsaw/AbstractServiceNameType.php b/src/XML/wsaw/AbstractServiceNameType.php
index 811b728..9790c6a 100644
--- a/src/XML/wsaw/AbstractServiceNameType.php
+++ b/src/XML/wsaw/AbstractServiceNameType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\QNameElementTrait;
diff --git a/src/XML/wsaw/ActionTrait.php b/src/XML/wsaw/ActionTrait.php
index b043f56..d8818fb 100644
--- a/src/XML/wsaw/ActionTrait.php
+++ b/src/XML/wsaw/ActionTrait.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsaw/Anonymous.php b/src/XML/wsaw/Anonymous.php
index 7f61ab8..d99828d 100644
--- a/src/XML/wsaw/Anonymous.php
+++ b/src/XML/wsaw/Anonymous.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsaw/InterfaceName.php b/src/XML/wsaw/InterfaceName.php
index 7781011..7b7bf73 100644
--- a/src/XML/wsaw/InterfaceName.php
+++ b/src/XML/wsaw/InterfaceName.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wsaw/ServiceName.php b/src/XML/wsaw/ServiceName.php
index 5fcdf5f..9ee03f8 100644
--- a/src/XML/wsaw/ServiceName.php
+++ b/src/XML/wsaw/ServiceName.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wsaw/UsingAddressing.php b/src/XML/wsaw/UsingAddressing.php
index 89b1f0e..9a09057 100644
--- a/src/XML/wsaw/UsingAddressing.php
+++ b/src/XML/wsaw/UsingAddressing.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsaw;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
diff --git a/src/XML/wsp/AbstractOperatorContentType.php b/src/XML/wsp/AbstractOperatorContentType.php
index 99fd836..9370c16 100644
--- a/src/XML/wsp/AbstractOperatorContentType.php
+++ b/src/XML/wsp/AbstractOperatorContentType.php
@@ -6,7 +6,7 @@
 
 use DOMElement;
 use InvalidArgumentException;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wsp/AppliesTo.php b/src/XML/wsp/AppliesTo.php
index 0ff4ae8..e4de662 100644
--- a/src/XML/wsp/AppliesTo.php
+++ b/src/XML/wsp/AppliesTo.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsp/Policy.php b/src/XML/wsp/Policy.php
index 08ce4c4..64efeb7 100644
--- a/src/XML/wsp/Policy.php
+++ b/src/XML/wsp/Policy.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
diff --git a/src/XML/wsp/PolicyAttachment.php b/src/XML/wsp/PolicyAttachment.php
index 980e881..d5f73c7 100644
--- a/src/XML/wsp/PolicyAttachment.php
+++ b/src/XML/wsp/PolicyAttachment.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\wsp\AppliesTo;
 use SimpleSAML\WSSecurity\XML\wsp\Policy;
 use SimpleSAML\WSSecurity\XML\wsp\PolicyReference;
diff --git a/src/XML/wsp/PolicyReference.php b/src/XML/wsp/PolicyReference.php
index 1d9c7dd..a2e737c 100644
--- a/src/XML/wsp/PolicyReference.php
+++ b/src/XML/wsp/PolicyReference.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
@@ -43,7 +43,7 @@ public function __construct(
         array $namespacedAttributes = [],
     ) {
         Assert::validURI($URI, SchemaViolationException::class);
-        Assert::nullOrStringPlausibleBase64($Digest, SchemaViolationException::class);
+        Assert::nullOrValidBase64($Digest, SchemaViolationException::class);
         Assert::nullOrValidURI($DigestAlgorithm, SchemaViolationException::class);
 
         $this->setAttributesNS($namespacedAttributes);
diff --git a/src/XML/wsp/PolicyURIsTrait.php b/src/XML/wsp/PolicyURIsTrait.php
index 33d1615..93b8f85 100644
--- a/src/XML/wsp/PolicyURIsTrait.php
+++ b/src/XML/wsp/PolicyURIsTrait.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\wsp;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 
 /**
  * Trait grouping common functionality for elements that can hold a PolicyURIs attribute.
diff --git a/src/XML/wsse/AbstractAttributedString.php b/src/XML/wsse/AbstractAttributedString.php
index eb2b85f..80505d2 100644
--- a/src/XML/wsse/AbstractAttributedString.php
+++ b/src/XML/wsse/AbstractAttributedString.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wsse/AbstractBinarySecurityTokenType.php b/src/XML/wsse/AbstractBinarySecurityTokenType.php
index 8dbef2a..6eb06d0 100644
--- a/src/XML/wsse/AbstractBinarySecurityTokenType.php
+++ b/src/XML/wsse/AbstractBinarySecurityTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wsse/AbstractEmbeddedType.php b/src/XML/wsse/AbstractEmbeddedType.php
index 6bfca20..2031036 100644
--- a/src/XML/wsse/AbstractEmbeddedType.php
+++ b/src/XML/wsse/AbstractEmbeddedType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsse/AbstractEncodedString.php b/src/XML/wsse/AbstractEncodedString.php
index b411f46..85e0fcb 100644
--- a/src/XML/wsse/AbstractEncodedString.php
+++ b/src/XML/wsse/AbstractEncodedString.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
diff --git a/src/XML/wsse/AbstractKeyIdentifierType.php b/src/XML/wsse/AbstractKeyIdentifierType.php
index b190492..55f46b4 100644
--- a/src/XML/wsse/AbstractKeyIdentifierType.php
+++ b/src/XML/wsse/AbstractKeyIdentifierType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wsse/AbstractPasswordString.php b/src/XML/wsse/AbstractPasswordString.php
index 2781247..0664ee3 100644
--- a/src/XML/wsse/AbstractPasswordString.php
+++ b/src/XML/wsse/AbstractPasswordString.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
diff --git a/src/XML/wsse/AbstractReferenceType.php b/src/XML/wsse/AbstractReferenceType.php
index 74dd59f..84887ba 100644
--- a/src/XML/wsse/AbstractReferenceType.php
+++ b/src/XML/wsse/AbstractReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsse/AbstractSecurityHeaderType.php b/src/XML/wsse/AbstractSecurityHeaderType.php
index 3486448..e5e8fc8 100644
--- a/src/XML/wsse/AbstractSecurityHeaderType.php
+++ b/src/XML/wsse/AbstractSecurityHeaderType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsse/AbstractSecurityTokenReferenceType.php b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
index 75d943f..971f6eb 100644
--- a/src/XML/wsse/AbstractSecurityTokenReferenceType.php
+++ b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wsse/AbstractTransformationParametersType.php b/src/XML/wsse/AbstractTransformationParametersType.php
index b0bd0bb..451455a 100644
--- a/src/XML/wsse/AbstractTransformationParametersType.php
+++ b/src/XML/wsse/AbstractTransformationParametersType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsse/AbstractUsernameTokenType.php b/src/XML/wsse/AbstractUsernameTokenType.php
index 3a7e853..1eb4808 100644
--- a/src/XML/wsse/AbstractUsernameTokenType.php
+++ b/src/XML/wsse/AbstractUsernameTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wsse/UsageTrait.php b/src/XML/wsse/UsageTrait.php
index c21c972..0774bad 100644
--- a/src/XML/wsse/UsageTrait.php
+++ b/src/XML/wsse/UsageTrait.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\wsse;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wst_200502/AbstractAuthenticatorType.php b/src/XML/wst_200502/AbstractAuthenticatorType.php
index 153b1ca..cd716c9 100644
--- a/src/XML/wst_200502/AbstractAuthenticatorType.php
+++ b/src/XML/wst_200502/AbstractAuthenticatorType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wst_200502/AbstractBinaryExchangeType.php b/src/XML/wst_200502/AbstractBinaryExchangeType.php
index 3d8565c..f4edb9c 100644
--- a/src/XML/wst_200502/AbstractBinaryExchangeType.php
+++ b/src/XML/wst_200502/AbstractBinaryExchangeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200502/AbstractBinarySecretType.php b/src/XML/wst_200502/AbstractBinarySecretType.php
index bd87e4d..7c4c2c1 100644
--- a/src/XML/wst_200502/AbstractBinarySecretType.php
+++ b/src/XML/wst_200502/AbstractBinarySecretType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200502/AbstractCancelTargetType.php b/src/XML/wst_200502/AbstractCancelTargetType.php
index f9595fb..bf38a4e 100644
--- a/src/XML/wst_200502/AbstractCancelTargetType.php
+++ b/src/XML/wst_200502/AbstractCancelTargetType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractClaimsType.php b/src/XML/wst_200502/AbstractClaimsType.php
index e18b1fe..8d2c1da 100644
--- a/src/XML/wst_200502/AbstractClaimsType.php
+++ b/src/XML/wst_200502/AbstractClaimsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php
index 3f8c46c..37ba293 100644
--- a/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php
+++ b/src/XML/wst_200502/AbstractComputedKeyOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractDelegateToType.php b/src/XML/wst_200502/AbstractDelegateToType.php
index 8a69096..ab8915a 100644
--- a/src/XML/wst_200502/AbstractDelegateToType.php
+++ b/src/XML/wst_200502/AbstractDelegateToType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractEncryptionType.php b/src/XML/wst_200502/AbstractEncryptionType.php
index c11dec2..1d45d29 100644
--- a/src/XML/wst_200502/AbstractEncryptionType.php
+++ b/src/XML/wst_200502/AbstractEncryptionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractEntropyType.php b/src/XML/wst_200502/AbstractEntropyType.php
index f248e94..5c142cd 100644
--- a/src/XML/wst_200502/AbstractEntropyType.php
+++ b/src/XML/wst_200502/AbstractEntropyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wst_200502/AbstractKeyExchangeTokenType.php b/src/XML/wst_200502/AbstractKeyExchangeTokenType.php
index 05cc405..be125e6 100644
--- a/src/XML/wst_200502/AbstractKeyExchangeTokenType.php
+++ b/src/XML/wst_200502/AbstractKeyExchangeTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php
index 500eda7..7009245 100644
--- a/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php
+++ b/src/XML/wst_200502/AbstractKeyTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractLifetimeType.php b/src/XML/wst_200502/AbstractLifetimeType.php
index 8cefd90..b3184ba 100644
--- a/src/XML/wst_200502/AbstractLifetimeType.php
+++ b/src/XML/wst_200502/AbstractLifetimeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\wsu\Created;
 use SimpleSAML\WSSecurity\XML\wsu\Expires;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wst_200502/AbstractOnBehalfOfType.php b/src/XML/wst_200502/AbstractOnBehalfOfType.php
index 90ce453..93aff7b 100644
--- a/src/XML/wst_200502/AbstractOnBehalfOfType.php
+++ b/src/XML/wst_200502/AbstractOnBehalfOfType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractParticipantType.php b/src/XML/wst_200502/AbstractParticipantType.php
index 3e88314..ecfe24e 100644
--- a/src/XML/wst_200502/AbstractParticipantType.php
+++ b/src/XML/wst_200502/AbstractParticipantType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractParticipantsType.php b/src/XML/wst_200502/AbstractParticipantsType.php
index d519d74..ab9da0e 100644
--- a/src/XML/wst_200502/AbstractParticipantsType.php
+++ b/src/XML/wst_200502/AbstractParticipantsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wst_200502/AbstractProofEncryptionType.php b/src/XML/wst_200502/AbstractProofEncryptionType.php
index dfea8a6..f5c87b4 100644
--- a/src/XML/wst_200502/AbstractProofEncryptionType.php
+++ b/src/XML/wst_200502/AbstractProofEncryptionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractRenewTargetType.php b/src/XML/wst_200502/AbstractRenewTargetType.php
index 807ccb4..e7d9c42 100644
--- a/src/XML/wst_200502/AbstractRenewTargetType.php
+++ b/src/XML/wst_200502/AbstractRenewTargetType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractRenewingType.php b/src/XML/wst_200502/AbstractRenewingType.php
index 1c7bff6..ad23831 100644
--- a/src/XML/wst_200502/AbstractRenewingType.php
+++ b/src/XML/wst_200502/AbstractRenewingType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 /**
diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php
index e68111a..ebb3a7c 100644
--- a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php
+++ b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseCollectionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php
index e6d0f65..9c1f534 100644
--- a/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php
+++ b/src/XML/wst_200502/AbstractRequestSecurityTokenResponseType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200502/AbstractRequestSecurityTokenType.php b/src/XML/wst_200502/AbstractRequestSecurityTokenType.php
index 5c6d59e..985ce41 100644
--- a/src/XML/wst_200502/AbstractRequestSecurityTokenType.php
+++ b/src/XML/wst_200502/AbstractRequestSecurityTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php
index f9c776d..a5c5611 100644
--- a/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php
+++ b/src/XML/wst_200502/AbstractRequestTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractRequestedProofTokenType.php b/src/XML/wst_200502/AbstractRequestedProofTokenType.php
index 560ee33..b9bde6b 100644
--- a/src/XML/wst_200502/AbstractRequestedProofTokenType.php
+++ b/src/XML/wst_200502/AbstractRequestedProofTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractRequestedReferenceType.php b/src/XML/wst_200502/AbstractRequestedReferenceType.php
index 09774e2..ed53bef 100644
--- a/src/XML/wst_200502/AbstractRequestedReferenceType.php
+++ b/src/XML/wst_200502/AbstractRequestedReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php
index 0b274d7..85254e0 100644
--- a/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php
+++ b/src/XML/wst_200502/AbstractRequestedSecurityTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractSignChallengeType.php b/src/XML/wst_200502/AbstractSignChallengeType.php
index 8e41377..fa24fb4 100644
--- a/src/XML/wst_200502/AbstractSignChallengeType.php
+++ b/src/XML/wst_200502/AbstractSignChallengeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php
index 5d416be..d84e5c4 100644
--- a/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php
+++ b/src/XML/wst_200502/AbstractStatusCodeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200502/AbstractStatusType.php b/src/XML/wst_200502/AbstractStatusType.php
index 7f5a54e..734494e 100644
--- a/src/XML/wst_200502/AbstractStatusType.php
+++ b/src/XML/wst_200502/AbstractStatusType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AbstractUseKeyType.php b/src/XML/wst_200502/AbstractUseKeyType.php
index 9a2d61f..62828b4 100644
--- a/src/XML/wst_200502/AbstractUseKeyType.php
+++ b/src/XML/wst_200502/AbstractUseKeyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200502/AllowPostdating.php b/src/XML/wst_200502/AllowPostdating.php
index 811a7cd..eff18e1 100644
--- a/src/XML/wst_200502/AllowPostdating.php
+++ b/src/XML/wst_200502/AllowPostdating.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wst_200502/KeySize.php b/src/XML/wst_200502/KeySize.php
index b037d59..a249711 100644
--- a/src/XML/wst_200502/KeySize.php
+++ b/src/XML/wst_200502/KeySize.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\IntegerElementTrait;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
diff --git a/src/XML/wst_200502/RequestKET.php b/src/XML/wst_200502/RequestKET.php
index 063c554..d5add1a 100644
--- a/src/XML/wst_200502/RequestKET.php
+++ b/src/XML/wst_200502/RequestKET.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wst_200502/RequestedTokenCancelled.php b/src/XML/wst_200502/RequestedTokenCancelled.php
index 36fadee..356b359 100644
--- a/src/XML/wst_200502/RequestedTokenCancelled.php
+++ b/src/XML/wst_200502/RequestedTokenCancelled.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200502;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wst_200512/AbstractAuthenticatorType.php b/src/XML/wst_200512/AbstractAuthenticatorType.php
index ef3ffa5..3be1ec9 100644
--- a/src/XML/wst_200512/AbstractAuthenticatorType.php
+++ b/src/XML/wst_200512/AbstractAuthenticatorType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wst_200512/AbstractBinaryExchangeType.php b/src/XML/wst_200512/AbstractBinaryExchangeType.php
index c227c3b..e9099de 100644
--- a/src/XML/wst_200512/AbstractBinaryExchangeType.php
+++ b/src/XML/wst_200512/AbstractBinaryExchangeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200512/AbstractBinarySecretType.php b/src/XML/wst_200512/AbstractBinarySecretType.php
index 85a6459..f12f570 100644
--- a/src/XML/wst_200512/AbstractBinarySecretType.php
+++ b/src/XML/wst_200512/AbstractBinarySecretType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200512/AbstractCancelTargetType.php b/src/XML/wst_200512/AbstractCancelTargetType.php
index 042f806..2f8e779 100644
--- a/src/XML/wst_200512/AbstractCancelTargetType.php
+++ b/src/XML/wst_200512/AbstractCancelTargetType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractClaimsType.php b/src/XML/wst_200512/AbstractClaimsType.php
index deb9d01..bc5a0aa 100644
--- a/src/XML/wst_200512/AbstractClaimsType.php
+++ b/src/XML/wst_200512/AbstractClaimsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php
index 2955b55..ae1a926 100644
--- a/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php
+++ b/src/XML/wst_200512/AbstractComputedKeyOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractDelegateToType.php b/src/XML/wst_200512/AbstractDelegateToType.php
index bd44b9d..772f9d6 100644
--- a/src/XML/wst_200512/AbstractDelegateToType.php
+++ b/src/XML/wst_200512/AbstractDelegateToType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractEncryptionType.php b/src/XML/wst_200512/AbstractEncryptionType.php
index 43427d2..5af46dc 100644
--- a/src/XML/wst_200512/AbstractEncryptionType.php
+++ b/src/XML/wst_200512/AbstractEncryptionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractEntropyType.php b/src/XML/wst_200512/AbstractEntropyType.php
index 43e155e..5e12210 100644
--- a/src/XML/wst_200512/AbstractEntropyType.php
+++ b/src/XML/wst_200512/AbstractEntropyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wst_200512/AbstractKeyExchangeTokenType.php b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php
index eeb894a..2fb9db4 100644
--- a/src/XML/wst_200512/AbstractKeyExchangeTokenType.php
+++ b/src/XML/wst_200512/AbstractKeyExchangeTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
diff --git a/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php
index a26f398..508d5f9 100644
--- a/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php
+++ b/src/XML/wst_200512/AbstractKeyTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractLifetimeType.php b/src/XML/wst_200512/AbstractLifetimeType.php
index ba56fd4..1a876ee 100644
--- a/src/XML/wst_200512/AbstractLifetimeType.php
+++ b/src/XML/wst_200512/AbstractLifetimeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\wsu\Created;
 use SimpleSAML\WSSecurity\XML\wsu\Expires;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
diff --git a/src/XML/wst_200512/AbstractOnBehalfOfType.php b/src/XML/wst_200512/AbstractOnBehalfOfType.php
index 18f6e51..2cf4d71 100644
--- a/src/XML/wst_200512/AbstractOnBehalfOfType.php
+++ b/src/XML/wst_200512/AbstractOnBehalfOfType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractParticipantType.php b/src/XML/wst_200512/AbstractParticipantType.php
index aad271f..606bdb4 100644
--- a/src/XML/wst_200512/AbstractParticipantType.php
+++ b/src/XML/wst_200512/AbstractParticipantType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractParticipantsType.php b/src/XML/wst_200512/AbstractParticipantsType.php
index 77e14f0..d4b2806 100644
--- a/src/XML/wst_200512/AbstractParticipantsType.php
+++ b/src/XML/wst_200512/AbstractParticipantsType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wst_200512/AbstractProofEncryptionType.php b/src/XML/wst_200512/AbstractProofEncryptionType.php
index b598a3f..376cea7 100644
--- a/src/XML/wst_200512/AbstractProofEncryptionType.php
+++ b/src/XML/wst_200512/AbstractProofEncryptionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractRenewTargetType.php b/src/XML/wst_200512/AbstractRenewTargetType.php
index 8dd59e2..ddcf2fa 100644
--- a/src/XML/wst_200512/AbstractRenewTargetType.php
+++ b/src/XML/wst_200512/AbstractRenewTargetType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractRenewingType.php b/src/XML/wst_200512/AbstractRenewingType.php
index e30f977..0ae2e2a 100644
--- a/src/XML/wst_200512/AbstractRenewingType.php
+++ b/src/XML/wst_200512/AbstractRenewingType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 /**
diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php
index 101ee41..ef1a4d9 100644
--- a/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php
+++ b/src/XML/wst_200512/AbstractRequestSecurityTokenCollectionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php
index f983280..f6e9e2e 100644
--- a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php
+++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseCollectionType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php
index 00eb295..c896c71 100644
--- a/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php
+++ b/src/XML/wst_200512/AbstractRequestSecurityTokenResponseType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200512/AbstractRequestSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php
index 901e9c5..00f3afc 100644
--- a/src/XML/wst_200512/AbstractRequestSecurityTokenType.php
+++ b/src/XML/wst_200512/AbstractRequestSecurityTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php
index 5d233bd..2da55a8 100644
--- a/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php
+++ b/src/XML/wst_200512/AbstractRequestTypeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractRequestedProofTokenType.php b/src/XML/wst_200512/AbstractRequestedProofTokenType.php
index 5360d0f..22e1953 100644
--- a/src/XML/wst_200512/AbstractRequestedProofTokenType.php
+++ b/src/XML/wst_200512/AbstractRequestedProofTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractRequestedReferenceType.php b/src/XML/wst_200512/AbstractRequestedReferenceType.php
index ac59581..e1c44e7 100644
--- a/src/XML/wst_200512/AbstractRequestedReferenceType.php
+++ b/src/XML/wst_200512/AbstractRequestedReferenceType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
diff --git a/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php
index 97c46a9..9e3f643 100644
--- a/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php
+++ b/src/XML/wst_200512/AbstractRequestedSecurityTokenType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractSignChallengeType.php b/src/XML/wst_200512/AbstractSignChallengeType.php
index 9ff5a83..87a29f2 100644
--- a/src/XML/wst_200512/AbstractSignChallengeType.php
+++ b/src/XML/wst_200512/AbstractSignChallengeType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php
index 2369a10..1c8fad8 100644
--- a/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php
+++ b/src/XML/wst_200512/AbstractStatusCodeOpenEnum.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
diff --git a/src/XML/wst_200512/AbstractStatusType.php b/src/XML/wst_200512/AbstractStatusType.php
index 35a0f08..c06f412 100644
--- a/src/XML/wst_200512/AbstractStatusType.php
+++ b/src/XML/wst_200512/AbstractStatusType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractUseKeyType.php b/src/XML/wst_200512/AbstractUseKeyType.php
index 2331ce9..b9f4d83 100644
--- a/src/XML/wst_200512/AbstractUseKeyType.php
+++ b/src/XML/wst_200512/AbstractUseKeyType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AbstractValidateTargetType.php b/src/XML/wst_200512/AbstractValidateTargetType.php
index 925b207..119cc7f 100644
--- a/src/XML/wst_200512/AbstractValidateTargetType.php
+++ b/src/XML/wst_200512/AbstractValidateTargetType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
diff --git a/src/XML/wst_200512/AllowPostdating.php b/src/XML/wst_200512/AllowPostdating.php
index 10fb161..3dae2d3 100644
--- a/src/XML/wst_200512/AllowPostdating.php
+++ b/src/XML/wst_200512/AllowPostdating.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wst_200512/KeySize.php b/src/XML/wst_200512/KeySize.php
index 23b9c8e..d2b4a7a 100644
--- a/src/XML/wst_200512/KeySize.php
+++ b/src/XML/wst_200512/KeySize.php
@@ -4,7 +4,7 @@
 
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\IntegerElementTrait;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
diff --git a/src/XML/wst_200512/RequestKET.php b/src/XML/wst_200512/RequestKET.php
index ded5469..ae46c4c 100644
--- a/src/XML/wst_200512/RequestKET.php
+++ b/src/XML/wst_200512/RequestKET.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wst_200512/RequestedTokenCancelled.php b/src/XML/wst_200512/RequestedTokenCancelled.php
index 1c5dc29..a3b15d4 100644
--- a/src/XML/wst_200512/RequestedTokenCancelled.php
+++ b/src/XML/wst_200512/RequestedTokenCancelled.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wst_200512;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\{SchemaValidatableElementInterface, SchemaValidatableElementTrait};
 
diff --git a/src/XML/wsu/AbstractAttributedDateTime.php b/src/XML/wsu/AbstractAttributedDateTime.php
index fe344d3..0f3efc2 100644
--- a/src/XML/wsu/AbstractAttributedDateTime.php
+++ b/src/XML/wsu/AbstractAttributedDateTime.php
@@ -6,7 +6,7 @@
 
 use DateTimeImmutable;
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\WSSecurity\Constants as C;
 use SimpleSAML\WSSecurity\Exception\ProtocolViolationException;
 use SimpleSAML\XML\Attribute as XMLAttribute;
diff --git a/src/XML/wsu/AbstractAttributedURI.php b/src/XML/wsu/AbstractAttributedURI.php
index 212e6a1..de47428 100644
--- a/src/XML/wsu/AbstractAttributedURI.php
+++ b/src/XML/wsu/AbstractAttributedURI.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsu;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsu/AbstractTimestamp.php b/src/XML/wsu/AbstractTimestamp.php
index e9277ae..37aeefb 100644
--- a/src/XML/wsu/AbstractTimestamp.php
+++ b/src/XML/wsu/AbstractTimestamp.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsu;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsx/GetMetadata.php b/src/XML/wsx/GetMetadata.php
index 6bdb880..4b231a3 100644
--- a/src/XML/wsx/GetMetadata.php
+++ b/src/XML/wsx/GetMetadata.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsx;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
diff --git a/src/XML/wsx/Metadata.php b/src/XML/wsx/Metadata.php
index 1ba337a..298baed 100644
--- a/src/XML/wsx/Metadata.php
+++ b/src/XML/wsx/Metadata.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsx;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsx/MetadataReference.php b/src/XML/wsx/MetadataReference.php
index 9e592eb..36b345d 100644
--- a/src/XML/wsx/MetadataReference.php
+++ b/src/XML/wsx/MetadataReference.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsx;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
diff --git a/src/XML/wsx/MetadataSection.php b/src/XML/wsx/MetadataSection.php
index 590e013..ad9e76c 100644
--- a/src/XML/wsx/MetadataSection.php
+++ b/src/XML/wsx/MetadataSection.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSSecurity\XML\wsx;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;