# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1269434607 0
# Node ID 772a244691790aab263d00b1ca0f94ae5f3fcc23
# Parent  321a53705efc415eb321b3495772af1c509cc2ce
Fix small mistakes found by Accenture

diff -r 321a53705efc -r 772a24469179 symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Sat Mar 20 17:50:49 2010 +0000
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Mar 24 12:43:27 2010 +0000
@@ -748,9 +748,6 @@
      <component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
       <unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
      </component>
-     <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60">
-      <!-- FAULTY <unit bldFile="devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/> -->
-     </component>
     </collection>
     <collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
      <component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
@@ -1172,7 +1169,7 @@
      <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
       <unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
      </component>
-     <component id="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+     <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
       <unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
      </component>
      <component id="rootcertificates" filter="sf_build" name="Root Certificates" introduced="7.0s" purpose="optional">
@@ -6294,8 +6291,9 @@
    </package>
    <package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
     <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
-     <component id="inc" name="Inc" introduced="^1" class="api" filter="s60">
-      <!-- FAULTY <unit bldFile="mmappfw_plat/inc/mmappfwbldvariant.hrh"/> -->
+     <component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
+      <!-- this is no longer necessary when confguration is put in place -->
+      <unit bldFile="/mw/mmappfw/mmappfw_plat"/>
      </component>
      <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
       <unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
@@ -8026,9 +8024,6 @@
      </component>
     </collection>
     <collection id="web_plat" name="Web Platform Interfaces" level="specific">
-     <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
-      <!-- FAULTY <unit bldFile="web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/> -->
-     </component>
      <component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
       <unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
      </component>
@@ -8378,9 +8373,6 @@
      <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
       <unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
      </component>
-     <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
-      <unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
-     </component>
      <component id="webservices_build" filter="s60" name="Web Services Build">
       <!-- need to split into self-contained components -->
       <unit bldFile="/mw/websrv/webservices/group"/>
@@ -9076,7 +9068,7 @@
       <unit bldFile="/app/devicecontrol/applicationmanagement/amadapter2/group"/>
      </component>
      <component id="omascomoadapter" filter="s60" name="OMA SCOMO Adapter" class="plugin" introduced="^3">
-      <unit bldFile="/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+      <unit bldFile="/app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
      </component>
      <component id="applicationmanagement_build" filter="s60" name="AM Build">
       <!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->
diff -r 321a53705efc -r 772a24469179 symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Sat Mar 20 17:50:49 2010 +0000
+++ b/symbian3/single/sysdefs/sf3.svg	Wed Mar 24 12:43:27 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 5165.599999999998 825.5984265184395" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 5156.2999999999975 825.2634607338003" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: %d %b %Y</title>
  <defs>
   <style type="text/css">
@@ -426,8 +426,8 @@
  <g id="os" transform="translate(3.1999999999999993 399.83000000000004)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
-  <g class="layer-detail" transform="translate(509.8999999999999 3.2)">
-   <rect x="-497.0999999999999" class="layer" y="-3.2" width="5143.199999999998" height="227.03"/>
+  <g class="layer-detail" transform="translate(509.89999999999947 3.2)">
+   <rect x="-497.09999999999945" class="layer" y="-3.2" width="5133.899999999998" height="227.03"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -1634,12 +1634,12 @@
     </g>
     <g id="devicesrv" class="package" transform="translate( 1100.9999999999989 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="698.1000000000005" height="116.00000000000001" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="698.1000000000005" x="349.05000000000024" y="105" dy="0.375em">Dev­ice Services</text>
+     <rect class="package" x="0" width="688.8000000000005" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="688.8000000000005" x="344.40000000000026" y="105" dy="0.375em">Dev­ice Services</text>
      <g transform="translate(0 3.2)">
       <g id="devicesrv_pub" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Dev­ice Services Public Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">Dev­ice Services Public Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="platform_path_definitions_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1691,15 +1691,9 @@
          <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Sensor Data Compensator API</text>
         </g>
-        <g id="platform_path_definitions_api" class="component placeholder">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="92.99999999999999" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Platform Path Definitions API</text>
-        </g>
-       </g>
-      </g>
-      <g id="devicesrv_plat" transform="translate(104.39999999999998 0)" class="collection">
+       </g>
+      </g>
+      <g id="devicesrv_plat" transform="translate(95.09999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="474.3000000000004"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="472.90000000000043" height="6.299999999999999">Dev­ice Services Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2006,7 +2000,7 @@
         </g>
        </g>
       </g>
