--- a/symbian4/single/sysdefs/system_model.surge.xml	Mon Aug 23 17:26:05 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.surge.xml	Tue Aug 24 14:27:40 2010 +0100
@@ -74,127 +74,127 @@
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^4">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="low mw high">
-<block name="stubs" level="high" span="2" levels="adaptation plugin mid engine" long-name="Stubs">
-<collection name="audiostubs" long-name="Audio Stubs" level="adaptation">
+<layer name="adapt" long-name="Adaptation" levels="low mw high">
+<block name="stubs" level="high" span="2" levels="adapt plugin mid engine" long-name="Stubs">
+<collection name="audiostubs" long-name="Audio Stubs" level="adapt">
 <component name="devsoundextensions_stubs" long-name="Devsound Extensions Stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/audiostubs/devsoundextensions_stubs/group"/>
+<unit bldFile="adapt/stubs/audiostubs/devsoundextensions_stubs/group"/>
 </component>
 <component name="fmradiotunercontrolstub" long-name="FM Radio Tuner Control Stub" purpose="optional">
-<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 Build" purpose="optional">
-<unit bldFile="adaptation/stubs/drm_stubs/group"/>
+<unit bldFile="adapt/stubs/drm_stubs/group"/>
 </component>
 </collection>
 <collection name="ocrsrv_stub" long-name="OCR Services Stub" level="mid">
 <component name="ocrsrv_stub_build" long-name="OCR Services Stub Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/ocrsrv_stub/group"/>
+<unit bldFile="adapt/stubs/ocrsrv_stub/group"/>
 </component>
 </collection>
 <collection name="omasuplasnconverterstubimpl" long-name="OMA SUPL ASN Converter Stub Implementation" level="plugin">
 <component name="omasuplasnconverterstubimpl_build" long-name="OMA SUPL ASN Converter Stub Implementation Build" filter="!dfs_build" purpose="optional">
-<unit bldFile="adaptation/stubs/omasuplasnconverterstubimpl/group"/>
+<unit bldFile="adapt/stubs/omasuplasnconverterstubimpl/group"/>
 </component>
 </collection>
 <collection name="posmsgpluginreferenceimpl" long-name="POS Message Plugin Reference Implementation" level="plugin">
 <component name="posmsgpluginreferenceimpl_build" long-name="POS Message Plugin Reference Implementation Build" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/posmsgpluginreferenceimpl/group"/>
+<unit bldFile="adapt/stubs/posmsgpluginreferenceimpl/group"/>
 </component>
 </collection>
 <collection name="srsfenginestub" long-name="SRSF Engine Stub" level="engine">
 <component name="srsfenginestub_build" long-name="SRSF Engine Stub Build" filter="stubs" purpose="optional">
-<unit bldFile="adaptation/stubs/srsfenginestub/group"/>
+<unit bldFile="adapt/stubs/srsfenginestub/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" long-name="Power Save Display Mode Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/power_save_display_mode_stub/group"/>
-</component>
-</collection>
-<collection name="systemswstubs" long-name="System Software Stubs" level="adaptation">
+<unit bldFile="adapt/stubs/power_save_display_mode_stub/group"/>
+</component>
+</collection>
+<collection name="systemswstubs" long-name="System Software Stubs" level="adapt">
 <component name="ddcaccessstub" long-name="DDC Access Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/ddcaccessstub/group"/>
+<unit bldFile="adapt/stubs/systemswstubs/ddcaccessstub/group"/>
 </component>
 <component name="tvoutconfig" long-name="TV Out Config" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/TVOutConfig/group" filter="oem_build"/>
 </component>
 <component name="accessorypolicyreference" long-name="Accessory Policy Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/accessorypolicyreference/group" filter="oem_build"/>
 </component>
 <component name="asyreference" long-name="ASY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/asyreference/group" filter="oem_build"/>
 </component>
 <component name="examplecommonisc" long-name="Example Common ISC" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/examplecommonisc/group" filter="oem_build"/>
 </component>
 <component name="exampledsy" long-name="Example DSY" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/exampledsy/group" filter="oem_build"/>
 </component>
 <component name="featuremanagerstub" long-name="Feature Manager Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/featuremanagerstub/group" filter="oem_build"/>
 </component>
 <component name="hwrmstubplugins" long-name="Hardware Resource Manager Stub Plugins" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmstubplugins/group" filter="oem_build"/>
 </component>
 <component name="hwrmhapticsstubplugin" long-name="Hardware Resource Manager Haptics Stub Plugin" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/hwrmhapticsstubplugin/group" filter="oem_build"/>
 </component>
 <component name="sensorchannelsreference" long-name="Sensor Channels Reference" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/sensorchannelsreference/group" filter="oem_build"/>
 </component>
 <component name="ssyreference" long-name="SSY Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
