diff -r 5b9ea224ada6 -r f99df75e4e8e CompilerCompatibility/mw/uitools/package_definition.xml
--- a/CompilerCompatibility/mw/uitools/package_definition.xml	Thu Nov 25 14:33:42 2010 +0000
+++ b/CompilerCompatibility/mw/uitools/package_definition.xml	Wed Dec 01 15:34:13 2010 +0000
@@ -60,10 +60,10 @@
 </component>
 </collection>
 <collection name="uitools_plat" long-name="UI Tools Platform Interfaces" level="if">
-<component name="uitools_cdl_api" long-name="CDL API" filter="s60" class="api">
+<component name="cdl_api" long-name="CDL API" filter="s60" class="api">
 <unit bldFile="/sf/mw/uitools/uitools_plat/cdl_api/group"/>
 </component>
-<component name="uitools_layout_system_private_api" long-name="Layout System Private API" filter="s60" class="api">
+<component name="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>