--- a/symbian2/single/sysdefs/system_model_trimmed.xml	Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian2/single/sysdefs/system_model_trimmed.xml	Tue Aug 24 14:27:40 2010 +0100
@@ -248,137 +248,137 @@
     </collection>
    </block>
   </layer>
-  <layer name="adaptation" long-name="Adaptation">
-    <block name="syborg_adaptation" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+  <layer name="adapt" long-name="Adaptation">
+    <block name="syborg_adapt" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
       <collection id="baseport" name="Baseport" level="hw-if"> 
         <component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
-          <unit bldFile="adaptation/QEMU/baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
+          <unit bldFile="adapt/QEMU/baseport/syborg" mrp="baseport/syborg/syborg.mrp"/>
         </component>
       </collection>
     </block>
-   <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adaptation plugin mid engine">
-    <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+   <block name="stubs" long-name="Stubs" tech_domain="hb" levels="adapt plugin mid engine">
+    <collection name="audiostubs" long-name="Audio Stubs" level="adapt">
      <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
-      <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
-      <!-- <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
-      <unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+      <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audiocodeccistubs/audiovibracontrolcistub/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
+      <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
      </component>
      <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/audiostubs/fmradiotunercontrolstub/group"/>
+      <unit bldFile="adapt/stubs/audiostubs/fmradiotunercontrolstub/group"/>
      </component>
     </collection>
     <collection name="drm_stubs" long-name="DRM Stubs" level="plugin">
      <component name="drm_stubs_build" long-name="DRM Stubs Component" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/drm_stubs/group"/>
+      <unit bldFile="adapt/stubs/drm_stubs/group"/>
      </component>
     </collection>
     <collection name="ptit9core_stub" long-name="PTI T9 Core Stub" level="plugin">
      <component name="ptit9core_stub_build" long-name="PTI T9 Core Stub Component" origin-model="foundation"/>
     </collection>
-    <collection name="btaudioadaptation_stub" long-name="BT Audio Adaptation Stub" level="adaptation">
-     <component name="btaudioadaptation_stub_build" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/btaudioadaptation_stub/group"/>
+    <collection name="btaudioadapt_stub" long-name="BT Audio Adaptation Stub" level="adapt">
+     <component name="btaudioadapt_stub_build" origin-model="foundation">
+      <unit bldFile="adapt/stubs/btaudioadapt_stub/group"/>
      </component>
     </collection>
     <collection name="posmsgpluginreferenceimpl" long-name="Pos Msg Plugin Reference Implementation" level="plugin">
      <component name="eposomasuplposrefapp" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+      <unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
      </component>
     </collection>
     <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
      <component name="asnimplementation" long-name="ASN Implementation" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+      <unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
      </component>
     </collection>
     <collection name="power_save_display_mode_stub" long-name="Power Save Display Mode Stub" level="plugin">
      <component name="power_save_display_mode_stub_build" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
+      <unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
      </component>
     </collection>
     <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
-     <component name="adaptationhwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/adaptationhwdevice/group"/> -->
+     <component name="adapthwdevice" long-name="Adaptation Hardware Device" origin-model="foundation">
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/adapthwdevice/group"/> -->
      </component>
      <component name="grcompilerhwdevice" long-name="GR Compiler Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/grcompilerhwdevice/group"/> -->
      </component>
      <component name="ttphwdevice" long-name="TTP Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttphwdevice/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/ttphwdevice/group"/> -->
      </component>
      <component name="recognitionhwdevice" long-name="Recognition Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/recognitionhwdevice/group"/> -->
      </component>
      <component name="vocmanhwdevice" long-name="Voc Man Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/vocmanhwdevice/group"/> -->
      </component>
      <component name="ttshwdevice" long-name="TTS Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/ttshwdevice/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/ttshwdevice/group"/> -->
      </component>
      <component name="nlphwdevice" long-name="NLP Hardware Device" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/srsfenginestub/nlphwdevice/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/nlphwdevice/group"/> -->
      </component>
      <component unofficial="yes" name="srsfenginestub_build" long-name="SRSF Engine Stub Build" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/srsfenginestub/group"/>
-     </component>
-    </collection>
-    <collection name="systemswstubs" long-name="System SW Stubs" level="adaptation">
+      <unit bldFile="adapt/stubs/srsfenginestub/group"/>
+     </component>
+    </collection>
+    <collection name="systemswstubs" long-name="System SW Stubs" level="adapt">
      <component name="accessorypolicyreference" long-name="Accessory Policy Reference" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group"/>
      </component>
      <component name="asyreference" long-name="ASY Reference" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/asyreference/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/asyreference/group"/>
      </component>
      <component name="examplecommonisc" long-name="Example Common ISC" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group"/>
      </component>
      <component name="exampledsy" long-name="Example DSY" origin-model="foundation">
