diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f21fd13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+jakartaee9/build
\ No newline at end of file
diff --git a/jakartaee9/src/application-client_9.xsds b/jakartaee9/src/application-client_9.xsds
index b850f0e..87081dd 100644
--- a/jakartaee9/src/application-client_9.xsds
+++ b/jakartaee9/src/application-client_9.xsds
@@ -83,9 +83,9 @@
 
 	The application-client element is the root element of an
 	application client deployment descriptor.  The application
-	client deployment descriptor describes the EJB components
-	and external resources referenced by the application
-	client.
+	client deployment descriptor describes the enterprise bean 
+	components and external resources referenced by the 
+	application client.
 
       </xsd:documentation>
     </xsd:annotation>
@@ -109,9 +109,9 @@
       <xsd:annotation>
 	<xsd:documentation>
 
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the application
-	  client's environment and is relative to the
+	  The ejb-ref-name element contains the name of an enterprise bean 
+	  reference. The enterprise bean reference is an entry 
+	  in the application client's environment and is relative to the
 	  java:comp/env context. The name must be unique within the
 	  application client.
 
@@ -213,7 +213,7 @@
 	    The callback-handler element names a class provided by
 	    the application.  The class must have a no args
 	    constructor and must implement the
-	    javax.security.auth.callback.CallbackHandler
+	    jakarta.security.auth.callback.CallbackHandler
 	    interface.  The class will be instantiated by the
 	    application client container and used by the container
 	    to collect authentication information from the user.
diff --git a/jakartaee9/src/connector_1_7.xsds b/jakartaee9/src/connector_2_0.xsds
similarity index 95%
rename from jakartaee9/src/connector_1_7.xsds
rename to jakartaee9/src/connector_2_0.xsds
index e48a0df..6dd8214 100644
--- a/jakartaee9/src/connector_1_7.xsds
+++ b/jakartaee9/src/connector_2_0.xsds
@@ -23,7 +23,7 @@
 	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	    elementFormDefault="qualified"
 	    attributeFormDefault="unqualified"
-	    version="1.7">
+	    version="2.0">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -35,9 +35,9 @@
     <xsd:documentation>
       <![CDATA[
 
-	This is the XML Schema for the Connector 1.7 deployment
+	This is the XML Schema for the Connectors 2.0 deployment
 	descriptor.  The deployment descriptor must be named
-	"META-INF/ra.xml" in the connector's rar file.  All Connector
+	"META-INF/ra.xml" in the connector's rar file.  All connector
 	deployment descriptors must indicate the connector resource
 	adapter schema by using the Jakarta EE namespace:
 
@@ -49,8 +49,8 @@
 	    <connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	      xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-		 https://jakarta.ee/xml/ns/jakartaee/connector_1_7.xsd"
-	      version="1.7">
+		 https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+	      version="2.0">
 	      ...
 	    </connector>
 
@@ -58,7 +58,7 @@
 	the schema using the xsi:schemaLocation attribute for Jakarta EE
 	namespace with the following location:
 
-	https://jakarta.ee/xml/ns/jakartaee/connector_1_7.xsd
+	https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd
 
 	]]>
     </xsd:documentation>
@@ -119,7 +119,7 @@
 	      The element activationspec-class specifies the fully
 	      qualified Java class name of the activation
 	      specification class. This class must implement the
-	      javax.resource.spi.ActivationSpec interface. The
+	      jakarta.resource.spi.ActivationSpec interface. The
 	      implementation of this class is required to be a
 	      JavaBean.
 
@@ -144,7 +144,7 @@
 	Bean Validation annotation or its XML validation
 	descriptor equivalent to indicate that a configuration
 	property is required to be specified by the deployer.
-	See the Connectors specification for more information. 
+	See the Jakarta Connectors specification for more information. 
 
       </xsd:documentation>
     </xsd:annotation>
@@ -187,7 +187,7 @@
 	      interface implemented by an administered object.
 
 	      Example:
-		<adminobject-interface>javax.jms.Destination
+		<adminobject-interface>jakarta.jms.Destination
 		</adminobject-interface>
 
 	      ]]>
@@ -235,10 +235,10 @@
 	security contract and authentication mechanism.
 
 	Note that BasicPassword mechanism type should support the
-	javax.resource.spi.security.PasswordCredential interface.
+	jakarta.resource.spi.security.PasswordCredential interface.
 	The Kerbv5 mechanism type should support the
 	org.ietf.jgss.GSSCredential interface or the deprecated
-	javax.resource.spi.security.GenericCredential interface.
+	jakarta.resource.spi.security.GenericCredential interface.
 
       </xsd:documentation>
     </xsd:annotation>
@@ -266,7 +266,7 @@
 	      </authentication-mechanism-type>
 
 	      Any additional security mechanisms are outside the
-	      scope of the Connector architecture specification.
+	      scope of the Jakarta Connectors architecture specification.
 
 	      ]]>
 	  </xsd:documentation>
@@ -416,7 +416,7 @@
 	      The element config-property-ignore is used to specify 
 	      whether the configuration tools must ignore considering the 
 	      configuration property during auto-discovery of
-	      Configuration properties. See the Connector specification for
+	      Configuration properties. See the Jakarta Connectors specification for
 	      more details. If unspecified, the container must not ignore
 	      the configuration property during auto-discovery.
 	      This element must be one of the following, "true" or "false".
@@ -435,7 +435,7 @@
 	      The element config-property-supports-dynamic-updates is used to specify 
 	      whether the configuration property allows its value to be updated, by
 	      application server's configuration tools, during the lifetime of
-	      the JavaBean instance. See the Connector specification for
+	      the JavaBean instance. See the Jakarta Connectors specification for
 	      more details. If unspecified, the container must not dynamically
 	      reconfigure the property.
 	      This element must be one of the following, "true" or "false".
@@ -454,7 +454,7 @@
 	      The element config-property-confidential is used to specify 
 	      whether the configuration property is confidential and
 	      recommends application server's configuration tools to use special 
-	      visual aids for editing them. See the Connector specification for
+	      visual aids for editing them. See the Jakarta Connectors specification for
 	      more details. If unspecified, the container must not treat the
 	      property as confidential.
 	      This element must be one of the following, "true" or "false".
@@ -494,7 +494,7 @@
 	      The element managedconnectionfactory-class specifies
 	      the fully qualified name of the Java class that
 	      implements the
-	      javax.resource.spi.ManagedConnectionFactory interface.
+	      jakarta.resource.spi.ManagedConnectionFactory interface.
 	      This Java class is provided as part of resource
 	      adapter's implementation of connector architecture
 	      specified contracts. The implementation of this
@@ -529,7 +529,7 @@
 
 	      OR
 
-	      <connectionfactory-interface>javax.resource.cci.ConnectionFactory
+	      <connectionfactory-interface>jakarta.resource.cci.ConnectionFactory
 	      </connectionfactory-interface>
 
 	      ]]>
@@ -569,7 +569,7 @@
 
 	      Example:
 
-		  <connection-interface>javax.resource.cci.Connection
+		  <connection-interface>jakarta.resource.cci.Connection
 		  </connection-interface>
 
 	      ]]>
@@ -705,7 +705,7 @@
     
     <xsd:attribute name="version"
 		   type="jakartaee:dewey-versionType"
-		   fixed="1.7"
+		   fixed="2.0"
 		   use="required">
       <xsd:annotation>
 	<xsd:documentation>
@@ -764,20 +764,20 @@
 
 	The possible values are:
 
-	javax.resource.spi.security.PasswordCredential
+	jakarta.resource.spi.security.PasswordCredential
 	org.ietf.jgss.GSSCredential
-	javax.resource.spi.security.GenericCredential
+	jakarta.resource.spi.security.GenericCredential
 
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
       <xsd:restriction base="jakartaee:fully-qualified-classType">
 	<xsd:enumeration
-	     value="javax.resource.spi.security.PasswordCredential"/>
+	     value="jakarta.resource.spi.security.PasswordCredential"/>
 	<xsd:enumeration
 	     value="org.ietf.jgss.GSSCredential"/>
 	<xsd:enumeration
-	     value="javax.resource.spi.security.GenericCredential"/>
+	     value="jakarta.resource.spi.security.GenericCredential"/>
       </xsd:restriction>
     </xsd:simpleContent>
   </xsd:complexType>
@@ -907,7 +907,7 @@
 
 	      Example:
 
-		<messagelistener-type>javax.jms.MessageListener
+		<messagelistener-type>jakarta.jms.MessageListener
 		</messagelistener-type>
 
 	      ]]>
@@ -950,7 +950,7 @@
 	If there is no transaction-support specified as part of this element 
     or metadata annotation, then the application server must consider that 
     the resource adapter does not support either the resource manager local 
-    or JTA transactions and must consider the transaction support as 
+    or Jakarta Transactions transactions and must consider the transaction support as 
     NoTransaction. Note that resource adapters may specify the level of 
     transaction support to be used at runtime for a ManagedConnectionFactory 
     through the TransactionSupport interface.
@@ -1056,7 +1056,7 @@
 
 	    The element resourceadapter-class specifies the
 	    fully qualified name of a Java class that implements
-	    the javax.resource.spi.ResourceAdapter
+	    the jakarta.resource.spi.ResourceAdapter
 	    interface. This Java class is provided as part of
 	    resource adapter's implementation of connector
 	    architecture specified contracts. The implementation
diff --git a/jakartaee9/src/jakartaee_9.xsds b/jakartaee9/src/jakartaee_9.xsds
index d540f84..2b871d8 100644
--- a/jakartaee9/src/jakartaee_9.xsds
+++ b/jakartaee9/src/jakartaee_9.xsds
@@ -41,7 +41,7 @@
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 
-  <xsd:include schemaLocation="jakartaee_web_services_client_1_4.xsd"/>
+  <xsd:include schemaLocation="jakartaee_web_services_client_2_0.xsd"/>
 
   <!-- **************************************************** -->
 
