diff --git a/data/templates/project/CSharp/AvalonApplication.xpt b/data/templates/project/CSharp/AvalonApplication.xpt
index 181fa5548f..7005cc39a8 100644
--- a/data/templates/project/CSharp/AvalonApplication.xpt
+++ b/data/templates/project/CSharp/AvalonApplication.xpt
@@ -9,7 +9,7 @@
 		<Category>C#</Category>
 		<Icon>C#.Project.Form</Icon>
 		<LanguageName>C#</LanguageName>
-		<Description>Creates a simple Avalon application</Description>
+		<Description>Creates a simple Avalon application.</Description>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
@@ -76,7 +76,7 @@ namespace ${StandardNamespace}
 				<File name="Window1.xaml" buildAction="Page" language="XML"><![CDATA[<Window x:Class="${StandardNamespace}.Window1"
     xmlns="http://schemas.microsoft.com/winfx/avalon/2005"
     xmlns:x="http://schemas.microsoft.com/winfx/xaml/2005"
-    Title="${StandardNamespace}"
+    Title="Window1"
     >
     <Grid>
         
diff --git a/data/templates/project/CSharp/AvalonPageApplication.xpt b/data/templates/project/CSharp/AvalonNavigationApplication.xpt
similarity index 97%
rename from data/templates/project/CSharp/AvalonPageApplication.xpt
rename to data/templates/project/CSharp/AvalonNavigationApplication.xpt
index 7cb2dae44e..3d7b94efb9 100644
--- a/data/templates/project/CSharp/AvalonPageApplication.xpt
+++ b/data/templates/project/CSharp/AvalonNavigationApplication.xpt
@@ -5,11 +5,11 @@
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>Avalon Page Application Beta</Name>
+		<Name>Avalon Navigation Application Beta</Name>
 		<Category>C#</Category>
 		<Icon>C#.Project.Form</Icon>
 		<LanguageName>C#</LanguageName>
-		<Description>Creates a simple Avalon application with one navigation page</Description>
+		<Description>Creates a simple Avalon application with one navigation page.</Description>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->