refactor/style(demo): xmlns -> jcp.org instead of sun.com
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
index 7f41735..8212314 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
@@ -17,11 +17,10 @@
  * limitations under the License.
 -->
 
-<web-app
-    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/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    version="3.0">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         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-app_4_0.xsd"
+         version="4.0">
 
   <display-name>Blank Tobago Application</display-name>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/sun-web.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/sun-web.xml
deleted file mode 100644
index 132427b..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/sun-web.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD GlassFish Application Server 3.0 Servlet 3.0//EN"
-    "http://www.sun.com/software/appserver/dtds/sun-web-app_3_0-0.dtd">
-<!--
-  This file is needed to run the application on Glassfish 3.0
-  Also, we have to add EL support to the pom.xml (el-ri.jar)
-  The reason may be: http://java.net/jira/browse/JAVASERVERFACES-1828
--->
-<sun-web-app>
-  <class-loader delegate="false"/>
-<!--
-  <property name="useMyFaces" value="true"/>
--->
-  <property name="useBundledJsf" value="true"/>
-</sun-web-app>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
index 7544e53..2ab839c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
@@ -17,11 +17,10 @@
  * limitations under the License.
 -->
 
-<web-app
-    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/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    version="3.0">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         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-app_4_0.xsd"
+         version="4.0">
 
   <display-name>Tobago Demo Application</display-name>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
index f1ec211..0638b12 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   This section describes how to build Tobago and run the example applications from the sources.
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/Docker.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/Docker.xhtml
index 4959fe0..9909aa6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/Docker.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/Docker.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>
     To run the examples, or other Tobago applications (or any web applications), you
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
index a1adbe0..f5d629b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
@@ -20,8 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="Overview and History">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
index af481bf..3a50b7d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="Overview">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
index 39ca9a9..8d4a945 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>In November 2015 the first alpha version of 3.0.0 has been released,
     the first final release followed in December 2016.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
index f00c92c..5d491bc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="Overview">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
index 9737553..cbd729b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
@@ -20,8 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="Overview">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
index d7f593f..17ecd9b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>At July 21, 2014 the version 2.0.0 has been released. Here was a quick overview over the features and changes made
     in the last time to release this major revision.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
index f37c863..1f8260b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="Migration from Tobago 4.0 to 5.0">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
index 553c0de..eef5a0f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="Migration from Tobago 3.0 to 4.0">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml
index 3c35f55..da1e7d9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="2 to 3"/>
 
   <tc:section label="Migration from Tobago 2.0 to 3.0">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml
index 28c8009..54f5fa5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="Migration from Tobago 1.5 to 2.0">
     <p>Tobago 2.0 has some API changes compared to Tobago 1.5.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml
index 95553ac..b754796 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="Migration from Tobago 1.0 to 1.5">
     <p>Tobago 1.5 has a lot of changes compared to Tobago 1.0.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml
index c6d8bd1..9239bee 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="Migration of Tobago applications">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
index 888e29a..159e1bc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section id="howto" label="Where can I find documentation or HowTos for using Tobago?">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/API.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/API.xhtml
index dfe89cf..39b5bbb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/API.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/API.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section id="api" label="API Documentation">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
index 875ab57..fec48e8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
@@ -19,9 +19,9 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section id="download" label="Download Tobago source- and binary packages">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/Release_Checklist.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/Release_Checklist.xhtml
index ec3f6ef..ffaa65d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/Release_Checklist.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/Release_Checklist.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
index e87402e..51ff696 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>This is the demo and documentation of <b>Tobago #{serverInfo.version}</b>.
     It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
   <p>If you want to migrate from an older version, you'll find further information in the
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
index b4b50cb..f1ab275 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The <code class="language-markup">&lt;tc:out/></code> display an outputtext combined with a label.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
index 7f648fb..ed9a98a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>With <code class="language-markup">&lt;tc:label/></code>, a single label can be created.
     Some components already have a <code>label</code> attribute to combine it with a label,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
index 194d430..b84c470 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
@@ -19,10 +19,10 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>A simple badge can be created with <code class="language-markup">&lt;tc:badge/></code>.<br/>
     Buttons can be displayed as a badge with the <code>badge</code> markup.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/Image.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/Image.xhtml
