--- a/3k/app/conntools/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/app/conntools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
-  <layer name="app" long-name="Middleware" levels="generic specific">
+  <layer name="app" long-name="Applications" levels="services apps">
    <block name="conntools" long-name="Conn Tools" tech_domain="to" level="generic" levels="1 2">
     <collection name="nettools" long-name="Net Tools" level="2">
      <component name="conntest" long-name="Connection Test" origin-model="foundation">

--- a/3k/app/techview/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/app/techview/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -2,9 +2,9 @@
 <SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="app" long-name="Applications" levels="services apps">
-<block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">
+<block name="techview" long-name="Techview" 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" purpose="development" introduced="9.1" plugin="N" origin-model="Symbian">
+     <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"/>
      </component>
      <component name="smoketest" long-name="Smoke Test" filter="gt" purpose="development" plugin="N" origin-model="Symbian">

--- a/3k/mw/appinstall/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/mw/appinstall/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -67,7 +67,7 @@
 	 <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
 	  <unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
 	 </component>
-	 <component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
+	 <component name="switestfw" long-name="Software Install Test Framework" introduced="7.0" deprecated="tb92" purpose="development">
 	  <unit bldFile="/sf/mw/appinstall/installationservices/switestfw/group" mrp="/sf/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
 	 </component>
 	 <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">

--- a/3k/mw/helix/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/mw/helix/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="helix" long-name="Helix" tech_domain="mm" level="generic" levels="plugin framework server generic specific">

--- a/3k/mw/ipappprotocols/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/mw/ipappprotocols/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -38,12 +38,12 @@
       <!-- Real Time Data Protocol -->
       <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/rtp/group" mrp="/sf/mw/ipappprotocols/realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
      </component>
-     <component name="sipfw" long-name="SIP Framework" introduced="9.2" filter="gt" purpose="optional" plugin="N" origin-model="Symbian">
+     <component name="sipfw" long-name="SIP Framework" filter="gt" introduced="9.2" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group" mrp="/sf/mw/ipappprotocols/realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp" version="2"/>
      </component>
     </collection>
     <collection name="sipproviderplugins" long-name="SIP Provider Plugins" level="conn">
-     <component name="sipprovider" long-name="SIP Provider" introduced="tb91" filter="gt" purpose="optional" plugin="Y" origin-model="Symbian">
+     <component name="sipprovider" long-name="SIP Provider" filter="gt" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group" mrp="/sf/mw/ipappprotocols/sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
      </component>
     </collection>

--- a/3k/os/boardsupport/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/boardsupport/package_definition.xml	Fri Aug 07 16:35:35 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" level="hw" long-name="Board Support" levels="bsp test 2 3 4">
+<block name="boardsupport" long-name="Board Support" 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"/>

--- a/3k/os/buildtools/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/buildtools/package_definition.xml	Fri Aug 07 16:35:35 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" level="hw" long-name="Build Tools" levels="bld mw fw ui">
+<block name="buildtools" long-name="Build Tools" 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"/>

--- a/3k/os/commsfw/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/commsfw/package_definition.xml	Fri Aug 07 16:35:35 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" level="services" long-name="Communications Framework" levels="server support framework process app-if">
+<block name="commsfw" long-name="Communications Framework" 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"/>
@@ -46,7 +46,7 @@
      </component>
     </collection>
     <collection name="serialserver" long-name="Serial Server" level="server">
-     <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" plugin="Y" class="placeholder" origin-model="Symbian">
+     <component name="serialportcsy" long-name="Serial Port CSY" introduced="ER5" purpose="optional" class="placeholder" plugin="Y" origin-model="Symbian">
       <!-- placeholder for ser-comms_serialportcsy, currently built by C32 -->
      </component>
      <component name="packetloopbackcsy" long-name="Packet Loopback CSY" introduced="8.1" purpose="development" plugin="N" origin-model="Symbian">

--- a/3k/os/kernelhwsrv/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/kernelhwsrv/package_definition.xml	Fri Aug 07 16:35:35 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" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<block name="kernelhwsrv" long-name="Kernel and Hardware Services" 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"/>