@@ -723,7 +723,7 @@
 
           The ejb-linkType is used by ejb-link
           elements in the ejb-ref or ejb-local-ref elements to specify
-          that an EJB reference is linked to enterprise bean.
+          that an enterprise bean reference is linked to enterprise bean.
 
           The value of the ejb-link element must be the ejb-name of an
           enterprise bean in the same ejb-jar file or in another ejb-jar
@@ -764,8 +764,8 @@
         The declaration consists of:
 
             - an optional description
-            - the EJB reference name used in the code of the Deployment 
-              Component that's referencing the enterprise bean.
+            - the enterprise bean's reference name used in the code of the 
+              Deployment Component that's referencing the enterprise bean.
             - the optional expected type of the referenced enterprise bean
             - the optional expected local interface of the referenced 
               enterprise bean or the local business interface of the 
@@ -812,11 +812,10 @@
       <xsd:documentation>
         <![CDATA[
 
-          The ejb-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the
-          Deployment Component's environment and is relative to the
-          java:comp/env context.  The name must be unique within the
-          Deployment Component.
+          The ejb-ref-name element contains the name of an enterprise bean reference. 
+          The enterprise bean reference is an entry in the Deployment Component's 
+          environment and is relative to the java:comp/env context.  The name must 
+          be unique within the Deployment Component.
 
           It is recommended that name is prefixed with "ejb/".
 
@@ -844,7 +843,7 @@
         The declaration consists of:
 
             - an optional description
-            - the EJB reference name used in the code of
+            - the enterprise bean's reference name used in the code of
               the Deployment Component that's referencing the enterprise
               bean. 
             - the optional expected type of the referenced enterprise bean
@@ -1316,7 +1315,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        Configuration of a JMS Connection Factory.
+        Configuration of a Messaging Connection Factory.
 
       </xsd:documentation>
     </xsd:annotation>
@@ -1327,7 +1326,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            Description of this JMS Connection Factory.
+            Description of this Messaging Connection Factory.
 
           </xsd:documentation>
         </xsd:annotation>
@@ -1338,7 +1337,7 @@
           <xsd:documentation>
 
             The name element specifies the JNDI name of the
-            JMS connection factory being defined.
+            messaging connection factory being defined.
 
           </xsd:documentation>
         </xsd:annotation>
@@ -1349,11 +1348,11 @@
         <xsd:annotation>
           <xsd:documentation>
 
-              Fully-qualified name of the JMS connection factory
-              interface.  Permitted values are javax.jms.ConnectionFactory,
-              javax.jms.QueueConnectionFactory, or 
-              javax.jms.TopicConnectionFactory.  If not specified,
-              javax.jms.ConnectionFactory will be used.
+              Fully-qualified name of the messaging connection factory
+              interface.  Permitted values are jakarta.jms.ConnectionFactory,
+              jakarta.jms.QueueConnectionFactory, or 
+              jakarta.jms.TopicConnectionFactory.  If not specified,
+              jakarta.jms.ConnectionFactory will be used.
 
           </xsd:documentation>
         </xsd:annotation>
@@ -1364,7 +1363,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-              Fully-qualified name of the JMS connection factory
+              Fully-qualified name of the messaging connection factory 
               implementation class.  Ignored if a resource adapter  
               is used.
 
@@ -1424,7 +1423,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            JMS Connection Factory property.  This may be a vendor-specific
+            Messaging Connection Factory property.  This may be a vendor-specific
             property or a less commonly used ConnectionFactory property.
 
           </xsd:documentation>
@@ -1478,7 +1477,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        Configuration of a JMS Destination.
+        Configuration of a Messaging Destination.
 
       </xsd:documentation>
     </xsd:annotation>
@@ -1489,7 +1488,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            Description of this JMS Destination.
+            Description of this Messaging Destination.
 
           </xsd:documentation>
         </xsd:annotation>
@@ -1500,7 +1499,7 @@
           <xsd:documentation>
 
             The name element specifies the JNDI name of the
-            JMS destination being defined.
+            messaging destination being defined.
 
           </xsd:documentation>
         </xsd:annotation>
@@ -1510,8 +1509,8 @@
         <xsd:annotation>
           <xsd:documentation>
 
-              Fully-qualified name of the JMS destination interface.
-              Permitted values are javax.jms.Queue and javax.jms.Topic
+              Fully-qualified name of the messaging destination interface.
+              Permitted values are jakarta.jms.Queue and jakarta.jms.Topic
 
           </xsd:documentation>
         </xsd:annotation>
@@ -1522,7 +1521,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-              Fully-qualified name of the JMS destination implementation
+              Fully-qualified name of the messaging destination implementation
               class.  Ignored if a resource adapter is used unless the
               resource adapter defines more than one destination implementation
               class for the specified interface.
@@ -1561,7 +1560,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            JMS Destination property.  This may be a vendor-specific
+            Messaging Destination property.  This may be a vendor-specific
             property or a less commonly used Destination property.
 
           </xsd:documentation>
@@ -2020,9 +2019,9 @@
             provider.  Vendor-specific properties may be included in
             the set of properties.  Properties that are not recognized
             by a vendor must be ignored.  Entries that make use of the 
-            namespace javax.persistence and its subnamespaces must not
+            namespace jakarta.persistence and its subnamespaces must not
             be used for vendor-specific properties.  The namespace
-            javax.persistence is reserved for use by the specification.
+            jakarta.persistence is reserved for use by the specification.
 
           </xsd:documentation>
         </xsd:annotation>
@@ -2241,7 +2240,7 @@
           <resource-env-ref>
               <resource-env-ref-name>jms/StockQueue
               </resource-env-ref-name>
-              <resource-env-ref-type>javax.jms.Queue
+              <resource-env-ref-type>jakarta.jms.Queue
               </resource-env-ref-type>
           </resource-env-ref>
 
@@ -2890,7 +2889,7 @@
           <message-destination-ref>
                   <message-destination-ref-name>jms/StockQueue
                   </message-destination-ref-name>
-                  <message-destination-type>javax.jms.Queue
+                  <message-destination-type>jakarta.jms.Queue
                   </message-destination-type>
                   <message-destination-usage>Consumes
                   </message-destination-usage>
@@ -2979,7 +2978,7 @@
 
           Example: 
 
-            <message-destination-type>javax.jms.Queue
+            <message-destination-type>jakarta.jms.Queue
             </message-destination-type>
 
           ]]>
diff --git a/jakartaee9/src/jakartaee_web_services_1_4.xsds b/jakartaee9/src/jakartaee_web_services_2_0.xsds
similarity index 88%
rename from jakartaee9/src/jakartaee_web_services_1_4.xsds
rename to jakartaee9/src/jakartaee_web_services_2_0.xsds
index 2ec2e3a..1d3b846 100644
--- a/jakartaee9/src/jakartaee_web_services_1_4.xsds
+++ b/jakartaee9/src/jakartaee_web_services_2_0.xsds
@@ -23,7 +23,7 @@
 	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	    elementFormDefault="qualified"
 	    attributeFormDefault="unqualified"
-	    version="1.4">
+	    version="2.0">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -61,8 +61,8 @@
 	    <webservices xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	      xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-		https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_1_4.xsd"
-	      version="1.4">
+		https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd"
+	      version="2.0">
 	      ...
 	    </webservices>
 
@@ -70,7 +70,7 @@
 	schema using the xsi:schemaLocation attribute for the Jakarta EE
 	namespace with the following location:
 
-	https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_1_4.xsd
+	https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd
 
 	]]>
     </xsd:documentation>
@@ -118,8 +118,8 @@
 	<xsd:documentation>
 
 	  The webservice-description-name identifies the collection of
-	  port-components associated with a WSDL file and JAX-RPC mapping. The
-	  name must be unique within the deployment descriptor.
+	  port-components associated with a WSDL file and Jakarta XML RPC mapping. 
+	  The name must be unique within the deployment descriptor.
 
 	</xsd:documentation>
       </xsd:annotation>
@@ -140,8 +140,8 @@
 	representations, WSDL port QName, Service Endpoint Interface, Service
 	Implementation Bean.
 
-	This element also associates a WSDL service with a JAX-WS Provider
-	implementation.
+	This element also associates a WSDL service with a Jakarta XML Web Services 
+	Provider implementation.
 
       </xsd:documentation>
     </xsd:annotation>
@@ -186,7 +186,8 @@
 
 	    Defines the name space and local name part of the WSDL
 	    service QName. This is required to be specified for
-	    port components that are JAX-WS Provider implementations.
+	    port components that are Jakarta XML Web Services 
+		Provider implementations.
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -199,7 +200,8 @@
 
 	    Defines the name space and local name part of the WSDL
 	    port QName. This is not required to be specified for port
-	    components that are JAX-WS Provider implementations
+	    components that are Jakarta XML Web Services Provider
+		implementations
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -213,7 +215,7 @@
             Used to enable or disable SOAP MTOM/XOP mechanism for an
             endpoint implementation.
 
-	    Not to be specified for JAX-RPC runtime
+	        Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -227,7 +229,7 @@
             When MTOM is enabled, binary data above this size in bytes
             will be XOP encoded or sent as attachment. Default value is 0.
 
-            Not to be specified for JAX-RPC runtime
+            Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -238,13 +240,13 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            This specifies the WS-Addressing requirements for a JAX-WS
-            web service. It corresponds to javax.xml.ws.soap.Addressing
-            annotation or its feature javax.xml.ws.soap.AddressingFeature.
+            This specifies the WS-Addressing requirements for a Jakarta XML  
+			web service. It corresponds to jakarta.xml.ws.soap.Addressing
+            annotation or its feature jakarta.xml.ws.soap.AddressingFeature.
 
             See the addressingType for more information.
 
