diff -r ce8543a6aaaa -r 79fffd551b70 symbian4/single/sysdefs/system_model_3.0.xml
--- a/symbian4/single/sysdefs/system_model_3.0.xml	Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/system_model_3.0.xml	Tue Aug 24 14:27:40 2010 +0100
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- this DTD describes schema="3.0.1" --><!-- all relative paths are relative to this file
-	all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not.  --><!-- Container for metadata
-	meta, if present, should always be the first element in the parent 
-	 --><!-- systemModel element has name but no ID --><!-- All items from layer down to component should have either @href or at least one valid child item.
-	Anything else will be considered a placeholder
-	--><!-- Nested packages are for backwards compatibility only --><!-- contains units or is a placeholder --><!--
-	"origin-model" attribute is only to be inserted by tools when merging models
- 	recommended class values are: doc, config, plugin, tool, api --><!-- priority is deprecated 
+<?xml version="1.0" encoding="UTF-8"?><!-- this DTD describes schema="3.0.1" --><!-- all relative paths are relative to this file
+	all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not.  --><!-- Container for metadata
+	meta, if present, should always be the first element in the parent 
+	 --><!-- systemModel element has name but no ID --><!-- All items from layer down to component should have either @href or at least one valid child item.
+	Anything else will be considered a placeholder
+	--><!-- Nested packages are for backwards compatibility only --><!-- contains units or is a placeholder --><!--
+	"origin-model" attribute is only to be inserted by tools when merging models
+ 	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="/adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+      <unit bldFile="/adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
      <component id="fmradiotunercontrolstub" name="FM Radio Tuner Control Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+      <unit bldFile="/adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
      </component>
     </collection>
    <collection id="drm_stubs" name="DRM Stubs" level="plugin">
      <component id="drm_stubs_build" name="DRM Stubs Build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/drm_stubs/group"/>
+      <unit bldFile="/adapt/stubs/drm_stubs/group"/>
      </component>
     </collection>
     <collection id="ocrsrv_stub" name="OCR Services Stub" level="mid">
      <component id="ocrsrv_stub_build" name="OCR Services Stub Build" filter="!dfs_build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/ocrsrv_stub/group"/>
+      <unit bldFile="/adapt/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
     <collection id="omasuplasnconverterstubimpl" name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 	 <component id="omasuplasnconverterstubimpl_build" name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+      <unit bldFile="/adapt/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
     <collection id="posmsgpluginreferenceimpl" name="POS Message Plugin Reference Implementation" level="plugin">
      <component id="posmsgpluginreferenceimpl_build" name="POS Message Plugin Reference Implementation Build" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+      <unit bldFile="/adapt/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
     <collection id="srsfenginestub" name="SRSF Engine Stub" level="engine">
      <component id="srsfenginestub_build" name="SRSF Engine Stub Build" filter="stubs" target="device" purpose="optional">
-	    <unit bldFile="/adaptation/stubs/srsfenginestub/group"/>
+	    <unit bldFile="/adapt/stubs/srsfenginestub/group"/>
      </component>
     </collection>
     <collection id="power_save_display_mode_stub" name="Power Save Display Mode Stub" level="plugin">
      <component id="power_save_display_mode_stub_build" name="Power Save Display Mode Stub Build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/power_save_display_mode_stub/group"/>
-     </component>
-    </collection>
-    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+      <unit bldFile="/adapt/stubs/power_save_display_mode_stub/group"/>
+     </component>
+    </collection>
+    <collection id="systemswstubs" name="System Software Stubs" level="adapt">
      <component id="ddcaccessstub" name="DDC Access Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/ddcaccessstub/group"/>
      </component>
      <component id="tvoutconfig" name="TV Out Config" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
      </component>
      <component id="accessorypolicyreference" name="Accessory Policy Reference" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
      </component>
      <component id="asyreference" name="ASY Reference" class="plugin" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
      </component>
      <component id="examplecommonisc" name="Example Common ISC" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
      </component>
      <component id="exampledsy" name="Example DSY" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
      </component>
      <component id="featuremanagerstub" name="Feature Manager Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
      </component>
      <component id="hwrmstubplugins" name="Hardware Resource Manager Stub Plugins" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
      </component>
      <component id="hwrmhapticsstubplugin" name="Hardware Resource Manager Haptics Stub Plugin" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
      </component>
      <component id="sensorchannelsreference" name="Sensor Channels Reference" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
      </component>
      <component id="ssyreference" name="SSY Reference" class="plugin" target="device" purpose="optional">
  	  
