diff --git a/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java b/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
index 039344daf4..853b26faba 100644
--- a/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
+++ b/auth/client/src/main/java/org/wildfly/security/auth/client/ElytronXmlParser.java
@@ -155,7 +155,7 @@ private enum Version {
         VERSION_1_5("urn:elytron:client:1.5", VERSION_1_4),
         VERSION_1_6("urn:elytron:client:1.6", VERSION_1_5),
         VERSION_1_7("urn:elytron:client:1.7", VERSION_1_6),
-        VERSION_1_8("urn:elytron:client:1.8", VERSION_1_7);
+        VERSION_1_8_PREVIEW("urn:elytron:client:preview:1.8", VERSION_1_7);
 
         final String namespace;
 
@@ -541,7 +541,7 @@ private static void parseSslContextType(final ConfigurationXMLStreamReader reade
                     case "accept-ocsp-stapling": {
                         if (isSet(foundBits, 10)) throw reader.unexpectedElement();
                         foundBits = setBit(foundBits, 10);
-                        if (!xmlVersion.isAtLeast(Version.VERSION_1_8)) throw reader.unexpectedElement();
+                        if (!xmlVersion.isAtLeast(Version.VERSION_1_8_PREVIEW)) throw reader.unexpectedElement();
                         acceptOcspStapling = parseOcspStaplingType(reader, trustManagerBuilder, xmlVersion, keyStoresMap);
                         break;
                     }
@@ -606,14 +606,14 @@ private static boolean parseOcspStaplingType(ConfigurationXMLStreamReader reader
             switch (reader.getAttributeLocalName(i)) {
                 case "accept-ocsp": {
                     if (acceptOcspStapling) throw reader.unexpectedAttribute(i);
-                    if (!xmlVersion.isAtLeast(Version.VERSION_1_8)) throw reader.unexpectedAttribute(i);
+                    if (!xmlVersion.isAtLeast(Version.VERSION_1_8_PREVIEW)) throw reader.unexpectedAttribute(i);
                     acceptOcspStapling = reader.getBooleanAttributeValueResolved(i);
                     builder.setOcspStapling(acceptOcspStapling);
                     break;
                 }
                 case "soft-fail": {
                     if (softFail) throw reader.unexpectedAttribute(i);
-                    if (!xmlVersion.isAtLeast(Version.VERSION_1_8)) throw reader.unexpectedAttribute(i);
+                    if (!xmlVersion.isAtLeast(Version.VERSION_1_8_PREVIEW)) throw reader.unexpectedAttribute(i);
                     softFail = reader.getBooleanAttributeValueResolved(i);
                     builder.setSoftFail(softFail);
                     break;
diff --git a/auth/client/src/main/resources/schema/elytron-client-1_8.xsd b/auth/client/src/main/resources/schema/elytron-client_preview_1_8.xsd
similarity index 99%
rename from auth/client/src/main/resources/schema/elytron-client-1_8.xsd
rename to auth/client/src/main/resources/schema/elytron-client_preview_1_8.xsd
index ada98c6138..5a982751fb 100644
--- a/auth/client/src/main/resources/schema/elytron-client-1_8.xsd
+++ b/auth/client/src/main/resources/schema/elytron-client_preview_1_8.xsd
@@ -19,8 +19,8 @@
   -->
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="urn:elytron:client:1.8"
-            xmlns="urn:elytron:client:1.8"
+            targetNamespace="urn:elytron:client:preview:1.8"
+            xmlns="urn:elytron:client:preview:1.8"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
             version="1.0">
diff --git a/auth/client/src/test/resources/org/wildfly/security/auth/client/test-wildfly-config-v1_8.xml b/auth/client/src/test/resources/org/wildfly/security/auth/client/test-wildfly-config-v1_8.xml
index 78abfa5715..75d6b52fea 100644
--- a/auth/client/src/test/resources/org/wildfly/security/auth/client/test-wildfly-config-v1_8.xml
+++ b/auth/client/src/test/resources/org/wildfly/security/auth/client/test-wildfly-config-v1_8.xml
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <configuration>
-    <authentication-client xmlns="urn:elytron:client:1.8">
+    <authentication-client xmlns="urn:elytron:client:preview:1.8">
         <authentication-configurations>
             <configuration name="clear-cred">
                 <credentials>
diff --git a/tests/base/src/test/resources/org/wildfly/security/ssl/ssl-authentication-config.xml b/tests/base/src/test/resources/org/wildfly/security/ssl/ssl-authentication-config.xml
index e9a666a51d..963abd6a9b 100644
--- a/tests/base/src/test/resources/org/wildfly/security/ssl/ssl-authentication-config.xml
+++ b/tests/base/src/test/resources/org/wildfly/security/ssl/ssl-authentication-config.xml
@@ -20,7 +20,7 @@
 
 <!-- Configuration for the SSLAuthenticationTest -->
 <configuration>
-    <authentication-client xmlns="urn:elytron:client:1.8">
+    <authentication-client xmlns="urn:elytron:client:preview:1.8">
         <key-stores>
             <key-store name="ca" type="PKCS12" provider="SUN">
                 <file name="target/test-classes/pkcs12/ca.truststore"/>