# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1287756406 -3600
# Node ID c0561f59d56b773aae6cd49d3790c164036465c9
# Parent  e5a436b850a6a58032ffdb5a72d3212d52e6a820
Changed adaptation to adapt

diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/adapt/beagleboard/package_definition.xml
--- a/CompilerCompatibility/adapt/beagleboard/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/adapt/beagleboard/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -96,17 +96,17 @@
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="hw-if">
+<layer name="adapt" long-name="Adaptation" levels="hw-if">
 <block name="beagleboard" long-name="Beagle Board" levels="hw-if">
 <collection name="omap3530" long-name="OMAP 3530" level="hw-if">
 <component name="omap3530" long-name="Beagle Board common" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530" mrp="/sf/adaptation/beagleboard/omap3530/base_beagle.mrp"/>
+<unit bldFile="/sf/adapt/beagleboard/omap3530" mrp="/sf/adapt/beagleboard/omap3530/base_beagle.mrp"/>
 </component>
 <component name="kernel" long-name="Beagle Board kernel" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/kernel"/>
+<unit bldFile="/sf/adapt/beagleboard/omap3530/kernel"/>
 </component>
 <component name="beagleboard" long-name="Beagle Board baseport" introduced="symbian^3" purpose="optional">
-<unit bldFile="/sf/adaptation/beagleboard/omap3530/beagleboard"/>
+<unit bldFile="/sf/adapt/beagleboard/omap3530/beagleboard"/>
 </component>
 </collection>
 </block>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/adapt/beagleboard/sources.csv
--- a/CompilerCompatibility/adapt/beagleboard/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/adapt/beagleboard/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,CompilerCompatibility,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,CompilerCompatibility,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/adapt/qemu/package_definition.xml
--- a/CompilerCompatibility/adapt/qemu/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/adapt/qemu/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -96,11 +96,11 @@
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
-<layer name="adaptation" long-name="Adaptation" levels="hw-if">
+<layer name="adapt" long-name="Adaptation" levels="hw-if">
 <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="/sf/adaptation/qemu/baseport/syborg" mrp="/sf/adaptation/qemu/baseport/syborg/syborg.mrp"/>
+<unit bldFile="/sf/adapt/qemu/baseport/syborg" mrp="/sf/adapt/qemu/baseport/syborg/syborg.mrp"/>
 </component>
 </collection>
 </block>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/adapt/qemu/sources.csv
--- a/CompilerCompatibility/adapt/qemu/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/adapt/qemu/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,CompilerCompatibility,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,CompilerCompatibility,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,CompilerCompatibility,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/adapt/stubs/package_definition.xml
--- a/CompilerCompatibility/adapt/stubs/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/adapt/stubs/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -96,35 +96,35 @@
 ]>
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
-<layer name="adaptation">
+<layer name="adapt">
 <block name="stubs">
 <collection name="s60">
 <component name="audiostubs">
-<unit bldFile="/sf/adaptation/stubs/audiostubs/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/audiostubs/group" mrp=""/>
 </component>
 <component name="drm_stubs">
-<unit bldFile="/sf/adaptation/stubs/drm_stubs/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/drm_stubs/group" mrp=""/>
 </component>
 <component name="ocrsrv_stub">
-<unit bldFile="/sf/adaptation/stubs/ocrsrv_stub/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/ocrsrv_stub/group" mrp=""/>
 </component>
 <component name="omasuplasnconverterstubimpl">
-<unit bldFile="/sf/adaptation/stubs/omasuplasnconverterstubimpl/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/omasuplasnconverterstubimpl/group" mrp=""/>
 </component>
 <component name="posmsgpluginreferenceimpl">
-<unit bldFile="/sf/adaptation/stubs/posmsgpluginreferenceimpl/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/posmsgpluginreferenceimpl/group" mrp=""/>
 </component>
 <component name="power_save_display_mode_stub">
-<unit bldFile="/sf/adaptation/stubs/power_save_display_mode_stub/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/power_save_display_mode_stub/group" mrp=""/>
 </component>
 <component name="systemswstubs">
-<unit bldFile="/sf/adaptation/stubs/systemswstubs/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/systemswstubs/group" mrp=""/>
 </component>
 <component name="tactileclickplugin_stub">
