diff --git a/src/XML/ds/DigestMethod.php b/src/XML/ds/DigestMethod.php
index 71055810..19e24130 100644
--- a/src/XML/ds/DigestMethod.php
+++ b/src/XML/ds/DigestMethod.php
@@ -10,6 +10,7 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
@@ -22,7 +23,7 @@ final class DigestMethod extends AbstractDsElement
 {
     use ExtendableElementTrait;
 
-    public const XS_ANY_ELT_NAMESPACE = C::XS_ANY_NS_OTHER;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
     /**
      * Initialize a DigestMethod element.
diff --git a/src/XML/ds/DsObject.php b/src/XML/ds/DsObject.php
index 41537ee4..7d46e240 100644
--- a/src/XML/ds/DsObject.php
+++ b/src/XML/ds/DsObject.php
@@ -7,7 +7,7 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Chunk;
-use SimpleSAML\XML\Constants;
+use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
@@ -25,7 +25,7 @@ final class DsObject extends AbstractDsElement
     public const LOCALNAME = 'Object';
 
     /** @var string */
-    public const XS_ANY_ELT_NAMESPACE = Constants::XS_ANY_NS_ANY;
+    public const XS_ANY_ELT_NAMESPACE = NS::ANY;
 
 
     /**
diff --git a/src/XML/ds/KeyValue.php b/src/XML/ds/KeyValue.php
index ac0db059..3b10bd6b 100644
--- a/src/XML/ds/KeyValue.php
+++ b/src/XML/ds/KeyValue.php
@@ -13,7 +13,7 @@
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\ElementInterface;
-use SimpleSAML\XMLSecurity\Constants as C;
+use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
 /**
@@ -27,7 +27,7 @@ final class KeyValue extends AbstractDsElement
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = C::XS_ANY_NS_OTHER;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/ds/SignatureProperty.php b/src/XML/ds/SignatureProperty.php
index d35b6f0f..a8e39702 100644
--- a/src/XML/ds/SignatureProperty.php
+++ b/src/XML/ds/SignatureProperty.php
@@ -7,12 +7,12 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Chunk;
-use SimpleSAML\XML\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\SerializableElementInterface;
+use SimpleSAML\XML\XsNamespace as NS;
 
 /**
  * Class representing a ds:SignatureProperty element.
@@ -25,7 +25,7 @@ final class SignatureProperty extends AbstractDsElement
 
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = C::XS_ANY_NS_OTHER;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/xenc/AbstractEncryptionMethod.php b/src/XML/xenc/AbstractEncryptionMethod.php
index f7ef1eed..a65a58b3 100644
--- a/src/XML/xenc/AbstractEncryptionMethod.php
+++ b/src/XML/xenc/AbstractEncryptionMethod.php
@@ -6,11 +6,12 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
-use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
@@ -27,7 +28,7 @@ abstract class AbstractEncryptionMethod extends AbstractXencElement
     use ExtendableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = C::XS_ANY_NS_OTHER;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**
diff --git a/src/XML/xenc/AbstractReference.php b/src/XML/xenc/AbstractReference.php
index faba9302..c5679a54 100644
--- a/src/XML/xenc/AbstractReference.php
+++ b/src/XML/xenc/AbstractReference.php
@@ -6,12 +6,12 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Chunk;
-use SimpleSAML\XML\Constants as C;
 use SimpleSAML\XML\ElementInterface;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
+use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\XML\xenc\Transforms;
 
 /**
@@ -24,7 +24,7 @@ abstract class AbstractReference extends AbstractXencElement
     use ExtendableElementTrait;
 
     /** The namespace-attribute for the xs:any element */
-    public const XS_ANY_ELT_NAMESPACE = C::XS_ANY_NS_OTHER;
+    public const XS_ANY_ELT_NAMESPACE = NS::OTHER;
 
 
     /**