-      <g id="commonservices" transform="translate(580.8000000000004 0)" class="collection">
+      <g id="commonservices" transform="translate(571.5000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Common Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2120,7 +2114,7 @@
         </g>
        </g>
       </g>
-      <g id="mediator" transform="translate(629.4000000000003 0)" class="collection">
+      <g id="mediator" transform="translate(620.1000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Mediator</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2131,7 +2125,7 @@
         </g>
        </g>
       </g>
-      <g id="psmservices" transform="translate(647.1000000000004 0)" class="collection">
+      <g id="psmservices" transform="translate(637.8000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Power Save Mode Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2273,12 +2267,12 @@
         </g>
        </g>
       </g>
-      <g id="devicesrvapitest" transform="translate(664.8000000000004 0)" class="collection placeholder">
+      <g id="devicesrvapitest" transform="translate(655.5000000000005 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Devices Services API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="devicesrv_info" transform="translate(682.5000000000005 0)" class="collection">
+      <g id="devicesrv_info" transform="translate(673.2000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dev­ice Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2292,7 +2286,7 @@
       </g>
      </g>
     </g>
-    <g id="security" class="package" transform="translate( 1801.1999999999994 0)">
+    <g id="security" class="package" transform="translate( 1791.8999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
      <rect class="package" x="0" width="93.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
      <text text-anchor="middle" class="package" width="93.3" x="46.65" y="105" dy="0.375em">OS Security</text>
@@ -2435,7 +2429,7 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">File-based Certificate &amp; Key Stores</text>
         </g>
-        <g id="Browser Root Certificates" class="component">
+        <g id="browserrootcertificates" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Root Certificates</text>
@@ -2466,7 +2460,7 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 1896.5999999999995 0)">
+    <g id="lbs" class="package" transform="translate( 1887.2999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
      <rect class="package" x="0" width="71.7" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
      <text text-anchor="middle" class="package" width="71.7" x="35.85" y="115.00000000000001">Locating Services</text>
@@ -2629,7 +2623,7 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 1970.3999999999994 0)">
+    <g id="commsfw" class="package" transform="translate( 1961.0999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="66.30000000000001" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="66.30000000000001" x="33.150000000000006" y="115.00000000000001">Comms Frame­work</text>
@@ -2796,7 +2790,7 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 2038.7999999999995 0)">
+    <g id="networkingsrv" class="package" transform="translate( 2029.4999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="170.70000000000002" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="105" dy="0.375em">Network­ing Services</text>
@@ -3056,7 +3050,7 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 2211.5999999999995 0)">
+    <g id="wlan" class="package" transform="translate( 2202.2999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="192.6" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="192.6" x="96.3" y="86.2" dy="0.375em">WLAN</text>
@@ -3208,7 +3202,7 @@
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 2406.2999999999993 0)">
+    <g id="cellularsrv" class="package" transform="translate( 2396.9999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="101.39999999999998" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="85.79999999999998" x="58.499999999999986" y="86.2" dy="0.375em">Cellular Baseband Services</text>
@@ -3427,7 +3421,7 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 2509.7999999999993 0)">
+    <g id="bt" class="package" transform="translate( 2500.4999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="81" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="81" x="40.5" y="105" dy="0.375em">Blue­tooth</text>
@@ -3594,7 +3588,7 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 2592.899999999999 0)">
+    <g id="usb" class="package" transform="translate( 2583.5999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
@@ -3646,7 +3640,7 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 2628.2999999999993 0)">
+    <g id="mm" class="package" transform="translate( 2618.9999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="795.8999999999996" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="749.3999999999996" x="421.1999999999998" y="86.2" dy="0.375em">Multi­media</text>
@@ -4402,7 +4396,7 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 3426.299999999999 0)">
+    <g id="imagingext" class="package" transform="translate( 3416.999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="94.2" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="94.2" x="47.1" y="105" dy="0.375em">Imaging Exten­sions</text>
@@ -4488,7 +4482,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3522.599999999999 0)">
+    <g id="graphics" class="package" transform="translate( 3513.2999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="113.1" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="97.5" x="64.35" y="29.8" dy="0.375em">Graphics</text>
@@ -4788,7 +4782,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3637.799999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3628.499999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="84" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="84" x="42" y="115.00000000000001">Text &amp; Localis­ation Services</text>
@@ -4981,7 +4975,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3723.8999999999987 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3714.599999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="115.00000000000001">XML Services</text>
@@ -5096,7 +5090,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3791.0999999999985 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3781.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="196.5" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="196.5" x="98.25" y="115.00000000000001">Dev­ice Platform Release</text>
@@ -5296,7 +5290,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3989.6999999999985 0)">
+    <g id="osrndtools" class="package" transform="translate( 3980.3999999999987 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="115.00000000000001">OS R&amp;D tools</text>
@@ -5521,7 +5515,7 @@
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
   <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="5143.199999999998" height="222.8"/>