-<unit bldFile="/sf/adaptation/stubs/tactileclickplugin_stub/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/tactileclickplugin_stub/group" mrp=""/>
 </component>
 <component name="wlanhwinit_stub">
-<unit bldFile="/sf/adaptation/stubs/wlanhwinit_stub/group" mrp=""/>
+<unit bldFile="/sf/adapt/stubs/wlanhwinit_stub/group" mrp=""/>
 </component>
 </collection>
 </block>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/adapt/stubs/sources.csv
--- a/CompilerCompatibility/adapt/stubs/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/adapt/stubs/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,CompilerCompatibility,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,CompilerCompatibility,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/bt/package_definition.xml
--- a/CompilerCompatibility/os/bt/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/bt/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="bt" level="services" long-name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+<block name="bt" level="services" long-name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
 <collection name="bluetooth" long-name="Bluetooth Core" level="framework">
 <component name="btstack" long-name="Bluetooth Stack" introduced="6.0" purpose="optional">
 <unit bldFile="/sf/os/bt/bluetooth/btstack" mrp="/sf/os/bt/bluetooth/btstack/bluetooth_stack.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/cellularsrv/package_definition.xml
--- a/CompilerCompatibility/os/cellularsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/cellularsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,13 +97,13 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="cellularsrv" level="services" long-name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="basebandabstraction" long-name="Baseband Abstraction" level="hw-if">
 <component name="basebandchanneladaptor" long-name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
 <unit bldFile="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group" mrp="/sf/os/cellularsrv/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
 </component>
 </collection>
-<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adaptation">
+<collection name="basebandadaptationplugins" long-name="Baseband Adaptation Plugins" level="adapt">
 <component name="basebandchanneladaptorforc32" long-name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/sf/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
 </component>
@@ -206,7 +206,7 @@
 <unit mrp="/sf/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">
 <unit bldFile="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group" mrp="/sf/os/cellularsrv/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
 </component>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/devicesrv/package_definition.xml
--- a/CompilerCompatibility/os/devicesrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/devicesrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="devicesrv" level="services" long-name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="devicesrv" level="services" long-name="Device Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="accessoryservices" long-name="Accessory Services" level="framework">
 <component name="remotecontrolfw" long-name="Remote Control Framework" introduced="9.1" purpose="optional">
 <unit bldFile="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group" mrp="/sf/os/devicesrv/accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/graphics/package_definition.xml
--- a/CompilerCompatibility/os/graphics/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/graphics/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="graphics" level="services" long-name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
+<block name="graphics" level="services" long-name="Graphics" levels="adapt engines internal-adaptations device-interface internal-utils app-if">
 <collection name="graphicsresourceservices" long-name="Graphics Resource Services" level="engines">
 <component name="graphicsresource" long-name="Graphics Resource" introduced="tb92" purpose="optional">
 <unit bldFile="/sf/os/graphics/graphicsresourceservices/graphicsresource/group" mrp="/sf/os/graphics/graphicsresourceservices/graphicsresource/group/graphics_graphicsresource.mrp"/>
@@ -111,7 +111,7 @@
 <unit bldFile="/sf/os/graphics/graphicsutils/commongraphicsheaders/group" mrp="/sf/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">
 <component name="displayldd" long-name="Display Drivers" introduced="tb92" purpose="optional">
 <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/display" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
 </component>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/kernelhwsrv/package_definition.xml
--- a/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/kernelhwsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+<block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adapt framework test">
 <collection name="baseintegtests" long-name="Base Integration Testing" level="test">
 <component name="baseintegrationtest" long-name="Base Integration Test" introduced="9.3" purpose="development">
 <unit bldFile="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group" mrp="/sf/os/kernelhwsrv/baseintegtests/baseintegrationtest/group/base_integration_test.mrp"/>
@@ -113,7 +113,7 @@
 <unit bldFile="/sf/os/kernelhwsrv/bsptemplate/asspandvariant/template_variant" mrp="/sf/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="/sf/os/kernelhwsrv/kernel/eka" mrp="/sf/os/kernelhwsrv/kernel/eka/base_e32.mrp"/>
 </component>
@@ -129,7 +129,7 @@
 <unit bldFile="/sf/os/kernelhwsrv/kerneltest/f32test/group" mrp="/sf/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="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
 </component>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/lbs/package_definition.xml
