diff --git a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAdapter.cs b/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAdapter.cs
index 8102528ae4..c9262718d1 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAdapter.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAdapter.cs
@@ -134,7 +134,7 @@ namespace Microsoft.AspNet.Owin
                     _webSocket.Abort();
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException("state", _webSocket.State, string.Empty);
+                    throw new ArgumentOutOfRangeException(nameof(_webSocket.State), _webSocket.State, string.Empty);
             }
         }
 
diff --git a/src/Microsoft.Net.Http.Headers/CacheControlHeaderValue.cs b/src/Microsoft.Net.Http.Headers/CacheControlHeaderValue.cs
index 48dfc913a9..c1940754ba 100644
--- a/src/Microsoft.Net.Http.Headers/CacheControlHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/CacheControlHeaderValue.cs
@@ -597,7 +597,7 @@ namespace Microsoft.Net.Http.Headers
 
         private static void CheckIsValidToken(string item)
         {
-            HeaderUtilities.CheckValidToken(item, "item");
+            HeaderUtilities.CheckValidToken(item, nameof(item));
         }
     }
 }
diff --git a/src/Microsoft.Net.Http.Headers/ContentRangeHeaderValue.cs b/src/Microsoft.Net.Http.Headers/ContentRangeHeaderValue.cs
index abce604280..092bb83320 100644
--- a/src/Microsoft.Net.Http.Headers/ContentRangeHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/ContentRangeHeaderValue.cs
@@ -82,7 +82,7 @@ namespace Microsoft.Net.Http.Headers
             get { return _unit; }
             set
             {
-                HeaderUtilities.CheckValidToken(value, "value");
+                HeaderUtilities.CheckValidToken(value, nameof(value));
                 _unit = value;
             }
         }
diff --git a/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs b/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs
index 11c5500a31..5006792814 100644
--- a/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/CookieHeaderValue.cs
@@ -39,7 +39,7 @@ namespace Microsoft.Net.Http.Headers
             get { return _name; }
             set
             {
-                CheckNameFormat(value, "name");
+                CheckNameFormat(value, nameof(value));
                 _name = value;
             }
         }
@@ -49,7 +49,7 @@ namespace Microsoft.Net.Http.Headers
             get { return _value; }
             set
             {
-                CheckValueFormat(value, "value");
+                CheckValueFormat(value, nameof(value));
                 _value = value;
             }
         }
diff --git a/src/Microsoft.Net.Http.Headers/NameValueHeaderValue.cs b/src/Microsoft.Net.Http.Headers/NameValueHeaderValue.cs
index a91b98e358..c2e38e643c 100644
--- a/src/Microsoft.Net.Http.Headers/NameValueHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/NameValueHeaderValue.cs
@@ -363,7 +363,7 @@ namespace Microsoft.Net.Http.Headers
 
         private static void CheckNameValueFormat(string name, string value)
         {
-            HeaderUtilities.CheckValidToken(name, "name");
+            HeaderUtilities.CheckValidToken(name, nameof(name));
             CheckValueFormat(value);
         }
 
diff --git a/src/Microsoft.Net.Http.Headers/RangeHeaderValue.cs b/src/Microsoft.Net.Http.Headers/RangeHeaderValue.cs
index 445752a13d..3657e24c27 100644
--- a/src/Microsoft.Net.Http.Headers/RangeHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/RangeHeaderValue.cs
@@ -33,7 +33,7 @@ namespace Microsoft.Net.Http.Headers
             get { return _unit; }
             set
             {
-                HeaderUtilities.CheckValidToken(value, "value");
+                HeaderUtilities.CheckValidToken(value, nameof(value));
                 _unit = value;
             }
         }
diff --git a/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs b/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs
index b470471e4e..52fdd46a36 100644
--- a/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/SetCookieHeaderValue.cs
@@ -49,7 +49,7 @@ namespace Microsoft.Net.Http.Headers
             get { return _name; }
             set
             {
-                CookieHeaderValue.CheckNameFormat(value, "name");
+                CookieHeaderValue.CheckNameFormat(value, nameof(value));
                 _name = value;
             }
         }
@@ -59,7 +59,7 @@ namespace Microsoft.Net.Http.Headers
             get { return _value; }
             set
             {
-                CookieHeaderValue.CheckValueFormat(value, "value");
+                CookieHeaderValue.CheckValueFormat(value, nameof(value));
                 _value = value;
             }
         }
diff --git a/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValue.cs b/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValue.cs
index ab33ba4a0f..36e9a3fd58 100644
--- a/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValue.cs
+++ b/src/Microsoft.Net.Http.Headers/StringWithQualityHeaderValue.cs
@@ -25,14 +25,14 @@ namespace Microsoft.Net.Http.Headers
 
         public StringWithQualityHeaderValue(string value)
         {
-            HeaderUtilities.CheckValidToken(value, "value");
+            HeaderUtilities.CheckValidToken(value, nameof(value));
 
             _value = value;
         }
 
         public StringWithQualityHeaderValue(string value, double quality)
         {
-            HeaderUtilities.CheckValidToken(value, "value");
+            HeaderUtilities.CheckValidToken(value, nameof(value));
 
             if ((quality < 0) || (quality > 1))
             {