-      <unit bldFile="/adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-     </component>
-     <component id="startupadaptationstub" name="Startup Adaptation Stub" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+     </component>
+     <component id="startupadaptstub" name="Startup Adaptation Stub" class="plugin" target="device" purpose="optional">
+      <unit bldFile="/adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
      </component>
      <component id="tiltcompensationstub" name="Tilt Compensation Stub" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
      </component>
      <component id="tvoutbehaviour" name="TV Out Behaviour" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
      </component>
      <component id="wiredbearerreference" name="Wired Bearer Reference" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+      <unit bldFile="/adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
      </component>
     </collection>
     <collection id="tactileclickplugin_stub" name="Tactile Click Plugin Stub" level="engine">
  	  
      <component id="tactileclickplugin_stub_build" name="Tactile Click Plugin Stub Build" class="plugin" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/tactileclickplugin_stub/group"/>
+      <unit bldFile="/adapt/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
     <collection id="wlanhwinit_stub" name="WLAN Hardware Init Stub" level="mid">
      <component id="wlanhwinit_stub_build" name="WLAN Hardware Init Stub Build" target="device" purpose="optional">
-      <unit bldFile="/adaptation/stubs/wlanhwinit_stub/group"/>
+      <unit bldFile="/adapt/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
   </package>
       <package id="beagleboard" tech-domain="hb" level="low" levels="hw-if" name="Beagle Board">
     <collection id="omap3530" name="OMAP 3530" level="hw-if">
       <component id="omap3530_build" name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/beagleboard/omap3530" mrp="/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+        <unit bldFile="/adapt/beagleboard/omap3530" mrp="/adapt/beagleboard/omap3530/base_beagle.mrp"/>
       </component>
       <component id="omap3530_kernel" name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/beagleboard/omap3530/kernel"/>
+        <unit bldFile="/adapt/beagleboard/omap3530/kernel"/>
       </component>
       <component id="beagleboard_Baseport" name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/beagleboard/omap3530/beagleboard"/>
+        <unit bldFile="/adapt/beagleboard/omap3530/beagleboard"/>
       </component>
     </collection>
   </package>
       <package id="qemu" tech-domain="hb" level="low" levels="hw-if" name="QEMU and Baseport">
     <collection id="qemu_baseport" name="Baseport" level="hw-if">
       <component id="syborg" name="Syborg" introduced="^2" filter="sf_build" purpose="optional" target="device">
-        <unit bldFile="/adaptation/qemu/baseport/syborg" mrp="/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+        <unit bldFile="/adapt/qemu/baseport/syborg" mrp="/adapt/qemu/baseport/syborg/syborg.mrp"/>
       </component>
     </collection>
   </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"/>
@@ -144,7 +144,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>
@@ -160,7 +160,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" target="device">
         <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
       </component>
@@ -526,7 +526,7 @@
     <unit bldFile="/os/ossrv/ofdbus/dbus-glib/group"/>
    </component>
    <component id="ofdbus_rom" name="D-Bus ROM" filter="s60" target="device" purpose="optional">
-    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
     <unit bldFile="/os/ossrv/ofdbus/group"/>
    </component>
@@ -605,7 +605,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"/>
@@ -656,7 +656,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 -->
@@ -1180,7 +1180,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"/>
@@ -1201,9 +1201,9 @@
         <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">
-      <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"/>
+    <collection id="datasourceadapt" name="Data Source Adaptation" level="adapt">
+      <component id="gpsdatasourceadapt" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin" target="device">
+        <unit bldFile="/os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="/os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
       </component>
     </collection>
     <collection id="locationrequestmgmt" name="Location Request Management" level="application-interface">
@@ -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" target="device">
         <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
@@ -1351,7 +1351,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"/>
@@ -1581,7 +1581,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>
@@ -1592,9 +1592,9 @@
         <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="basebandadaptplugins" 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"/>
+        <unit bldFile="/os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
     </collection>
     <collection id="smsprotocols" name="SMS Protocols" level="framework">
@@ -1683,7 +1683,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>
@@ -1703,11 +1703,11 @@
       </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">
-    
-    <unit bldFile="/os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+   <component id="bluetooth_audio_adapt_api" name="Bluetooth Audio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+    
+    <unit bldFile="/os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
    </component>
    <component id="bluetooth_power_management_api" name="Bluetooth Power Management API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -1793,12 +1793,12 @@
    </component>
   </collection>
     <collection id="btsimulator" name="Bluetooth Simulator" level="internal-utils">