-<!--AUTO TRIMMED      <unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group"/> -->
+<!--AUTO TRIMMED      <unit bldFile="adapt/stubs/systemswstubs/exampledsy/group"/> -->
      </component>
      <component name="featuremanagerstub" long-name="Feature Manager Stub" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group"/>
      </component>
      <component name="tvoutconfig" long-name="TVOut Config" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/tvoutconfig/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/tvoutconfig/group"/>
      </component>
      <component name="hwrmstubplugins" long-name="HWRM Stub Plugins" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group"/>
      </component>
      <component name="hwrmhapticsstubplugin" long-name="HWRM Haptics Stub Plugin" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group"/>
      </component>
      <component name="sensorchannelsreference" long-name="Sensor Channels Reference" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group"/>
      </component>
      <component name="ssyreference" long-name="SSY Rreference" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group"/>
-     </component>
-     <component name="startupadaptationstub" long-name="Startup Adaptation Stub" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/ssyreference/group"/>
+     </component>
+     <component name="startupadaptstub" long-name="Startup Adaptation Stub" origin-model="foundation">
+      <unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group"/>
      </component>
      <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group"/>
      </component>
      <component name="wiredbearerreference" long-name="Wired Bearer Teference" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group"/>
+      <unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group"/>
      </component>
      <component unofficial="yes" name="systemswstubs_build" long-name="System SW Stubs Build" origin-model="foundation">
-      <!-- <unit bldFile="adaptation/stubs/systemswstubs/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/systemswstubs/group"/> -->
      </component>
     </collection>
     <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
      <component name="tactileclickplugin_build" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/tactileclickplugin_stub/group"/>
+      <unit bldFile="adapt/stubs/tactileclickplugin_stub/group"/>
      </component>
     </collection>
     <collection name="wlanhwinit_stub" long-name="WLAN Hardware Init Stub" level="mid">
      <component name="wlanhwinit" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+      <unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
      </component>
     </collection>
     <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
      <component name="ocrsrv" origin-model="foundation">
-      <unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+      <unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
      </component>
     </collection>
    </block>
@@ -659,7 +659,7 @@
      </component>
     </collection>
    </block>
-   <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
+   <block name="persistentdata" long-name="Persistent Data Services" tech_domain="hb" level="services" levels="adapt hw-if plugin framework server app-if">
     <collection name="featuremgmt" long-name="Feature Management" level="framework">
      <component name="featuremanager" long-name="Feature Manager" origin-model="foundation">
       <!-- <unit bldFile="os/devicesrv/featuremgmt/featuremanager/clientdll/group"/> -->
@@ -719,7 +719,7 @@
      </component>
     </collection>
    </block>
-   <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adaptation hw-if plugin framework server app-if">
+   <block name="devicesrv" long-name="Device Services" tech_domain="hb" level="services" levels="adapt hw-if plugin framework server app-if">
     <collection name="accessoryservices" long-name="Accessory Services" level="framework">
      <component name="accessorymonitor" long-name="Accessory Monitor" origin-model="foundation">
       <unit bldFile="os/devicesrv/accessoryservices/accessorymonitor/group"/>
@@ -1022,7 +1022,7 @@
      </component>
     </collection>
    </block>
-   <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
+   <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adapt management application-interface">
     <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
      <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
       <unit bldFile="mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
@@ -1044,9 +1044,9 @@
       <!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
      </component>
     </collection>
-    <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-     <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+    <collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+     <component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
+      <unit bldFile="os/lbs/datasourceadapt/gpsdatasourceadapt/group" mrp="os/lbs/datasourceadapt/gpsdatasourceadapt/group/lbs_gps_data_source_adapt.mrp"/>
      </component>
     </collection>
     <collection name="locationrequestmgmt" long-name="Location Request Management" level="application-interface">
@@ -1079,7 +1079,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="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
      </component>
@@ -1207,7 +1207,7 @@
      </component>
     </collection>
    </block>