+   <rect x="0" class="layer" y="-3.2" width="5133.899999999998" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -11348,11 +11342,10 @@
        <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">MM App FW Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
-        <g id="inc" class="component placeholder">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Inc</text>
+        <g id="mmappfw_plat_build" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Multimedia App Framework Platform Interfaces Build</text>
         </g>
         <g id="collection_helper_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14070,8 +14063,8 @@
     </g>
     <g id="web" class="package" transform="translate( 3548.4000000000015 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="328.8" height="97.2" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="328.8" x="164.4" y="86.2" dy="0.375em">Web</text>
+     <rect class="package" x="0" width="319.50000000000006" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="319.50000000000006" x="159.75000000000003" y="86.2" dy="0.375em">Web</text>
      <g transform="translate(0 3.2)">
       <g id="web_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -14110,103 +14103,97 @@
        </g>
       </g>
       <g id="web_plat" transform="translate(57.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Web Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="browser_platform_api" class="component placeholder">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Browser Platform API</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Web Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="aiw_browser_provider_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AIW Browser Provider API</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">AIW Browser Provider API</text>
         </g>
         <g id="browser_dialogs_provider_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Dialogs Provider API</text>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Browser Dialogs Provider API</text>
         </g>
         <g id="browser_platform_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Browser Platform API</text>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Platform API</text>
         </g>
         <g id="cod_handler_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">COD Handler API</text>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">COD Handler API</text>
         </g>
         <g id="connection_manager_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Connection Manager API</text>
+        </g>
+        <g id="cxml_library_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Connection Manager API</text>
-        </g>
-        <g id="cxml_library_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">cXml Library API</text>
+        </g>
+        <g id="download_mgr_client_api_extn" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">cXml Library API</text>
-        </g>
-        <g id="download_mgr_client_api_extn" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Download Manager Client API Extension</text>
+        </g>
+        <g id="feeds_engine_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Download Manager Client API Extension</text>
-        </g>
-        <g id="feeds_engine_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Feeds Engine API</text>
+        </g>
+        <g id="launcher_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Feeds Engine API</text>
-        </g>
-        <g id="launcher_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Launcher API</text>
+        </g>
+        <g id="multipart_parser_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Launcher API</text>
-        </g>
-        <g id="multipart_parser_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Multipart Parser API</text>
+        </g>
+        <g id="recent_url_store_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Multipart Parser API</text>
-        </g>
-        <g id="recent_url_store_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Recent URL Store API</text>
+        </g>
+        <g id="scheme_handler_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Recent URL Store API</text>
-        </g>
-        <g id="scheme_handler_plugin_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Scheme Handler Plugin API</text>
+        </g>
+        <g id="scriptable_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Scheme Handler Plugin API</text>
-        </g>
-        <g id="scriptable_plugin_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Scriptable Plugin API</text>
+        </g>
+        <g id="webutils_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Scriptable Plugin API</text>
-        </g>
-        <g id="webutils_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Web Utils API</text>
+        </g>
+        <g id="widget_registry_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Web Utils API</text>
-        </g>
-        <g id="widget_registry_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Widget Registry API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Widget Registry API</text>
         </g>
         <g id="xml_parser_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XML Parser API</text>
+         <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">XML Parser API</text>
         </g>
         <g id="stmgesturefw_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">State Machine Gesture Framework API </text>
-        </g>
-       </g>
-      </g>
-      <g id="web_info" transform="translate(227.40000000000003 0)" class="collection">
+         <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">State Machine Gesture Framework API </text>
+        </g>
+       </g>
+      </g>
+      <g id="web_info" transform="translate(218.10000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Web Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -14365,7 +14352,7 @@
         </g>
        </g>
       </g>
-      <g id="codhandler" transform="translate(245.10000000000005 0)" class="collection">
+      <g id="codhandler" transform="translate(235.80000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Content Object Descriptor Handler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -14473,8 +14460,8 @@
     </g>
     <g id="websrv" class="package" transform="translate( 4852.799999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="260.40000000000015" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="115.00000000000003">Web Services</text>