-      <component id="btaudioadaptation_stub" name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional" target="device">
-        <unit bldFile="/os/bt/btsimulator/btaudioadaptation_stub/group"/>
+      <component id="btaudioadapt_stub" name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional" target="device">
+        <unit bldFile="/os/bt/btsimulator/btaudioadapt_stub/group"/>
       </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>
@@ -1820,7 +1820,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">
     
@@ -1909,9 +1909,9 @@
     
     <unit bldFile="/os/mm/mm_plat/custom_interface_utility_api/group"/>
    </component>
-   <component id="devsound_adaptation_api" name="DevSound Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-    
-    <unit bldFile="/os/mm/mm_plat/devsound_adaptation_api/group"/>
+   <component id="devsound_adapt_api" name="DevSound Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+    
+    <unit bldFile="/os/mm/mm_plat/devsound_adapt_api/group"/>
    </component>
    <component id="display_posting_api" name="Display Posting API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -1943,9 +1943,9 @@
     
     <unit bldFile="/os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
    </component>
-   <component id="fm_radio_adaptation_api" name="FM Radio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-    
-    <unit bldFile="/os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+   <component id="fm_radio_adapt_api" name="FM Radio Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+    
+    <unit bldFile="/os/mm/mm_plat/fm_radio_adapt_api/group"/>
    </component>
    <component id="g711_decoder_interface_api" name="G711 Decoder Interface API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -2063,9 +2063,9 @@
     
     <unit bldFile="/os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
    </component>
-   <component id="rds_adaptation_api" name="RDS Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-    
-    <unit bldFile="/os/mm/mm_plat/rds_adaptation_api/group"/>
+   <component id="rds_adapt_api" name="RDS Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+    
+    <unit bldFile="/os/mm/mm_plat/rds_adapt_api/group"/>
    </component>
    <component id="restricted_audio_output_api" name="Restricted Audio Output API" filter="s60" class="api" target="device" purpose="optional">
     
@@ -2177,7 +2177,7 @@
     <unit bldFile="/os/mm/devsoundextensions/effectspresets/group"/>
    </component>
    <component id="effectspresets_utils" name="Effects Presets Utils" filter="s60" target="device" purpose="optional">
-    <!-- need to #include the lot from a single bld.inf
+    <!-- need to #include the lot from a single bld.inf
       		Also move to a standard component location, not under effectspresets -->
     <unit bldFile="/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
     <unit bldFile="/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -2274,9 +2274,9 @@
     <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="mmswadapt" 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"/>
+    <unit bldFile="/os/mm/mmswadapt/videorenderer/group" mrp="/os/mm/mmswadapt/videorenderer/group/multimedia_videorenderer.mrp"/>
    </component>
   </collection>
   <collection id="mmtestenv" name="Multimedia Test Environment" level="device-fw">
@@ -2331,7 +2331,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>
@@ -2339,10 +2339,10 @@
     <unit bldFile="/os/mm/mmhais/a3facl/group" mrp="/os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
    </component>
    <component id="a3fdevsoundcustomisation" name="A3F DevSound Customisation" introduced="^2" purpose="optional" target="device">
-    <unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptationinfo.mrp"/>
+    <unit bldFile="/os/mm/mmhais/a3fdevsoundcustomisation/group" mrp="/os/mm/mmhais/a3fdevsoundcustomisation/group/multimedia_a3f_devsoundadaptinfo.mrp"/>
    </component>
    <component id="refacladapt" name="Reference ACL Adaptation" introduced="^2" purpose="optional" target="device">
-    <unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladaptation.mrp"/>
+    <unit bldFile="/os/mm/mmhais/refacladapt/group" mrp="/os/mm/mmhais/refacladapt/group/multimedia_a3f_refacladapt.mrp"/>
    </component>
    <component id="videohai" name="Video HAI" introduced="7.0s" purpose="mandatory" target="device">
     <unit bldFile="/os/mm/mmhais/videohai/group" mrp="/os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2353,7 +2353,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">
     
@@ -2392,13 +2392,13 @@
       <unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
    </component>
   </collection>
-  <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+  <collection id="imageadaptextensions" name="Image Adaptation Extensions" level="app-if">
    <component id="iclextjpegapi" name="ICL Extension JPEG API" filter="s60" target="device" purpose="optional">
-    <unit bldFile="/os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-   </component>
-   <component id="imageadaptationextensions_build" name="Image Adaptation Extensions Build" filter="s60" target="device" purpose="optional">
+    <unit bldFile="/os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+   </component>
+   <component id="imageadaptextensions_build" name="Image Adaptation Extensions Build" filter="s60" target="device" purpose="optional">
     <!--  Move the export from this bld.inf into the above one and remove this component, or make this a ROM component -->