-   <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adaptation hw-if plugin framework server app-if">
+   <block name="networkingsrv" long-name="Networking Services" tech_domain="dc" level="services" levels="adapt hw-if plugin framework server app-if">
     <collection name="commsdb" long-name="Comms DB" level="server">
      <component name="s60_commsdb" long-name="S60 Commsdb" origin-model="foundation">
       <unit bldFile="os/networkingsrv/commsdb/s60_commsdb/group"/>
@@ -1415,10 +1415,10 @@
      </component>
     </collection>
    </block>
-   <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+   <block name="cellularsrv" long-name="Cellular Baseband Services" tech_domain="vc" level="services" levels="adapt hw-if plugin framework server app-if">
+    <collection name="basebandadaptplugins" long-name="Baseband Adaptation Plugins" level="adapt">
      <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y" origin-model="Symbian">
-      <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 name="fax" long-name="Fax" level="server">
@@ -1574,7 +1574,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="tb91" purpose="development" plugin="Y" origin-model="Symbian">
       <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
      </component>
@@ -1597,7 +1597,7 @@
      </component>
     </collection>
    </block>
-   <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if">
+   <block name="mm" long-name="Multimedia" tech_domain="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if">
     <collection name="audio" long-name="Audio Codecs" level="middleware">
      <component name="arm_cmmf_codecs" long-name="ARM CMMF Codecs" origin-model="foundation">
       <unit bldFile="os/mm/audio/arm_cmmf_codecs/group"/>
@@ -1664,12 +1664,12 @@
 <!--AUTO TRIMMED      <unit bldFile="os/mm/mdfdevvideoextensions/group"/> -->
      </component>
     </collection>
-    <collection name="videoadaptationextensions" long-name="Video Adaptation Extensions" level="adaptation">
+    <collection name="videoadaptextensions" long-name="Video Adaptation Extensions" level="adapt">
      <component name="postingsurface" long-name="Posting Surface" origin-model="foundation">
-      <unit bldFile="os/mm/videoadaptationextensions/postingsurface/group"/>
-     </component>
-     <component unofficial="yes" name="videoadaptationextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
-<!--AUTO TRIMMED      <unit bldFile="os/mm/videoadaptationextensions/group"/> -->
+      <unit bldFile="os/mm/videoadaptextensions/postingsurface/group"/>
+     </component>
+     <component unofficial="yes" name="videoadaptextensions_build" long-name="Video Adaptation Extensions Build" origin-model="foundation">
+<!--AUTO TRIMMED      <unit bldFile="os/mm/videoadaptextensions/group"/> -->
      </component>
     </collection>
     <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
@@ -1819,7 +1819,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" plugin="N" origin-model="Symbian">
       <unit bldFile="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
      </component>
@@ -1827,10 +1827,10 @@
       <unit bldFile="os/mm/mmhais/a3facl/group" mrp="os/mm/mmhais/a3facl/group/multimedia_a3f_acl.mrp"/>
      </component>
      <component name="a3fdevsoundcustomisation" long-name="A3F DevSound Customisation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <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 name="refacladapt" long-name="Reference ACL Adaptation" introduced="tb92" purpose="optional" plugin="N" origin-model="Symbian">
-      <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 name="videohai" long-name="Video HAI" introduced="7.0s" purpose="mandatory" plugin="N" origin-model="Symbian">
       <unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -1863,13 +1863,13 @@
      </component>
     </collection>
    </block>
-   <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adaptation hw-if plugin framework server app-if">
-    <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+   <block name="imagingext" long-name="Imaging Extensions" tech_domain="mm" level="services" levels="adapt hw-if plugin framework server app-if">
+    <collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
      <component name="iclextjpegapi" long-name="ICL Ext JPEG API" origin-model="foundation">
-      <unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-     </component>
-     <component unofficial="yes" name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
-      <unit bldFile="os/imagingext/imageadaptationextensions/group"/>
+      <unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+     </component>
+     <component unofficial="yes" name="imageadaptextensions_build" long-name="Image Adaptation Extensions Build" origin-model="foundation">
+      <unit bldFile="os/imagingext/imageadaptextensions/group"/>
      </component>
     </collection>
     <collection name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -1895,15 +1895,15 @@
      </component>
     </collection>
    </block>
-   <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adaptation">
+   <block name="graphics" long-name="Graphics" tech_domain="ui" level="services" levels="adapt engines internal-adapts device-interface internal-utils app-if">
+    <collection name="graphicsaccelaration" long-name="Graphics Accelaration" level="adapt">
      <component name="vgi" long-name="VGI" origin-model="foundation">
       <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
      </component>
      <component name="2d_openvg_1_0" long-name="2D Open VG 1.0" origin-model="foundation"/>
      <component name="3d_opengl_es_1_1" long-name="3d OpenGL ES 1.1" origin-model="foundation"/>
     </collection>
