diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config-ext-data1.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config-ext-data1.xml
index 7c511c3..db514ec 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config-ext-data1.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config-ext-data1.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!--
-	Copyright 2003 Sun Microsystems, Inc. All rights reserved.
-	SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
--->
-
 <!DOCTYPE faces-config PUBLIC
   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
   "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml
index 012b71b..e777aec 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!--
-	Copyright 2003 Sun Microsystems, Inc. All rights reserved.
-	SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
--->
-
 <!DOCTYPE faces-config PUBLIC
   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
   "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config1.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config1.xml
index acd2ea6..c26e90f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config1.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config1.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!--
- Copyright 2003 Sun Microsystems, Inc. All rights reserved.
- SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
--->
-
 <!DOCTYPE faces-config PUBLIC
   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
   "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config2.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config2.xml
index 81e3131..4801809 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config2.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <faces-config
-    xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 
 
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml
index 77a7610..2c46e99 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/template/faces-config_1_2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <faces-config
-    xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
     version="1.2">
 <!-- =========== FULL CONFIGURATION FILE ================================== -->