--- a/symbian3/app/camera/package_definition.xml	Thu Feb 18 12:07:25 2010 +0000
+++ b/symbian3/app/camera/package_definition.xml	Thu Feb 18 12:25:45 2010 +0000
@@ -83,6 +83,7 @@
           </component>
           <component name="cameraapp" filter="s60" long-name="Camera Application">
             <unit bldFile="/sf/app/camera/camerauis/cameraapp/group"/>
+            <unit bldFile="/sf/app/camera/camerauis/cameraapp/help/group"/>
           </component>
         </collection>
         <collection name="camera_info" long-name="Camera Apps Info">

--- a/symbian3/app/videotelephony/package_definition.xml	Thu Feb 18 12:07:25 2010 +0000
+++ b/symbian3/app/videotelephony/package_definition.xml	Thu Feb 18 12:25:45 2010 +0000
@@ -79,7 +79,7 @@
       <block name="videotelephony" level="apps" long-name="Video Telephony Apps" levels="engine plugin prot ui">
         <collection name="vtengines" long-name="Video Telephony Engines" level="engine">
           <component name="videoteleng" filter="s60" long-name="Video Telephony Engine">
-            <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/group"/>
+            <unit bldFile="/sf/app/videotelephony/vtengines/videoteleng/Group"/>
           </component>
           <component name="vtmediatorplugin" filter="s60" long-name="VT Mediator Plugin" plugin="Y">
             <unit bldFile="/sf/app/videotelephony/vtengines/vtmediatorplugin/group"/>
@@ -92,10 +92,10 @@
         </collection>
         <collection name="vtprotocolplugins" long-name="VT Protocol Plugins" level="plugin">
           <component name="displaysink" filter="s60" long-name="Display Sink" introduced="^2">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/displaysink/group"/>
+            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/DisplaySink/group"/>
           </component>
           <component name="videosource" filter="s60" long-name="Video Source" introduced="^2">
-            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/videosource/group"/>
+            <unit bldFile="/sf/app/videotelephony/vtprotocolplugins/VideoSource/group"/>
           </component>
         </collection>
         <collection name="vtprotocolsstub" long-name="VT Protocols Stub" level="prot">

--- a/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Feb 18 12:07:25 2010 +0000
+++ b/symbian3/mw/mmmw/package_definition_3.0.xml	Thu Feb 18 12:25:45 2010 +0000
@@ -41,9 +41,6 @@
       <component id="metadatautility" filter="s60" name="Metadata Utility">
         <unit bldFile="mmserv/metadatautility/group"/>
       </component>
-      <component id="3gpextparserstub" filter="sf_build" name="3GPExt Parser Stub">
-        <unit bldFile="mmserv/metadatautility/3GPExtParserLib_stub/group"/>
-      </component>
       <component id="radioutility" filter="s60" name="Radio Utility">
         <unit bldFile="mmserv/radioutility/group"/>
       </component>

--- a/symbian3/mw/securitysrv/package_definition.xml	Thu Feb 18 12:07:25 2010 +0000
+++ b/symbian3/mw/securitysrv/package_definition.xml	Thu Feb 18 12:25:45 2010 +0000
@@ -106,7 +106,7 @@
             <unit bldFile="/sf/mw/securitysrv/pkiutilities/devicetoken/group"/>
           </component>
           <component name="certificates" filter="s60" long-name="Certificates">
-            <unit bldFile="/sf/mw/securitysrv/pkiutilities/certificates/group" filter="sf_build"/>
+            <unit bldFile="/sf/mw/securitysrv/pkiutilities/Certificates/group" filter="sf_build"/>
           </component>
           <component name="pkiutilities_build" filter="s60" long-name="PKI Utilities Build">
             <!-- need to split this into the above components -->

--- a/symbian3/mw/uiresources/package_definition.xml	Thu Feb 18 12:07:25 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml	Thu Feb 18 12:25:45 2010 +0000
@@ -119,6 +119,9 @@
           <component name="aknicon" filter="s60" long-name="Avkon Icon Framework">
             <unit bldFile="/sf/mw/uiresources/uigraphics/aknicon/group"/>
           </component>
+          <component name="nvgrenderstage" filter="sf_build" long-name="NVG Render Stage">
+            <unit bldFile="/sf/mw/uiresources/uigraphics/nvgrenderstage/group"/>
+          </component>
         </collection>
         <collection name="layouts" long-name="Layouts" level="plugin">
           <component name="cdl" filter="s60" long-name="Customization Definition Language">