Renamed the RegistrationExtension namespace and classes.

12 files changed, 116 insertions, 116 deletions

diff --git a/samples/ProviderPortal/ProfileFields.ascx.cs b/samples/ProviderPortal/ProfileFields.ascx.cs
index ab19e7b..c1ffd36 100644
--- a/samples/ProviderPortal/ProfileFields.ascx.cs
+++ b/samples/ProviderPortal/ProfileFields.ascx.cs
@@ -1,7 +1,7 @@
 using System;

 using System.Net.Mail;

 using DotNetOpenId.Provider;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 

 /// <summary>

 /// Handles the collection of the simple registration fields.

@@ -12,32 +12,32 @@ public partial class ProfileFields : System.Web.UI.UserControl {
 	protected void Page_Load(object sender, EventArgs e) {

 	}

 

-	public void SetRequiredFieldsFromRequest(ProfileRequestFields requestFields) {

+	public void SetRequiredFieldsFromRequest(SimpleRegistrationRequestFields requestFields) {

 		if (requestFields.PolicyUrl != null) {

 			privacyLink.NavigateUrl = requestFields.PolicyUrl.AbsoluteUri;

 		} else {

 			privacyLink.Visible = false;

 		}

 

-		dobRequiredLabel.Visible = (requestFields.BirthDate == ProfileRequest.Require);

-		countryRequiredLabel.Visible = (requestFields.Country == ProfileRequest.Require);

-		emailRequiredLabel.Visible = (requestFields.Email == ProfileRequest.Require);

-		fullnameRequiredLabel.Visible = (requestFields.FullName == ProfileRequest.Require);

-		genderRequiredLabel.Visible = (requestFields.Gender == ProfileRequest.Require);

-		languageRequiredLabel.Visible = (requestFields.Language == ProfileRequest.Require);

-		nicknameRequiredLabel.Visible = (requestFields.Nickname == ProfileRequest.Require);

-		postcodeRequiredLabel.Visible = (requestFields.PostalCode == ProfileRequest.Require);

-		timezoneRequiredLabel.Visible = (requestFields.TimeZone == ProfileRequest.Require);

+		dobRequiredLabel.Visible = (requestFields.BirthDate == SimpleRegistrationRequest.Require);

+		countryRequiredLabel.Visible = (requestFields.Country == SimpleRegistrationRequest.Require);

+		emailRequiredLabel.Visible = (requestFields.Email == SimpleRegistrationRequest.Require);

+		fullnameRequiredLabel.Visible = (requestFields.FullName == SimpleRegistrationRequest.Require);

+		genderRequiredLabel.Visible = (requestFields.Gender == SimpleRegistrationRequest.Require);

+		languageRequiredLabel.Visible = (requestFields.Language == SimpleRegistrationRequest.Require);

+		nicknameRequiredLabel.Visible = (requestFields.Nickname == SimpleRegistrationRequest.Require);

+		postcodeRequiredLabel.Visible = (requestFields.PostalCode == SimpleRegistrationRequest.Require);

+		timezoneRequiredLabel.Visible = (requestFields.TimeZone == SimpleRegistrationRequest.Require);

 

-		dateOfBirthRow.Visible = !(requestFields.BirthDate == ProfileRequest.NoRequest);

-		countryRow.Visible = !(requestFields.Country == ProfileRequest.NoRequest);

-		emailRow.Visible = !(requestFields.Email == ProfileRequest.NoRequest);

-		fullnameRow.Visible = !(requestFields.FullName == ProfileRequest.NoRequest);

-		genderRow.Visible = !(requestFields.Gender == ProfileRequest.NoRequest);

-		languageRow.Visible = !(requestFields.Language == ProfileRequest.NoRequest);

-		nicknameRow.Visible = !(requestFields.Nickname == ProfileRequest.NoRequest);

-		postcodeRow.Visible = !(requestFields.PostalCode == ProfileRequest.NoRequest);

-		timezoneRow.Visible = !(requestFields.TimeZone == ProfileRequest.NoRequest);

+		dateOfBirthRow.Visible = !(requestFields.BirthDate == SimpleRegistrationRequest.NoRequest);

+		countryRow.Visible = !(requestFields.Country == SimpleRegistrationRequest.NoRequest);

+		emailRow.Visible = !(requestFields.Email == SimpleRegistrationRequest.NoRequest);

+		fullnameRow.Visible = !(requestFields.FullName == SimpleRegistrationRequest.NoRequest);

+		genderRow.Visible = !(requestFields.Gender == SimpleRegistrationRequest.NoRequest);

+		languageRow.Visible = !(requestFields.Language == SimpleRegistrationRequest.NoRequest);

+		nicknameRow.Visible = !(requestFields.Nickname == SimpleRegistrationRequest.NoRequest);

+		postcodeRow.Visible = !(requestFields.PostalCode == SimpleRegistrationRequest.NoRequest);

+		timezoneRow.Visible = !(requestFields.TimeZone == SimpleRegistrationRequest.NoRequest);

 	}

 

 	public bool DoesAnyFieldHaveAValue {

@@ -82,10 +82,10 @@ public partial class ProfileFields : System.Web.UI.UserControl {
 	public Gender? Gender {

 		get {

 			if (this.genderDropdownList.SelectedValue == "Male") {

-				return DotNetOpenId.RegistrationExtension.Gender.Male;

+				return DotNetOpenId.Extensions.Gender.Male;

 			}

 			if (this.genderDropdownList.SelectedValue == "Female") {

-				return DotNetOpenId.RegistrationExtension.Gender.Female;

+				return DotNetOpenId.Extensions.Gender.Female;

 			}

 			return null;

 		}

@@ -98,9 +98,9 @@ public partial class ProfileFields : System.Web.UI.UserControl {
 		}

 	}

 

-	public ProfileFieldValues OpenIdProfileFields {

+	public SimpleRegistrationFieldValues OpenIdProfileFields {

 		get {

-			ProfileFieldValues fields = new ProfileFieldValues();

+			SimpleRegistrationFieldValues fields = new SimpleRegistrationFieldValues();

 			fields.BirthDate = DateOfBirth;

 			fields.Country = countryDropdownList.SelectedValue;

 			fields.Email = emailTextBox.Text;

diff --git a/samples/ProviderPortal/decide.aspx.cs b/samples/ProviderPortal/decide.aspx.cs
index 0e6dc7c..752639f 100644
--- a/samples/ProviderPortal/decide.aspx.cs
+++ b/samples/ProviderPortal/decide.aspx.cs
@@ -4,7 +4,7 @@ using System.Web.UI;
 using DotNetOpenId.Provider;

 using System.Web.Profile;

 using System.Diagnostics;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 

 /// <summary>

 /// Page for giving the user the option to continue or cancel out of authentication with a consumer.

@@ -24,12 +24,12 @@ public partial class decide : Page {
 			Response.Redirect(Request.Url.AbsoluteUri);

 		} else {

 			// if simple registration fields were used, then prompt the user for them

-			var requestedFields = ProfileRequestFields.ReadFromRequest(ProviderEndpoint.PendingAuthenticationRequest);

-			if (!requestedFields.Equals(ProfileRequestFields.None)) {

+			var requestedFields = SimpleRegistrationRequestFields.ReadFromRequest(ProviderEndpoint.PendingAuthenticationRequest);

+			if (!requestedFields.Equals(SimpleRegistrationRequestFields.None)) {

 				this.profileFields.Visible = true;

 				this.profileFields.SetRequiredFieldsFromRequest(requestedFields);

 				if (!IsPostBack) {

-					this.profileFields.OpenIdProfileFields = new DotNetOpenId.RegistrationExtension.ProfileFieldValues() {

+					this.profileFields.OpenIdProfileFields = new DotNetOpenId.Extensions.SimpleRegistrationFieldValues() {

 						Email = Membership.GetUser().Email,

 					};

 				}

diff --git a/samples/RelyingPartyPortal/Code/State.cs b/samples/RelyingPartyPortal/Code/State.cs
index f7c1216..ccfdd6e 100644
--- a/samples/RelyingPartyPortal/Code/State.cs
+++ b/samples/RelyingPartyPortal/Code/State.cs
@@ -7,7 +7,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;

 using System.Web.UI.WebControls.WebParts;

 using System.Web.UI.HtmlControls;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 

 /// <summary>

 /// Summary description for State

@@ -18,15 +18,15 @@ public class State
     {

     }

 

-    public static ProfileFieldValues ProfileFields

+    public static SimpleRegistrationFieldValues ProfileFields

     {

         get

         {

             if (HttpContext.Current .Session["ProfileFields"] == null)

             {

-                HttpContext.Current .Session["ProfileFields"] = new ProfileFieldValues();

+                HttpContext.Current .Session["ProfileFields"] = new SimpleRegistrationFieldValues();

             }

-            return (ProfileFieldValues)HttpContext.Current .Session["ProfileFields"];

+            return (SimpleRegistrationFieldValues)HttpContext.Current .Session["ProfileFields"];

         }

         set { HttpContext.Current .Session["ProfileFields"] = value; }

     }

diff --git a/samples/RelyingPartyPortal/login.aspx.cs b/samples/RelyingPartyPortal/login.aspx.cs
index 5192897..c35ba12 100644
--- a/samples/RelyingPartyPortal/login.aspx.cs
+++ b/samples/RelyingPartyPortal/login.aspx.cs
@@ -11,7 +11,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;

 using System.Web.UI.HtmlControls;

 using DotNetOpenId.RelyingParty;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 

 public partial class login : System.Web.UI.Page

 {

diff --git a/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs b/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs
index 2b38545..6834942 100644
--- a/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs
+++ b/src/DotNetOpenId.Test/ProfileFieldValuesTests.cs
@@ -13,13 +13,13 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Xml.Serialization;

 using System.IO;

 using NUnit.Framework;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 

 namespace DotNetOpenId.Test {

 	[TestFixture]

 	public class ProfileFieldValuesTests {

-		ProfileFieldValues getFilledStruct() {

-			return new ProfileFieldValues() {

+		SimpleRegistrationFieldValues getFilledStruct() {

+			return new SimpleRegistrationFieldValues() {

 				BirthDate = new DateTime(2005, 2, 3),

 				Culture = new System.Globalization.CultureInfo("en-US"),

 				Email = "a@b.com",

@@ -33,36 +33,36 @@ namespace DotNetOpenId.Test {
 

 		[Test]

 		public void BinarySerialization() {

-			ProfileFieldValues fields = getFilledStruct();

+			SimpleRegistrationFieldValues fields = getFilledStruct();

 			MemoryStream ms = new MemoryStream();

 			IFormatter formatter = new BinaryFormatter();

 			formatter.Serialize(ms, fields);

 

 			ms.Position = 0;

-			ProfileFieldValues fields2 = (ProfileFieldValues)formatter.Deserialize(ms);

+			SimpleRegistrationFieldValues fields2 = (SimpleRegistrationFieldValues)formatter.Deserialize(ms);

 			Assert.AreEqual(fields, fields2);

 		}

 

 		[Test]

 		public void XmlSerialization() {

-			ProfileFieldValues fields = getFilledStruct();

+			SimpleRegistrationFieldValues fields = getFilledStruct();

 			MemoryStream ms = new MemoryStream();

-			XmlSerializer xs = new XmlSerializer(typeof(ProfileFieldValues));

+			XmlSerializer xs = new XmlSerializer(typeof(SimpleRegistrationFieldValues));

 			xs.Serialize(ms, fields);

 

 			ms.Position = 0;

-			ProfileFieldValues fields2 = (ProfileFieldValues)xs.Deserialize(ms);

+			SimpleRegistrationFieldValues fields2 = (SimpleRegistrationFieldValues)xs.Deserialize(ms);

 			Assert.AreEqual(fields, fields2);

 		}

 

 		[Test]

 		public void TestEquals() {

-			ProfileFieldValues fields1 = getFilledStruct();

+			SimpleRegistrationFieldValues fields1 = getFilledStruct();

 

 			Assert.AreNotEqual(fields1, null);

 			Assert.AreNotEqual(fields1, "string");

 

-			ProfileFieldValues fields2 = fields1;

+			SimpleRegistrationFieldValues fields2 = fields1;

 			Assert.AreNotSame(fields1, fields2, "Test sanity check.");

 			Assert.AreEqual(fields1, fields2);

 

@@ -97,7 +97,7 @@ namespace DotNetOpenId.Test {
 

 		[Test]

 		public void Empty() {

-			Assert.AreEqual(new ProfileFieldValues(), ProfileFieldValues.Empty);

+			Assert.AreEqual(new SimpleRegistrationFieldValues(), SimpleRegistrationFieldValues.Empty);

 		}

 

 		//[Test]

diff --git a/src/DotNetOpenId/DotNetOpenId.csproj b/src/DotNetOpenId/DotNetOpenId.csproj
index 64a9e88..90dfc27 100644
--- a/src/DotNetOpenId/DotNetOpenId.csproj
+++ b/src/DotNetOpenId/DotNetOpenId.csproj
@@ -89,13 +89,13 @@
     <Compile Include="Provider\Request.cs" />

     <Compile Include="Provider\Response.cs" />

     <Compile Include="Provider\ProviderEndpoint.cs" />

-    <Compile Include="RegistrationExtension\Gender.cs" />

+    <Compile Include="Extensions\Gender.cs" />

     <Compile Include="Provider\AssociatedRequest.cs" />

-    <Compile Include="RegistrationExtension\ProfileFieldValues.cs" />

-    <Compile Include="RegistrationExtension\ProfileRequestFields.cs" />

+    <Compile Include="Extensions\SimpleRegistrationFieldValues.cs" />

+    <Compile Include="Extensions\SimpleRegistrationRequestFields.cs" />

     <Compile Include="RelyingParty\OpenIdLogin.cs" />

     <Compile Include="RelyingParty\OpenIdTextBox.cs" />

-    <Compile Include="RegistrationExtension\ProfileRequest.cs" />

+    <Compile Include="Extensions\SimpleRegistrationRequest.cs" />

     <Compile Include="RelyingParty\ServiceEndpoint.cs" />

     <Compile Include="CryptUtil.cs" />

     <Compile Include="DiffieHellman\DHKeyGeneration.cs" />

diff --git a/src/DotNetOpenId/RegistrationExtension/Gender.cs b/src/DotNetOpenId/Extensions/Gender.cs
index 7090437..25f303b 100644
--- a/src/DotNetOpenId/RegistrationExtension/Gender.cs
+++ b/src/DotNetOpenId/Extensions/Gender.cs
@@ -5,7 +5,7 @@
  * For news or support on this file: http://blog.nerdbank.net/

  ********************************************************/

 

-namespace DotNetOpenId.RegistrationExtension {

+namespace DotNetOpenId.Extensions {

 	public enum Gender {

 		Male,

 		Female,

diff --git a/src/DotNetOpenId/RegistrationExtension/ProfileFieldValues.cs b/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs
index c87a6b9..fd5d806 100644
--- a/src/DotNetOpenId/RegistrationExtension/ProfileFieldValues.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistrationFieldValues.cs
@@ -8,18 +8,18 @@
 using System;

 using System.Globalization;

 using System.Net.Mail;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 using System.Xml.Serialization;

 using DotNetOpenId.RelyingParty;

 using DotNetOpenId.Provider;

 using System.Collections.Generic;

 

-namespace DotNetOpenId.RegistrationExtension

+namespace DotNetOpenId.Extensions

 {

 	[Serializable()]

-	public struct ProfileFieldValues

+	public struct SimpleRegistrationFieldValues

 	{

-		public static readonly ProfileFieldValues Empty = new ProfileFieldValues();

+		public static readonly SimpleRegistrationFieldValues Empty = new SimpleRegistrationFieldValues();

 

 		public string Nickname { get; set; }

 		public string Email { get; set; }

@@ -83,7 +83,7 @@ namespace DotNetOpenId.RegistrationExtension
 				fields.Add(QueryStringArgs.openidnp.sregnp.fullname, FullName);

 			}

 			if (Gender != null) {

-				if (Gender == DotNetOpenId.RegistrationExtension.Gender.Female) {

+				if (Gender == DotNetOpenId.Extensions.Gender.Female) {

 					fields.Add(QueryStringArgs.openidnp.sregnp.gender, QueryStringArgs.Genders.Female);

 				} else {

 					fields.Add(QueryStringArgs.openidnp.sregnp.gender, QueryStringArgs.Genders.Male);

@@ -103,7 +103,7 @@ namespace DotNetOpenId.RegistrationExtension
 			}

 			authenticationRequest.AddExtensionArguments(QueryStringArgs.sreg_ns, fields);

 		}

-		public static ProfileFieldValues ReadFromResponse(IAuthenticationResponse response) {

+		public static SimpleRegistrationFieldValues ReadFromResponse(IAuthenticationResponse response) {

 			var sreg = response.GetExtensionArguments(QueryStringArgs.sreg_ns);

 			string nickname, email, fullName, dob, genderString, postalCode, country, language, timeZone;

 			DateTime? birthDate = null;

@@ -118,8 +118,8 @@ namespace DotNetOpenId.RegistrationExtension
 			}

 			if (sreg.TryGetValue(QueryStringArgs.openidnp.sregnp.gender, out genderString)) {

 				switch (genderString) {

-					case QueryStringArgs.Genders.Male: gender = DotNetOpenId.RegistrationExtension.Gender.Male; break;

-					case QueryStringArgs.Genders.Female: gender = DotNetOpenId.RegistrationExtension.Gender.Female; break;

+					case QueryStringArgs.Genders.Male: gender = DotNetOpenId.Extensions.Gender.Male; break;

+					case QueryStringArgs.Genders.Female: gender = DotNetOpenId.Extensions.Gender.Female; break;

 				}

 			}

 			sreg.TryGetValue(QueryStringArgs.openidnp.sregnp.postcode, out postalCode);

@@ -127,7 +127,7 @@ namespace DotNetOpenId.RegistrationExtension
 			sreg.TryGetValue(QueryStringArgs.openidnp.sregnp.language, out language);

 			sreg.TryGetValue(QueryStringArgs.openidnp.sregnp.timezone, out timeZone);

 

-			return new ProfileFieldValues() {

+			return new SimpleRegistrationFieldValues() {

 				Nickname = nickname,

 				Email = email,

 				FullName = fullName,

@@ -142,8 +142,8 @@ namespace DotNetOpenId.RegistrationExtension
 

 		public override bool Equals(object obj)

 		{

-			if (!(obj is ProfileFieldValues)) return false;

-			ProfileFieldValues other = (ProfileFieldValues)obj;

+			if (!(obj is SimpleRegistrationFieldValues)) return false;

+			SimpleRegistrationFieldValues other = (SimpleRegistrationFieldValues)obj;

 

 			return

 				safeEquals(this.BirthDate, other.BirthDate) &&

diff --git a/src/DotNetOpenId/RegistrationExtension/ProfileRequest.cs b/src/DotNetOpenId/Extensions/SimpleRegistrationRequest.cs
index 5ad5227..ca8ef06 100644
--- a/src/DotNetOpenId/RegistrationExtension/ProfileRequest.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistrationRequest.cs
@@ -5,8 +5,8 @@
  * For news or support on this file: http://blog.nerdbank.net/

  ********************************************************/

 

-namespace DotNetOpenId.RegistrationExtension {

-	public enum ProfileRequest {

+namespace DotNetOpenId.Extensions {

+	public enum SimpleRegistrationRequest {

 		NoRequest,

 		Request,

 		Require,

diff --git a/src/DotNetOpenId/RegistrationExtension/ProfileRequestFields.cs b/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs
index 5d50f60..dcbff38 100644
--- a/src/DotNetOpenId/RegistrationExtension/ProfileRequestFields.cs
+++ b/src/DotNetOpenId/Extensions/SimpleRegistrationRequestFields.cs
@@ -6,22 +6,22 @@ using System.Globalization;
 using DotNetOpenId.Provider;

 using DotNetOpenId.RelyingParty;

 

-namespace DotNetOpenId.RegistrationExtension {

+namespace DotNetOpenId.Extensions {

 	/// <summary>

 	/// Carries the request/require/none demand state of the simple registration fields.

 	/// </summary>

-	public struct ProfileRequestFields {

-		public static readonly ProfileRequestFields None = new ProfileRequestFields();

+	public struct SimpleRegistrationRequestFields {

+		public static readonly SimpleRegistrationRequestFields None = new SimpleRegistrationRequestFields();

 

-		public ProfileRequest Nickname { get; set; }

-		public ProfileRequest Email { get; set; }

-		public ProfileRequest FullName { get; set; }

-		public ProfileRequest BirthDate { get; set; }

-		public ProfileRequest Gender { get; set; }

-		public ProfileRequest PostalCode { get; set; }

-		public ProfileRequest Country { get; set; }

-		public ProfileRequest Language { get; set; }

-		public ProfileRequest TimeZone { get; set; }

+		public SimpleRegistrationRequest Nickname { get; set; }

+		public SimpleRegistrationRequest Email { get; set; }

+		public SimpleRegistrationRequest FullName { get; set; }

+		public SimpleRegistrationRequest BirthDate { get; set; }

+		public SimpleRegistrationRequest Gender { get; set; }

+		public SimpleRegistrationRequest PostalCode { get; set; }

+		public SimpleRegistrationRequest Country { get; set; }

+		public SimpleRegistrationRequest Language { get; set; }

+		public SimpleRegistrationRequest TimeZone { get; set; }

 

 		/// <summary>

 		/// The URL the consumer site provides for the authenticating user to review

@@ -39,7 +39,7 @@ namespace DotNetOpenId.RegistrationExtension {
 		/// the OpenId specification for field names, omitting the 'openid.sreg' prefix.

 		/// </param>

 		/// <param name="requestLevel">The none/request/require state of the listed fields.</param>

-		internal void SetProfileRequestFromList(ICollection<string> fieldNames, ProfileRequest requestLevel) {

+		internal void SetProfileRequestFromList(ICollection<string> fieldNames, SimpleRegistrationRequest requestLevel) {

 			foreach (string field in fieldNames) {

 				switch (field) {

 					case QueryStringArgs.openidnp.sregnp.nickname:

@@ -75,7 +75,7 @@ namespace DotNetOpenId.RegistrationExtension {
 				}

 			}

 		}

-		string[] assembleProfileFields(ProfileRequest level) {

+		string[] assembleProfileFields(SimpleRegistrationRequest level) {

 			List<string> fields = new List<string>(10);

 			if (Nickname == level)

 				fields.Add(QueryStringArgs.openidnp.sregnp.nickname);

@@ -102,8 +102,8 @@ namespace DotNetOpenId.RegistrationExtension {
 		/// Reads the sreg extension information on an authentication request to the provider

 		/// and returns information on what profile fields the consumer is requesting/requiring.

 		/// </summary>

-		public static ProfileRequestFields ReadFromRequest(IRequest request) {

-			ProfileRequestFields fields = new ProfileRequestFields();

+		public static SimpleRegistrationRequestFields ReadFromRequest(IRequest request) {

+			SimpleRegistrationRequestFields fields = new SimpleRegistrationRequestFields();

 			var args = request.GetExtensionArguments(QueryStringArgs.sreg_ns);

 

 			string policyUrl;

@@ -114,12 +114,12 @@ namespace DotNetOpenId.RegistrationExtension {
 

 			string optionalFields;

 			if (args.TryGetValue(QueryStringArgs.openidnp.sregnp.optional, out optionalFields)) {

-				fields.SetProfileRequestFromList(optionalFields.Split(','), ProfileRequest.Request);

+				fields.SetProfileRequestFromList(optionalFields.Split(','), SimpleRegistrationRequest.Request);

 			}

 

 			string requiredFields;

 			if (args.TryGetValue(QueryStringArgs.openidnp.sregnp.required, out requiredFields)) {

-				fields.SetProfileRequestFromList(requiredFields.Split(','), ProfileRequest.Require);

+				fields.SetProfileRequestFromList(requiredFields.Split(','), SimpleRegistrationRequest.Require);

 			}

 

 			return fields;

@@ -129,8 +129,8 @@ namespace DotNetOpenId.RegistrationExtension {
 			if (PolicyUrl != null)

 				fields.Add(QueryStringArgs.openidnp.sregnp.policy_url, PolicyUrl.AbsoluteUri);

 

-			fields.Add(QueryStringArgs.openidnp.sregnp.required, string.Join(",", assembleProfileFields(ProfileRequest.Require)));

-			fields.Add(QueryStringArgs.openidnp.sregnp.optional, string.Join(",", assembleProfileFields(ProfileRequest.Request)));

+			fields.Add(QueryStringArgs.openidnp.sregnp.required, string.Join(",", assembleProfileFields(SimpleRegistrationRequest.Require)));

+			fields.Add(QueryStringArgs.openidnp.sregnp.optional, string.Join(",", assembleProfileFields(SimpleRegistrationRequest.Request)));

 

 			request.AddExtensionArguments(QueryStringArgs.sreg_ns, fields);

 		}

@@ -147,8 +147,8 @@ Language = '{7}'
 TimeZone = '{8}'", Nickname, Email, FullName, BirthDate, Gender, PostalCode, Country, Language, TimeZone);

 		}

 		public override bool Equals(object obj) {

-			if (!(obj is ProfileRequestFields)) return false;

-			ProfileRequestFields other = (ProfileRequestFields)obj;

+			if (!(obj is SimpleRegistrationRequestFields)) return false;

+			SimpleRegistrationRequestFields other = (SimpleRegistrationRequestFields)obj;

 

 			return

 				safeEquals(this.BirthDate, other.BirthDate) &&

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdLogin.cs b/src/DotNetOpenId/RelyingParty/OpenIdLogin.cs
index 249f62a..6570a37 100644
--- a/src/DotNetOpenId/RelyingParty/OpenIdLogin.cs
+++ b/src/DotNetOpenId/RelyingParty/OpenIdLogin.cs
@@ -10,7 +10,7 @@ using System.ComponentModel;
 using System.Web.UI;

 using System.Web.UI.WebControls;

 using System.Web.UI.HtmlControls;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 using System.Diagnostics.CodeAnalysis;

 

 namespace DotNetOpenId.RelyingParty

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
index e518f11..a16a5d6 100644
--- a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
+++ b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
@@ -12,7 +12,7 @@ using System.ComponentModel;
 using System.Web.Security;

 using System.Web.UI;

 using System.Web.UI.WebControls;

-using DotNetOpenId.RegistrationExtension;

+using DotNetOpenId.Extensions;

 using System.Net;

 using System.Text.RegularExpressions;

 using System.Diagnostics;

@@ -175,101 +175,101 @@ namespace DotNetOpenId.RelyingParty
 		}

 

 		const string requestNicknameViewStateKey = "RequestNickname";

-		const ProfileRequest requestNicknameDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestNicknameDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestNicknameDefault)]

-		public ProfileRequest RequestNickname

+		public SimpleRegistrationRequest RequestNickname

 		{

-			get { return (ProfileRequest)(ViewState[requestNicknameViewStateKey] ?? requestNicknameDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestNicknameViewStateKey] ?? requestNicknameDefault); }

 			set { ViewState[requestNicknameViewStateKey] = value; }

 		}

 

 		const string requestEmailViewStateKey = "RequestEmail";

-		const ProfileRequest requestEmailDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestEmailDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestEmailDefault)]

-		public ProfileRequest RequestEmail

+		public SimpleRegistrationRequest RequestEmail

 		{

-			get { return (ProfileRequest)(ViewState[requestEmailViewStateKey] ?? requestEmailDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestEmailViewStateKey] ?? requestEmailDefault); }

 			set { ViewState[requestEmailViewStateKey] = value; }

 		}

 

 		const string requestFullNameViewStateKey = "RequestFullName";

-		const ProfileRequest requestFullNameDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestFullNameDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestFullNameDefault)]

-		public ProfileRequest RequestFullName

+		public SimpleRegistrationRequest RequestFullName

 		{

-			get { return (ProfileRequest)(ViewState[requestFullNameViewStateKey] ?? requestFullNameDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestFullNameViewStateKey] ?? requestFullNameDefault); }

 			set { ViewState[requestFullNameViewStateKey] = value; }

 		}

 

 		const string requestBirthDateViewStateKey = "RequestBirthday";

-		const ProfileRequest requestBirthDateDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestBirthDateDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestBirthDateDefault)]

-		public ProfileRequest RequestBirthDate

+		public SimpleRegistrationRequest RequestBirthDate

 		{

-			get { return (ProfileRequest)(ViewState[requestBirthDateViewStateKey] ?? requestBirthDateDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestBirthDateViewStateKey] ?? requestBirthDateDefault); }

 			set { ViewState[requestBirthDateViewStateKey] = value; }

 		}

 

 		const string requestGenderViewStateKey = "RequestGender";

-		const ProfileRequest requestGenderDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestGenderDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestGenderDefault)]

-		public ProfileRequest RequestGender

+		public SimpleRegistrationRequest RequestGender

 		{

-			get { return (ProfileRequest)(ViewState[requestGenderViewStateKey] ?? requestGenderDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestGenderViewStateKey] ?? requestGenderDefault); }

 			set { ViewState[requestGenderViewStateKey] = value; }

 		}

 

 		const string requestPostalCodeViewStateKey = "RequestPostalCode";

-		const ProfileRequest requestPostalCodeDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestPostalCodeDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestPostalCodeDefault)]

-		public ProfileRequest RequestPostalCode

+		public SimpleRegistrationRequest RequestPostalCode

 		{

-			get { return (ProfileRequest)(ViewState[requestPostalCodeViewStateKey] ?? requestPostalCodeDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestPostalCodeViewStateKey] ?? requestPostalCodeDefault); }

 			set { ViewState[requestPostalCodeViewStateKey] = value; }

 		}

 

 		const string requestCountryViewStateKey = "RequestCountry";

-		const ProfileRequest requestCountryDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestCountryDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestCountryDefault)]

-		public ProfileRequest RequestCountry

+		public SimpleRegistrationRequest RequestCountry

 		{

-			get { return (ProfileRequest)(ViewState[requestCountryViewStateKey] ?? requestCountryDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestCountryViewStateKey] ?? requestCountryDefault); }

 			set { ViewState[requestCountryViewStateKey] = value; }

 		}

 

 		const string requestLanguageViewStateKey = "RequestLanguage";

-		const ProfileRequest requestLanguageDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestLanguageDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestLanguageDefault)]

-		public ProfileRequest RequestLanguage

+		public SimpleRegistrationRequest RequestLanguage

 		{

-			get { return (ProfileRequest)(ViewState[requestLanguageViewStateKey] ?? requestLanguageDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestLanguageViewStateKey] ?? requestLanguageDefault); }

 			set { ViewState[requestLanguageViewStateKey] = value; }

 		}

 

 		const string requestTimeZoneViewStateKey = "RequestTimeZone";

-		const ProfileRequest requestTimeZoneDefault = ProfileRequest.NoRequest;

+		const SimpleRegistrationRequest requestTimeZoneDefault = SimpleRegistrationRequest.NoRequest;

 		[Bindable(true)]

 		[Category(profileCategory)]

 		[DefaultValue(requestTimeZoneDefault)]

-		public ProfileRequest RequestTimeZone

+		public SimpleRegistrationRequest RequestTimeZone

 		{

-			get { return (ProfileRequest)(ViewState[requestTimeZoneViewStateKey] ?? requestTimeZoneDefault); }

+			get { return (SimpleRegistrationRequest)(ViewState[requestTimeZoneViewStateKey] ?? requestTimeZoneDefault); }

 			set { ViewState[requestTimeZoneViewStateKey] = value; }

 		}

 

@@ -460,7 +460,7 @@ namespace DotNetOpenId.RelyingParty
 

 		void addProfileArgs(IAuthenticationRequest request)

 		{

-			new ProfileRequestFields() {

+			new SimpleRegistrationRequestFields() {

 				Nickname = RequestNickname,

 				Email = RequestEmail,

 				FullName = RequestFullName,

@@ -525,7 +525,7 @@ namespace DotNetOpenId.RelyingParty
 			{

 				Response = response;

 				ClaimedIdentifier = response.ClaimedIdentifier;

-				ProfileFields = ProfileFieldValues.ReadFromResponse(response);

+				ProfileFields = SimpleRegistrationFieldValues.ReadFromResponse(response);

 			}

 			/// <summary>

 			/// Cancels the OpenID authentication and/or login process.

@@ -542,7 +542,7 @@ namespace DotNetOpenId.RelyingParty
 			/// Gets the simple registration (sreg) extension fields given

 			/// by the provider, if any.

 			/// </summary>

-			public ProfileFieldValues ProfileFields { get; private set; }

+			public SimpleRegistrationFieldValues ProfileFields { get; private set; }

 		}

 		/// <summary>

 		/// Fired upon completion of a successful login.