--- a/CompilerCompatibility/os/lbs/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+<block name="lbs" level="services" long-name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
 <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
 <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -115,7 +115,7 @@
 <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
 </component>
 </collection>
-<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
+<collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adapt">
 <component name="gpsdatasourceadaptation" long-name="GPS Data Source Adaptation" introduced="tb91" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group" mrp="/sf/os/lbs/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
 </component>
@@ -153,7 +153,7 @@
 <unit bldFile="/sf/os/lbs/locationmgmt/networkgateway/group" mrp="/sf/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">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/mm/package_definition.xml
--- a/CompilerCompatibility/os/mm/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/mm/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+<block name="mm" level="services" long-name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
 <collection name="imagingandcamerafws" long-name="Imaging and Camera Frameworks" level="app-if">
 <component name="imagingfws" long-name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
 <unit bldFile="/sf/os/mm/imagingandcamerafws/imagingfws/group" mrp="/sf/os/mm/imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
@@ -178,7 +178,7 @@
 <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/ASR/group/multimedia_mmf_ASR.mrp"/>
 </component>
 </collection>
-<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adaptation">
+<collection name="mmswadaptation" long-name="Multimedia Software Adaptation" level="adapt">
 <component name="videorenderer" long-name="Video Renderer" introduced="tb92" purpose="optional">
 <unit bldFile="/sf/os/mm/mmswadaptation/videorenderer/group" mrp="/sf/os/mm/mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
 </component>
@@ -280,7 +280,7 @@
 <unit bldFile="/sf/os/mm/devsound/a3fsrvstart/group" mrp="/sf/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">
 <!-- PLACEHOLDER="DEF137592" START REMOVE -->
 <unit bldFile="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev" mrp="/sf/mw/mmmw/mmmiddlewarefws/mmfw/SoundDev/group_hwdev/multimedia_mdf_devsound_hwdev.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/networkingsrv/package_definition.xml
--- a/CompilerCompatibility/os/networkingsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/networkingsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="networkingsrv" level="services" long-name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="networkingsrv" level="services" long-name="Networking Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="esockapiextensions" long-name="ESock API Extensions" level="app-if">
 <component name="internetsockets" long-name="Internet Sockets" introduced="ER5" purpose="mandatory">
 <unit bldFile="/sf/os/networkingsrv/esockapiextensions/internetsockets/group" mrp="/sf/os/networkingsrv/esockapiextensions/internetsockets/group/networking_insock.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/persistentdata/package_definition.xml
--- a/CompilerCompatibility/os/persistentdata/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/persistentdata/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+<block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
 <collection name="featuremgmt" long-name="Feature Management" level="framework">
 <component name="featuremgr" long-name="Feature Manager" introduced="tb92" purpose="mandatory">
 <unit bldFile="/sf/os/persistentdata/featuremgmt/featuremgr/group" mrp="/sf/os/persistentdata/featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b CompilerCompatibility/os/usb/package_definition.xml
--- a/CompilerCompatibility/os/usb/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/CompilerCompatibility/os/usb/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -97,7 +97,7 @@
 <SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
-<block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
+<block name="usb" level="services" long-name="USB" levels="adapt hw-if plugin framework server app-if">
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
 <unit bldFile="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/sf/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/adapt/beagleboard/sources.csv
--- a/symbian3/adapt/beagleboard/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/adapt/beagleboard/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/beagleboard/,/sf/adapt/beagleboard,branch,RCL_3,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b symbian3/adapt/codecs.aricent/sources.csv
--- a/symbian3/adapt/codecs.aricent/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/adapt/codecs.aricent/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/adapt/codecs.aricent/,/sf/adapt/codecs.aricent,branch,default,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b symbian3/adapt/qemu/sources.csv
--- a/symbian3/adapt/qemu/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/adapt/qemu/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,3 +1,3 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/qemu/,/sf/adapt/qemu,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_3,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b symbian3/adapt/stubs/sources.csv
--- a/symbian3/adapt/stubs/sources.csv	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/adapt/stubs/sources.csv	Fri Oct 22 15:06:46 2010 +0100
@@ -1,2 +1,2 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_3,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adapt/stubs/,/sf/adapt/stubs,branch,RCL_3,layers.sysdef.xml
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/bt/package_definition.xml
--- a/symbian3/os/bt/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/bt/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <package id="bt" name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
   <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
    <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
     <meta rel="Api" href="bt_plat/bluetooth_audio_adaptation_api/bluetooth_audio_adaptation_api.metaxml"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/cellularsrv/package_definition.xml
