# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1287486112 -3600
# Node ID ba76cab9ae36792553e5bb356180438ef67be8cd
# Parent  a9b10571503add34f99a515c9d1a6aaa9ba05b05
Changed sf/adaptation to sf/adapt in metadata

diff -r a9b10571503a -r ba76cab9ae36 symbian3/micro/sysdefs/system_model.xml
--- a/symbian3/micro/sysdefs/system_model.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian3/micro/sysdefs/system_model.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -53,7 +53,7 @@
      </component>
     </collection>
    </block>
-   <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" 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 adapt 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"/>
@@ -86,7 +86,7 @@
       <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
      </component>
     </collection>
-    <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+    <collection name="kernel" long-name="Kernel Architecture" level="adapt">
      <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
      </component>
@@ -106,7 +106,7 @@
       <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
      </component>
     </collection>
-    <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+    <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
      <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
      </component>
diff -r a9b10571503a -r ba76cab9ae36 symbian3/micro/sysdefs/system_model_os.xml
--- a/symbian3/micro/sysdefs/system_model_os.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian3/micro/sysdefs/system_model_os.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -53,7 +53,7 @@
      </component>
     </collection>
    </block>
-   <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" 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 adapt 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"/>
@@ -86,7 +86,7 @@
       <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
      </component>
     </collection>
-    <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+    <collection name="kernel" long-name="Kernel Architecture" level="adapt">
      <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
      </component>
@@ -106,7 +106,7 @@
       <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
      </component>
     </collection>
-    <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+    <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
      <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
      </component>
diff -r a9b10571503a -r ba76cab9ae36 symbian3/micro/sysdefs/system_model_s60.xml
--- a/symbian3/micro/sysdefs/system_model_s60.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian3/micro/sysdefs/system_model_s60.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -53,7 +53,7 @@
      </component>
     </collection>
    </block>
-   <block name="kernelhwsrv" long-name="Kernel and Hardware Services" tech_domain="hb" 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 adapt 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"/>
@@ -86,7 +86,7 @@
       <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
      </component>
     </collection>
-    <collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+    <collection name="kernel" long-name="Kernel Architecture" level="adapt">
      <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
      </component>
@@ -106,7 +106,7 @@
       <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
      </component>
     </collection>
-    <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+    <collection name="ldds" long-name="Logical Device Drivers" level="adapt">
      <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
      </component>
diff -r a9b10571503a -r ba76cab9ae36 symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><SystemDefinition id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
 <systemModel name="Symbian^3">
-<layer id="adaptation" name="Adaptation" levels="low mw high">
+<layer id="adapt" name="Adaptation" levels="low mw high">
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
 <collection id="s60_stubs" level="stub">
 <component id="audiostubs" name="Audio Stubs">
@@ -60,7 +60,7 @@
 </package>
 </layer>
 <layer id="os" name="OS" levels="hw services">
-<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adapt framework test">
 <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
 <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
 <unit mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -71,7 +71,7 @@
 <unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection id="kernel" name="Kernel Architecture" level="adaptation">
+<collection id="kernel" name="Kernel Architecture" level="adapt">
 <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -87,7 +87,7 @@
 <unit bldFile="/os/kernelhwsrv/kerneltest/f32test/group" mrp="/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection id="ldds" name="Logical Device Drivers" level="adaptation">
+<collection id="ldds" name="Logical Device Drivers" level="adapt">
 <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
 <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -664,7 +664,7 @@
 </component>
 </collection>
 </package>
-<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="featuremgmt" name="Feature Management" level="framework">
 <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -715,7 +715,7 @@
 </component>
 </collection>
 </package>
-<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
 <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
 <unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
@@ -1178,7 +1178,7 @@
 </component>
 </collection>
 </package>
-<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
 <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
 <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1199,7 +1199,7 @@
 <unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
 </component>
 </collection>
-<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+<collection id="datasourceadaptation" name="Data Source Adaptation" level="adapt">
 <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -1237,7 +1237,7 @@
 <unit bldFile="/os/lbs/locationmgmt/networkgateway/group" mrp="/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
 <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1355,7 +1355,7 @@
 </component>
 </collection>
 </package>
-<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
 <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1603,13 +1603,13 @@
 </component>
 </collection>
 </package>
