--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h	Thu Aug 13 18:24:35 2009 -0500
@@ -32,7 +32,7 @@
 #define $(className$upper)_H
 
 #include <QtGui/$(parentClass)>
-#include "ui_$(className).h"
+#include "ui_$(baseName).h"
 
 class $(className) : public $(parentClass)
 {
@@ -43,7 +43,7 @@
     ~$(className)();
 
 private:
-    Ui::$(className)Class ui;
+    Ui::$(className) ui;
 };
 
 #endif // $(className$upper)_H

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp	Thu Aug 13 18:24:35 2009 -0500
@@ -37,6 +37,6 @@
 {
     QApplication a(argc, argv);
     $(className) w;
-    w.show();
+    w.showMaximized();
     return a.exec();
 }

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/QDialog.ui	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/QDialog.ui	Thu Aug 13 18:24:35 2009 -0500
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>$(className)Class</class>
- <widget class="QDialog" name="$(className)Class" >
+ <class>$(className)</class>
+ <widget class="QDialog" name="$(className)" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>$(className)</string>
+   <string>$(baseName)</string>
   </property>
  </widget>
  <layoutdefault spacing="6" margin="11" />

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Thu Aug 13 18:24:35 2009 -0500
@@ -8,13 +8,13 @@
 		id="basics" 
 		label="%basics.label">
 		<description>%basics.desc</description>
-		<textField 
+		<filenameField 
 				id="className"
 				label="%className.label"
 				mandatory="true"
 				default="$(baseName)">
 				<description>%className.desc</description>
-		</textField>
+		</filenameField>
 		<uidField 
 				id="uid3"
 				label="%uid3.label"
@@ -62,7 +62,7 @@
 			/>
 		<parameter name="file"
 			sourcePath="QDialog.ui"
-			targetPath="$(className).ui"
+			targetPath="$(baseName).ui"
 			/>
 	</process>
 

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/QMainWindow.ui	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/QMainWindow.ui	Thu Aug 13 18:24:35 2009 -0500
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>$(className)Class</class>
- <widget class="QMainWindow" name="$(className)Class" >
+ <class>$(className)</class>
+ <widget class="QMainWindow" name="$(className)" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>MainWindow</string>
+   <string>$(baseName)</string>
   </property>
   <widget class="QWidget" name="centralwidget" />
   <widget class="QMenuBar" name="menubar" >

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Thu Aug 13 18:24:35 2009 -0500
@@ -8,13 +8,13 @@
 		id="basics" 
 		label="%basics.label">
 		<description>%basics.desc</description>
-		<textField 
+		<filenameField 
 				id="className"
 				label="%className.label"
 				mandatory="true"
 				default="$(baseName)">
 				<description>%className.desc</description>
-		</textField>
+		</filenameField>
 		<uidField 
 				id="uid3"
 				label="%uid3.label"
@@ -62,7 +62,7 @@
 			/>
 		<parameter name="file"
 			sourcePath="QMainWindow.ui"
-			targetPath="$(className).ui"
+			targetPath="$(baseName).ui"
 			/>
 	</process>
 

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/QWidget.ui	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/QWidget.ui	Thu Aug 13 18:24:35 2009 -0500
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>$(className)Class</class>
- <widget class="QWidget" name="$(className)Class" >
+ <class>$(className)</class>
+ <widget class="QWidget" name="$(className)" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>$(className)</string>
+   <string>$(baseName)</string>
   </property>
  </widget>
  <layoutdefault spacing="6" margin="11" />

--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Thu Aug 13 17:12:47 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Thu Aug 13 18:24:35 2009 -0500
@@ -8,13 +8,13 @@
 		id="basics" 
 		label="%basics.label">
 		<description>%basics.desc</description>
-		<textField 
+		<filenameField 
 				id="className"
 				label="%className.label"
 				mandatory="true"
 				default="$(baseName)">
 				<description>%className.desc</description>
-		</textField>
+		</filenameField>
 		<uidField 
 				id="uid3"
 				label="%uid3.label"
@@ -62,7 +62,7 @@
 			/>
 		<parameter name="file"
 			sourcePath="QWidget.ui"
-			targetPath="$(className).ui"
+			targetPath="$(baseName).ui"
 			/>
 	</process>