--- a/symbian3/os/cellularsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/cellularsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+  <package id="cellularsrv" name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
     <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
       <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
     </collection>
-    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adapt">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
         <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
@@ -109,7 +109,7 @@
         <unit mrp="cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
       </component>
     </collection>
-    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
       <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
         <unit bldFile="hwpluginsimulation/mocksy/group" mrp="hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/devicesrv/package_definition.xml
--- a/symbian3/os/devicesrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/devicesrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <package id="devicesrv" name="Device Services" levels="adapt hw-if plugin framework server app-if">
   <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
    <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
     <meta rel="Api" href="devicesrv_pub/platform_path_definitions_api/platform_path_definitions_api.metaxml"/>
@@ -357,7 +357,7 @@
     <meta rel="config">
      <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
     </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
+    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
       		may need to  -->
     <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
    </component>
@@ -371,7 +371,7 @@
     <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
    </component>
    <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-    <!-- Move exports to a self-contained component.
+    <!-- Move exports to a self-contained component.
          	This needs to be kept around until configuration is in place -->
     <unit bldFile="resourcemgmt/group"/>
    </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/graphics/package_definition.xml
--- a/symbian3/os/graphics/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/graphics/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-  <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+ <package id="graphics" name="Graphics" levels="adapt engines internal-adaptations device-interface internal-utils app-if">
+  <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
    <component id="vgi" filter="s60" name="VGI">
     <unit bldFile="graphicsaccelaration/vgi/group"/>
    </component>
@@ -24,7 +24,7 @@
     <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
    </component>
   </collection>
-  <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+  <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
    <!-- displayldd to be moved here -->
    <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
     <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/imagingext/package_definition.xml
--- a/symbian3/os/imagingext/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/imagingext/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <package id="imagingext" name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
   <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
    <component id="exif_api" name="Exif API" class="api" filter="s60">
     <meta rel="Api" href="imagingext_pub/exif_api/exif_api.metaxml"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/kernelhwsrv/package_definition.xml
--- a/symbian3/os/kernelhwsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/kernelhwsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+  <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adapt framework test">
     <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
       <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
         <unit mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -11,7 +11,7 @@
         <unit bldFile="bsptemplate/asspandvariant/template_variant" mrp="bsptemplate/asspandvariant/base_template.mrp"/>
       </component>
     </collection>
-    <collection id="kernel" name="Kernel Architecture" level="adaptation">
+    <collection id="kernel" name="Kernel Architecture" level="adapt">
       <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
         <unit bldFile="kernel/eka" mrp="kernel/eka/base_e32.mrp"/>
       </component>
@@ -27,7 +27,7 @@
         <unit bldFile="kerneltest/f32test/group" mrp="kerneltest/f32test/group/base_f32test.mrp"/>
       </component>
     </collection>
-    <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+    <collection id="ldds" name="Logical Device Drivers" level="adapt">
       <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
         <unit bldFile="kernel/eka/drivers/ethernet" mrp="kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+  <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
     <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
       <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -21,7 +21,7 @@
         <unit bldFile="datasourcemodules/locationapesuplpsy/group"/>
       </component>
     </collection>
-    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adapt">
       <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
       </component>
@@ -59,7 +59,7 @@
         <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
       </component>
     </collection>
-    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/mm/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <package id="mm" name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
   <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
    <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
@@ -338,7 +338,7 @@
     <unit bldFile="devsoundextensions/effectspresets/group"/>
    </component>
    <component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
-    <!-- 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="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
     <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -444,7 +444,7 @@
     <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
    </component>
   </collection>
-  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adapt">
    <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
     <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
    </component>
@@ -515,7 +515,7 @@
     <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
    </component>
   </collection>
-  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
    <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
     <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
    </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/networkingsrv/package_definition.xml
--- a/symbian3/os/networkingsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/networkingsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+  <package id="networkingsrv" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
     <collection id="commsdb" name="Comms DB" level="server">
       <component id="s60_commsdb" filter="s60" name="S60 Commsdb" class="config">
         <unit bldFile="commsdb/s60_commsdb/group"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/persistentdata/package_definition.xml
