diff --git a/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageDispatcher.cs b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageDispatcher.cs
index d7e5812d..c4cf5365 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageDispatcher.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Hosting/Protocol/MessageDispatcher.cs
@@ -210,7 +210,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
                 }
                 catch (MessageParseException e)
                 {
-                    string message = String.Format("Exception occurred while parsing message: {0}", e.Message);
+                    string message = string.Format("Exception occurred while parsing message: {0}", e.Message);
                     Logger.Write(LogLevel.Error, message);
                     await MessageWriter.WriteEvent(HostingErrorEvent.Type, new HostingErrorParams
                     {
@@ -228,7 +228,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
                 catch (Exception e)
                 {
                     // Log the error and send an error event to the client
-                    string message = String.Format("Exception occurred while receiving message: {0}", e.Message);
+                    string message = string.Format("Exception occurred while receiving message: {0}", e.Message);
                     Logger.Write(LogLevel.Error, message);
                     await MessageWriter.WriteEvent(HostingErrorEvent.Type, new HostingErrorParams
                     {
@@ -244,7 +244,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
                 if (newMessage != null)
                 {
                     // Verbose logging
-                    string logMessage = String.Format("Received message of type[{0}] and method[{1}]",
+                    string logMessage = string.Format("Received message of type[{0}] and method[{1}]",
                         newMessage.MessageType, newMessage.Method);
                     Logger.Write(LogLevel.Verbose, logMessage);
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
index 6cdbd745..f380f1bb 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/LanguageServices/LanguageService.cs
@@ -337,7 +337,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
             {
                 Logger.Write(
                     LogLevel.Error,
-                    String.Format(
+                    string.Format(
                         "Exception while cancelling analysis task:\n\n{0}",
                         e.ToString()));
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs
index 701fa6f5..f47cacb9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs
@@ -182,7 +182,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Workspace
             foreach (var textChange in textChangeParams.ContentChanges)
             {
                 string fileUri = textChangeParams.Uri ?? textChangeParams.TextDocument.Uri; 
-                msg.AppendLine(String.Format("  File: {0}", fileUri));
+                msg.AppendLine(string.Format("  File: {0}", fileUri));
 
                 ScriptFile changedFile = Workspace.GetFile(fileUri);
 
diff --git a/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Common.cs b/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Common.cs
index 9bc8053b..292e3264 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Common.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.Test/QueryExecution/Common.cs
@@ -36,7 +36,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.QueryExecution
                 Dictionary<string, string> rowDictionary = new Dictionary<string, string>();
                 for (int column = 0; column < columns; column++)
                 {
-                    rowDictionary.Add(String.Format("column{0}", column), String.Format("val{0}{1}", column, row));
+                    rowDictionary.Add(string.Format("column{0}", column), string.Format("val{0}{1}", column, row));
                 }
                 output[row] = rowDictionary;
             }