--- a/3k/os/persistentdata/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/persistentdata/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -24,7 +24,7 @@
      <component name="filelogger" long-name="File Logger" introduced="ER5" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/persistentdata/loggingservices/filelogger/group" mrp="/sf/os/persistentdata/loggingservices/filelogger/group/comms-infras_flogger.mrp"/>
      </component>
-     <component name="rfilelogger" long-name="RFile Logger" deprecated="tb92" introduced="9.1" purpose="development" plugin="N" origin-model="Symbian">
+     <component name="rfilelogger" long-name="RFile Logger" introduced="9.1" deprecated="tb92" purpose="development" plugin="N" origin-model="Symbian">
       <unit bldFile="/sf/os/persistentdata/loggingservices/rfilelogger/group" mrp="/sf/os/persistentdata/loggingservices/rfilelogger/group/testtools_utilities.mrp"/>
      </component>
     </collection>

--- a/3k/os/security/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/security/package_definition.xml	Fri Aug 07 16:35:35 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" level="services" long-name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
+<block name="security" long-name="OS Security" 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"/>

--- a/3k/os/shortlinksrv/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/shortlinksrv/package_definition.xml	Fri Aug 07 16:35:35 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" level="services" long-name="Short Link Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="shortlinksrv" long-name="Short Link Services" 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"/>

--- a/3k/os/textandloc/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/os/textandloc/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -10,7 +10,7 @@
      <component name="charconvplugin" long-name="Charconv Plugin" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/charconvplugin/group"/>
      </component>
-     <component name="charconv_fw" origin-model="foundation" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N">
+     <component name="charconv_fw" long-name="Character Encoding and Conversion Framework" purpose="optional" plugin="N" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/charconv_fw/group" mrp="/sf/os/textandloc/charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
      </component>
      <!--Component manually removed and merged to OS-->
@@ -58,7 +58,7 @@
       <unit mrp="/sf/os/textandloc/textrendering/word/group/app-framework_word.mrp"/>
      </component>
     </collection>
-    <collection name="textandlocutils" level="util" long-name="Text and Localisation Utils">
+    <collection name="textandlocutils" long-name="Text and Localisation Utils" level="util">
      <component name="localizer" long-name="Localizer" origin-model="foundation">
       <unit bldFile="/sf/os/textandloc/charconvfw/localizer/group"/>
      </component>

--- a/3k/tools/homescreentools/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/tools/homescreentools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
   <layer name="tools" long-name="Tools">
    <block name="homescreentools" long-name="Home Screen Tools" tech_domain="ui" level="services" levels="tool install">

--- a/3k/tools/platformtools/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/tools/platformtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
-  <layer name="tools">
+<layer name="tools" long-name="Tools">
    <block name="platformtools" long-name="Platform Tools" tech_domain="to" level="generic">
     <collection name="gfxconversion" long-name="Graphics Conversion">
      <component name="bmconv_s60" long-name="Bm Conv S60" origin-model="foundation">

--- a/3k/tools/rndtools/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/tools/rndtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition>
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
-  <layer name="tools">
+<layer name="tools" long-name="Tools">
    <block name="rndtools" long-name="RD tools" tech_domain="to" level="services" levels="app generic specific">
     <collection name="creator" long-name="Creator" level="app">
      <component name="creator_build" origin-model="foundation">

--- a/3k/tools/swconfigtools/package_definition.xml	Fri Aug 07 14:27:31 2009 +0100
+++ b/3k/tools/swconfigtools/package_definition.xml	Fri Aug 07 16:35:35 2009 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
  <systemModel>
-  <layer name="tools">
+<layer name="tools" long-name="Tools">
    <block name="swconfigtools" long-name="Software Config Tools" tech_domain="to" level="services">
     <collection name="gid_pc_tool" long-name="GID PC Tool">
      <component name="dbimporter" long-name="DB Importer" origin-model="foundation">