You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/01/28 12:26:19 UTC

[myfaces-tobago] 02/03: TOBAGO-2045: Go for Jakarta EE 8 servers and Quarkus

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 32fb42e5430da19c1404531d253699e61d1858eb
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Jan 28 12:54:25 2021 +0100

    TOBAGO-2045: Go for Jakarta EE 8 servers and Quarkus
    
    * update xmlns für f und ui (to current spec)
---
 tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml  | 2 +-
 tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml  | 2 +-
 tobago-example/tobago-example-blank/src/main/webapp/result.xhtml      | 2 +-
 .../content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml      | 4 ++--
 .../content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml      | 4 ++--
 .../content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml      | 4 ++--
 .../content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml      | 4 ++--
 .../content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml      | 4 ++--
 .../content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml      | 4 ++--
 .../content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml      | 2 +-
 .../content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml      | 2 +-
 .../src/main/webapp/content/10-intro/30-whats-new/What's_New.xhtml    | 2 +-
 .../content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml       | 2 +-
 .../content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml       | 2 +-
 .../main/webapp/content/10-intro/60-compatibility/Compatibility.xhtml | 2 +-
 .../src/main/webapp/content/10-intro/80-api/API.xhtml                 | 2 +-
 .../content/10-intro/90-release-checklist/Release_Checklist.xhtml     | 4 ++--
 .../src/main/webapp/content/20-component/010-input/10-in/In.xhtml     | 4 ++--
 .../webapp/content/20-component/010-input/20-suggest/Suggest.xhtml    | 2 +-
 .../webapp/content/20-component/010-input/30-textarea/Textarea.xhtml  | 4 ++--
 .../src/main/webapp/content/20-component/010-input/40-date/Date.xhtml | 4 ++--
 .../main/webapp/content/20-component/010-input/45-range/Range.xhtml   | 4 ++--
 .../webapp/content/20-component/010-input/50-input-group/Group.xhtml  | 4 ++--
 .../content/20-component/010-input/80-stars/5_Star_Rating.xhtml       | 4 ++--
 .../src/main/webapp/content/20-component/010-input/Input.xhtml        | 4 ++--
 .../main/webapp/content/20-component/020-output/25-badge/Badge.xhtml  | 2 +-
 .../webapp/content/20-component/020-output/45-figure/Figure.xhtml     | 2 +-
 .../webapp/content/20-component/020-output/50-progress/Progress.xhtml | 2 +-
 .../20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml   | 2 +-
 .../20-component/030-select/15-selectBooleanToggle/Toggle.xhtml       | 2 +-
 .../content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml | 2 +-
 .../content/20-component/030-select/30-selectOneRadio/Radio.xhtml     | 2 +-
 .../content/20-component/030-select/40-selectOneListbox/Listbox.xhtml | 2 +-
 .../030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml             | 2 +-
 .../20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml  | 2 +-
 .../20-component/030-select/70-selectManyShuttle/Shuttle.xhtml        | 2 +-
 .../20-component/040-command/00-button-link/Button_and_Link.xhtml     | 2 +-
 .../20-component/040-command/21-buttons-customizer/Customizer.xhtml   | 2 +-
 .../webapp/content/20-component/050-container/20-panel/Panel.xhtml    | 2 +-
 .../050-container/50-header-footer/x-header-footer-example.xhtml      | 2 +-
 .../main/webapp/content/20-component/050-container/60-bar/Bar.xhtml   | 2 +-
 .../src/main/webapp/content/20-component/060-popup/Popup.xhtml        | 4 ++--
 .../webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml    | 4 ++--
 .../20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml    | 2 +-
 .../webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml  | 2 +-
 .../content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml       | 2 +-
 .../20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml    | 2 +-
 .../content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml   | 2 +-
 .../main/webapp/content/20-component/080-sheet/x-sheet-nested.xhtml   | 2 +-
 .../webapp/content/20-component/090-tree/01-select/Tree_Select.xhtml  | 4 ++--
 .../webapp/content/20-component/090-tree/02-editor/Tree_Editor.xhtml  | 4 ++--
 .../src/main/webapp/content/20-component/100-upload/File_Upload.xhtml | 2 +-
 .../webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml  | 2 +-
 .../content/30-concept/06-validation/00/Content_Validation.xhtml      | 2 +-
 .../content/30-concept/06-validation/30-messages/Messages.xhtml       | 2 +-
 .../src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml | 2 +-
 .../main/webapp/content/30-concept/08-form/10-required/Required.xhtml | 2 +-
 .../src/main/webapp/content/30-concept/08-form/20-ajax/Ajax.xhtml     | 4 ++--
 .../src/main/webapp/content/30-concept/08-form/Form.xhtml             | 2 +-
 .../src/main/webapp/content/30-concept/10-theme/Theme.xhtml           | 4 ++--
 .../src/main/webapp/content/30-concept/12-browser/Browser.xhtml       | 2 +-
 .../src/main/webapp/content/30-concept/14-locale/Locale.xhtml         | 4 ++--
 .../webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml     | 2 +-
 .../webapp/content/30-concept/16-layout/20-flex/Flex_Layout.xhtml     | 2 +-
 .../webapp/content/30-concept/16-layout/40-label/Label_Layout.xhtml   | 2 +-
 .../webapp/content/30-concept/16-layout/50-grid/Grid_Layout.xhtml     | 2 +-
 .../webapp/content/30-concept/16-layout/60-split/Split_Layout.xhtml   | 2 +-
 .../30-concept/16-layout/90-message-layout/message-layout.xhtml       | 2 +-
 .../src/main/webapp/content/30-concept/16-layout/Layout.xhtml         | 2 +-
 .../src/main/webapp/content/30-concept/18-websocket/WebSocket.xhtml   | 2 +-
 .../src/main/webapp/content/30-concept/20-format/Format.xhtml         | 2 +-
 .../src/main/webapp/content/30-concept/21-error/Error_Handling.xhtml  | 2 +-
 .../main/webapp/content/30-concept/21-error/x-error-in-syntax.xhtml   | 2 +-
 .../content/30-concept/22-exception-handler/Exception_Handler.xhtml   | 4 ++--
 .../src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml     | 4 ++--
 .../src/main/webapp/content/30-concept/50-partial/Partial_Ajax.xhtml  | 4 ++--
 .../src/main/webapp/content/30-concept/51-for-each/For_Each.xhtml     | 2 +-
 .../53-collapsible/00-collapsible-box/Collapsible_Box.xhtml           | 2 +-
 .../53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml       | 2 +-
 .../53-collapsible/30-collapsible-section/Collapsible_Section.xhtml   | 4 ++--
 .../src/main/webapp/content/30-concept/65-accessKey/AccessKey.xhtml   | 2 +-
 .../src/main/webapp/content/30-concept/75-resize/Resize.xhtml         | 4 ++--
 .../src/main/webapp/content/30-concept/77-focus/Focus.xhtml           | 2 +-
 .../30-concept/80-security/05-csp/Content_Security_Policy.xhtml       | 2 +-
 .../main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml   | 2 +-
 .../main/webapp/content/30-concept/80-security/20-roles/x-login.xhtml | 2 +-
 .../src/main/webapp/content/30-concept/80-security/Security.xhtml     | 2 +-
 .../webapp/content/30-concept/90-non-faces-request/x-fish-pond.xhtml  | 2 +-
 .../src/main/webapp/content/35-deprecated/20-toolBar/ToolBar.xhtml    | 2 +-
 .../src/main/webapp/content/35-deprecated/25-menubar/Menubar.xhtml    | 2 +-
 .../src/main/webapp/content/40-test/1040-date/Date.xhtml              | 2 +-
 .../main/webapp/content/40-test/1041-date-pattern/Date_Pattern.xhtml  | 2 +-
 .../40-test/1041-date-tobagoConverter/Date_TobagoConverter.xhtml      | 2 +-
 .../src/main/webapp/content/40-test/2000-selectItem/Currency.xhtml    | 2 +-
 .../main/webapp/content/40-test/2000-selectItem/List_Of_Objects.xhtml | 2 +-
 .../src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.xhtml     | 2 +-
 .../content/40-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml       | 2 +-
 .../src/main/webapp/content/40-test/3000-sheet/Sheet.xhtml            | 2 +-
 .../40-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml   | 2 +-
 .../main/webapp/content/40-test/4000-button-link/Button_Link.xhtml    | 2 +-
 .../src/main/webapp/content/40-test/4000-button-link/x-link.xhtml     | 2 +-
 .../webapp/content/40-test/40000-style/100-headings/Headings.xhtml    | 4 ++--
 .../10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml            | 2 +-
 .../content/40-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml | 2 +-
 .../content/40-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml      | 2 +-
 .../src/main/webapp/content/40-test/4700-flexLayout/FlexLayout.xhtml  | 2 +-
 .../src/main/webapp/content/40-test/4700-flexLayout/x-template.xhtml  | 4 ++--
 .../main/webapp/content/40-test/4700-flexLayout/x-textarea-1.xhtml    | 2 +-
 .../main/webapp/content/40-test/4800-labelLayout/LabelLayout.xhtml    | 2 +-
 .../webapp/content/40-test/4810-labelLayoutTop/LabelLayoutTop.xhtml   | 2 +-
 .../src/main/webapp/content/40-test/4950-severity/Severity.xhtml      | 2 +-
 .../src/main/webapp/content/40-test/5000-form/Sheet_In_Form.xhtml     | 4 ++--
 .../RendererBase_GetCurrentValue.xhtml                                | 4 ++--
 .../content/40-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml     | 4 ++--
 .../50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml | 4 ++--
 .../src/main/webapp/content/40-test/6000-event/Event.xhtml            | 4 ++--
 .../src/main/webapp/content/40-test/6000-event/Event_1870.xhtml       | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-bar.xhtml      | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-date.xhtml     | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-hidden.xhtml   | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-in.xhtml       | 4 ++--
 .../src/main/webapp/content/40-test/6000-event/x-event-link.xhtml     | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-panel.xhtml    | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-progress.xhtml | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-row.xhtml      | 2 +-
 .../content/40-test/6000-event/x-event-selectBooleanCheckbox.xhtml    | 2 +-
 .../content/40-test/6000-event/x-event-selectManyCheckbox.xhtml       | 2 +-
 .../webapp/content/40-test/6000-event/x-event-selectManyListbox.xhtml | 2 +-
 .../webapp/content/40-test/6000-event/x-event-selectManyShuttle.xhtml | 2 +-
 .../webapp/content/40-test/6000-event/x-event-selectOneRadio.xhtml    | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-sheet.xhtml    | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-tab.xhtml      | 2 +-
 .../src/main/webapp/content/40-test/6000-event/x-event-textarea.xhtml | 4 ++--
 .../main/webapp/content/40-test/6000-event/x-event-treeCommand.xhtml  | 2 +-
 .../content/40-test/60000-manual/4000-button-link/Button_Link.xhtml   | 2 +-
 .../40-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml     | 4 ++--
 .../40-test/60000-manual/5000-messageLayout/MessageLayout.xhtml       | 2 +-
 .../src/main/webapp/content/40-test/60000-manual/Manual.xhtml         | 2 +-
 .../src/main/webapp/content/40-test/6500-behavior/Behavior.xhtml      | 4 ++--
 .../main/webapp/content/40-test/7000-layout/Markup_Spread_Flex.xhtml  | 2 +-
 .../main/webapp/content/40-test/7000-layout/Markup_Spread_Grid.xhtml  | 2 +-
 .../src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml    | 2 +-
 .../tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml    | 2 +-
 .../tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml      | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml    | 4 ++--
 .../tobago-example-demo/src/main/webapp/error/exception.xhtml         | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/init.xhtml         | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/logging-info.xhtml | 4 ++--
 tobago-example/tobago-example-demo/src/main/webapp/login.xhtml        | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/main.xhtml         | 4 ++--
 tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml         | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml   | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml        | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/server-info.xhtml  | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/test.xhtml         | 2 +-
 .../tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml      | 2 +-
 tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml      | 2 +-
 .../src/main/resources/META-INF/resources/helloWorld.xhtml            | 2 +-
 .../src/main/resources/META-INF/resources/result.xhtml                | 2 +-
 159 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml b/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml
index 1946dd5..3a1f720 100644
--- a/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml
+++ b/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<f:view xmlns:f="http://java.sun.com/jsf/core"
+<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
 
   <tc:page>
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml b/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
index e9e816c..03e9d38 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<f:view xmlns:f="http://java.sun.com/jsf/core"
+<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
 
   <tc:page>
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml b/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml
index 0bffc77..fd0a35a 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<f:view xmlns:f="http://java.sun.com/jsf/core"
+<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
 
   <tc:page>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
index f1b4626..07b2736 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.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/65-new-in-4-5/Tobago_4.5.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
index ba2acca..24bc30d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.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/66-new-in-4-4/Tobago_4.4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
index aa99a8a..7a499e6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.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">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
index 4ef5acf..209e1ac 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.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/68-new-in-4-2/Tobago_4.2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
index f03c780..9858d45 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.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/69-new-in-4-1/Tobago_4.1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
index 5994f3d..33426f2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.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/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 3338520..af481bf 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
@@ -21,7 +21,7 @@
                 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: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/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 2b94002..f00c92c 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
@@ -21,7 +21,7 @@
                 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: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/What's_New.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/What's_New.xhtml
index 4c0905b..0548d6a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/What's_New.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/What's_New.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>
     Here you find a condensed overview by versions:
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 e4daf57..f37c863 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://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
 
   <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 15406db..553c0de 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://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
 
   <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/60-compatibility/Compatibility.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/Compatibility.xhtml
