8 files changed, 123 insertions, 76 deletions
diff --git a/src/DotNetOAuth/Messages/AccessProtectedResourceMessage.cs b/src/DotNetOAuth/Messages/AccessProtectedResourceRequest.cs
index 0ff254b..e29f710 100644
--- a/src/DotNetOAuth/Messages/AccessProtectedResourceMessage.cs
+++ b/src/DotNetOAuth/Messages/AccessProtectedResourceRequest.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="AccessProtectedResourceMessage.cs" company="Andrew Arnott">
+// <copyright file="AccessProtectedResourceRequest.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -12,12 +12,12 @@ namespace DotNetOAuth.Messages {
 	/// A message attached to a request for protected resources that provides the necessary
 	/// credentials to be granted access to those resources.
 	/// </summary>
-	public class AccessProtectedResourceMessage : SignedMessageBase, ITokenContainingMessage {
+	public class AccessProtectedResourceRequest : SignedMessageBase, ITokenContainingMessage {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="AccessProtectedResourceMessage"/> class.
+		/// Initializes a new instance of the <see cref="AccessProtectedResourceRequest"/> class.
 		/// </summary>
 		/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
-		protected internal AccessProtectedResourceMessage(MessageReceivingEndpoint serviceProvider)
+		protected internal AccessProtectedResourceRequest(MessageReceivingEndpoint serviceProvider)
 			: base(MessageTransport.Direct, serviceProvider) {
 		}
 
diff --git a/src/DotNetOAuth/Messages/GetAccessTokenMessage.cs b/src/DotNetOAuth/Messages/AuthorizedTokenRequest.cs
index caa83d3..94ec6ff 100644
--- a/src/DotNetOAuth/Messages/GetAccessTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/AuthorizedTokenRequest.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="GetAccessTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="AuthorizedTokenRequest.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -15,12 +15,12 @@ namespace DotNetOAuth.Messages {
 	/// <remarks>
 	/// The class is sealed because the OAuth spec forbids adding parameters to this message.
 	/// </remarks>
-	public sealed class GetAccessTokenMessage : SignedMessageBase, ITokenContainingMessage {
+	public sealed class AuthorizedTokenRequest : SignedMessageBase, ITokenContainingMessage {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="GetAccessTokenMessage"/> class.
+		/// Initializes a new instance of the <see cref="AuthorizedTokenRequest"/> class.
 		/// </summary>
 		/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
-		internal GetAccessTokenMessage(MessageReceivingEndpoint serviceProvider)
+		internal AuthorizedTokenRequest(MessageReceivingEndpoint serviceProvider)
 			: base(MessageTransport.Direct, serviceProvider) {
 		}
 
@@ -33,7 +33,7 @@ namespace DotNetOAuth.Messages {
 		}
 
 		/// <summary>
-		/// Gets or sets the Request Token.
+		/// Gets or sets the unauthorized Request Token used to obtain authorization.
 		/// </summary>
 		[MessagePart("oauth_token", IsRequired = true)]
 		internal string RequestToken { get; set; }
diff --git a/src/DotNetOAuth/Messages/GrantAccessTokenMessage.cs b/src/DotNetOAuth/Messages/AuthorizedTokenResponse.cs
index 69823ae..5d0af27 100644
--- a/src/DotNetOAuth/Messages/GrantAccessTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/AuthorizedTokenResponse.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="GrantAccessTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="AuthorizedTokenResponse.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -11,13 +11,13 @@ namespace DotNetOAuth.Messages {
 
 	/// <summary>
 	/// A direct message sent from Service Provider to Consumer in response to 
-	/// a Consumer's <see cref="GetAccessTokenMessage"/> request.
+	/// a Consumer's <see cref="AuthorizedTokenRequest"/> request.
 	/// </summary>
-	public class GrantAccessTokenMessage : MessageBase, ITokenSecretContainingMessage {
+	public class AuthorizedTokenResponse : MessageBase, ITokenSecretContainingMessage {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="GrantAccessTokenMessage"/> class.
+		/// Initializes a new instance of the <see cref="AuthorizedTokenResponse"/> class.
 		/// </summary>
-		protected internal GrantAccessTokenMessage()
+		protected internal AuthorizedTokenResponse()
 			: base(MessageProtections.None, MessageTransport.Direct) {
 		}
 
diff --git a/src/DotNetOAuth/Messages/OAuth Messages.cd b/src/DotNetOAuth/Messages/OAuth Messages.cd
index a271247..5c5bfcc 100644
--- a/src/DotNetOAuth/Messages/OAuth Messages.cd
+++ b/src/DotNetOAuth/Messages/OAuth Messages.cd
@@ -6,84 +6,117 @@
   <Comment CommentText="Messages from Consumer">
     <Position X="4.36" Y="0.683" Height="0.291" Width="2.02" />
   </Comment>
-  <Class Name="DotNetOAuth.Messages.AccessProtectedResourceMessage">
-    <Position X="3.75" Y="8.75" Width="3.5" />
-    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedToPoint="true">
+  <Class Name="DotNetOAuth.Messages.AccessProtectedResourceRequest">
+    <Position X="4.25" Y="7.75" Width="3" />
+    <Members>
+      <Property Name="ITokenContainingMessage.Token" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="2.25" Y="6.588" />
-        <Point X="2.25" Y="6.828" />
-        <Point X="3.51" Y="6.828" />
-        <Point X="3.51" Y="9.562" />
-        <Point X="3.75" Y="9.562" />
+        <Point X="3.5" Y="5.626" />
+        <Point X="3.5" Y="8.25" />
+        <Point X="4.25" Y="8.25" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messages\AccessProtectedResourceMessage.cs</FileName>
+      <FileName>Messages\AccessProtectedResourceRequest.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DotNetOAuth.Messages.GrantRequestTokenMessage">
+  <Class Name="DotNetOAuth.Messages.UnauthorizedTokenResponse">
     <Position X="7.5" Y="1.5" Width="3" />
+    <Members>
+      <Property Name="ITokenContainingMessage.Token" Hidden="true" />
+      <Property Name="ITokenSecretContainingMessage.TokenSecret" Hidden="true" />
+    </Members>
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAEAAAAAAIAAIAAAIAAAAAAAAAA=</HashCode>
-      <FileName>Messages\GrantRequestTokenMessage.cs</FileName>
+      <FileName>Messages\UnauthorizedTokenResponse.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DotNetOAuth.Messages.DirectUserToConsumerMessage">
-    <Position X="7.5" Y="5.25" Width="3" />
+  <Class Name="DotNetOAuth.Messages.UserAuthorizationResponse">
+    <Position X="7.5" Y="4.5" Width="3" />
+    <Members>
+      <Property Name="ITokenContainingMessage.Token" Hidden="true" />
+    </Members>
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
+    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="10.75" Y="4.688" />
+        <Point X="10.5" Y="4.688" />
+      </Path>
+    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messages\DirectUserToConsumerMessage.cs</FileName>
+      <FileName>Messages\UserAuthorizationResponse.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DotNetOAuth.Messages.DirectUserToServiceProviderMessage">
+  <Class Name="DotNetOAuth.Messages.UserAuthorizationRequest">
     <Position X="4.25" Y="3" Width="3" />
+    <Members>
+      <Property Name="ITokenContainingMessage.Token" Hidden="true" />
+    </Members>
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="10.75" Y="4.875" />
-        <Point X="7.25" Y="4.875" />
+        <Point X="10.75" Y="4.125" />
+        <Point X="7.25" Y="4.125" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAIAAAAAAIAAAAAAAQAA=</HashCode>
-      <FileName>Messages\DirectUserToServiceProviderMessage.cs</FileName>
+      <FileName>Messages\UserAuthorizationRequest.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DotNetOAuth.Messages.GrantAccessTokenMessage">
-    <Position X="7.5" Y="7.5" Width="3" />
+  <Class Name="DotNetOAuth.Messages.AuthorizedTokenResponse">
+    <Position X="7.5" Y="6.25" Width="3" />
+    <Members>
+      <Property Name="ITokenContainingMessage.Token" Hidden="true" />
+      <Property Name="ITokenSecretContainingMessage.TokenSecret" Hidden="true" />
+    </Members>
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
-    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedToPoint="true">
+    <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="12.5" Y="7.112" />
-        <Point X="12.5" Y="7.487" />
-        <Point X="10.875" Y="7.487" />
-        <Point X="10.875" Y="8.5" />
-        <Point X="10.5" Y="8.5" />
+        <Point X="11" Y="4.805" />
+        <Point X="11" Y="7.013" />
+        <Point X="10.5" Y="7.013" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAIAAAIAAAAAAAAAA=</HashCode>
-      <FileName>Messages\GrantAccessTokenMessage.cs</FileName>
+      <FileName>Messages\AuthorizedTokenResponse.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="DotNetOAuth.Messages.MessageBase">
     <Position X="10.75" Y="1" Width="3.5" />
+    <Members>
+      <Field Name="extraData" Hidden="true" />
+      <Property Name="IDirectedProtocolMessage.Recipient" Hidden="true" />
+      <Property Name="IOAuthDirectedMessage.HttpMethods" Hidden="true" />
+      <Property Name="IOAuthDirectedMessage.Recipient" Hidden="true" />
+      <Method Name="IProtocolMessage.EnsureValidMessage" Hidden="true" />
+      <Property Name="IProtocolMessage.ExtraData" Hidden="true" />
+      <Property Name="IProtocolMessage.ProtocolVersion" Hidden="true" />
+      <Property Name="IProtocolMessage.RequiredProtection" Hidden="true" />
+      <Property Name="IProtocolMessage.Transport" Hidden="true" />
+      <Field Name="protectionRequired" Hidden="true" />
+      <Field Name="recipient" Hidden="true" />
+      <Field Name="transport" Hidden="true" />
+    </Members>
     <Compartments>
       <Compartment Name="Fields" Collapsed="true" />
     </Compartments>
@@ -93,24 +126,29 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DotNetOAuth.Messages.GetAccessTokenMessage">
-    <Position X="4.25" Y="6" Width="3" />
+  <Class Name="DotNetOAuth.Messages.AuthorizedTokenRequest">
+    <Position X="4.25" Y="5.5" Width="3" />
+    <Members>
+      <Property Name="ITokenContainingMessage.Token" Hidden="true" />
+    </Members>
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="4" Y="6.125" />
-        <Point X="4.25" Y="6.125" />
+        <Point X="4" Y="4.947" />
+        <Point X="4.123" Y="4.947" />
+        <Point X="4.123" Y="5.75" />
+        <Point X="4.25" Y="5.75" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAACQAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Messages\GetAccessTokenMessage.cs</FileName>
+      <FileName>Messages\AuthorizedTokenRequest.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="DotNetOAuth.Messages.GetRequestTokenMessage">
+  <Class Name="DotNetOAuth.Messages.UnauthorizedTokenRequest">
     <Position X="4.25" Y="1" Width="3" />
     <Compartments>
       <Compartment Name="Internal" Collapsed="true" />
@@ -119,17 +157,24 @@
     </Compartments>
     <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" FixedFromPoint="true">
       <Path>
-        <Point X="4" Y="1.938" />
-        <Point X="4.25" Y="1.938" />
+        <Point X="4" Y="1.855" />
+        <Point X="4.25" Y="1.855" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAA=</HashCode>
-      <FileName>Messages\GetRequestTokenMessage.cs</FileName>
+      <FileName>Messages\UnauthorizedTokenRequest.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="DotNetOAuth.Messages.SignedMessageBase">
     <Position X="0.5" Y="1.5" Width="3.5" />
+    <Members>
+      <Property Name="ITamperResistantOAuthMessage.ConsumerSecret" Hidden="true" />
+      <Property Name="ITamperResistantOAuthMessage.HttpMethod" Hidden="true" />
+      <Property Name="ITamperResistantOAuthMessage.SignatureMethod" Hidden="true" />
+      <Property Name="ITamperResistantOAuthMessage.TokenSecret" Hidden="true" />
+      <Property Name="ITamperResistantProtocolMessage.Signature" Hidden="true" />
+    </Members>
     <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="12.875" Y="1" />
@@ -145,14 +190,14 @@
     <Lollipop Position="0.2" />
   </Class>
   <Interface Name="DotNetOAuth.ChannelElements.ITamperResistantOAuthMessage">
-    <Position X="11.25" Y="7.75" Width="2.5" />
+    <Position X="11.25" Y="5.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AIAAAAAAAAAAAAAAAIAAAgAAAAAAIAQAAAAAAAAAAAA=</HashCode>
       <FileName>ChannelElements\ITamperResistantOAuthMessage.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="DotNetOAuth.Messages.ITokenSecretContainingMessage">
-    <Position X="1" Y="8.5" Width="2" />
+    <Position X="1" Y="7.5" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAA=</HashCode>
       <FileName>Messages\ITokenSecretContainingMessage.cs</FileName>
@@ -160,7 +205,7 @@
     </TypeIdentifier>
   </Interface>
   <Interface Name="DotNetOAuth.Messages.ITokenContainingMessage">
-    <Position X="1" Y="7" Width="2" />
+    <Position X="1" Y="6" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>
       <FileName>Messages\ITokenContainingMessage.cs</FileName>
diff --git a/src/DotNetOAuth/Messages/GetRequestTokenMessage.cs b/src/DotNetOAuth/Messages/UnauthorizedTokenRequest.cs
index f8ebc6b..cdac36f 100644
--- a/src/DotNetOAuth/Messages/GetRequestTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/UnauthorizedTokenRequest.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="GetRequestTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="UnauthorizedTokenRequest.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -11,12 +11,12 @@ namespace DotNetOAuth.Messages {
 	/// <summary>
 	/// A direct message sent from Consumer to Service Provider to request a Request Token.
 	/// </summary>
-	public class GetRequestTokenMessage : SignedMessageBase {
+	public class UnauthorizedTokenRequest : SignedMessageBase {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="GetRequestTokenMessage"/> class.
+		/// Initializes a new instance of the <see cref="UnauthorizedTokenRequest"/> class.
 		/// </summary>
 		/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
-		protected internal GetRequestTokenMessage(MessageReceivingEndpoint serviceProvider)
+		protected internal UnauthorizedTokenRequest(MessageReceivingEndpoint serviceProvider)
 			: base(MessageTransport.Direct, serviceProvider) {
 		}
 
diff --git a/src/DotNetOAuth/Messages/GrantRequestTokenMessage.cs b/src/DotNetOAuth/Messages/UnauthorizedTokenResponse.cs
index 7cebda0..c875ed7 100644
--- a/src/DotNetOAuth/Messages/GrantRequestTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/UnauthorizedTokenResponse.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="GrantRequestTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="UnauthorizedTokenResponse.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -12,11 +12,11 @@ namespace DotNetOAuth.Messages {
 
 	/// <summary>
 	/// A direct message sent from Service Provider to Consumer in response to 
-	/// a Consumer's <see cref="GetRequestTokenMessage"/> request.
+	/// a Consumer's <see cref="UnauthorizedTokenRequest"/> request.
 	/// </summary>
-	public class GrantRequestTokenMessage : MessageBase, ITokenSecretContainingMessage {
+	public class UnauthorizedTokenResponse : MessageBase, ITokenSecretContainingMessage {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="GrantRequestTokenMessage"/> class.
+		/// Initializes a new instance of the <see cref="UnauthorizedTokenResponse"/> class.
 		/// </summary>
 		/// <param name="requestMessage">The unauthorized request token message that this message is being generated in response to.</param>
 		/// <param name="requestToken">The request token.</param>
@@ -24,7 +24,7 @@ namespace DotNetOAuth.Messages {
 		/// <remarks>
 		/// This constructor is used by the Service Provider to send the message.
 		/// </remarks>
-		protected internal GrantRequestTokenMessage(GetRequestTokenMessage requestMessage, string requestToken, string tokenSecret) : this() {
+		protected internal UnauthorizedTokenResponse(UnauthorizedTokenRequest requestMessage, string requestToken, string tokenSecret) : this() {
 			if (requestMessage == null) {
 				throw new ArgumentNullException("requestMessage");
 			}
@@ -41,10 +41,10 @@ namespace DotNetOAuth.Messages {
 		}
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="GrantRequestTokenMessage"/> class.
+		/// Initializes a new instance of the <see cref="UnauthorizedTokenResponse"/> class.
 		/// </summary>
 		/// <remarks>This constructor is used by the consumer to deserialize the message.</remarks>
-		protected internal GrantRequestTokenMessage()
+		protected internal UnauthorizedTokenResponse()
 			: base(MessageProtections.None, MessageTransport.Direct) {
 		}
 
@@ -81,7 +81,7 @@ namespace DotNetOAuth.Messages {
 		/// <summary>
 		/// Gets the original request for an unauthorized token.
 		/// </summary>
-		internal GetRequestTokenMessage RequestMessage { get; private set; }
+		internal UnauthorizedTokenRequest RequestMessage { get; private set; }
 
 		/// <summary>
 		/// Gets or sets the Token Secret.
diff --git a/src/DotNetOAuth/Messages/DirectUserToServiceProviderMessage.cs b/src/DotNetOAuth/Messages/UserAuthorizationRequest.cs
index 20ad5b7..4dfa80b 100644
--- a/src/DotNetOAuth/Messages/DirectUserToServiceProviderMessage.cs
+++ b/src/DotNetOAuth/Messages/UserAuthorizationRequest.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="DirectUserToServiceProviderMessage.cs" company="Andrew Arnott">
+// <copyright file="UserAuthorizationRequest.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -11,24 +11,26 @@ namespace DotNetOAuth.Messages {
 	using DotNetOAuth.Messaging;
 
 	/// <summary>
-	/// A message used to redirect the user from a Consumer to a Service Provider's web site.
+	/// A message used to redirect the user from a Consumer to a Service Provider's web site
+	/// so the Service Provider can ask the user to authorize the Consumer's access to some
+	/// protected resource(s).
 	/// </summary>
-	public class DirectUserToServiceProviderMessage : MessageBase, ITokenContainingMessage {
+	public class UserAuthorizationRequest : MessageBase, ITokenContainingMessage {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="DirectUserToServiceProviderMessage"/> class.
+		/// Initializes a new instance of the <see cref="UserAuthorizationRequest"/> class.
 		/// </summary>
 		/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
 		/// <param name="requestToken">The request token.</param>
-		internal DirectUserToServiceProviderMessage(MessageReceivingEndpoint serviceProvider, string requestToken)
+		internal UserAuthorizationRequest(MessageReceivingEndpoint serviceProvider, string requestToken)
 			: this(serviceProvider) {
 			this.RequestToken = requestToken;
 		}
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="DirectUserToServiceProviderMessage"/> class.
+		/// Initializes a new instance of the <see cref="UserAuthorizationRequest"/> class.
 		/// </summary>
 		/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
-		internal DirectUserToServiceProviderMessage(MessageReceivingEndpoint serviceProvider)
+		internal UserAuthorizationRequest(MessageReceivingEndpoint serviceProvider)
 			: base(MessageProtections.None, MessageTransport.Indirect, serviceProvider) {
 		}
 
diff --git a/src/DotNetOAuth/Messages/DirectUserToConsumerMessage.cs b/src/DotNetOAuth/Messages/UserAuthorizationResponse.cs
index c73eaa4..c5312e8 100644
--- a/src/DotNetOAuth/Messages/DirectUserToConsumerMessage.cs
+++ b/src/DotNetOAuth/Messages/UserAuthorizationResponse.cs
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------
-// <copyright file="DirectUserToConsumerMessage.cs" company="Andrew Arnott">
+// <copyright file="UserAuthorizationResponse.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
@@ -14,12 +14,12 @@ namespace DotNetOAuth.Messages {
 	/// <remarks>
 	/// The class is sealed because extra parameters are determined by the callback URI provided by the Consumer.
 	/// </remarks>
-	public sealed class DirectUserToConsumerMessage : MessageBase, ITokenContainingMessage {
+	public sealed class UserAuthorizationResponse : MessageBase, ITokenContainingMessage {
 		/// <summary>
-		/// Initializes a new instance of the <see cref="DirectUserToConsumerMessage"/> class.
+		/// Initializes a new instance of the <see cref="UserAuthorizationResponse"/> class.
 		/// </summary>
 		/// <param name="consumer">The URI of the Consumer endpoint to send this message to.</param>
-		internal DirectUserToConsumerMessage(Uri consumer)
+		internal UserAuthorizationResponse(Uri consumer)
 			: base(MessageProtections.None, MessageTransport.Indirect, new MessageReceivingEndpoint(consumer, HttpDeliveryMethods.GetRequest)) {
 		}