-<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
 <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adapt">
 <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
 <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -1712,7 +1712,7 @@
 <unit mrp="/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
 <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
 <unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1734,7 +1734,7 @@
 </component>
 </collection>
 </package>
-<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
 <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
 <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
 <unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
@@ -1827,7 +1827,7 @@
 </component>
 </collection>
 </package>
-<package id="usb" level="services" tech-domain="de" name="USB" levels="adaptation hw-if plugin framework server app-if">
+<package id="usb" level="services" tech-domain="de" name="USB" levels="adapt hw-if plugin framework server app-if">
 <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
@@ -1848,7 +1848,7 @@
 </component>
 </collection>
 </package>
-<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
 <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
 <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_pub/audio_effects_api/group"/>
@@ -2213,7 +2213,7 @@
 <unit bldFile="/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+<collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adapt">
 <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
 <unit bldFile="/os/mm/mmswadaptation/videorenderer/group" mrp="/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -2284,7 +2284,7 @@
 <unit bldFile="/os/mm/devsound/a3fsrvstart/group" mrp="/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2308,7 +2308,7 @@
 </component>
 </collection>
 </package>
-<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
 <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
 <component id="exif_api" name="Exif API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2357,8 +2357,8 @@
 </component>
 </collection>
 </package>
-<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adapt engines internal-adaptations device-interface internal-utils app-if">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
 <component id="vgi" filter="s60" name="VGI">
 <unit bldFile="/os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
@@ -2381,7 +2381,7 @@
 <unit bldFile="/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r a9b10571503a -r ba76cab9ae36 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -75,7 +75,7 @@
 ]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
 <collection name="s60_stubs" level="stub">
 <component name="audiostubs" long-name="Audio Stubs">
@@ -195,7 +195,7 @@
 </block>
 </layer>
 <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" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adapt framework test">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -206,7 +206,7 @@
 <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
 <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -222,7 +222,7 @@
 <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -788,7 +788,7 @@
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -839,7 +839,7 @@
 </component>
 </collection>
 </block>
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="devicesrv" level="services" long-name="Device Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" class="api">
 <unit bldFile="os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
@@ -1285,7 +1285,7 @@
 </component>
 </collection>
 </block>
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1306,7 +1306,7 @@
 <unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -1341,7 +1341,7 @@
 <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1460,7 +1460,7 @@
 </component>
 </collection>
 </block>
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="commsdb" long-name="Comms DB" level="server">
 <component name="s60_commsdb" filter="s60" long-name="S60 Commsdb" class="config">
 <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
@@ -1688,13 +1688,13 @@
 </component>
 </collection>
 </block>
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adapt">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
 <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -1791,7 +1791,7 @@
 <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
 <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1803,7 +1803,7 @@
 </component>
 </collection>
 </block>
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<block name="bt" level="services" long-name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
 <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" class="api">
 <unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
@@ -1886,7 +1886,7 @@
 </component>
 </collection>
 </block>
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
@@ -1904,7 +1904,7 @@
 </component>
 </collection>
 </block>
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" class="api">
 <unit bldFile="os/mm/mm_pub/audio_effects_api/group"/>
@@ -2251,7 +2251,7 @@
 <unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
 <unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -2300,7 +2300,7 @@
 <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/hwdevapi/group" mrp="os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2321,7 +2321,7 @@
 </component>
 </collection>
 </block>
-<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<block name="imagingext" level="services" long-name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" class="api">
 <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2368,8 +2368,8 @@
 </component>
 </collection>
 </block>
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" long-name="Graphics" levels="adapt engines internal-adaptations device-interface internal-utils app-if">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
 <component name="vgi" filter="s60" long-name="VGI">
 <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
@@ -2392,7 +2392,7 @@
 <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r a9b10571503a -r ba76cab9ae36 symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition xmlns:qt="http://www.nokia.com/qt" id-namespace="http://www.symbian.org/system-definition" schema="3.0.0">
 <systemModel name="Symbian^3">
-<layer id="adaptation" name="Adaptation" levels="low mw high">
+<layer id="adapt" name="Adaptation" levels="low mw high">
 <package id="stubs" tech-domain="hb" level="high" name="Stubs" levels="stub">
 <collection id="s60_stubs" level="stub">
 <component id="audiostubs" name="Audio Stubs">
@@ -61,7 +61,7 @@
 </package>
 </layer>
 <layer id="os" name="OS" levels="hw services">