index 4b286a3..2a75b55 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/Compatibility.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/Compatibility.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 was compatible with the following specifications, libraries and containers.
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 2fb8d04..503114e 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
@@ -19,7 +19,7 @@
 
 <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">
 
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 87e23d5..ec3f6ef 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
@@ -20,9 +20,9 @@
 <ui:composition template="/main.xhtml"
                 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: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="Developer Info">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml
index 48bc37b..a6e3b73 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.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>The <code class="language-markup">&lt;tc:in/&gt;</code> tag create a classic input field.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png" link="#{apiController.base}/doc/#{apiController.currentRelease}/tld/tc/in.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml
index 9fa7e84..3d668cb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.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 <code class="language-markup">&lt;tc:suggest/></code> tag can be added to an input field to make
     suggestions based on the already entered text.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
index 02927c5..f77f240 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.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>The <code class="language-markup">&lt;tc:textarea/&gt;</code> tag, creates a textfield with one or more rows.
     The textarea becomes scrollable if the containing text could not displayed in the current size.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
index d1d234a..6d9f882 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.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>The <code class="language-markup">&lt;tc:date/&gt;</code>
     tag create an input field with a button to open a calendar to edit the date.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/45-range/Range.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/45-range/Range.xhtml
index 44ac539..6f5eff4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/45-range/Range.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/45-range/Range.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="Input Type Range">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.xhtml
index d032bc4..6995a02 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.xhtml
@@ -20,9 +20,9 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo"
-                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">
 
   <p>The <code class="language-markup">&lt;tc:in/></code> tag may be extended with the facet tags
     <code class="language-markup">&lt;f:facet name="before"></code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml
index dcb9a27..b3ca870 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.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">
 
   <p>Use <code class="language-markup">&lt;tc:stars/></code> to create a five star rating.</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/010-input/Input.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/Input.xhtml
