--- a/symbian3/app/contacts/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/app/contacts/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -34,12 +34,12 @@
   <collection id="contacts_plat" name="Contacts Apps Platform Interfaces" level="ui">
    <component id="virtual_phonebook_store_api" name="Virtual Phonebook Store API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/virtual_phonebook_store_api/virtual_phonebook_store_api.metaxml"/>
-    <unit bldFile="contacts_plat/virtual_phonebook_store_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_store_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/virtual_phonebook_store_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="virtual_phonebook_sim_services_api" name="Virtual Phonebook SIM Services API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/virtual_phonebook_sim_services_api/virtual_phonebook_sim_services_api.metaxml"/>
-    <unit bldFile="contacts_plat/virtual_phonebook_sim_services_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_sim_services_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/virtual_phonebook_sim_services_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="virtual_phonebook_configuration_api" name="Virtual Phonebook Configuration API" class="api" filter="s60">
@@ -52,12 +52,12 @@
    </component>
    <component id="virtual_phonebook_policy_api" name="Virtual Phonebook Policy API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/virtual_phonebook_policy_api/virtual_phonebook_policy_api.metaxml"/>
-    <unit bldFile="contacts_plat/virtual_phonebook_policy_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_policy_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/virtual_phonebook_policy_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="virtual_phonebook_engine_api" name="Virtual Phonebook Engine API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/virtual_phonebook_engine_api/virtual_phonebook_engine_api.metaxml"/>
-    <unit bldFile="contacts_plat/virtual_phonebook_engine_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_engine_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/virtual_phonebook_engine_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="virtual_phonebook_migration_support_api" name="Virtual Phonebook Migration Support API" class="api" filter="s60">
@@ -66,12 +66,12 @@
    </component>
    <component id="virtual_phonebook_view_definition_api" name="Virtual Phonebook View Definition API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/virtual_phonebook_view_definition_api/virtual_phonebook_view_definition_api.metaxml"/>
-    <unit bldFile="contacts_plat/virtual_phonebook_view_definition_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_view_definition_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/virtual_phonebook_view_definition_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="virtual_phonebook_vcard_api" name="Virtual Phonebook vCard API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/virtual_phonebook_vcard_api/virtual_phonebook_vcard_api.metaxml"/>
-    <unit bldFile="contacts_plat/virtual_phonebook_vcard_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/virtual_phonebook_vcard_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/virtual_phonebook_vcard_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="cms_contactor_api" name="CMS Contactor API" class="api" filter="s60">
@@ -80,12 +80,12 @@
    </component>
    <component id="contactpresence_api" name="Contact Presence API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/contactpresence_api/contactpresence_api.metaxml"/>
-    <unit bldFile="contacts_plat/contactpresence_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/contactpresence_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/contactpresence_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="presence_cache_api" name="Presence Cache API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/presence_cache_api/presence_cache_api.metaxml"/>
-    <unit bldFile="contacts_plat/presence_cache_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/presence_cache_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/presence_cache_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="phonebook_internal_common_api" name="Phonebook Internal Common API" class="api" filter="s60">
@@ -202,22 +202,22 @@
    </component>
    <component id="cca_launch_api" name="CCA Launch API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/cca_launch_api/cca_launch_api.metaxml"/>
-    <unit bldFile="contacts_plat/cca_launch_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/cca_launch_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/cca_launch_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="cca_view_plugin_api" name="CCA View Plugin API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/cca_view_plugin_api/cca_view_plugin_api.metaxml"/>
-    <unit bldFile="contacts_plat/cca_view_plugin_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/cca_view_plugin_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/cca_view_plugin_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="predictivesearch_client_api" name="Predictive Search Client API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/predictivesearch_client_api/predictivesearch_client_api.metaxml"/>
-    <unit bldFile="contacts_plat/predictivesearch_client_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/predictivesearch_client_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/predictivesearch_client_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="predictivesearch_utils_api" name="Predictive Search Utils API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/predictivesearch_utils_api/predictivesearch_utils_api.metaxml"/>
-    <unit bldFile="contacts_plat/predictivesearch_utils_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/predictivesearch_utils_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/predictivesearch_utils_api/tsrc/group" filter="test,api_test"/>
    </component>
    <component id="predictivesearch_adapters_api" name="Predictive Search Adapters API" class="api" filter="s60">
@@ -230,7 +230,7 @@
    </component>
    <component id="phonebook_2_rcl_api" name="Phonebook 2 RCL API" class="api" filter="s60">
     <meta rel="Api" href="contacts_plat/phonebook_2_rcl_api/phonebook_2_rcl_api.metaxml"/>
-    <unit bldFile="contacts_plat/phonebook_2_rcl_api/group" fitler="!test"/>
+    <unit bldFile="contacts_plat/phonebook_2_rcl_api/group" filter="!test"/>
     <unit bldFile="contacts_plat/phonebook_2_rcl_api/tsrc/group" filter="test,api_test"/>
    </component>
   </collection>

