50 files changed, 108 insertions, 106 deletions

diff --git a/build.proj b/build.proj
index 4ac49f7..844fa28 100644
--- a/build.proj
+++ b/build.proj
@@ -5,7 +5,7 @@
 		<SolutionPath>$(ProjectRoot)\src\$(ProductName).sln</SolutionPath>
 		<ILMergeOutputAssemblyDirectory>$(OutputPath)\unified\</ILMergeOutputAssemblyDirectory>
 		<ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)\$(ProductName).dll</ILMergeOutputAssembly>
-		<StarterKitsLayoutPath>$(ProjectRoot)\obj\$(Configuration)\starterkits\</StarterKitsLayoutPath>
+		<ProjectTemplatesLayoutPath>$(ProjectRoot)\obj\$(Configuration)\projecttemplates\</ProjectTemplatesLayoutPath>
 	</PropertyGroup>
 
 	<Import Project="$(ProjectRoot)\tools\$(ProductName).Versioning.targets"/>
@@ -17,7 +17,7 @@
 	<ItemGroup>
 		<SampleProjects Include="$(ProjectRoot)\samples\**\*.csproj" />
 		<SampleSites Include="OAuthConsumer;OAuthServiceProvider;InfoCardRelyingParty" />
-		<StarterKits Include="$(ProjectRoot)\starterkits\**\*.csproj" />
+		<ProjectTemplates Include="$(ProjectRoot)\projecttemplates\**\*.csproj" />
 		<ILMergeInputAssemblies Include="$(OutputPath)\$(ProductName).dll;
 		                                 $(ProjectRoot)\lib\Microsoft.Contracts.dll; "/>
 		<DelaySignedAssemblies Include="$(ILMergeOutputAssembly);
@@ -36,7 +36,7 @@
 			                           $(ProjectRoot)\doc\api;
 			                           $(DropsRoot);
 			                           $(ProjectRoot)\src\PrecompiledWeb;
-			                           $(StarterKitsLayoutPath);
+			                           $(ProjectTemplatesLayoutPath);
 			                           " />
 			<DirtyDirectories Include="@(SampleDirectories->'%(FullPath)\bin')" />
 			<DirtyDirectories Include="@(SampleDirectories->'%(FullPath)\obj')" />
@@ -136,55 +136,56 @@
 				 WorkingDirectory="$(ToolsDirectory)" />
 	</Target>
 
-	<Target Name="BuildStarterKitsLayout" DependsOnTargets="BuildUnifiedProduct;ReSignDelaySignedAssemblies">
+	<Target Name="BuildProjectTemplatesLayout" DependsOnTargets="BuildUnifiedProduct;ReSignDelaySignedAssemblies">
 		<ItemGroup>
-			<StarterKitsSource Include="$(ProjectRoot)\starterkits\**\*"
+			<ProjectTemplatesSource Include="$(ProjectRoot)\projecttemplates\**\*"
 			                   Exclude="
-			                   $(ProjectRoot)\starterkits\**\*.sln.cache;
-			                   $(ProjectRoot)\starterkits\**\*.suo;
-			                   $(ProjectRoot)\starterkits\**\*.gitignore;
-			                   $(ProjectRoot)\starterkits\**\*.log*;
-			                   $(ProjectRoot)\starterkits\**\*~;
-			                   $(ProjectRoot)\starterkits\**\Settings.StyleCop;
-			                   $(ProjectRoot)\starterkits\**\*.user;
-			                   $(ProjectRoot)\starterkits\**\obj\**;
-			                   $(ProjectRoot)\starterkits\**\bin\DotNetOpenAuth.dll;
-			                   $(ProjectRoot)\starterkits\**\bin\DotNetOpenAuth.pdb;
-			                   $(ProjectRoot)\starterkits\**\bin\Microsoft.Contracts.dll;
-			                   $(ProjectRoot)\starterkits\**\*.ldf;
-			                   $(ProjectRoot)\starterkits\**\*.mdf;
+			                   $(ProjectRoot)\projecttemplates\**\*.sln.cache;
+			                   $(ProjectRoot)\projecttemplates\**\*.suo;
+			                   $(ProjectRoot)\projecttemplates\**\*.gitignore;
+			                   $(ProjectRoot)\projecttemplates\**\*.log*;
+			                   $(ProjectRoot)\projecttemplates\**\*~;
+			                   $(ProjectRoot)\projecttemplates\**\Settings.StyleCop;
+			                   $(ProjectRoot)\projecttemplates\**\StyleCop.Cache;
+			                   $(ProjectRoot)\projecttemplates\**\*.user;
+			                   $(ProjectRoot)\projecttemplates\**\obj\**;
+			                   $(ProjectRoot)\projecttemplates\**\bin\DotNetOpenAuth.dll;
+			                   $(ProjectRoot)\projecttemplates\**\bin\DotNetOpenAuth.pdb;
+			                   $(ProjectRoot)\projecttemplates\**\bin\Microsoft.Contracts.dll;
+			                   $(ProjectRoot)\projecttemplates\**\*.ldf;
+			                   $(ProjectRoot)\projecttemplates\**\*.mdf;
 			                   "/>