index e56e6ac..88eb433 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/Input.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/Input.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>With input components, a text or a date can be entered.
     Input components should always use the <code>label</code> attribute.</p>
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 9d3b4a7..0fa3edb 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
@@ -20,7 +20,7 @@
 <ui:composition template="/main.xhtml"
                 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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
 
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 2b76d84..f0615f5 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://java.sun.com/jsf/core">
+                xmlns:ui="http://java.sun.com/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 ccb6bff..f4f7b87 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
   <p>The <code class="language-markup">&lt;tc:progress/></code> tag create a progressbar.
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 fe590a4..ff962bf 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The tag <code class="language-markup">&lt;tc:selectBooleanCheckbox/></code> generate a classic boolean
     checkbox.</p>
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 7c82891..ca78ec6 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The tag <code class="language-markup">&lt;tc:selectBooleanToggle/></code> generate a boolean
     toggle.</p>
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 0e83027..12ee1a0 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The tag <code class="language-markup">&lt;tc:selectOneChoice/&gt;</code> create a dropdown box,
     which contain<br/>
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 47748e8..9fbc491 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
   <ui:param name="title" value="Select One Radio: &lt;tc:selectOneRadio>"/>
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 19b4098..0cbacd7 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
@@ -21,7 +21,7 @@
                 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: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
     entry can be selected. Items can be added with <code class="language-markup">&lt;tc:selectItem/></code>
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 e8dfe79..e83c16a 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
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 1b22e98..975b1a0 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code class="language-markup">&lt;tc:selectManyListbox/></code> create a list,
     where more than one entry could be selected. Entries are added with
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 a515d8e..db8ae8f 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The shuttlelist component can be created with <code class="language-markup">&lt;tc:selectManyShuttle/></code>.
     In general, the height of the list depends on the number of items and is set to an amount, where no
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 a65b11b..0515c99 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
@@ -19,7 +19,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
   <p>A classic link can be set with the <code class="language-markup">&lt;tc:link/></code> tag.
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 d273531..03c6c37 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
@@ -22,7 +22,7 @@
         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:f="http://xmlns.jcp.org/jsf/core"
         xmlns:c="http://java.sun.com/jsp/jstl/core">
 
   <p>The data of the model can also be loaded directly from the webapp directory.
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 23e5e5f..8020b0f 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>A <code class="language-markup">&lt;tc:panel/></code> is a simple content container.
     In the most cases it's invisible and wrapping other components.</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 c44b5cb..8ce33f3 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
   <tc:header fixed="#{headerFooterController.fixHeader}" rendered="#{headerFooterController.renderHeader}">
     <tc:style customClass="bg-warning"/>
     <p>This is the header.</p>
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 f36d8f2..52b5cbd 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
@@ -21,7 +21,7 @@
                 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: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
     as long as there is enough space.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
index afafb69..ecf6faa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.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 popup dialog is created with <code class="language-markup">&lt;tc:popup/></code>.
     It can be filled with other components.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml
index 72521e0..41409b4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.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/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 a76c6ff..7faee91 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>To insert a selectable column, use the <code class="language-markup">&lt;tc:columnSelector/></code> tag.
     With the <code>selectable</code> in the <code class="language-markup">&lt;tc:sheet/></code> tag, you can
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 8520827..199ef7c 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>A <code class="language-markup">&lt;tc:sheet/&gt;</code> can contain a
     <code class="language-markup">&lt;tc:row/&gt;</code> tag with a containing <code
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 4599434..0c5b301 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
@@ -20,7 +20,7 @@
 <ui:composition template="/main.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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns="http://www.w3.org/1999/xhtml">
 
   <p>Filtering is not a explicit feature of the sheet. It is done in the controller.</p>
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 882b6ca..be2c592 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>For more complex headers, which can span over columns and/or rows use a
     <code class="language-markup">&lt;f:facet name="header"></code>in the sheet.
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 4e553bf..b098473 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
@@ -21,7 +21,7 @@
                 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: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>
   <p>Tag Library Documentation:
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/x-sheet-nested.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/x-sheet-nested.xhtml
index 16f64af..16500b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/x-sheet-nested.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/x-sheet-nested.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="Nested Sheet"/>
 
     <tc:sheet value="#{sheetController.solarList}" id="sheet"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.xhtml
index 2ff9b55..78df898 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.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>The <code class="language-markup">&lt;tc:treeSelect/></code> tag can be used instead of
     <code class="language-markup">&lt;treeLabel/></code> to add radio buttons or checkboxes in front of the nodes.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/02-editor/Tree_Editor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/02-editor/Tree_Editor.xhtml
index 91b6f76..8ad9660 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/02-editor/Tree_Editor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/02-editor/Tree_Editor.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>This is an example, to show how to write an editor for a tree.
   Some commands are using popups and AJAX.</p>
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 3936b7f..e1a3857 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
@@ -21,7 +21,7 @@
                 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: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
     right.</p>
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 69a0d0e..217face 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
@@ -19,7 +19,7 @@
 
 <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">
 
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 92394c7..4b31d89 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
@@ -21,7 +21,7 @@
                 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: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
     for validation. In the following sections, the different kinds von validation are explained.</p>
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 43300c0..43aade1 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
@@ -21,7 +21,7 @@
                 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: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/07-conversion/Conversion.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/07-conversion/Conversion.xhtml
