--- a/3k/app/conntools/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/app/conntools/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
-   <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="services" levels="1 2">
     <collection name="nettools" long-name="Net Tools" level="2">
      <component name="conntest" long-name="Connection Test" origin-model="foundation">
       <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>

--- a/3k/app/techview/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/app/techview/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="techview" long-name="Techview" level="apps" span="2" levels="services ui utils apps1 apps2 apps3">
+<block name="techview" long-name="Techview" tech_domain="ui" level="apps" span="2" levels="services ui utils apps1 apps2 apps3">
     <collection name="buildverification" long-name="Build Verification" level="services">
      <component name="autosmoketest" long-name="Auto Smoke Test" filter="gt" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/app/techview/buildverification/autosmoketest/Group" mrp="/sf/app/techview/buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
@@ -46,4 +46,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/mw/opensrv/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/mw/opensrv/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
-<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="/sf/mw/opensrv/loudmouth/group"/>
@@ -50,4 +50,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/os/boardsupport/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/os/boardsupport/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <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="/sf/os/boardsupport/emulator/emulatorbsp" mrp="/sf/os/boardsupport/emulator/emulatorbsp/base_wins.mrp"/>
@@ -61,4 +61,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/os/buildtools/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/os/buildtools/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="buildtools" long-name="Build Tools" level="hw" levels="bld mw fw ui">
+<block name="buildtools" long-name="Build Tools" tech_domain="to" level="hw" levels="bld mw fw ui">
     <collection name="bldsystemtools" long-name="Build System Tools" level="bld">
      <component name="buildsystemtools" long-name="Build System Tools" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/buildtools/bldsystemtools/buildsystemtools/group" mrp="/sf/os/buildtools/bldsystemtools/buildsystemtools/group/tools_build.mrp"/>
@@ -320,4 +320,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/os/commsfw/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/os/commsfw/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<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="/sf/os/commsfw/commsinfrastructureapitest/commsinfrastructuresvs/group/commsinfrastructuresvs.mrp"/>
@@ -107,4 +107,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/os/kernelhwsrv/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/os/kernelhwsrv/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<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="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -179,4 +179,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/os/security/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/os/security/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<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="/sf/os/security/contentmgmt/contentaccessfwfordrm/group" mrp="/sf/os/security/contentmgmt/contentaccessfwfordrm/group/security_caf2.mrp"/>
@@ -63,4 +63,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>

--- a/3k/os/shortlinksrv/package_definition.xml	Thu Aug 20 13:55:42 2009 +0100
+++ b/3k/os/shortlinksrv/package_definition.xml	Fri Aug 21 12:47:10 2009 +0100
@@ -2,7 +2,7 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<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="/sf/os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
@@ -105,4 +105,4 @@
    </block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>