-			<StarterKitsLayout Include="@(StarterKitsSource->'$(StarterKitsLayoutPath)%(RecursiveDir)%(FileName)%(Extension)')"/>
+			<ProjectTemplatesLayout Include="@(ProjectTemplatesSource->'$(ProjectTemplatesLayoutPath)%(RecursiveDir)%(FileName)%(Extension)')"/>
 
 			<!-- Include the template icon -->
-			<StarterKitsSource Include="@(StarterKits->'$(ProjectRoot)\doc\logo\dotnetopenid.ico')" />
-			<StarterKitsLayout Include="@(StarterKits->'$(StarterKitsLayoutPath)%(RecursiveDir)__TemplateIcon.ico')" />
+			<ProjectTemplatesSource Include="@(ProjectTemplates->'$(ProjectRoot)\doc\logo\dotnetopenid.ico')" />
+			<ProjectTemplatesLayout Include="@(ProjectTemplates->'$(ProjectTemplatesLayoutPath)%(RecursiveDir)__TemplateIcon.ico')" />
 
 			<!-- Include the unified, signed version of the library -->
-			<StarterKitsSource Include="@(StarterKits->'$(ILMergeOutputAssembly)')" />
-			<StarterKitsSource Include="@(StarterKits->'$(ILMergeOutputAssemblyDirectory)\$(ProductName).pdb')" />
-			<StarterKitsSource Include="@(StarterKits->'$(OutputPath)\$(ProductName).Contracts.dll')" />
-			<StarterKitsLayout Include="@(StarterKits->'$(StarterKitsLayoutPath)%(RecursiveDir)bin\$(ProductName).dll')" />
-			<StarterKitsLayout Include="@(StarterKits->'$(StarterKitsLayoutPath)%(RecursiveDir)bin\$(ProductName).pdb')" />
-			<StarterKitsLayout Include="@(StarterKits->'$(StarterKitsLayoutPath)%(RecursiveDir)bin\$(ProductName).Contracts.dll')" />
+			<ProjectTemplatesSource Include="@(ProjectTemplates->'$(ILMergeOutputAssembly)')" />
+			<ProjectTemplatesSource Include="@(ProjectTemplates->'$(ILMergeOutputAssemblyDirectory)\$(ProductName).pdb')" />
+			<ProjectTemplatesSource Include="@(ProjectTemplates->'$(OutputPath)\$(ProductName).Contracts.dll')" />
+			<ProjectTemplatesLayout Include="@(ProjectTemplates->'$(ProjectTemplatesLayoutPath)%(RecursiveDir)bin\$(ProductName).dll')" />
+			<ProjectTemplatesLayout Include="@(ProjectTemplates->'$(ProjectTemplatesLayoutPath)%(RecursiveDir)bin\$(ProductName).pdb')" />
+			<ProjectTemplatesLayout Include="@(ProjectTemplates->'$(ProjectTemplatesLayoutPath)%(RecursiveDir)bin\$(ProductName).Contracts.dll')" />
 		</ItemGroup>