-	    Not to be specified for JAX-RPC runtime
+	    Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -255,13 +257,13 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            Corresponds to the javax.xml.ws.RespectBinding annotation
-            or its corresponding javax.xml.ws.RespectBindingFeature web
-            service feature. This is used to control whether a JAX-WS
-            implementation must respect/honor the contents of the
+            Corresponds to the jakarta.xml.ws.RespectBinding annotation
+            or its corresponding jakarta.xml.ws.RespectBindingFeature web
+            service feature. This is used to control whether a Jakarta XML Web 
+			Services implementation must respect/honor the contents of the
             wsdl:binding in the WSDL that is associated with the service.
 
-            Not to be specified for JAX-RPC runtime
+            Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -316,7 +318,7 @@
 		     minOccurs="0" maxOccurs="unbounded">
 	  <xsd:annotation>
 	    <xsd:documentation>
-		 To be used with JAX-RPC based runtime only.
+		 To be used with Jakarta XML RPC based runtime only.
 	    </xsd:documentation>
 	  </xsd:annotation>
 	</xsd:element>
@@ -325,7 +327,7 @@
 		     minOccurs="0" maxOccurs="1">
 	  <xsd:annotation>
 	    <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
+		 To be used with Jakarta XML Web Services based runtime only.
 	    </xsd:documentation>
 	  </xsd:annotation>
 	</xsd:element>
@@ -342,9 +344,9 @@
       <xsd:documentation>
 
 	The service-impl-bean element defines the web service implementation.
-	A service implementation can be an EJB bean class or JAX-RPC web
-	component.  Existing EJB implementations are exposed as a web service
-	using an ejb-link.
+	A service implementation can be an enterprise bean class or Jakarta
+	XML RPC web component.  Existing enterprise bean implementations 
+	are exposed as a web service using an ejb-link.
 
 	Used in: port-component
 
@@ -368,10 +370,10 @@
 
 	  The servlet-link element is used in the service-impl-bean element
 	  to specify that a Service Implementation Bean is defined as a
-	  JAX-RPC Service Endpoint.
+	  Jakarta XML RPC Service Endpoint.
 
 	  The value of the servlet-link element must be the servlet-name of
-	  a JAX-RPC Service Endpoint in the same WAR file.
+	  a Jakarta XML RPC Service Endpoint in the same WAR file.
 
 	  Used in: service-impl-bean
 
@@ -421,7 +423,7 @@
 	  <xsd:documentation>
 
 	    The webservice-description-name identifies the collection of
-	    port-components associated with a WSDL file and JAX-RPC
+	    port-components associated with a WSDL file and Jakarta XML RPC
 	    mapping. The name must be unique within the deployment descriptor.
 
 	  </xsd:documentation>
@@ -446,11 +448,12 @@
 	  <xsd:documentation>
 
 	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
+	    describes the Jakarta XML RPC mapping between the Java interaces used by
 	    the application and the WSDL description in the wsdl-file.  The
 	    file name is a relative path within the module.
 
-	    This is not required when JAX-WS based runtime is used.
+	    This is not required when JAX-Jakarta Enterprise Web Services based 
+		runtime is used.
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -511,12 +514,12 @@
 
     <xsd:attribute name="version"
 		   type="jakartaee:dewey-versionType"
-		   fixed="1.4"
+		   fixed="2.0"
 		   use="required">
       <xsd:annotation>
 	<xsd:documentation>
 
-	  The required value for the version is 1.4.
+	  The required value for the version is 2.0.
 
 	</xsd:documentation>
       </xsd:annotation>
diff --git a/jakartaee9/src/jakartaee_web_services_client_1_4.xsds b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds
similarity index 90%
rename from jakartaee9/src/jakartaee_web_services_client_1_4.xsds
rename to jakartaee9/src/jakartaee_web_services_client_2_0.xsds
index 4f4b30d..6694577 100644
--- a/jakartaee9/src/jakartaee_web_services_client_1_4.xsds
+++ b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds
@@ -23,7 +23,7 @@
 	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	    elementFormDefault="qualified"
 	    attributeFormDefault="unqualified"
-	    version="1.4">
+	    version="2.0">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -47,7 +47,7 @@
 	service. It contains optional description, display name and
 	icons, a declaration of the required Service interface,
 	an optional WSDL document location, an optional set
-	of JAX-RPC mappings, an optional QName for the service element,
+	of Jakarta XML RPC mappings, an optional QName for the service element,
 	an optional set of Service Endpoint Interfaces to be resolved 
 	by the container to a WSDL port, and an optional set of handlers.
 
@@ -76,9 +76,9 @@
 	  <xsd:documentation>
 
 	    The service-interface element declares the fully qualified class
-	    name of the JAX-RPC Service interface the client depends on. 
-	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	    generated Service Interface class may also be specified.
+	    name of the Jakarta XML RPC Service interface the client depends on. 
+	    In most cases the value will be jakarta.xml.rpc.Service.  A Jakarta XML 
+      RPC generated Service Interface class may also be specified.
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -94,9 +94,9 @@
 	    element that is injected or returned when a JNDI lookup is done.
 	    This must be either a fully qualified name of Service class or 
 	    the fully qualified name of service endpoint interface class. 
-	    This is only used with JAX-WS runtime where the corresponding 
-	    @WebServiceRef annotation can be used to denote both a Service
-	    or a Port.
+	    This is only used with Jakarta XML Web Services runtime where
+      the corresponding @WebServiceRef annotation can be used to denote both 
+      a Service or a Port.
 
 	    If this is not specified, then the type of service-ref element 
 	    that is injected or returned when a JNDI lookup is done is 
@@ -126,11 +126,12 @@
 	  <xsd:documentation>
 
 	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
+	    describes the Jakarta XML RPC mapping between the Java interaces used by
 	    the application and the WSDL description in the wsdl-file.  The 
 	    file name is a relative path within the module file.
 
-	    This is not required when JAX-WS based runtime is used.
+	    This is not required when Jakarta Enterprise Web Services based 
+      runtime is used.
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -179,7 +180,7 @@
 		handler is assumed to be associated with all ports of the
 		service.
 
-		To be used with JAX-RPC based runtime only.
+		To be used with Jakarta XML RPC based runtime only.
 
 	      </xsd:documentation>
 	    </xsd:annotation>
@@ -189,7 +190,7 @@
 		       minOccurs="0" maxOccurs="1">
 	    <xsd:annotation>
 	      <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
+		 To be used with Jakarta XML Web Services based runtime only.
 	      </xsd:documentation>
 	    </xsd:annotation>
 	  </xsd:element>
@@ -235,9 +236,9 @@
           <xsd:documentation>
 
             Used to enable or disable SOAP MTOM/XOP mechanism on the client
-	    side for a port-component. 
+	          side for a port-component. 
 
-	    Not to be specified for JAX-RPC runtime
+	          Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -251,7 +252,7 @@
             When MTOM is enabled, binary data above this size in bytes
             should be XOP encoded or sent as attachment. Default value is 0.
 
-            Not to be specified for JAX-RPC runtime
+            Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -262,13 +263,13 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            This specifies the WS-Addressing requirements for a JAX-WS
-            web service. It corresponds to javax.xml.ws.soap.Addressing
-            annotation or its feature javax.xml.ws.soap.AddressingFeature.
+            This specifies the WS-Addressing requirements for a Jakarta XML 
+            web service. It corresponds to jakarta.xml.ws.soap.Addressing
+            annotation or its feature jakarta.xml.ws.soap.AddressingFeature.
 
             See the addressingType for more information.
 
-            Not to be specified for JAX-RPC runtime
+            Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -279,13 +280,13 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            Corresponds to the javax.xml.ws.RespectBinding annotation
-            or its corresponding javax.xml.ws.RespectBindingFeature web
-            service feature. This is used to control whether a JAX-WS
-            implementation must respect/honor the contents of the
+            Corresponds to the jakarta.xml.ws.RespectBinding annotation
+            or its corresponding jakarta.xml.ws.RespectBindingFeature web
+            service feature. This is used to control whether a Jakarta XML Web 
+            Services implementation must respect/honor the contents of the
             wsdl:binding in the WSDL that is associated with the service.
 
-            Not to be specified for JAX-RPC runtime
+            Not to be specified for Jakarta XML RPC runtime
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -501,9 +502,9 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        This specifies the WS-Addressing requirements for a JAX-WS web service.
-        It corresponds to javax.xml.ws.soap.Addressing annotation or its
-        feature javax.xml.ws.soap.AddressingFeature.
+        This specifies the WS-Addressing requirements for a Jakarta XML web 
+        service. It corresponds to jakarta.xml.ws.soap.Addressing annotation or its
+        feature jakarta.xml.ws.soap.AddressingFeature.
 
         If the "enabled" element is "true", WS-Addressing is enabled.
         It means that the endpoint supports WS-Addressing but does not require
@@ -563,10 +564,10 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        Corresponds to the javax.xml.ws.RespectBinding annotation
-        or its corresponding javax.xml.ws.RespectBindingFeature web
-        service feature. This is used to control whether a JAX-WS
-        implementation must respect/honor the contents of the
+        Corresponds to the jakarta.xml.ws.RespectBinding annotation
+        or its corresponding jakarta.xml.ws.RespectBindingFeature web
+        service feature. This is used to control whether a Jakarta XML 
+        Web Services implementation must respect/honor the contents of the
         wsdl:binding in the WSDL that is associated with the service.
 
         If the "enabled" element is "true", wsdl:binding in the
@@ -624,7 +625,7 @@
 	<xsd:annotation>
 	  <xsd:documentation>
 