-<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<package id="kernelhwsrv" level="hw" tech-domain="hb" name="Kernel and Hardware Services" levels="hw-if adapt framework test">
 <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
 <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
 <unit mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -72,7 +72,7 @@
 <unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection id="kernel" name="Kernel Architecture" level="adaptation">
+<collection id="kernel" name="Kernel Architecture" level="adapt">
 <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -88,7 +88,7 @@
 <unit bldFile="/os/kernelhwsrv/kerneltest/f32test/group" mrp="/os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection id="ldds" name="Logical Device Drivers" level="adaptation">
+<collection id="ldds" name="Logical Device Drivers" level="adapt">
 <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
 <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -659,7 +659,7 @@
 </component>
 </collection>
 </package>
-<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="persistentdata" level="services" tech-domain="hb" name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="featuremgmt" name="Feature Management" level="framework">
 <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -710,7 +710,7 @@
 </component>
 </collection>
 </package>
-<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="devicesrv" level="services" tech-domain="hb" name="Device Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
 <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
 <unit bldFile="/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group"/>
@@ -1164,7 +1164,7 @@
 </component>
 </collection>
 </package>
-<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<package id="lbs" level="services" tech-domain="lo" name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
 <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
 <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1185,7 +1185,7 @@
 <unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
 </component>
 </collection>
-<collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+<collection id="datasourceadaptation" name="Data Source Adaptation" level="adapt">
 <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -1221,7 +1221,7 @@
 <unit bldFile="/os/lbs/locationmgmt/networkgateway/group" mrp="/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+<collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
 <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1333,7 +1333,7 @@
 </component>
 </collection>
 </package>
-<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="networkingsrv" level="services" tech-domain="dc" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
 <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1555,13 +1555,13 @@
 </component>
 </collection>
 </package>
-<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<package id="cellularsrv" level="services" tech-domain="vc" name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
 <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
 <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+<collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adapt">
 <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
 <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -1660,7 +1660,7 @@
 <unit mrp="/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+<collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
 <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
 <unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1676,10 +1676,10 @@
 </component>
 </collection>
 </package>
-<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<package id="bt" level="services" tech-domain="de" name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
 <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
-<component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
-<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio adapt API" class="api" filter="s60">
+<unit bldFile="/os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
 </component>
 <component id="bluetooth_power_management_api" name="Bluetooth Power Management API" class="api" filter="s60">
 <unit bldFile="/os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1763,7 +1763,7 @@
 </component>
 </collection>
 </package>
-<package id="usb" level="services" tech-domain="de" name="USB" levels="adaptation hw-if plugin framework server app-if">
+<package id="usb" level="services" tech-domain="de" name="USB" levels="adapt hw-if plugin framework server app-if">
 <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
 <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
 </collection>
@@ -1782,7 +1782,7 @@
 </component>
 </collection>
 </package>
-<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<package id="mm" level="services" tech-domain="mm" name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
 <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
 <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
 <unit bldFile="/os/mm/mm_pub/audio_effects_api/group"/>
@@ -2135,7 +2135,7 @@
 <unit bldFile="/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+<collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adapt">
 <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
 <unit bldFile="/os/mm/mmswadaptation/videorenderer/group" mrp="/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -2192,7 +2192,7 @@
 <unit bldFile="/os/mm/devsound/a3fsrvstart/group" mrp="/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2214,7 +2214,7 @@
 
 </collection>
 </package>
-<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+<package id="imagingext" level="services" tech-domain="mm" name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
 <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
 <component id="exif_api" name="Exif API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2263,8 +2263,8 @@
 </component>
 </collection>
 </package>
-<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+<package id="graphics" level="services" tech-domain="ui" name="Graphics" levels="adapt engines internal-adaptations device-interface internal-utils app-if">
+<collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
 <component id="vgi" filter="s60" name="VGI">
 <unit bldFile="/os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
@@ -2287,7 +2287,7 @@
 <unit bldFile="/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+<collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r a9b10571503a -r ba76cab9ae36 symbian4/single/sysdefs/system_model.good.xml
--- a/symbian4/single/sysdefs/system_model.good.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.good.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -75,9 +75,9 @@
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" levels="adapt plugin mid engine" long-name="Stubs">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
 <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
@@ -115,7 +115,7 @@
 <unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
 <unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
@@ -269,8 +269,8 @@
 </component>
 </collection>
 </block>