-		<MSBuild Projects="@(StarterKits)" />
-		<RemoveDir Directories="$(StarterKitsLayoutPath)" Condition="'$(NoClean)' != 'true'" />
-		<Copy SourceFiles="@(StarterKitsSource)" DestinationFiles="@(StarterKitsLayout)" SkipUnchangedFiles="true" />
+		<MSBuild Projects="@(ProjectTemplates)" />
+		<RemoveDir Directories="$(ProjectTemplatesLayoutPath)" Condition="'$(NoClean)' != 'true'" />
+		<Copy SourceFiles="@(ProjectTemplatesSource)" DestinationFiles="@(ProjectTemplatesLayout)" SkipUnchangedFiles="true" />
 	</Target>
 
-	<Target Name="BuildStarterKits" DependsOnTargets="BuildStarterKitsLayout">
+	<Target Name="BuildProjectTemplates" DependsOnTargets="BuildProjectTemplatesLayout">
 		<PropertyGroup>
-			<WebFormsRelyingPartyZipFile>$(StarterKitsLayoutPath)\WebFormsRelyingParty.zip</WebFormsRelyingPartyZipFile>
+			<WebFormsRelyingPartyZipFile>$(ProjectTemplatesLayoutPath)\WebFormsRelyingParty.zip</WebFormsRelyingPartyZipFile>
 		</PropertyGroup>
 		<ItemGroup>
-			<WebFormsRelyingPartyStarterKitLayout Include="$(StarterKitsLayoutPath)\WebFormsRelyingParty\**\*" />
+			<WebFormsRelyingPartyProjectTemplateLayout Include="$(ProjectTemplatesLayoutPath)\WebFormsRelyingParty\**\*" />
 		</ItemGroup>
 		<Delete Files="$(WebFormsRelyingPartyZipFile)" />
 		<Zip
-			Files="@(WebFormsRelyingPartyStarterKitLayout)"
+			Files="@(WebFormsRelyingPartyProjectTemplateLayout)"
 			ZipFileName="$(WebFormsRelyingPartyZipFile)"
-			WorkingDirectory="$(StarterKitsLayoutPath)\WebFormsRelyingParty" />
+			WorkingDirectory="$(ProjectTemplatesLayoutPath)\WebFormsRelyingParty" />
 	</Target>
 
 	<Target Name="Documentation" DependsOnTargets="BuildProduct;Chm" Condition="'$(NoDocumentation)' != 'true'">
@@ -207,7 +208,7 @@
 		</PropertyGroup>
 	</Target>
 
-	<Target Name="DropLayout" DependsOnTargets="GetBuildVersion;_SetDropProperties;BuildUnifiedProduct;ReSignDelaySignedAssemblies;BuildSamples;BuildStarterKits;Documentation">
+	<Target Name="DropLayout" DependsOnTargets="GetBuildVersion;_SetDropProperties;BuildUnifiedProduct;ReSignDelaySignedAssemblies;BuildSamples;BuildProjectTemplates;Documentation">
 		<PropertyGroup>
 			<DropBinDirectory>$(DropDirectory)\Bin</DropBinDirectory>
 			<DropLibDirectory>$(DropDirectory)\Lib</DropLibDirectory>
@@ -243,7 +244,7 @@
 			<DropLibSourceFiles Include="
 																$(ProjectRoot)\Lib\log4net.*;
 																" />
-			<DropProjectTemplatesSourceFiles Include="$(StarterKitsLayoutPath)\*.zip" />
+			<DropProjectTemplatesSourceFiles Include="$(ProjectTemplatesLayoutPath)\*.zip" />
 			<DropSamplesSourceFiles Include="$(ProjectRoot)\Samples\**" Exclude="
 															$(ProjectRoot)\**\obj\**;
 															$(ProjectRoot)\**\*.sln.cache;
@@ -255,6 +256,7 @@
 															$(ProjectRoot)\**\*~;
 															$(ProjectRoot)\**\Debug\**;
 															$(ProjectRoot)\**\Settings.StyleCop;
+															$(ProjectRoot)\**\StyleCop.Cache;
 															$(ProjectRoot)\Samples\**\DotNetOpenAuth.???;
 															$(ProjectRoot)\Samples\**\log4net.???;
 															$(ProjectRoot)\Samples\**\PresentationCore.dll;