-	    Not to be specified for JAX-WS runtime
+	    Not to be specified for Jakarta XML Web Services runtime
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -639,7 +640,7 @@
 	    Defines the QName of a SOAP header that will be processed by the
 	    handler.
 
-	    Not to be specified for JAX-WS runtime
+	    Not to be specified for Jakarta XML Web Services runtime
 
 	  </xsd:documentation>
 	</xsd:annotation>
@@ -667,7 +668,7 @@
             specified, the handler is assumed to be associated with
             all ports of the service.
 
-	    Not to be specified for JAX-WS runtime
+	    Not to be specified for Jakarta XML Web Services runtime
 
 	  </xsd:documentation>
 	</xsd:annotation>
diff --git a/jakartaee9/src/permissions_7.xsds b/jakartaee9/src/permissions_9.xsds
similarity index 93%
rename from jakartaee9/src/permissions_7.xsds
rename to jakartaee9/src/permissions_9.xsds
index 8b4b43d..14686ed 100644
--- a/jakartaee9/src/permissions_7.xsds
+++ b/jakartaee9/src/permissions_9.xsds
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
 	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	    elementFormDefault="qualified"
 	    attributeFormDefault="unqualified"
-	    version="7">
+	    version="9">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -35,7 +35,7 @@
     <xsd:documentation>
       <![CDATA[
 
-	This is the XML Schema for the application or module declared permissions 7.
+	This is the XML Schema for the application or module declared permissions 9.
         The declared permissions file must be named "META-INF/permissions.xml" in the
 	application's ear file, or in a module's META-INF/permissions.xml if
         the module is deployed standalone.  All declared permissions must indicate
@@ -50,8 +50,8 @@
 	    <permissions xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	      xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee 
-		https://jakarta.ee/xml/ns/jakartaee/permissions_7.xsd"
-	      version="7">
+		https://jakarta.ee/xml/ns/jakartaee/permissions_9.xsd"
+	      version="9">
 	      ...
 	    </permisssions>
 
@@ -59,7 +59,7 @@
 	the schema using the xsi:schemaLocation attribute for Jakarta EE
 	namespace with the following location:
 
-	https://jakarta.ee/xml/ns/jakartaee/permissions_7.xsd
+	https://jakarta.ee/xml/ns/jakartaee/permissions_9.xsd
 
 	]]>
     </xsd:documentation>
@@ -131,12 +131,12 @@
 
       <xsd:attribute name="version"
 		   type="jakartaee:dewey-versionType"
-		   fixed="7"
+		   fixed="9"
 		   use="required">
         <xsd:annotation>
 	  <xsd:documentation>
 
-	    The required value for the version is 7.
+	    The required value for the version is 9.
 
 	  </xsd:documentation>
         </xsd:annotation>
diff --git a/jakartaee9/src/web-app_4_0.xsds b/jakartaee9/src/web-app_5_0.xsds
similarity index 94%
rename from jakartaee9/src/web-app_4_0.xsds
rename to jakartaee9/src/web-app_5_0.xsds
index 0269e9c..edf1ae8 100644
--- a/jakartaee9/src/web-app_4_0.xsds
+++ b/jakartaee9/src/web-app_5_0.xsds
@@ -23,7 +23,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
-            version="4.0">
+            version="5.0">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -35,7 +35,7 @@
     <xsd:documentation>
       <![CDATA[
 
-        This is the XML Schema for the Servlet 4.0 deployment descriptor.
+        This is the XML Schema for the Servlet 5.0 deployment descriptor.
         The deployment descriptor must be named "WEB-INF/web.xml" in the
         web application's war file.  All Servlet deployment descriptors
         must indicate the web application schema by using the Jakarta EE
@@ -49,7 +49,7 @@
             <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="..."
-              version="4.0">
+              version="5.0">
               ...
             </web-app>
 
@@ -57,7 +57,7 @@
         the schema using the xsi:schemaLocation attribute for Jakarta EE
         namespace with the following location:
 
-        https://jakarta.ee/xml/ns/jakartaee/web-app_4_0.xsd
+        https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd
 
         ]]>
     </xsd:documentation>
@@ -71,7 +71,7 @@
 
   <!-- **************************************************** -->
 
-  <xsd:include schemaLocation="web-common_4_0.xsd"/>
+  <xsd:include schemaLocation="web-common_5_0.xsd"/>
 
   <!-- **************************************************** -->
 
@@ -127,8 +127,9 @@
       <xsd:annotation>
         <xsd:documentation>
 
-          The ejb-local-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
+          The ejb-local-ref-name element contains the name of an 
+          enterprise bean reference. The enterprise 
+          bean reference is an entry in the web
           application's environment and is relative to the
           java:comp/env context.  The name must be unique within
           the web application.
@@ -145,11 +146,11 @@
       <xsd:annotation>
         <xsd:documentation>
 
-          The ejb-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
-          the web application.
+          The ejb-ref-name element contains the name of an 
+          enterprise bean reference. The enterprise bean 
+          reference is an entry in the web application's environment 
+          and is relative to the java:comp/env context.  
+          The name must be unique within the web application.
 
           It is recommended that name is prefixed with "ejb/".
 
diff --git a/jakartaee9/src/web-common_4_0.xsds b/jakartaee9/src/web-common_5_0.xsds
similarity index 99%
rename from jakartaee9/src/web-common_4_0.xsds
rename to jakartaee9/src/web-common_5_0.xsds
index 2fbf958..9ee344d 100644
--- a/jakartaee9/src/web-common_4_0.xsds
+++ b/jakartaee9/src/web-common_5_0.xsds
@@ -23,7 +23,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
-            version="4.0">
+            version="5.0">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -35,7 +35,7 @@
     <xsd:documentation>
       <![CDATA[
 
-        This is the common XML Schema for the Servlet 4.0 deployment descriptor.
+        This is the common XML Schema for the Servlet 5.0 deployment descriptor.
         This file is in turn used by web.xml and web-fragment.xml
         web application's war file.  All Servlet deployment descriptors
         must indicate the web common schema by using the Jakarta EE
@@ -49,7 +49,7 @@
             <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="..."
-              version="4.0">
+              version="5.0">
               ...
             </web-app>
 
@@ -57,7 +57,7 @@
         the schema using the xsi:schemaLocation attribute for Jakarta EE
         namespace with the following location:
 
-        https://jakarta.ee/xml/ns/jakartaee/web-common_4_0.xsd
+        https://jakarta.ee/xml/ns/jakartaee/web-common_5_0.xsd
 
         ]]>
     </xsd:documentation>
@@ -1199,7 +1199,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="4.0"/>
+      <xsd:enumeration value="5.0"/>
     </xsd:restriction>
   </xsd:simpleType>
 
diff --git a/jakartaee9/src/web-facelettaglibrary_2_3.xsds b/jakartaee9/src/web-facelettaglibrary_3_0.xsds
similarity index 96%
rename from jakartaee9/src/web-facelettaglibrary_2_3.xsds
rename to jakartaee9/src/web-facelettaglibrary_3_0.xsds
index 5ac3b1f..c4bf3c0 100644
--- a/jakartaee9/src/web-facelettaglibrary_2_3.xsds
+++ b/jakartaee9/src/web-facelettaglibrary_3_0.xsds
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,7 +23,7 @@
             xmlns:xml="http://www.w3.org/XML/1998/namespace"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
-            version="2.3">
+            version="3.0">
   <xsd:include schemaLocation="jakartaee_9.xsd"/>
 
   <xsd:annotation>