index c54c917..66ffe8c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/Image.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/Image.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Create an image with <code class="language-markup">&lt;tc:image/&gt;</code>.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/image.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/45-figure/Figure.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/45-figure/Figure.xhtml
index 93d83a1..fb459cb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/45-figure/Figure.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/45-figure/Figure.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>Create a figure with <code class="language-markup">&lt;tc:figure/&gt;</code> around an image,
     video or something else. The label can be set via the label attribute or with the label facet.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/Progress.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/Progress.xhtml
index 9c22e24..9d002ef 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/Progress.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/Progress.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml
index 8607f28..e03d899 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml
@@ -20,8 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:script file="#{request.contextPath}/content/20-component/020-output/60-object/object.js"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/Output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/Output.xhtml
index 4452ac0..fc9eb68 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/Output.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/Output.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <ui:param name="hideGlobalMessages" value="true"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
index fa82c13..e7de8a7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The tag <code class="language-markup">&lt;tc:selectBooleanCheckbox/></code> generate a classic boolean
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
index 5eb667a..c278ab3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The tag <code class="language-markup">&lt;tc:selectBooleanToggle/></code> generate a boolean
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
index 909105a..57e4b9d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The tag <code class="language-markup">&lt;tc:selectOneChoice/&gt;</code> create a dropdown box,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
index 682d928..630d096 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
@@ -20,9 +20,9 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
   <ui:param name="title" value="Select One Radio: &lt;tc:selectOneRadio>"/>
   <p>A group of radiobuttons will be created with the <code class="language-markup">&lt;tc:selectOneRadio/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
index f15d6e3..514652b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code class="language-markup">&lt;tc:selectOneListbox/></code> create a list of entries, where only one
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
index 16bf334..d41a0a4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
@@ -20,9 +20,9 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
   <p>With <code class="language-markup">&lt;tc:selectManyCheckbox/></code>, you can create a group of checkboxes.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
index 65fa930..a960dea 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code class="language-markup">&lt;tc:selectManyListbox/></code> create a list,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
index 67d5030..4f0de60 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The shuttlelist component can be created with <code class="language-markup">&lt;tc:selectManyShuttle/></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/Select.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/Select.xhtml
index 56d87dc..66fe5b1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/Select.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/Select.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Tobago provides several ways to select an option.
     Entries are added with <code class="language-markup">&lt;tc:selectItem/></code> or
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
index 5c1aaae..a05982e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
@@ -18,7 +18,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
index d6a65aa..f116991 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>A normal button, created with <code class="language-markup">&lt;tc:button/></code>, must be actively pressed,
     to run the action. A default-button can be activated, even if not selected.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.xhtml
index a9a5261..952a5e0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Buttons can be grouped with the <code class="language-markup">&lt;tc:buttons/></code> tag.
     Just add some <code class="language-markup">&lt;tc:button/></code> tags.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/Customizer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/Customizer.xhtml
index 03c6c37..fddb4e0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/Customizer.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/Customizer.xhtml
@@ -21,9 +21,9 @@
         template="/main.xhtml"
         xmlns="http://www.w3.org/1999/xhtml"
         xmlns:tc="http://myfaces.apache.org/tobago/component"
-        xmlns:ui="http://java.sun.com/jsf/facelets"
+        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
         xmlns:f="http://xmlns.jcp.org/jsf/core"
-        xmlns:c="http://java.sun.com/jsp/jstl/core">
+        xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
   <p>The data of the model can also be loaded directly from the webapp directory.
     So we can define an item for each facelet matching buttons-item-*.xhtml.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-links/Link_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-links/Link_Group.xhtml