--- a/symbian3/app/phone/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/app/phone/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -2,7 +2,7 @@
 <SystemDefinition schema="3.0.0">
  <package id="phone" name="Phone Apps" levels="engine plugin ui app">
   <collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
-   <component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+   <component id="ringing_tone_3d_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
     <meta rel="Api" href="phone_plat/3d_ringing_tone_enabler_api/3d_ringing_tone_enabler_api.metaxml"/>
     <unit bldFile="phone_plat/3d_ringing_tone_enabler_api/group"/>
    </component>
@@ -56,7 +56,7 @@
    <component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
     <unit bldFile="phone_plat/phone_application_voip_commands_api/group"/>
    </component>
-   <component id="telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+   <component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
     <unit bldFile="phone_plat/telephony_mediator_api/group"/>
    </component>
    <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">

--- a/symbian3/app/podcatcher/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/app/podcatcher/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -5,6 +5,10 @@
       <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
         <unit bldFile="group"/> 
       </component>
+      <component id="podcatcher_app" filter="sf_build" name="Podcatcher Application" introduced="^3">
+      </component>
+      <component id="podcatcher_engine" filter="sf_build" name="Podcatcher Engine" introduced="^3">
+      </component>
     </collection>
   </package>
 </SystemDefinition>

--- a/symbian3/app/printing/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/app/printing/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="printing" name="Printing" levels="app">
-    <collection id="DirectPrint" name="DirectPrint" level="app">
+    <collection id="directprint" name="DirectPrint" level="app">
       <component id="DirectPrintApp" filter="sf_build" name="DirectPrint App" introduced="^3">
         <unit bldFile="DirectPrint/DirectPrintApp/group"/>
       </component>

--- a/symbian3/app/radio/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/app/radio/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -20,7 +20,7 @@
       <component id="fmradio_help" filter="s60" name="FM Radio Help">
         <unit bldFile="fmradio/help/group"/>
       </component>
-      <component id="fmradio_build" filter="s60" name="FM Radio ROM">
+      <component id="fmradio_rom" filter="s60" name="FM Radio ROM">
       	<!--  remove above #included bld.infs -->
         <unit bldFile="fmradio/group"/>
       </component>

--- a/symbian3/mw/accesssec/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/accesssec/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -10,7 +10,7 @@
     <meta rel="Api" href="accesssec_plat/wep_security_settings_ui_api/wep_security_settings_ui_api.metaxml"/>
     <unit bldFile="accesssec_plat/wep_security_settings_ui_api/group"/>
    </component>
-   <component id="wi-fi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
+   <component id="wifi_protected_setup_ui_api" name="Wi-Fi Protected Setup UI API" class="api" filter="s60">
     <meta rel="Api" href="accesssec_plat/wi-fi_protected_setup_ui_api/wi-fi_protected_setup_ui_api.metaxml"/>
     <unit bldFile="accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
    </component>

--- a/symbian3/mw/btservices/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/btservices/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -27,17 +27,17 @@
    <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
     <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_connection_management_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
     <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_device_management_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
     <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_discovery_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
@@ -46,7 +46,7 @@
    <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
     <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
-    <unit bldFiile="btservices_plat/bluetooth_engine_settings_api/tsrc/group"  filter="test,api_test"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
@@ -78,7 +78,7 @@
    </component>
    <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
     <unit bldFile="bluetoothengine/btaudioman/group" filter="!test"/>
-    <unit bldFiile="bluetoothengine/btaudioman/tsrc/btAudioManApiTest/group"  filter="test,api_test"/>
+    <unit bldFile="bluetoothengine/btaudioman/tsrc/btAudioManApiTest/group"  filter="test,api_test"/>
    </component>
    <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
     <unit bldFile="bluetoothengine/btmac/group"/>
@@ -88,7 +88,7 @@
    </component>
    <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
     <unit bldFile="bluetoothengine/btaudiostreamer/group" filter="!test"/>
-    <unit bldFiile="bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/group" filter="test,api_test"/>
+    <unit bldFile="bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/group" filter="test,api_test"/>
    </component>
    <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
     <unit bldFile="bluetoothengine/btsap/group"/>

--- a/symbian3/mw/camerasrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/camerasrv/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -29,7 +29,7 @@
     <unit bldFile="camerasrv_plat/media_recorder_api/group" filter="!test"/>
     <unit bldFile="camerasrv_plat/media_recorder_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
+   <component id="lib3gp_file_composer_api" name="3GP File Composer API" class="api" filter="s60">
     <meta rel="Api" href="camerasrv_plat/3gp_file_composer_api/3gp_file_composer_api.metaxml"/>
     <unit bldFile="camerasrv_plat/3gp_file_composer_api/group"/>
    </component>

--- a/symbian3/mw/classicui/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/classicui/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -381,7 +381,7 @@
     <meta rel="Api" href="classicui_plat/avkon_testability_api/avkon_testability_api.metaxml"/>
     <unit bldFile="classicui_plat/avkon_testability_api/group"/>
    </component>
