--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/template.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/template.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -70,11 +70,11 @@
 		<parameter name="project" projectName="$(projectName)" />
 		
 		<parameter name="file"
-			sourcePath="reg/basename_reg.loc" 
+			sourcePath="reg/baseName_reg.loc" 
 			targetPath="$(regDir)/$(baseName)_reg.loc" 
 			/>
 		<parameter name="file"
-			sourcePath="reg/basename_reg.rss" 
+			sourcePath="reg/baseName_reg.rss" 
 			targetPath="$(regDir)/$(baseName)_reg.rss" 
 			/>
 
@@ -111,7 +111,7 @@
 			/>
 		
 		<parameter name="file"
-			sourcePath="group/basename.mmp" 
+			sourcePath="group/baseName.mmp" 
 			targetPath="$(groupDir)/$(baseName).mmp" 
 			/>
 		<parameter name="file"
@@ -119,7 +119,7 @@
 			targetPath="$(groupDir)/bld.inf" 
 			/>
 		<parameter name="file"
-			sourcePath="sis/basename.pkg" 
+			sourcePath="sis/baseName.pkg" 
 			targetPath="$(sisDir)/$(baseName).pkg" 
 			/>
 		<parameter name="file"

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_landscape_right.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_landscape_right.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -17,7 +17,7 @@
 <!-- fonts are found relative to data/s60/fonts -->
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="8" />
 <font key="EditorFont" initData="s60ssb.ttf" size="10" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
@@ -35,7 +35,7 @@
 <font key="standard.AnnotationFont" initData="s60ssb.ttf" size="9" />
 <font key="standard.LegendFont" initData="s60ssb.ttf" size="10" />
 <font key="standard.NormalFont" initData="s60ssb.ttf" size="10" />
-<font key="status.TitleFont" initData="Alb13.10.ttf" size="10" />
+<font key="status.TitleFont" initData="alb13.10.ttf" size="10" />
 
 
 <rectangle key="control.pane.bounds" x="140" y="0" width="68" height="176"/>

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -18,7 +18,7 @@
 <!-- fonts are found relative to data/s60/fonts -->
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="8" />
 <font key="EditorFont" initData="s60ssb.ttf" size="10" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait_2_x.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/classic_portrait_2_x.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -18,26 +18,26 @@
 
 <!-- fonts are found relative to data/s60/fonts -->
 
-<font key="AnnotationFont" initData="Alb12.9.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
-<font key="DenseFont" initData="Alp13.10.ttf" size="10" />
-<font key="EditorFont" initData="Alb13.10.ttf" size="10" />
-<font key="HalfTitleFont" initData="Alb13.10.ttf" size="10" />
-<font key="MessageFont" initData="Alb13.10.ttf" size="10" />
-<font key="NormalFont" initData="Alb13.10.ttf" size="10" />
-<font key="SymbolFont" initData="Alb12.9.ttf" size="9" />
+<font key="AnnotationFont" initData="alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
+<font key="DenseFont" initData="alp13.10.ttf" size="10" />
+<font key="EditorFont" initData="alb13.10.ttf" size="10" />
+<font key="HalfTitleFont" initData="alb13.10.ttf" size="10" />
+<font key="MessageFont" initData="alb13.10.ttf" size="10" />
+<font key="NormalFont" initData="alb13.10.ttf" size="10" />
+<font key="SymbolFont" initData="alb12.9.ttf" size="9" />
 <font key="TimeFont" initData="Acb14.11.ttf" size="11" />
-<font key="TitleFont" initData="Alb19.15.ttf" size="15" />
-<font key="control.pane.font" initData="Alb17.14.ttf" size="14" />
-<font key="menuitem.font" initData="Alb13.10.ttf" size="10" />
-<font key="menuitem.submenu.font" initData="Alb12.9.ttf" size="9" />
-<font key="message.font" initData="Alb13.10.ttf" size="10" />
+<font key="TitleFont" initData="alb19.15.ttf" size="15" />
+<font key="control.pane.font" initData="alb17.14.ttf" size="14" />
+<font key="menuitem.font" initData="alb13.10.ttf" size="10" />
+<font key="menuitem.submenu.font" initData="alb12.9.ttf" size="9" />
+<font key="message.font" initData="alb13.10.ttf" size="10" />
 <font key="navi.tab.font" initData="s60ssb.ttf" size="8" />
