diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp b/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
index 682f978a507b210ea22c1dd237849d8c8cdfb38f..08eef18c2b96448263e17d9a99086052d3c9f2d4 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/main.cpp
@@ -7,7 +7,7 @@ Q_DECL_EXPORT int main(int argc, char **argv)
 {
     bb::cascades::Application app(argc, argv);
 
-    new %ProjectName%(&app);
+    new %ProjectName:s%(&app);
 
     return bb::cascades::Application::exec();
 }
diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp b/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
index 499c13cfbfa8a50d37ebeb3a557fb00f0ea2af56..34de18ad120fb7d02f48ddcfc10de1c7b172647e 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/project.cpp
@@ -4,7 +4,7 @@
 #include <bb/cascades/QmlDocument>
 #include <bb/cascades/AbstractPane>
 
-%ProjectName%::%ProjectName%(bb::cascades::Application *app)
+%ProjectName:s%::%ProjectName:s%(bb::cascades::Application *app)
     : QObject(app)
 {
     bb::cascades::QmlDocument *qml = bb::cascades::QmlDocument::create("asset:///main.qml").parent(this);
diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp b/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
index 05d9ee0b5f9947c2e3d26266d817f095b2f8e2c1..de0b701395ce957b6ed3a0370e897565c7be109d 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/project.hpp
@@ -1,16 +1,16 @@
-#ifndef %ProjectName%_HPP_
-#define %ProjectName%_HPP_
+#ifndef %ProjectName:h%_HPP_
+#define %ProjectName:h%_HPP_
 
 #include <QObject>
 
 namespace bb { namespace cascades { class Application; }}
 
-class %ProjectName% : public QObject
+class %ProjectName:s% : public QObject
 {
     Q_OBJECT
 public:
-    %ProjectName%(bb::cascades::Application *app);
-    virtual ~%ProjectName%() {}
+    %ProjectName:s%(bb::cascades::Application *app);
+    virtual ~%ProjectName:s%() {}
 };
 
-#endif /* %ProjectName%_HPP_ */
+#endif /* %ProjectName:h%_HPP_ */
diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/project.pro b/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
index 1c18913f263508596616f3406fc31fbf2aa2b3c8..a0034bfcf2eba959b7e0f83d9cd4839557a525fb 100644
--- a/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
+++ b/share/qtcreator/templates/wizards/bb-cascades-app/project.pro
@@ -1,11 +1,8 @@
 TEMPLATE = app
 
-# Additional import path used to resolve QML modules in Creator's code model
-
 LIBS += -lbbdata -lbb -lbbcascades
 QT += declarative xml
 
-# The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp \
     %ProjectName%.cpp
 
@@ -14,5 +11,3 @@ HEADERS += %ProjectName%.hpp
 OTHER_FILES += bar-descriptor.xml \
     assets/main.qml \
     assets/SecondPage.qml
-
-