+     <rect class="package" x="0" width="251.10000000000014" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="251.10000000000014" x="125.55000000000007" y="115.00000000000003">Web Services</text>
      <g transform="translate(0 3.2)">
       <g id="websrv_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
@@ -14518,8 +14505,8 @@
        </g>
       </g>
       <g id="webservices" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="260.40000000000015"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="259.00000000000017" height="6.299999999999999">Web Services Fmwk.</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="249.70000000000013" height="6.299999999999999">Web Services Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="wsnotifierplugins" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14651,15 +14638,10 @@
          <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">WS Ovi Plugin</text>
         </g>
-        <g id="wsoviplugin" class="component">
+        <g id="webservices_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">WS Ovi Plugin</text>
-        </g>
-        <g id="webservices_build" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="251.10000000000014" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="255.75000000000014">Web Services Build</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">Web Services Build</text>
         </g>
        </g>
       </g>
@@ -14676,7 +14658,7 @@
       </g>
      </g>
     </g>
-    <g id="platformtools" class="package" transform="translate( 5115.299999999998 100.4)">
+    <g id="platformtools" class="package" transform="translate( 5105.999999999998 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
@@ -14699,7 +14681,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 3879.3000000000015 0)">
+    <g id="uitools" class="package" transform="translate( 3870.0000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -14826,8 +14808,8 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="170.63000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="170.63000000000002" height="9.3" x="-85.61500000000001">Applications</text>
-  <g class="layer-detail" transform="translate(798.1999999999989 3.2)">
-   <rect x="-785.399999999999" class="layer" y="-3.2" width="5143.199999999998" height="170.63000000000002"/>
+  <g class="layer-detail" transform="translate(793.5499999999988 3.2)">
+   <rect x="-780.7499999999989" class="layer" y="-3.2" width="5133.899999999998" height="170.63000000000002"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -20034,7 +20016,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(4844.779499999998 633.2600000000001) translate(317.6205 0) scale(13.002687169121636) translate(-317.6205)">
+ <g id="legend-root" class="legend" transform="translate(4835.479499999998 633.2600000000002) translate(317.6205 0) scale(12.979262988377636) translate(-317.6205)">
   <text text-anchor="middle" class="title" x="301.28525" y="0">
    <tspan dy="0.75em" x="301.28525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="301.28525">System Model</tspan>
@@ -20169,7 +20151,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
      <tspan dy="1em" x="265.17499999999995">663 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2918 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">2915 Components</tspan>
     </text>
    </g>
   </g>
diff -r 321a53705efc -r 772a24469179 symbian3/single/sysdefs/sf3lit.svg
--- a/symbian3/single/sysdefs/sf3lit.svg	Sat Mar 20 17:50:49 2010 +0000
+++ b/symbian3/single/sysdefs/sf3lit.svg	Wed Mar 24 12:43:27 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 4866.799999999999 841.8949607098763" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 4857.5 841.5442030129847" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: %d %b %Y</title>
  <defs>
   <style type="text/css">
@@ -426,8 +426,8 @@
  <g id="os" transform="translate(3.1999999999999993 418.63)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
-  <g class="layer-detail" transform="translate(516.9500000000003 3.2)">
-   <rect x="-504.1500000000003" class="layer" y="-3.2" width="4844.4" height="227.03"/>
+  <g class="layer-detail" transform="translate(516.9500000000005 3.2)">
+   <rect x="-504.15000000000055" class="layer" y="-3.2" width="4835.1" height="227.03"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -1443,12 +1443,12 @@
     </g>
     <g id="devicesrv" class="package" transform="translate( 1040.099999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="680.4000000000004" height="116.00000000000001" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="680.4000000000004" x="340.2000000000002" y="105" dy="0.375em">Dev­ice Services</text>
+     <rect class="package" x="0" width="671.1000000000005" height="116.00000000000001" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="671.1000000000005" x="335.55000000000024" y="105" dy="0.375em">Dev­ice Services</text>
      <g transform="translate(0 3.2)">
       <g id="devicesrv_pub" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Dev­ice Services Public Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">Dev­ice Services Public Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="platform_path_definitions_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1500,14 +1500,9 @@
          <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Sensor Data Compensator API</text>
         </g>
-        <g id="platform_path_definitions_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Platform Path Definitions API</text>
-        </g>
-       </g>
-      </g>
-      <g id="devicesrv_plat" transform="translate(104.39999999999998 0)" class="collection">
+       </g>
+      </g>
+      <g id="devicesrv_plat" transform="translate(95.09999999999998 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="474.3000000000004"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="472.90000000000043" height="6.299999999999999">Dev­ice Services Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1814,7 +1809,7 @@
         </g>
        </g>
       </g>
