diff --git a/SDT/schema3.0/etc/domain.rnc b/SDT/schema3.0/etc/domain.rnc
index e3f40618de4875dd32a6142c80743167eab5639c..7b42fb1a3f8c857a3ab99fe2d9038f6aa304b86f 100644
--- a/SDT/schema3.0/etc/domain.rnc
+++ b/SDT/schema3.0/etc/domain.rnc
@@ -1,3 +1,13 @@
+# - domain.rng
+# -
+# - Version 3.0
+# -
+# - This work is released by the Smarthome Task Force of the HGI (Home
+# - Gateway Initative), October 2015.
+# - The work is created and released under the Apache License Version 2.0 .
+# - See the license text at http://www.apache.org/licenses/LICENSE-2.0 for
+# - full details.
+
 start = Domain
 Domain =
   element Domain {
diff --git a/SDT/schema3.0/src/domain.rng b/SDT/schema3.0/src/domain.rng
index 34a4cc97b983f9ab743b71404ae1ee28a7b4a821..db5784147c77f0152c8c4c76e2e160c2e165776f 100644
--- a/SDT/schema3.0/src/domain.rng
+++ b/SDT/schema3.0/src/domain.rng
@@ -1,14 +1,14 @@
 <!--
-  -- domain.rng
-  --
-  -- Version 3.0
-  --
-  -- This work is released by the Smarthome Task Force of the HGI (Home
-  -- Gateway Initative), October 2015.
-  -- The work is created and released under the Apache License Version 2.0 .
-  -- See the license text at http://www.apache.org/licenses/LICENSE-2.0 for
-  -- full details.
-  -->
+   - domain.rng
+   -
+   - Version 3.0
+   -
+   - This work is released by the Smarthome Task Force of the HGI (Home
+   - Gateway Initative), October 2015.
+   - The work is created and released under the Apache License Version 2.0 .
+   - See the license text at http://www.apache.org/licenses/LICENSE-2.0 for
+   - full details.
+   -->
 
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
 	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
diff --git a/SDT/schema3.0/src/domain.xsd b/SDT/schema3.0/src/domain.xsd
index 496e3fd6d301b77d07935048ff4800a6db46ff1d..3144017f513abcb8fc8f514d33c09c4913933818 100644
--- a/SDT/schema3.0/src/domain.xsd
+++ b/SDT/schema3.0/src/domain.xsd
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  - domain.rng
+  -
+  - Version 3.0
+  -
+  - This work is released by the Smarthome Task Force of the HGI (Home
+  - Gateway Initative), October 2015.
+  - The work is created and released under the Apache License Version 2.0 .
+  - See the license text at http://www.apache.org/licenses/LICENSE-2.0 for
+  - full details.
+-->
 <xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/3.0" 
-	   xmlns="http://homegatewayinitiative.org/xml/dal/3.0" 
-	   targetNamespace="http://homegatewayinitiative.org/xml/dal/3.0" 
-	   xmlns="http://homegatewayinitiative.org/xml/dal/3.0" 
-	   targetNamespace="http://homegatewayinitiative.org/xml/dal/3.0" 
 	   xmlns="http://homegatewayinitiative.org/xml/dal/3.0" 
 	   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 	  
- 
-	  
- 
-	  
  elementFormDefault="qualified">
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/http://www.w3.org/2001/03/http://www.w3.org/2001/03/xml.xsd"/>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
   <xs:element name="Domain">
     <xs:complexType>
       <xs:sequence>