-<block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
-<collection name="omxilcomp" long-name="OpenMAX IL Components" level="adaptation">
+<block name="openmaxil.nokia" level="mw" levels="adapt hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
+<collection name="omxilcomp" long-name="OpenMAX IL Components" level="adapt">
 <component name="omxilgeneric" long-name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
 </component>
@@ -284,7 +284,7 @@
 </block>
 </layer>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
+<block name="kernelhwsrv" level="hw" levels="hw-if adapt framework test" long-name="Kernel and Hardware Services">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -295,7 +295,7 @@
 <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
 <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -317,7 +317,7 @@
 <unit bldFile="os/kernelhwsrv/kerneltest/f32test/loader" mrp="os/kernelhwsrv/kerneltest/f32test/loader/base_loader.mrp"/>
 </component>
 </collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -723,7 +723,7 @@
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
+<block name="persistentdata" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Persistent Data Services">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -774,7 +774,7 @@
 </component>
 </collection>
 </block>
-<block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
+<block name="devicesrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Device Services">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" purpose="optional" class="api">
 <!-- this needs to be moved to deviceplatformrelease -->
@@ -1227,7 +1227,7 @@
 </component>
 </collection>
 </block>
-<block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
+<block name="lbs" level="services" levels="hw-if data-acquisition adapt management application-interface" long-name="Locating Services">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1248,7 +1248,7 @@
 <unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -1283,7 +1283,7 @@
 <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1393,7 +1393,7 @@
 </component>
 </collection>
 </block>
-<block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
+<block name="networkingsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Networking Services">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1595,13 +1595,13 @@
 </component>
 </collection>
 </block>
-<block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
+<block name="cellularsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adapt">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
 <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -1690,7 +1690,7 @@
 <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
 <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1703,7 +1703,7 @@
 </component>
 </collection>
 </block>
-<block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
+<block name="bt" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Bluetooth">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
 <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
@@ -1791,7 +1791,7 @@
 </component>
 </collection>
 </block>
-<block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
+<block name="usb" level="services" levels="adapt hw-if plugin framework server app-if" long-name="USB">
 <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
 <!-- placeholder for platform APIs -->
 </collection>
@@ -1812,7 +1812,7 @@
 </component>
 </collection>
 </block>
-<block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
+<block name="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -2157,7 +2157,7 @@
 <unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
 <unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -2189,7 +2189,7 @@
 <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/hwdevapi/group" mrp="os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2210,7 +2210,7 @@
 </component>
 </collection>
 </block>
-<block name="mmimaging" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia Imaging">
+<block name="mmimaging" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia Imaging">
 <collection name="imaging" long-name="Imaging Frameworks and Plugins" level="app-if">
 <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
 <unit bldFile="os/mmimaging/imaging/imagingfws/group" mrp="os/mmimaging/imaging/imagingfws/group/multimedia_icl.mrp"/>
@@ -2224,7 +2224,7 @@
 </collection>
 <collection name="imagingtestenv" long-name="Imaging Test Environment" level="device-fw"/>
 </block>
-<block name="openmaxil" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="openmaxil" level="services" levels="adapt hw-if device-fw devices middleware app-if">
 <collection name="openmaxil_plat" long-name="OpenMAX IL Platform Exports" level="hw-if">
 <component name="openmaxil_khronos_api" long-name="OpenMAX IL API" introduced="^3" purpose="mandatory" class="api">
 <unit bldFile="os/openmaxil/openmaxil_plat/khronos_api/group" version="1"/>
@@ -2253,7 +2253,7 @@
 </component>
 </collection>
 </block>
-<block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
+<block name="imagingext" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Imaging Extensions">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2300,8 +2300,8 @@
 </component>
 </collection>
 </block>
-<block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" levels="adapt engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
 <component name="vgi" long-name="VGI" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
@@ -2330,7 +2330,7 @@
 <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r a9b10571503a -r ba76cab9ae36 symbian4/single/sysdefs/system_model.surge.xml
--- a/symbian4/single/sysdefs/system_model.surge.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.surge.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -74,9 +74,9 @@
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^4">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" levels="adapt plugin mid engine" long-name="Stubs">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
 <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
@@ -114,7 +114,7 @@
 <unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
 <unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
@@ -194,7 +194,7 @@
 </block>
 </layer>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
