22 files changed, 66 insertions, 66 deletions

diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
index cf3badb..9e8858c 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
@@ -558,30 +558,30 @@ http://opensource.org/licenses/ms-pl.html
     <Compile Include="Messaging\StandardWebRequestHandler.cs" />
     <Compile Include="Messaging\MessageReceivingEndpoint.cs" />
     <Compile Include="Reporting.cs" />
-    <Compile Include="SimpleApiAuth\ChannelElements\SimpleAuthChannel.cs" />
-    <Compile Include="SimpleApiAuth\ChannelElements\SimpleAuthMessageFactory.cs" />
-    <Compile Include="SimpleApiAuth\ChannelElements\UriOrOutOfBandEncoding.cs" />
-    <Compile Include="SimpleApiAuth\ConsumerBase.cs" />
-    <Compile Include="SimpleApiAuth\Messages\AccessTokenFailedResponse.cs" />
-    <Compile Include="SimpleApiAuth\Messages\AccessTokenSuccessResponse.cs" />
-    <Compile Include="SimpleApiAuth\Messages\AccessTokenWithConsumerNamePasswordRequest.cs" />
-    <Compile Include="SimpleApiAuth\Messages\AccessTokenWithSamlRequest.cs" />
-    <Compile Include="SimpleApiAuth\Messages\MessageBase.cs" />
-    <Compile Include="SimpleApiAuth\Messages\AccessTokenWithDelegationCodeRequest.cs" />
-    <Compile Include="SimpleApiAuth\Messages\UserAuthorizationInUserAgentDeniedResponse.cs" />
-    <Compile Include="SimpleApiAuth\Messages\UserAuthorizationInUserAgentRequest.cs" />
-    <Compile Include="SimpleApiAuth\Messages\UserAuthorizationInUserAgentGrantedResponse.cs" />
-    <Compile Include="SimpleApiAuth\Messages\UserAuthorizationViaUsernamePasswordFailedResponse.cs" />
-    <Compile Include="SimpleApiAuth\Messages\UserAuthorizationViaUsernamePasswordRequest.cs" />
-    <Compile Include="SimpleApiAuth\Messages\UserAuthorizationViaUsernamePasswordSuccessResponse.cs" />
-    <Compile Include="SimpleApiAuth\Protocol.cs" />
-    <Compile Include="SimpleApiAuth\SimpleAuthStrings.Designer.cs">
+    <Compile Include="OAuthWrap\ChannelElements\OAuthWrapChannel.cs" />
+    <Compile Include="OAuthWrap\ChannelElements\OAuthWrapMessageFactory.cs" />
+    <Compile Include="OAuthWrap\ChannelElements\UriOrOutOfBandEncoding.cs" />
+    <Compile Include="OAuthWrap\ConsumerBase.cs" />
+    <Compile Include="OAuthWrap\Messages\AccessTokenFailedResponse.cs" />
+    <Compile Include="OAuthWrap\Messages\AccessTokenSuccessResponse.cs" />
+    <Compile Include="OAuthWrap\Messages\AccessTokenWithConsumerNamePasswordRequest.cs" />
+    <Compile Include="OAuthWrap\Messages\AccessTokenWithSamlRequest.cs" />
+    <Compile Include="OAuthWrap\Messages\MessageBase.cs" />
+    <Compile Include="OAuthWrap\Messages\AccessTokenWithDelegationCodeRequest.cs" />
+    <Compile Include="OAuthWrap\Messages\UserAuthorizationInUserAgentDeniedResponse.cs" />
+    <Compile Include="OAuthWrap\Messages\UserAuthorizationInUserAgentRequest.cs" />
+    <Compile Include="OAuthWrap\Messages\UserAuthorizationInUserAgentGrantedResponse.cs" />
+    <Compile Include="OAuthWrap\Messages\UserAuthorizationViaUsernamePasswordFailedResponse.cs" />
+    <Compile Include="OAuthWrap\Messages\UserAuthorizationViaUsernamePasswordRequest.cs" />
+    <Compile Include="OAuthWrap\Messages\UserAuthorizationViaUsernamePasswordSuccessResponse.cs" />
+    <Compile Include="OAuthWrap\Protocol.cs" />
+    <Compile Include="OAuthWrap\SimpleAuthStrings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>SimpleAuthStrings.resx</DependentUpon>
     </Compile>