-      <g id="commonservices" transform="translate(580.8000000000004 0)" class="collection">
+      <g id="commonservices" transform="translate(571.5000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Common Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -1923,12 +1918,12 @@
         </g>
        </g>
       </g>
-      <g id="mediator" transform="translate(629.4000000000003 0)" class="collection placeholder">
+      <g id="mediator" transform="translate(620.1000000000004 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Mediator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="psmservices" transform="translate(647.1000000000004 0)" class="collection">
+      <g id="psmservices" transform="translate(637.8000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Power Save Mode Services</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2059,7 +2054,7 @@
         </g>
        </g>
       </g>
-      <g id="devicesrv_info" transform="translate(664.8000000000004 0)" class="collection">
+      <g id="devicesrv_info" transform="translate(655.5000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Dev­ice Services Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2073,7 +2068,7 @@
       </g>
      </g>
     </g>
-    <g id="security" class="package" transform="translate( 1722.5999999999995 0)">
+    <g id="security" class="package" transform="translate( 1713.2999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
      <rect class="package" x="0" width="93.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
      <text text-anchor="middle" class="package" width="93.3" x="46.65" y="105" dy="0.375em">OS Security</text>
@@ -2211,20 +2206,20 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">File-based Certificate &amp; Key Stores</text>
         </g>
-        <g id="rootcertificates" class="component">
+        <g id="browserrootcertificates" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Root Certificates</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Root Certificates</text>
+        </g>
+        <g id="rootcertificates" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Root Certificates</text>
         </g>
         <g id="asnpkcs" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">ASN PKCS</text>
-        </g>
-        <g id="browserrootcertificates" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
          <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">browserrootcertificates</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">ASN PKCS</text>
         </g>
        </g>
       </g>
@@ -2242,7 +2237,7 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 1817.9999999999995 0)">
+    <g id="lbs" class="package" transform="translate( 1808.6999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
      <rect class="package" x="0" width="64.2" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
      <text text-anchor="middle" class="package" width="64.2" x="32.1" y="115.00000000000001">Locating Services</text>
@@ -2400,7 +2395,7 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 1884.2999999999995 0)">
+    <g id="commsfw" class="package" transform="translate( 1874.9999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="57.00000000000001" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="115.00000000000001">Comms Frame­work</text>
@@ -2552,7 +2547,7 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 1943.3999999999994 0)">
+    <g id="networkingsrv" class="package" transform="translate( 1934.0999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="170.70000000000002" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="105" dy="0.375em">Network­ing Services</text>
@@ -2812,7 +2807,7 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 2116.1999999999994 0)">
+    <g id="wlan" class="package" transform="translate( 2106.8999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="174.89999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="174.89999999999998" x="87.44999999999999" y="86.2" dy="0.375em">WLAN</text>
@@ -2959,7 +2954,7 @@
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 2293.1999999999994 0)">
+    <g id="cellularsrv" class="package" transform="translate( 2283.8999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="101.39999999999998" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="85.79999999999998" x="58.499999999999986" y="86.2" dy="0.375em">Cellular Baseband Services</text>
@@ -3173,7 +3168,7 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 2396.6999999999994 0)">
+    <g id="bt" class="package" transform="translate( 2387.3999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="105" dy="0.375em">Blue­tooth</text>
@@ -3329,7 +3324,7 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 2463.899999999999 0)">
+    <g id="usb" class="package" transform="translate( 2454.5999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
@@ -3376,7 +3371,7 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 2499.2999999999993 0)">
+    <g id="mm" class="package" transform="translate( 2489.9999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="795.8999999999996" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="749.3999999999996" x="421.1999999999998" y="86.2" dy="0.375em">Multi­media</text>
@@ -4116,7 +4111,7 @@
       </g>
      </g>
     </g>