index f24fd68..005a3c1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-links/Link_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-links/Link_Group.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Links can be grouped with the <code class="language-markup">&lt;tc:links/></code> tag.
     Just add some <code class="language-markup">&lt;tc:link/></code> or
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/Command.xhtml
index a3d673a..a1642d0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/Command.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/Command.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Commands are ways to execute actions after clicked by a user.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.xhtml
index 116758d..5ddf4b8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.xhtml
@@ -20,9 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>A content box is created with <code class="language-markup">&lt;tc:box/></code>.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
index 8efa150..d4a130c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>A <code class="language-markup">&lt;tc:panel/></code> is a simple content container.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/Separator.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/Separator.xhtml
index 7084260..f995efe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/Separator.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/Separator.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>A separator can be added with <code class="language-markup">&lt;tc:separator/></code></p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.xhtml
index 978d89b..ae3cd68 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>A section can be added with <code class="language-markup">&lt;tc:section/></code> tag.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/Header_and_Footer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/Header_and_Footer.xhtml
index fcddcb7..ec6b008 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/Header_and_Footer.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/Header_and_Footer.xhtml
@@ -20,7 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
   <p>A header / footer can be set via the <code class="language-markup">&lt;tc:header/></code>
     respectively <code class="language-markup">&lt;tc:footer/></code> tag.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/x-header-footer-example.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/x-header-footer-example.xhtml
index 8ce33f3..609b5b1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/x-header-footer-example.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/x-header-footer-example.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
   <tc:header fixed="#{headerFooterController.fixHeader}" rendered="#{headerFooterController.renderHeader}">
     <tc:style customClass="bg-warning"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
index 01a2567..b25b1e7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p><code class="language-markup">&lt;tc:bar/></code> is a container which display elements in one single line
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/Container.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/Container.xhtml
index b351b60..9082de0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/Container.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/Container.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>With the container components, content can be shown in different ways.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
index eb1f22e..578ac7f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
@@ -20,8 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>Tabs can be created with one or more <code class="language-markup">&lt;tc:tab/></code> within a
     <code class="language-markup">&lt;tc:tabGroup></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
index f2836d5..449b541 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Tabs can be created with one or more <code class="language-markup">&lt;tc:tab/></code> within a
     <code class="language-markup">&lt;tc:tabGroup></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.xhtml
index 48576da..2e4e721 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.xhtml
@@ -20,8 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>A <code class="language-markup">&lt;tc:tabGroup/></code> can contain several
     <code class="language-markup">&lt;tc:tab/></code> tags.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.xhtml
index 838bc4c..ac59d77 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Sorting can be enable via the <code>sortable</code> attribute in the
     <code class="language-markup">&lt;tc:column/></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
index 01567ca..cbc8207 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>To insert a selectable column, use the <code class="language-markup">&lt;tc:columnSelector/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml
index 199ef7c..3fecb4b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>A <code class="language-markup">&lt;tc:sheet/&gt;</code> can contain a
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/Sheet_Markup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/Sheet_Markup.xhtml
index eb59401..3b6b780 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/Sheet_Markup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/Sheet_Markup.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>This example, demonstrate the different markups defined for sheet.
     These markups reflecting the styles from bootstrap.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/40-style/Sheet_Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/40-style/Sheet_Style.xhtml
index e3b17a8..24ed25e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/40-style/Sheet_Style.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/40-style/Sheet_Style.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Styling inside a sheet"/>
   <p>
     Inside of <code>&lt;tc:row></code> and <code>&lt;tc:column></code> tags a <code>&lt;tc:style></code> can be used
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
index 02603c5..c7b0267 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns="http://www.w3.org/1999/xhtml">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
index 7f7cb38..17e9c6f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>There are several ways to display the header.
     For simple column headers, use the attribute <code>label</code> of
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
index 00049c1..7a19852 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>For more complex headers, which can span over columns and/or rows use a
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.xhtml
index 7e03133..78c61f1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>A tree can be added into a sheet. To do so, there are two steps which must be done.
     First, the <code>value</code> attribute of the sheet must refer to a method, which return a tree instead of a list.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
index e00a5b4..90c9137 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>Not only a sheet can be used to display data, it may also contain input fields to edit the data.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/90-lazy/Sheet_Lazy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/90-lazy/Sheet_Lazy.xhtml
index 5e46039..1f4ea57 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/90-lazy/Sheet_Lazy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/90-lazy/Sheet_Lazy.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Lazy Loading Large Data"/>
   <tc:sheet value="#{sheetController.hugeSolarList}" id="sheet" var="luminary"
             rows="20" markup="small" lazy="true"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
index b571249..0cea893 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   The sheet control is a simple solution for displaying table based
   information. The essential features are:
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.xhtml
index ae7890b..80a992c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The <code class="language-markup">&lt;tc:link/></code> tag can be added to a
     <code class="language-markup">&lt;tc:treeNode/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
