79 files changed, 194 insertions, 204 deletions

diff --git a/samples/DotNetOpenAuth.ApplicationBlock/Facebook/FacebookClient.cs b/samples/DotNetOpenAuth.ApplicationBlock/Facebook/FacebookClient.cs
index 2f3840e..0bf2fdd 100644
--- a/samples/DotNetOpenAuth.ApplicationBlock/Facebook/FacebookClient.cs
+++ b/samples/DotNetOpenAuth.ApplicationBlock/Facebook/FacebookClient.cs
@@ -11,7 +11,7 @@ namespace DotNetOpenAuth.ApplicationBlock {
 	using System.Text;
 	using System.Web;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 	public class FacebookClient : WebServerClient {
 		private static readonly AuthorizationServerDescription FacebookDescription = new AuthorizationServerDescription {
diff --git a/samples/DotNetOpenAuth.ApplicationBlock/InMemoryClientTokenManager.cs b/samples/DotNetOpenAuth.ApplicationBlock/InMemoryClientTokenManager.cs
index 4c86df7..24144bf 100644
--- a/samples/DotNetOpenAuth.ApplicationBlock/InMemoryClientTokenManager.cs
+++ b/samples/DotNetOpenAuth.ApplicationBlock/InMemoryClientTokenManager.cs
@@ -13,7 +13,7 @@ namespace DotNetOpenAuth.ApplicationBlock {
 	using System.Text;
 	using System.Threading;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 #if SAMPLESONLY
 	internal class InMemoryClientTokenManager : IClientTokenManager {
diff --git a/samples/DotNetOpenAuth.ApplicationBlock/TokenManager.cs b/samples/DotNetOpenAuth.ApplicationBlock/TokenManager.cs
index 22099a3..842045c 100644
--- a/samples/DotNetOpenAuth.ApplicationBlock/TokenManager.cs
+++ b/samples/DotNetOpenAuth.ApplicationBlock/TokenManager.cs
@@ -6,7 +6,7 @@
 
 namespace DotNetOpenAuth.ApplicationBlock {
 	using System;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 	public class TokenManager : IClientTokenManager {
 		public IAuthorizationState GetAuthorizationState(Uri callbackUrl, string clientState) {
diff --git a/samples/OAuthConsumer/Facebook.aspx.cs b/samples/OAuthConsumer/Facebook.aspx.cs
index 5935859..95e209a 100644
--- a/samples/OAuthConsumer/Facebook.aspx.cs
+++ b/samples/OAuthConsumer/Facebook.aspx.cs
@@ -5,7 +5,7 @@
 	using System.Web;
 	using DotNetOpenAuth.ApplicationBlock;
 	using DotNetOpenAuth.ApplicationBlock.Facebook;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 	public partial class Facebook : System.Web.UI.Page {
 		private static readonly FacebookClient client = new FacebookClient {
diff --git a/samples/OAuthConsumer/SampleWcf2.aspx.cs b/samples/OAuthConsumer/SampleWcf2.aspx.cs
index 7fae00b..6b6ced2 100644
--- a/samples/OAuthConsumer/SampleWcf2.aspx.cs
+++ b/samples/OAuthConsumer/SampleWcf2.aspx.cs
@@ -11,7 +11,7 @@
 	using System.Web.UI;
 	using System.Web.UI.WebControls;
 	using DotNetOpenAuth.ApplicationBlock;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 	using OAuthConsumer.SampleServiceProvider;
 
 	public partial class SampleWcf2 : System.Web.UI.Page {
diff --git a/samples/OAuthConsumerWpf/Authorize2.xaml.cs b/samples/OAuthConsumerWpf/Authorize2.xaml.cs
index 91435da..4a0a969 100644
--- a/samples/OAuthConsumerWpf/Authorize2.xaml.cs
+++ b/samples/OAuthConsumerWpf/Authorize2.xaml.cs
@@ -13,7 +13,7 @@
 	using System.Windows.Media.Imaging;
 	using System.Windows.Navigation;
 	using System.Windows.Shapes;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 	/// <summary>
 	/// Interaction logic for Authorize2.xaml
diff --git a/samples/OAuthConsumerWpf/MainWindow.xaml.cs b/samples/OAuthConsumerWpf/MainWindow.xaml.cs
index 749a626..f315922 100644
--- a/samples/OAuthConsumerWpf/MainWindow.xaml.cs
+++ b/samples/OAuthConsumerWpf/MainWindow.xaml.cs
@@ -29,7 +29,7 @@
 	using DotNetOpenAuth.OAuth;
 	using DotNetOpenAuth.OAuth.ChannelElements;
 	using DotNetOpenAuth.Samples.OAuthConsumerWpf.WcfSampleService;
-	using OAuth2 = DotNetOpenAuth.OAuthWrap;
+	using OAuth2 = DotNetOpenAuth.OAuth2;
 
 	/// <summary>
 	/// Interaction logic for MainWindow.xaml
@@ -202,7 +202,7 @@
 		}
 
 		private void wrapBeginButton_Click(object sender, RoutedEventArgs e) {
-			var authServer = new DotNetOpenAuth.OAuthWrap.AuthorizationServerDescription {
+			var authServer = new DotNetOpenAuth.OAuth2.AuthorizationServerDescription {
 				AuthorizationEndpoint = new Uri(wrapAuthorizationUrlBox.Text),
 			};
 			if (wrapTokenUrlBox.Text.Length > 0) {
@@ -210,7 +210,7 @@
 			}
 
 			try {
-				////var client = new DotNetOpenAuth.OAuthWrap.WebAppClient(authServer);
+				////var client = new DotNetOpenAuth.OAuth2.WebAppClient(authServer);
 				////client.PrepareRequestUserAuthorization();
 				var client = new OAuth2.UserAgentClient(authServer) {
 					ClientIdentifier = wrapClientIdentifierBox.Text,
diff --git a/samples/OAuthServiceProvider/Code/Global.cs b/samples/OAuthServiceProvider/Code/Global.cs
index 44263e9..e8bacae 100644
--- a/samples/OAuthServiceProvider/Code/Global.cs
+++ b/samples/OAuthServiceProvider/Code/Global.cs
@@ -5,8 +5,8 @@
 	using System.Text;
 	using System.Web;
 	using DotNetOpenAuth.OAuth.Messages;
-	using DotNetOpenAuth.OAuthWrap;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
 	/// The web application global events and properties.
diff --git a/samples/OAuthServiceProvider/Code/OAuth2AuthorizationServer.cs b/samples/OAuthServiceProvider/Code/OAuth2AuthorizationServer.cs
index e281b07..a0234e2 100644
--- a/samples/OAuthServiceProvider/Code/OAuth2AuthorizationServer.cs
+++ b/samples/OAuthServiceProvider/Code/OAuth2AuthorizationServer.cs
@@ -7,8 +7,8 @@
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.Messaging.Bindings;
 	using DotNetOpenAuth.OAuth.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	internal class OAuth2AuthorizationServer : IAuthorizationServer {
 		internal static readonly RSAParameters AsymmetricKey;
diff --git a/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs b/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs
index 92038bd..be6d671 100644
--- a/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs
+++ b/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs
@@ -9,7 +9,7 @@
 	using System.ServiceModel.Security;
 	using DotNetOpenAuth.OAuth;
 	using DotNetOpenAuth.OAuth.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 	/// <summary>
 	/// A WCF extension to authenticate incoming messages using OAuth.
diff --git a/samples/OAuthServiceProvider/OAuth2.ashx.cs b/samples/OAuthServiceProvider/OAuth2.ashx.cs
index 272502c..259803a 100644
--- a/samples/OAuthServiceProvider/OAuth2.ashx.cs
+++ b/samples/OAuthServiceProvider/OAuth2.ashx.cs
@@ -7,7 +7,7 @@
 	using System.Web.SessionState;
 	using Code;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap;
+	using DotNetOpenAuth.OAuth2;
 
 	public class OAuth2 : IHttpHandler, IRequiresSessionState {
 		/// <summary>
diff --git a/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs b/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs
index 3c85bcb..5fb45b6 100644
--- a/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs
@@ -10,9 +10,9 @@ namespace DotNetOpenAuth.Test.OAuthWrap {
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
+	using DotNetOpenAuth.OAuth2.Messages;
 	using NUnit.Framework;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth.Test/OAuthWrap/OAuthWrapChannelTests.cs b/src/DotNetOpenAuth.Test/OAuthWrap/OAuthWrapChannelTests.cs
index c7fe48f..20fd5a5 100644
--- a/src/DotNetOpenAuth.Test/OAuthWrap/OAuthWrapChannelTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuthWrap/OAuthWrapChannelTests.cs
@@ -10,9 +10,9 @@ namespace DotNetOpenAuth.Test.OAuthWrap {
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
+	using DotNetOpenAuth.OAuth2.Messages;
 	using NUnit.Framework;
 
 	[TestFixture]
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
index bca5705..bc64780 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
@@ -306,56 +306,56 @@ http://opensource.org/licenses/ms-pl.html
     <Compile Include="Mvc\OpenIdHelper.cs" />
     <Compile Include="Mvc\OpenIdAjaxOptions.cs" />
     <Compile Include="Messaging\StandardMessageFactory.cs" />
-    <Compile Include="OAuthWrap\AuthorizationServerBase.cs" />
-    <Compile Include="OAuthWrap\AuthorizationState.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\AccessRequestBindingElement.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\AccessToken.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\AuthorizationDataBag.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\AuthServerBindingElementBase.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\IDataBagFormatter.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\UriStyleMessageFormatter.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\IAccessTokenRequest.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\IAuthorizationDescription.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\ITokenCarryingRequest.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\OAuthWrapResourceServerChannel.cs" />
+    <Compile Include="OAuth2\AuthorizationServerBase.cs" />
+    <Compile Include="OAuth2\AuthorizationState.cs" />
+    <Compile Include="OAuth2\ChannelElements\AccessRequestBindingElement.cs" />
+    <Compile Include="OAuth2\ChannelElements\AccessToken.cs" />
+    <Compile Include="OAuth2\ChannelElements\AuthorizationDataBag.cs" />
+    <Compile Include="OAuth2\ChannelElements\AuthServerBindingElementBase.cs" />
+    <Compile Include="OAuth2\ChannelElements\IDataBagFormatter.cs" />
+    <Compile Include="OAuth2\ChannelElements\UriStyleMessageFormatter.cs" />
+    <Compile Include="OAuth2\ChannelElements\IAccessTokenRequest.cs" />
+    <Compile Include="OAuth2\ChannelElements\IAuthorizationDescription.cs" />
+    <Compile Include="OAuth2\ChannelElements\ITokenCarryingRequest.cs" />
+    <Compile Include="OAuth2\ChannelElements\OAuthWrapResourceServerChannel.cs" />
     <Compile Include="Messaging\StandardMessageFactoryChannel.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\RefreshToken.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\DataBag.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\TimestampEncoder.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\VerificationCode.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\WebServerVerificationCodeBindingElement.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\AuthServerAllFlowsBindingElement.cs" />
-    <Compile Include="OAuthWrap\IAccessTokenAnalyzer.cs" />
-    <Compile Include="OAuthWrap\IAuthorizationServer.cs" />
-    <Compile Include="OAuthWrap\IAuthorizationState.cs" />
-    <Compile Include="OAuthWrap\IClientTokenManager.cs" />
-    <Compile Include="OAuthWrap\Messages\AccessProtectedResourceRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\Assertion\AssertionRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\ClientCredentials\ClientCredentialsRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\IAccessTokenSuccessResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\IMessageWithClientState.cs" />
-    <Compile Include="OAuthWrap\Messages\IOAuthDirectResponseFormat.cs" />
-    <Compile Include="OAuthWrap\Messages\RefreshAccessTokenRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\Device\DeviceAccessTokenRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\Device\DeviceRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\Device\DeviceResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UnauthorizedResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\AccessTokenFailedResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\AccessTokenSuccessResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UserAgent\UserAgentFailedResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UserAgent\UserAgentRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\UserAgent\UserAgentSuccessResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordCaptchaResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordVerificationResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\ResponseFormat.cs" />
-    <Compile Include="OAuthWrap\Messages\ResponseFormatEncoder.cs" />
-    <Compile Include="OAuthWrap\Messages\EndUserAuthorizationSuccessResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\WebServer\WebServerRequest.cs" />
-    <Compile Include="OAuthWrap\ResourceServer.cs" />
-    <Compile Include="OAuthWrap\StandardAccessTokenAnalyzer.cs" />
-    <Compile Include="OAuthWrap\UserAgentClient.cs" />
-    <Compile Include="OAuthWrap\WebServerAuthorizationServer.cs" />
-    <Compile Include="OAuthWrap\WrapUtilities.cs" />
+    <Compile Include="OAuth2\ChannelElements\RefreshToken.cs" />
+    <Compile Include="OAuth2\ChannelElements\DataBag.cs" />
+    <Compile Include="OAuth2\ChannelElements\TimestampEncoder.cs" />
+    <Compile Include="OAuth2\ChannelElements\VerificationCode.cs" />
+    <Compile Include="OAuth2\ChannelElements\WebServerVerificationCodeBindingElement.cs" />
+    <Compile Include="OAuth2\ChannelElements\AuthServerAllFlowsBindingElement.cs" />
+    <Compile Include="OAuth2\IAccessTokenAnalyzer.cs" />
+    <Compile Include="OAuth2\IAuthorizationServer.cs" />
+    <Compile Include="OAuth2\IAuthorizationState.cs" />
+    <Compile Include="OAuth2\IClientTokenManager.cs" />
+    <Compile Include="OAuth2\Messages\AccessProtectedResourceRequest.cs" />
+    <Compile Include="OAuth2\Messages\Assertion\AssertionRequest.cs" />
+    <Compile Include="OAuth2\Messages\ClientCredentials\ClientCredentialsRequest.cs" />
+    <Compile Include="OAuth2\Messages\IAccessTokenSuccessResponse.cs" />
+    <Compile Include="OAuth2\Messages\IMessageWithClientState.cs" />
+    <Compile Include="OAuth2\Messages\IOAuthDirectResponseFormat.cs" />
+    <Compile Include="OAuth2\Messages\RefreshAccessTokenRequest.cs" />
+    <Compile Include="OAuth2\Messages\Device\DeviceAccessTokenRequest.cs" />
+    <Compile Include="OAuth2\Messages\Device\DeviceRequest.cs" />
+    <Compile Include="OAuth2\Messages\Device\DeviceResponse.cs" />
+    <Compile Include="OAuth2\Messages\UnauthorizedResponse.cs" />
+    <Compile Include="OAuth2\Messages\AccessTokenFailedResponse.cs" />
+    <Compile Include="OAuth2\Messages\AccessTokenSuccessResponse.cs" />
+    <Compile Include="OAuth2\Messages\UserAgent\UserAgentFailedResponse.cs" />
+    <Compile Include="OAuth2\Messages\UserAgent\UserAgentRequest.cs" />
+    <Compile Include="OAuth2\Messages\UserAgent\UserAgentSuccessResponse.cs" />
+    <Compile Include="OAuth2\Messages\UsernameAndPassword\UserNamePasswordCaptchaResponse.cs" />
+    <Compile Include="OAuth2\Messages\UsernameAndPassword\UserNamePasswordVerificationResponse.cs" />
+    <Compile Include="OAuth2\Messages\ResponseFormat.cs" />
+    <Compile Include="OAuth2\Messages\ResponseFormatEncoder.cs" />
+    <Compile Include="OAuth2\Messages\EndUserAuthorizationSuccessResponse.cs" />
+    <Compile Include="OAuth2\Messages\WebServer\WebServerRequest.cs" />
+    <Compile Include="OAuth2\ResourceServer.cs" />
+    <Compile Include="OAuth2\StandardAccessTokenAnalyzer.cs" />
+    <Compile Include="OAuth2\UserAgentClient.cs" />
+    <Compile Include="OAuth2\WebServerAuthorizationServer.cs" />
+    <Compile Include="OAuth2\OAuthUtilities.cs" />
     <Compile Include="OAuth\ChannelElements\ICombinedOpenIdProviderTokenManager.cs" />
     <Compile Include="OAuth\ChannelElements\IConsumerDescription.cs" />
     <Compile Include="OAuth\ChannelElements\IConsumerTokenManager.cs" />
@@ -642,24 +642,24 @@ http://opensource.org/licenses/ms-pl.html
     <Compile Include="Messaging\StandardWebRequestHandler.cs" />
     <Compile Include="Messaging\MessageReceivingEndpoint.cs" />
     <Compile Include="Reporting.cs" />
-    <Compile Include="OAuthWrap\ChannelElements\OAuthWrapAuthorizationServerChannel.cs" />
-    <Compile Include="OAuthWrap\ClientBase.cs" />
-    <Compile Include="OAuthWrap\Messages\MessageBase.cs" />
-    <Compile Include="OAuthWrap\Messages\WebServer\WebServerAccessTokenRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\WebServer\WebServerFailedResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\EndUserAuthorizationRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\WebServer\WebServerSuccessResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordFailedResponse.cs" />
-    <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordRequest.cs" />
-    <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordSuccessResponse.cs" />
-    <Compile Include="OAuthWrap\Protocol.cs" />
-    <Compile Include="OAuthWrap\OAuthWrapStrings.Designer.cs">
+    <Compile Include="OAuth2\ChannelElements\OAuthWrapAuthorizationServerChannel.cs" />
+    <Compile Include="OAuth2\ClientBase.cs" />
+    <Compile Include="OAuth2\Messages\MessageBase.cs" />
+    <Compile Include="OAuth2\Messages\WebServer\WebServerAccessTokenRequest.cs" />
+    <Compile Include="OAuth2\Messages\WebServer\WebServerFailedResponse.cs" />
+    <Compile Include="OAuth2\Messages\EndUserAuthorizationRequest.cs" />
+    <Compile Include="OAuth2\Messages\WebServer\WebServerSuccessResponse.cs" />
+    <Compile Include="OAuth2\Messages\UsernameAndPassword\UserNamePasswordFailedResponse.cs" />
+    <Compile Include="OAuth2\Messages\UsernameAndPassword\UserNamePasswordRequest.cs" />
+    <Compile Include="OAuth2\Messages\UsernameAndPassword\UserNamePasswordSuccessResponse.cs" />
+    <Compile Include="OAuth2\Protocol.cs" />
+    <Compile Include="OAuth2\OAuthWrapStrings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>OAuthWrapStrings.resx</DependentUpon>
     </Compile>
-    <Compile Include="OAuthWrap\AuthorizationServerDescription.cs" />
-    <Compile Include="OAuthWrap\WebServerClient.cs" />
+    <Compile Include="OAuth2\AuthorizationServerDescription.cs" />
+    <Compile Include="OAuth2\WebServerClient.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="OAuth\Protocol.cs" />
     <Compile Include="OAuth\ServiceProvider.cs" />
@@ -772,7 +772,7 @@ http://opensource.org/licenses/ms-pl.html
     <EmbeddedResource Include="OpenId\RelyingParty\OpenIdRelyingPartyAjaxControlBase.js">
       <Copyright>$(StandardCopyright)</Copyright>
     </EmbeddedResource>
-    <EmbeddedResource Include="OAuthWrap\OAuthWrapStrings.resx">
+    <EmbeddedResource Include="OAuth2\OAuthWrapStrings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>OAuthWrapStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
diff --git a/src/DotNetOpenAuth/Logger.cs b/src/DotNetOpenAuth/Logger.cs
index 7c8691c..48007ed 100644
--- a/src/DotNetOpenAuth/Logger.cs
+++ b/src/DotNetOpenAuth/Logger.cs
@@ -75,11 +75,6 @@ namespace DotNetOpenAuth {
 		private static readonly ILog oauth = Create("DotNetOpenAuth.OAuth");
 
 		/// <summary>
-		/// Backing field for the <see cref="Wrap"/> property.
-		/// </summary>
-		private static readonly ILog wrap = Create("DotNetOpenAuth.WRAP");
-
-		/// <summary>
 		/// Backing field for the <see cref="InfoCard"/> property.
 		/// </summary>
 		private static readonly ILog infocard = Create("DotNetOpenAuth.InfoCard");
@@ -135,11 +130,6 @@ namespace DotNetOpenAuth {
 		internal static ILog OAuth { get { return oauth; } }
 
 		/// <summary>
-		/// Gets the logger for the high-level OAuth WRAP events.
-		/// </summary>
-		internal static ILog Wrap { get { return wrap; } }
-
-		/// <summary>
 		/// Gets the logger for high-level InfoCard events.
 		/// </summary>
 		internal static ILog InfoCard { get { return infocard; } }
diff --git a/src/DotNetOpenAuth/OAuthWrap/AuthorizationServerBase.cs b/src/DotNetOpenAuth/OAuth2/AuthorizationServerBase.cs
index 9f56507..84e4604 100644
--- a/src/DotNetOpenAuth/OAuthWrap/AuthorizationServerBase.cs
+++ b/src/DotNetOpenAuth/OAuth2/AuthorizationServerBase.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -13,7 +13,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using System.Text;
 	using ChannelElements;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 	using OAuth.ChannelElements;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/AuthorizationServerDescription.cs b/src/DotNetOpenAuth/OAuth2/AuthorizationServerDescription.cs
index 93cc1e1..756c980 100644
--- a/src/DotNetOpenAuth/OAuthWrap/AuthorizationServerDescription.cs
+++ b/src/DotNetOpenAuth/OAuth2/AuthorizationServerDescription.cs
@@ -4,14 +4,14 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
 
 	/// <summary>
-	/// A description of an OAuth WRAP Authorization Server.
+	/// A description of an OAuth Authorization Server.
 	/// </summary>
 	public class AuthorizationServerDescription {
 		/// <summary>
@@ -47,12 +47,12 @@ namespace DotNetOpenAuth.OAuthWrap {
 		public Uri AuthorizationEndpoint { get; set; }
 
 		/// <summary>
-		/// Gets or sets the OAuth WRAP version supported by the Authorization Server.
+		/// Gets or sets the OAuth version supported by the Authorization Server.
 		/// </summary>
 		public ProtocolVersion ProtocolVersion { get; set; }
 
 		/// <summary>
-		/// Gets the version of the OAuth WRAP protocol to use with this Authorization Server.
+		/// Gets the version of the OAuth protocol to use with this Authorization Server.
 		/// </summary>
 		/// <value>The version.</value>
 		internal Version Version {
diff --git a/src/DotNetOpenAuth/OAuthWrap/AuthorizationState.cs b/src/DotNetOpenAuth/OAuth2/AuthorizationState.cs
index c990b2b..b6d2ee5 100644
--- a/src/DotNetOpenAuth/OAuthWrap/AuthorizationState.cs
+++ b/src/DotNetOpenAuth/OAuth2/AuthorizationState.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AccessRequestBindingElement.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessRequestBindingElement.cs
index 770bb23..45e0fd4 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AccessRequestBindingElement.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessRequestBindingElement.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AccessToken.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessToken.cs
index de6ef98..aba407f 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AccessToken.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AccessToken.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AuthServerAllFlowsBindingElement.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthServerAllFlowsBindingElement.cs
index 30430fb..361ec46 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AuthServerAllFlowsBindingElement.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthServerAllFlowsBindingElement.cs
@@ -4,13 +4,13 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
 	using System.Linq;
 	using System.Text;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 	using Messaging;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AuthServerBindingElementBase.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthServerBindingElementBase.cs
index dfc03f8..b117fa3 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AuthServerBindingElementBase.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthServerBindingElementBase.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AuthorizationDataBag.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthorizationDataBag.cs
index 134f1af..90d63eb 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/AuthorizationDataBag.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/AuthorizationDataBag.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/DataBag.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/DataBag.cs
index a7ec958..cefd24d 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/DataBag.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/DataBag.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -16,7 +16,7 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.Messaging.Bindings;
 	using DotNetOpenAuth.Messaging.Reflection;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
 	/// A collection of message parts that will be serialized into a single string,
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/IAccessTokenRequest.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/IAccessTokenRequest.cs
index d6c5bf3..f1f2361 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/IAccessTokenRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/IAccessTokenRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/IAuthorizationDescription.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/IAuthorizationDescription.cs
index 9e75594..a4aba57 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/IAuthorizationDescription.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/IAuthorizationDescription.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/IDataBagFormatter.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/IDataBagFormatter.cs
index 8e1d76b..a9c1875 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/IDataBagFormatter.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/IDataBagFormatter.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Diagnostics.Contracts;
 	using DotNetOpenAuth.Messaging;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/ITokenCarryingRequest.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/ITokenCarryingRequest.cs
index 335bf28..79d52ee 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/ITokenCarryingRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/ITokenCarryingRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using Messaging;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuthWrapAuthorizationServerChannel.cs
index ea08da0..f837f93 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuthWrapAuthorizationServerChannel.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -19,10 +19,10 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.Messaging.Bindings;
 	using DotNetOpenAuth.Messaging.Reflection;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
-	/// The channel for the OAuth WRAP protocol.
+	/// The channel for the OAuth protocol.
 	/// </summary>
 	internal class OAuthWrapAuthorizationServerChannel : StandardMessageFactoryChannel {
 		/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapResourceServerChannel.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuthWrapResourceServerChannel.cs
index 53821d2..56cc359 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapResourceServerChannel.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuthWrapResourceServerChannel.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -15,10 +15,10 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
 	using System.Web;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.Messaging.Reflection;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
-	/// The channel for the OAuth WRAP protocol.
+	/// The channel for the OAuth protocol.
 	/// </summary>
 	internal class OAuthWrapResourceServerChannel : StandardMessageFactoryChannel {
 		/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/RefreshToken.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/RefreshToken.cs
index 55f3e69..cd6cbf4 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/RefreshToken.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/RefreshToken.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/TimestampEncoder.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/TimestampEncoder.cs
index 26b3508..7c6aafb 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/TimestampEncoder.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/TimestampEncoder.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Globalization;
 	using DotNetOpenAuth.Messaging.Reflection;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/UriStyleMessageFormatter.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/UriStyleMessageFormatter.cs
index 12c532a..690082a 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/UriStyleMessageFormatter.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/UriStyleMessageFormatter.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/VerificationCode.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/VerificationCode.cs
index 84380d9..b920c2c 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/VerificationCode.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/VerificationCode.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Diagnostics.Contracts;
 	using System.Security.Cryptography;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/WebServerVerificationCodeBindingElement.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/WebServerVerificationCodeBindingElement.cs
index 1c71ebe..7b50c9c 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/WebServerVerificationCodeBindingElement.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/WebServerVerificationCodeBindingElement.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
+namespace DotNetOpenAuth.OAuth2.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/ClientBase.cs b/src/DotNetOpenAuth/OAuth2/ClientBase.cs
index 4dc6afd..27bc97b 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ClientBase.cs
+++ b/src/DotNetOpenAuth/OAuth2/ClientBase.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -13,11 +13,11 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using System.Net;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
-	/// A base class for common OAuth WRAP Client behaviors.
+	/// A base class for common OAuth Client behaviors.
 	/// </summary>
 	public class ClientBase {
 		/// <summary>
@@ -37,7 +37,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 		public AuthorizationServerDescription AuthorizationServer { get; private set; }
 
 		/// <summary>
-		/// Gets the OAuth WRAP channel.
+		/// Gets the OAuth channel.
 		/// </summary>
 		/// <value>The channel.</value>
 		public Channel Channel { get; private set; }
@@ -62,7 +62,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 			Contract.Requires<ArgumentNullException>(request != null);
 			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(accessToken));
 
-			WrapUtilities.AuthorizeWithOAuthWrap(request, accessToken);
+			OAuthUtilities.AuthorizeWithOAuthWrap(request, accessToken);
 		}
 
 		/// <summary>
@@ -70,7 +70,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 		/// (nearly) expired access token if necessary.
 		/// </summary>
 		/// <param name="request">The request for protected resources from the service provider.</param>
-		/// <param name="authorization">The authorization for this request previously obtained via OAuth WRAP.</param>
+		/// <param name="authorization">The authorization for this request previously obtained via OAuth.</param>
 		public void AuthorizeRequest(HttpWebRequest request, IAuthorizationState authorization) {
 			Contract.Requires<ArgumentNullException>(request != null);
 			Contract.Requires<ArgumentNullException>(authorization != null);
@@ -98,7 +98,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 				TimeSpan usefulLifeRemaining = authorization.AccessTokenExpirationUtc.Value - DateTime.UtcNow;
 				if (usefulLifeRemaining > skipIfUsefulLifeExceeds.Value) {
 					// There is useful life remaining in the access token.  Don't refresh.
-					Logger.Wrap.DebugFormat("Skipping token refresh step because access token's remaining life is {0}, which exceeds {1}.", usefulLifeRemaining, skipIfUsefulLifeExceeds.Value);
+					Logger.OAuth.DebugFormat("Skipping token refresh step because access token's remaining life is {0}, which exceeds {1}.", usefulLifeRemaining, skipIfUsefulLifeExceeds.Value);
 					return;
 				}
 			}
@@ -142,7 +142,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 			authorizationState.AccessTokenIssueDateUtc = DateTime.UtcNow;
 			if (accessTokenSuccess.Scope != null && accessTokenSuccess.Scope != authorizationState.Scope) {
 				if (authorizationState.Scope != null) {
-					Logger.Wrap.InfoFormat(
+					Logger.OAuth.InfoFormat(
 					                       "Requested scope of \"{0}\" changed to \"{1}\" by authorization server.",
 					                       authorizationState.Scope,
 					                       accessTokenSuccess.Scope);
diff --git a/src/DotNetOpenAuth/OAuthWrap/IAccessTokenAnalyzer.cs b/src/DotNetOpenAuth/OAuth2/IAccessTokenAnalyzer.cs
index 06e8e90..d82a6ab 100644
--- a/src/DotNetOpenAuth/OAuthWrap/IAccessTokenAnalyzer.cs
+++ b/src/DotNetOpenAuth/OAuth2/IAccessTokenAnalyzer.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/IAuthorizationServer.cs b/src/DotNetOpenAuth/OAuth2/IAuthorizationServer.cs
index c263277..b302651 100644
--- a/src/DotNetOpenAuth/OAuthWrap/IAuthorizationServer.cs
+++ b/src/DotNetOpenAuth/OAuth2/IAuthorizationServer.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -13,7 +13,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using System.Text;
 	using DotNetOpenAuth.Messaging.Bindings;
 	using DotNetOpenAuth.OAuth.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// Provides host-specific authorization server services needed by this library.
diff --git a/src/DotNetOpenAuth/OAuthWrap/IAuthorizationState.cs b/src/DotNetOpenAuth/OAuth2/IAuthorizationState.cs
index b68d84b..3839209 100644
--- a/src/DotNetOpenAuth/OAuthWrap/IAuthorizationState.cs
+++ b/src/DotNetOpenAuth/OAuth2/IAuthorizationState.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/IClientTokenManager.cs b/src/DotNetOpenAuth/OAuth2/IClientTokenManager.cs
index c6beb90..776d691 100644
--- a/src/DotNetOpenAuth/OAuthWrap/IClientTokenManager.cs
+++ b/src/DotNetOpenAuth/OAuth2/IClientTokenManager.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Diagnostics.Contracts;
 
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessProtectedResourceRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessProtectedResourceRequest.cs
index c6f2de7..f49efce 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessProtectedResourceRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessProtectedResourceRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenFailedResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenFailedResponse.cs
index 4a44aa3..cb77b99 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenFailedResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenFailedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using ChannelElements;
 	using Messaging;
 
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenSuccessResponse.cs
index 1c13677..6031c3a 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenSuccessResponse.cs
@@ -4,11 +4,11 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Net;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// A response from the Authorization Server to the Client containing a delegation code
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Assertion/AssertionRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/Assertion/AssertionRequest.cs
index 6137d19..e3b000a 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/Assertion/AssertionRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/Assertion/AssertionRequest.cs
@@ -4,13 +4,13 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// A request from a Client to an Authorization Server with some assertion for an access token.
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/ClientCredentials/ClientCredentialsRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/ClientCredentials/ClientCredentialsRequest.cs
index 56d5e3e..3f5fc30 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/ClientCredentials/ClientCredentialsRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/ClientCredentials/ClientCredentialsRequest.cs
@@ -4,13 +4,13 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// A request for an access token for a client application that has its
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceAccessTokenRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/Device/DeviceAccessTokenRequest.cs
index 4e1f850..0e5dc06 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceAccessTokenRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/Device/DeviceAccessTokenRequest.cs
@@ -4,14 +4,14 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// A message from the Client to the Authorization Server exchanging a
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/Device/DeviceRequest.cs
index dfffe20..568c194 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/Device/DeviceRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/Device/DeviceResponse.cs
index 783ddaa..12732f8 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/Device/DeviceResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/EndUserAuthorizationRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs
index 6e3e2e5..32461c5 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/EndUserAuthorizationRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Diagnostics.Contracts;
 	using DotNetOpenAuth.Messaging;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/EndUserAuthorizationSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessResponse.cs
index 8a81a90..a487ff0 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/EndUserAuthorizationSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationSuccessResponse.cs
@@ -4,11 +4,11 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Diagnostics.Contracts;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// The message sent by the Authorization Server to the Client via the user agent
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/IAccessTokenSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/IAccessTokenSuccessResponse.cs
index 6211d78..82803a8 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/IAccessTokenSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/IAccessTokenSuccessResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/IMessageWithClientState.cs b/src/DotNetOpenAuth/OAuth2/Messages/IMessageWithClientState.cs
index 1d42f54..fa371ae 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/IMessageWithClientState.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/IMessageWithClientState.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using DotNetOpenAuth.Messaging;
 
 	/// <summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/IOAuthDirectResponseFormat.cs b/src/DotNetOpenAuth/OAuth2/Messages/IOAuthDirectResponseFormat.cs
index 5063995..2b0d9a1 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/IOAuthDirectResponseFormat.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/IOAuthDirectResponseFormat.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/MessageBase.cs b/src/DotNetOpenAuth/OAuth2/Messages/MessageBase.cs
index 50e697a..3233360 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/MessageBase.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/MessageBase.cs
@@ -4,14 +4,14 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
 	using DotNetOpenAuth.Messaging;
 
 	/// <summary>
-	/// A common message base class for OAuth WRAP messages.
+	/// A common message base class for OAuth messages.
 	/// </summary>
 	[Serializable]
 	public class MessageBase : IDirectedProtocolMessage, IDirectResponseProtocolMessage {
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/RefreshAccessTokenRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/RefreshAccessTokenRequest.cs
index 028544b..746e287 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/RefreshAccessTokenRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/RefreshAccessTokenRequest.cs
@@ -4,10 +4,10 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// A request from the client to the token endpoint for a new access token
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/ResponseFormat.cs b/src/DotNetOpenAuth/OAuth2/Messages/ResponseFormat.cs
index 985ec3e..0ef36ed 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/ResponseFormat.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/ResponseFormat.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	/// <summary>
 	/// The various formats a client can request a response to come in from an authorization server.
 	/// </summary>
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/ResponseFormatEncoder.cs b/src/DotNetOpenAuth/OAuth2/Messages/ResponseFormatEncoder.cs
index 6cf879c..f84ecc1 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/ResponseFormatEncoder.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/ResponseFormatEncoder.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UnauthorizedResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UnauthorizedResponse.cs
index f77977d..90ef662 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UnauthorizedResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UnauthorizedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Diagnostics.Contracts;
 	using System.Net;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UserAgent/UserAgentFailedResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UserAgent/UserAgentFailedResponse.cs
index e027267..ffac52d 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UserAgent/UserAgentFailedResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UserAgent/UserAgentFailedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UserAgent/UserAgentRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/UserAgent/UserAgentRequest.cs
index e36a1f1..d79690f 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UserAgent/UserAgentRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UserAgent/UserAgentRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UserAgent/UserAgentSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UserAgent/UserAgentSuccessResponse.cs
index a0e082b..0d1dd31 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UserAgent/UserAgentSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UserAgent/UserAgentSuccessResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordCaptchaResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordCaptchaResponse.cs
index 192af58..56bf21f 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordCaptchaResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordCaptchaResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordFailedResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordFailedResponse.cs
index fa98b83..3ba2a61 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordFailedResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordFailedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	/// <summary>
 	/// A response from the Authorization Server to the Consumer to indicate that a
 	/// request for a delegation code failed, probably due to an invalid
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordRequest.cs
index 3bc886a..98bb1d9 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordRequest.cs
@@ -4,14 +4,14 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// A request for a delegation code in exchange for a user's confidential 
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordSuccessResponse.cs
index db3a7d2..9ad42c9 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordSuccessResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordVerificationResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordVerificationResponse.cs
index e24a200..079b102 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/UsernameAndPassword/UserNamePasswordVerificationResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/UsernameAndPassword/UserNamePasswordVerificationResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerAccessTokenRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerAccessTokenRequest.cs
index c41705a..323d6de 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerAccessTokenRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerAccessTokenRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Diagnostics.Contracts;
 	using ChannelElements;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerFailedResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerFailedResponse.cs
index 1bfa168..6735087 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerFailedResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerFailedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Diagnostics.Contracts;
 	using DotNetOpenAuth.Messaging;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerRequest.cs
index 1843c64..c1d9f26 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerSuccessResponse.cs
index a6a2de3..7135ba0 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/WebServer/WebServerSuccessResponse.cs
@@ -4,11 +4,11 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap.Messages {
+namespace DotNetOpenAuth.OAuth2.Messages {
 	using System;
 	using System.Diagnostics.Contracts;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// The message sent by the Authorization Server to the Client via the user agent
diff --git a/src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs b/src/DotNetOpenAuth/OAuth2/OAuthUtilities.cs
index 8000d02..fba80b5 100644
--- a/src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs
+++ b/src/DotNetOpenAuth/OAuth2/OAuthUtilities.cs
@@ -1,10 +1,10 @@
 //-----------------------------------------------------------------------
-// <copyright file="WrapUtilities.cs" company="Andrew Arnott">
+// <copyright file="OAuthUtilities.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -16,11 +16,11 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using DotNetOpenAuth.OAuth.ChannelElements;
 
 	/// <summary>
-	/// Some common utility methods for OAuth WRAP.
+	/// Some common utility methods for OAuth 2.0.
 	/// </summary>
-	internal static class WrapUtilities {
+	internal static class OAuthUtilities {
 		/// <summary>
-		/// Authorizes an HTTP request using an OAuth WRAP access token in an HTTP Authorization header.
+		/// Authorizes an HTTP request using an OAuth 2.0 access token in an HTTP Authorization header.
 		/// </summary>
 		/// <param name="request">The request to authorize.</param>
 		/// <param name="accessToken">The access token previously obtained from the Authorization Server.</param>
diff --git a/src/DotNetOpenAuth/OAuthWrap/OAuthWrapStrings.Designer.cs b/src/DotNetOpenAuth/OAuth2/OAuthWrapStrings.Designer.cs
index 35417e1..dcde6b7 100644
--- a/src/DotNetOpenAuth/OAuthWrap/OAuthWrapStrings.Designer.cs
+++ b/src/DotNetOpenAuth/OAuth2/OAuthWrapStrings.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30426.0
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace DotNetOpenAuth.OAuthWrap {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetOpenAuth.OAuthWrap.OAuthWrapStrings", typeof(OAuthWrapStrings).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetOpenAuth.OAuth2.OAuthWrapStrings", typeof(OAuthWrapStrings).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/DotNetOpenAuth/OAuthWrap/OAuthWrapStrings.resx b/src/DotNetOpenAuth/OAuth2/OAuthWrapStrings.resx
index ae2cc6c..ae2cc6c 100644
--- a/src/DotNetOpenAuth/OAuthWrap/OAuthWrapStrings.resx
+++ b/src/DotNetOpenAuth/OAuth2/OAuthWrapStrings.resx
diff --git a/src/DotNetOpenAuth/OAuthWrap/Protocol.cs b/src/DotNetOpenAuth/OAuth2/Protocol.cs
index 074f794..9dfc9ae 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Protocol.cs
+++ b/src/DotNetOpenAuth/OAuth2/Protocol.cs
@@ -5,12 +5,12 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 
 	/// <summary>
-	/// An enumeration of the OAuth WRAP protocol versions supported by this library.
+	/// An enumeration of the OAuth protocol versions supported by this library.
 	/// </summary>
 	public enum ProtocolVersion {
 		/// <summary>
@@ -20,7 +20,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 	}
 
 	/// <summary>
-	/// Protocol constants for OAuth WRAP.
+	/// Protocol constants for OAuth 2.0.
 	/// </summary>
 	internal class Protocol {
 		/// <summary>
@@ -29,7 +29,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 		internal const string HttpAuthorizationScheme = "Token";
 
 		/// <summary>
-		/// The format of the HTTP Authorization header value that authorizes OAuth WRAP requests.
+		/// The format of the HTTP Authorization header value that authorizes OAuth 2.0 requests.
 		/// </summary>
 		internal const string HttpAuthorizationHeaderFormat = "Token token=\"{0}\"";
 
@@ -212,13 +212,13 @@ namespace DotNetOpenAuth.OAuthWrap {
 		internal static readonly Protocol Default = AllVersions[0];
 
 		/// <summary>
-		/// Gets or sets the OAuth WRAP version represented by this instance.
+		/// Gets or sets the OAuth 2.0 version represented by this instance.
 		/// </summary>
 		/// <value>The version.</value>
 		internal Version Version { get; private set; }
 
 		/// <summary>
-		/// Gets or sets the OAuth WRAP version represented by this instance.
+		/// Gets or sets the OAuth 2.0 version represented by this instance.
 		/// </summary>
 		/// <value>The protocol version.</value>
 		internal ProtocolVersion ProtocolVersion { get; private set; }
diff --git a/src/DotNetOpenAuth/OAuthWrap/ResourceServer.cs b/src/DotNetOpenAuth/OAuth2/ResourceServer.cs
index 1696ecd..5b14623 100644
--- a/src/DotNetOpenAuth/OAuthWrap/ResourceServer.cs
+++ b/src/DotNetOpenAuth/OAuth2/ResourceServer.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
diff --git a/src/DotNetOpenAuth/OAuthWrap/StandardAccessTokenAnalyzer.cs b/src/DotNetOpenAuth/OAuth2/StandardAccessTokenAnalyzer.cs
index be495e0..f292af5 100644
--- a/src/DotNetOpenAuth/OAuthWrap/StandardAccessTokenAnalyzer.cs
+++ b/src/DotNetOpenAuth/OAuth2/StandardAccessTokenAnalyzer.cs
@@ -4,11 +4,11 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Security.Cryptography;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
 
 	/// <summary>
 	/// An access token reader that understands DotNetOpenAuth authorization server issued tokens.
diff --git a/src/DotNetOpenAuth/OAuthWrap/UserAgentClient.cs b/src/DotNetOpenAuth/OAuth2/UserAgentClient.cs
index 5af4cbb..42e359c 100644
--- a/src/DotNetOpenAuth/OAuthWrap/UserAgentClient.cs
+++ b/src/DotNetOpenAuth/OAuth2/UserAgentClient.cs
@@ -4,14 +4,14 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
 	/// The OAuth client for the user-agent flow, providing services for installed apps
diff --git a/src/DotNetOpenAuth/OAuthWrap/WebServerAuthorizationServer.cs b/src/DotNetOpenAuth/OAuth2/WebServerAuthorizationServer.cs
index 868af77..63a999f 100644
--- a/src/DotNetOpenAuth/OAuthWrap/WebServerAuthorizationServer.cs
+++ b/src/DotNetOpenAuth/OAuth2/WebServerAuthorizationServer.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -12,8 +12,8 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using System.Security.Cryptography;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.ChannelElements;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.ChannelElements;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
 	/// Authorization Server supporting the web server flow.
diff --git a/src/DotNetOpenAuth/OAuthWrap/WebServerClient.cs b/src/DotNetOpenAuth/OAuth2/WebServerClient.cs
index 858afd7..ea3ebfd 100644
--- a/src/DotNetOpenAuth/OAuthWrap/WebServerClient.cs
+++ b/src/DotNetOpenAuth/OAuth2/WebServerClient.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.OAuthWrap {
+namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics.Contracts;
@@ -13,10 +13,10 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using System.Text;
 	using System.Web;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.OAuthWrap.Messages;
+	using DotNetOpenAuth.OAuth2.Messages;
 
 	/// <summary>
-	/// An OAuth WRAP consumer designed for web applications.
+	/// An OAuth 2.0 consumer designed for web applications.
 	/// </summary>
 	public class WebServerClient : ClientBase {
 		/// <summary>
@@ -109,7 +109,7 @@ namespace DotNetOpenAuth.OAuthWrap {
 						ErrorUtilities.ThrowProtocol(OAuthWrapStrings.CannotObtainAccessTokenWithReason, error);
 					}
 				} else { // failure
-					Logger.Wrap.Info("User refused to grant the requested authorization at the Authorization Server.");
+					Logger.OAuth.Info("User refused to grant the requested authorization at the Authorization Server.");
 					authorizationState.Delete();
 				}