diff --git a/SDT/schema4.0/build.xml b/SDT/schema4.0/build.xml
index 3f5101fb6f675867fbb0bac7a7bfa77314f574eb..55bf6408067c37ae017bb263286f05c00bdfc0c3 100644
--- a/SDT/schema4.0/build.xml
+++ b/SDT/schema4.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://homegatewayinitiative.org/xml/dal/4.0"
+ <schema namespace="http://www.onem2m.org/xml/sdt/4.0"
file="${path.src}/domain.xsd" />
<schema namespace="http://www.w3.org/2001/XInclude"
file="${basedir}/etc/XInclude.xsd" />
diff --git a/SDT/schema4.0/etc/dal.rnc b/SDT/schema4.0/etc/dal.rnc
index e9c05eee2933d959745c944234fcd9e9abdb851c..bdf78c4059c80568d57a4d45753d411ebe99165e 100644
--- a/SDT/schema4.0/etc/dal.rnc
+++ b/SDT/schema4.0/etc/dal.rnc
@@ -1,6 +1,6 @@
namespace local = ""
-default namespace xsl = "http://homegatewayinitiative.org/xml/dal/4.0"
+default namespace xsl = "http://www.onem2m.org/xml/sdt/4.0"
namespace xi = "http://www.w3.org/2001/XInclude"
version = "1.0"
diff --git a/SDT/schema4.0/etc/schema.xmlns b/SDT/schema4.0/etc/schema.xmlns
index d38050cfd3f90669fdcdad324f8f95609c56bf65..159f7ed015c76d622006c2d5213b62be4f5fd475 100644
--- a/SDT/schema4.0/etc/schema.xmlns
+++ b/SDT/schema4.0/etc/schema.xmlns
@@ -1,4 +1,4 @@
-targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0"
- xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+targetNamespace="http://www.onem2m.org/xml/sdt/4.0"
+ xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/SDT/schema4.0/etc/schemas.xml b/SDT/schema4.0/etc/schemas.xml
index 239fe56855cbe8beece56ae0739dae3ec4276b4e..9cfc9f9bbffee9ae36553c9fcc2fb63a8cd738b5 100644
--- a/SDT/schema4.0/etc/schemas.xml
+++ b/SDT/schema4.0/etc/schemas.xml
@@ -1,6 +1,6 @@
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
- <namespace ns="http://homegatewayinitiative.org/xml/dal/4.0" typeId="DAL"/>
+ <namespace ns="http://www.onem2m.org/xml/sdt/4.0" typeId="DAL"/>
<namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/>
<typeId id="DAL" uri="dal.rnc"/>
diff --git a/SDT/schema4.0/gen/html/EchonetLiteExamples.html b/SDT/schema4.0/gen/html/EchonetLiteExamples.html
index 34817ab33135df3c7897cb665788176a12298733..f5a448b3ac7334f79239612d477681f5260dc6fb 100644
--- a/SDT/schema4.0/gen/html/EchonetLiteExamples.html
+++ b/SDT/schema4.0/gen/html/EchonetLiteExamples.html
@@ -112,18 +112,21 @@
This property indicates whether the door/cover is open or closed.
+
Washing machine setting
+
This property indicates the current stage of the washing cycle.
+
@@ -139,6 +142,7 @@
Reservation ON/OFF
+
diff --git a/SDT/schema4.0/gen/html/dal-core.html b/SDT/schema4.0/gen/html/dal-core.html
index 4a9f90e5ad3f7a74a67a05f9d667d5fb6c02c1bb..4fbe82f7e7fd42d961bcc8e4a3dd3e2ba12130f3 100644
--- a/SDT/schema4.0/gen/html/dal-core.html
+++ b/SDT/schema4.0/gen/html/dal-core.html
@@ -1,31 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
-
-
- BooleanState is the preferred module for modelling a
- functionality corresponding to an underlying binary state. This
- module should be used to abstract away from the actual datatype
- and values in question. Note that the module does not define whether
- the execution mode is blocking or non-blocking.
-
-
-
- Obtain the current associated state.
-
+
+
+ BooleanState is the preferred module for modelling a
+ functionality corresponding to an underlying binary state. This
+ module should be used to abstract away from the actual datatype
+ and values in question. Note that the module does not define whether
+ the execution mode is blocking or non-blocking.
+
+
+
+ Obtain the current associated state.
+
+
+
+
+
+ Set the associated state to the specified value.
+
+
+ The desired value of the associated state.
+
+
+
+
+
+
+
+
-
-
- Set the associated state to the specified value.
-
-
-
- The desired value of the associated state.
-
-
-
-
-
-
diff --git a/SDT/schema4.0/gen/html/dal-eg.html b/SDT/schema4.0/gen/html/dal-eg.html
index 426e7f5102f39ed0484ca11175985e69428e216f..112efcc42754c294b295b2c75b0f26899c37cf4c 100644
--- a/SDT/schema4.0/gen/html/dal-eg.html
+++ b/SDT/schema4.0/gen/html/dal-eg.html
@@ -1,71 +1,54 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
-
-
-
-
-
-
-
-
-
-
-
- PowerSwitch
- Telekom Innovation Laboratories
-
-
-
- This device is intended as a demonstration of how to use the
- abstract modules defined in the HGI Core domain. The
- vendor has provided a proprietry module with two operations
- on and off. This is clearly a candidate for the
- module class BooleanState.
-
-
-
+
-
- The proprietry interface for turning the switch on and off.
- Actions for setting the state to on or off
- and for querying the state.
-
-
-
-
-
- Turn the switch on.
-
-
-
-
- Turn the switch off.
-
-
-
-
- Query the state of the switch. Returns the string "on"
- or "off".
-
-
-
-
-
-
-
-
-
-
- An event that indicates the new state of the switch.
-
-
-
-
+
+ This device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain. The vendor has provided a proprietry module with two operations on and off. This is clearly a candidate for the module class BooleanState.
+
+
+ Original value: PowerSwitch
+
+
+
+
+ Original value: Telekom Innovation Laboratories
+
+
+
+
+
+ The proprietry interface for turning the switch on and off. Actions for setting the state to on or offand for querying the state.
+
+
+ Turn the switch on.
+
+
+ Turn the switch off.
+
+
+ Query the state of the switch. Returns the string "on" or "off".
+
+
+
+
+
+
+
+ An event that indicates the new state of the switch.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/SDT/schema4.0/gen/html/mseeb.html b/SDT/schema4.0/gen/html/mseeb.html
index 0e01ea6f8d9816e8d4114ea9de2759619a54eebe..ee5115e769455ae24b45ecb8e61bbf12a44f7591 100644
--- a/SDT/schema4.0/gen/html/mseeb.html
+++ b/SDT/schema4.0/gen/html/mseeb.html
@@ -16,6 +16,9 @@
Obtain the current associated state.
+
+
+
@@ -23,7 +26,12 @@
- The desired value of the associated state.
+
+ The desired value of the associated state.
+
+
+
+
@@ -32,6 +40,9 @@
+
+
+
@@ -47,14 +58,29 @@
- Multi Socket Electrical-Extension-Block
- HGI
- 1.0
- http://www.homegatewayinitative.org
- 1234.5
+ This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
- This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
+
+ Original value: Multi Socket Electrical-Extension-Block
+
+
+
+ Original value: HGI
+
+
+
+ Original value: 1.0
+
+
+
+ Original value: http://www.homegatewayinitative.org
+
+
+
+ Original value: 1234.5
+
+
@@ -62,23 +88,84 @@
-
The proprietry interface for turning all switches of the extension block on and off.
The action "BooleanState:get" returns "true" when any of the sub-devices is in the state "on", otherwise it returns "false".
+
+
+
+ Version for this ModuleClass
+
+
+
+
+
+
+
+ Get the power consumption.
+
+
+
+
+
+ This is an example simple data type with a minimum-value constraint.
+
+
+
+ The value must be equal or greater 0.0
+
+
+ Steps are 0.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
This datapoint represents the firmware version of the extension block.
+
+
+
This datapoint is an array of strings with the names of the contained devices.
+
+
+
+
+
+
+
@@ -93,11 +180,15 @@
- PowerSwitch 1
- HGI
+ This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
- This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
+
+
+
+
+
+
@@ -110,11 +201,21 @@
- PowerSwitch 2
- HGI
+ This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
- This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SDT/schema4.0/src/domain.xsd b/SDT/schema4.0/src/domain.xsd
index b2e85762f033a8f2fefa73d65917f8f0555c8991..28b66b207f76bfd9ab1f4d98c268bceda4bb9735 100644
--- a/SDT/schema4.0/src/domain.xsd
+++ b/SDT/schema4.0/src/domain.xsd
@@ -9,8 +9,8 @@
- See the license text at [https://opensource.org/licenses/BSD-3-Clause for
- full details.
-->
-<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0"
- xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<xs:schema targetNamespace="http://www.onem2m.org/xml/sdt/4.0"
+ xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
diff --git a/SDT/schema4.0/style/html.xsl b/SDT/schema4.0/style/html.xsl
index 8492bede0498eaebf0ce370eebb95cee9af73311..6b2bcf2dea9d9bdf072de2af1a5287d8b7c0dcf4 100644
--- a/SDT/schema4.0/style/html.xsl
+++ b/SDT/schema4.0/style/html.xsl
@@ -8,7 +8,7 @@
document ... -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0"
+ xmlns:dal="http://www.onem2m.org/xml/sdt/4.0"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:redirect="http://xml.apache.org/xalan/redirect"
diff --git a/SDT/schema4.0/test/EchonetLiteExamples.xml b/SDT/schema4.0/test/EchonetLiteExamples.xml
index 738a17a1903880e64563f673df2aabf356920e0b..e87de7a63e29f9275de5db6a4592c2b17bac490c 100644
--- a/SDT/schema4.0/test/EchonetLiteExamples.xml
+++ b/SDT/schema4.0/test/EchonetLiteExamples.xml
@@ -3,7 +3,7 @@
<!-- Example SDT definition taken from EchonetLite https://github.com/ECHONET-Consortium -->
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example.based.on.echonetLite">
diff --git a/SDT/schema4.0/test/action-test.xml b/SDT/schema4.0/test/action-test.xml
index dcaeeb8e4d945e9cadee63b7ac0095ab8fab8ff9..a3d74fa6d9ec47b13e81612f999ff77ea1a0e62c 100644
--- a/SDT/schema4.0/test/action-test.xml
+++ b/SDT/schema4.0/test/action-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
-<Domain id="action-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="action-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestActions">
diff --git a/SDT/schema4.0/test/arg-test.xml b/SDT/schema4.0/test/arg-test.xml
index 1ab946844648b6f9dd4aae13003f1b56e36e7609..5d6261dd6b22120f7cdea8134d287abfe552383a 100644
--- a/SDT/schema4.0/test/arg-test.xml
+++ b/SDT/schema4.0/test/arg-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
-<Domain id="arg-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="arg-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestArg">
diff --git a/SDT/schema4.0/test/dal-core.xml b/SDT/schema4.0/test/dal-core.xml
index a2484100d1c6bdc3220eb985232770ed143b6712..e270b6f849c637866ba9d35a11f9c48da9de0fd1 100644
--- a/SDT/schema4.0/test/dal-core.xml
+++ b/SDT/schema4.0/test/dal-core.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
- id="hgi.dal.core">
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
+ id="dal.core">
<ModuleClasses>
<ModuleClass name="BooleanState">
diff --git a/SDT/schema4.0/test/dal-eg.xml b/SDT/schema4.0/test/dal-eg.xml
index 5361e6745088ceda70e5570f7378cb59701c1d61..a29d7e0a63af3177d38e9bd7de5a68338c402ccd 100644
--- a/SDT/schema4.0/test/dal-eg.xml
+++ b/SDT/schema4.0/test/dal-eg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<Domain id="com.telekom" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="com.telekom" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<Imports>
<xi:include href="./dal-core.xml" parse="xml"/>
</Imports>
diff --git a/SDT/schema4.0/test/datapoint-test.xml b/SDT/schema4.0/test/datapoint-test.xml
index 68d9be9faae7f315b0a7c696af016b3f80a05656..6100a5dec8126e2735960cf6fde3f1c06fce6cef 100644
--- a/SDT/schema4.0/test/datapoint-test.xml
+++ b/SDT/schema4.0/test/datapoint-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the EnumType -->
-<Domain id="datapoint-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="datapoint-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestDataPoint">
<Data>
diff --git a/SDT/schema4.0/test/datatypes-test.xml b/SDT/schema4.0/test/datatypes-test.xml
index a4ff3530dff8d02e84244363fa4a2ec6467ef910..b3f9d9ce4ccc6054a23e0d0d45417c8073196ba2 100644
--- a/SDT/schema4.0/test/datatypes-test.xml
+++ b/SDT/schema4.0/test/datatypes-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
-<Domain id="datatypes-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="datatypes-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<DataTypes>
<DataType name="temperatureType" unitOfMeasure="C">
<SimpleType type="float"/>
diff --git a/SDT/schema4.0/test/deviceClass-test.xml b/SDT/schema4.0/test/deviceClass-test.xml
index acecbc8cd76b864f5eae6f45b640072fad6bdea0..1500f3dfe006ca081f36fef665a790ef5e96a5c0 100644
--- a/SDT/schema4.0/test/deviceClass-test.xml
+++ b/SDT/schema4.0/test/deviceClass-test.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass.test" >
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass.test" >
<Imports>
<xi:include href="./dal-core.xml" parse="xml"/>
</Imports>
diff --git a/SDT/schema4.0/test/enumtype-test.xml b/SDT/schema4.0/test/enumtype-test.xml
index 2d92b51178fa44138632fbf3ca5250cdd09102f8..9a7da60bbdc8fb36724a38cb0ac6483f7d693550 100644
--- a/SDT/schema4.0/test/enumtype-test.xml
+++ b/SDT/schema4.0/test/enumtype-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the EnumType -->
-<Domain id="enumtype-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="enumtype-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestEnumType">
<Data>
diff --git a/SDT/schema4.0/test/example1.SDT.xml b/SDT/schema4.0/test/example1.SDT.xml
index a95cd00f25582795c294bdd6f2bdcc0e5e8e5aba..f263033e397e6d22b3c5bec6784ef2ee7137dafe 100644
--- a/SDT/schema4.0/test/example1.SDT.xml
+++ b/SDT/schema4.0/test/example1.SDT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example1.SDT">
diff --git a/SDT/schema4.0/test/example2.SDT.xml b/SDT/schema4.0/test/example2.SDT.xml
index ef4aacb4849d14566f88eabac93acd09165a64dd..0034465f79b61f48a665afd5768d5448c4fa2602 100644
--- a/SDT/schema4.0/test/example2.SDT.xml
+++ b/SDT/schema4.0/test/example2.SDT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example2.SDT">
diff --git a/SDT/schema4.0/test/example3.SDT.xml b/SDT/schema4.0/test/example3.SDT.xml
index 9cbb1c226828431a4843cbf969088b8cdcde085d..a3ce2605d45b7a066eca9481ecb32d6f6745839c 100644
--- a/SDT/schema4.0/test/example3.SDT.xml
+++ b/SDT/schema4.0/test/example3.SDT.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example3.SDT">
diff --git a/SDT/schema4.0/test/extends-test.xml b/SDT/schema4.0/test/extends-test.xml
index db1123652eea3d56da3f36fe8469688d93ffd4af..f7e8b884b3e56b6a72852a4fcab621352f6f1611 100644
--- a/SDT/schema4.0/test/extends-test.xml
+++ b/SDT/schema4.0/test/extends-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the extends element -->
-<Domain id="extend-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="extend-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestExtendsParent">
<Data>
diff --git a/SDT/schema4.0/test/mseeb.xml b/SDT/schema4.0/test/mseeb.xml
index b7b94389563ec39546bc9015c33a1e5ce99f793a..c729380aed91f7ffca0a21348eec5272f1a51a08 100644
--- a/SDT/schema4.0/test/mseeb.xml
+++ b/SDT/schema4.0/test/mseeb.xml
@@ -5,7 +5,7 @@
<!--
+................................................+
-:Domain:org.homegatewayinitiative :
+:Domain:org.onem2m :
: :
: +..........................................+ :
: :Module:BooleanState : :
@@ -62,8 +62,8 @@
-->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
- id="org.homegatewayinitiative">
+ xmlns="http://www.onem2m.org/xml/sdt/4.0"
+ id="org.onem2m">
<!-- The following import statements include ModuleClasses from HGI -->
@@ -139,7 +139,7 @@
<SimpleType type="string" />
</Property>
<Property name="VendorURL">
- <Doc>Original value: http://www.homegatewayinitative.org</Doc>
+ <Doc>Original value: http://www.onem2m.org</Doc>
<SimpleType type="uri" />
</Property>
<Property name="SerialNumber">
@@ -283,7 +283,7 @@
<Property name="Vendor" value="HGI">
<SimpleType type="string" />
</Property>
- <Property name="VendorURL" value="http://homegatwaysinitiative.org">
+ <Property name="VendorURL" value="http://www.onem2m.org">
<SimpleType type="uri" />
</Property>
<Property name="maximumAltitude" value="2800">
diff --git a/SDT/schema4.0/test/product-test.xml b/SDT/schema4.0/test/product-test.xml
index 99250ad3a139c49600b2c31aecf5b7759ff2535d..1ac16dda94ebf575df00e3cfe8eacd6c840fdd06 100644
--- a/SDT/schema4.0/test/product-test.xml
+++ b/SDT/schema4.0/test/product-test.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass-test" >
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass-test" >
<Products>
<Product id="TestProduct" semanticURI="http://example.com/TestProduct.rdf">
<Doc>This is a test product</Doc>
diff --git a/SDT/schema4.0/test/semanticURI-test.xml b/SDT/schema4.0/test/semanticURI-test.xml
index 0b3259c5245ef0af5c4c3766b92d0c4beb947da8..6fa7c2845a03863d89e6c2aa33df8d2d005fe72a 100644
--- a/SDT/schema4.0/test/semanticURI-test.xml
+++ b/SDT/schema4.0/test/semanticURI-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
-<Domain id="semanticURI-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
+<Domain id="semanticURI-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
<DataTypes>
<DataType name="temperatureType" unitOfMeasure="C" semanticURI="http://example.com/temperatureType.rdf">
<SimpleType type="float"/>
diff --git a/SDT/schema4.0/test/void-test.xml b/SDT/schema4.0/test/void-test.xml
index fc550af4ed731398378dfe02c7ef547472b3e806..32b836bf511f6508e17abbae2d09b4029a2b1fca 100644
--- a/SDT/schema4.0/test/void-test.xml
+++ b/SDT/schema4.0/test/void-test.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the void BasicType -->
-<Domain id="void-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="void-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestVoid">
<Actions>