-</component>
-<component name="startupadaptationstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/startupadaptationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/ssyreference/group" filter="oem_build"/>
+</component>
+<component name="startupadaptstub" long-name="Startup Adaptation Stub" purpose="optional" plugin="Y">
+<unit bldFile="adapt/stubs/systemswstubs/startupadaptstub/group" filter="oem_build"/>
 </component>
 <component name="tiltcompensationstub" long-name="Tilt Compensation Stub" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tiltcompensationstub/group" filter="oem_build"/>
 </component>
 <component name="tvoutbehaviour" long-name="TV Out Behaviour" purpose="optional">
-<unit bldFile="adaptation/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/tvoutbehaviour/group" filter="oem_build"/>
 </component>
 <component name="wiredbearerreference" long-name="Wired Bearer Reference" purpose="optional" plugin="Y">
-<unit bldFile="adaptation/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
+<unit bldFile="adapt/stubs/systemswstubs/wiredbearerreference/group" filter="oem_build"/>
 </component>
 </collection>
 <collection name="tactileclickplugin_stub" long-name="Tactile Click Plugin Stub" level="engine">
 <component name="tactileclickplugin_stub_build" long-name="Tactile Click Plugin Stub Build" purpose="optional" plugin="Y">
-<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_stub_build" long-name="WLAN Hardware Init Stub Build" purpose="optional">
-<unit bldFile="adaptation/stubs/wlanhwinit_stub/group"/>
+<unit bldFile="adapt/stubs/wlanhwinit_stub/group"/>
 </component>
 </collection>
 </block>
 <block name="beagleboard" level="low" levels="hw-if" long-name="Beagle Board">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530_build" long-name="Beagle Board Common" introduced="^3" filter="sf_build" purpose="optional">
-<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 name="omap3530_kernel" long-name="Beagle Board Kernel" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard_Baseport" long-name="Beagle Board Baseport" introduced="^3" filter="sf_build" purpose="optional">
-<unit bldFile="adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
 <block name="qemu" level="low" levels="hw-if" long-name="QEMU and Baseport">
 <collection name="qemu_baseport" long-name="Baseport" level="hw-if">
 <component name="syborg" long-name="Syborg" introduced="^2" filter="sf_build" purpose="optional">
-<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>
 </block>
 </layer>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" levels="hw-if adaptation framework test" long-name="Kernel and Hardware Services">
+<block name="kernelhwsrv" level="hw" levels="hw-if adapt framework test" long-name="Kernel and Hardware Services">
 <collection name="brdbootldr" long-name="Board Boot Loader" level="hw-if">
 <component name="ubootldr" long-name="Boot Loader" introduced="9.2" purpose="optional">
 <unit bldFile="os/kernelhwsrv/brdbootldr/ubootldr" mrp="os/kernelhwsrv/brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -205,7 +205,7 @@
 <unit bldFile="os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="os/kernelhwsrv/bsptemplate/asspandvariant/base_template.mrp"/>
 </component>
 </collection>
-<collection name="kernel" long-name="Kernel Architecture" level="adaptation">
+<collection name="kernel" long-name="Kernel Architecture" level="adapt">
 <component name="eka" long-name="Kernel Architecture" introduced="8.0" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka" mrp="os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -221,7 +221,7 @@
 <unit bldFile="os/kernelhwsrv/kerneltest/f32test/group" mrp="os/kernelhwsrv/kerneltest/f32test/group/base_f32test.mrp"/>
 </component>
 </collection>
-<collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
+<collection name="ldds" long-name="Logical Device Drivers" level="adapt">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
@@ -633,7 +633,7 @@
 </component>
 </collection>
 </block>
-<block name="persistentdata" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Persistent Data Services">
+<block name="persistentdata" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Persistent Data Services">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="^3" purpose="mandatory">
 <unit bldFile="os/persistentdata/featuremgmt/featuremgr/group" mrp="os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
@@ -684,7 +684,7 @@
 </component>
 </collection>
 </block>
-<block name="devicesrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Device Services">
+<block name="devicesrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Device Services">
 <collection name="devicesrv_pub" long-name="Device Services Public Interfaces" level="app-if">
 <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60,bldmefirst" purpose="optional" class="api">
 <!-- this needs to be moved to deviceplatformrelease -->