index 7de67e1..e77f431 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The <code class="language-markup">&lt;tc:treeMenu/></code> tag is deprecated, because it's easy to
     build a tree menu with the <code class="language-markup">&lt;tc:tree/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
index 7d26d21..1219789 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The <code class="language-markup">&lt;tc:treeListbox/></code> can be used to replace a classic
     <code class="language-markup">&lt;tc:tree/></code>. It displays the tree as a number of lists.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml
index e381eec..e2f6e88 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml
@@ -20,8 +20,8 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   The tree control displays a tree which is generated from application data. The key features are:
   <ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/File_Upload.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/File_Upload.xhtml
index 3182298..4e8a8f3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/File_Upload.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/File_Upload.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code class="language-markup">&lt;tc:file/></code> create a textfield with a choose directory button on the
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml
index 0cfef63..34a4eaa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:script file="https://cdn.tiny.cloud/1/no-api-key/tinymce/5/tinymce.min.js" referrerpolicy="origin"/>
   <tc:script file="#{request.contextPath}/content/20-component/110-wysiwyg/00-tinymce/init-tinymce.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml
index c3befab..e8c0a2e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml
@@ -19,9 +19,9 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:script file="https://cdn.ckeditor.com/ckeditor5/25.0.0/classic/ckeditor.js"/>
   <tc:script file="#{request.contextPath}/content/20-component/110-wysiwyg/01-ckeditor/init-ckeditor.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/WYSIWYG_Editor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/WYSIWYG_Editor.xhtml
index 1f22791..82c4148 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/WYSIWYG_Editor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/WYSIWYG_Editor.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="So many alternatives">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
index edbf849..9745c8f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The different components of Tobago are shown in this section.
     There are some classic components like input fields, output fields or radiobuttons
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
index 6e64205..f4248e4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/00/Content_Validation.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>There are several ways to validate the content of a component. In general input components have the option
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.xhtml
index d95c2c7..10ca07d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/01/JSR_303.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Tobago has JSR 303 Validation support.
     With it, you can describe the validation in an annotation in the controller.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/02/Severity.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/02/Severity.xhtml
index 5c6c81f..1283fd2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/02/Severity.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/02/Severity.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   The validator of each field creates a FacesMessage with the given severity.
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
index 2e55c59..96ade14 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/30-messages/Messages.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <ui:param name="hideGlobalMessages" value="true"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
index 5797849..4719d5b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/Validation.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>Content validation of input fields can be made directly in the facelet
     with the <code>required</code> attribute and several validation tags.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml
index c6601e0..9201d79 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>To convert numbers put a <code class="language-markup">&lt;f:convertNumber/></code> tag in an component.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/Conversation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/Conversation.xhtml
index ba6f669..1bba965 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/Conversation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/15-conversation/Conversation.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:badge markup="warning"
             value="Warning: This example is turned off, because its not suppored in Quarkus!"/><br/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/Segment_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/Segment_Layout.xhtml
index 5b0aab4..01b3dbe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/Segment_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/Segment_Layout.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The segment layout is a grid with 12 columns.
     The number and the proportion of the columns can be set with the attributes
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml
index 682e6b0..2f831b7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code>&lt;tc:gridLayout></code> has a dynamic history. </p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml
index e068d2d..f5f3306 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>Simple example for WebSockets.</p>
 
   <tc:section label="Example">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/Format.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/Format.xhtml
index f05eeec..3053981 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/Format.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/20-format/Format.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core">
+                xmlns:fn="http://xmlns.jcp.org/jsp/jstl/functions">
 
   <p>Use the EL functions from <code>tc:format1</code> to <code>tc:format9</code>
     to replace up to 9 variables in a given internationalized text.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/x-error-in-syntax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/x-error-in-syntax.xhtml
index 60f59fe..00689af 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/x-error-in-syntax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/x-error-in-syntax.xhtml
@@ -19,6 +19,6 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
   this page is syntactically incorrect!
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/Transition.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/Transition.xhtml
index a8b204a..3c9e068 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/Transition.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/Transition.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>For command components like a link or a button, the <code>transition</code> attribute is available.
     It shows a loading animation if the site don't respond in a certain amount of time.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml
