--- a/3k/os/lbs/package_definition.xml	Mon Jul 27 18:33:03 2009 +0100
+++ b/3k/os/lbs/package_definition.xml	Tue Jul 28 14:16:28 2009 +0100
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="Foundation" schema="2.0.1">
+<SystemDefinition name="foundation" schema="2.0.1">
 <systemModel>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="lbs" long-name="Locating Services" tech_domain="lo" level="services" levels="hw-if data-acquisition adaptation management application-interface">
-    <collection name="Data Source Modules" long-name="Generic Positioning Plugins" level="data-acquisition">
-     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="Foundation">
+    <collection name="datasourcemodules" long-name="Generic Positioning Plugins" level="data-acquisition">
+     <component name="locationnpppsy" long-name="Location NPP PSY" origin-model="foundation">
       <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/locationnpppsy/group"/>
      </component>
-     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="Foundation">
+     <component name="locationsuplpsy" long-name="Location SUPL PSY" origin-model="foundation">
       <unit bldFile="/sf/mw/locationsrv/genericpositioningplugins/locationsuplpsy/group"/>
      </component>
-    </collection>
-    <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" origin-model="Symbian">
+    <component name="defaultpositioningmodule" long-name="Default Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
       <unit bldFile="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp"/>
      </component>
      <component name="bluetoothgpspositioningmodule" long-name="Bluetooth GPS Positioning Module" introduced="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
@@ -22,7 +20,8 @@
       <unit bldFile="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp"/>
      </component>
      <component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="/sf/os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/lbs/datasourcemodules/agpsintegrationmodule/group" mrp="os/lbs/datasourcemodules/agpsintegrationmodule/group/lbs_datasourceplugins.mrp"/> -->
      </component>
     </collection>
     <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
@@ -65,7 +64,8 @@
       <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
      </component>
      <component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y" origin-model="Symbian">
-      <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+      <!-- The following unit is removed as non-contributed -->
+      <!-- <unit bldFile="os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/> -->
      </component>
     </collection>
     <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
@@ -76,7 +76,7 @@
      </component>
     </collection>
     <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
-     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="Foundation">
+     <component unofficial="yes" name="lbs_build" long-name="Locating Services Build" origin-model="foundation">
       <unit bldFile="/sf/os/lbs/group"/>
      </component>
     <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">