+<block name="kernelhwsrv" level="hw" levels="hw-if adapt framework test" long-name="Kernel and Hardware Services">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -205,7 +205,7 @@
 <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
 <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -221,7 +221,7 @@
 <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -633,7 +633,7 @@
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
+<block name="persistentdata" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Persistent Data Services">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -684,7 +684,7 @@
 </component>
 </collection>
 </block>
-<block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
+<block name="devicesrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Device Services">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" purpose="optional" class="api">
 <!-- this needs to be moved to deviceplatformrelease -->
@@ -1135,7 +1135,7 @@
 </component>
 </collection>
 </block>
-<block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
+<block name="lbs" level="services" levels="hw-if data-acquisition adapt management application-interface" long-name="Locating Services">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1156,7 +1156,7 @@
 <unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -1191,7 +1191,7 @@
 <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1301,7 +1301,7 @@
 </component>
 </collection>
 </block>
-<block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
+<block name="networkingsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Networking Services">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1503,13 +1503,13 @@
 </component>
 </collection>
 </block>
-<block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
+<block name="cellularsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adapt">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
 <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -1598,7 +1598,7 @@
 <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
 <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1611,7 +1611,7 @@
 </component>
 </collection>
 </block>
-<block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
+<block name="bt" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Bluetooth">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
 <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
@@ -1699,7 +1699,7 @@
 </component>
 </collection>
 </block>
-<block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
+<block name="usb" level="services" levels="adapt hw-if plugin framework server app-if" long-name="USB">
 <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
 <!-- placeholder for platform APIs -->
 </collection>
@@ -1720,7 +1720,7 @@
 </component>
 </collection>
 </block>
-<block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
+<block name="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -2071,7 +2071,7 @@
 <unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
 <unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -2120,7 +2120,7 @@
 <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/hwdevapi/group" mrp="os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2141,7 +2141,7 @@
 </component>
 </collection>
 </block>
-<block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
+<block name="imagingext" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Imaging Extensions">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2188,8 +2188,8 @@
 </component>
 </collection>
 </block>
-<block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" levels="adapt engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
 <component name="vgi" long-name="VGI" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
@@ -2218,7 +2218,7 @@
 <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r a9b10571503a -r ba76cab9ae36 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -75,9 +75,9 @@
 ]>
 <SystemDefinition name="Symbian^4" schema="2.0.1">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" levels="adapt plugin mid engine" long-name="Stubs">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
 <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
@@ -115,7 +115,7 @@
 <unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
 </component>
 </collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
 <unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
@@ -269,8 +269,8 @@
 </component>
 </collection>
 </block>
-<block name="openmaxil.nokia" level="mw" levels="adaptation hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
-<collection name="omxilcomp" long-name="OpenMAX IL Components" level="adaptation">
+<block name="openmaxil.nokia" level="mw" levels="adapt hw-if device-fw" long-name="Nokia OpenMAX IL Adaptation">
+<collection name="omxilcomp" long-name="OpenMAX IL Components" level="adapt">
 <component name="omxilgeneric" long-name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" plugin="Y">
 <unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
 </component>
@@ -284,7 +284,7 @@
 </block>
 </layer>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
+<block name="kernelhwsrv" level="hw" levels="hw-if adapt framework test" long-name="Kernel and Hardware Services">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -295,7 +295,7 @@
 <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
 <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -317,7 +317,7 @@
 <unit bldFile="os/kernelhwsrv/kerneltest/f32test/loader" mrp="os/kernelhwsrv/kerneltest/f32test/loader/base_loader.mrp"/>
 </component>
 </collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -723,7 +723,7 @@
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
+<block name="persistentdata" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Persistent Data Services">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -774,7 +774,7 @@
 </component>
 </collection>
 </block>
-<block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
+<block name="devicesrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Device Services">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" purpose="optional" class="api">
 <!-- this needs to be moved to deviceplatformrelease -->
@@ -1227,7 +1227,7 @@
 </component>
 </collection>
 </block>
-<block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
+<block name="lbs" level="services" levels="hw-if data-acquisition adapt management application-interface" long-name="Locating Services">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1248,7 +1248,7 @@
 <unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -1283,7 +1283,7 @@
 <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1393,7 +1393,7 @@
 </component>
 </collection>
 </block>
-<block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
+<block name="networkingsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Networking Services">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1595,13 +1595,13 @@
 </component>
 </collection>
 </block>