@@ -35,17 +35,17 @@
   <xsd:annotation>
     <xsd:documentation>
       <![CDATA[[
-      <p>The XML Schema for the Tag Libraries in the JavaServer Faces
+      <p>The XML Schema for the Tag Libraries in the Jakarta Server Faces
       Standard Facelets View Declaration Language (Facelets VDL)
-      (Version 2.3).</p>
+      (Version 3.0).</p>
       
-      <p>JSF 2.3 Facelet Tag Libraries that wish to conform to this
-      schema must declare it in the following manner.</p>
+      <p>Jakarta Server Faces 3.0 Facelet Tag Libraries that wish to conform to 
+      this schema must declare it in the following manner.</p>
       
       &lt;facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facelettaglibary_2_3.xsd"
-      version="2.3"&gt;
+      version="3.0"&gt;
       
       ...
       
@@ -403,7 +403,7 @@
       <xsd:documentation><![CDATA[<p>
 
         Within a tag element, the behavior element encapsulates
-        information specific to a JSF Behavior.
+        information specific to a Faces Behavior.
         
       </p>]]></xsd:documentation>
     </xsd:annotation>
@@ -455,12 +455,11 @@
 
       <p><span class="changed_modified_2_2
       changed_modified_2_3">Within</span> a tag element, the component
-      element encapsulates information specific to a JSF
-      UIComponent.</p>
+      element encapsulates information specific to a Faces UIComponent.</p>
 
 <div class="changed_added_2_2 changed_deleted_2_3">
 
-<p>As of 2.3 of the specification, this requirement is no longer
+<p>As of 3.0 of the specification, this requirement is no longer
 present: This element must have exactly one of
 <code>&lt;component-type&gt;</code>, <code>&lt;resource-id&gt;</code>,
 or <code>&lt;handler-class&gt;</code> among its child elements.</p>
@@ -539,7 +538,7 @@ or <code>&lt;handler-class&gt;</code> among its child elements.</p>
       <xsd:documentation><![CDATA[<p>
 
         Within a tag element, the converter element encapsulates
-        information specific to a JSF Converter.
+        information specific to a Faces Converter.
         
       </p>]]></xsd:documentation>
     </xsd:annotation>
@@ -590,7 +589,7 @@ or <code>&lt;handler-class&gt;</code> among its child elements.</p>
       <xsd:documentation><![CDATA[<p>
 
         Within a tag element, the validator element encapsulates
-        information specific to a JSF Validator.
+        information specific to a Faces Validator.
         
       </p>]]></xsd:documentation>
     </xsd:annotation>
@@ -643,7 +642,7 @@ or <code>&lt;handler-class&gt;</code> among its child elements.</p>
       </p>]]></xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="2.3"/>
+      <xsd:enumeration value="3.0"/>
     </xsd:restriction>
   </xsd:simpleType>
 
diff --git a/jakartaee9/src/web-facesconfig_2_3.xsds b/jakartaee9/src/web-facesconfig_3_0.xsds
similarity index 99%
rename from jakartaee9/src/web-facesconfig_2_3.xsds
rename to jakartaee9/src/web-facesconfig_3_0.xsds
index 0200173..c0d5598 100644
--- a/jakartaee9/src/web-facesconfig_2_3.xsds
+++ b/jakartaee9/src/web-facesconfig_3_0.xsds
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
             attributeFormDefault="unqualified" 
             elementFormDefault="qualified" 
             targetNamespace="https://jakarta.ee/xml/ns/jakartaee" 
-            version="2.3" 
+            version="3.0" 
             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <xsd:include schemaLocation="jakartaee_9.xsd" />
 
@@ -35,8 +35,8 @@
     <xsd:documentation>
       <![CDATA[
 
-      <p>The XML Schema for the JavaServer Faces Application
-      Configuration File (Version 2.3).</p>
+      <p>The XML Schema for the Jakarta Server Faces Application
+      Configuration File (Version 3.0).</p>
       
       <p>All JavaServer Faces configuration files must indicate
       the JavaServer Faces schema by indicating the JavaServer
@@ -58,7 +58,7 @@
       version of the schema using xsi:schemaLocation attribute
       for jakartaee namespace with the following location:</p>
       
-      <p>https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_2_3.xsd</p>
+      <p>https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd</p>
       
       ]]>
     </xsd:documentation>
@@ -229,7 +229,7 @@
           configuration resource file located at "WEB-INF/faces-config.xml".
           The presence of this attribute on any application configuration
           resource other than the one located at "WEB-INF/faces-config.xml",
-          including any files named using the javax.faces.CONFIG_FILES
+          including any files named using the jakarta.faces.CONFIG_FILES
           attribute, must be ignored.
           
           If metadata-complete is set to "true", the JavaServer Faces
@@ -392,7 +392,8 @@
         various per-application-singleton implementation artifacts for
         a particular web application that is utilizing
         JavaServer Faces.  For nested elements that are not specified,
-        the JSF implementation must provide a suitable default.</p>
+        the Jakarta Server Faces implementation must provide a suitable 
+        default.</p>
         
       ]]></xsd:documentation>
     </xsd:annotation>
@@ -448,8 +449,8 @@
             NavigationHandler implementation class that will
             be called during the Invoke Application phase
             of the request processing lifecycle, if the
-            default ActionListener (provided by the JSF
-            implementation) is used.</p>
+            default ActionListener (provided by the Jakarta Server 
+            Faces implementation) is used.</p>
             
           ]]></xsd:documentation>
         </xsd:annotation>
@@ -493,7 +494,7 @@
 
            <p> The "el-resolver" element contains the fully
             qualified class name of the concrete
-            javax.el.ELResolver implementation class
+            jakarta.el.ELResolver implementation class
             that will be used during the processing of
             EL expressions.</p>
             
@@ -566,7 +567,7 @@
 
            <p class="changed_added_2_3">The "search-expression-handler"
            element contains the fully qualified class name of the
-           concrete javax.faces.component.search.SearchExpressionHandler
+           concrete jakarta.faces.component.search.SearchExpressionHandler
            implementation class that will be used for processing of a
            search expression.</p>
             
@@ -580,7 +581,7 @@
 
            <p class="changed_added_2_3"> The "search-keyword-resolver"
            element contains the fully qualified class name of the
-           concrete javax.faces.component.search.SearchKeywordResolver
+           concrete jakarta.faces.component.search.SearchKeywordResolver
            implementation class that will be used during the processing
            of a search expression keyword.</p>
             
@@ -766,8 +767,8 @@
        <p> The "factory" element provides a mechanism to define the
         various Factories that comprise parts of the implementation
         of JavaServer Faces.  For nested elements that are not
-        specified, the JSF implementation must provide a suitable
-        default.</p>
+        specified, the Jakarta Server Faces implementation must provide a 
+        suitable default.</p>
         
       ]]></xsd:documentation>
     </xsd:annotation>
@@ -2918,8 +2919,8 @@ which must contain exactly one <code>&lt;flow-id&gt;</code> element.</p>
       <xsd:documentation><![CDATA[
 
        <p class="changed_added_2_2">Any view that matches any of the
-       url-patterns in this element may only be reached from another JSF
-       view in the same web application. Because the runtime is aware of
+       url-patterns in this element may only be reached from another Jakarta Server 
+       Faces view in the same web application. Because the runtime is aware of
        which views are protected, any navigation from an unprotected
        view to a protected view is automatically subject to
        protection.</p>
@@ -3746,7 +3747,7 @@ which must contain exactly one <code>&lt;flow-id&gt;</code> element.</p>
       ]]></xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="2.3"/>
+      <xsd:enumeration value="3.0"/>
     </xsd:restriction>
   </xsd:simpleType>
 
diff --git a/jakartaee9/src/web-fragment_4_0.xsds b/jakartaee9/src/web-fragment_5_0.xsds
similarity index 93%
rename from jakartaee9/src/web-fragment_4_0.xsds
rename to jakartaee9/src/web-fragment_5_0.xsds
index 81e7baa..8bd9246 100644
--- a/jakartaee9/src/web-fragment_4_0.xsds
+++ b/jakartaee9/src/web-fragment_5_0.xsds
@@ -23,7 +23,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified"
-            version="4.0">
+            version="5.0">
 
   <xsd:annotation>
     <xsd:documentation>
@@ -35,7 +35,7 @@
     <xsd:documentation>
       <![CDATA[
 
-        This is the XML Schema for the Servlet 4.0 deployment descriptor.
+        This is the XML Schema for the Servlet 5.0 deployment descriptor.
         The deployment descriptor must be named "META-INF/web-fragment.xml"
         in the web fragment's jar file.  All Servlet deployment descriptors
         must indicate the web application schema by using the Jakarta EE
@@ -49,7 +49,7 @@
             <web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="..."
-              version="4.0">
+              version="5.0">
               ...
             </web-fragment>
 
@@ -57,7 +57,7 @@
         the schema using the xsi:schemaLocation attribute for Jakarta EE
         namespace with the following location:
 
-        https://jakarta.ee/xml/ns/jakartaee/web-fragment_4_0.xsd
+        https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd
 
         ]]>
     </xsd:documentation>
@@ -71,7 +71,7 @@
 
   <!-- **************************************************** -->
 
-  <xsd:include schemaLocation="web-common_4_0.xsd"/>
+  <xsd:include schemaLocation="web-common_5_0.xsd"/>
 
   <!-- **************************************************** -->
 
@@ -127,10 +127,10 @@
       <xsd:annotation>
         <xsd:documentation>
 
-          The ejb-local-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
+          The ejb-local-ref-name element contains the name of an 
+          enterprise bean reference. The enterprise bean reference
+          is an entry in the web application's environment and is relative
+          to the java:comp/env context.  The name must be unique within
           the web application.
 
           It is recommended that name is prefixed with "ejb/".
@@ -145,10 +145,10 @@
       <xsd:annotation>
         <xsd:documentation>
 
-          The ejb-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
+          The ejb-ref-name element contains the name of an  
+          enterprise bean reference. The enterprise bean reference 
+          is an entry in the web application's environment and is relative 
+          to the java:comp/env context.  The name must be unique within
           the web application.
 
           It is recommended that name is prefixed with "ejb/".
diff --git a/jakartaee9/src/web-partialresponse_2_3.xsds b/jakartaee9/src/web-partialresponse_3_0.xsds
similarity index 98%
rename from jakartaee9/src/web-partialresponse_2_3.xsds
rename to jakartaee9/src/web-partialresponse_3_0.xsds
index 6bd821f..1afa4e3 100644
--- a/jakartaee9/src/web-partialresponse_2_3.xsds
+++ b/jakartaee9/src/web-partialresponse_3_0.xsds
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
             attributeFormDefault="unqualified"
             elementFormDefault="qualified"
             targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
-            version="2.3"
+            version="3.0"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <xsd:include schemaLocation="jakartaee_9.xsd"/>
 