index a5d35cf..c6601e0 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
@@ -21,7 +21,7 @@
                 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: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>
   <tc:section label="Example">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/Required.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/Required.xhtml
index 63d7ea3..2942c13 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/Required.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/10-required/Required.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>If the validation of a form is activated and the actual value of this form is only stored temporarily,
     the validation is deactivated until the value is definitely stored into the model.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/Ajax.xhtml
index 29f0034..b6e0adb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/20-ajax/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>The <code class="language-markup">&lt;f:ajax execute="..." render="..."/></code> tag ignore the
     <code class="language-markup">&lt;tc:form></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml
index 704caa0..1b2a654 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.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 supports nested forms and can treat each form separately.
     Values can be stored separately into the model, while already filled input elements keep their values (temporarily).
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/10-theme/Theme.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/10-theme/Theme.xhtml
index a259837..878908d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/10-theme/Theme.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/10-theme/Theme.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>Tobago supports a big variety of displaying controls, so called designs or themes.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
index 4ca10b1..e593256 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.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="Browser"/>
 
   <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/14-locale/Locale.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/14-locale/Locale.xhtml
index cae2b9c..892d665 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/14-locale/Locale.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/14-locale/Locale.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">
 
   Tobago supports internationalization and localization.
   <ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml
index c5be223..c733b5c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/10-flow/Flow_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 flow layout can be used with the <code>&lt;tc:flowLayout/></code> tag.
     By default, the content is displayed in a flow layout.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/Flex_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/Flex_Layout.xhtml
index dc0685a..9d5738b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/Flex_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/20-flex/Flex_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 flex layout can be used with the <code>&lt;tc:flexLayout/></code> tag.
     The two most important attributes are <code>columns</code> and <code>rows</code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-label/Label_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-label/Label_Layout.xhtml
index cc534f6..451dfca 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-label/Label_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/40-label/Label_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>For many components, a <code>label</code> attribute is available, which place a label in front
     of the according component.
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 51f4410..682e6b0 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code>&lt;tc:gridLayout></code> has a dynamic history. </p>
   <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/60-split/Split_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/60-split/Split_Layout.xhtml
index a8a2a61..ba07b01 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/60-split/Split_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/60-split/Split_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"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/90-message-layout/message-layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/90-message-layout/message-layout.xhtml
index 10918cd..fbdf008 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/90-message-layout/message-layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/90-message-layout/message-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">
   <ui:param name="title" value="messages"/>
   <p>The message layout renders messages directly on the component.</p>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/Layout.xhtml
index c441cd9..d1726f8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/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>Tobago provide several layout options.</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 fd97dce..668ee5e 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
@@ -19,7 +19,7 @@
 
 <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">
   <p>Simple example for WebSockets.</p>
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 fb57f0f..f05eeec 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
@@ -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:fn="http://java.sun.com/jsp/jstl/functions" xmlns:c="http://java.sun.com/jsp/jstl/core">
 
   <p>Use the EL functions from <code>tc:format1</code> to <code>tc:format9</code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/Error_Handling.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/Error_Handling.xhtml
index ad8ad0c..532d251 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/Error_Handling.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/21-error/Error_Handling.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="Sample Error Scenarios (Todo: is to be optimized)"/>
 
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 d9f6fb0..60f59fe 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
@@ -20,5 +20,5 @@
 <ui:composition template="/main.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: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/22-exception-handler/Exception_Handler.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/22-exception-handler/Exception_Handler.xhtml
index 68b94f6..ba8c392 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/22-exception-handler/Exception_Handler.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/22-exception-handler/Exception_Handler.xhtml
@@ -20,9 +20,9 @@
 <ui:composition template="/main.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:demo="http://myfaces.apache.org/tobago/example/demo"
-                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">
 
   <p>Since Tobago 4.0.0 an AjaxExceptionHandler takes care of exceptions in ajax case.</p>
   <p><span class="#{demo:bootstrapClass('BADGE')} #{demo:bootstrapClass('BADGE_DANGER')}">Important!</span>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml
index e9842b3..f1237b9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.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">
 
   <p>There are two kinds of behaviors: </p>
   <ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/Partial_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/Partial_Ajax.xhtml
index 8accca0..9f1c306 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/Partial_Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/50-partial/Partial_Ajax.xhtml
@@ -19,8 +19,8 @@
 
 <ui:composition template="/main.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"
                 xmlns="http://www.w3.org/1999/xhtml">
   <ui:param name="title" value="Partial Update (AJAX)"/>
   <tc:panel id="parent">
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 e5a6f83..608c744 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
@@ -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:c="http://java.sun.com/jsp/jstl/core">
 
   <p>Generating content with a loop can be done
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 44a9b64..ab6adfc 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>On this page the collapsible concept is explained for a
     <tc:link label="Box" outcome="/content/20-component/050-container/10-box/Box.xhtml"/>.</p>
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 3c65979..5012560 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>This page show some examples for the collapsible concept of a
     <tc:link label="Panel" outcome="/content/20-component/050-container/20-panel/Panel.xhtml"/>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
index 4171989..7c096e5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.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>Collapsible concept explained for a
     <tc:link label="Section"
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 0e86134..b9ec664 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
@@ -19,7 +19,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p>The <code>accessKey</code> attribute is available for many components like buttons, checkboxes or links.
     A component with this attribute is accessible by the given character. The character is not case sensitive.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/Resize.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/Resize.xhtml
