From 8103002b53156a6b0b86978fa18bca0d470f3ca1 Mon Sep 17 00:00:00 2001
From: ankraft <an.kraft@googlemail.com>
Date: Mon, 6 May 2019 17:47:07 +0200
Subject: [PATCH] Changed namespace to http://www.onem2m.org/xml/sdt/4.0

---
 SDT/schema4.0/build.xml                       |   2 +-
 SDT/schema4.0/etc/dal.rnc                     |   2 +-
 SDT/schema4.0/etc/schema.xmlns                |   4 +-
 SDT/schema4.0/etc/schemas.xml                 |   2 +-
 .../gen/html/EchonetLiteExamples.html         |   4 +
 SDT/schema4.0/gen/html/dal-core.html          |  54 ++++----
 SDT/schema4.0/gen/html/dal-eg.html            | 115 +++++++---------
 SDT/schema4.0/gen/html/mseeb.html             | 129 ++++++++++++++++--
 SDT/schema4.0/src/domain.xsd                  |   4 +-
 SDT/schema4.0/style/html.xsl                  |   2 +-
 SDT/schema4.0/test/EchonetLiteExamples.xml    |   2 +-
 SDT/schema4.0/test/action-test.xml            |   2 +-
 SDT/schema4.0/test/arg-test.xml               |   2 +-
 SDT/schema4.0/test/dal-core.xml               |   4 +-
 SDT/schema4.0/test/dal-eg.xml                 |   2 +-
 SDT/schema4.0/test/datapoint-test.xml         |   2 +-
 SDT/schema4.0/test/datatypes-test.xml         |   2 +-
 SDT/schema4.0/test/deviceClass-test.xml       |   2 +-
 SDT/schema4.0/test/enumtype-test.xml          |   2 +-
 SDT/schema4.0/test/example1.SDT.xml           |   2 +-
 SDT/schema4.0/test/example2.SDT.xml           |   2 +-
 SDT/schema4.0/test/example3.SDT.xml           |   2 +-
 SDT/schema4.0/test/extends-test.xml           |   2 +-
 SDT/schema4.0/test/mseeb.xml                  |  10 +-
 SDT/schema4.0/test/product-test.xml           |   2 +-
 SDT/schema4.0/test/semanticURI-test.xml       |   2 +-
 SDT/schema4.0/test/void-test.xml              |   2 +-
 27 files changed, 226 insertions(+), 136 deletions(-)

diff --git a/SDT/schema4.0/build.xml b/SDT/schema4.0/build.xml
index 3f5101f..55bf640 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 e9c05ee..bdf78c4 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 d38050c..159f7ed 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 239fe56..9cfc9f9 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 34817ab..f5a448b 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 4a9f90e..4fbe82f 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 426e7f5..112efcc 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 0e01ea6..ee5115e 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 b2e8576..28b66b2 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 8492bed..6b2bcf2 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 738a17a..e87de7a 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 dcaeeb8..a3d74fa 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 1ab9468..5d6261d 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 a248410..e270b6f 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 5361e67..a29d7e0 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 68d9be9..6100a5d 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 a4ff353..b3f9d9c 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 acecbc8..1500f3d 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 2d92b51..9a7da60 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 a95cd00..f263033 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 ef4aacb..0034465 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 9cbb1c2..a3ce260 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 db11236..f7e8b88 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 b7b9438..c729380 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 99250ad..1ac16dd 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 0b3259c..6fa7c28 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 fc550af..32b836b 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>
-- 
GitLab