@@ -36,7 +36,7 @@
       <![CDATA[[
       <p>
       
-      The XML Schema for the JavaServer Faces (Version 2.3)  
+      The XML Schema for the Jakarta Server Faces (Version 3.0)  
       Partial Response used in JSF Ajax frameworks.
       
       </p>
diff --git a/jakartaee9/test/app-client-complete.xml b/jakartaee9/test/app-client-complete.xml
index 6274634..73bb572 100644
--- a/jakartaee9/test/app-client-complete.xml
+++ b/jakartaee9/test/app-client-complete.xml
@@ -134,12 +134,12 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
+    <resource-env-ref-type>jakarta.jms.Queue
     </resource-env-ref-type>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue
+    <message-destination-type>jakarta.jms.Queue
     </message-destination-type>
     <message-destination-usage>Produces
     </message-destination-usage>
diff --git a/jakartaee9/test/app-client-data-source.xml b/jakartaee9/test/app-client-data-source.xml
index 55eb302..5400035 100644
--- a/jakartaee9/test/app-client-data-source.xml
+++ b/jakartaee9/test/app-client-data-source.xml
@@ -87,12 +87,12 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+    <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
     <mapped-name>POPD</mapped-name>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-type>jakarta.jms.Queue</message-destination-type>
     <message-destination-usage>Produces</message-destination-usage>
     <mapped-name>StockJMS</mapped-name>
   </message-destination-ref>
diff --git a/jakartaee9/test/app-client-handler.xml b/jakartaee9/test/app-client-handler.xml
index 87986cd..6d789bf 100644
--- a/jakartaee9/test/app-client-handler.xml
+++ b/jakartaee9/test/app-client-handler.xml
@@ -28,7 +28,7 @@
   <display-name>HandlerInfoTestClnt_client</display-name>
   <service-ref>
     <service-ref-name>service/handlerinfohandler</service-ref-name>
-    <service-interface>javax.xml.rpc.Service</service-interface>
+    <service-interface>jakarta.xml.rpc.Service</service-interface>
     <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
     <jaxrpc-mapping-file>HelloService.xml</jaxrpc-mapping-file>
     <port-component-ref>
diff --git a/jakartaee9/test/app-client-injection.xml b/jakartaee9/test/app-client-injection.xml
index 100e46f..0e6f81b 100644
--- a/jakartaee9/test/app-client-injection.xml
+++ b/jakartaee9/test/app-client-injection.xml
@@ -170,11 +170,11 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+    <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-type>jakarta.jms.Queue</message-destination-type>
     <message-destination-usage>Produces</message-destination-usage>
   </message-destination-ref>
   <post-construct>
diff --git a/jakartaee9/test/app-client-mapped-name.xml b/jakartaee9/test/app-client-mapped-name.xml
index 815b7dc..eda4b1e 100644
--- a/jakartaee9/test/app-client-mapped-name.xml
+++ b/jakartaee9/test/app-client-mapped-name.xml
@@ -87,12 +87,12 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+    <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
     <mapped-name>POPD</mapped-name>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-type>jakarta.jms.Queue</message-destination-type>
     <message-destination-usage>Produces</message-destination-usage>
     <mapped-name>StockJMS</mapped-name>
   </message-destination-ref>
diff --git a/jakartaee9/test/app-client-module.xml b/jakartaee9/test/app-client-module.xml
index cdb3b9b..44b4087 100644
--- a/jakartaee9/test/app-client-module.xml
+++ b/jakartaee9/test/app-client-module.xml
@@ -152,24 +152,24 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
+    <resource-env-ref-type>jakarta.jms.Queue
     </resource-env-ref-type>
   </resource-env-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
+    <resource-env-ref-type>jakarta.jms.Queue
     </resource-env-ref-type>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue
+    <message-destination-type>jakarta.jms.Queue
     </message-destination-type>
     <message-destination-usage>Produces
     </message-destination-usage>
   </message-destination-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue
+    <message-destination-type>jakarta.jms.Queue
     </message-destination-type>
     <message-destination-usage>Produces
     </message-destination-usage>
diff --git a/jakartaee9/test/app-client-resources.xml b/jakartaee9/test/app-client-resources.xml
index 8872d03..57cb167 100644
--- a/jakartaee9/test/app-client-resources.xml
+++ b/jakartaee9/test/app-client-resources.xml
@@ -87,12 +87,12 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+    <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
     <mapped-name>POPD</mapped-name>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-type>jakarta.jms.Queue</message-destination-type>
     <message-destination-usage>Produces</message-destination-usage>
     <mapped-name>StockJMS</mapped-name>
   </message-destination-ref>
@@ -145,7 +145,7 @@
   <jms-connection-factory>
      <description>A partial JMSConnectionFactory definition</description>
      <name>java:app/MyApp/myJMSCF</name>
-     <interface-name>javax.jms.QueueConnectionFactory</interface-name>
+     <interface-name>jakarta.jms.QueueConnectionFactory</interface-name>
      <transactional>true</transactional>
      <max-pool-size>5</max-pool-size>
    </jms-connection-factory>
@@ -156,7 +156,7 @@
    <jms-destination>
       <description>JMS Queue definition</description>
       <name>java:app/MyApp/myJMSQ</name>
-      <interface-name>javax.jms.Queue</interface-name>
+      <interface-name>jakarta.jms.Queue</interface-name>
       <class-name>com.example.myQueueImpl</class-name>
       <resource-adapter>MYRA</resource-adapter>
       <destination-name>Queue10</destination-name>
diff --git a/jakartaee9/test/app-client.xml b/jakartaee9/test/app-client.xml
index 3f2584b..70dee3f 100644
--- a/jakartaee9/test/app-client.xml
+++ b/jakartaee9/test/app-client.xml
@@ -150,24 +150,24 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
+    <resource-env-ref-type>jakarta.jms.Queue
     </resource-env-ref-type>
   </resource-env-ref>
   <resource-env-ref>
     <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
+    <resource-env-ref-type>jakarta.jms.Queue
     </resource-env-ref-type>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue
+    <message-destination-type>jakarta.jms.Queue
     </message-destination-type>
     <message-destination-usage>Produces
     </message-destination-usage>
   </message-destination-ref>
   <message-destination-ref>
     <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue
+    <message-destination-type>jakarta.jms.Queue
     </message-destination-type>
     <message-destination-usage>Produces
     </message-destination-usage>
diff --git a/jakartaee9/test/application-resources.xml b/jakartaee9/test/application-resources.xml
index 3fb8996..6bcf9a7 100644
--- a/jakartaee9/test/application-resources.xml
+++ b/jakartaee9/test/application-resources.xml
@@ -162,12 +162,12 @@
   </resource-ref>
   <resource-env-ref>
     <resource-env-ref-name>java:app/whatever/POPD</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue
+    <resource-env-ref-type>jakarta.jms.Queue
     </resource-env-ref-type>
   </resource-env-ref>
   <message-destination-ref>
     <message-destination-ref-name>java:app/jms/Stocks</message-destination-ref-name>
-    <message-destination-type>javax.jms.Queue
+    <message-destination-type>jakarta.jms.Queue
     </message-destination-type>
     <message-destination-usage>Produces
     </message-destination-usage>
@@ -209,7 +209,7 @@
      <description>A partial JMSConnectionFactory definition</description>
      <name>java:app/MyApp/myJMSCF</name>
      <interface-name>com.example.QueueConnectionFactoryImpl</interface-name>
-     <class-name>javax.jms.QueueConnectionFactory</class-name>
+     <class-name>jakarta.jms.QueueConnectionFactory</class-name>
      <transactional>true</transactional>
      <max-pool-size>5</max-pool-size>
    </jms-connection-factory>
@@ -220,7 +220,7 @@
    <jms-destination>
       <description>JMS Queue definition</description>
       <name>java:app/MyApp/myJMSQ</name>
-      <interface-name>javax.jms.Queue</interface-name>
+      <interface-name>jakarta.jms.Queue</interface-name>
       <resource-adapter>MYRA</resource-adapter>
       <destination-name>Queue10</destination-name>
       <property>
diff --git a/jakartaee9/test/connector-complete.xml b/jakartaee9/test/connector-complete.xml
index 5a7df57..e71333e 100644
--- a/jakartaee9/test/connector-complete.xml
+++ b/jakartaee9/test/connector-complete.xml
@@ -21,8 +21,8 @@
 <connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-           connector_1_7.xsd"
-           version="1.7" metadata-complete="true">
+           connector_2_0.xsd"
+           version="2.0" metadata-complete="true">
     <module-name>SimpleResourceAdapter</module-name>
     <display-name>Simple Resource Adapter</display-name>
     <vendor-name>Java Software</vendor-name>
@@ -83,7 +83,7 @@
 		<transaction-support>XATransaction</transaction-support>
 		<authentication-mechanism>
 		    <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-		    <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+		    <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
 		</authentication-mechanism>
 		<reauthentication-support>false</reauthentication-support>
 	</outbound-resourceadapter>
@@ -127,5 +127,5 @@
     <required-work-context>com.wombat.MyOtherCustomWorkContext</required-work-context>
 
 </connector>
-<?validateAgainst connector_1_7.xsd?>
+<?validateAgainst connector_2_0.xsd?>
 
diff --git a/jakartaee9/test/connector-sparse.xml b/jakartaee9/test/connector-sparse.xml
index 61897d1..3d150cb 100644
--- a/jakartaee9/test/connector-sparse.xml
+++ b/jakartaee9/test/connector-sparse.xml
@@ -21,8 +21,8 @@
 <connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-           connector_1_7.xsd"
-           version="1.7" metadata-complete="false">
+           connector_2_0.xsd"
+           version="2.0" metadata-complete="false">
 <!-- Assuming everything else is specified via annotations (the resourceadapter-class through @Connector
 Connection Definitions through @ConnectionDefinition, message adapter configuration through @Activation
 and Administered Objects through @AdministeredObject. A minimal connector deployment descriptor to
@@ -58,4 +58,4 @@ This should validate against the 1.6 DD -->
     <required-work-context>com.wombat.MyOtherCustomWorkContext</required-work-context>
 </connector>
 
-<?validateAgainst connector_1_7.xsd?>
+<?validateAgainst connector_2_0.xsd?>
diff --git a/jakartaee9/test/connector.xml b/jakartaee9/test/connector.xml
index 1bfe80b..8a9b779 100644
--- a/jakartaee9/test/connector.xml
+++ b/jakartaee9/test/connector.xml
@@ -21,8 +21,8 @@
 <connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-           connector_1_7.xsd"
-           version="1.7" metadata-complete="true">
+           connector_2_0.xsd"
+           version="2.0" metadata-complete="true">
 
     <display-name>Simple Resource Adapter</display-name>
     <vendor-name>Java Software</vendor-name>
@@ -103,7 +103,7 @@
 		<authentication-mechanism>
 		    <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
 	            <!-- TEST: @since 1.5 valid credential-interface -->
-		    <credential-interface>javax.resource.spi.security.PasswordCredentialTYPO</credential-interface>
+		    <credential-interface>jakarta.resource.spi.security.PasswordCredentialTYPO</credential-interface>
 		</authentication-mechanism>
 		<reauthentication-support>false</reauthentication-support>
 	</outbound-resourceadapter>
@@ -178,7 +178,7 @@
     <required-work-context>com.wombat.MyOtherCustomWorkContext</required-work-context>
 </connector>
 
-<?validateAgainst connector_1_7.xsd?>
+<?validateAgainst connector_2_0.xsd?>
 <?expectError 43:cvc-enumeration-valid?>
 <?expectError 43:cvc-complex-type.2.2?>
 <?expectError 67:cvc-enumeration-valid?>
diff --git a/jakartaee9/test/ejb-jar-complete.xml b/jakartaee9/test/ejb-jar-complete.xml
index 8c56aee..3720db6 100644
--- a/jakartaee9/test/ejb-jar-complete.xml
+++ b/jakartaee9/test/ejb-jar-complete.xml
@@ -56,12 +56,12 @@
       </service-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
diff --git a/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml b/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml
index 14984cb..d0ac0f8 100644
--- a/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml
+++ b/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml
@@ -111,24 +111,24 @@
       </service-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
       </message-destination-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
@@ -138,7 +138,7 @@
         <persistence-context-ref-name>persistence/context1</persistence-context-ref-name>
         <persistence-unit-name>foo</persistence-unit-name>
         <persistence-property>
-          <name>javax.persisstence.Foo</name>
+          <name>jakarta.persistence.Foo</name>
           <value>foo</value>
         </persistence-property>
         <persistence-property>
diff --git a/jakartaee9/test/ejb-jar.xml b/jakartaee9/test/ejb-jar.xml
index a36a568..e167837 100644
--- a/jakartaee9/test/ejb-jar.xml
+++ b/jakartaee9/test/ejb-jar.xml
@@ -111,24 +111,24 @@
       </service-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
       </message-destination-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
@@ -138,7 +138,7 @@
         <persistence-context-ref-name>persistence/context1</persistence-context-ref-name>
         <persistence-unit-name>foo</persistence-unit-name>
         <persistence-property>
-          <name>javax.persisstence.Foo</name>
+          <name>jakarta.persisstence.Foo</name>
           <value>foo</value>
         </persistence-property>
         <persistence-property>
@@ -217,24 +217,24 @@
       <primkey-field>lineitemId</primkey-field>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
       </message-destination-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
@@ -259,30 +259,30 @@
       <activation-config-property>
             <activation-config-property-name>destinationMode
             </activation-config-property-name>
-            <activation-config-property-value>javax.jms.Queue
+            <activation-config-property-value>jakarta.jms.Queue
             </activation-config-property-value>
         </activation-config-property>
       </activation-config>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>whatever/POPD</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
+        <resource-env-ref-type>jakarta.jms.Queue
         </resource-env-ref-type>
       </resource-env-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
       </message-destination-ref>
       <message-destination-ref>
         <message-destination-ref-name>jms/Stocks</message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
+        <message-destination-type>jakarta.jms.Queue
         </message-destination-type>
         <message-destination-usage>Produces
         </message-destination-usage>
@@ -1847,7 +1847,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>
@@ -2635,7 +2635,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>
diff --git a/jakartaee9/test/permissions-empty.xml b/jakartaee9/test/permissions-empty.xml
index d70c315..ccaaaa3 100644
--- a/jakartaee9/test/permissions-empty.xml
+++ b/jakartaee9/test/permissions-empty.xml
@@ -21,11 +21,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xmlns:xml="http://www.w3.org/XML/1998/namespace" 
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee 
-      permissions_7.xsd"
-    version="7">
+      permissions_9.xsd"
+    version="9">
 
 
 
 </permissions>
 
-<?validateAgainst permissions_7.xsd?>
+<?validateAgainst permissions_9.xsd?>
diff --git a/jakartaee9/test/permissions.xml b/jakartaee9/test/permissions.xml
index f84fcb8..732c5c2 100644
--- a/jakartaee9/test/permissions.xml
+++ b/jakartaee9/test/permissions.xml
@@ -21,8 +21,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xmlns:xml="http://www.w3.org/XML/1998/namespace" 
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee 
-      permissions_7.xsd"
-    version="7">
+      permissions_9.xsd"
+    version="9">
 
   <permission>
     <class-name>java.io.FilePermission</class-name>
@@ -93,5 +93,5 @@
 
 </permissions>
 
-<?validateAgainst permissions_7.xsd?>
+<?validateAgainst permissions_9.xsd?>
 <?expectError 85:cvc-complex-type.2.4.a?>
diff --git a/jakartaee9/test/web-app-complete.xml b/jakartaee9/test/web-app-complete.xml
index 4f7f3a2..613107f 100644
--- a/jakartaee9/test/web-app-complete.xml
+++ b/jakartaee9/test/web-app-complete.xml
@@ -20,9 +20,9 @@
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://foobar.com"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
  metadata-complete="true"
- version="4.0">
+ version="5.0">
   <default-context-path>/myappcomplete</default-context-path>
   <request-character-encoding>UTF-8</request-character-encoding>
   <response-character-encoding>UTF-8</response-character-encoding>
@@ -173,4 +173,4 @@
     <name>B</name>
   </absolute-ordering>
 </web-app>
-<?validateAgainst web-app_4_0.xsd ?>
+<?validateAgainst web-app_5_0.xsd ?>
diff --git a/jakartaee9/test/web-app-data-source.xml b/jakartaee9/test/web-app-data-source.xml
index 2ba344c..d03b1f4 100644
--- a/jakartaee9/test/web-app-data-source.xml
+++ b/jakartaee9/test/web-app-data-source.xml
@@ -20,8 +20,8 @@
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://foobar.com"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
- version="4.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
+ version="5.0">
   <servlet>
     <servlet-name>MyInventoryServlet</servlet-name>
     <servlet-class>com.acme.Inventory</servlet-class>
@@ -208,4 +208,4 @@
     <max-statements>50</max-statements>
   </data-source>
 </web-app>
-<?validateAgainst web-app_4_0.xsd ?>
+<?validateAgainst web-app_5_0.xsd ?>
diff --git a/jakartaee9/test/web-app-resources.xml b/jakartaee9/test/web-app-resources.xml
index b079a25..a3369ec 100644
--- a/jakartaee9/test/web-app-resources.xml
+++ b/jakartaee9/test/web-app-resources.xml
@@ -20,8 +20,8 @@
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://foobar.com"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
- version="4.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
+ version="5.0">
   <servlet>
     <servlet-name>MyInventoryServlet</servlet-name>
     <servlet-class>com.acme.Inventory</servlet-class>
@@ -210,7 +210,7 @@
   <jms-connection-factory>
      <description>A partial JMSConnectionFactory definition</description>
      <name>java:app/MyApp/myJMSCF</name>
-     <interface-name>javax.jms.QueueConnectionFactory</interface-name>
+     <interface-name>jakarta.jms.QueueConnectionFactory</interface-name>
      <class-name>com.example.QueueConnectionFactoryImpl</class-name>
      <transactional>true</transactional>
      <max-pool-size>5</max-pool-size>
@@ -222,7 +222,7 @@
    <jms-destination>
       <description>JMS Queue definition</description>
       <name>java:app/MyApp/myJMSQ</name>
-      <interface-name>javax.jms.Queue</interface-name>
+      <interface-name>jakarta.jms.Queue</interface-name>
       <class-name>com.example.QueueImpl</class-name>
       <resource-adapter>MYRA</resource-adapter>
       <destination-name>Queue10</destination-name>
@@ -269,4 +269,4 @@
      </property>
    </connection-factory>
 </web-app>
-<?validateAgainst web-app_4_0.xsd ?>
+<?validateAgainst web-app_5_0.xsd ?>
diff --git a/jakartaee9/test/web-app.xml b/jakartaee9/test/web-app.xml
index 41b054c..8c636bf 100644
--- a/jakartaee9/test/web-app.xml
+++ b/jakartaee9/test/web-app.xml
@@ -20,8 +20,8 @@
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://foobar.com"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
- version="4.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
+ version="5.0">
   <default-context-path>/myapp</default-context-path>
   <request-character-encoding>UTF-8</request-character-encoding>
   <response-character-encoding>UTF-8</response-character-encoding>
@@ -165,4 +165,4 @@
     </handler>
   </service-ref>
 </web-app>
-<?validateAgainst web-app_4_0.xsd ?>
+<?validateAgainst web-app_5_0.xsd ?>
diff --git a/jakartaee9/test/web-facelettaglibrary-composite.xml b/jakartaee9/test/web-facelettaglibrary-composite.xml
index 27fa143..77a0d67 100644
--- a/jakartaee9/test/web-facelettaglibrary-composite.xml
+++ b/jakartaee9/test/web-facelettaglibrary-composite.xml
@@ -20,12 +20,12 @@
 <facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
- version="2.3"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
+ version="3.0"
 >
     <namespace>http://domain.com/path</namespace>
     <composite-library-name>compositeTest</composite-library-name>
 </facelet-taglib>
 
 
-<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
+<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
diff --git a/jakartaee9/test/web-facelettaglibrary-library-class.xml b/jakartaee9/test/web-facelettaglibrary-library-class.xml
index 40d8c9f..080b1c4 100644
--- a/jakartaee9/test/web-facelettaglibrary-library-class.xml
+++ b/jakartaee9/test/web-facelettaglibrary-library-class.xml
@@ -20,9 +20,9 @@
 <facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
- version="2.3"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
+ version="3.0"
 >
     <library-class>com.foo.MyLibrary</library-class>
 </facelet-taglib>
-<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
+<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
diff --git a/jakartaee9/test/web-facelettaglibrary-pathological-0.xml b/jakartaee9/test/web-facelettaglibrary-pathological-0.xml
index 272faa8..a431fbc 100644
--- a/jakartaee9/test/web-facelettaglibrary-pathological-0.xml
+++ b/jakartaee9/test/web-facelettaglibrary-pathological-0.xml
@@ -20,19 +20,19 @@
 <facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
- version="2.3"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
+ version="3.0"
 >
     <library-class>com.foo.MyLibrary</library-class>
     <namespace>http://mojarra.dev.java.net/mojarra_ext</namespace>
     <tag>
         <tag-name>regexValidator</tag-name>
         <validator>
-            <validator-id>javax.faces.RegularExpression</validator-id>
+            <validator-id>jakarta.faces.RegularExpression</validator-id>
         </validator>
     </tag>
     <composite-library-name>compositeTest</composite-library-name>
 
 </facelet-taglib>
-<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
+<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
 <?expectError 27:cvc-complex-type.2.4.a ?>
diff --git a/jakartaee9/test/web-facelettaglibrary-pathological-1.xml b/jakartaee9/test/web-facelettaglibrary-pathological-1.xml
index f2f0e60..203a662 100644
--- a/jakartaee9/test/web-facelettaglibrary-pathological-1.xml
+++ b/jakartaee9/test/web-facelettaglibrary-pathological-1.xml
@@ -20,8 +20,8 @@
 <facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
- version="2.3"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
+ version="3.0"
 >
     <namespace>http://mojarra.dev.java.net/mojarra_ext</namespace>
     <tag>
@@ -29,5 +29,5 @@
     </tag>
 
 </facelet-taglib>
-<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
+<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
 <?expectError 29:cvc-complex-type.2.4.b ?>
diff --git a/jakartaee9/test/web-facelettaglibrary-standard.xml b/jakartaee9/test/web-facelettaglibrary-standard.xml
index 54822f4..e42ec39 100644
--- a/jakartaee9/test/web-facelettaglibrary-standard.xml
+++ b/jakartaee9/test/web-facelettaglibrary-standard.xml
@@ -20,14 +20,14 @@
 <facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://mojarra.dev.java.net/mojarra_ext"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_2_3.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
- version="2.3"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facelettaglibrary_3_0.xsd http://mojarra.dev.java.net/mojarra_ext http://mojarra.dev.java.net/mojarra_ext/mojarra_ext.xsd"
+ version="3.0"
 >
     <namespace>http://mojarra.dev.java.net/mojarra_ext</namespace>
     <tag>
         <tag-name>regexValidator</tag-name>
         <validator>
-            <validator-id>javax.faces.RegularExpression</validator-id>
+            <validator-id>jakarta.faces.RegularExpression</validator-id>
         </validator>
     </tag>
     <tag>
@@ -54,4 +54,4 @@
     -->
 
 </facelet-taglib>
-<?validateAgainst web-facelettaglibrary_2_3.xsd ?>
+<?validateAgainst web-facelettaglibrary_3_0.xsd ?>
diff --git a/jakartaee9/test/web-facesconfig-pathological-0.xml b/jakartaee9/test/web-facesconfig-pathological-0.xml
index afe45ba..be10179 100644
--- a/jakartaee9/test/web-facesconfig-pathological-0.xml
+++ b/jakartaee9/test/web-facesconfig-pathological-0.xml
@@ -19,8 +19,8 @@
 
 <faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_2_3.xsd"
-    version="2.3">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_3_0.xsd"
+    version="3.0">
 
 
   <name>[]][</name>
@@ -28,7 +28,7 @@
 
 </faces-config>
 
-<?validateAgainst web-facesconfig_2_3.xsd ?>
+<?validateAgainst web-facesconfig_3_0.xsd ?>
 <?expectError 26:cvc-pattern-valid ?>
 <?expectError 26:cvc-complex-type.2.2 ?>
 <?expectError 27:cvc-complex-type.2.4.b ?>
diff --git a/jakartaee9/test/web-facesconfig-standard.xml b/jakartaee9/test/web-facesconfig-standard.xml
index 7a4435d..77e3248 100644
--- a/jakartaee9/test/web-facesconfig-standard.xml
+++ b/jakartaee9/test/web-facesconfig-standard.xml
@@ -19,8 +19,8 @@
 
 <faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_2_3.xsd"
-    version="2.3">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_3_0.xsd"
+    version="3.0">
 
   <application>
     <message-bundle>com.sun.faces.CustomMessages</message-bundle>
@@ -313,7 +313,7 @@
    <managed-bean>
       <managed-bean-name>usernamecomponent</managed-bean-name>
       <managed-bean-class>
-         javax.faces.component.UIInput
+         jakarta.faces.component.UIInput
       </managed-bean-class>
       <managed-bean-scope>request</managed-bean-scope>
       <managed-property>
@@ -331,18 +331,18 @@
     <render-kit-id>CUSTOM</render-kit-id>
     <render-kit-class>com.sun.faces.systest.render.CustomRenderKitImpl</render-kit-class>
     <renderer>
-      <component-family>javax.faces.Output</component-family>
-      <renderer-type>javax.faces.Text</renderer-type>
+      <component-family>jakarta.faces.Output</component-family>
+      <renderer-type>jakarta.faces.Text</renderer-type>
       <renderer-class>com.sun.faces.systest.render.TextRenderer</renderer-class>
     </renderer>
     <renderer>
-      <component-family>javax.faces.Form</component-family>
-      <renderer-type>javax.faces.Form</renderer-type>
+      <component-family>jakarta.faces.Form</component-family>
+      <renderer-type>jakarta.faces.Form</renderer-type>
       <renderer-class>com.sun.faces.systest.render.FormRenderer</renderer-class>
     </renderer>
     <renderer>
-      <component-family>javax.faces.Command</component-family>
-      <renderer-type>javax.faces.Button</renderer-type>
+      <component-family>jakarta.faces.Command</component-family>
+      <renderer-type>jakarta.faces.Button</renderer-type>
       <renderer-class>com.sun.faces.systest.render.ButtonRenderer</renderer-class>
     </renderer>
   </render-kit>
@@ -774,4 +774,4 @@
 
 </faces-config>
 
-<?validateAgainst web-facesconfig_2_3.xsd ?>
+<?validateAgainst web-facesconfig_3_0.xsd ?>
diff --git a/jakartaee9/test/web-fragment-complete.xml b/jakartaee9/test/web-fragment-complete.xml
index df10624..28f839f 100644
--- a/jakartaee9/test/web-fragment-complete.xml
+++ b/jakartaee9/test/web-fragment-complete.xml
@@ -20,9 +20,9 @@
 <web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  xmlns:foobar="http://foobar.com"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-fragment_4_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-fragment_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd"
  metadata-complete="true"
- version="4.0">
+ version="5.0">
   <name>A</name>
   <servlet>
     <servlet-name>MyInventoryServlet</servlet-name>
@@ -170,4 +170,4 @@
     </before>
   </ordering>
 </web-fragment>
-<?validateAgainst web-fragment_4_0.xsd ?>
+<?validateAgainst web-fragment_5_0.xsd ?>
diff --git a/jakartaee9/test/web-partialresponse-standard.xml b/jakartaee9/test/web-partialresponse-standard.xml
index 1eb10db..95dd0aa 100644
--- a/jakartaee9/test/web-partialresponse-standard.xml
+++ b/jakartaee9/test/web-partialresponse-standard.xml
@@ -19,7 +19,7 @@
 
 <partial-response xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-partialresponse_2_3.xsd" id="partial">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-partialresponse_3_0.xsd" id="partial">
 
   <changes>
     <update id="1">
@@ -50,4 +50,4 @@
 </partial-response>
 
 
-<?validateAgainst web-partialresponse_2_3.xsd ?>
+<?validateAgainst web-partialresponse_3_0.xsd ?>
diff --git a/jakartaee9/test/web-service-features.xml b/jakartaee9/test/web-service-features.xml
index 0b9272a..a339031 100644
--- a/jakartaee9/test/web-service-features.xml
+++ b/jakartaee9/test/web-service-features.xml
@@ -20,8 +20,8 @@
 <webservices xmlns="https://jakarta.ee/xml/ns/jakartaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee 
-               jakartaee_web_services_1_4.xsd"
-             version="1.4">
+               jakartaee_web_services_2_0.xsd"
+             version="2.0">
   <webservice-description>
     <webservice-description-name>JoesServices</webservice-description-name>
     <wsdl-file>META-INF/joe.wsdl</wsdl-file>
@@ -44,4 +44,4 @@
     </port-component>
   </webservice-description>
 </webservices>
-<?validateAgainst jakartaee_web_services_1_4.xsd?>
+<?validateAgainst jakartaee_web_services_2_0.xsd?>
diff --git a/jakartaee9/test/web-service-handler.xml b/jakartaee9/test/web-service-handler.xml
index 7c847c7..5fa60f2 100644
--- a/jakartaee9/test/web-service-handler.xml
+++ b/jakartaee9/test/web-service-handler.xml
@@ -23,8 +23,8 @@
              xmlns:soap2="http://HandlerInfo.org/Server2"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee 
-               jakartaee_web_services_1_4.xsd"
-             version="1.4">
+               jakartaee_web_services_2_0.xsd"
+             version="2.0">
   <webservice-description>
     <webservice-description-name>HandlerInfoTest</webservice-description-name>
     <wsdl-file>WEB-INF/wsdl/HelloService.wsdl</wsdl-file>
@@ -53,4 +53,4 @@
     </port-component>
   </webservice-description> 
 </webservices>
-<?validateAgainst jakartaee_web_services_1_4.xsd?>
+<?validateAgainst jakartaee_web_services_2_0.xsd?>