--- a/symbian4/mw/uitools/package_definition.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/mw/uitools/package_definition.xml	Wed May 19 10:37:39 2010 +0100
@@ -83,10 +83,10 @@
           </component>
         </collection>
         <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
-          <component name="cdl_api" long-name="CDL API" filter="s60" class="api">
+          <component name="uitools_cdl_api" long-name="CDL API" filter="s60" class="api">
             <unit bldFile="/sf/mw/uitools/uitools_plat/cdl_api/group"/>
           </component>
-          <component name="layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+          <component name="uitools_layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
             <unit bldFile="/sf/mw/uitools/uitools_plat/layout_system_private_api/group"/>
           </component>
         </collection>
@@ -103,9 +103,6 @@
           </component>
         </collection>
         <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-          <component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-            <unit bldFile="/sf/mw/uitools/gfxtools/gditools/group"/>
-          </component>
           <component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
             <unit bldFile="/sf/mw/uitools/gfxtools/color/group"/>
           </component>