index 19f3fb5..f54cc25 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/23-transition/x-transition-after-sleep.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Transition after sleep"/>
 
   <tc:button label="Back" outcome="/content/30-concept/23-transition/Transition.xhtml"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/Non_Faces_Response.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/Non_Faces_Response.xhtml
index 4649b6c..0c16955 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/Non_Faces_Response.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/24-non-faces-response/Non_Faces_Response.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Non Faces Response (e. g. a download link)"/>
 
   <tc:segmentLayout large="10seg 2seg">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/For_Each.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/For_Each.xhtml
index 608c744..b2f9b8b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/For_Each.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/51-for-each/For_Each.xhtml
@@ -19,7 +19,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://java.sun.com/jsp/jstl/core">
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
   <p>Generating content with a loop can be done
     with the <code class="language-markup">&lt;c:forEach/></code> tag and
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
index ab6adfc..90d60bb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>On this page the collapsible concept is explained for a
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
index eab1422..8fbed52 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>This page contain some examples for the collapsible concept of a popup. Please have a look at the
     <tc:link label="Popup" outcome="/content/20-component/060-popup/Popup.xhtml"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
index 5012560..ab2c2b3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>This page show some examples for the collapsible concept of a
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
index 575ea7a..504a56b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
@@ -18,7 +18,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
   <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml
index 57ea870..9b7343b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml
@@ -18,7 +18,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code>accessKey</code> attribute is available for many components like buttons, checkboxes or links.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/DataAttribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/DataAttribute.xhtml
index 17876c5..4f2a8d9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/DataAttribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/DataAttribute.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:script file="#{request.contextPath}/content/30-concept/70-dataAttribute/dataAttribute.js"/>
   <p>Add a data attribute to an UIComponent with
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/78-meta/Meta.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/78-meta/Meta.xhtml
index 062b6bc..8512da7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/78-meta/Meta.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/78-meta/Meta.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:tc="http://myfaces.apache.org/tobago/component">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:tc="http://myfaces.apache.org/tobago/component">
   <ui:param name="title" value="Meta"/>
 
   <tc:panel id="meta-panel">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/10-sanitize/Sanitize.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/10-sanitize/Sanitize.xhtml
index 0199f31..5ed3bdc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/10-sanitize/Sanitize.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/10-sanitize/Sanitize.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns="http://www.w3.org/1999/xhtml">
 
   <ui:param name="title" value="Sanitizer"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
index 266cec2..660988d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/Non_Faces_Request.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns="http://www.w3.org/1999/xhtml">
   <ui:param name="title" value="Non-Faces-Request Demo: Start"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
index a5af54a..e943e2f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
   <ui:param name="title" value="Non-Faces-Request Demo: Fish Pont"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/Concept.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/Concept.xhtml
index 290decc..9ab14ab 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/Concept.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/Concept.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns="http://www.w3.org/1999/xhtml">
 
   <p>In this section the different concepts of Tobago are described
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml
index 2773099..3b914b1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The TX-library is no longer supported. Use components from the TC-library.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.xhtml
index 02f9c71..46307d8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/Suggest_Method.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The <code>suggestMethod</code> attribute of <code class="language-markup">&lt;tc:suggest/></code>
     is deprecated.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/ToolBar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/ToolBar.xhtml
index 319ca36..24680a1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/ToolBar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/ToolBar.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p><code class="language-markup">&lt;tc:toolBar/></code> and
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/Menubar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/Menubar.xhtml
index de95263..04a9d7f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/Menubar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/Menubar.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p><code class="language-markup">&lt;tc:menubar></code>,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/Deprecated.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/Deprecated.xhtml
index 4485a92..b6dddbb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/Deprecated.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/Deprecated.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns="http://www.w3.org/1999/xhtml">
 
   <p>This section list all deprecated components with the appropriate solution.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml
index 5452302..1c43de8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Test quotation mark in suggest results"/>
   <tc:section label="Suggest">
     <p>The suggest results contain an entry with a quotation mark.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.xhtml
index acb3497..ebc299a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-tobagoConverter/Date_TobagoConverter.xhtml
@@ -20,7 +20,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="tc:convertDateTime"/>
 
   <tc:section label="Date">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/21-label-for/Label_For.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/21-label-for/Label_For.xhtml