-    <collection name="m3g" long-name="M3G" level="internal-adaptations">
+    <collection name="m3g" long-name="M3G" level="internal-adapts">
      <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
       <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
      </component>
@@ -1956,7 +1956,7 @@
       <unit bldFile="os/graphics/fbs/fontandbitmapserver/group" mrp="os/graphics/fbs/fontandbitmapserver/group/graphics_fbserv.mrp"/>
      </component>
     </collection>
-    <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
+    <collection name="opengles" long-name="OpenGLES" level="internal-adapts">
      <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
      </component>
@@ -1969,15 +1969,15 @@
       <!-- <unit bldFile="os/graphics/opengles/openglesdisplayproperties/group" mrp="os/graphics/opengles/openglesdisplayproperties/group/graphics_openglesdisplayproperty.mrp"/> -->
      </component>
     </collection>
-    <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
+    <collection name="openvg" long-name="OpenVG" level="internal-adapts">
      <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
      </component>
-	 <component name="openvg11" long-name="OpenVG11" level="internal-adaptations">
+	 <component name="openvg11" long-name="OpenVG11" level="internal-adapts">
       <unit bldFile="os/graphics/openvg/openvginterface/group/openvg11"/>
      </component>
     </collection>
-    <collection name="egl" long-name="EGL" level="internal-adaptations">
+    <collection name="egl" long-name="EGL" level="internal-adapts">
      <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional" plugin="N" origin-model="Symbian">
       <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
      </component>
@@ -2259,7 +2259,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"/>
@@ -2292,7 +2292,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>
@@ -2312,7 +2312,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>
@@ -2432,7 +2432,7 @@
      </component>
     </collection>
    </block>
-   <block name="shortlinksrv" long-name="Short Link Services" tech_domain="de" level="services" levels="adaptation hw-if plugin framework server app-if">
+   <block name="shortlinksrv" long-name="Short Link Services" tech_domain="de" level="services" levels="adapt hw-if plugin framework server app-if">
     <collection name="bluetoothapitest" long-name="Bluetooth API Tests" level="app-if">
      <component name="bluetoothsvs" long-name="Bluetooth Verification Suite" introduced="tb91" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="os/shortlinksrv/bluetoothapitest/bluetoothsvs/group/bluetoothsvs.mrp"/>
@@ -3018,9 +3018,9 @@
       <unit bldFile="mw/appsupport/filehandling/richtexttohtmlconverter/Group" mrp="mw/appsupport/filehandling/richtexttohtmlconverter/Group/app-services_richtexttohtmlconv.mrp"/>
      </component>
     </collection>
-    <collection name="hwresourceadaptation" long-name="Hardware Resource Adaptation" level="generic">
+    <collection name="hwresourceadapt" long-name="Hardware Resource Adaptation" level="generic">
      <component name="hwresourcemgruiplugin" long-name="Hardware Resource Manager UI Plugin" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <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 name="commonappservices" long-name="Common Application Services" level="framework">
@@ -4489,10 +4489,10 @@
       <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
       <!-- <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
      </component>
-     <component name="ossprotocoladaptation" long-name="OSS Protocol Adaptation" origin-model="foundation">
-      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/dataconvlib/group"/> -->
-      <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
+     <component name="ossprotocoladapt" long-name="OSS Protocol Adaptation" origin-model="foundation">
+      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladapt/dataconvlib/group"/> -->
+      <unit bldFile="mw/imsrv/imservices/ossprotocoladapt/group"/>
+      <!-- <unit bldFile="mw/imsrv/imservices/ossprotocoladapt/tsrc/ossadapmt/group"/> -->
      </component>
      <component name="instantmessagingcache" long-name="Instant Messaging Cache" origin-model="foundation">
       <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
@@ -8775,7 +8775,7 @@
      </component>
      <component name="imconversationview" long-name="IM Conversation View" origin-model="foundation">
       <unit bldFile="app/conversations/imstutils/imconversationview/group"/>
-      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadaptation/group"/> -->
+      <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/dummytestadapt/group"/> -->
       <!-- <unit bldFile="app/conversations/imstutils/imconversationview/tsrc/imcvuiengine_test/group"/> -->
      </component>
      <component unofficial="yes" name="imstutils_build" long-name="IM Service Tab Utils Build" origin-model="foundation">