--- a/symbian3/os/persistentdata/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/persistentdata/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="persistentdata" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+  <package id="persistentdata" name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
     <collection id="featuremgmt" name="Feature Management" level="framework">
       <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
         <unit bldFile="featuremgmt/featuremgr/group" mrp="featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian3/os/usb/package_definition.xml
--- a/symbian3/os/usb/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian3/os/usb/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <package id="usb" name="USB" levels="adapt hw-if plugin framework server app-if">
   <collection id="usbldd" name="USB Logical Device Drivers" level="hw-if">
    <!-- usbclientdrivers  to be moved here from kernelhwsrv-->
   </collection>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/adapt/openmaxil.nokia/package_definition.xml
--- a/symbian4/adapt/openmaxil.nokia/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/adapt/openmaxil.nokia/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.1">
-  <package id="openmaxil.nokia" name="Nokia OpenMAX IL Adaptation" levels="adaptation hw-if device-fw">
+  <package id="openmaxil.nokia" name="Nokia OpenMAX IL Adaptation" levels="adapt hw-if device-fw">
 
-    <collection id="omxilcomp" name="OpenMAX IL Components" level="adaptation">
+    <collection id="omxilcomp" name="OpenMAX IL Components" level="adapt">
          <component id="omxilgeneric" name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" class="plugin">
         <unit version="1" bldFile="omxilcomp/omxilgeneric/group"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/adapt/stubs/package_definition.xml
--- a/symbian4/adapt/stubs/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/adapt/stubs/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="stubs" name="Stubs" levels="adaptation plugin mid engine">
-    <collection id="audiostubs" name="Audio Stubs" level="adaptation">
+  <package id="stubs" name="Stubs" levels="adapt plugin mid engine">
+    <collection id="audiostubs" name="Audio Stubs" level="adapt">
      <component id="devsoundextensions_stubs" name="Devsound Extensions Stubs">
       <unit bldFile="audiostubs/devsoundextensions_stubs/group"/>
      </component>
@@ -39,7 +39,7 @@
       <unit bldFile="power_save_display_mode_stub/group"/>
      </component>
     </collection>
-    <collection id="systemswstubs" name="System Software Stubs" level="adaptation">
+    <collection id="systemswstubs" name="System Software Stubs" level="adapt">
      <component id="ddcaccessstub" name="DDC Access Stub">
       <unit bldFile="systemswstubs/ddcaccessstub/group"/>
      </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/bt/package_definition.xml
--- a/symbian4/os/bt/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/bt/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="bt" name="Bluetooth" levels="adaptation hw-if plugin framework server app-if">
+ <package id="bt" name="Bluetooth" levels="adapt hw-if plugin framework server app-if">
   <collection id="bt_plat" name="Bluetooth Platform Interfaces" level="app-if">
    <component id="bluetooth_audio_adaptation_api" name="Bluetooth Audio Adaptation API" class="api" filter="s60">
     <meta rel="Api" href="bt_plat/bluetooth_audio_adaptation_api/bluetooth_audio_adaptation_api.metaxml"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/cellularsrv/package_definition.xml
--- a/symbian4/os/cellularsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/cellularsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
+  <package id="cellularsrv" name="Cellular Baseband Services" levels="adapt hw-if plugin framework server app-if">
     <meta rel="License">
       <license type="EPL"><supplier>Nokia</supplier></license>	
     </meta>
@@ -9,7 +9,7 @@
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
     </collection>
-    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
+    <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adapt">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
         <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
@@ -104,7 +104,7 @@
         <unit mrp="cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp"/>
       </component>
     </collection>
-    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adaptation">
+    <collection id="hwpluginsimulation" name="Hardware Plugin Simulation" level="adapt">
       <component id="mocksy" name="MockSY" introduced="^2" purpose="development" class="plugin">
         <unit bldFile="hwpluginsimulation/mocksy/group" mrp="hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="devicesrv" name="Device Services" levels="adaptation hw-if plugin framework server app-if">