-    <Compile Include="SimpleApiAuth\TokenIssuerDescription.cs" />
-    <Compile Include="SimpleApiAuth\WebConsumer.cs" />
+    <Compile Include="OAuthWrap\TokenIssuerDescription.cs" />
+    <Compile Include="OAuthWrap\WebConsumer.cs" />
     <Compile Include="Util.cs" />
     <Compile Include="OAuth\Protocol.cs" />
     <Compile Include="OAuth\ServiceProvider.cs" />
@@ -693,7 +693,7 @@ http://opensource.org/licenses/ms-pl.html
     <EmbeddedResource Include="OpenId\RelyingParty\OpenIdRelyingPartyAjaxControlBase.js">
       <Copyright>$(StandardCopyright)</Copyright>
     </EmbeddedResource>
-    <EmbeddedResource Include="SimpleApiAuth\SimpleAuthStrings.resx">
+    <EmbeddedResource Include="OAuthWrap\SimpleAuthStrings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>SimpleAuthStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
@@ -714,4 +714,4 @@ http://opensource.org/licenses/ms-pl.html
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/ChannelElements/SimpleAuthChannel.cs b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapChannel.cs
index 7c1964b..3c2065f 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/ChannelElements/SimpleAuthChannel.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapChannel.cs
@@ -1,10 +1,10 @@
 //-----------------------------------------------------------------------