@@ -1135,7 +1135,7 @@
 </component>
 </collection>
 </block>
-<block name="lbs" level="services" levels="hw-if data-acquisition adaptation management application-interface" long-name="Locating Services">
+<block name="lbs" level="services" levels="hw-if data-acquisition adapt management application-interface" long-name="Locating Services">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -1156,9 +1156,9 @@
 <unit bldFile="os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
-<component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
-<unit bldFile="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
+<collection name="datasourceadapt" long-name="Data Source Adaptation" level="adapt">
+<component name="gpsdatasourceadapt" long-name="GPS Data Source Adaptation" introduced="^2" purpose="optional" plugin="Y">
+<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">
@@ -1191,7 +1191,7 @@
 <unit bldFile="os/lbs/locationmgmt/networkgateway/group" mrp="os/lbs/locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
 </component>
 </collection>
-<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adaptation">
+<collection name="networkprotocolmodules" long-name="Network Protocol Modules" level="adapt">
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
@@ -1301,7 +1301,7 @@
 </component>
 </collection>
 </block>
-<block name="networkingsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Networking Services">
+<block name="networkingsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Networking Services">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="os/networkingsrv/esockapiextensions/internetsockets/group" mrp="os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -1503,15 +1503,15 @@
 </component>
 </collection>
 </block>
-<block name="cellularsrv" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
+<block name="cellularsrv" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Cellular Baseband Services">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="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">
-<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="smsprotocols" long-name="SMS Protocols" level="framework">
@@ -1598,7 +1598,7 @@
 <unit mrp="os/cellularsrv/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
 </component>
 </collection>
-<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adaptation">
+<collection name="hwpluginsimulation" long-name="Hardware Plugin Simulation" level="adapt">
 <component name="mocksy" long-name="MockSY" introduced="^2" purpose="development" plugin="Y">
 <unit bldFile="os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
@@ -1611,10 +1611,10 @@
 </component>
 </collection>
 </block>
-<block name="bt" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Bluetooth">
+<block name="bt" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Bluetooth">
 <collection name="bt_plat" long-name="Bluetooth Platform Interfaces" level="app-if">
-<component name="bluetooth_audio_adaptation_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/bt/bt_plat/bluetooth_audio_adaptation_api/group"/>
+<component name="bluetooth_audio_adapt_api" long-name="Bluetooth Audio Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/bt/bt_plat/bluetooth_audio_adapt_api/group"/>
 </component>
 <component name="bluetooth_power_management_api" long-name="Bluetooth Power Management API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/bt/bt_plat/bluetooth_power_management_api/group"/>
@@ -1694,12 +1694,12 @@
 </component>
 </collection>
 <collection name="btsimulator" long-name="Bluetooth Simulator" level="internal-utils">
-<component name="btaudioadaptation_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional">
-<unit bldFile="os/bt/btsimulator/btaudioadaptation_stub/group"/>
+<component name="btaudioadapt_stub" long-name="Bluetooth Audio Adaption Stub" introduced="^3" filter="s60" purpose="optional">
+<unit bldFile="os/bt/btsimulator/btaudioadapt_stub/group"/>
 </component>
 </collection>
 </block>
-<block name="usb" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="USB">
+<block name="usb" level="services" levels="adapt hw-if plugin framework server app-if" long-name="USB">
 <collection name="usb_plat" long-name="USB Platform Interfaces" level="app-if">
 <!-- placeholder for platform APIs -->
 </collection>
@@ -1720,7 +1720,7 @@
 </component>
 </collection>
 </block>
-<block name="mm" level="services" levels="adaptation hw-if device-fw devices middleware app-if" long-name="Multimedia">
+<block name="mm" level="services" levels="adapt hw-if device-fw devices middleware app-if" long-name="Multimedia">
 <collection name="mm_pub" long-name="Multimedia Public Interfaces" level="app-if">
 <component name="audio_effects_api" long-name="Audio Effects API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_pub/audio_effects_api/group" filter="!test"/>
@@ -1784,8 +1784,8 @@
 <component name="custom_interface_utility_api" long-name="Custom Interface Utility API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/custom_interface_utility_api/group"/>
 </component>
-<component name="devsound_adaptation_api" long-name="DevSound Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/devsound_adaptation_api/group"/>
+<component name="devsound_adapt_api" long-name="DevSound Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/mm/mm_plat/devsound_adapt_api/group"/>
 </component>
 <component name="display_posting_api" long-name="Display Posting API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/display_posting_api/group"/>
