diff --git a/framework/entity/BasicEntities.xml b/framework/entity/BasicEntities.xml
index 9d3d40ebf..b44559d26 100644
--- a/framework/entity/BasicEntities.xml
+++ b/framework/entity/BasicEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- moqui.basic -->
diff --git a/framework/entity/EntityEntities.xml b/framework/entity/EntityEntities.xml
index 510c08ad1..f2e7d514a 100644
--- a/framework/entity/EntityEntities.xml
+++ b/framework/entity/EntityEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- moqui.entity -->
diff --git a/framework/entity/OlapEntities.xml b/framework/entity/OlapEntities.xml
index f0f4d1321..033080b72 100644
--- a/framework/entity/OlapEntities.xml
+++ b/framework/entity/OlapEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <entity entity-name="DateDayDimension" package="moqui.olap" use="analytical">
         <description>Date Day Dimension. The natural key is [dateValue]</description>
         <field name="dimensionId" type="id" is-pk="true"/>
diff --git a/framework/entity/ResourceEntities.xml b/framework/entity/ResourceEntities.xml
index 9fdb4ce1f..349e5139a 100644
--- a/framework/entity/ResourceEntities.xml
+++ b/framework/entity/ResourceEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- moqui.resource -->
diff --git a/framework/entity/Screen.eecas.xml b/framework/entity/Screen.eecas.xml
index c409d1044..903479a98 100644
--- a/framework/entity/Screen.eecas.xml
+++ b/framework/entity/Screen.eecas.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<eecas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-eca-3.xsd">
+<eecas xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-eca-3.xsd">
     <eeca id="DbFormCache" entity="moqui.screen.form.DbForm" on-create="true" on-update="true" on-delete="true">
         <actions><script>ec.cache.getCache('screen.form.db.node').remove(formId)</script></actions></eeca>
     <eeca id="DbFormFieldCache" entity="moqui.screen.form.DbFormField" on-create="true" on-update="true" on-delete="true">
diff --git a/framework/entity/ScreenEntities.xml b/framework/entity/ScreenEntities.xml
index c92bb3c84..7f04eb37f 100644
--- a/framework/entity/ScreenEntities.xml
+++ b/framework/entity/ScreenEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!-- ========================================================= -->
     <!-- moqui.screen -->
     <!-- ========================================================= -->
diff --git a/framework/entity/SecurityEntities.xml b/framework/entity/SecurityEntities.xml
index 46bf22439..71cc6405b 100644
--- a/framework/entity/SecurityEntities.xml
+++ b/framework/entity/SecurityEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- moqui.security -->
diff --git a/framework/entity/ServerEntities.xml b/framework/entity/ServerEntities.xml
index 319de3245..1532cf163 100644
--- a/framework/entity/ServerEntities.xml
+++ b/framework/entity/ServerEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- moqui.server -->
diff --git a/framework/entity/ServiceEntities.xml b/framework/entity/ServiceEntities.xml
index 120acabdb..56f1172aa 100644
--- a/framework/entity/ServiceEntities.xml
+++ b/framework/entity/ServiceEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <entity entity-name="ServiceRegister" package="moqui.service" use="configuration" cache="true">
         <field name="serviceRegisterId" type="id" is-pk="true"/>
diff --git a/framework/entity/TestEntities.xml b/framework/entity/TestEntities.xml
index ff3da7484..b451c2e6e 100644
--- a/framework/entity/TestEntities.xml
+++ b/framework/entity/TestEntities.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
     <!-- ========================================================= -->
     <!-- moqui.test -->
diff --git a/framework/screen/AddedEmailAuthcFactor.xml b/framework/screen/AddedEmailAuthcFactor.xml
index 0bc94b892..991642666 100644
--- a/framework/screen/AddedEmailAuthcFactor.xml
+++ b/framework/screen/AddedEmailAuthcFactor.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xml-screen-3.xsd">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <widgets>
         <render-mode><text type="html"><![CDATA[<html><body>]]></text></render-mode>
         <container><label text="An email method for authentication has been added for ${userEmail}"/></container>