-// <copyright file="SimpleAuthChannel.cs" company="Andrew Arnott">
+// <copyright file="OAuthWrapChannel.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.ChannelElements {
+namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
@@ -12,14 +12,14 @@ namespace DotNetOpenAuth.SimpleApiAuth.ChannelElements {
 	using DotNetOpenAuth.Messaging;
 
 	/// <summary>
-	/// The channel for the Simple API Auth protocol.
+	/// The channel for the OAuth WRAP protocol.
 	/// </summary>
-	internal class SimpleAuthChannel : Channel {
+	internal class OAuthWrapChannel : Channel {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="SimpleAuthChannel"/> class.
+		/// Initializes a new instance of the <see cref="OAuthWrapChannel"/> class.
 		/// </summary>
-		internal SimpleAuthChannel()
-			: base(new SimpleAuthMessageFactory()) {
+		internal OAuthWrapChannel()
+			: base(new OAuthWrapMessageFactory()) {
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/ChannelElements/SimpleAuthMessageFactory.cs b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapMessageFactory.cs
index f89d963..62cceb8 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/ChannelElements/SimpleAuthMessageFactory.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapMessageFactory.cs
@@ -1,25 +1,25 @@
 //-----------------------------------------------------------------------
-// <copyright file="SimpleAuthMessageFactory.cs" company="Andrew Arnott">
+// <copyright file="OAuthWrapMessageFactory.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.ChannelElements {
+namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.SimpleApiAuth.Messages;
+	using DotNetOpenAuth.OAuthWrap.Messages;
 
 	/// <summary>
-	/// The message factory for Simple API Auth messages.
+	/// The message factory for OAuth WRAP messages.
 	/// </summary>
-	internal class SimpleAuthMessageFactory : IMessageFactory {
+	internal class OAuthWrapMessageFactory : IMessageFactory {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="SimpleAuthMessageFactory"/> class.
+		/// Initializes a new instance of the <see cref="OAuthWrapMessageFactory"/> class.
 		/// </summary>
-		internal SimpleAuthMessageFactory() {
+		internal OAuthWrapMessageFactory() {
 		}
 
 		#region IMessageFactory Members
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/ChannelElements/UriOrOutOfBandEncoding.cs b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/UriOrOutOfBandEncoding.cs
index 0394660..bb7fc01 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/ChannelElements/UriOrOutOfBandEncoding.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/UriOrOutOfBandEncoding.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.ChannelElements {
+namespace DotNetOpenAuth.OAuthWrap.ChannelElements {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/ConsumerBase.cs b/src/DotNetOpenAuth/OAuthWrap/ConsumerBase.cs
index b84d47f..bdfb9b8 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/ConsumerBase.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/ConsumerBase.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth {
+namespace DotNetOpenAuth.OAuthWrap {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenFailedResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenFailedResponse.cs
index fa1210d..dc0dd97 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenFailedResponse.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenFailedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenSuccessResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenSuccessResponse.cs
index a98bf8b..d38a2e1 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenSuccessResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using DotNetOpenAuth.Messaging;
 
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenWithConsumerNamePasswordRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenWithConsumerNamePasswordRequest.cs
index 2140832..605e27e 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenWithConsumerNamePasswordRequest.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenWithConsumerNamePasswordRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenWithDelegationCodeRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenWithDelegationCodeRequest.cs
index 277e8c0..4374657 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenWithDelegationCodeRequest.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenWithDelegationCodeRequest.cs
@@ -4,10 +4,10 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.SimpleApiAuth.ChannelElements;
+	using DotNetOpenAuth.OAuthWrap.ChannelElements;
 
 	/// <summary>
 	/// A message sent by the Consumer directly to the Token Issuer to exchange
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenWithSamlRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenWithSamlRequest.cs
index 07f46a2..1a610ed 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/AccessTokenWithSamlRequest.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessTokenWithSamlRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/MessageBase.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/MessageBase.cs
index 796ccb9..ad4612a 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/MessageBase.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/MessageBase.cs
@@ -4,13 +4,13 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using DotNetOpenAuth.Messaging;
 
 	/// <summary>
-	/// A common message base class for Simple API Auth messages.
+	/// A common message base class for OAuth WRAP messages.
 	/// </summary>
 	public class MessageBase : IDirectedProtocolMessage, IDirectResponseProtocolMessage {
 		/// <summary>
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationInUserAgentDeniedResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationInUserAgentDeniedResponse.cs
index 30956df..44268c5 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationInUserAgentDeniedResponse.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationInUserAgentDeniedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using DotNetOpenAuth.Messaging;
 
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationInUserAgentGrantedResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationInUserAgentGrantedResponse.cs
index fc310de..ae43d5c 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationInUserAgentGrantedResponse.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationInUserAgentGrantedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using DotNetOpenAuth.Messaging;
 
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationInUserAgentRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationInUserAgentRequest.cs
index 2f67f02..7e5191f 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationInUserAgentRequest.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationInUserAgentRequest.cs
@@ -4,10 +4,10 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.SimpleApiAuth.ChannelElements;
+	using DotNetOpenAuth.OAuthWrap.ChannelElements;
 
 	/// <summary>
 	/// A message sent by the Consumer to the Token Issuer via the user agent
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationViaUsernamePasswordFailedResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationViaUsernamePasswordFailedResponse.cs
index 2ee0b4d..4a6fdf4 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationViaUsernamePasswordFailedResponse.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationViaUsernamePasswordFailedResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationViaUsernamePasswordRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationViaUsernamePasswordRequest.cs
index a80812e..cf01940 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationViaUsernamePasswordRequest.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationViaUsernamePasswordRequest.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationViaUsernamePasswordSuccessResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationViaUsernamePasswordSuccessResponse.cs
index 9fadc3a..11c9a20 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Messages/UserAuthorizationViaUsernamePasswordSuccessResponse.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/UserAuthorizationViaUsernamePasswordSuccessResponse.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth.Messages {
+namespace DotNetOpenAuth.OAuthWrap.Messages {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/Protocol.cs b/src/DotNetOpenAuth/OAuthWrap/Protocol.cs
index 4d5a656..59d77c1 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/Protocol.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Protocol.cs
@@ -5,20 +5,20 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth {
+namespace DotNetOpenAuth.OAuthWrap {
 	using System;
 
 	/// <summary>
-	/// Protocol constants for Simple API Auth.
+	/// Protocol constants for OAuth WRAP.
 	/// </summary>
 	internal class Protocol {
 		/// <summary>
-		/// The default (latest) version of the Simple API Auth protocol.
+		/// The default (latest) version of the OAuth WRAP protocol.
 		/// </summary>
 		internal static readonly Version DefaultVersion = V10;
 
 		/// <summary>
-		/// The initial (1.0) version of Simple API Auth.
+		/// The initial (1.0) version of OAuth WRAP.
 		/// </summary>
 		internal static readonly Version V10 = new Version(1, 0);
 
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/SimpleAuthStrings.Designer.cs b/src/DotNetOpenAuth/OAuthWrap/SimpleAuthStrings.Designer.cs
index 12af29d..8cf74ed 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/SimpleAuthStrings.Designer.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/SimpleAuthStrings.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:4.0.30118.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth {
+namespace DotNetOpenAuth.OAuthWrap {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace DotNetOpenAuth.SimpleApiAuth {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class SimpleAuthStrings {
@@ -39,7 +39,7 @@ namespace DotNetOpenAuth.SimpleApiAuth {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetOpenAuth.SimpleApiAuth.SimpleAuthStrings", typeof(SimpleAuthStrings).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetOpenAuth.OAuthWrap.SimpleAuthStrings", typeof(SimpleAuthStrings).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/SimpleAuthStrings.resx b/src/DotNetOpenAuth/OAuthWrap/SimpleAuthStrings.resx
index b8a8d62..b8a8d62 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/SimpleAuthStrings.resx
+++ b/src/DotNetOpenAuth/OAuthWrap/SimpleAuthStrings.resx
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/TokenIssuerDescription.cs b/src/DotNetOpenAuth/OAuthWrap/TokenIssuerDescription.cs
index 7456578..0dd07c4 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/TokenIssuerDescription.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/TokenIssuerDescription.cs
@@ -4,14 +4,14 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth {
+namespace DotNetOpenAuth.OAuthWrap {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
 
 	/// <summary>
-	/// A description of a Simple API Auth Token Issuer.
+	/// A description of a OAuth WRAP Token Issuer.
 	/// </summary>
 	public class TokenIssuerDescription {
 		/// <summary>
@@ -37,7 +37,7 @@ namespace DotNetOpenAuth.SimpleApiAuth {
 		public Uri EndpointUrl { get; set; }
 
 		/// <summary>
-		/// Gets or sets the version of the Simple API Auth protocol to use with this Token Issuer.
+		/// Gets or sets the version of the OAuth WRAP protocol to use with this Token Issuer.
 		/// </summary>
 		/// <value>The version.</value>
 		public Version Version { get; set; }
diff --git a/src/DotNetOpenAuth/SimpleApiAuth/WebConsumer.cs b/src/DotNetOpenAuth/OAuthWrap/WebConsumer.cs
index f856612..828dd0b 100644
--- a/src/DotNetOpenAuth/SimpleApiAuth/WebConsumer.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/WebConsumer.cs
@@ -4,13 +4,13 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.SimpleApiAuth {
+namespace DotNetOpenAuth.OAuthWrap {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
-	using DotNetOpenAuth.SimpleApiAuth.Messages;
+	using DotNetOpenAuth.OAuthWrap.Messages;
 
 	public class WebConsumer : ConsumerBase {
 		public WebConsumer(TokenIssuerDescription tokenIssuer)