-<block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
+<block name="cellularsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adapt">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
 <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -1690,7 +1690,7 @@
 <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
 <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1703,7 +1703,7 @@
 </component>
 </collection>
 </block>
-<block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
+<block name="bt" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Bluetooth">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
 <component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
@@ -1791,7 +1791,7 @@
 </component>
 </collection>
 </block>
-<block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
+<block name="usb" level="services" levels="adapt hw-if plugin framework server app-if" long-name="USB">
 <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
 <!-- placeholder for platform APIs -->
 </collection>
@@ -1812,7 +1812,7 @@
 </component>
 </collection>
 </block>
-<block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
+<block name="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -2157,7 +2157,7 @@
 <unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
 <unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -2189,7 +2189,7 @@
 <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/hwdevapi/group" mrp="os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2210,7 +2210,7 @@
 </component>
 </collection>
 </block>
-<block name="mmimaging" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia Imaging">
+<block name="mmimaging" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia Imaging">
 <collection name="imaging" long-name="Imaging Frameworks and Plugins" level="app-if">
 <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
 <unit bldFile="os/mmimaging/imaging/imagingfws/group" mrp="os/mmimaging/imaging/imagingfws/group/multimedia_icl.mrp"/>
@@ -2224,7 +2224,7 @@
 </collection>
 <collection name="imagingtestenv" long-name="Imaging Test Environment" level="device-fw"/>
 </block>
-<block name="openmaxil" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="openmaxil" level="services" levels="adapt hw-if device-fw devices middleware app-if">
 <collection name="openmaxil_plat" long-name="OpenMAX IL Platform Exports" level="hw-if">
 <component name="openmaxil_khronos_api" long-name="OpenMAX IL API" introduced="^3" purpose="mandatory" class="api">
 <unit bldFile="os/openmaxil/openmaxil_plat/khronos_api/group" version="1"/>
@@ -2253,7 +2253,7 @@
 </component>
 </collection>
 </block>
-<block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
+<block name="imagingext" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Imaging Extensions">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2300,8 +2300,8 @@
 </component>
 </collection>
 </block>
-<block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" levels="adapt engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
 <component name="vgi" long-name="VGI" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
@@ -2330,7 +2330,7 @@
 <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r a9b10571503a -r ba76cab9ae36 symbian4/single/sysdefs/system_model_3.0.xml
--- a/symbian4/single/sysdefs/system_model_3.0.xml	Fri Oct 15 14:34:15 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml	Tue Oct 19 12:01:52 2010 +0100
@@ -8,9 +8,9 @@
  	recommended class values are: doc, config, plugin, tool, api --><!-- priority is deprecated 
 	"root" attribute will usually be inserted by tools when merging models, although it can be set manually--><SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.1" id-namespace="http://www.symbian.org/system-definition">
   <systemModel name="Symbian^4">
-    <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" span="2" levels="adaptation plugin mid engine" name="Stubs">
-    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
+    <layer id="adapt" name="Adaptation" levels="low mw high">
+      <package id="stubs" tech-domain="hb" level="high" span="2" levels="adapt plugin mid engine" name="Stubs">
+    <collection id="audiostubs" name="Audio Stubs" level="adapt">
      <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs" target="device" purpose="optional">
       <unit bldFile="/adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
@@ -48,7 +48,7 @@
       <unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
-    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+    <collection id="systemswstubs" name="System Software Stubs" level="adapt">
      <component id="ddcaccessstub" name="DDC Access Stub" target="device" purpose="optional">
       <unit bldFile="/adapt/stubs/systemswstubs/ddcaccessstub/group"/>
      </component>
@@ -191,9 +191,9 @@
       </component>
     </collection>
   </package>
-      <package id="openmaxil.nokia" tech-domain="mm" level="mw" levels="adaptation hw-if device-fw" name="Nokia OpenMAX IL Adaptation">
+      <package id="openmaxil.nokia" tech-domain="mm" level="mw" levels="adapt hw-if device-fw" name="Nokia OpenMAX IL Adaptation">
 
-    <collection id="omxilcomp" name="OpenMAX IL Components" level="adaptation">
+    <collection id="omxilcomp" name="OpenMAX IL Components" level="adapt">
          <component id="omxilgeneric" name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" class="plugin" target="device">
         <unit bldFile="/adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
       </component>