-    <g id="imagingext" class="package" transform="translate( 3297.299999999999 0)">
+    <g id="imagingext" class="package" transform="translate( 3287.999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="91.19999999999999" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="105" dy="0.375em">Imaging Exten­sions</text>
@@ -4197,7 +4192,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3390.599999999999 0)">
+    <g id="graphics" class="package" transform="translate( 3381.2999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="95.4" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="76.80000000000001" x="57" y="29.8" dy="0.375em">Graphics</text>
@@ -4488,7 +4483,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3488.099999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3478.7999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="84.9" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="84.9" x="42.45" y="86.2" dy="0.375em">Text &amp; Localis­ation Services</text>
@@ -4638,7 +4633,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3575.099999999999 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3565.7999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="115.00000000000001">XML Services</text>
@@ -4729,7 +4724,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3642.299999999999 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3632.999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">Dev­ice Platform Release</text>
@@ -4829,7 +4824,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3695.3999999999987 0)">
+    <g id="osrndtools" class="package" transform="translate( 3686.099999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="140.7" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="140.7" x="70.35" y="115.00000000000001">OS R&amp;D tools</text>
@@ -5026,7 +5021,7 @@
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
   <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="4844.4" height="222.8"/>
+   <rect x="0" class="layer" y="-3.2" width="4835.1" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -12600,8 +12595,8 @@
     </g>
     <g id="web" class="package" transform="translate( 3338.400000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="301.8" height="97.2" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="301.8" x="150.9" y="86.2" dy="0.375em">Web</text>
+     <rect class="package" x="0" width="292.5" height="97.2" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="292.5" x="146.25" y="86.2" dy="0.375em">Web</text>
      <g transform="translate(0 3.2)">
       <g id="web_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -12640,98 +12635,93 @@
        </g>
       </g>
       <g id="web_plat" transform="translate(57.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Web Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="browser_platform_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Browser Platform API</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Web Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="aiw_browser_provider_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AIW Browser Provider API</text>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">AIW Browser Provider API</text>
         </g>
         <g id="browser_dialogs_provider_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Dialogs Provider API</text>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Browser Dialogs Provider API</text>
         </g>
         <g id="browser_platform_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Browser Platform API</text>
+        </g>
+        <g id="cod_handler_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Browser Platform API</text>
-        </g>
-        <g id="cod_handler_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">COD Handler API</text>
+        </g>
+        <g id="connection_manager_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">COD Handler API</text>
-        </g>
-        <g id="connection_manager_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Connection Manager API</text>
+        </g>
+        <g id="cxml_library_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Connection Manager API</text>
-        </g>
-        <g id="cxml_library_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">cXml Library API</text>
+        </g>
+        <g id="download_mgr_client_api_extn" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">cXml Library API</text>
-        </g>
-        <g id="download_mgr_client_api_extn" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Download Manager Client API Extension</text>
+        </g>
+        <g id="feeds_engine_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Download Manager Client API Extension</text>
-        </g>
-        <g id="feeds_engine_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Feeds Engine API</text>
+        </g>
+        <g id="launcher_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Feeds Engine API</text>
-        </g>
-        <g id="launcher_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Launcher API</text>
+        </g>
+        <g id="multipart_parser_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Launcher API</text>
-        </g>
-        <g id="multipart_parser_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Multipart Parser API</text>
+        </g>
+        <g id="recent_url_store_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Multipart Parser API</text>
-        </g>
-        <g id="recent_url_store_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Recent URL Store API</text>
+        </g>
+        <g id="scheme_handler_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Recent URL Store API</text>
-        </g>
-        <g id="scheme_handler_plugin_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Scheme Handler Plugin API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Scheme Handler Plugin API</text>
         </g>
         <g id="scriptable_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Scriptable Plugin API</text>
+         <use width="9.3" height="9.3" x="111.59999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Scriptable Plugin API</text>
         </g>
         <g id="webutils_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Web Utils API</text>
+         <use width="9.3" height="9.3" x="120.89999999999998" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Web Utils API</text>
         </g>
         <g id="widget_registry_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Widget Registry API</text>
+        </g>
+        <g id="xml_parser_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="139.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Widget Registry API</text>
-        </g>
-        <g id="xml_parser_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">XML Parser API</text>
+        </g>
+        <g id="stmgesturefw_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">XML Parser API</text>
-        </g>
-        <g id="stmgesturefw_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="158.10000000000002" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">State Machine Gesture Framework API </text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">State Machine Gesture Framework API </text>
         </g>
        </g>
       </g>
@@ -12872,7 +12862,7 @@
         </g>
        </g>
       </g>
-      <g id="codhandler" transform="translate(227.40000000000003 0)" class="collection">
+      <g id="codhandler" transform="translate(218.10000000000002 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Content Object Descriptor Handler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -12927,8 +12917,8 @@
     </g>
     <g id="websrv" class="package" transform="translate( 4563.3 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="251.10000000000014" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="251.10000000000014" x="125.55000000000007" y="115.00000000000003">Web Services</text>