-   <component id="ganes_api" name="ganes_api" class="api" filter="s60">
+   <component id="ganes_api" name="Ganes API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/ganes_api/ganes_api.metaxml"/>
     <unit bldFile="classicui_plat/ganes_api/group"/>
    </component>

--- a/symbian3/mw/imghandling/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -6,7 +6,7 @@
     <meta rel="Api" href="imagehandling_plat/image_handling_library_api/image_handling_library_api.metaxml"/>
     <unit bldFile="imagehandling_plat/image_handling_library_api/group"/>
    </component>
-   <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+   <component id="lib3gp_library_api" name="3GP Library API" class="api" filter="s60">
     <meta rel="Api" href="imagehandling_plat/3gp_library_api/3gp_library_api.metaxml"/>
     <unit bldFile="imagehandling_plat/3gp_library_api/group"/>
    </component>

--- a/symbian3/mw/mmappfw/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/mmappfw/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -26,7 +26,7 @@
     <meta rel="Api" href="mmappfw_plat/playlist_engine_api/playlist_engine_api.metaxml"/>
     <unit bldFile="mmappfw_plat/playlist_engine_api/group"/>
    </component>
-   <component id="mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
+   <component id="mmappfw_mtp_keys_api" name="MTP Keys API" introduced="^1" class="api" filter="s60">
     <meta rel="Api" href="mmappfw_plat/mtp_keys_api/mtp_keys_api.metaxml"/>
     <unit bldFile="mmappfw_plat/mtp_keys_api/group"/>
    </component>

--- a/symbian3/mw/securitysrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -109,7 +109,7 @@
     <unit bldFile="pkiutilities/ocsp/group" mrp="pkiutilities/ocsp/group/securitysrv_ocsp.mrp"/>
    </component>
   </collection>
-  <collection id="wim" name="Wireless Identity Module " level="framework">
+  <collection id="wim" name="Wireless Identity Module" level="framework">
    <!-- collection is really a component. Need to move down a directory-->
    <component id="wim_build" filter="s60" name="WIM Build">
     <unit bldFile="wim/group"/>
@@ -181,7 +181,7 @@
    <component id="devencstarter" filter="s60" name="Device Encryption Starter" introduced="^3" class="plugin">
     <unit bldFile="devencdiskutils/DevEncStarter/group"/>
    </component>
-   <component id="devencdiskutils" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
+   <component id="devencdiskutils_build" filter="s60" name="Device Encryption Disk Utils Build" introduced="^3">
     <!-- need to split this into the above components, or remove #includes and make this a ROM  component-->
     <unit bldFile="devencdiskutils/group"/>
    </component>

--- a/symbian3/mw/web/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/mw/web/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -98,7 +98,7 @@
     <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
     <unit bldFile="web_plat/xml_parser_api/group"/>
    </component>
-   <component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
+   <component id="stmgesturefw_api" name="State Machine Gesture Framework API" class="api" filter="s60">
     <meta rel="Api" href="web_plat/stmgesturefw_api/stmgesturefw_api.metaxml"/>
     <unit bldFile="web_plat/stmgesturefw_api/group"/>
    </component>

--- a/symbian3/os/deviceplatformrelease/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -90,7 +90,7 @@
       <component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
         <unit bldFile="sf_config/rombuild/zoom2/group"/>
       </component>
-      <component id="rombuild_sfrefhw" filter="sf_build" name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
+      <component id="rombuild_sfrefhw" filter="sf_build" name="Foundation Reference Hardware iMaker Config" purpose="development" introduced="^3" class="config">
         <unit bldFile="sf_config/rombuild/sf_refhw/group"/>
       </component>
     </collection>

--- a/symbian3/os/fshell/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/os/fshell/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="fshell" name="Build Tools" levels="bld mw fw ui">
-	 <collection id="fshell_all" name="fshell" level="fw">
-      <component id="fshell_s3" name="fshell s3" introduced="^3" purpose="development">
+  <package id="fshell" name="FShell" levels="bld mw fw ui">
+	 <collection id="fshell_all" name="FShell Build" level="fw">
+      <component id="fshell_s3" name="FShell Symbian^3" introduced="^3" purpose="development">
         <unit bldFile="fshell/build/sf/3"/>
       </component>
     </collection>

--- a/symbian3/os/lbs/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/os/lbs/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -71,15 +71,15 @@
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
-	  <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+	  <component id="suplprotocolmodule1" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
-      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+      <component id="suplprotocolmodule2" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
       </component>
-      <component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
+      <component id="suplrrlpprotocol3" name="SUPL RRLP Protocol Module">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
       </component>

--- a/symbian3/os/ossrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
+++ b/symbian3/os/ossrv/package_definition.xml	Thu Nov 04 14:10:32 2010 +0000
@@ -405,7 +405,7 @@
       <component id="dbus" filter="s60" name="D-Bus">
         <unit bldFile="ofdbus/dbus/group"/>
       </component>
-      <component id="dbus-glib" filter="s60" name="D-Bus GLib">
+      <component id="dbus_glib" filter="s60" name="D-Bus GLib">
         <unit bldFile="ofdbus/dbus-glib/group"/>
       </component>
       <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">