+ <package id="devicesrv" name="Device Services" levels="adapt hw-if plugin framework server app-if">
   <collection id="devicesrv_pub" name="Device Services Public Interfaces" level="app-if">
    <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60,bldmefirst">
 	<!-- this needs to be moved to deviceplatformrelease -->
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/graphics/package_definition.xml
--- a/symbian4/os/graphics/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="graphics" name="Graphics" levels="adaptation engines internal-adaptations device-interface internal-utils app-if">
-    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adaptation">
+  <package id="graphics" name="Graphics" levels="adapt engines internal-adaptations device-interface internal-utils app-if">
+    <collection id="graphicsaccelaration" name="Graphics Acceleration" level="adapt">
       <component id="vgi" filter="s60" name="VGI">
         <unit bldFile="graphicsaccelaration/vgi/group"/>
       </component>
@@ -30,7 +30,7 @@
         <unit bldFile="graphicsutils/commongraphicsheaders/group" mrp="graphicsutils/commongraphicsheaders/group/graphics_commonheader.mrp"/>
       </component>
     </collection>
-    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adaptation">
+    <collection id="graphicshwdrivers" name="Graphics Hardware Drivers" level="adapt">
       <!-- displayldd to be moved here -->
       <component id="surfacemgr" name="Surface Manager" introduced="^3" purpose="optional">
         <unit bldFile="graphicshwdrivers/surfacemgr/group" mrp="graphicshwdrivers/surfacemgr/group/graphics_surfacemanager.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/imagingext/package_definition.xml
--- a/symbian4/os/imagingext/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/imagingext/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+ <package id="imagingext" name="Imaging Extensions" levels="adapt hw-if plugin framework server app-if">
   <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
    <component id="exif_api" name="Exif API" class="api" filter="s60">
     <meta rel="Api" href="imagingext_pub/exif_api/exif_api.metaxml"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/kernelhwsrv/package_definition.xml
--- a/symbian4/os/kernelhwsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adaptation framework test">
+  <package id="kernelhwsrv" name="Kernel and Hardware Services" levels="hw-if adapt framework test">
     <collection id="brdbootldr" name="Board Boot Loader" level="hw-if">
       <component id="ubootldr" name="Boot Loader" introduced="9.2" purpose="optional">
         <unit bldFile="brdbootldr/ubootldr" mrp="brdbootldr/ubootldr/base_ubootldr.mrp"/>
@@ -11,7 +11,7 @@
         <unit bldFile="bsptemplate/asspandvariant/template_variant" mrp="bsptemplate/asspandvariant/base_template.mrp"/>
       </component>
     </collection>
-    <collection id="kernel" name="Kernel Architecture" level="adaptation">
+    <collection id="kernel" name="Kernel Architecture" level="adapt">
       <component id="eka" name="Kernel Architecture" introduced="8.0" purpose="mandatory">
         <unit bldFile="kernel/eka" mrp="kernel/eka/base_e32.mrp"/>
       </component>
@@ -33,7 +33,7 @@
         <unit bldFile="kerneltest/f32test/loader" mrp="kerneltest/f32test/loader/base_loader.mrp"/>
       </component>
     </collection>
-    <collection id="ldds" name="Logical Device Drivers" level="adaptation">
+    <collection id="ldds" name="Logical Device Drivers" level="adapt">
       <component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
         <unit bldFile="kernel/eka/drivers/ethernet" mrp="kernel/eka/drivers/ethernet/base_e32_drivers_ethernet.mrp"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/lbs/package_definition.xml
--- a/symbian4/os/lbs/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adaptation management application-interface">
+  <package id="lbs" name="Locating Services" levels="hw-if data-acquisition adapt management application-interface">
     <collection id="datasourcemodules" name="Generic Positioning Plugins" level="data-acquisition">
       <component id="defaultpositioningmodule" name="Default Positioning Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="datasourcemodules/defaultpositioningmodule/group" mrp="datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
@@ -21,7 +21,7 @@
         <unit bldFile="datasourcemodules/locationapesuplpsy/group" mrp="datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
       </component>
     </collection>
-    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adaptation">
+    <collection id="datasourceadaptation" name="Data Source Adaptation" level="adapt">
       <component id="gpsdatasourceadaptation" name="GPS Data Source Adaptation" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="datasourceadaptation/gpsdatasourceadaptation/group" mrp="datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp"/>
       </component>
@@ -59,7 +59,7 @@
         <unit bldFile="locationmgmt/networkgateway/group" mrp="locationmgmt/networkgateway/group/lbs_networkgateway.mrp"/>
       </component>
     </collection>