+     <rect class="package" x="0" width="241.80000000000013" height="116.00000000000001" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="241.80000000000013" x="120.90000000000006" y="115.00000000000003">Web Services</text>
      <g transform="translate(0 3.2)">
       <g id="websrv_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
@@ -12972,8 +12962,8 @@
        </g>
       </g>
       <g id="webservices" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="251.10000000000014"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="249.70000000000013" height="6.299999999999999">Web Services Fmwk.</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="241.80000000000013"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="240.40000000000012" height="6.299999999999999">Web Services Fmwk.</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="wsnotifierplugins" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -13105,16 +13095,11 @@
          <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">WS Ovi Plugin</text>
         </g>
-        <g id="wsoviplugin" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="241.80000000000013" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="246.45000000000013">WS Ovi Plugin</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="platformtools" class="package" transform="translate( 4816.5 100.4)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="platformtools" class="package" transform="translate( 4807.200000000001 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
@@ -13137,7 +13122,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 3642.300000000001 0)">
+    <g id="uitools" class="package" transform="translate( 3633.000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -13235,8 +13220,8 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="189.43"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="189.43" height="9.3" x="-95.015">Applications</text>
-  <g class="layer-detail" transform="translate(804.9499999999989 3.2)">
-   <rect x="-792.149999999999" class="layer" y="-3.2" width="4844.4" height="189.43"/>
+  <g class="layer-detail" transform="translate(800.2999999999993 3.2)">
+   <rect x="-787.4999999999993" class="layer" y="-3.2" width="4835.1" height="189.43"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -14221,8 +14206,8 @@
        </g>
       </g>
       <g id="applicationmanagement" transform="translate(39.300000000000004 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">App Manage­ment</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">App Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="rfsplugin" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14234,20 +14219,25 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AM Adapter</text>
         </g>
+        <g id="omascomoadapter" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">OMA SCOMO Adapter</text>
+        </g>
         <g id="options" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">options</text>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">options</text>
         </g>
         <g id="client" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">client</text>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">client</text>
         </g>
         <g id="server" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">server</text>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">server</text>
         </g>
        </g>
       </g>
@@ -17620,7 +17610,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(4560.2795 652.0600000000002) translate(303.3205 0) scale(12.827619630061271) translate(-303.3205)">
+ <g id="legend-root" class="legend" transform="translate(4550.9795 652.0600000000001) translate(303.3205 0) scale(12.803091119789137) translate(-303.3205)">
   <text text-anchor="middle" class="title" x="286.98525" y="0">
    <tspan dy="0.75em" x="286.98525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="286.98525">System Model</tspan>
@@ -17746,7 +17736,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
      <tspan dy="-1em" x="250.875">107 Packages</tspan>
      <tspan dy="1em" x="250.875">600 Collections</tspan>
-     <tspan dy="1em" x="250.875">2554 Components</tspan>
+     <tspan dy="1em" x="250.875">2552 Components</tspan>
     </text>
    </g>
   </g>
diff -r 321a53705efc -r 772a24469179 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Sat Mar 20 17:50:49 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Mar 24 12:43:27 2010 +0000
@@ -811,9 +811,6 @@
      <component name="sensor_data_compensator_api" long-name="Sensor Data Compensator API" filter="s60" class="api">
       <unit bldFile="os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
      </component>
-     <component name="platform_path_definitions_api" long-name="Platform Path Definitions API" filter="s60" class="api placeholder">
-      <!-- FAULTY <unit bldFile="devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/> -->
-     </component>
     </collection>
     <collection name="devicesrv_plat" long-name="Device Services Platform Interfaces" level="app-if">
      <component name="configuration_file_parser_api" long-name="Configuration File Parser API" filter="s60" class="api">
@@ -1222,7 +1219,7 @@
      <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
       <unit bldFile="os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
      </component>
-     <component name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+     <component name="browserrootcertificates" long-name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
       <unit mrp="os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
      </component>
      <component name="rootcertificates" filter="sf_build" long-name="Root Certificates" introduced="7.0s" purpose="optional">
@@ -6024,8 +6021,9 @@
    </block>
    <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
     <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-     <component name="inc" long-name="Inc" introduced="^1" filter="s60" class="api placeholder">
-      <!-- FAULTY <unit bldFile="mmappfw_plat/inc/mmappfwbldvariant.hrh"/> -->
+     <component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
+      <!-- this is no longer necessary when confguration is put in place -->
+      <unit bldFile="mw/mmappfw/mmappfw_plat"/>
      </component>
      <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
       <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
