diff --git a/data/templates/file/CSharp/CSharp.AvalonFlowDocument.xft b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
similarity index 89%
rename from data/templates/file/CSharp/CSharp.AvalonFlowDocument.xft
rename to data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
index 6d5a31360c..fadf0e752d 100644
--- a/data/templates/file/CSharp/CSharp.AvalonFlowDocument.xft
+++ b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "Avalon FlowDocument"
+		  name        = "WPF FlowDocument"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "FlowDocument${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>An Avalon FlowDocument.</Description>
+	<Description>A Windows Presentation Foundation FlowDocument.</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.AvalonPage.xft b/data/templates/file/CSharp/CSharp.WPFPage.xft
similarity index 94%
rename from data/templates/file/CSharp/CSharp.AvalonPage.xft
rename to data/templates/file/CSharp/CSharp.WPFPage.xft
index 2f2015c883..1073a56425 100644
--- a/data/templates/file/CSharp/CSharp.AvalonPage.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPage.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "Avalon Page"
+		  name        = "WPF Page"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "Page${Number}.xaml"
 		  language    = "C#"/>
 	 
-	<Description>An Avalon page.</Description>
+	<Description>A Windows Presentation Foundation page.</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.AvalonPageFunction.xft b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
similarity index 96%
rename from data/templates/file/CSharp/CSharp.AvalonPageFunction.xft
rename to data/templates/file/CSharp/CSharp.WPFPageFunction.xft
index 000f2ffa76..294ab73c8f 100644
--- a/data/templates/file/CSharp/CSharp.AvalonPageFunction.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "Avalon PageFunction"
+		  name        = "WPF PageFunction"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "PageFunction${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>An Avalon PageFunction.</Description>
+	<Description>A Windows Presentation Foundation PageFunction.</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.AvalonResourceDictionary.xft b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
similarity index 88%
rename from data/templates/file/CSharp/CSharp.AvalonResourceDictionary.xft
rename to data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
index 9f49c04979..25d7ca4587 100644
--- a/data/templates/file/CSharp/CSharp.AvalonResourceDictionary.xft
+++ b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "Avalon ResourceDictionary"
+		  name        = "WPF ResourceDictionary"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "Dictionary${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>An Avalon ResourceDictionary.</Description>
+	<Description>A Windows Presentation Foundation ResourceDictionary.</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.AvalonUserControl.xft b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
similarity index 94%
rename from data/templates/file/CSharp/CSharp.AvalonUserControl.xft
rename to data/templates/file/CSharp/CSharp.WPFUserControl.xft
index e436510ee1..0ea31bbcb0 100644
--- a/data/templates/file/CSharp/CSharp.AvalonUserControl.xft
+++ b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "Avalon User Control"
+		  name        = "WPF User Control"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "UserControl${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>An Avalon User Control.</Description>
+	<Description>A Windows Presentation Foundation User Control.</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.AvalonWindow.xft b/data/templates/file/CSharp/CSharp.WPFWindow.xft
similarity index 95%
rename from data/templates/file/CSharp/CSharp.AvalonWindow.xft
rename to data/templates/file/CSharp/CSharp.WPFWindow.xft
index 2715a97cad..d9c752fa30 100644
--- a/data/templates/file/CSharp/CSharp.AvalonWindow.xft
+++ b/data/templates/file/CSharp/CSharp.WPFWindow.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "Avalon Window"
+		  name        = "WPF Window"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "Window${Number}.xaml"
 		  language    = "C#"/>
 	 
-	<Description>An Avalon window.</Description>
+	<Description>A Windows Presentation Foundation window.</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/project/CSharp/AvalonApplication.xpt b/data/templates/project/CSharp/WPFApplication.xpt
similarity index 93%
rename from data/templates/project/CSharp/AvalonApplication.xpt
rename to data/templates/project/CSharp/WPFApplication.xpt
index 0454cb75ba..2f79437da2 100644
--- a/data/templates/project/CSharp/AvalonApplication.xpt
+++ b/data/templates/project/CSharp/WPFApplication.xpt
@@ -5,16 +5,16 @@
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>Avalon Application Beta</Name>
+		<Name>WPF Application Template Beta</Name>
 		<Category>C#</Category>
 		<Icon>C#.Project.Form</Icon>
 		<LanguageName>C#</LanguageName>
-		<Description>Creates a simple Avalon application.</Description>
+		<Description>Creates a simple Windows Presentation Foundation application.</Description>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
 	<Actions>
-		<Open filename = "AvalonApplication.txt"/>
+		<Open filename = "WPF.txt"/>
 	</Actions>
 	
 	<Combine name = "${ProjectName}" directory = ".">
@@ -112,8 +112,8 @@ namespace ${StandardNamespace}
 
     }
 }]]></File>
-				<File name="AvalonApplication.txt" buildAction="None" language="Default"><![CDATA[First of all let me say that this is just a simple Avalon application with an empty window.
-I hope I can fix and improve this template in the near future.
+				<File name="WPF.txt" buildAction="None" language="Default"><![CDATA[This template is just a simple WPF (formerly known as "Avalon") application with an empty
+window. I hope I can fix and improve this template in the near future.
 If you want to build this Avalon application you need the following things:
 
 	1. The latest version of Microsoft's WinFX Runtime Components
@@ -124,7 +124,7 @@ I personally use the September Community Technology Preview (CTP) and it works f
 So, don't say I did not warn you. :-)
 
 Mathias
-(2005-10-26)]]></File>
+(2005-10-30)]]></File>
 				<File name="AssemblyInfo.cs"><![CDATA[#region Using directives
 
 using System.Reflection;
diff --git a/data/templates/project/CSharp/AvalonNavigationApplication.xpt b/data/templates/project/CSharp/WPFNavigationApplication.xpt
similarity index 94%
rename from data/templates/project/CSharp/AvalonNavigationApplication.xpt
rename to data/templates/project/CSharp/WPFNavigationApplication.xpt
index bfee6c4f65..06838f2425 100644
--- a/data/templates/project/CSharp/AvalonNavigationApplication.xpt
+++ b/data/templates/project/CSharp/WPFNavigationApplication.xpt
@@ -5,11 +5,11 @@
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>Avalon Navigation Application Beta</Name>
+		<Name>WPF Navigation Application Template 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 Windows Presentation Foundation application with one navigation page.</Description>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
@@ -87,7 +87,7 @@ namespace ${StandardNamespace}
 	{
 	}
 }]]></File>
-				<File name="AvalonApplication.txt" buildAction="None" language="Default"><![CDATA[First of all let me say that this is just a simple Avalon application with one empty page.
+				<File name="AvalonApplication.txt" buildAction="None" language="Default"><![CDATA[This template is just a simple WPF (formerly known as "Avalon") application with one empty page.
 I hope I can fix and improve this template in the near future.
 If you want to build this Avalon application you need the following things:
 
@@ -99,7 +99,7 @@ I personally use the September Community Technology Preview (CTP) and it works f
 So, don't say I did not warn you. :-)
 
 Mathias
-(2005-10-26)]]></File>
+(2005-10-30)]]></File>
 				<File name="AssemblyInfo.cs"><![CDATA[#region Using directives
 
 using System.Reflection;