diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6b4fd6386..82a9b5cb2 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -90,36 +90,6 @@ parameters:
 			count: 1
 			path: src/Configuration/SimpleSAMLConverter.php
 
-		-
-			message: "#^Call to static method fromXML\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Envelope\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
-		-
-			message: "#^Call to static method fromXML\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Fault\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
-		-
-			message: "#^Call to static method getXPath\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\Utils\\\\XPath\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
-		-
-			message: "#^Call to static method xpQuery\\(\\) on an unknown class SimpleSAML\\\\SOAP11\\\\Utils\\\\XPath\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
-		-
-			message: "#^Instantiated class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Body not found\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
-		-
-			message: "#^Instantiated class SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Envelope not found\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
 		-
 			message: "#^Instantiated class SimpleSAML\\\\Utils\\\\Config not found\\.$#"
 			count: 1
@@ -130,11 +100,6 @@ parameters:
 			count: 1
 			path: src/SOAPClient.php
 
-		-
-			message: "#^Method SimpleSAML\\\\SAML2\\\\SOAPClient\\:\\:getSOAPFault\\(\\) has invalid return type SimpleSAML\\\\SOAP11\\\\XML\\\\env\\\\Fault\\.$#"
-			count: 1
-			path: src/SOAPClient.php
-
 		-
 			message: "#^Parameter \\$dstMetadata of method SimpleSAML\\\\SAML2\\\\SOAPClient\\:\\:send\\(\\) has invalid type SimpleSAML\\\\Configuration\\.$#"
 			count: 1
diff --git a/src/SOAPClient.php b/src/SOAPClient.php
index 5ccf2d3be..6bea71169 100644
--- a/src/SOAPClient.php
+++ b/src/SOAPClient.php
@@ -10,10 +10,10 @@
 use SimpleSAML\SAML2\Compat\ContainerSingleton;
 use SimpleSAML\SAML2\XML\samlp\AbstractMessage;
 use SimpleSAML\SAML2\XML\samlp\MessageFactory;
-use SimpleSAML\SOAP11\Utils\XPath;
-use SimpleSAML\SOAP11\XML\env\Body;
-use SimpleSAML\SOAP11\XML\env\Envelope;
-use SimpleSAML\SOAP11\XML\env\Fault;
+use SimpleSAML\SOAP\Utils\XPath;
+use SimpleSAML\SOAP\XML\env_200106\Body;
+use SimpleSAML\SOAP\XML\env_200106\Envelope;
+use SimpleSAML\SOAP\XML\env_200106\Fault;
 use SimpleSAML\Utils\Config;
 use SimpleSAML\Utils\Crypto;
 use SimpleSAML\XML\Chunk;
@@ -255,7 +255,7 @@ public static function validateSSL(string $data, XMLSecurityKey $key): void
      * Extracts the SOAP Fault from SOAP message
      *
      * @param \DOMDocument $soapMessage Soap response needs to be type DOMDocument
-     * @return \SimpleSAML\SOAP11\XML\env\Fault|null
+     * @return \SimpleSAML\SOAP\XML\env_200106\Fault|null
      */
     private function getSOAPFault(DOMDocument $soapMessage): ?Fault
     {