@@ -210,7 +210,7 @@
   </package>
     </layer>
     <layer id="os" name="OS" levels="hw services">
-      <package id="kernelhwsrv" level="hw" tech-domain="hb" levels="hw-if adaptation framework test" name="Kernel and Hardware Services">
+      <package id="kernelhwsrv" level="hw" tech-domain="hb" levels="hw-if adapt framework test" name="Kernel and Hardware Services">
     <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
       <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional" target="device">
         <unit bldFile="/os/kernelhwsrv/brdbootldr/ubootldr" mrp="/os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -221,7 +221,7 @@
         <unit bldFile="/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
       </component>
     </collection>
-    <collection id="kernel" name="Kernel Architecture" level="adaptation">
+    <collection id="kernel" name="Kernel Architecture" level="adapt">
       <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory" target="device">
         <unit bldFile="/os/kernelhwsrv/kernel/eka" mrp="/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
       </component>
@@ -243,7 +243,7 @@
         <unit bldFile="/os/kernelhwsrv/kerneltest/f32test/loader" mrp="/os/kernelhwsrv/kerneltest/f32test/loader/base_loader.mrp"/>
       </component>
     </collection>
-    <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+    <collection id="ldds" name="Logical Device Drivers" level="adapt">
       <component id="ethernetldd" name="Ethernet Drivers" purpose="optional" target="device">
         <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
       </component>
@@ -688,7 +688,7 @@
    </component>
   </collection>
  </package>
-      <package id="persistentdata" level="services" tech-domain="hb" levels="adaptation hw-if plugin framework server app-if" name="Persistent Data Services">
+      <package id="persistentdata" level="services" tech-domain="hb" levels="adapt hw-if plugin framework server app-if" name="Persistent Data Services">
     <collection id="featuremgmt" name="Feature Management" level="framework">
       <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory" target="device">
         <unit bldFile="/os/persistentdata/featuremgmt/featuremgr/group" mrp="/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -739,7 +739,7 @@
       </component>
     </collection>
   </package>
-      <package id="devicesrv" level="services" tech-domain="hb" levels="adaptation hw-if plugin framework server app-if" name="Device Services">
+      <package id="devicesrv" level="services" tech-domain="hb" levels="adapt hw-if plugin framework server app-if" name="Device Services">
   <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
    <component id="platform_path_definitions_api" name="Platform Path Definitions API" filter="s60,bldmefirst" class="api" target="device" purpose="optional">
 	<!-- this needs to be moved to deviceplatformrelease -->
@@ -1265,7 +1265,7 @@
       </component>
     </collection>
   </package>
-      <package id="lbs" level="services" tech-domain="lo" levels="hw-if data-acquisition adaptation management application-interface" name="Locating Services">
+      <package id="lbs" level="services" tech-domain="lo" levels="hw-if data-acquisition adapt management application-interface" name="Locating Services">
     <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
       <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin" target="device">
         <unit bldFile="/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1286,7 +1286,7 @@
         <unit bldFile="/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
       </component>
     </collection>
-    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adapt">
       <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin" target="device">
         <unit bldFile="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
       </component>
@@ -1322,7 +1322,7 @@
         <unit bldFile="/os/lbs/locationmgmt/networkgateway/group" mrp="/os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
       </component>
     </collection>
-    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin" target="device">
         <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
@@ -1436,7 +1436,7 @@
       </component>
 	  </collection>
   </package>
-      <package id="networkingsrv" level="services" tech-domain="dc" levels="adaptation hw-if plugin framework server app-if" name="Networking Services">
+      <package id="networkingsrv" level="services" tech-domain="dc" levels="adapt hw-if plugin framework server app-if" name="Networking Services">
     <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
       <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory" target="device">
         <unit bldFile="/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1666,7 +1666,7 @@
    </component>
   </collection>
  </package>
-      <package id="cellularsrv" level="services" tech-domain="vc" levels="adaptation hw-if plugin framework server app-if" name="Cellular Baseband Services">
+      <package id="cellularsrv" level="services" tech-domain="vc" levels="adapt hw-if plugin framework server app-if" name="Cellular Baseband Services">
     <meta rel="License" type="auto">
       <license type="EPL">
 <supplier>Nokia</supplier>
@@ -1677,7 +1677,7 @@
         <unit bldFile="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
     </collection>
-    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adapt">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin" target="device">
         <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