@@ -1808,8 +1808,8 @@
 <component name="error_concealment_interface_proxy_api" long-name="Error Concealment Interface Proxy API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/error_concealment_interface_proxy_api/group"/>
 </component>
-<component name="fm_radio_adaptation_api" long-name="FM Radio Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/fm_radio_adaptation_api/group"/>
+<component name="fm_radio_adapt_api" long-name="FM Radio Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/mm/mm_plat/fm_radio_adapt_api/group"/>
 </component>
 <component name="g711_decoder_interface_api" long-name="G711 Decoder Interface API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/g711_decoder_interface_api/group" filter="!test"/>
@@ -1892,8 +1892,8 @@
 <component name="ra8_decoder_interface_proxy_api" long-name="RA8 Decoder Interface Proxy API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/ra8_decoder_interface_proxy_api/group"/>
 </component>
-<component name="rds_adaptation_api" long-name="RDS Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="os/mm/mm_plat/rds_adaptation_api/group"/>
+<component name="rds_adapt_api" long-name="RDS Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="os/mm/mm_plat/rds_adapt_api/group"/>
 </component>
 <component name="restricted_audio_output_api" long-name="Restricted Audio Output API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/mm/mm_plat/restricted_audio_output_api/group" filter="!test"/>
@@ -2071,9 +2071,9 @@
 <unit bldFile="os/mm/mmdevicefw/speechrecogsupport/group" mrp="os/mm/mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadapt" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="^3" purpose="optional">
-<unit bldFile="os/mm/mmswadaptation/videorenderer/group" mrp="os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
+<unit bldFile="os/mm/mmswadapt/videorenderer/group" mrp="os/mm/mmswadapt/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
 </collection>
 <collection name="mmtestenv" long-name="Multimedia Test Environment" level="device-fw"/>
@@ -2120,7 +2120,7 @@
 <unit bldFile="os/mm/devsound/a3fsrvstart/group" mrp="os/mm/devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
 </component>
 </collection>
-<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+<collection name="mmhais" long-name="Multimedia Hardware Adaptation Interfaces" level="adapt">
 <component name="devsoundhwdeviceapi" long-name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
 <unit bldFile="os/mm/devsound/hwdevapi/group" mrp="os/mm/devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
 </component>
@@ -2128,10 +2128,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="^2" purpose="optional">
-<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="^2" purpose="optional">
-<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">
 <unit bldFile="os/mm/mmhais/videohai/group" mrp="os/mm/mmhais/videohai/group/multimedia_videohai.mrp"/>
@@ -2141,7 +2141,7 @@
 </component>
 </collection>
 </block>
-<block name="imagingext" level="services" levels="adaptation hw-if plugin framework server app-if" long-name="Imaging Extensions">
+<block name="imagingext" level="services" levels="adapt hw-if plugin framework server app-if" long-name="Imaging Extensions">
 <collection name="imagingext_pub" long-name="Imaging Extensions Public Interfaces" level="app-if">
 <component name="exif_api" long-name="Exif API" filter="s60" purpose="optional" class="api">
 <unit bldFile="os/imagingext/imagingext_pub/exif_api/group" filter="!test"/>
@@ -2170,13 +2170,13 @@
 <unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
 </component>
 </collection>
-<collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
+<collection name="imageadaptextensions" long-name="Image Adaptation Extensions" level="app-if">
 <component name="iclextjpegapi" long-name="ICL Extension JPEG API" filter="s60" purpose="optional">
-<unit bldFile="os/imagingext/imageadaptationextensions/iclextjpegapi/group"/>
-</component>
-<component name="imageadaptationextensions_build" long-name="Image Adaptation Extensions Build" filter="s60" purpose="optional">
+<unit bldFile="os/imagingext/imageadaptextensions/iclextjpegapi/group"/>
+</component>
+<component name="imageadaptextensions_build" long-name="Image Adaptation Extensions Build" filter="s60" 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 name="imagingmodules" long-name="Imaging Modules" level="hw-if">
@@ -2188,13 +2188,13 @@
 </component>
 </collection>
 </block>
-<block name="graphics" level="services" levels="adaptation engines internal-adaptations device-interface internal-utils app-if" long-name="Graphics">
-<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adaptation">
+<block name="graphics" level="services" levels="adapt engines internal-adapts device-interface internal-utils app-if" long-name="Graphics">
+<collection name="graphicsaccelaration" long-name="Graphics Acceleration" level="adapt">
 <component name="vgi" long-name="VGI" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
 </collection>