diff --git a/framework/screen/EmailAuthcFactorSent.xml b/framework/screen/EmailAuthcFactorSent.xml
index 96f2ec8d6..a00dba55c 100644
--- a/framework/screen/EmailAuthcFactorSent.xml
+++ b/framework/screen/EmailAuthcFactorSent.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xml-screen-3.xsd">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <widgets>
         <render-mode><text type="html"><![CDATA[<html><body>]]></text></render-mode>
         <container><label text="A one time code was sent to ${userEmail}."/></container>
diff --git a/framework/screen/NotificationEmail.xml b/framework/screen/NotificationEmail.xml
index 47c888525..789d91228 100644
--- a/framework/screen/NotificationEmail.xml
+++ b/framework/screen/NotificationEmail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xml-screen-3.xsd">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <!-- for fields available see NotificationMessageImpl.getWrappedMessageMap(), this is generic so nothing from the 'message' Map within it -->
     <actions>
         <if condition="link">
diff --git a/framework/screen/PasswordReset.xml b/framework/screen/PasswordReset.xml
index fca187593..a416940bd 100644
--- a/framework/screen/PasswordReset.xml
+++ b/framework/screen/PasswordReset.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xml-screen-3.xsd">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <widgets>
         <render-mode><text type="html"><![CDATA[<html><body>]]></text></render-mode>
         <container><label text="Your reset password has been set to: ${resetPassword}"/></container>
diff --git a/framework/screen/ScreenRenderEmail.xml b/framework/screen/ScreenRenderEmail.xml
index f0eaa296b..935562338 100644
--- a/framework/screen/ScreenRenderEmail.xml
+++ b/framework/screen/ScreenRenderEmail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xml-screen-3.xsd">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <actions>
         <set field="title" from="title ?: 'Rendered screen attached'"/>
         <set field="bodyParmKeys" from="new TreeSet()"/>
diff --git a/framework/screen/SingleUseCode.xml b/framework/screen/SingleUseCode.xml
index fb96c981a..49b6326ad 100644
--- a/framework/screen/SingleUseCode.xml
+++ b/framework/screen/SingleUseCode.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xml-screen-3.xsd">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
     <widgets>
         <render-mode><text type="html"><![CDATA[<html><body>]]></text></render-mode>
         <container><label text="Your single use code is: ${code}"/></container>
diff --git a/framework/service/org/moqui/EmailServices.xml b/framework/service/org/moqui/EmailServices.xml
index 5b523b058..5ed7a05bd 100644
--- a/framework/service/org/moqui/EmailServices.xml
+++ b/framework/service/org/moqui/EmailServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="send" noun="EmailTemplate" type="interface">
         <description>Send Email with settings in EmailTemplate entity record</description>
diff --git a/framework/service/org/moqui/EntityServices.xml b/framework/service/org/moqui/EntityServices.xml
index 74b865a9f..c5667f5ea 100644
--- a/framework/service/org/moqui/EntityServices.xml
+++ b/framework/service/org/moqui/EntityServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="receive" noun="DataFeed" type="interface" no-remember-parameters="true">
         <description>Services named in the DataFeed.feedReceiveServiceName field should implement this interface.</description>
         <in-parameters>
diff --git a/framework/service/org/moqui/SmsServices.xml b/framework/service/org/moqui/SmsServices.xml
index 0b80594d1..796b07e16 100644
--- a/framework/service/org/moqui/SmsServices.xml
+++ b/framework/service/org/moqui/SmsServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="send" noun="SmsMessage" authenticate="anonymous-view">
         <in-parameters>
             <parameter name="countryCode" default-value="1"/>