index b4d9b4c..7c7a9b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/Resize.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/Resize.xhtml
@@ -19,8 +19,8 @@
 
 <ui:composition template="/plain.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">
   <ui:param name="title" value="Resize Event"/>
 
   <f:facet name="resize">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/77-focus/Focus.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/77-focus/Focus.xhtml
index 1a2a74a..331587f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/77-focus/Focus.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/77-focus/Focus.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">
   <ui:param name="title" value="Focus"/>
 
   <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/05-csp/Content_Security_Policy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/05-csp/Content_Security_Policy.xhtml
index 9361ca2..07acdda 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/05-csp/Content_Security_Policy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/05-csp/Content_Security_Policy.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="Content Security Policy"/>
 
   Tobago supports Content Security Policy (CSP) to prevent cross-site
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml
index 98b17be..c935821 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/Roles.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>It is possible to define roles for users. Based on this roles, components with an <code>action</code> attribute
     like a button can be hidden or disabled for the current user.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/x-login.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/x-login.xhtml
index 874a1a3..e543c6f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/x-login.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/20-roles/x-login.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="Login"/>
   <tc:panel rendered="#{request.userPrincipal != null}">
   <p>You are now logged in as user '#{request.userPrincipal.name}'</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/Security.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/Security.xhtml
index 2d8cc56..3a27110 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/Security.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/80-security/Security.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="Security"/>
 
   <p>
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 2fbb622..16a7132 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
@@ -20,7 +20,7 @@
 <ui:composition template="/main.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:f="http://xmlns.jcp.org/jsf/core">
   <ui:param name="title" value="Non-Faces-Request Demo: Fish Pont"/>
 
   <ui:define name="metadata">
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 d8d79f4..319ca36 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
@@ -20,7 +20,7 @@
 <ui:composition template="/main.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:f="http://xmlns.jcp.org/jsf/core">
 
   <p><code class="language-markup">&lt;tc:toolBar/></code> and
     <code class="language-markup">&lt;tc:toolBarCommand/></code> are deprecated.
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 cd02646..de95263 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
@@ -21,7 +21,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <p><code class="language-markup">&lt;tc:menubar></code>,
     <code class="language-markup">&lt;tc:menu></code>,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.xhtml
index 27615d0..961cf17 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1040-date/Date.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">
 
   <tc:date id="dateNoPattern"/>
   <tc:button label="Submit"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.xhtml
index c6e29da..a3f9d83 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/1041-date-pattern/Date_Pattern.xhtml
@@ -19,7 +19,7 @@
 <f:view
     locale="DE"
     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 id="page">
 
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 ca36d17..acb3497 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
@@ -18,7 +18,7 @@
 
 <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">
   <ui:param name="title" value="tc:convertDateTime"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Currency.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Currency.xhtml
index 72ca358..6b0f07d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Currency.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/Currency.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 label="Sample with model">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/List_Of_Objects.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/List_Of_Objects.xhtml
index 6701e91..d330774 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/List_Of_Objects.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2000-selectItem/List_Of_Objects.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>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.xhtml
index c5d5a68..55359a7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_Style.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/2500-tab/Tabgroup_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">
   <tc:tabGroup id="tabGroup">
     <tc:style customClass="someCssClass"/>
     <tc:tab id="tabOne" label="One">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml
index 5d37a3a..7c49da0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/10-sheet-types/Sheet_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">
 
   <tc:sheet value="#{sheetController.solarList}" id="sheet" var="luminary"
             columns="50px 70px 70px 10px 90px 160px 100px 70px 180px 90px 130px"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/Sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/Sheet.xhtml
index 1a9a000..d2354fa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/Sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/3000-sheet/Sheet.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/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 263868d..fbc3451 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
@@ -17,7 +17,7 @@
 
 <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">
 
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 9a4e38a..e38476b 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
@@ -19,7 +19,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="Standard">
     <tc:buttons>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-link.xhtml
index 2f1dd44..6d8d64e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4000-button-link/x-link.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="linkSection" label="Link">
     <p>This page should be accessed by an link/button with <code>link</code> attribute.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/Headings.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/Headings.xhtml
index 370c2c5..835ca35 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/Headings.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/40000-style/100-headings/Headings.xhtml
@@ -17,9 +17,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">
   <ui:param name="title" value="Components in heading tags"/>
   <tc:box id="headingsBox" label="Links">
     <p>The fonts of the apache.org-link and the ActionLink must be the same.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml
index 90a3f0a..bb5f79d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.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 left and right (horizontal)">
     <tc:gridLayout id="grid" columns="150px 2fr 1fr 5fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml
index 9dc3fce..57bdce8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/100-auto-column/Auto-Column.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="surroundingBox" label="'auto' value">
     <tc:style width="300px"/>
     <p>Grid Layout - column with 'auto' but without '*'</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml
index 02cf01a..54ef9b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4600-gridLayout/90-style-tag/Style_Tag.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="Style tag inside grid layout">
     <p>The <code class="language-markup"> &lt;tc:out> </code> should have the CSS class 'text-warning'.</p>
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 162bde0..ef5ca67 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
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:f="http://java.sun.com/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:define name="x-textarea-1">
     <ui:include src="/content/40-test/4700-flexLayout/x-textarea-1.xhtml"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-template.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-template.xhtml