-    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adaptation">
+    <collection id="networkprotocolmodules" name="Network Protocol Modules" level="adapt">
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="mm" name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
+ <package id="mm" name="Multimedia" levels="adapt hw-if device-fw devices middleware app-if">
   <collection id="mm_pub" name="Multimedia Public Interfaces" level="app-if">
    <component id="audio_effects_api" name="Audio Effects API" class="api" filter="s60">
     <meta rel="Api" href="mm_pub/audio_effects_api/audio_effects_api.metaxml"/>
@@ -452,7 +452,7 @@
     <unit bldFile="mmdevicefw/speechrecogsupport/group" mrp="mmdevicefw/speechrecogsupport/group/multimedia_mmf_ASR.mrp"/>
    </component>
   </collection>
-  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adaptation">
+  <collection id="mmswadaptation" name="Multimedia Software Adaptation" level="adapt">
    <component id="videorenderer" name="Video Renderer" introduced="^3" purpose="optional">
     <unit bldFile="mmswadaptation/videorenderer/group" mrp="mmswadaptation/videorenderer/group/multimedia_videorenderer.mrp"/>
    </component>
@@ -500,7 +500,7 @@
     <unit bldFile="devsound/a3fsrvstart/group" mrp="devsound/a3fsrvstart/group/multimedia_a3f_serverstart.mrp"/>
    </component>
   </collection>
-  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adaptation">
+  <collection id="mmhais" name="Multimedia Hardware Adaptation Interfaces" level="adapt">
    <component id="devsoundhwdeviceapi" name="DevSound Hardware Device API" introduced="7.0s" purpose="optional">
     <unit bldFile="devsound/hwdevapi/group" mrp="devsound/hwdevapi/group/multimedia_mdf_devsound_hwdev.mrp"/>
    </component>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/mmimaging/package_definition.xml
--- a/symbian4/os/mmimaging/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/mmimaging/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="mmimaging" name="Multimedia Imaging" levels="adaptation hw-if device-fw devices middleware app-if">
+  <package id="mmimaging" name="Multimedia Imaging" levels="adapt hw-if device-fw devices middleware app-if">
     <collection id="imaging" name="Imaging Frameworks and Plugins" level="app-if">
       <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
         <unit bldFile="imaging/imagingfws/group" mrp="imaging/imagingfws/group/multimedia_icl.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/networkingsrv/package_definition.xml
--- a/symbian4/os/networkingsrv/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/networkingsrv/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="networkingsrv" name="Networking Services" levels="adaptation hw-if plugin framework server app-if">
+  <package id="networkingsrv" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
     <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
       <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
         <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/openmaxil/package_definition.xml
--- a/symbian4/os/openmaxil/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/openmaxil/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.1">
-  <package id="openmaxil" name="openmaxil" levels="adaptation hw-if device-fw devices middleware app-if">
+  <package id="openmaxil" name="openmaxil" levels="adapt hw-if device-fw devices middleware app-if">
 
 
     <collection id="openmaxil_plat" name="OpenMAX IL Platform Exports" level="hw-if">
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/persistentdata/package_definition.xml
--- a/symbian4/os/persistentdata/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/persistentdata/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="persistentdata" name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
+  <package id="persistentdata" name="Persistent Data Services" levels="adapt hw-if plugin framework server app-if">
     <collection id="featuremgmt" name="Feature Management" level="framework">
       <component id="featuremgr" name="Feature Manager" introduced="^3" purpose="mandatory">
         <unit bldFile="featuremgmt/featuremgr/group" mrp="featuremgmt/featuremgr/group/syslibs_featmgr.mrp"/>
diff -r e5a436b850a6 -r c0561f59d56b symbian4/os/usb/package_definition.xml
--- a/symbian4/os/usb/package_definition.xml	Tue Oct 19 15:58:50 2010 +0100
+++ b/symbian4/os/usb/package_definition.xml	Fri Oct 22 15:06:46 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="usb" name="USB" levels="adaptation hw-if plugin framework server app-if">
+ <package id="usb" name="USB" levels="adapt hw-if plugin framework server app-if">
   <collection id="usb_plat" name="USB Platform Interfaces" level="app-if">
 	<!-- placeholder for platform APIs -->
   </collection>