diff --git a/framework/service/org/moqui/impl/BasicServices.xml b/framework/service/org/moqui/impl/BasicServices.xml
index 602726057..07080c179 100644
--- a/framework/service/org/moqui/impl/BasicServices.xml
+++ b/framework/service/org/moqui/impl/BasicServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="noop" authenticate="anonymous-all" validate="false">
         <actions><!-- do nothing, it's a noop service --></actions>
     </service>
diff --git a/framework/service/org/moqui/impl/ElFinderServices.xml b/framework/service/org/moqui/impl/ElFinderServices.xml
index d96d84669..d186248e0 100644
--- a/framework/service/org/moqui/impl/ElFinderServices.xml
+++ b/framework/service/org/moqui/impl/ElFinderServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="run" noun="Command">
         <description>See elFinder API docs at: https://github.com/Studio-42/elFinder/wiki/Client-Server-API-2.0</description>
         <in-parameters>
diff --git a/framework/service/org/moqui/impl/EmailServices.xml b/framework/service/org/moqui/impl/EmailServices.xml
index dfec6eb5e..b08b328d4 100644
--- a/framework/service/org/moqui/impl/EmailServices.xml
+++ b/framework/service/org/moqui/impl/EmailServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="send" noun="Email" type="script"
              location="classpath://org/moqui/impl/sendEmailTemplate.groovy" allow-remote="false">
diff --git a/framework/service/org/moqui/impl/EntityServices.xml b/framework/service/org/moqui/impl/EntityServices.xml
index b7a10a669..8e6bb3341 100644
--- a/framework/service/org/moqui/impl/EntityServices.xml
+++ b/framework/service/org/moqui/impl/EntityServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <!-- ==================================================== -->
     <!-- ========== DataDocument and Feed Services ========== -->
diff --git a/framework/service/org/moqui/impl/EntitySyncServices.xml b/framework/service/org/moqui/impl/EntitySyncServices.xml
index c93376d40..bb0d8cad1 100644
--- a/framework/service/org/moqui/impl/EntitySyncServices.xml
+++ b/framework/service/org/moqui/impl/EntitySyncServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="run" noun="EntitySyncAll" transaction="ignore" authenticate="anonymous-all">
         <actions>
             <entity-find entity-name="moqui.entity.sync.EntitySync" list="entitySyncList">
diff --git a/framework/service/org/moqui/impl/GoogleServices.xml b/framework/service/org/moqui/impl/GoogleServices.xml
index 8ad9fc19c..8d06799e3 100644
--- a/framework/service/org/moqui/impl/GoogleServices.xml
+++ b/framework/service/org/moqui/impl/GoogleServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="verify" noun="ReCaptcha">
         <!-- for documentation see: https://developers.google.com/recaptcha/docs/verify -->
diff --git a/framework/service/org/moqui/impl/InstanceServices.xml b/framework/service/org/moqui/impl/InstanceServices.xml
index b4c60dd4e..7071d77fa 100644
--- a/framework/service/org/moqui/impl/InstanceServices.xml
+++ b/framework/service/org/moqui/impl/InstanceServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <!-- ========== Instance Interfaces ========== -->
 
diff --git a/framework/service/org/moqui/impl/PrintServices.xml b/framework/service/org/moqui/impl/PrintServices.xml
index 12658312d..6b8f02e5e 100644
--- a/framework/service/org/moqui/impl/PrintServices.xml
+++ b/framework/service/org/moqui/impl/PrintServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="get" noun="ServerPrinters">
         <!-- org.moqui.impl.PrintServices.get#ServerPrinters -->
diff --git a/framework/service/org/moqui/impl/ScreenServices.xml b/framework/service/org/moqui/impl/ScreenServices.xml
index 11ae32e02..39a6a717a 100644
--- a/framework/service/org/moqui/impl/ScreenServices.xml
+++ b/framework/service/org/moqui/impl/ScreenServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <!-- ========== ScheduledScreen Services ========== -->
 