-    <unit bldFile="/os/imagingext/imageadaptationextensions/group"/>
+    <unit bldFile="/os/imagingext/imageadaptextensions/group"/>
    </component>
   </collection>
   <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
@@ -2410,13 +2410,13 @@
    </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-adapts 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>
     </collection>
-    <collection id="m3g" name="Mobile 3D Graphics" level="internal-adaptations">
+    <collection id="m3g" name="Mobile 3D Graphics" level="internal-adapts">
       <component id="m3gcore11" name="M3G Core 1.1" filter="s60" target="device" purpose="optional">
         <unit bldFile="/os/graphics/m3g/m3gcore11/group"/>
       </component>
@@ -2425,8 +2425,8 @@
       <component id="graphicsresource" name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional" target="device">
         <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
       </component>
-      <component id="graphicsresourceadaptation" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional" target="device">
-        <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+      <component id="graphicsresourceadapt" name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional" target="device">
+        <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceadapt/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceadapt/group/graphics_graphicsresourceadapter.mrp"/>
       </component>
       <component id="graphicsresourceimplementation" name="Graphics Resource Implementation" introduced="^4" purpose="optional" target="device">
         <unit bldFile="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="/os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2440,7 +2440,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"/>
@@ -2501,7 +2501,7 @@
         <unit bldFile="/os/graphics/fbs/fontandbitmapserver/group" mrp="/os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
       </component>
     </collection>
-    <collection id="opengles" name="OpenGLES" level="internal-adaptations">
+    <collection id="opengles" name="OpenGLES" level="internal-adapts">
       <component id="openglesinterface" name="OpenGL ES Interface" introduced="8.0" purpose="optional" target="device">
         <unit bldFile="/os/graphics/opengles/openglesinterface/group" mrp="/os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
       </component>
@@ -2509,7 +2509,7 @@
         <unit bldFile="/os/graphics/opengles/openglesinterface/group/opengles_stub"/>
       </component>
     </collection>
-    <collection id="openvg" name="OpenVG" level="internal-adaptations">
+    <collection id="openvg" name="OpenVG" level="internal-adapts">
       <component id="openvginterface" name="OpenVG Interface" introduced="^2" purpose="optional" target="device">
         <unit bldFile="/os/graphics/openvg/openvginterface/group" mrp="/os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
       </component>
@@ -2521,7 +2521,7 @@
         <unit bldFile="/os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
       </component>
     </collection>
-    <collection id="egl" name="EGL" level="internal-adaptations">
+    <collection id="egl" name="EGL" level="internal-adapts">
       <component id="eglinterface" name="EGL Interface" introduced="^2" purpose="mandatory" target="device">
         <unit bldFile="/os/graphics/egl/eglinterface/group" mrp="/os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
       </component>
@@ -2554,8 +2554,8 @@
       <component id="directgdiinterface" name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional" target="device">
         <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
       </component>
-      <component id="directgdiadaptation" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional" target="device">
-        <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+      <component id="directgdiadapt" name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional" target="device">
+        <unit bldFile="/os/graphics/graphicsdeviceinterface/directgdiadapt/group" mrp="/os/graphics/graphicsdeviceinterface/directgdiadapt/group/graphics_directgdiadapter.mrp"/>
       </component>
     </collection>
     <collection id="graphicstools" name="Graphics Tools" level="internal-utils">
@@ -3186,9 +3186,9 @@
     <unit bldFile="/mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="/mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
    </component>
   </collection>
-  <collection id="hwresourceadaptation" name="Hardware Resource Adaptation" level="generic">
+  <collection id="hwresourceadapt" name="Hardware Resource Adaptation" level="generic">
    <component id="hwresourcemgruiplugin" name="Hardware Resource Manager UI Plugin" introduced="^2" deprecated="^4" purpose="optional" class="plugin" target="device">
-    <unit bldFile="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadaptation/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
+    <unit bldFile="/mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group" mrp="/mw/appsupport/hwresourceadapt/hwresourcemgruiplugin/group/telephony_hwrmuiplugin.mrp"/>
    </component>
   </collection>
   <collection id="commonappservices" name="Common Application Services" level="framework">
@@ -3329,8 +3329,8 @@
    <component id="lockapp_server_api" name="Lock Application Server API" filter="s60" class="api" target="device" purpose="optional">
     <unit bldFile="/mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
    </component>
