diff --git a/README.md b/README.md
index 55e7434296dbe11c8f6ebddbe7b2e1bbce2ebdc6..34a61cd282d5d77ae9297eda9e713a777db425ad 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ You can find further Information here:
- Added optional ``<Doc>`` element to Event
- Changed the optionality of the ``<DataPoint>``'s ``type`` attribute to "required".
- Added [UML diagram](SDT/schema2.0/docs/SDT_Components.md)
+- Changed the namespace for the XSD from "hgi.org" to "homegatewayinitiative.org".
---
@@ -71,7 +72,11 @@ The "numbers" could be just integer number, but may also contain letters, e.g. "
## Domain / namespace
-The SDL now uses the namespace "homegateway.org" as a namespace to identify the schema (also used for includes). The namespace is **not** a URL, but uniquely identifies the namespace and *should* be registered by HGI.
+The SDL now uses the namespace "homegatewayinitiative.org" as a namespace to identify the schema (also used for includes). The namespace is **not** a URL, but uniquely identifies the namespace and *should* be registered by HGI.
+
+That said, most validating parsers expect **that the namesapce IS a valid URL** or that at least there is a server on the other end rejecting the request. A timeout / no connection / no answer / ... leads to an error.
+
+Therefore, we cannot use the namespace "homegateway.org" because parsers don't get an answer from this address.
diff --git a/SDT/schema2.0/build.xml b/SDT/schema2.0/build.xml
index 38d73d721290489fbed147288a832adde76e7281..adbce2fd2d91776a4333658db8a0eec126474dca 100644
--- a/SDT/schema2.0/build.xml
+++ b/SDT/schema2.0/build.xml
@@ -92,7 +92,7 @@
<schemavalidate warn="true">
<fileset dir="${basedir}/test" includes="*.xml"/>
<attribute name="http://apache.org/xml/features/xinclude" value="true"/>
- <schema namespace="http://hgi.org/xml/dal/2.0"
+ <schema namespace="http://homegatewayinitiative.org/xml/dal/2.0"
file="${path.src}/domain.xsd" />
<schema namespace="http://www.w3.org/2001/XInclude"
file="${basedir}/etc/XInclude.xsd" />
diff --git a/SDT/schema2.0/etc/dal.rnc b/SDT/schema2.0/etc/dal.rnc
index 735196ad3839b8ec1d1b45d7fb3cf550c8c74a2f..d5c572e697680d458bc979d8e8f87f1b965a1d7f 100644
--- a/SDT/schema2.0/etc/dal.rnc
+++ b/SDT/schema2.0/etc/dal.rnc
@@ -1,6 +1,6 @@
namespace local = ""
-default namespace xsl = "http://hgi.org/xml/dal/2.0"
+default namespace xsl = "http://homegatewayinitiative.org/xml/dal/2.0"
namespace xi = "http://www.w3.org/2001/XInclude"
version = "1.0"
diff --git a/SDT/schema2.0/etc/schema.xmlns b/SDT/schema2.0/etc/schema.xmlns
index 619292d6925966723981428e653c1a6d18a6f817..e64c32968931b3d1745b6c11ecd5b6db2647c7fd 100644
--- a/SDT/schema2.0/etc/schema.xmlns
+++ b/SDT/schema2.0/etc/schema.xmlns
@@ -1,4 +1,4 @@
-targetNamespace="http://hgi.org/xml/dal/2.0"
- xmlns="http://hgi.org/xml/dal/2.0"
+targetNamespace="http://homegatewayinitiative.org/xml/dal/2.0"
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/SDT/schema2.0/etc/schemas.xml b/SDT/schema2.0/etc/schemas.xml
index a92a4e9d57a85468595b4f55d82b9cc67af96515..3b0bea68871bb789a0a90378c2c425b777e77199 100644
--- a/SDT/schema2.0/etc/schemas.xml
+++ b/SDT/schema2.0/etc/schemas.xml
@@ -1,6 +1,6 @@
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
- <namespace ns="http://hgi.org/xml/dal/2.0" typeId="DAL"/>
+ <namespace ns="http://homegatewayinitiative.org/xml/dal/2.0" typeId="DAL"/>
<namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/>
<typeId id="DAL" uri="dal.rnc"/>
diff --git a/SDT/schema2.0/gen/html/hgi.dal.core/index.html b/SDT/schema2.0/gen/html/hgi.dal.core/index.html
index 456cbf8c1f0cc2779533792f5f42a084e9e84b10..3e17706cbd1a2f88dc09494b21515a4e623606e7 100644
--- a/SDT/schema2.0/gen/html/hgi.dal.core/index.html
+++ b/SDT/schema2.0/gen/html/hgi.dal.core/index.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://hgi.org/xml/dal/1.0" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Domain hgi.dal.core</title>
</head>
diff --git a/SDT/schema2.0/src/domain.xsd b/SDT/schema2.0/src/domain.xsd
index f9297404a8027f5eb3b9976364de2c6b8f798f31..f22e199f0d00df437e885b502cc6f77f1fb57cc9 100644
--- a/SDT/schema2.0/src/domain.xsd
+++ b/SDT/schema2.0/src/domain.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://hgi.org/xml/dal/2.0"
- xmlns="http://hgi.org/xml/dal/2.0"
+<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/2.0"
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
diff --git a/SDT/schema2.0/style/html.xsl b/SDT/schema2.0/style/html.xsl
index c7fab6ec30ecb76b0ee54359b850d089522fba0f..8492bede0498eaebf0ce370eebb95cee9af73311 100644
--- a/SDT/schema2.0/style/html.xsl
+++ b/SDT/schema2.0/style/html.xsl
@@ -8,7 +8,7 @@
document ... -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dal="http://hgi.org/xml/dal/1.0"
+ xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:redirect="http://xml.apache.org/xalan/redirect"
diff --git a/SDT/schema2.0/test/dal-core.xml b/SDT/schema2.0/test/dal-core.xml
index beb3a80e67632a40dcde6963b1b27178a9720ef8..dc61de8ff7b3a7d649a2120817a69e4266270053 100644
--- a/SDT/schema2.0/test/dal-core.xml
+++ b/SDT/schema2.0/test/dal-core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<Domain xmlns="http://hgi.org/xml/dal/2.0"
+<Domain xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
id="hgi.dal.core">
<Modules>
diff --git a/SDT/schema2.0/test/dal-eg.xml b/SDT/schema2.0/test/dal-eg.xml
index afe7bb9e39393504017f3cdfdbbb6217b7da67a4..10b2a254d53f8d209a8acaf82fd3ed4da920e04a 100644
--- a/SDT/schema2.0/test/dal-eg.xml
+++ b/SDT/schema2.0/test/dal-eg.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://hgi.org/xml/dal/2.0"
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
id="com.telekom">
<Imports>
diff --git a/SDT/schema2.0/test/mseeb.xml b/SDT/schema2.0/test/mseeb.xml
index e2fc34b493c54175fedbdd52868433077e98db7c..78e0d6a7cc57b47c5bcaa4824c7488b1eea09385 100644
--- a/SDT/schema2.0/test/mseeb.xml
+++ b/SDT/schema2.0/test/mseeb.xml
@@ -5,7 +5,7 @@
<!--
+................................................+
-:Domain:org.hgi :
+:Domain:org.homegatewayinitiative :
: :
: +..........................................+ :
: :Module:BooleanState : :
@@ -62,8 +62,8 @@
-->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://hgi.org/xml/dal/2.0"
- id="org.hgi">
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
+ id="org.homegatewayinitiative">
<!-- The following import statements include ModuleClasses from HGI -->