--- a/foundation/sysdefs/system_model.xml	Wed Aug 12 12:46:09 2009 +0100
+++ b/foundation/sysdefs/system_model.xml	Thu Aug 13 19:29:23 2009 +0100
@@ -295,7 +295,7 @@
      </component>
     </collection>
    </block>
-   <block name="conntools" long-name="Conn Tools" tech_domain="to" level="generic" levels="1 2">
+   <block name="conntools" long-name="Conn Tools" tech_domain="dc" level="generic" levels="1 2">
     <collection name="nettools" long-name="Net Tools" level="2">
      <component name="conntest" long-name="Connection Test" origin-model="foundation">
       <unit bldFile="app/conntools/nettools/conntest/group"/>
@@ -5603,7 +5603,7 @@
      </component>
     </collection>
    </block>
-   <block name="opensrv" long-name="Open Services" tech_domain="rt" level="specific" levels="prt lib server eng">
+   <block name="opensrv" long-name="Open Services" tech_domain="pr" level="specific" levels="prt lib server eng">
     <collection name="loudmouth" long-name="Loudmouth" level="prt">
      <component name="loudmouth_build" origin-model="foundation">
       <unit bldFile="mw/opensrv/loudmouth/group"/>
@@ -7316,7 +7316,7 @@
    </block>
   </layer>
   <layer name="os" long-name="OS" levels="hw services">
-   <block name="boardsupport" long-name="Board Support" level="hw" levels="bsp test 2 3 4">
+   <block name="boardsupport" long-name="Board Support" tech_domain="hb" level="hw" levels="bsp test 2 3 4">
     <collection name="emulator" long-name="Emulator" level="bsp">
      <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/boardsupport/emulator/emulatorbsp" mrp="os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
@@ -7871,7 +7871,7 @@
      </component>
     </collection>
    </block>
-   <block name="commsfw" long-name="Communications Framework" level="services" levels="server support framework process app-if">
+   <block name="commsfw" long-name="Communications Framework" tech_domain="dc" level="services" levels="server support framework process app-if">
     <collection name="commsinfrastructureapitest" long-name="Comms-Infras API Tests" level="app-if">
      <component name="commsinfrastructuresvs" long-name="Comms Infrastructure Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
@@ -8480,7 +8480,7 @@
      </component>
     </collection>
    </block>
-   <block name="kernelhwsrv" long-name="Kernel and Hardware Services" level="hw" levels="hw-if adaptation framework test">
+   <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" level="hw" levels="hw-if adaptation framework test">
     <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
      <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -9377,7 +9377,7 @@
      </component>
     </collection>
    </block>
-   <block name="security" long-name="OS Security" level="services" levels="physical-abstraction plugins libraries management services utilities">
+   <block name="security" long-name="OS Security" tech_domain="se" level="services" levels="physical-abstraction plugins libraries management services utilities">
     <collection name="contentmgmt" long-name="Content Management" level="utilities">
      <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/security/contentmgmt/contentaccessfwfordrm/group" mrp="os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
@@ -9436,7 +9436,7 @@
      </component>
     </collection>
    </block>
-   <block name="shortlinksrv" long-name="Short Link Services" level="services" levels="adaptation hw-if plugin framework server app-if">
+   <block name="shortlinksrv" long-name="Short Link Services" tech_domain="de" level="services" levels="adaptation hw-if plugin framework server app-if">
     <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
      <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>