--- a/symbian2/single/sysdefs/system_model.xml	Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian2/single/sysdefs/system_model.xml	Tue Aug 24 14:27:40 2010 +0100
@@ -247,11 +247,11 @@
     </collection>
    </block>
   </layer>
-  <layer name="adaptation" long-name="Adaptation">
+  <layer name="adapt" long-name="Adaptation">
     <block name="qemu" 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="adaptation/qemu/baseport/syborg/syborg.mrp"/>
+          <unit bldFile="adapt/qemu/baseport/syborg" mrp="adaptation/qemu/baseport/syborg/syborg.mrp"/>
         </component>
       </collection>
     </block>
@@ -259,125 +259,125 @@
     <collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
      <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="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/custominterfaceproxyfactory_stub/group"/> -->
+      <!-- <unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/audioenhancementfactorystubs/messagehandlerfactory_stub/group"/> -->
       <unit bldFile="adaptation/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"/>
+     <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"/> -->
+      <!-- <unit bldFile="adapt/stubs/srsfenginestub/adaptationhwdevice/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"/>
+      <unit bldFile="adapt/stubs/srsfenginestub/group"/>
      </component>
     </collection>
     <collection name="systemswstubs" long-name="System SW Stubs" level="adaptation">
      <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">
-      <unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group"/>
+      <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"/>
+      <unit bldFile="adapt/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/startupadaptationstub/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>
@@ -8253,7 +8253,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">