diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs
index add9c5bb..cc8c97d0 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/ChannelOpenMessage.cs
@@ -115,10 +115,10 @@ namespace Renci.SshNet.Messages.Connection
 
             switch (channelName)
             {
-                case SessionChannelOpenInfo.NAME:
+                case SessionChannelOpenInfo.Name:
                     Info = new SessionChannelOpenInfo(_infoBytes);
                     break;
-                case X11ChannelOpenInfo.NAME:
+                case X11ChannelOpenInfo.Name:
                     Info = new X11ChannelOpenInfo(_infoBytes);
                     break;
                 case DirectTcpipChannelInfo.NAME:
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/SessionChannelOpenInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/SessionChannelOpenInfo.cs
index 867c1b54..d712f382 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/SessionChannelOpenInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/SessionChannelOpenInfo.cs
@@ -10,7 +10,7 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Specifies channel open type
         /// </summary>
-        public const string NAME = "session";
+        public const string Name = "session";
 
         /// <summary>
         /// Gets the type of the channel to open.
@@ -20,7 +20,7 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public override string ChannelType
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs
index efa280a4..1cc0c12b 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelOpen/X11ChannelOpenInfo.cs
@@ -12,7 +12,7 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Specifies channel open type
         /// </summary>
-        public const string NAME = "x11";
+        public const string Name = "x11";
 
         /// <summary>
         /// Gets the type of the channel to open.
@@ -22,7 +22,7 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public override string ChannelType
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs
index 5bbef290..36828396 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/BreakRequestInfo.cs
@@ -10,7 +10,7 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "break";
+        public const string Name = "break";
 
         /// <summary>
         /// Gets the name of the request.
@@ -20,13 +20,13 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
         /// Gets break length in milliseconds.
         /// </summary>
-        public UInt32 BreakLength { get; private set; }
+        public uint BreakLength { get; private set; }
 
         /// <summary>
         /// Gets the size of the message in bytes.
@@ -56,7 +56,7 @@ namespace Renci.SshNet.Messages.Connection
         /// Initializes a new instance of the <see cref="ExecRequestInfo"/> class.
         /// </summary>
         /// <param name="breakLength">Length of the break.</param>
-        public BreakRequestInfo(UInt32 breakLength)
+        public BreakRequestInfo(uint breakLength)
             : this()
         {
             BreakLength = breakLength;
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/EndOfWriteRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/EndOfWriteRequestInfo.cs
index 8b382fd5..30037086 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/EndOfWriteRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/EndOfWriteRequestInfo.cs
@@ -8,7 +8,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "eow@openssh.com";
+        public const string Name = "eow@openssh.com";
 
         /// <summary>
         /// Gets the name of the request.
@@ -18,7 +18,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs
index 68b3236a..fb3b0eb1 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/EnvironmentVariableRequestInfo.cs
@@ -11,7 +11,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "env";
+        public const string Name = "env";
 
         /// <summary>
         /// Gets the name of the request.
@@ -21,7 +21,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
index 9aef09b7..0c56eb38 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExecRequestInfo.cs
@@ -13,7 +13,7 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "exec";
+        public const string Name = "exec";
 
         /// <summary>
         /// Gets the name of the request.
@@ -23,7 +23,7 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs
index 64fc16a8..dcd24050 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitSignalRequestInfo.cs
@@ -12,7 +12,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "exit-signal";
+        public const string Name = "exit-signal";
 
         /// <summary>
         /// Gets the name of the request.
@@ -22,7 +22,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs
index dbb588cc..455e4b57 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ExitStatusRequestInfo.cs
@@ -8,7 +8,7 @@
         /// <summary>
         /// Channel request name.
         /// </summary>
-        public const string NAME = "exit-status";
+        public const string Name = "exit-status";
 
         /// <summary>
         /// Gets the name of the request.
@@ -18,7 +18,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/KeepAliveRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/KeepAliveRequestInfo.cs
index 24952588..8d1b44f0 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/KeepAliveRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/KeepAliveRequestInfo.cs
@@ -8,7 +8,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "keepalive@openssh.com";
+        public const string Name = "keepalive@openssh.com";
 
         /// <summary>
         /// Gets the name of the request.
@@ -18,7 +18,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs
index e0118929..077f359b 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/PseudoTerminalInfo.cs
@@ -11,7 +11,7 @@ namespace Renci.SshNet.Messages.Connection
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "pty-req";
+        public const string Name = "pty-req";
 
         /// <summary>
         /// Gets the name of the request.
@@ -21,7 +21,7 @@ namespace Renci.SshNet.Messages.Connection
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ShellRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ShellRequestInfo.cs
index bd96028b..420404ca 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/ShellRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/ShellRequestInfo.cs
@@ -8,7 +8,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "shell";
+        public const string Name = "shell";
 
         /// <summary>
         /// Gets the name of the request.
@@ -18,7 +18,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs
index 519413e1..1103bba8 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SignalRequestInfo.cs
@@ -10,7 +10,7 @@
         /// <summary>
         /// Channel request name.
         /// </summary>
-        public const string NAME = "signal";
+        public const string Name = "signal";
 
         /// <summary>
         /// Gets the name of the request.
@@ -20,7 +20,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
index 5aa35b61..7e792aa3 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/SubsystemRequestInfo.cs
@@ -10,7 +10,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "subsystem";
+        public const string Name = "subsystem";
 
         /// <summary>
         /// Gets the name of the request.
@@ -20,7 +20,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs
index 7a01d5a2..2de72b10 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/WindowChangeRequestInfo.cs
@@ -8,7 +8,7 @@
         /// <summary>
         /// Channe request name
         /// </summary>
-        public const string NAME = "window-change";
+        public const string Name = "window-change";
 
         /// <summary>
         /// Gets the name of the request.
@@ -18,7 +18,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs
index 0b7487ed..ceafaac1 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/X11ForwardingRequestInfo.cs
@@ -10,7 +10,7 @@
         /// <summary>
         /// Channel request name
         /// </summary>
-        public const string NAME = "x11-req";
+        public const string Name = "x11-req";
 
         /// <summary>
         /// Gets the name of the request.
@@ -20,7 +20,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs b/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs
index 230eb6ab..0edd5b56 100644
--- a/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs
+++ b/src/Renci.SshNet/Messages/Connection/ChannelRequest/XonXoffRequestInfo.cs
@@ -8,7 +8,7 @@
         /// <summary>
         /// Channel request type
         /// </summary>
-        public const string NAME = "xon-xoff";
+        public const string Name = "xon-xoff";
 
         /// <summary>
         /// Gets the name of the request.
@@ -18,7 +18,7 @@
         /// </value>
         public override string RequestName
         {
-            get { return NAME; }
+            get { return Name; }
         }
 
         /// <summary>