-   <component id="devencadaptation_api" name="Device Encryption Adaptation API" filter="s60" class="api" target="device" purpose="optional">
-    <unit bldFile="/mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+   <component id="devencadapt_api" name="Device Encryption Adaptation API" filter="s60" class="api" target="device" purpose="optional">
+    <unit bldFile="/mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
    </component>
    <component id="devenccommonutils_api" name="Device Encryption Common Utils API" filter="s60" class="api" target="device" purpose="optional">
     <unit bldFile="/mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>
@@ -3634,9 +3634,9 @@
     <unit bldFile="/mw/locationsrv/locsrv_plat/geocoding_api/group"/>
    </component>
    <component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" filter="s60" class="api" target="device" purpose="optional">
-	<!-- placeholder
-    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
-    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+	<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
 	 -->
    </component>
    <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" filter="s60" class="api" target="device" purpose="optional">
@@ -6232,7 +6232,7 @@
   </collection>
   <collection id="mmappcomponents" name="Multimedia App Components" level="utils">
    <component id="mmappcomponents_build" name="Multimedia App Components Build" introduced="^1" filter="s60" target="device" purpose="optional">
-    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
+    <!-- needed for  #ifdefs and hrh include. Need to #include the .hrh file in each bld.inf
       		Can remove this once configuration is in place-->
     <unit bldFile="/mw/mmappfw/mmappcomponents/group"/>
    </component>
@@ -7518,10 +7518,10 @@
    <component id="fontprovider" name="Font Provider" filter="s60" target="device" purpose="optional">
     <unit bldFile="/mw/uiresources/fontsupport/fontprovider/group"/>
    </component>
-   <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
-      <component id="s60_fonts" filter="s60" name="S60 Fonts">
-        <unit bldFile="fontsupport/fontutils/group"/>
-      </component>
+   <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s60_fonts" filter="s60" name="S60 Fonts">
+        <unit bldFile="fontsupport/fontutils/group"/>
+      </component>
 -->
    <component id="fontutils" name="Font Utils" filter="sf_build" target="device" purpose="optional">
     <unit bldFile="/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
@@ -7624,15 +7624,15 @@
   <collection id="controlpanel" name="Control Panel" level="generic">
     
    <component id="controlpanel_rom" name="Control Panel ROM" filter="s60" target="device" purpose="optional">
-      <!-- Need to create a real .pro file for this 
+      <!-- Need to create a real .pro file for this 
 	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="controlpanel_config" name="Control Panel Config" introduced="^4" filter="s60" class="config" target="device" purpose="optional">
-      <!-- Need to create a real .pro file for this 
+      <!-- Need to create a real .pro file for this 
 	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="controlpanel_source" name="Control Panel Source" filter="s60" target="device" purpose="optional">
-      <!-- Uncomment when controlpanel_build is removed
+      <!-- Uncomment when controlpanel_build is removed
 	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
    </component>
    <component id="controlpanel_build" name="Control Panel Build" filter="s60" target="device" purpose="optional">
@@ -8161,7 +8161,7 @@
     <unit bldFile="/mw/web/codhandler/roapapp/group"/>
    </component>
    <component id="codhandler_build" name="COD Handler Build" filter="s60" target="device" purpose="optional">
-    <!-- Exports need to go into another component or make this self-contained.
+    <!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
     <unit bldFile="/mw/web/codhandler/group"/>
    </component>
@@ -9061,14 +9061,14 @@
     <collection id="calendarwidgetinstaller" name="Calendar Widget Installer" level="build">
 		<!-- collection is really a component, need to move down a directory -->
      <component id="calendarwidgetinstaller_build" name="Calendar Widget Installer Build" introduced="^4" filter="dfs_build" target="device" purpose="optional">
-      <!--  built by calendarwidget_rom
+      <!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetinstaller" qt:qmakeArgs="-r" qt:proFile="calendarwidgetinstaller.pro"/> -->
      </component>
     </collection>
     <collection id="calendarwidgetplugin" name="Calendar Widget Plugin" level="app">
 		<!-- collection is really a component, need to move down a directory -->
      <component id="calendarwidgetplugin_build" name="Calendar Widget Plugin Build" introduced="^4" filter="dfs_build" class="plugin" target="device" purpose="optional">
-      <!--  built by calendarwidget_rom
+      <!--  built by calendarwidget_rom
 	  <unit bldFile="calendarwidgetplugin" qt:qmakeArgs="-r" qt:proFile="calendarwidgetplugin.pro"/> -->
      </component>
      <component id="calendarwidgetplugin_test" name="Calendar Widget Plugin Test" introduced="^4" filter="dfs_build" target="device" purpose="optional">