diff --git a/pom.xml b/pom.xml
index 86370c3..361222f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,16 +67,16 @@
         <maven.source.excludeResources>true</maven.source.excludeResources>
 
         <!-- Test versions. -->
-        <test.wildfly.version>33.0.1.Final</test.wildfly.version> <!-- https://mvnrepository.com/artifact/org.wildfly.bom/wildfly -->
-        <test.glassfish.version>7.0.17</test.glassfish.version> <!-- https://mvnrepository.com/artifact/org.glassfish.main.distributions/glassfish -->
+        <test.wildfly.version>33.0.2.Final</test.wildfly.version> <!-- https://mvnrepository.com/artifact/org.wildfly.bom/wildfly -->
+        <test.glassfish.version>7.0.21</test.glassfish.version> <!-- https://mvnrepository.com/artifact/org.glassfish.main.distributions/glassfish -->
         <test.tomee.version>9.1.3</test.tomee.version> <!-- https://mvnrepository.com/artifact/org.apache.tomee/apache-tomee -->
-        <test.wildfly-eclipselink.version>5.0.0-B03</test.wildfly-eclipselink.version> <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink -->
+        <test.wildfly-eclipselink.version>5.0.0-B05</test.wildfly-eclipselink.version> <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink -->
         <test.glassfish-hibernate.version>6.1.7.Final</test.glassfish-hibernate.version> <!-- https://mvnrepository.com/artifact/org.hibernate.orm/hibernate-core TODO: Hibernate 6.2.0 and newer somehow threw java.lang.ClassCircularityError: org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl$Entry -->
         <test.h2.version>2.3.232</test.h2.version> <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
         <test.mysql-driver.version>8.0.33</test.mysql-driver.version> <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
-        <test.postgresql-driver.version>42.7.4</test.postgresql-driver.version> <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
-        <test.omnifaces.version>4.5.1</test.omnifaces.version> <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
-        <test.primefaces.version>14.0.5</test.primefaces.version> <!-- https://mvnrepository.com/artifact/org.primefaces/primefaces -->
+        <test.postgresql-driver.version>42.7.5</test.postgresql-driver.version> <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
+        <test.omnifaces.version>5.0-M2</test.omnifaces.version> <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
+        <test.primefaces.version>14.0.10</test.primefaces.version> <!-- https://mvnrepository.com/artifact/org.primefaces/primefaces -->
     </properties>
 
     <dependencies>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazy.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazy.xhtml
index 566a602..cd79d0d 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazy.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazy.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyStateless.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyStateless.xhtml
index 4133f95..ee95bcf 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyStateless.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyStateless.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <f:view transient="true">
         <h:head>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithCriteria.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithCriteria.xhtml
index f34e3a7..ecb7b2d 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithCriteria.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithCriteria.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with criteria</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDTO.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDTO.xhtml
index 17c9e14..fff7a49 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDTO.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDTO.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with DTO</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDefaultOrderBy.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDefaultOrderBy.xhtml
index 8954b7c..4719905 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDefaultOrderBy.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithDefaultOrderBy.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with default orderBy</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithElementCollection.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithElementCollection.xhtml
index 84ce9da..cf50e45 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithElementCollection.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithElementCollection.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with element collection</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithFilterOptions.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithFilterOptions.xhtml
index 8219eba..9d02ed1 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithFilterOptions.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithFilterOptions.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with filter options</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithManyToOne.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithManyToOne.xhtml
index dc216eb..39467a6 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithManyToOne.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithManyToOne.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with @ManyToOne</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToMany.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToMany.xhtml
index d410fcd..151c7e0 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToMany.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToMany.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with @OneToMany</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToOne.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToOne.xhtml
index 2f429ea..4ccbfd8 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToOne.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITLazyWithOneToOne.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - lazy with @OneToOne</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazy.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazy.xhtml
index d75c44b..d45a420 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazy.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazy.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyStateless.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyStateless.xhtml
index bfbed42..c0e0c15 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyStateless.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyStateless.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <f:view transient="true">
         <h:head>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithCriteria.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithCriteria.xhtml
index ec00238..92c7a8e 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithCriteria.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithCriteria.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with criteria</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithDTO.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithDTO.xhtml
index 396eb14..15e399d 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithDTO.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithDTO.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with DTO</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithElementCollection.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithElementCollection.xhtml
index 9a571c8..52f5d56 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithElementCollection.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithElementCollection.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with element collection</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithFilterOptions.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithFilterOptions.xhtml
index 1060ea5..a36c327 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithFilterOptions.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithFilterOptions.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with filter options</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithManyToOne.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithManyToOne.xhtml
index 5e0d1b2..1208f29 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithManyToOne.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithManyToOne.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with @ManyToOne</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToMany.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToMany.xhtml
index 8412d8a..d373d13 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToMany.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToMany.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with @OneToMany</title>
diff --git a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToOne.xhtml b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToOne.xhtml
index 5640bbc..5e7b29f 100644
--- a/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToOne.xhtml
+++ b/src/test/resources/org.omnifaces.optimusfaces.test/OptimusFacesITNonLazyWithOneToOne.xhtml
@@ -14,13 +14,12 @@
 -->
 <!DOCTYPE html>
 <html lang="en"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:f="http://xmlns.jcp.org/jsf/core"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-    xmlns:o="http://omnifaces.org/ui"
-    xmlns:p="http://primefaces.org/ui"
-    xmlns:op="http://omnifaces.org/optimusfaces"
+    xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets"
+    xmlns:o="omnifaces"
+    xmlns:p="primefaces"
+    xmlns:op="optimusfaces"
 >
     <h:head>
         <title>OptimusFacesIT - non-lazy with @OneToOne</title>