diff --git a/starterkits/Settings.StyleCop b/projecttemplates/Settings.StyleCop
index f6b59ac..f6b59ac 100644
--- a/starterkits/Settings.StyleCop
+++ b/projecttemplates/Settings.StyleCop
diff --git a/starterkits/WebFormsRelyingParty/Admin/Admin.Master b/projecttemplates/WebFormsRelyingParty/Admin/Admin.Master
index 77cd461..c50b73c 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Admin.Master
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Admin.Master
@@ -1,4 +1,4 @@
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Admin.master.cs" Inherits="WebFormsOpenIdRelyingParty.Admin.Admin"
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Admin.master.cs" Inherits="WebFormsRelyingParty.Admin.Admin"
 	MasterPageFile="~/Site.Master" %>
 
 <asp:Content ContentPlaceHolderID="Body" runat="server">
diff --git a/starterkits/WebFormsRelyingParty/Admin/Admin.Master.cs b/projecttemplates/WebFormsRelyingParty/Admin/Admin.Master.cs
index 496833e..85f7608 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Admin.Master.cs
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Admin.Master.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Admin {
+namespace WebFormsRelyingParty.Admin {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Admin/Admin.Master.designer.cs b/projecttemplates/WebFormsRelyingParty/Admin/Admin.Master.designer.cs
index 9d0abf9..fa5ccb9 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Admin.Master.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Admin.Master.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Admin {
+namespace WebFormsRelyingParty.Admin {
     
     
     public partial class Admin {
diff --git a/starterkits/WebFormsRelyingParty/Admin/CreateDatabase.sql b/projecttemplates/WebFormsRelyingParty/Admin/CreateDatabase.sql
index 99ac9db..99ac9db 100644
--- a/starterkits/WebFormsRelyingParty/Admin/CreateDatabase.sql
+++ b/projecttemplates/WebFormsRelyingParty/Admin/CreateDatabase.sql
diff --git a/starterkits/WebFormsRelyingParty/Admin/Default.aspx b/projecttemplates/WebFormsRelyingParty/Admin/Default.aspx
index 9685436..9a14078 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Default.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Default.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebFormsOpenIdRelyingParty.Admin.Default" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebFormsRelyingParty.Admin.Default" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/starterkits/WebFormsRelyingParty/Admin/Default.aspx.cs b/projecttemplates/WebFormsRelyingParty/Admin/Default.aspx.cs
index e1814f2..a3ce30e 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Default.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Default.aspx.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Admin {
+namespace WebFormsRelyingParty.Admin {
 	using System;
 	using System.Collections.Generic;
 	using System.Configuration;
diff --git a/starterkits/WebFormsRelyingParty/Admin/Default.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Admin/Default.aspx.designer.cs
index 45a664f..de4c986 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Default.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Default.aspx.designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Admin {
+namespace WebFormsRelyingParty.Admin {
     
     
     public partial class Default {
diff --git a/starterkits/WebFormsRelyingParty/Admin/Web.config b/projecttemplates/WebFormsRelyingParty/Admin/Web.config
index 52a5faf..52a5faf 100644
--- a/starterkits/WebFormsRelyingParty/Admin/Web.config
+++ b/projecttemplates/WebFormsRelyingParty/Admin/Web.config
diff --git a/starterkits/WebFormsRelyingParty/Code/DataRoleProvider.cs b/projecttemplates/WebFormsRelyingParty/Code/DataRoleProvider.cs
index a643ece..8117e4b 100644
--- a/starterkits/WebFormsRelyingParty/Code/DataRoleProvider.cs
+++ b/projecttemplates/WebFormsRelyingParty/Code/DataRoleProvider.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Code {
+namespace WebFormsRelyingParty.Code {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Default.aspx b/projecttemplates/WebFormsRelyingParty/Default.aspx
index 6dae10c..ef58a8a 100644
--- a/starterkits/WebFormsRelyingParty/Default.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Default.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebFormsOpenIdRelyingParty._Default"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebFormsRelyingParty._Default"
 	MasterPageFile="~/Site.Master" %>
 
 <asp:Content runat="server" ContentPlaceHolderID="Body">
diff --git a/starterkits/WebFormsRelyingParty/Default.aspx.cs b/projecttemplates/WebFormsRelyingParty/Default.aspx.cs
index a3f3a16..a72fce1 100644
--- a/starterkits/WebFormsRelyingParty/Default.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Default.aspx.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Default.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Default.aspx.designer.cs
index 98c13a6..9c12f15 100644
--- a/starterkits/WebFormsRelyingParty/Default.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Default.aspx.designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
     
     
     public partial class _Default {
diff --git a/starterkits/WebFormsRelyingParty/Global.asax b/projecttemplates/WebFormsRelyingParty/Global.asax
index 4f00db9..ff6cdb1 100644
--- a/starterkits/WebFormsRelyingParty/Global.asax
+++ b/projecttemplates/WebFormsRelyingParty/Global.asax
@@ -1 +1 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="WebFormsOpenIdRelyingParty.Global" Language="C#" %>
+<%@ Application Codebehind="Global.asax.cs" Inherits="WebFormsRelyingParty.Global" Language="C#" %>
diff --git a/starterkits/WebFormsRelyingParty/Global.asax.cs b/projecttemplates/WebFormsRelyingParty/Global.asax.cs
index 293a59f..3df0935 100644
--- a/starterkits/WebFormsRelyingParty/Global.asax.cs
+++ b/projecttemplates/WebFormsRelyingParty/Global.asax.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Data;
 	using System.Data.SqlClient;
diff --git a/starterkits/WebFormsRelyingParty/Login.aspx b/projecttemplates/WebFormsRelyingParty/Login.aspx
index d4e6d69..cdd1be1 100644
--- a/starterkits/WebFormsRelyingParty/Login.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Login.aspx.cs" Inherits="WebFormsOpenIdRelyingParty.Login"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Login.aspx.cs" Inherits="WebFormsRelyingParty.Login"
 	MasterPageFile="~/Site.Master" ValidateRequest="false" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty"
diff --git a/starterkits/WebFormsRelyingParty/Login.aspx.cs b/projecttemplates/WebFormsRelyingParty/Login.aspx.cs
index 53c7973..ff6081f 100644
--- a/starterkits/WebFormsRelyingParty/Login.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Login.aspx.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Login.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Login.aspx.designer.cs
index 16a22da..b390b51 100644
--- a/starterkits/WebFormsRelyingParty/Login.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Login.aspx.designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
     
     
     public partial class Login {
diff --git a/starterkits/WebFormsRelyingParty/Logout.aspx b/projecttemplates/WebFormsRelyingParty/Logout.aspx
index 02a939f..abba0c1 100644
--- a/starterkits/WebFormsRelyingParty/Logout.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Logout.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Logout.aspx.cs" Inherits="WebFormsOpenIdRelyingParty.Logout" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Logout.aspx.cs" Inherits="WebFormsRelyingParty.Logout" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
diff --git a/starterkits/WebFormsRelyingParty/Logout.aspx.cs b/projecttemplates/WebFormsRelyingParty/Logout.aspx.cs
index 86b1e30..0e53fac 100644
--- a/starterkits/WebFormsRelyingParty/Logout.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Logout.aspx.cs
@@ -1,4 +1,4 @@
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Web.Security;
 
diff --git a/projecttemplates/WebFormsRelyingParty/Logout.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Logout.aspx.designer.cs
new file mode 100644
index 0000000..19ef79d
--- /dev/null
+++ b/projecttemplates/WebFormsRelyingParty/Logout.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebFormsRelyingParty {
+    
+    
+    public partial class Logout {
+        
+        /// <summary>
+        /// form1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/starterkits/WebFormsRelyingParty/Members/AccountInfo.aspx b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
index cab9312..798142a 100644
--- a/starterkits/WebFormsRelyingParty/Members/AccountInfo.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccountInfo.aspx.cs" Inherits="WebFormsOpenIdRelyingParty.Members.AccountInfo"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AccountInfo.aspx.cs" Inherits="WebFormsRelyingParty.Members.AccountInfo"
 	MasterPageFile="~/Site.Master" ValidateRequest="false" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty"
diff --git a/starterkits/WebFormsRelyingParty/Members/AccountInfo.aspx.cs b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.cs
index 22a7e71..bf76dea 100644
--- a/starterkits/WebFormsRelyingParty/Members/AccountInfo.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Members {
+namespace WebFormsRelyingParty.Members {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
index d1eb8ed..9e831a5 100644
--- a/starterkits/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Members {
+namespace WebFormsRelyingParty.Members {
     
     
     public partial class AccountInfo {
diff --git a/starterkits/WebFormsRelyingParty/Members/Default.aspx b/projecttemplates/WebFormsRelyingParty/Members/Default.aspx
index 03707c6..157237f 100644
--- a/starterkits/WebFormsRelyingParty/Members/Default.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Members/Default.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebFormsOpenIdRelyingParty.Members.Default"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="WebFormsRelyingParty.Members.Default"
 	MasterPageFile="~/Site.Master" %>
 
 <asp:Content runat="server" ContentPlaceHolderID="Body">
diff --git a/starterkits/WebFormsRelyingParty/Members/Default.aspx.cs b/projecttemplates/WebFormsRelyingParty/Members/Default.aspx.cs
index 3c8747d..8460541 100644
--- a/starterkits/WebFormsRelyingParty/Members/Default.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/Default.aspx.cs
@@ -1,4 +1,4 @@
-namespace WebFormsOpenIdRelyingParty.Members {
+namespace WebFormsRelyingParty.Members {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Members/Default.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Members/Default.aspx.designer.cs
index 08fab2c..2daf037 100644
--- a/starterkits/WebFormsRelyingParty/Members/Default.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/Default.aspx.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4918
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty.Members {
+namespace WebFormsRelyingParty.Members {
     
     
     public partial class Default {
diff --git a/starterkits/WebFormsRelyingParty/Members/Web.config b/projecttemplates/WebFormsRelyingParty/Members/Web.config
index aafc323..aafc323 100644
--- a/starterkits/WebFormsRelyingParty/Members/Web.config
+++ b/projecttemplates/WebFormsRelyingParty/Members/Web.config
diff --git a/starterkits/WebFormsRelyingParty/Model.Designer.cs b/projecttemplates/WebFormsRelyingParty/Model.Designer.cs
index f34f21c..5c7b138 100644
--- a/starterkits/WebFormsRelyingParty/Model.Designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Model.Designer.cs
@@ -9,12 +9,12 @@
 //------------------------------------------------------------------------------
 
 [assembly: global::System.Data.Objects.DataClasses.EdmSchemaAttribute()]
-[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("DatabaseModel", "UserRole", "Role", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(WebFormsOpenIdRelyingParty.Role), "User", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(WebFormsOpenIdRelyingParty.User))]
-[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("DatabaseModel", "UserAuthenticationToken", "User", global::System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(WebFormsOpenIdRelyingParty.User), "AuthenticationToken", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(WebFormsOpenIdRelyingParty.AuthenticationToken))]
+[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("DatabaseModel", "UserRole", "Role", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(WebFormsRelyingParty.Role), "User", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(WebFormsRelyingParty.User))]
+[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("DatabaseModel", "UserAuthenticationToken", "User", global::System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(WebFormsRelyingParty.User), "AuthenticationToken", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(WebFormsRelyingParty.AuthenticationToken))]
 
 // Original file name:
-// Generation date: 10/8/2009 12:07:35 PM
-namespace WebFormsOpenIdRelyingParty
+// Generation date: 10/10/2009 9:43:51 AM
+namespace WebFormsRelyingParty
 {
     
     /// <summary>
diff --git a/starterkits/WebFormsRelyingParty/Model.cs b/projecttemplates/WebFormsRelyingParty/Model.cs
index f471c97..53ca10f 100644
--- a/starterkits/WebFormsRelyingParty/Model.cs
+++ b/projecttemplates/WebFormsRelyingParty/Model.cs
@@ -1,4 +1,4 @@
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Model.edmx b/projecttemplates/WebFormsRelyingParty/Model.edmx
index c23b3df..c23b3df 100644
--- a/starterkits/WebFormsRelyingParty/Model.edmx
+++ b/projecttemplates/WebFormsRelyingParty/Model.edmx
diff --git a/starterkits/WebFormsRelyingParty/MyTemplate.vstemplate b/projecttemplates/WebFormsRelyingParty/MyTemplate.vstemplate
index 4cea3f4..4cea3f4 100644
--- a/starterkits/WebFormsRelyingParty/MyTemplate.vstemplate
+++ b/projecttemplates/WebFormsRelyingParty/MyTemplate.vstemplate
diff --git a/starterkits/WebFormsRelyingParty/Properties/AssemblyInfo.cs b/projecttemplates/WebFormsRelyingParty/Properties/AssemblyInfo.cs
index 0f26ac9..78ec7de 100644
--- a/starterkits/WebFormsRelyingParty/Properties/AssemblyInfo.cs
+++ b/projecttemplates/WebFormsRelyingParty/Properties/AssemblyInfo.cs
@@ -11,11 +11,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("WebFormsOpenIdRelyingParty")]
+[assembly: AssemblyTitle("WebFormsRelyingParty")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WebFormsOpenIdRelyingParty")]
+[assembly: AssemblyProduct("WebFormsRelyingParty")]
 [assembly: AssemblyCopyright("Copyright ©  2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/starterkits/WebFormsRelyingParty/Setup.aspx b/projecttemplates/WebFormsRelyingParty/Setup.aspx
index 996a72d..557ce9f 100644
--- a/starterkits/WebFormsRelyingParty/Setup.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Setup.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Setup.aspx.cs" Inherits="WebFormsOpenIdRelyingParty.Setup" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Setup.aspx.cs" Inherits="WebFormsRelyingParty.Setup" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty"
 	TagPrefix="rp" %>
diff --git a/starterkits/WebFormsRelyingParty/Setup.aspx.cs b/projecttemplates/WebFormsRelyingParty/Setup.aspx.cs
index e6da59f..71e64ce 100644
--- a/starterkits/WebFormsRelyingParty/Setup.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Setup.aspx.cs
@@ -1,4 +1,4 @@
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Collections.Generic;
 	using System.Globalization;
diff --git a/starterkits/WebFormsRelyingParty/Setup.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Setup.aspx.designer.cs
index 0d93871..a51ceed 100644
--- a/starterkits/WebFormsRelyingParty/Setup.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Setup.aspx.designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
     
     
     public partial class Setup {
diff --git a/starterkits/WebFormsRelyingParty/Site.Master b/projecttemplates/WebFormsRelyingParty/Site.Master
index a489150..78f7dc7 100644
--- a/starterkits/WebFormsRelyingParty/Site.Master
+++ b/projecttemplates/WebFormsRelyingParty/Site.Master
@@ -1,6 +1,6 @@
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="WebFormsOpenIdRelyingParty.Site" %>
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="WebFormsRelyingParty.Site" %>
 
-<%@ Import Namespace="WebFormsOpenIdRelyingParty" %>
+<%@ Import Namespace="WebFormsRelyingParty" %>
 <%@ Import Namespace="System.Linq" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/starterkits/WebFormsRelyingParty/Site.Master.cs b/projecttemplates/WebFormsRelyingParty/Site.Master.cs
index a865893..b6a4f1d 100644
--- a/starterkits/WebFormsRelyingParty/Site.Master.cs
+++ b/projecttemplates/WebFormsRelyingParty/Site.Master.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/starterkits/WebFormsRelyingParty/Site.Master.designer.cs b/projecttemplates/WebFormsRelyingParty/Site.Master.designer.cs
index 4f1e48a..d1be856 100644
--- a/starterkits/WebFormsRelyingParty/Site.Master.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Site.Master.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4918
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WebFormsOpenIdRelyingParty {
+namespace WebFormsRelyingParty {
     
     
     public partial class Site {
diff --git a/starterkits/WebFormsRelyingParty/Standard.css b/projecttemplates/WebFormsRelyingParty/Standard.css
index f0b1d8e..f0b1d8e 100644
--- a/starterkits/WebFormsRelyingParty/Standard.css
+++ b/projecttemplates/WebFormsRelyingParty/Standard.css
diff --git a/starterkits/WebFormsRelyingParty/Web.config b/projecttemplates/WebFormsRelyingParty/Web.config
index 757a2c5..4cf8c3c 100644
--- a/starterkits/WebFormsRelyingParty/Web.config
+++ b/projecttemplates/WebFormsRelyingParty/Web.config
@@ -133,7 +133,7 @@
 		</httpModules>
 		<roleManager enabled="true" defaultProvider="Database">
 			<providers>
-				<add name="Database" type="WebFormsOpenIdRelyingParty.Code.DataRoleProvider" />
+				<add name="Database" type="WebFormsRelyingParty.Code.DataRoleProvider" />
 			</providers>
 		</roleManager>
 	</system.web>
diff --git a/starterkits/WebFormsRelyingParty/WebFormsRelyingParty.csproj b/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj
index a2982c1..99fbf4e 100644
--- a/starterkits/WebFormsRelyingParty/WebFormsRelyingParty.csproj
+++ b/projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj
@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WebFormsOpenIdRelyingParty</RootNamespace>
-    <AssemblyName>WebFormsOpenIdRelyingParty</AssemblyName>
+    <RootNamespace>WebFormsRelyingParty</RootNamespace>
+    <AssemblyName>WebFormsRelyingParty</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/starterkits/WebFormsRelyingParty/images/google.gif b/projecttemplates/WebFormsRelyingParty/images/google.gif
index 1b6cd07..1b6cd07 100644
--- a/starterkits/WebFormsRelyingParty/images/google.gif
+++ b/projecttemplates/WebFormsRelyingParty/images/google.gif
diff --git a/starterkits/WebFormsRelyingParty/images/infocard_23x16.png b/projecttemplates/WebFormsRelyingParty/images/infocard_23x16.png
index 9dbea9f..9dbea9f 100644
--- a/starterkits/WebFormsRelyingParty/images/infocard_23x16.png
+++ b/projecttemplates/WebFormsRelyingParty/images/infocard_23x16.png
diff --git a/starterkits/WebFormsRelyingParty/images/openid_login.gif b/projecttemplates/WebFormsRelyingParty/images/openid_login.gif
index cde836c..cde836c 100644
--- a/starterkits/WebFormsRelyingParty/images/openid_login.gif
+++ b/projecttemplates/WebFormsRelyingParty/images/openid_login.gif
diff --git a/starterkits/WebFormsRelyingParty/images/yahoo.gif b/projecttemplates/WebFormsRelyingParty/images/yahoo.gif
index 42adbfa..42adbfa 100644
--- a/starterkits/WebFormsRelyingParty/images/yahoo.gif
+++ b/projecttemplates/WebFormsRelyingParty/images/yahoo.gif
diff --git a/starterkits/WebFormsRelyingParty/images/yahoo_login.png b/projecttemplates/WebFormsRelyingParty/images/yahoo_login.png
index 476fa64..476fa64 100644
--- a/starterkits/WebFormsRelyingParty/images/yahoo_login.png
+++ b/projecttemplates/WebFormsRelyingParty/images/yahoo_login.png
diff --git a/src/DotNetOpenAuth.sln b/src/DotNetOpenAuth.sln
index 5f2a121..f94fe03 100644
--- a/src/DotNetOpenAuth.sln
+++ b/src/DotNetOpenAuth.sln
@@ -165,7 +165,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{E9ED920D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Templates", "Project Templates", "{B9EB8729-4B54-4453-B089-FE6761BA3057}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebFormsRelyingParty", "..\starterkits\WebFormsRelyingParty\WebFormsRelyingParty.csproj", "{A78F8FC6-7B03-4230-BE41-761E400D6810}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebFormsRelyingParty", "..\projecttemplates\WebFormsRelyingParty\WebFormsRelyingParty.csproj", "{A78F8FC6-7B03-4230-BE41-761E400D6810}"
 EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
diff --git a/starterkits/WebFormsRelyingParty/Logout.aspx.designer.cs b/starterkits/WebFormsRelyingParty/Logout.aspx.designer.cs
deleted file mode 100644
index 7c5cae6..0000000
--- a/starterkits/WebFormsRelyingParty/Logout.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace WebFormsOpenIdRelyingParty {
-
-
-	public partial class Logout {
-
-		/// <summary>
-		/// form1 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-	}
-}