--- a/symbian4/mw/srvdiscovery/package_definition_3.0.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition_3.0.xml	Wed May 19 10:37:39 2010 +0100
@@ -2,27 +2,27 @@
 <SystemDefinition schema="3.0.0">
  <package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
   <collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
-   <component id="upnpstack_plat" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_device_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_common_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_utils_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_control_point_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_httpserver_api/group"/>
    </component>
-   <component id="upnpstack_plat" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+   <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
     <meta rel="Api" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
     <unit bldFile="upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
    </component>