@@ -7573,9 +7571,6 @@
      </component>
     </collection>
     <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-     <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api placeholder">
-      <!-- FAULTY <unit bldFile="web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/> -->
-     </component>
      <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
       <unit bldFile="mw/web/web_plat/aiw_browser_provider_api/group"/>
      </component>
@@ -7895,9 +7890,6 @@
      <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
       <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
      </component>
-     <component name="wsoviplugin" filter="s60" long-name="WS Ovi Plugin">
-      <unit bldFile="mw/websrv/webservices/wsoviplugin/group"/>
-     </component>
      <component name="webservices_build" filter="s60" long-name="Web Services Build">
       <!-- need to split into self-contained components -->
       <unit bldFile="mw/websrv/webservices/group"/>
@@ -8589,7 +8581,7 @@
       <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
      </component>
      <component name="omascomoadapter" filter="s60" long-name="OMA SCOMO Adapter" introduced="^3" plugin="Y">
-      <unit bldFile="app/devicecontrol/applicationmanagement/amadapter2/group"/>
+      <unit bldFile="app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
      </component>
      <component name="applicationmanagement_build" filter="s60" long-name="AM Build">
       <!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->
diff -r 321a53705efc -r 772a24469179 symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Sat Mar 20 17:50:49 2010 +0000
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Wed Mar 24 12:43:27 2010 +0000
@@ -742,9 +742,6 @@
      <component id="sensor_data_compensator_api" name="Sensor Data Compensator API" class="api" filter="s60">
       <unit bldFile="/os/devicesrv/devicesrv_pub/sensor_data_compensator_api/group"/>
      </component>
-     <component id="platform_path_definitions_api" name="Platform Path Definitions API" class="api" filter="s60">
-      <!-- FAULTY <unit bldFile="devicesrv_pub/platform_path_definitions_api/inc/platform_paths.hrh"/> -->
-     </component>
     </collection>
     <collection id="devicesrv_plat" name="Device Services Platform Interfaces" level="app-if">
      <component id="configuration_file_parser_api" name="Configuration File Parser API" class="api" filter="s60">
@@ -1160,7 +1157,7 @@
      <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
       <unit bldFile="/os/security/cryptoservices/filebasedcertificateandkeystores/group" mrp="/os/security/cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
      </component>
-     <component id="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+     <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
       <unit mrp="/os/security/cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
      </component>
      <component id="rootcertificates" filter="sf_build" name="Root Certificates" introduced="7.0s" purpose="optional">
@@ -6147,8 +6144,9 @@
    </package>
    <package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
     <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
-     <component id="inc" name="Inc" introduced="^1" class="api" filter="s60">
-      <!-- FAULTY <unit bldFile="mmappfw_plat/inc/mmappfwbldvariant.hrh"/> -->
+     <component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
+      <!-- this is no longer necessary when confguration is put in place -->
+      <unit bldFile="/mw/mmappfw/mmappfw_plat"/>
      </component>
      <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
       <unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
@@ -7870,9 +7868,6 @@
      </component>
     </collection>
     <collection id="web_plat" name="Web Platform Interfaces" level="specific">
-     <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
-      <!-- FAULTY <unit bldFile="web_plat/browser_platform_api/inc/browser_platform_variant.hrh"/> -->
-     </component>
      <component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
       <unit bldFile="/mw/web/web_plat/aiw_browser_provider_api/group"/>
      </component>
@@ -8222,9 +8217,6 @@
      <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
       <unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
      </component>
-     <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
-      <unit bldFile="/mw/websrv/webservices/wsoviplugin/group"/>
-     </component>
      <component id="webservices_build" filter="s60" name="Web Services Build">
       <!-- need to split into self-contained components -->
       <unit bldFile="/mw/websrv/webservices/group"/>
@@ -8920,7 +8912,7 @@
       <unit bldFile="/app/devicecontrol/applicationmanagement/amadapter2/group"/>
      </component>
      <component id="omascomoadapter" filter="s60" name="OMA SCOMO Adapter" class="plugin" introduced="^3">
-      <unit bldFile="/app/devicecontrol/applicationmanagement/amadapter2/group"/>
+      <unit bldFile="/app/devicecontrol/applicationmanagement/omascomoadapter/group"/>
      </component>
      <component id="applicationmanagement_build" filter="s60" name="AM Build">
       <!-- If thes aren't collapsed into one cmp, can all  #includes removed from here, and it renamed AM ROM? -->