diff --git a/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml b/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml
index 73a3f01e2..169c5fac2 100644
--- a/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/context/pretty-config.xml
@@ -1,11 +1,11 @@
-<pretty-config xmlns="http://ocpsoft.com/prettyfaces/4.0.0"
+<pretty-config xmlns="http://ocpsoft.org/schema/rewrite-config-prettyfaces"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/4.0.0
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-4.0.0.xsd">
+   xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
+         https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
    <url-mapping id="index">
       <pattern value="/"></pattern>
-      <view-id>/index.jsf</view-id>
+      <view-id value="/index.jsf"></view-id>
    </url-mapping>
 
 </pretty-config>
\ No newline at end of file
diff --git a/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml
index 2072c6e04..35afe7323 100644
--- a/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/dynaview/ambiguous-pretty-config.xml
@@ -1,6 +1,6 @@
 <pretty-config xmlns="http://ocpsoft.org/schema/rewrite-config-prettyfaces" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
-                      http://ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
+                      https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
    <url-mapping id="foo">
       <pattern value="/foo"/>
diff --git a/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml
index f1c303b3b..5378dc71b 100644
--- a/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/encoding/encoding-pretty-config.xml
@@ -1,6 +1,6 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+                                   		https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
    <rewrite match="/URL ENCODED" substitute="/url decoded" toCase="lowercase"/>
 
diff --git a/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml
index 5a6c07b20..008ea235f 100644
--- a/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/errorpage/errorpage-pretty-config.xml
@@ -1,6 +1,6 @@
 <pretty-config xmlns="http://ocpsoft.org/schema/rewrite-config-prettyfaces" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
-                      http://ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
+                      https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
    <url-mapping id="test">
       <pattern value="/validate/#{value}">
diff --git a/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml
index 09c1e77d9..e85050ada 100644
--- a/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/interaction/faces-navigate-pretty-config.xml
@@ -1,5 +1,5 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
+   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
 
    <!-- Simple URL mapping -->
    <url-mapping>
diff --git a/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml
index f44747d89..958b7e236 100644
--- a/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/interaction/interaction-pretty-config.xml
@@ -1,5 +1,5 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
+   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
 
    <!-- Directly accessing view-ids should redirect to the pretty URL -->
    <rewrite match="/(.*)\.jsf" substitute="/$1" redirect="302"/>
diff --git a/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml
index 29044ed1a..2e46c0b8a 100644
--- a/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/loop/loop-pretty-config.xml
@@ -1,6 +1,6 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+                                   		https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
    <url-mapping id="loop">
       <pattern value="/loop.jsf"/>
diff --git a/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml
index c2b30899d..80eaafd91 100644
--- a/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/outbound/outbound-pretty-config.xml
@@ -1,5 +1,5 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.3.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.3 http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.3.xsd">
+   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.3 https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.3.xsd">
 
    <url-mapping id="no-param">
       <pattern value="/no-param" />
diff --git a/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml b/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml
index 9335933fa..eb5ec06b1 100644
--- a/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/pathparams/pretty-config.xml
@@ -1,17 +1,17 @@
-<pretty-config xmlns="http://ocpsoft.com/prettyfaces/4.0.0"
+<pretty-config xmlns="http://ocpsoft.org/schema/rewrite-config-prettyfaces"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/4.0.0
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-4.0.0.xsd">
+   xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
+         https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
 
    <url-mapping id="index">
       <pattern value="/default/#{digits}"></pattern>
-      <view-id>/index.jsf</view-id>
+      <view-id value="/index.jsf"></view-id>
    </url-mapping>
 
    <url-mapping id="index">
       <pattern value="/digits/#{/\\d+/ digits}"></pattern>
-      <view-id>/index.jsf</view-id>
+      <view-id value="/index.jsf"></view-id>
    </url-mapping>
 
 </pretty-config>
\ No newline at end of file
diff --git a/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml
index 7bb99d2ac..45fb11494 100644
--- a/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/redirect/redirect-pretty-config.xml
@@ -1,6 +1,6 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+                                   		https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
    <url-mapping id="value">
       <pattern value="/#{one}/#{two}"></pattern>
diff --git a/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml b/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml
index 5bbc607e7..64149ff3a 100644
--- a/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/rule_naming/pretty-config.xml
@@ -1,16 +1,16 @@
-<pretty-config xmlns="http://ocpsoft.com/prettyfaces/4.0.0"
+<pretty-config xmlns="http://ocpsoft.org/schema/rewrite-config-prettyfaces"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://ocpsoft.com/prettyfaces/4.0.0
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-4.0.0.xsd">
+   xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
+                                   		https://www.ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
    <url-mapping id="index">
       <pattern value="/"></pattern>
-      <view-id>/index.jsf</view-id>
+      <view-id value="/index.jsf"></view-id>
    </url-mapping>
    
    <url-mapping id="test:link">
       <pattern value="/test-link"></pattern>
-      <view-id>/test.jsf</view-id>
+      <view-id value="/test.jsf"></view-id>
    </url-mapping>
 
 </pretty-config>
\ No newline at end of file
diff --git a/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml b/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml
index ed9ad2566..7d875fe52 100644
--- a/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml
+++ b/config-prettyfaces-tests/src/test/resources/trailingslash/trailingslash-pretty-config.xml
@@ -1,6 +1,6 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1
-                                   		http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+                                   		https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
    <rewrite trailingSlash="remove" outbound="false" redirect="301"/>
 
diff --git a/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml b/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml
index de46b0a28..45ca571f1 100644
--- a/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml
+++ b/config-prettyfaces/src/test/resources/META-INF/pretty-config.xml
@@ -2,7 +2,7 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1 
-	http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+	https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
    <url-mapping id="0">
       <pattern value="/project/#{viewProjectBean.projectId}/" />
diff --git a/config-prettyfaces/src/test/resources/mock-pretty-config.xml b/config-prettyfaces/src/test/resources/mock-pretty-config.xml
index aff40430c..f142cdfa1 100644
--- a/config-prettyfaces/src/test/resources/mock-pretty-config.xml
+++ b/config-prettyfaces/src/test/resources/mock-pretty-config.xml
@@ -2,7 +2,7 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1 
-	http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+	https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
    <url-mapping id="0">
       <pattern value="/project/#{viewProjectBean.projectId}/" />
diff --git a/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml b/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml
index cd91703ba..652d4257c 100644
--- a/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml
+++ b/config-prettyfaces/src/test/resources/rewrite-pretty-config.xml
@@ -2,7 +2,7 @@
 <pretty-config xmlns="http://ocpsoft.com/prettyfaces/3.1.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.1.1 
-	http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
+	https://www.ocpsoft.org/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.1.1.xsd">
 
 	<rewrite match="^(.*[^/])$" substitute="$1/" redirect="chain"
 		outbound="true" />