--- a/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 15 15:15:03 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/plugin.xml	Wed Sep 15 15:23:31 2010 -0500
@@ -43,14 +43,6 @@
             templateId="com.nokia.carbide.cpp.templates.symbian.empty"
             wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
 
-      <template
-      		displayName="%openc.label"
-            filterArguments=""
-            groupLabel="%S60.3.label"
-            image="icons/icon_S60.png"
-            location="templates/projecttemplates/OpenC-HelloWorld/template.xml"
-            templateId="com.nokia.carbide.cpp.templates.openC.helloworld"
-            wizardId="com.nokia.carbide.cpp.project.ui.wizards.NewSymbianOSCppProjectWizard"/>
    </extension>
 
 	<!-- CLASS WIZARDS -->

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Wed Sep 15 15:15:03 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/template.xml	Wed Sep 15 15:23:31 2010 -0500
@@ -73,7 +73,7 @@
 		<!-- SIS -->
 		<parameter name="file"
 			sourcePath="sis/Basename.pkg" 
-			targetPath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg" 
+			targetPath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" 
 			/> 
 		<parameter name="file"
 			sourcePath="sis/backup_registration.xml"
@@ -97,7 +97,7 @@
 		<parameter name="project" projectName="$(projectName)"
 			bldInfPath="$(groupDir)/bld.inf"
 			targetMMPFileName="$(baseName).mmp" 
-			pkgFilePath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg" /> 
+			pkgFilePath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" /> 
 	</process>
 
 </template>

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/template.properties	Wed Sep 15 15:15:03 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/template.properties	Wed Sep 15 15:23:31 2010 -0500
@@ -1,6 +1,6 @@
-template.label=3rd-Future Ed. GUI Application
+template.label=GUI Application
 template.desc=A simple platform security enabled GUI application (Hello world).\r\n\
-This wizard generates a Platform Security enabled executable for Nokia S60 3rd-Future Editions only.
+This wizard generates a Platform Security enabled executable for Nokia AVKON SDKs.
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
 basics.uid3.label=Application UID:

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.properties	Wed Sep 15 15:15:03 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.properties	Wed Sep 15 15:23:31 2010 -0500
@@ -1,7 +1,7 @@
 template.label=GUI Application
 template.desc=A simple platform security enabled GUI application (Hello world).\r\n\
 The main container can receive Touch UI events in Touch-enabled SDKs.\r\n\
-This wizard generates a Platform Security enabled executable for Nokia S60 SDKs with Touch UI support.
+This wizard generates a Platform Security enabled executable for Nokia SDKs supporting AVKON and Touch UI.
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
 basics.uid3.label=Application UID:

--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.xml	Wed Sep 15 15:15:03 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/template.xml	Wed Sep 15 15:23:31 2010 -0500
@@ -124,7 +124,7 @@
 			/> 
 		<parameter name="file"
 			sourcePath="sis/baseName.pkg"
-			targetPath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg"
+			targetPath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg"
 			/> 
 		<parameter name="file"
 			sourcePath="sis/backup_registration.xml"
@@ -203,7 +203,7 @@
 		<parameter name="project" projectName="$(projectName)"
 			bldInfPath="$(groupDir)/bld.inf"
 			targetMMPFileName="$(baseName).mmp" 
-			pkgFilePath="$(sisDir)/$(baseName)_S60_3_X_v_1_0_0.pkg" /> 
+			pkgFilePath="$(sisDir)/$(baseName)_S60_5_X_v_1_0_0.pkg" /> 
 	</process>
 	
 </template>