index 0250d5d..033076e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-template.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-template.xhtml
@@ -17,9 +17,9 @@
  * 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://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <f:view locale="#{localeController.locale}">
     <tc:page label="flex layout template" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-textarea-1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-textarea-1.xhtml
index 3ce6039..cf0c037 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-textarea-1.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4700-flexLayout/x-textarea-1.xhtml
@@ -18,6 +18,6 @@
 -->
 
 <ui:composition 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:textarea value="T1"/>
 </ui:composition>
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 b503b6e..2a1aad0 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
@@ -19,7 +19,7 @@
 
 <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">
   <ui:param name="title" value="labelLayout"/>
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 274f705..2e7dafd 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
@@ -19,7 +19,7 @@
 
 <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">
   <ui:param name="title" value="labelLayout"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.xhtml
index 432a45f..f0ad94b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/4950-severity/Severity.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="messages"/>
   <tc:button id="submit" label="Submit"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5000-form/Sheet_In_Form.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5000-form/Sheet_In_Form.xhtml
index eefe88a..1a88848 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5000-form/Sheet_In_Form.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/5000-form/Sheet_In_Form.xhtml
@@ -20,8 +20,8 @@
 <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:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:panel id="panel">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml
index 61613cf..48694b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml
@@ -19,8 +19,8 @@
 
 <ui:composition template="/main.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">
 
   <ui:param name="title" value="Test: RendererBase.getCurrentValue()"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml
index e0d5957..7c28088 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml
@@ -19,8 +19,8 @@
 
 <ui:composition template="/main.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">
 
   <ui:param name="title" value="TODO"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml
index bc22efe..b685f4e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml
@@ -18,9 +18,9 @@
 -->
 
 <ui:composition template="/main.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">
   <ui:param name="title" value="Ajax Unicode"/>
 
   <tc:out id="timestamp" label="Timestamp" value="#{ajaxSpecialCharacterController.timestamp}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.xhtml
index 616d1fc..a429302 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event.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">
   <ui:param name="title" value="&lt;tc:event>"/>
   <tc:style file="#{request.contextPath}/style/tobago.css"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event_1870.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event_1870.xhtml
index 33b4686..4ab4a47 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event_1870.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/Event_1870.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">
 
   <tc:style file="#{request.contextPath}/css/demo.css"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-bar.xhtml
index b044a11..43f7d2f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-bar.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <ui:composition 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">
   <tc:bar/>
   <p>Not implemented yet!</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-date.xhtml
index f01befa..0372af2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-date.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:date/>
   <p>Not implemented yet!</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-hidden.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-hidden.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-hidden.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-hidden.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-in.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-in.xhtml
index 7db17fa..e888635 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
@@ -19,9 +19,9 @@
 
 <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: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:in id="in#{eventType}" valueChangeListener="#{eventController.valueChangeListener}">
     <c:if test="#{eventType == 'ajax'}">
       <f:ajax event="change" render="metrics" listener="#{eventController.ajaxListener}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-link.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-link.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-panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-panel.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-panel.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-progress.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-progress.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-progress.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-progress.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 414697b..46e3e88 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
@@ -19,7 +19,7 @@
 
 <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:f="http://xmlns.jcp.org/jsf/core"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
   <tc:sheet id="sheet#{eventType}" value="#{eventController.planets}" var="planet" markup="small">
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 680ee93..a03725b 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
@@ -21,7 +21,7 @@
                 xmlns:c="http://java.sun.com/jsp/jstl/core"
                 xmlns:f="http://java.sun.com/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:selectBooleanCheckbox id="selectBooleanCheckbox#{eventType}"
                             valueChangeListener="#{eventController.valueChangeListener}" value="true">
     <c:if test="#{eventType == 'ajax'}">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyCheckbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyCheckbox.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyCheckbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyCheckbox.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-selectManyListbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyListbox.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyListbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyListbox.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-selectManyShuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyShuttle.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyShuttle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectManyShuttle.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-selectOneRadio.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneRadio.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneRadio.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-selectOneRadio.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-sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-sheet.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-sheet.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-tab.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tab.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tab.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-tab.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 b2344f6..2356f5d 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
@@ -19,9 +19,9 @@
 
 <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: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:textarea id="textarea#{eventType}" valueChangeListener="#{eventController.valueChangeListener}">
     <c:if test="#{eventType == 'ajax'}">
       <f:ajax event="change" render="metrics" listener="#{eventController.ajaxListener}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeCommand.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeCommand.xhtml
index 16adf13..63526e2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeCommand.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/x-event-treeCommand.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 2e1dc80..50274c8 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
@@ -19,7 +19,7 @@
                 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:f="http://xmlns.jcp.org/jsf/core">
 
   <tc:section label="&lt;button> - &lt;a>">
     <p>The left link is rendered as a <code>&lt;button></code>, the right side is rendered as an <code>&lt;a></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml
index 2301d34..cfea350 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.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:in label="In"/>
   <tc:textarea label="Text Area"/>
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 19606f2..ff149ab 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
@@ -21,7 +21,7 @@
                 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: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/60000-manual/Manual.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/Manual.xhtml