index ce6e33b..c0d7d97 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/21-label-for/Label_For.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/21-label-for/Label_For.xhtml
@@ -18,9 +18,9 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Label 'for'-attribute"/>
   <p>Test if 'required' is set correctly on tc:label.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/Output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/Output.xhtml
index 3400ad7..6d2f264 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/Output.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1500-output/Output.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Output"/>
   <p>Tests for output fields.</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Type_Of_Literals.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Type_Of_Literals.xhtml
index e17b442..997310d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Type_Of_Literals.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Type_Of_Literals.xhtml
@@ -18,7 +18,7 @@
 
 <f:view
     xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:f="http://java.sun.com/jsf/core">
+    xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:page width="700px" height="600px">
     <tc:gridLayout columns="4fr 1fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml
index fbc3451..634a928 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml
@@ -19,7 +19,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>The dropdown menu should be closed, after clicking the 'AJAX' entry in the dropdown menu.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.xhtml
index e38476b..9f8c712 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/Button_Link.xhtml
@@ -18,7 +18,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="Standard">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-action.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-action.xhtml
index 8e9ad32..3802625 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-action.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-action.xhtml
@@ -18,7 +18,7 @@
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section id="actionSection" label="Action">
     <p>This page should be accessed by an link/button with <code>action</code> attribute.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/Style.xhtml
index e41b65f..b1f5bdd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/Style.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/Style.xhtml
@@ -17,7 +17,7 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Style tests"/>
   <p>Automated tests for styling.</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml
index 06783c4..035e42a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:box id="box" label="Grid Layout with labelLayout top and bottom (vertical)">
     <tc:gridLayout id="grid" columns="1fr 2fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/Grid_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/Grid_Layout.xhtml
index 1a9a000..d2354fa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/Grid_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/Grid_Layout.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <ui:param name="title" value="TODO"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/FlexLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/FlexLayout.xhtml
index ef5ca67..0f14e21 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/FlexLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/FlexLayout.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="x-template.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml
index 7d98b7e..ebab737 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Test position of ids and markups"/>
 
   <tc:section id="sectionNoLabel" label="No label set">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/LabelLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/LabelLayout.xhtml
index 2a1aad0..60286c9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/LabelLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4800-labelLayout/LabelLayout.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="labelLayout"/>
 
   <tc:box label="&lt;tc:date>">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.xhtml
index 2e7dafd..d549142 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="labelLayout"/>
 
   <tc:box label="&lt;tc:date>">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/Java.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/Java.xhtml
index 56048a3..0c931db 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/Java.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/Java.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition template="/main.xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <ui:param name="title" value="TODO"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml
index 83d86a1..8cc3ae5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml
@@ -19,9 +19,9 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:dc="http://java.sun.com/jsf/composite/demo-components"
+                xmlns:dc="http://xmlns.jcp.org/jsf/composite/demo-components"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Composite Components"/>
 
   <tc:box label="Login">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.xhtml
index 02b47b3..736cab7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5500-compositeComponent/Composite_Components.xhtml
@@ -19,9 +19,9 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:dc="http://java.sun.com/jsf/composite/demo-components"
+                xmlns:dc="http://xmlns.jcp.org/jsf/composite/demo-components"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <ui:param name="title" value="Composite Components"/>
 
   <tc:section label="no layout manager">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-.xhtml
index eee762a..7de6d48 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-.xhtml
@@ -17,6 +17,6 @@
  * limitations under the License.
 -->
 
-<ui:composition xmlns:ui="http://java.sun.com/jsf/facelets">
+<ui:composition xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <!-- This is to prevent a FileNotFoundException if the value of ui:include evaluated and no component is selected. -->
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-button.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-button.xhtml
index a060ca5..78be21d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-button.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-button.xhtml
@@ -18,10 +18,10 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <tc:button id="button#{eventType}" label="Button">
     <c:if test="#{eventType == 'ajax'}">
       <f:ajax event="click" render="metrics" listener="#{eventController.ajaxListener}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-file.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-file.xhtml
