--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 15:11:50 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 15:19:51 2010 +0100
@@ -8574,16 +8574,12 @@
 </component>
 </collection>
 <collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
+<component name="stifui_avkon" filter="s60" long-name="STIF UI" purpose="development">
+<unit bldFile="app/rndtools/stifui/avkon/group"/>
 </component>
 <component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
 <unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
 </component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
-</component>
 </collection>
 <collection name="memspyui" long-name="Memspy UI" level="generic">
 <!-- collection is really a component. Should move down a directory -->