@@ -1768,7 +1768,7 @@
         <unit mrp="/os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
       </component>
     </collection>
-    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
       <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin" target="device">
         <unit bldFile="/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
       </component>
@@ -1788,7 +1788,7 @@
       </component>
     </collection>
   </package>
-      <package id="bt" level="services" tech-domain="de" levels="adaptation hw-if plugin framework server app-if" name="Bluetooth">
+      <package id="bt" level="services" tech-domain="de" levels="adapt hw-if plugin framework server app-if" name="Bluetooth">
   <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
    <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -1883,7 +1883,7 @@
       </component>
     </collection>
  </package> 
-      <package id="usb" level="services" tech-domain="de" levels="adaptation hw-if plugin framework server app-if" name="USB">
+      <package id="usb" level="services" tech-domain="de" levels="adapt hw-if plugin framework server app-if" name="USB">
   <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
 	<!-- placeholder for platform APIs -->
   </collection>
@@ -1905,7 +1905,7 @@
    </component>
   </collection>
  </package> 
-      <package id="mm" level="services" tech-domain="mm" levels="adaptation hw-if device-fw devices middleware app-if" name="Multimedia">
+      <package id="mm" level="services" tech-domain="mm" levels="adapt hw-if device-fw devices middleware app-if" name="Multimedia">
   <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
    <component id="audio_effects_api" name="Audio Effects API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -2351,7 +2351,7 @@
     <unit bldFile="/os/mm/mmdevicefw/speechrecogsupport/group" mrp="/os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
    </component>
   </collection>
-  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adapt">
    <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional" target="device">
     <unit bldFile="/os/mm/mmswadaptation/videorenderer/group" mrp="/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
    </component>
@@ -2389,7 +2389,7 @@
     <unit bldFile="/os/mm/devsound/a3fsrvstart/group" mrp="/os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
    </component>
   </collection>
-  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
    <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional" target="device">
     <unit bldFile="/os/mm/devsound/hwdevapi/group" mrp="/os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
    </component>
@@ -2411,7 +2411,7 @@
    
   </collection>
  </package>
-      <package id="mmimaging" level="services" tech-domain="mm" levels="adaptation hw-if device-fw devices middleware app-if" name="Multimedia Imaging">
+      <package id="mmimaging" level="services" tech-domain="mm" levels="adapt hw-if device-fw devices middleware app-if" name="Multimedia Imaging">
     <collection id="imaging" name="Imaging Frameworks and Plugins" level="app-if">
       <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory" target="device">
         <unit bldFile="/os/mmimaging/imaging/imagingfws/group" mrp="/os/mmimaging/imaging/imagingfws/group/multimedia_icl.mrp"/>
@@ -2432,7 +2432,7 @@
       
     </collection>
   </package>
-      <package id="openmaxil" level="services" tech-domain="mm" levels="adaptation hw-if device-fw devices middleware app-if" name="openmaxil">
+      <package id="openmaxil" level="services" tech-domain="mm" levels="adapt hw-if device-fw devices middleware app-if" name="openmaxil">
 
 
     <collection id="openmaxil_plat" name="OpenMAX IL Platform Exports" level="hw-if">
@@ -2466,7 +2466,7 @@
     </collection>
 
   </package>
-      <package id="imagingext" level="services" tech-domain="mm" levels="adaptation hw-if plugin framework server app-if" name="Imaging Extensions">
+      <package id="imagingext" level="services" tech-domain="mm" levels="adapt hw-if plugin framework server app-if" name="Imaging Extensions">
   <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
    <component id="exif_api" name="Exif API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -2523,8 +2523,8 @@
    </component>
   </collection>
  </package>
-      <package id="graphics" level="services" tech-domain="ui" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" name="Graphics">
-    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+      <package id="graphics" level="services" tech-domain="ui" levels="adapt engines internal-adaptations device-interface internal-utils app-if" name="Graphics">
+    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
       <component id="vgi" name="VGI" filter="s60" target="device" purpose="optional">
         <unit bldFile="/os/graphics/graphicsaccelaration/vgi/group"/>
       </component>
@@ -2553,7 +2553,7 @@
         <unit bldFile="/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
       </component>
     </collection>
-    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
       <!-- displayldd to be moved here -->
       <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional" target="device">
         <unit bldFile="/os/graphics/graphicshwdrivers/surfacemgr/group" mrp="/os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>