diff --git a/framework/service/org/moqui/impl/ServerServices.xml b/framework/service/org/moqui/impl/ServerServices.xml
index fb321ff96..03df4d790 100644
--- a/framework/service/org/moqui/impl/ServerServices.xml
+++ b/framework/service/org/moqui/impl/ServerServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="get" noun="VisitClientIpData" authenticate="anonymous-all">
         <description>Gets data from freegeoip.net for client IP address and populates in Visit record</description>
         <in-parameters><parameter name="visitId" required="true"/></in-parameters>
diff --git a/framework/service/org/moqui/impl/ServiceServices.xml b/framework/service/org/moqui/impl/ServiceServices.xml
index 3289c1606..63fe13d22 100644
--- a/framework/service/org/moqui/impl/ServiceServices.xml
+++ b/framework/service/org/moqui/impl/ServiceServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="clean" noun="ServiceJobRun" authenticate="false" transaction-timeout="600">
         <in-parameters><parameter name="daysToKeep" type="Integer" default="90"/></in-parameters>
diff --git a/framework/service/org/moqui/impl/SystemMessageServices.xml b/framework/service/org/moqui/impl/SystemMessageServices.xml
index 457f38ecf..7cba84404 100644
--- a/framework/service/org/moqui/impl/SystemMessageServices.xml
+++ b/framework/service/org/moqui/impl/SystemMessageServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <!-- =========== Interfaces =========== -->
 
diff --git a/framework/service/org/moqui/impl/UserServices.xml b/framework/service/org/moqui/impl/UserServices.xml
index 1a1dbba28..6b433bba6 100644
--- a/framework/service/org/moqui/impl/UserServices.xml
+++ b/framework/service/org/moqui/impl/UserServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="set" noun="Preference" allow-remote="true">
         <in-parameters>
diff --git a/framework/service/org/moqui/impl/WikiServices.xml b/framework/service/org/moqui/impl/WikiServices.xml
index 6145fd621..8b31dbdc6 100644
--- a/framework/service/org/moqui/impl/WikiServices.xml
+++ b/framework/service/org/moqui/impl/WikiServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <service verb="get" noun="WikiPageInfoById">
         <in-parameters><parameter name="wikiPageId"/></in-parameters>
         <out-parameters>
diff --git a/framework/service/org/moqui/search/ElasticSearchServices.xml b/framework/service/org/moqui/search/ElasticSearchServices.xml
index 33db7d632..8e407eecf 100644
--- a/framework/service/org/moqui/search/ElasticSearchServices.xml
+++ b/framework/service/org/moqui/search/ElasticSearchServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <!-- for backward compatibility with the service location in the old moqui-elasticsearch component; here because ServiceJob DB records may reference it still -->
     <service-include verb="delete" noun="Documents" location="classpath://service/org/moqui/search/SearchServices.xml"/>
 </services>
diff --git a/framework/service/org/moqui/search/SearchServices.xml b/framework/service/org/moqui/search/SearchServices.xml
index 664d59a78..dae0015fd 100644
--- a/framework/service/org/moqui/search/SearchServices.xml
+++ b/framework/service/org/moqui/search/SearchServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="service-definition-3.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="index" noun="DataDocuments" authenticate="false" no-remember-parameters="true" transaction-timeout="3600">
         <implements service="org.moqui.EntityServices.receive#DataFeed"/>
diff --git a/framework/src/main/resources/MoquiDefaultConf.xml b/framework/src/main/resources/MoquiDefaultConf.xml
index bb46ddd97..8af35a7b3 100644
--- a/framework/src/main/resources/MoquiDefaultConf.xml
+++ b/framework/src/main/resources/MoquiDefaultConf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- No copyright or license for configuration file, details here are not considered a creative work. -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="moqui-conf-3.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <!-- Settings in this file can be overridden in a component (MoquiConf.xml) and/or runtime conf file that has
         any of the desired sub-elements. -->