-<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adaptations">
+<collection name="m3g" long-name="Mobile 3D Graphics" level="internal-adapts">
 <component name="m3gcore11" long-name="M3G Core 1.1" filter="s60" purpose="optional">
 <unit bldFile="os/graphics/m3g/m3gcore11/group"/>
 </component>
@@ -2203,8 +2203,8 @@
 <component name="graphicsresource" long-name="Graphics Resource" introduced="^3" deprecated="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicsresourceservices/graphicsresource/group" mrp="os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
 </component>
-<component name="graphicsresourceadaptation" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceadaptation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceadaptation/group/graphics_graphicsresourceadapter.mrp"/>
+<component name="graphicsresourceadapt" long-name="Graphics Resource Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceadapt/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceadapt/group/graphics_graphicsresourceadapter.mrp"/>
 </component>
 <component name="graphicsresourceimplementation" long-name="Graphics Resource Implementation" introduced="^4" purpose="optional">
 <unit bldFile="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group" mrp="os/graphics/graphicsresourceservices/graphicsresourceimplementation/group/graphics_graphicsresourceimplementation.mrp"/>
@@ -2218,7 +2218,7 @@
 <unit bldFile="os/graphics/graphicsutils/commongraphicsheaders/group" mrp="os/graphics/graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
 </component>
 </collection>
-<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adaptation">
+<collection name="graphicshwdrivers" long-name="Graphics Hardware Drivers" level="adapt">
 <!-- displayldd to be moved here -->
 <component name="surfacemgr" long-name="Surface Manager" introduced="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicshwdrivers/surfacemgr/group" mrp="os/graphics/graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
@@ -2277,7 +2277,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">
 <unit bldFile="os/graphics/opengles/openglesinterface/group" mrp="os/graphics/opengles/openglesinterface/group/graphics_openglesheaders.mrp"/>
 </component>
@@ -2285,7 +2285,7 @@
 <unit bldFile="os/graphics/opengles/openglesinterface/group/opengles_stub"/>
 </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="^2" purpose="optional">
 <unit bldFile="os/graphics/openvg/openvginterface/group" mrp="os/graphics/openvg/openvginterface/group/graphics_openvgheaders.mrp"/>
 </component>
@@ -2297,7 +2297,7 @@
 <unit bldFile="os/graphics/openvg/openvgrefimplementation/sfopenvg/group"/>
 </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="^2" purpose="mandatory">
 <unit bldFile="os/graphics/egl/eglinterface/group" mrp="os/graphics/egl/eglinterface/group/graphics_eglheaders.mrp"/>
 </component>
@@ -2331,8 +2331,8 @@
 <component name="directgdiinterface" long-name="DirectGDI Interface" introduced="^3" deprecated="^3" purpose="optional">
 <unit bldFile="os/graphics/graphicsdeviceinterface/directgdiinterface/group" mrp="os/graphics/graphicsdeviceinterface/directgdiinterface/group/graphics_directgdiheaders.mrp"/>
 </component>
-<component name="directgdiadaptation" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
-<unit bldFile="os/graphics/graphicsdeviceinterface/directgdiadaptation/group" mrp="os/graphics/graphicsdeviceinterface/directgdiadaptation/group/graphics_directgdiadapter.mrp"/>
+<component name="directgdiadapt" long-name="DirectGDI Adaptation" introduced="^3" deprecated="^3" purpose="optional">
+<unit bldFile="os/graphics/graphicsdeviceinterface/directgdiadapt/group" mrp="os/graphics/graphicsdeviceinterface/directgdiadapt/group/graphics_directgdiadapter.mrp"/>
 </component>
 </collection>
 <collection name="graphicstools" long-name="Graphics Tools" level="internal-utils">
@@ -2875,9 +2875,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="^2" deprecated="^4" purpose="optional" plugin="Y">
-<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">
@@ -3003,8 +3003,8 @@
 <component name="lockapp_server_api" long-name="Lock Application Server API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/securitysrv/secsrv_plat/lockapp_server_api/group"/>
 </component>
-<component name="devencadaptation_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
-<unit bldFile="mw/securitysrv/secsrv_plat/devencadaptation_api/group"/>
+<component name="devencadapt_api" long-name="Device Encryption Adaptation API" filter="s60" purpose="optional" class="api">
+<unit bldFile="mw/securitysrv/secsrv_plat/devencadapt_api/group"/>
 </component>
 <component name="devenccommonutils_api" long-name="Device Encryption Common Utils API" filter="s60" purpose="optional" class="api">
 <unit bldFile="mw/securitysrv/secsrv_plat/devenccommonutils_api/group"/>