index d8b68f6..c673aba 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-file.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-file.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:tc="http://myfaces.apache.org/tobago/component">
   <tc:file/>
   <p>Not implemented yet!</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-in.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-in.xhtml
index e888635..d5dc4e0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-in.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-in.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-page.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-page.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-page.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-page.xhtml
@@ -18,6 +18,6 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>Not implemented yet!</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-row.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-row.xhtml
index 46e3e88..bb83290 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-row.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-row.xhtml
@@ -18,10 +18,10 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <tc:sheet id="sheet#{eventType}" value="#{eventController.planets}" var="planet" markup="small">
     <tc:style maxHeight="200px"/>
     <tc:column label="Planet">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectBooleanCheckbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectBooleanCheckbox.xhtml
index a03725b..e23d9f0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectBooleanCheckbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectBooleanCheckbox.xhtml
@@ -18,8 +18,8 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <tc:selectBooleanCheckbox id="selectBooleanCheckbox#{eventType}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneChoice.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneChoice.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneChoice.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneChoice.xhtml
@@ -18,6 +18,6 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>Not implemented yet!</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneListbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneListbox.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneListbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneListbox.xhtml
@@ -18,6 +18,6 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>Not implemented yet!</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tabGroup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tabGroup.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tabGroup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tabGroup.xhtml
@@ -18,6 +18,6 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>Not implemented yet!</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-textarea.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-textarea.xhtml
index 2356f5d..4153863 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-textarea.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-textarea.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeSelect.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeSelect.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeSelect.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeSelect.xhtml
@@ -18,6 +18,6 @@
 -->
 
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <p>Not implemented yet!</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4000-button-link/Button_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4000-button-link/Button_Link.xhtml
index d1df90f..70bde8c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4000-button-link/Button_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4000-button-link/Button_Link.xhtml
@@ -18,7 +18,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="&lt;button> - &lt;a>">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4500-suggest/Suggest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4500-suggest/Suggest.xhtml
index 9e330ed..10ab832 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4500-suggest/Suggest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/4500-suggest/Suggest.xhtml
@@ -19,9 +19,9 @@
 
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:section label="Suggest Input - AJAX">
     <p>The out component will show the selected value choosen from the suggest input field. Ajax case is covered and component is reloaded after valid selection.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/MessageLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/MessageLayout.xhtml
index ff149ab..2b55cd5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/MessageLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-messageLayout/MessageLayout.xhtml
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
   <ui:param name="title" value="messages"/>
   <tc:button label="Submit"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml
index 0e261f6..eb1aa60 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml
@@ -18,9 +18,8 @@
 
 <f:view
     xmlns:tc="http://myfaces.apache.org/tobago/component"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:c="http://java.sun.com/jsp/jstl/core">
+    xmlns:f="http://xmlns.jcp.org/jsf/core"
+    xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
   <tc:page>
     <tc:gridLayout columns="250px 1fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/Mode_ValueIfSet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/Mode_ValueIfSet.xhtml
index fc45217..c1e492f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/Mode_ValueIfSet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9010-mode-valueIfSet/Mode_ValueIfSet.xhtml
@@ -18,9 +18,9 @@
 
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:segmentLayout medium="6seg 6seg">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
index 8af8ebe..e378a48 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+<ui:composition xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml
index de53855..f45a2fd2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml
@@ -18,7 +18,7 @@
 <!DOCTYPE html
         PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns:cc="http://java.sun.com/jsf/composite"
+<html xmlns:cc="http://xmlns.jcp.org/jsf/composite"
       xmlns:tc="http://myfaces.apache.org/tobago/component">
 <cc:interface>
   <cc:attribute name="label"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml
index e0e0cb9..620b269 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml
@@ -18,7 +18,7 @@
 <!DOCTYPE html
         PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns:cc="http://java.sun.com/jsf/composite"
+<html xmlns:cc="http://xmlns.jcp.org/jsf/composite"
       xmlns:tc="http://myfaces.apache.org/tobago/component">
 <cc:interface>
   <cc:attribute name="label"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
index a8a20e2..bb26c24 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <tc:style file="#{request.contextPath}/style/tobago-test.css"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
index 9a69920..ccadcdb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   <tc:style file="#{request.contextPath}/style/tobago-test.css"/>