diff --git a/SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.QueryDirectory.cs b/SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.QueryDirectory.cs
index 62c3ac0..66a2ffb 100644
--- a/SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.QueryDirectory.cs
+++ b/SMBLibrary/NTFileStore/Adapter/NTFileSystemAdapter.QueryDirectory.cs
@@ -128,15 +128,15 @@ namespace SMBLibrary
 
                 if (!findExactNameWithoutExtension)
                 {
-                    if (fileName.StartsWith(desiredFileNameStart, StringComparison.InvariantCultureIgnoreCase))
+                    if (fileName.StartsWith(desiredFileNameStart, StringComparison.OrdinalIgnoreCase))
                     {
                         return true;
                     }
                 }
                 else
                 {
-                    if (fileName.StartsWith(desiredFileNameStart + ".", StringComparison.InvariantCultureIgnoreCase) ||
-                        fileName.Equals(desiredFileNameStart, StringComparison.InvariantCultureIgnoreCase))
+                    if (fileName.StartsWith(desiredFileNameStart + ".", StringComparison.OrdinalIgnoreCase) ||
+                        fileName.Equals(desiredFileNameStart, StringComparison.OrdinalIgnoreCase))
                     {
                         return true;
                     }
@@ -145,12 +145,12 @@ namespace SMBLibrary
             else if (expression.StartsWith("<"))
             {
                 string desiredFileNameEnd = expression.Substring(1);
-                if (fileName.EndsWith(desiredFileNameEnd, StringComparison.InvariantCultureIgnoreCase))
+                if (fileName.EndsWith(desiredFileNameEnd, StringComparison.OrdinalIgnoreCase))
                 {
                     return true;
                 }
             }
-            else if (String.Equals(fileName, expression, StringComparison.CurrentCultureIgnoreCase))
+            else if (String.Equals(fileName, expression, StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
diff --git a/SMBLibrary/NTFileStore/NamedPipeStore.cs b/SMBLibrary/NTFileStore/NamedPipeStore.cs
index 5ce118a..1b7fb5d 100644
--- a/SMBLibrary/NTFileStore/NamedPipeStore.cs
+++ b/SMBLibrary/NTFileStore/NamedPipeStore.cs
@@ -60,7 +60,7 @@ namespace SMBLibrary
 
             foreach (RemoteService service in m_services)
             {
-                if (String.Equals(path, service.PipeName, StringComparison.InvariantCultureIgnoreCase))
+                if (String.Equals(path, service.PipeName, StringComparison.OrdinalIgnoreCase))
                 {
                     return service;
                 }
diff --git a/SMBLibrary/Server/NameServer.cs b/SMBLibrary/Server/NameServer.cs
index 16df7f6..546b2f4 100644
--- a/SMBLibrary/Server/NameServer.cs
+++ b/SMBLibrary/Server/NameServer.cs
@@ -109,7 +109,7 @@ namespace SMBLibrary.Server
                             string name = NetBiosUtils.GetNameFromMSNetBiosName(request.Question.Name);
                             NetBiosSuffix suffix = (NetBiosSuffix)request.Question.Name[15];
 
-                            bool nameMatch = String.Equals(name, Environment.MachineName, StringComparison.InvariantCultureIgnoreCase);
+                            bool nameMatch = String.Equals(name, Environment.MachineName, StringComparison.OrdinalIgnoreCase);
                             
                             if (nameMatch && ((suffix == NetBiosSuffix.WorkstationService) || (suffix == NetBiosSuffix.FileServiceService)))
                             {
diff --git a/SMBLibrary/Server/SMB1/TransactionHelper.cs b/SMBLibrary/Server/SMB1/TransactionHelper.cs
index 358caac..db3ebd3 100644
--- a/SMBLibrary/Server/SMB1/TransactionHelper.cs
+++ b/SMBLibrary/Server/SMB1/TransactionHelper.cs
@@ -100,7 +100,7 @@ namespace SMBLibrary.Server.SMB1
 
         internal static List<SMB1Command> GetCompleteTransactionResponse(SMB1Header header, uint maxDataCount, uint timeout, string name, byte[] requestSetup, byte[] requestParameters, byte[] requestData, ISMBShare share, SMB1ConnectionState state)
         {
-            if (String.Equals(name, @"\pipe\lanman", StringComparison.InvariantCultureIgnoreCase))
+            if (String.Equals(name, @"\PIPE\lanman", StringComparison.OrdinalIgnoreCase))
             {
                 // [MS-RAP] Remote Administration Protocol request
                 state.LogToServer(Severity.Debug, "Remote Administration Protocol requests are not implemented");
diff --git a/SMBLibrary/Server/SMB1/TreeConnectHelper.cs b/SMBLibrary/Server/SMB1/TreeConnectHelper.cs
index a32f7c0..a1554c0 100644
--- a/SMBLibrary/Server/SMB1/TreeConnectHelper.cs
+++ b/SMBLibrary/Server/SMB1/TreeConnectHelper.cs
@@ -22,7 +22,7 @@ namespace SMBLibrary.Server.SMB1
             ISMBShare share;
             ServiceName serviceName;
             OptionalSupportFlags supportFlags;
-            if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.InvariantCultureIgnoreCase))
+            if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.OrdinalIgnoreCase))
             {
                 share = services;
                 serviceName = ServiceName.NamedPipe;
diff --git a/SMBLibrary/Server/SMB2/TreeConnectHelper.cs b/SMBLibrary/Server/SMB2/TreeConnectHelper.cs
index 4538351..c5aae2b 100644
--- a/SMBLibrary/Server/SMB2/TreeConnectHelper.cs
+++ b/SMBLibrary/Server/SMB2/TreeConnectHelper.cs
@@ -22,7 +22,7 @@ namespace SMBLibrary.Server.SMB2
             ISMBShare share;
             ShareType shareType;
             ShareFlags shareFlags;
-            if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.InvariantCultureIgnoreCase))
+            if (String.Equals(shareName, NamedPipeShare.NamedPipeShareName, StringComparison.OrdinalIgnoreCase))
             {
                 share = services;
                 shareType = ShareType.Pipe;
diff --git a/SMBLibrary/Server/Shares/SMBShareCollection.cs b/SMBLibrary/Server/Shares/SMBShareCollection.cs
index cf5498b..f09130e 100644
--- a/SMBLibrary/Server/Shares/SMBShareCollection.cs
+++ b/SMBLibrary/Server/Shares/SMBShareCollection.cs
@@ -50,7 +50,7 @@ namespace SMBLibrary.Server
         /// <param name="relativePath">e.g. \Shared</param>
         public FileSystemShare GetShareFromName(string shareName)
         {
-            int index = IndexOf(shareName, StringComparison.InvariantCultureIgnoreCase);
+            int index = IndexOf(shareName, StringComparison.OrdinalIgnoreCase);
             if (index >= 0)
             {
                 return this[index];
diff --git a/SMBLibrary/Services/ServerService/ServerService.cs b/SMBLibrary/Services/ServerService/ServerService.cs
index 81f253b..326fb69 100644
--- a/SMBLibrary/Services/ServerService/ServerService.cs
+++ b/SMBLibrary/Services/ServerService/ServerService.cs
@@ -166,7 +166,7 @@ namespace SMBLibrary.Services
         {
             for (int index = 0; index < m_shares.Count; index++)
             {
-                if (m_shares[index].Equals(shareName, StringComparison.InvariantCultureIgnoreCase))
+                if (m_shares[index].Equals(shareName, StringComparison.OrdinalIgnoreCase))
                 {
                     return index;
                 }
diff --git a/SMBServer/ServerUI.cs b/SMBServer/ServerUI.cs
index 6b912a9..9cacbcc 100644
--- a/SMBServer/ServerUI.cs
+++ b/SMBServer/ServerUI.cs
@@ -261,7 +261,7 @@ namespace SMBServer
         {
             for (int index = 0; index < list.Count; index++)
             {
-                if (string.Equals(list[index], value, StringComparison.InvariantCultureIgnoreCase))
+                if (string.Equals(list[index], value, StringComparison.OrdinalIgnoreCase))
                 {
                     return index;
                 }
diff --git a/SMBServer/UserCollection.cs b/SMBServer/UserCollection.cs
index 6dd139b..8b134bb 100644
--- a/SMBServer/UserCollection.cs
+++ b/SMBServer/UserCollection.cs
@@ -20,7 +20,7 @@ namespace SMBServer
         {
             for (int index = 0; index < this.Count; index++)
             {
-                if (string.Equals(this[index].AccountName, accountName, StringComparison.InvariantCultureIgnoreCase))
+                if (string.Equals(this[index].AccountName, accountName, StringComparison.OrdinalIgnoreCase))
                 {
                     return index;
                 }