diff --git a/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/faces-config.xml b/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/faces-config.xml
index 8f4e9b510a..cc2cb31062 100644
--- a/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/api/jakarta_faces/flow/flowhandler/faces-config.xml
@@ -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
@@ -21,9 +21,9 @@
   $Id$
 -->
 
-<faces-config version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 </faces-config>
 
diff --git a/src/com/sun/ts/tests/jsf/spec/flows/basicimplicit/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/flows/basicimplicit/faces-config.xml
index eb91f13c49..5b5017035a 100644
--- a/src/com/sun/ts/tests/jsf/spec/flows/basicimplicit/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/flows/basicimplicit/faces-config.xml
@@ -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
@@ -21,10 +21,10 @@
   $Id$
 -->
 
-<faces-config version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
         			
        <flow-definition id="flow">
             <start-node>start</start-node>
diff --git a/src/com/sun/ts/tests/jsf/spec/flows/common/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/flows/common/faces-config.xml
index 2568ff2220..7bc6763800 100644
--- a/src/com/sun/ts/tests/jsf/spec/flows/common/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/flows/common/faces-config.xml
@@ -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
@@ -21,8 +21,8 @@
   $Id$
 -->
 
-<faces-config version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/flows/factory/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/flows/factory/faces-config.xml
index 76b9c3ec73..aedc44aaf2 100644
--- a/src/com/sun/ts/tests/jsf/spec/flows/factory/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/flows/factory/faces-config.xml
@@ -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
@@ -18,10 +18,10 @@
 -->
 
 
-<faces-config version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 	<factory>
 		<flow-handler-factory>com.sun.ts.tests.jsf.spec.flows.factory.beans.FlowHandlerFactoryTestImpl</flow-handler-factory>
 	</factory>
diff --git a/src/com/sun/ts/tests/jsf/spec/flows/multipagewebinf/bounded-task-flow/bounded-task-flow-flow.xml b/src/com/sun/ts/tests/jsf/spec/flows/multipagewebinf/bounded-task-flow/bounded-task-flow-flow.xml
index e708cffd7c..235d049288 100644
--- a/src/com/sun/ts/tests/jsf/spec/flows/multipagewebinf/bounded-task-flow/bounded-task-flow-flow.xml
+++ b/src/com/sun/ts/tests/jsf/spec/flows/multipagewebinf/bounded-task-flow/bounded-task-flow-flow.xml
@@ -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
@@ -17,11 +17,11 @@
 
 -->
 
-<faces-config version="2.2"
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0"
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 
     <flow-definition id="bounded-task-flow">
         <flow-return id="taskFlowReturn1">
diff --git a/src/com/sun/ts/tests/jsf/spec/view/protectedview/WEB-INF/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/view/protectedview/WEB-INF/faces-config.xml
index d656a87cef..7075b600eb 100644
--- a/src/com/sun/ts/tests/jsf/spec/view/protectedview/WEB-INF/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/view/protectedview/WEB-INF/faces-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 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
@@ -17,11 +17,11 @@
 
 -->
 
-<faces-config version="2.2" 
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" 
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 
 		<protected-views>
 			<url-pattern>/views/protected.xhtml</url-pattern>
diff --git a/src/web/jsf/spec/flows/basicflowcall/flow-b/flow-b-flow.xml b/src/web/jsf/spec/flows/basicflowcall/flow-b/flow-b-flow.xml
index 8cddaed411..1e3506d325 100644
--- a/src/web/jsf/spec/flows/basicflowcall/flow-b/flow-b-flow.xml
+++ b/src/web/jsf/spec/flows/basicflowcall/flow-b/flow-b-flow.xml
@@ -1,6 +1,6 @@
 <!--
 
-    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
@@ -16,11 +16,11 @@
 
 -->
 
-<faces-config version="2.2" 
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" 
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 
     <flow-definition id="flow-b">
         
diff --git a/src/web/jsf/spec/flows/basicmethodcall/flow-b/flow-b-flow.xml b/src/web/jsf/spec/flows/basicmethodcall/flow-b/flow-b-flow.xml
index 45cec0ce2c..74879c19b2 100644
--- a/src/web/jsf/spec/flows/basicmethodcall/flow-b/flow-b-flow.xml
+++ b/src/web/jsf/spec/flows/basicmethodcall/flow-b/flow-b-flow.xml
@@ -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
@@ -17,11 +17,11 @@
 
 -->
 
-<faces-config version="2.2" 
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" 
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 
   <flow-definition id="flow-b">
     
diff --git a/src/web/jsf/spec/flows/basicmultipage/boundtaskflow/bounded-task-flow-flow.xml b/src/web/jsf/spec/flows/basicmultipage/boundtaskflow/bounded-task-flow-flow.xml
index 30531aa675..e9b687fda4 100644
--- a/src/web/jsf/spec/flows/basicmultipage/boundtaskflow/bounded-task-flow-flow.xml
+++ b/src/web/jsf/spec/flows/basicmultipage/boundtaskflow/bounded-task-flow-flow.xml
@@ -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
@@ -17,11 +17,11 @@
 
 -->
 
-<faces-config version="2.2" 
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" 
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
     
     <flow-definition id="bounded-task-flow">
         <flow-return id="taskFlowReturn1">
diff --git a/src/web/jsf/spec/flows/basicswitch/flow-b/flow-b-flow.xml b/src/web/jsf/spec/flows/basicswitch/flow-b/flow-b-flow.xml
index 0dffb74589..cbf8735764 100644
--- a/src/web/jsf/spec/flows/basicswitch/flow-b/flow-b-flow.xml
+++ b/src/web/jsf/spec/flows/basicswitch/flow-b/flow-b-flow.xml
@@ -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
@@ -17,11 +17,11 @@
 
 -->
 
-<faces-config version="2.2" 
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" 
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 
   <flow-definition id="flow-b">
     <flow-return id="taskFlowReturn1">
diff --git a/src/web/jsf/spec/flows/intermediate/maintain-customer-record/maintain-customer-record-flow.xml b/src/web/jsf/spec/flows/intermediate/maintain-customer-record/maintain-customer-record-flow.xml
index 790cd6dafc..da1964ff96 100644
--- a/src/web/jsf/spec/flows/intermediate/maintain-customer-record/maintain-customer-record-flow.xml
+++ b/src/web/jsf/spec/flows/intermediate/maintain-customer-record/maintain-customer-record-flow.xml
@@ -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
@@ -17,11 +17,11 @@
 
 -->
 
-<faces-config version="2.2" 
-			  xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config version="3.0" 
+			  xmlns="https://jakarta.ee/xml/ns/jakartaee"
    			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        			http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+   			  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+        			https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd">
 
     <flow-definition id="maintain-customer-record">
         <start-node>router1</start-node>