102 files changed, 164 insertions, 51 deletions

diff --git a/samples/RelyingPartyMvc/.gitignore b/samples/OpenIdRelyingPartyMvc/.gitignore
index 0b08797..0b08797 100644
--- a/samples/RelyingPartyMvc/.gitignore
+++ b/samples/OpenIdRelyingPartyMvc/.gitignore
diff --git a/samples/RelyingPartyMvc/Content/Site.css b/samples/OpenIdRelyingPartyMvc/Content/Site.css
index 6fda856..6fda856 100644
--- a/samples/RelyingPartyMvc/Content/Site.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/Site.css
diff --git a/samples/RelyingPartyMvc/Content/css/openidlogin.css b/samples/OpenIdRelyingPartyMvc/Content/css/openidlogin.css
index 20338c4..20338c4 100644
--- a/samples/RelyingPartyMvc/Content/css/openidlogin.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/css/openidlogin.css
diff --git a/samples/RelyingPartyMvc/Content/images/aol.gif b/samples/OpenIdRelyingPartyMvc/Content/images/aol.gif
index decc4f1..decc4f1 100644
--- a/samples/RelyingPartyMvc/Content/images/aol.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/aol.gif
diff --git a/samples/RelyingPartyMvc/Content/images/facebook.gif b/samples/OpenIdRelyingPartyMvc/Content/images/facebook.gif
index b997b35..b997b35 100644
--- a/samples/RelyingPartyMvc/Content/images/facebook.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/facebook.gif
diff --git a/samples/RelyingPartyMvc/Content/images/google.gif b/samples/OpenIdRelyingPartyMvc/Content/images/google.gif
index 1b6cd07..1b6cd07 100644
--- a/samples/RelyingPartyMvc/Content/images/google.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/google.gif
diff --git a/samples/RelyingPartyMvc/Content/images/openid.gif b/samples/OpenIdRelyingPartyMvc/Content/images/openid.gif
index c718b0e..c718b0e 100644
--- a/samples/RelyingPartyMvc/Content/images/openid.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/openid.gif
diff --git a/samples/RelyingPartyMvc/Content/images/openid_small.gif b/samples/OpenIdRelyingPartyMvc/Content/images/openid_small.gif
index cde836c..cde836c 100644
--- a/samples/RelyingPartyMvc/Content/images/openid_small.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/openid_small.gif
diff --git a/samples/RelyingPartyMvc/Content/images/yahoo.gif b/samples/OpenIdRelyingPartyMvc/Content/images/yahoo.gif
index 42adbfa..42adbfa 100644
--- a/samples/RelyingPartyMvc/Content/images/yahoo.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/yahoo.gif
diff --git a/samples/RelyingPartyMvc/Content/scripts/jquery-1.3.1.js b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-1.3.1.js
index 3a4badd..3a4badd 100644
--- a/samples/RelyingPartyMvc/Content/scripts/jquery-1.3.1.js
+++ b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-1.3.1.js
diff --git a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js
index 71bea46..71bea46 100644
--- a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js
+++ b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js
diff --git a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js
index 2d97bb8..2d97bb8 100644
--- a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js
+++ b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png
index 6b6de7d..6b6de7d 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png
index 3dac650..3dac650 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png
index b383704..b383704 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png
index d384e42..d384e42 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
index b9851ba..b9851ba 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
index 76dac56..76dac56 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png
index eeacf69..eeacf69 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
index 38c3833..38c3833 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png
index 58f96f8..58f96f8 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png
index 8e6103d..8e6103d 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png
index 2c8aac4..2c8aac4 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png
index d985a26..d985a26 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png
index 7862520..7862520 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png
index c5297f8..c5297f8 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png
index 68dcff5..68dcff5 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.accordion.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.accordion.css
index c84ad4e..c84ad4e 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.accordion.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.accordion.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.all.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.all.css
index 543e4c3..543e4c3 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.all.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.all.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.base.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.base.css
index dadf378..dadf378 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.base.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.base.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.core.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.core.css
index d832ad7..d832ad7 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.core.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.core.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.datepicker.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.datepicker.css
index 92986c9..92986c9 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.datepicker.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.datepicker.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.dialog.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.dialog.css
index f10f409..f10f409 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.dialog.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.dialog.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.progressbar.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.progressbar.css
index bc0939e..bc0939e 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.progressbar.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.progressbar.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.resizable.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.resizable.css
index 44efeb2..44efeb2 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.resizable.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.resizable.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.slider.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.slider.css
index 0792a48..0792a48 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.slider.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.slider.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.tabs.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.tabs.css
index 70ed3ef..70ed3ef 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.tabs.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.tabs.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.theme.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.theme.css
index 84f7fed..84f7fed 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.theme.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.theme.css
diff --git a/samples/OpenIdRelyingPartyMvc/Controllers/AccountController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/AccountController.cs
new file mode 100644
index 0000000..5422a61
--- /dev/null
+++ b/samples/OpenIdRelyingPartyMvc/Controllers/AccountController.cs
@@ -0,0 +1,113 @@
+namespace RelyingPartyMvc.Controllers {
+	using System;
+	using System.Collections.Generic;
+	using System.Diagnostics.CodeAnalysis;
+	using System.Globalization;
+	using System.Linq;
+	using System.Security.Cryptography;
+	using System.Security.Principal;
+	using System.Web;
+	using System.Web.Mvc;
+	using System.Web.Security;
+	using System.Web.UI;
+
+	public class AccountController : Controller {
+		// This constructor is used by the MVC framework to instantiate the controller using
+		// the default forms authentication and membership providers.
+
+		public AccountController()
+			: this(null, null) {
+		}
+
+		// This constructor is not used by the MVC framework but is instead provided for ease
+		// of unit testing this type. See the comments at the end of this file for more
+		// information.
+		public AccountController(IFormsAuthentication formsAuth, IMembershipService service) {
+			this.FormsAuth = formsAuth ?? new FormsAuthenticationService();
+			this.MembershipService = service ?? new AccountMembershipService();
+		}
+
+		public IFormsAuthentication FormsAuth { get; private set; }
+
+		public IMembershipService MembershipService { get; private set; }
+
+		public ActionResult LogOn() {
+			return View();
+		}
+
+		[AcceptVerbs(HttpVerbs.Post)]
+		[SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",
+			Justification = "Needs to take same parameter type as Controller.Redirect()")]
+		public ActionResult LogOn(string userName, bool rememberMe, string returnUrl) {
+			this.FormsAuth.SignIn(userName, rememberMe);
+			if (!String.IsNullOrEmpty(returnUrl)) {
+				return Redirect(returnUrl);
+			} else {
+				return RedirectToAction("Index", "Home");
+			}
+		}
+
+		public ActionResult LogOff() {
+			this.FormsAuth.SignOut();
+
+			return RedirectToAction("Index", "Home");
+		}
+
+		protected override void OnActionExecuting(ActionExecutingContext filterContext) {
+			if (filterContext.HttpContext.User.Identity is WindowsIdentity) {
+				throw new InvalidOperationException("Windows authentication is not supported.");
+			}
+		}
+	}
+
+	// The FormsAuthentication type is sealed and contains static members, so it is difficult to
+	// unit test code that calls its members. The interface and helper class below demonstrate
+	// how to create an abstract wrapper around such a type in order to make the AccountController
+	// code unit testable.
+
+	public interface IFormsAuthentication {
+		void SignIn(string userName, bool createPersistentCookie);
+
+		void SignOut();
+	}
+
+	public class FormsAuthenticationService : IFormsAuthentication {
+		public void SignIn(string userName, bool createPersistentCookie) {
+			FormsAuthentication.SetAuthCookie(userName, createPersistentCookie);
+		}
+		public void SignOut() {
+			FormsAuthentication.SignOut();
+		}
+	}
+
+	public interface IMembershipService {
+		MembershipCreateStatus CreateUser(string claimedIdentifier, string email);
+	}
+
+	public class AccountMembershipService : IMembershipService {
+		private MembershipProvider provider;
+		private RandomNumberGenerator passwordGenerator;
+
+		public AccountMembershipService()
+			: this(null) {
+		}
+
+		public AccountMembershipService(MembershipProvider provider) {
+			this.provider = provider ?? Membership.Provider;
+			this.passwordGenerator = RNGCryptoServiceProvider.Create();
+		}
+
+		public MembershipCreateStatus CreateUser(string userName, string email) {
+			MembershipCreateStatus status;
+			string password = this.GenerateInsaneSecurePassword();
+			this.provider.CreateUser(userName, password, email, null, null, true, null, out status);
+			return status;
+		}
+
+		private string GenerateInsaneSecurePassword() {
+			byte[] secureBits = new byte[20];
+			this.passwordGenerator.GetBytes(secureBits);
+			return Convert.ToBase64String(secureBits);
+		}
+	}
+}
diff --git a/samples/RelyingPartyMvc/Controllers/HomeController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/HomeController.cs
index ac33185..d26cdd9 100644
--- a/samples/RelyingPartyMvc/Controllers/HomeController.cs
+++ b/samples/OpenIdRelyingPartyMvc/Controllers/HomeController.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc.Controllers {
+namespace OpenIdRelyingPartyMvc.Controllers {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/RelyingPartyMvc/Controllers/UserController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs
index ba94efe..dd526d3 100644
--- a/samples/RelyingPartyMvc/Controllers/UserController.cs
+++ b/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc.Controllers {
+namespace OpenIdRelyingPartyMvc.Controllers {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/RelyingPartyMvc/Default.aspx b/samples/OpenIdRelyingPartyMvc/Default.aspx
index b570fd8..b570fd8 100644
--- a/samples/RelyingPartyMvc/Default.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Default.aspx
diff --git a/samples/OpenIdRelyingPartyMvc/Global.asax b/samples/OpenIdRelyingPartyMvc/Global.asax
new file mode 100644
index 0000000..756d5eb
--- /dev/null
+++ b/samples/OpenIdRelyingPartyMvc/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="OpenIdRelyingPartyMvc.MvcApplication" Language="C#" %>
diff --git a/samples/RelyingPartyMvc/Global.asax.cs b/samples/OpenIdRelyingPartyMvc/Global.asax.cs
index 4015d71..a43b734 100644
--- a/samples/RelyingPartyMvc/Global.asax.cs
+++ b/samples/OpenIdRelyingPartyMvc/Global.asax.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc {
+namespace OpenIdRelyingPartyMvc {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/RelyingPartyMvc/RelyingPartyMvc.csproj b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
index 13bd612..a6fab7c 100644
--- a/samples/RelyingPartyMvc/RelyingPartyMvc.csproj
+++ b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{603c0e0b-db56-11dc-be95-000d561079b0};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RelyingPartyMvc</RootNamespace>
-    <AssemblyName>RelyingPartyMvc</AssemblyName>
+    <RootNamespace>OpenIdRelyingPartyMvc</RootNamespace>
+    <AssemblyName>OpenIdRelyingPartyMvc</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/RelyingPartyMvc/Properties/AssemblyInfo.cs b/samples/OpenIdRelyingPartyMvc/Properties/AssemblyInfo.cs
index 483a4a1..8a23a59 100644
--- a/samples/RelyingPartyMvc/Properties/AssemblyInfo.cs
+++ b/samples/OpenIdRelyingPartyMvc/Properties/AssemblyInfo.cs
@@ -5,11 +5,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("RelyingPartyMvc")]
+[assembly: AssemblyTitle("OpenIdRelyingPartyMvc")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RelyingPartyMvc")]
+[assembly: AssemblyProduct("OpenIdRelyingPartyMvc")]
 [assembly: AssemblyCopyright("Copyright © Andrew Arnott 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/samples/RelyingPartyMvc/Views/Home/Index.aspx b/samples/OpenIdRelyingPartyMvc/Views/Home/Index.aspx
index 82eb924..82eb924 100644
--- a/samples/RelyingPartyMvc/Views/Home/Index.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/Home/Index.aspx
diff --git a/samples/RelyingPartyMvc/Views/Home/xrds.aspx b/samples/OpenIdRelyingPartyMvc/Views/Home/xrds.aspx
index 583c77c..583c77c 100644
--- a/samples/RelyingPartyMvc/Views/Home/xrds.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/Home/xrds.aspx
diff --git a/samples/RelyingPartyMvc/Views/Shared/Site.Master b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master
index 698ea34..d9b759c 100644
--- a/samples/RelyingPartyMvc/Views/Shared/Site.Master
+++ b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master
@@ -1,4 +1,4 @@
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="RelyingPartyMvc.Views.Shared.Site" %>
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="OpenIdRelyingPartyMvc.Views.Shared.Site" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/samples/RelyingPartyMvc/Views/Shared/Site.Master.cs b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.cs
index c844657..9fca9d7 100644
--- a/samples/RelyingPartyMvc/Views/Shared/Site.Master.cs
+++ b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc.Views.Shared {
+namespace OpenIdRelyingPartyMvc.Views.Shared {
 	public partial class Site : System.Web.Mvc.ViewMasterPage {
 	}
 }
diff --git a/samples/RelyingPartyMvc/Views/Shared/Site.Master.designer.cs b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.designer.cs
index 2793ee4..a207a32 100644
--- a/samples/RelyingPartyMvc/Views/Shared/Site.Master.designer.cs
+++ b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.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.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyMvc.Views.Shared {
+namespace OpenIdRelyingPartyMvc.Views.Shared {
     
     
     public partial class Site {
diff --git a/samples/RelyingPartyMvc/Views/User/Index.aspx b/samples/OpenIdRelyingPartyMvc/Views/User/Index.aspx
index ef55c06..ef55c06 100644
--- a/samples/RelyingPartyMvc/Views/User/Index.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/User/Index.aspx
diff --git a/samples/RelyingPartyMvc/Views/User/Login.aspx b/samples/OpenIdRelyingPartyMvc/Views/User/Login.aspx
index 24f9f56..24f9f56 100644
--- a/samples/RelyingPartyMvc/Views/User/Login.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/User/Login.aspx
diff --git a/samples/RelyingPartyMvc/Views/User/LoginPopup.aspx b/samples/OpenIdRelyingPartyMvc/Views/User/LoginPopup.aspx
index 67006fa..67006fa 100644
--- a/samples/RelyingPartyMvc/Views/User/LoginPopup.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/User/LoginPopup.aspx
diff --git a/samples/RelyingPartyMvc/Views/Web.config b/samples/OpenIdRelyingPartyMvc/Views/Web.config
index e67c0eb..e67c0eb 100644
--- a/samples/RelyingPartyMvc/Views/Web.config
+++ b/samples/OpenIdRelyingPartyMvc/Views/Web.config
diff --git a/samples/RelyingPartyMvc/Web.config b/samples/OpenIdRelyingPartyMvc/Web.config
index 03c7fc4..b051162 100644
--- a/samples/RelyingPartyMvc/Web.config
+++ b/samples/OpenIdRelyingPartyMvc/Web.config
@@ -84,7 +84,7 @@
             ASP.NET to identify an incoming user. 
     -->
 		<authentication mode="Forms">
-			<forms defaultUrl="/Home" loginUrl="/User/Login" name="RelyingPartyMvcSession"/>
+			<forms defaultUrl="/Home" loginUrl="/User/Login" name="OpenIdRelyingPartyMvcSession"/>
 			<!-- named cookie prevents conflicts with other samples -->
 		</authentication>
 		<!--
diff --git a/samples/RelyingPartyWebForms/.gitignore b/samples/OpenIdRelyingPartyWebForms/.gitignore
index b086a60..b086a60 100644
--- a/samples/RelyingPartyWebForms/.gitignore
+++ b/samples/OpenIdRelyingPartyWebForms/.gitignore
diff --git a/samples/RelyingPartyWebForms/Code/CustomStore.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStore.cs
index c4a7854..2363aec 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStore.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStore.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms.Code {
+namespace OpenIdRelyingPartyWebForms.Code {
 	using System;
 	using System.Data;
 	using System.Globalization;
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs
index a0ffef0..beacfc4 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs
@@ -10,7 +10,7 @@
 
 #pragma warning disable 1591
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     /// <summary>
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.cs
index 8dc69d4..abc77e9 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms.Code {
+namespace OpenIdRelyingPartyWebForms.Code {
 	public partial class CustomStoreDataSet {
 	}
 }
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsc b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsc
index 05b0199..05b0199 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsc
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsc
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsd b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsd
index b80310e..b80310e 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsd
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsd
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xss b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xss
index 483a137..483a137 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xss
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xss
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs
index 9382ca7..580b1fa 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -10,7 +10,7 @@
 
 #pragma warning disable 1591
 
-namespace RelyingPartyWebForms.Code {
+namespace OpenIdRelyingPartyWebForms.Code {
     
     
     /// <summary>
diff --git a/samples/RelyingPartyWebForms/Code/State.cs b/samples/OpenIdRelyingPartyWebForms/Code/State.cs
index 857e02a..4861a34 100644
--- a/samples/RelyingPartyWebForms/Code/State.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/State.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System.Collections.Generic;
 	using System.Web;
 	using DotNetOpenAuth.OpenId.Extensions.ProviderAuthenticationPolicy;
diff --git a/samples/RelyingPartyWebForms/Code/TracePageAppender.cs b/samples/OpenIdRelyingPartyWebForms/Code/TracePageAppender.cs
index e6e453a..9848bb3 100644
--- a/samples/RelyingPartyWebForms/Code/TracePageAppender.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/TracePageAppender.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Generic;
 	using System.IO;
diff --git a/samples/RelyingPartyWebForms/Default.aspx b/samples/OpenIdRelyingPartyWebForms/Default.aspx
index 602d5ed..602d5ed 100644
--- a/samples/RelyingPartyWebForms/Default.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/Default.aspx
diff --git a/samples/OpenIdRelyingPartyWebForms/Global.asax b/samples/OpenIdRelyingPartyWebForms/Global.asax
new file mode 100644
index 0000000..8be3cd1
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebForms/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="OpenIdRelyingPartyWebForms.Global" Language="C#" %>
diff --git a/samples/RelyingPartyWebForms/Global.asax.cs b/samples/OpenIdRelyingPartyWebForms/Global.asax.cs
index cdf941b..c7d1e8b 100644
--- a/samples/RelyingPartyWebForms/Global.asax.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Global.asax.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Specialized;
 	using System.IO;
diff --git a/samples/RelyingPartyWebForms/MembersOnly/Default.aspx b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
index cdfbc09..46458e8 100644
--- a/samples/RelyingPartyWebForms/MembersOnly/Default.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="~/Site.Master" %>
-<%@ Import Namespace="RelyingPartyWebForms" %>
+<%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
 
 <asp:Content ID="Content1" runat="server" ContentPlaceHolderID="Main">
 	<h2>
diff --git a/samples/RelyingPartyWebForms/MembersOnly/Web.config b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Web.config
index 3cfad05..3cfad05 100644
--- a/samples/RelyingPartyWebForms/MembersOnly/Web.config
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Web.config
diff --git a/samples/RelyingPartyWebForms/RelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
index f67bb54..cf40440 100644
--- a/samples/RelyingPartyWebForms/RelyingPartyWebForms.csproj
+++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RelyingPartyWebForms</RootNamespace>
-    <AssemblyName>RelyingPartyWebForms</AssemblyName>
+    <RootNamespace>OpenIdRelyingPartyWebForms</RootNamespace>
+    <AssemblyName>OpenIdRelyingPartyWebForms</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/RelyingPartyWebForms/PrivacyPolicy.aspx b/samples/OpenIdRelyingPartyWebForms/PrivacyPolicy.aspx
index e99112e..e99112e 100644
--- a/samples/RelyingPartyWebForms/PrivacyPolicy.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/PrivacyPolicy.aspx
diff --git a/samples/RelyingPartyWebForms/Properties/AssemblyInfo.cs b/samples/OpenIdRelyingPartyWebForms/Properties/AssemblyInfo.cs
index 6411677..ea71bfc 100644
--- a/samples/RelyingPartyWebForms/Properties/AssemblyInfo.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ 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("RelyingPartyWebForms sample")]
+[assembly: AssemblyTitle("OpenIdRelyingPartyWebForms sample")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/samples/RelyingPartyWebForms/Settings.StyleCop b/samples/OpenIdRelyingPartyWebForms/Settings.StyleCop
index 7f55ce6..7f55ce6 100644
--- a/samples/RelyingPartyWebForms/Settings.StyleCop
+++ b/samples/OpenIdRelyingPartyWebForms/Settings.StyleCop
diff --git a/samples/RelyingPartyWebForms/Site.Master b/samples/OpenIdRelyingPartyWebForms/Site.Master
index 4171e4b..9630f78 100644
--- a/samples/RelyingPartyWebForms/Site.Master
+++ b/samples/OpenIdRelyingPartyWebForms/Site.Master
@@ -1,5 +1,5 @@
 <%@ Master Language="C#" AutoEventWireup="true" %>
-<%@ Import Namespace="RelyingPartyWebForms" %>
+<%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <script runat="server">
diff --git a/samples/RelyingPartyWebForms/TracePage.aspx b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx
index 2df425f..b115298 100644
--- a/samples/RelyingPartyWebForms/TracePage.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TracePage.aspx.cs" Inherits="RelyingPartyWebForms.TracePage" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TracePage.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.TracePage" %>
 
 <!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/samples/RelyingPartyWebForms/TracePage.aspx.cs b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.cs
index f859a41..171bb67 100644
--- a/samples/RelyingPartyWebForms/TracePage.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Generic;
 	using System.Web;
diff --git a/samples/RelyingPartyWebForms/TracePage.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.designer.cs
index 7755a2c..8d8720d 100644
--- a/samples/RelyingPartyWebForms/TracePage.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.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.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class TracePage {
diff --git a/samples/RelyingPartyWebForms/Web.config b/samples/OpenIdRelyingPartyWebForms/Web.config
index 934510c..10cc266 100644
--- a/samples/RelyingPartyWebForms/Web.config
+++ b/samples/OpenIdRelyingPartyWebForms/Web.config
@@ -12,7 +12,7 @@
 			<relyingParty>
 				<security requireSsl="false" />
 				<!-- Uncomment the following to activate the sample custom store.  -->
-				<!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->
+				<!--<store type="OpenIdRelyingPartyWebForms.CustomStore, OpenIdRelyingPartyWebForms" />-->
 			</relyingParty>
 		</openid>
 		<messaging>
@@ -46,7 +46,7 @@
 		<compilation debug="true"/>
 		<customErrors mode="RemoteOnly"/>
 		<authentication mode="Forms">
-			<forms name="RelyingPartySession"/> <!-- named cookie prevents conflicts with other samples -->
+			<forms name="OpenIdRelyingPartySession"/> <!-- named cookie prevents conflicts with other samples -->
 		</authentication>
 		<trace enabled="false" writeToDiagnosticsTrace="true" />
 		<!-- Trust level discussion:
@@ -70,7 +70,7 @@
 				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
 			</layout>
 		</appender>
-		<appender name="TracePageAppender" type="RelyingPartyWebForms.TracePageAppender, RelyingPartyWebForms">
+		<appender name="TracePageAppender" type="OpenIdRelyingPartyWebForms.TracePageAppender, OpenIdRelyingPartyWebForms">
 			<layout type="log4net.Layout.PatternLayout">
 				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
 			</layout>
diff --git a/samples/RelyingPartyWebForms/ajaxlogin.aspx b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx
index a44bf52..de82304 100644
--- a/samples/RelyingPartyWebForms/ajaxlogin.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ajaxlogin.aspx.cs" Inherits="RelyingPartyWebForms.ajaxlogin"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ajaxlogin.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.ajaxlogin"
 	ValidateRequest="false" MasterPageFile="~/Site.Master" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="openid" %>
diff --git a/samples/RelyingPartyWebForms/ajaxlogin.aspx.cs b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
index 4024e59..ffaf6f0 100644
--- a/samples/RelyingPartyWebForms/ajaxlogin.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Web.UI.WebControls;
 	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
diff --git a/samples/RelyingPartyWebForms/ajaxlogin.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.designer.cs
index 96cf3cf..7e8f83c 100644
--- a/samples/RelyingPartyWebForms/ajaxlogin.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.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.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class ajaxlogin {
diff --git a/samples/RelyingPartyWebForms/images/attention.png b/samples/OpenIdRelyingPartyWebForms/images/attention.png
index 8003700..8003700 100644
--- a/samples/RelyingPartyWebForms/images/attention.png
+++ b/samples/OpenIdRelyingPartyWebForms/images/attention.png
diff --git a/samples/RelyingPartyWebForms/images/dotnetopenid_tiny.gif b/samples/OpenIdRelyingPartyWebForms/images/dotnetopenid_tiny.gif
index c4ed4f5..c4ed4f5 100644
--- a/samples/RelyingPartyWebForms/images/dotnetopenid_tiny.gif
+++ b/samples/OpenIdRelyingPartyWebForms/images/dotnetopenid_tiny.gif
diff --git a/samples/RelyingPartyWebForms/images/openid_login.gif b/samples/OpenIdRelyingPartyWebForms/images/openid_login.gif
index cde836c..cde836c 100644
--- a/samples/RelyingPartyWebForms/images/openid_login.gif
+++ b/samples/OpenIdRelyingPartyWebForms/images/openid_login.gif
diff --git a/samples/RelyingPartyWebForms/images/yahoo.png b/samples/OpenIdRelyingPartyWebForms/images/yahoo.png
index 3129217..3129217 100644
--- a/samples/RelyingPartyWebForms/images/yahoo.png
+++ b/samples/OpenIdRelyingPartyWebForms/images/yahoo.png
diff --git a/samples/RelyingPartyWebForms/login.aspx b/samples/OpenIdRelyingPartyWebForms/login.aspx
index 9aeef06..6e66fd3 100644
--- a/samples/RelyingPartyWebForms/login.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="login.aspx.cs" Inherits="RelyingPartyWebForms.login"
+<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="login.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.login"
 	ValidateRequest="false" MasterPageFile="~/Site.Master" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="rp" %>
diff --git a/samples/RelyingPartyWebForms/login.aspx.cs b/samples/OpenIdRelyingPartyWebForms/login.aspx.cs
index 4c5af89..37a714c 100644
--- a/samples/RelyingPartyWebForms/login.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Generic;
 	using System.Web.UI;
diff --git a/samples/RelyingPartyWebForms/login.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs
index 28e93ab..436ef7b 100644
--- a/samples/RelyingPartyWebForms/login.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx.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.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class login {
diff --git a/samples/RelyingPartyWebForms/loginProgrammatic.aspx b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
index dfbfe69..a00eccd 100644
--- a/samples/RelyingPartyWebForms/loginProgrammatic.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="loginProgrammatic.aspx.cs"
-	Inherits="RelyingPartyWebForms.loginProgrammatic" MasterPageFile="~/Site.Master" %>
+	Inherits="OpenIdRelyingPartyWebForms.loginProgrammatic" MasterPageFile="~/Site.Master" %>
 <asp:Content ID="Content1" runat="server" ContentPlaceHolderID="Main">
 	<h2>Login Page </h2>
 	<asp:Label ID="Label1" runat="server" Text="OpenID Login" />
diff --git a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.cs b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.cs
index 52e3a49..fe73b7e 100644
--- a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Net;
 	using System.Web.Security;
diff --git a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
index 835188e..0363be7 100644
--- a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.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.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class loginProgrammatic {
diff --git a/samples/RelyingPartyWebForms/logout.aspx b/samples/OpenIdRelyingPartyWebForms/logout.aspx
index 84bcdc4..71c0433 100644
--- a/samples/RelyingPartyWebForms/logout.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/logout.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" %>
-<%@ Import Namespace="RelyingPartyWebForms" %>
+<%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <script runat="server">
diff --git a/samples/RelyingPartyWebForms/m/Login.aspx b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx
index 2915106..dda8c85 100644
--- a/samples/RelyingPartyWebForms/m/Login.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" CodeBehind="Login.aspx.cs" Inherits="RelyingPartyWebForms.m.Login" %>
+<%@ Page Language="C#" CodeBehind="Login.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.m.Login" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty"
 	TagPrefix="RP" %>
diff --git a/samples/RelyingPartyWebForms/m/Login.aspx.cs b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs
index 088fb5b..86cd5c1 100644
--- a/samples/RelyingPartyWebForms/m/Login.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms.m {
+namespace OpenIdRelyingPartyWebForms.m {
 	using System;
 	using System.Web.UI.MobileControls;
 
diff --git a/samples/RelyingPartyWebForms/m/Login.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.designer.cs
index e3d5448..e55b802 100644
--- a/samples/RelyingPartyWebForms/m/Login.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.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.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms.m {
+namespace OpenIdRelyingPartyWebForms.m {
     
     
     public partial class Login {
diff --git a/samples/RelyingPartyWebForms/styles.css b/samples/OpenIdRelyingPartyWebForms/styles.css
index 2e4d3db..2e4d3db 100644
--- a/samples/RelyingPartyWebForms/styles.css
+++ b/samples/OpenIdRelyingPartyWebForms/styles.css
diff --git a/samples/RelyingPartyWebForms/xrds.aspx b/samples/OpenIdRelyingPartyWebForms/xrds.aspx
index e169bc7..e169bc7 100644
--- a/samples/RelyingPartyWebForms/xrds.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/xrds.aspx
diff --git a/samples/RelyingPartyMvc/Global.asax b/samples/RelyingPartyMvc/Global.asax
deleted file mode 100644
index bc13a45..0000000
--- a/samples/RelyingPartyMvc/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="RelyingPartyMvc.MvcApplication" Language="C#" %>
diff --git a/samples/RelyingPartyWebForms/Global.asax b/samples/RelyingPartyWebForms/Global.asax
deleted file mode 100644
index 3882feb..0000000
--- a/samples/RelyingPartyWebForms/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="RelyingPartyWebForms.Global" Language="C#" %>