index 6bd46bf..5084518 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/Manual.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/60000-manual/Manual.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">
 
   <p>This section contain manual tests, which are not covered by QUnitTests.</p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.xhtml
index 4fcfba6..c7bcfe3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6500-behavior/Behavior.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:box id="counter" label="Counter">
     <f:facet name="bar">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Flex.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Flex.xhtml
index 44cbf1b..e74b33c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Flex.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Flex.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <f:view locale="#{localeController.locale}"
-        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
   <tc:page markup="spread" label="Test" id="page">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Grid.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Grid.xhtml
index 23e906d..53d1c11 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Grid.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/7000-layout/Markup_Spread_Grid.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <f:view locale="#{localeController.locale}"
-        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
   <tc:page markup="spread" label="Test" id="page">
 
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 f4ff11c..0e261f6 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,7 +18,7 @@
 
 <f:view
     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://java.sun.com/jsf/core"
     xmlns:c="http://java.sun.com/jsp/jstl/core">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml
index dc9eeb6..482f161 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.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:tc="http://myfaces.apache.org/tobago/component">
 
   <ui:param name="title" value="Test"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml
index 613a6ba..99f96df 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml
@@ -19,6 +19,6 @@
 
 <ui:composition template="/plain.xhtml"
                 xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
   Root Dummy
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
index 1bbadc6..38e93a8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
@@ -19,8 +19,8 @@
 
 <ui:composition template="/main.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">
   <ui:param name="title" value="Error 404"/>
   <tc:messages/>
   <tc:out id="pageNotFoundMessage" value="The page was not found!"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
index 9b0b317..93a1831 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/error/exception.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="Sorry, an error has occured!"/>
 
     <tc:messages/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml
index 73aa4f6..f66482d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <f:view locale="#{localeController.locale}"
-        xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
   <tc:page label="Tobago Demo" id="page">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/logging-info.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/logging-info.xhtml
index 9aaab24..eb42df3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/logging-info.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/logging-info.xhtml
@@ -19,9 +19,9 @@
 
 <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:demo="http://myfaces.apache.org/tobago/example/demo"
-                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
                 xmlns="http://www.w3.org/1999/xhtml">
   <ui:param name="title" value="Logging Info"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml
index d8d5e9d..b9660f5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/login.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="Login"/>
 
   <p>This login site is to demonstrate roles.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
index e65c82a..465d7c7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
@@ -20,9 +20,9 @@
 <!-- main template for this demo application, you may also use plain.xhtml for test purpose -->
 
 <ui:composition
-        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"
         xmlns="http://www.w3.org/1999/xhtml">
   <f:view locale="#{localeController.locale}">
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
index 496398c..5c3e937 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
@@ -19,7 +19,7 @@
 
 <tc:header fixed="true"
            xmlns:tc="http://myfaces.apache.org/tobago/component"
-           xmlns:f="http://java.sun.com/jsf/core">
+           xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <!-- tbd: how to solve this? -->
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
index 1304fcf..b507d6c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
@@ -18,7 +18,7 @@
 -->
 
 <f:subview id="navigator"
-           xmlns:f="http://java.sun.com/jsf/core"
+           xmlns:f="http://xmlns.jcp.org/jsf/core"
            xmlns:tc="http://myfaces.apache.org/tobago/component">
   <tc:tree id="nav" value="#{navigationTree.tree}" var="node" state="#{navigationState.state}">
     <tc:treeNode id="node">
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 1e0c92b..8af8ebe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition xmlns:f="http://java.sun.com/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">
 
   <f:view locale="#{localeController.locale}">
     <tc:page label="Test" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/server-info.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/server-info.xhtml
index b3edd7c..8e7ec8b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/server-info.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/server-info.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:f="http://java.sun.com/jsf/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <ui:param name="title" value="Server Info"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
index 5b857f6..bbc23c1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
@@ -19,7 +19,7 @@
 
 <ui:composition template="/plain.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">
   <tc:script file="#{request.contextPath}/script/demo.js" type="module"/>
   <tc:script file="#{request.contextPath}/script/jasmine-3.5.0/jasmine.js"/>
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 7aa327d..0b9b852 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:c="http://java.sun.com/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:style file="#{request.contextPath}/style/tobago.css"/>
   <tc:script file="#{request.contextPath}/script/tobago-testAll.js"/>
 
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 3da2380..115703b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
@@ -21,7 +21,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:c="http://java.sun.com/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:style file="#{request.contextPath}/style/tobago.css"/>
   <tc:script file="#{request.contextPath}/script/tobago-testAll.js"/>
 
diff --git a/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/helloWorld.xhtml b/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/helloWorld.xhtml
index 02bbfb1..4ce1a53 100644
--- a/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/helloWorld.xhtml
+++ b/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/helloWorld.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<f:view xmlns:f="http://java.sun.com/jsf/core"
+<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
 
   <tc:page>
diff --git a/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/result.xhtml b/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/result.xhtml
index 66e6c41..fcaedc9 100644
--- a/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/result.xhtml
+++ b/tobago-example/tobago-example-spring-boot/src/main/resources/META-INF/resources/result.xhtml
@@ -17,7 +17,7 @@
  * limitations under the License.
 -->
 
-<f:view xmlns:f="http://java.sun.com/jsf/core"
+<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:tc="http://myfaces.apache.org/tobago/component">
 
   <tc:page>