-<font key="navi.text.font" initData="Alp13.10.ttf" size="10" />
-<font key="standard.AnnotationFont" initData="Alb12.9.ttf" size="9" />
-<font key="standard.LegendFont" initData="Alb12.9.ttf" size="9" />
-<font key="standard.NormalFont" initData="Alb13.10.ttf" size="10" />
-<font key="status.TitleFont" initData="Alb19.15.ttf" size="15" />
+<font key="navi.text.font" initData="alp13.10.ttf" size="10" />
+<font key="standard.AnnotationFont" initData="alb12.9.ttf" size="9" />
+<font key="standard.LegendFont" initData="alb12.9.ttf" size="9" />
+<font key="standard.NormalFont" initData="alb13.10.ttf" size="10" />
+<font key="status.TitleFont" initData="alb19.15.ttf" size="15" />
 	
 	
 <color key="status.bar.color" r="0" g="0" b="150"/>

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_landscape_right.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_landscape_right.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -18,7 +18,7 @@
 <!-- fonts are found relative to data/s60/fonts -->
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="16" />
 <font key="EditorFont" initData="s60ssb.ttf" size="20" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="18" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_portrait.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/dblres_portrait.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -18,7 +18,7 @@
 <!-- fonts are found relative to data/s60/fonts -->
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="16" />
 <font key="EditorFont" initData="s60ssb.ttf" size="20" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="18" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/masterFonts.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/masterFonts.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -1,7 +1,7 @@
 <!-- bundleentry://1111/data/s60/laf/qvga_landscape_right_3_1.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="11" />
 <font key="EditorFont" initData="s60snrc.ttf" size="10" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />
@@ -25,7 +25,7 @@
 <!-- bundleentry://1111/data/s60/laf/vga_portrait.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -51,7 +51,7 @@
 
 <!-- bundleentry://1111/data/s60/laf/qvga_portrait.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="12" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="10" />
 <font key="EditorFont" initData="s60ssb.ttf" size="12" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
@@ -75,7 +75,7 @@
 
 <!-- bundleentry://1111/data/s60/laf/classic_landscape_right.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="8" />
 <font key="EditorFont" initData="s60ssb.ttf" size="10" />
 <font key="NormalFont" initData="s60ssb.ttf" size="10" />
@@ -83,14 +83,14 @@
 <font key="message.font" initData="s60ssb.ttf" size="10" />
 <font key="navi.tab.font" initData="s60ssb.ttf" size="8" />
 <font key="navi.text.font" initData="s60snrc.ttf" size="8" />
-<font key="status.TitleFont" initData="Alb13.10.ttf" size="10" />
+<font key="status.TitleFont" initData="alb13.10.ttf" size="10" />
 <!-- END -->
 
 
 <!-- bundleentry://1111/data/s60/laf/qhd_landscape_right.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -115,7 +115,7 @@
 <!-- bundleentry://1111/data/s60/laf/qhd_portrait.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -141,7 +141,7 @@
 
 <!-- bundleentry://1111/data/s60/laf/classic_portrait.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="8" />
 <font key="EditorFont" initData="s60ssb.ttf" size="10" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />
@@ -165,7 +165,7 @@
 
 <!-- bundleentry://1111/data/s60/laf/dblres_landscape_right.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="16" />
 <font key="EditorFont" initData="s60ssb.ttf" size="20" />
 <font key="NormalFont" initData="s60ssb.ttf" size="20" />
@@ -180,7 +180,7 @@
 <!-- bundleentry://1111/data/s60/laf/vga_landscape.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />
@@ -206,7 +206,7 @@
 
 <!-- bundleentry://1111/data/s60/laf/qvga_landscape_right.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="9" />
 <font key="EditorFont" initData="s60ssb.ttf" size="11" />
 <font key="NormalFont" initData="s60ssb.ttf" size="11" />
@@ -221,7 +221,7 @@
 <!-- bundleentry://1111/data/s60/laf/qvga_portrait_3_1.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="11" />
 <font key="EditorFont" initData="s60snrc.ttf" size="10" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />
@@ -246,7 +246,7 @@
 
 <!-- bundleentry://1111/data/s60/laf/dblres_portrait.xml -->
 <font key="AnnotationFont" initData="s60ssb.ttf" size="16" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="16" />
 <font key="EditorFont" initData="s60ssb.ttf" size="20" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="18" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_landscape_right.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_landscape_right.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -20,7 +20,7 @@
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_portrait.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qhd_portrait.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -20,7 +20,7 @@
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -18,7 +18,7 @@
 <!-- fonts are found relative to data/s60/fonts -->
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="9" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="9" />
 <font key="EditorFont" initData="s60ssb.ttf" size="11" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right_3_1.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_landscape_right_3_1.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -30,7 +30,7 @@
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="11" />
 <font key="EditorFont" initData="s60snrc.ttf" size="10" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -18,7 +18,7 @@
 <!-- fonts are found relative to data/s60/fonts -->
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="12" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="10" />
 <font key="EditorFont" initData="s60ssb.ttf" size="12" />
 <font key="HalfTitleFont" initData="s60tsb.ttf" size="10" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait_3_1.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/qvga_portrait_3_1.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -27,7 +27,7 @@
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="10" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="14" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="11" />
 <font key="EditorFont" initData="s60snrc.ttf" size="10" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="16" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_landscape.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_landscape.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -20,7 +20,7 @@
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />

--- a/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_portrait.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.component.symbian/data/s60/laf/vga_portrait.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -20,7 +20,7 @@
 
 <font key="AnnotationFont" initData="s60ssb.ttf" size="14" />
 <font key="ButtonFont" initData="s60ssb.ttf" size="21" />
-<font key="CEikEdwin.font" initData="Alb12.9.ttf" size="9" />
+<font key="CEikEdwin.font" initData="alb12.9.ttf" size="9" />
 <font key="DenseFont" initData="s60snrc.ttf" size="17" />
 <font key="EditorFont" initData="s60snrc.ttf" size="15" />
 <font key="EditorFont.settings.list" initData="s60ssb.ttf" size="17" />

--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/template.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/template.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -81,15 +81,15 @@
 		<parameter name="project" projectName="$(projectName)" />
 		
 		<parameter name="file"
-			sourcePath="data/basename_reg.loc" 
+			sourcePath="data/baseName_reg.loc" 
 			targetPath="$(dataDir)/$(baseName)_reg.loc" 
 			/>
 		<parameter name="file"
-			sourcePath="data/basename_reg.rss" 
+			sourcePath="data/baseName_reg.rss" 
 			targetPath="$(dataDir)/$(baseName)_reg.rss" 
 			/>
 		<parameter name="file"
-			sourcePath="inc/basename.pan" 
+			sourcePath="inc/baseName.pan" 
 			targetPath="$(incDir)/$(baseName).pan" 
 			/>
 		<!-- provide some sample BMP images -->
@@ -114,12 +114,12 @@
 			substitute="false" 
 			/>
 		<parameter name="file"
-			sourcePath="gfx/qgn_menu_basename.svg" 
+			sourcePath="gfx/qgn_menu_baseName.svg" 
 			targetPath="$(gfxDir)/qgn_menu_$(baseName).svg" 
 			substitute="false" 
 			/>
 		<parameter name="file"
-			sourcePath="group/basename.mmp" 
+			sourcePath="group/baseName.mmp" 
 			targetPath="$(groupDir)/$(baseName).mmp" 
 			/>
 		<parameter name="file"
@@ -131,7 +131,7 @@
 			targetPath="$(groupDir)/Icons_aif_scalable_dc.mk" 
 			/>
 		<parameter name="file"
-			sourcePath="sis/basename.pkg" 
+			sourcePath="sis/baseName.pkg" 
 			targetPath="$(sisDir)/$(baseName).pkg" 
 			/>
 		<parameter name="file"

--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/template.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/template.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -143,8 +143,8 @@
 			targetPath="$(groupDir)/bld.inf" 
 			/>
 		<parameter name="file"
-			sourcePath="group/Icons_aif_scalable_dc.mk" 
-			targetPath="$(groupDir)/Icons_aif_scalable_dc.mk" 
+			sourcePath="group/icons_aif_scalable_dc.mk" 
+			targetPath="$(groupDir)/icons_aif_scalable_dc.mk" 
 			/>
 		<parameter name="file"
 			sourcePath="sis/baseName.pkg" 

--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/template.xml	Thu Nov 12 14:50:22 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/template.xml	Mon Nov 16 10:07:22 2009 -0600
@@ -143,8 +143,8 @@
 			targetPath="$(groupDir)/bld.inf" 
 			/>
 		<parameter name="file"
-			sourcePath="group/Icons_aif_scalable_dc.mk" 
-			targetPath="$(groupDir)/Icons_aif_scalable_dc.mk" 
+			sourcePath="group/icons_aif_scalable_dc.mk" 
+			targetPath="$(groupDir)/icons_aif_scalable_dc.mk" 
 			/>
 		<parameter name="file"
 			sourcePath="sis/YahooImageSearch.pkg"