diff --git a/OpenStack/OpenStack.Test/Storage/StorageContainerPayloadConverterTests.cs b/OpenStack/OpenStack.Test/Storage/StorageContainerPayloadConverterTests.cs
index 65a56fa..e4b4398 100644
--- a/OpenStack/OpenStack.Test/Storage/StorageContainerPayloadConverterTests.cs
+++ b/OpenStack/OpenStack.Test/Storage/StorageContainerPayloadConverterTests.cs
@@ -47,9 +47,9 @@ namespace OpenStack.Test.Storage
 
             Assert.AreEqual(2, containers.Count());
             var obj1 =
-                containers.First(o => string.Compare(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase) == 0);
+                containers.First(o => string.Equals(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase));
             var obj2 =
-                containers.First(o => string.Compare(o.Name, "OtherTestContainer", StringComparison.InvariantCultureIgnoreCase) == 0);
+                containers.First(o => string.Equals(o.Name, "OtherTestContainer", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsNotNull(obj1);
             Assert.IsNotNull(obj2);
 
@@ -77,7 +77,7 @@ namespace OpenStack.Test.Storage
 
             Assert.AreEqual(1, containers.Count());
             var obj1 =
-                containers.First(o => string.Compare(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase) == 0);
+                containers.First(o => string.Equals(o.Name, "TestContainer", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsNotNull(obj1);
 
             Assert.AreEqual(7, obj1.TotalBytesUsed);
diff --git a/OpenStack/OpenStack.Test/Storage/StorageObjectPayloadConverterTests.cs b/OpenStack/OpenStack.Test/Storage/StorageObjectPayloadConverterTests.cs
index e71bd3b..57b3270 100644
--- a/OpenStack/OpenStack.Test/Storage/StorageObjectPayloadConverterTests.cs
+++ b/OpenStack/OpenStack.Test/Storage/StorageObjectPayloadConverterTests.cs
@@ -53,9 +53,9 @@ namespace OpenStack.Test.Storage
 
             Assert.AreEqual(2,objects.Count());
             var obj1 =
-                objects.First(o => string.Compare(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase) == 0);
+                objects.First(o => string.Equals(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase));
             var obj2 =
-                objects.First(o => string.Compare(o.Name, "LargeFile.bin", StringComparison.InvariantCultureIgnoreCase) == 0);
+                objects.First(o => string.Equals(o.Name, "LargeFile.bin", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsNotNull(obj1);
             Assert.IsNotNull(obj2);
 
@@ -91,7 +91,7 @@ namespace OpenStack.Test.Storage
 
             Assert.AreEqual(1, objects.Count());
             var obj1 =
-                objects.First(o => string.Compare(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase) == 0);
+                objects.First(o => string.Equals(o.Name, "BLAH", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsNotNull(obj1);
 
             Assert.AreEqual(0, obj1.Length);
diff --git a/OpenStack/OpenStack/Identity/IdentityServiceClientDefinition.cs b/OpenStack/OpenStack/Identity/IdentityServiceClientDefinition.cs
index 7e62916..a84cbb2 100644
--- a/OpenStack/OpenStack/Identity/IdentityServiceClientDefinition.cs
+++ b/OpenStack/OpenStack/Identity/IdentityServiceClientDefinition.cs
@@ -54,7 +54,7 @@ namespace OpenStack.Identity
             {
                 //https://someidentityendpoint:35357/v2.0/tokens
                 var endpointSegs = credential.AuthenticationEndpoint.Segments;
-                if (endpointSegs.Count() == 3 && string.Compare(endpointSegs[1].Trim('/'), "v2.0", StringComparison.Ordinal) == 0)
+                if (endpointSegs.Count() == 3 && string.Equals(endpointSegs[1].Trim('/'), "v2.0", StringComparison.Ordinal))
                 {
                     return true;
                 }
diff --git a/OpenStack/OpenStack/Identity/OpenStackRegionResolver.cs b/OpenStack/OpenStack/Identity/OpenStackRegionResolver.cs
index 1cc51e8..cf532ce 100644
--- a/OpenStack/OpenStack/Identity/OpenStackRegionResolver.cs
+++ b/OpenStack/OpenStack/Identity/OpenStackRegionResolver.cs
@@ -31,7 +31,7 @@ namespace OpenStack.Identity
 
             var ret = string.Empty;
 
-            var identService = catalog.FirstOrDefault(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) == 0);
+            var identService = catalog.FirstOrDefault(s => string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase));
             
             if (identService == null)
             {
diff --git a/OpenStack/OpenStack/Identity/OpenStackServiceCatalog.cs b/OpenStack/OpenStack/Identity/OpenStackServiceCatalog.cs
index 8eb6cd0..90f1c3d 100644
--- a/OpenStack/OpenStack/Identity/OpenStackServiceCatalog.cs
+++ b/OpenStack/OpenStack/Identity/OpenStackServiceCatalog.cs
@@ -34,7 +34,7 @@ namespace OpenStack.Identity
         /// <inheritdoc/>
         public bool Exists(string serviceName)
         {
-            return this.Any(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) == 0);
+            return this.Any(s => string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase));
         }
 
         /// <inheritdoc/>
diff --git a/OpenStack/OpenStack/Identity/OpenStackServiceEndpointResolver.cs b/OpenStack/OpenStack/Identity/OpenStackServiceEndpointResolver.cs
index 8fc45cc..aea9112 100644
--- a/OpenStack/OpenStack/Identity/OpenStackServiceEndpointResolver.cs
+++ b/OpenStack/OpenStack/Identity/OpenStackServiceEndpointResolver.cs
@@ -31,19 +31,19 @@ namespace OpenStack.Identity
             serviceName.AssertIsNotNullOrEmpty("serviceName", "Cannot resolve the public endpoint of a service with a null or empty service name.");
             serviceName.AssertIsNotNullOrEmpty("region", "Cannot resolve the public endpoint of a service with a null or empty region.");
 
-            if (catalog.All(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) != 0))
+            if (catalog.All(s => !string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase)))
             {
                 throw new InvalidOperationException(string.Format("Service catalog does not contain an entry for the '{0}' service. The request could not be completed.", serviceName));
             }
 
-            var service = catalog.First(s => string.Compare(s.Name, serviceName, StringComparison.OrdinalIgnoreCase) == 0);
+            var service = catalog.First(s => string.Equals(s.Name, serviceName, StringComparison.OrdinalIgnoreCase));
 
-            if (service.Endpoints.All(e => string.Compare(e.Region, region, StringComparison.OrdinalIgnoreCase) != 0))
+            if (service.Endpoints.All(e => !string.Equals(e.Region, region, StringComparison.OrdinalIgnoreCase)))
             {
                 throw new InvalidOperationException(string.Format("Service catalog does not contain an endpoint for the '{0}' service in the requested region. Region: '{1}'", serviceName, region));
             }
 
-            var endpoint = service.Endpoints.First(e => string.Compare(e.Region, region, StringComparison.OrdinalIgnoreCase) == 0);
+            var endpoint = service.Endpoints.First(e => string.Equals(e.Region, region, StringComparison.OrdinalIgnoreCase));
             
             return endpoint.PublicUri;
         }
diff --git a/OpenStack/OpenStack/Storage/LargeStorageObjectCreator.cs b/OpenStack/OpenStack/Storage/LargeStorageObjectCreator.cs
index 5ef0520..74f281f 100644
--- a/OpenStack/OpenStack/Storage/LargeStorageObjectCreator.cs
+++ b/OpenStack/OpenStack/Storage/LargeStorageObjectCreator.cs
@@ -191,7 +191,7 @@ namespace OpenStack.Storage
 
             var segmentFolder =
                 container.Folders.FirstOrDefault(
-                    f => string.Compare(f.FullName, objectName, StringComparison.Ordinal) == 0);
+                    f => string.Equals(f.FullName, objectName, StringComparison.Ordinal));
 
             if (segmentFolder == null)
             {
diff --git a/OpenStack/OpenStack/Storage/StorageFolderPayloadConverter.cs b/OpenStack/OpenStack/Storage/StorageFolderPayloadConverter.cs
index c76e274..e179e46 100644
--- a/OpenStack/OpenStack/Storage/StorageFolderPayloadConverter.cs
+++ b/OpenStack/OpenStack/Storage/StorageFolderPayloadConverter.cs
@@ -58,7 +58,7 @@ namespace OpenStack.Storage
                     continue;
                 }
 
-                var currentRoot = folders.FirstOrDefault(f => string.Compare(f.Name, folderParts[0], StringComparison.Ordinal) == 0);
+                var currentRoot = folders.FirstOrDefault(f => string.Equals(f.Name, folderParts[0], StringComparison.Ordinal));
                 if (currentRoot == null)
                 {
                     //if the root folder does not exist, create it.
@@ -71,7 +71,7 @@ namespace OpenStack.Storage
                 foreach (var part in folderParts.Skip(1))
                 {
                     currentPath += "/" + part;
-                    var newRoot = currentRoot.Folders.FirstOrDefault(f => string.Compare(f.Name, part, StringComparison.Ordinal) == 0);
+                    var newRoot = currentRoot.Folders.FirstOrDefault(f => string.Equals(f.Name, part, StringComparison.Ordinal));
                     if (newRoot == null)
                     {
                         newRoot = new StorageFolder(currentPath, new List<StorageFolder>());
@@ -111,7 +111,7 @@ namespace OpenStack.Storage
                 var objectConverter = ServiceLocator.Instance.Locate<IStorageObjectPayloadConverter>();
 
                 var objects = rawObjects.Select(t => objectConverter.ConvertSingle(t,containerName)).ToList();
-                objects.RemoveAll(o => string.Compare(o.FullName, folderName, StringComparison.Ordinal) == 0);
+                objects.RemoveAll(o => string.Equals(o.FullName, folderName, StringComparison.Ordinal));
 
                 return new StorageFolder(folderName, subFolders.Select(ParseSubFolder), objects);
                 
diff --git a/OpenStack/OpenStack/Storage/StorageObjectPayloadConverter.cs b/OpenStack/OpenStack/Storage/StorageObjectPayloadConverter.cs
index 929e29f..ad93def 100644
--- a/OpenStack/OpenStack/Storage/StorageObjectPayloadConverter.cs
+++ b/OpenStack/OpenStack/Storage/StorageObjectPayloadConverter.cs
@@ -144,7 +144,7 @@ namespace OpenStack.Storage
             IEnumerable<string> values;
             if (headers.TryGetValue("X-Static-Large-Object", out values))
             {
-                if (values.Any(v => string.Compare(v, "true", StringComparison.OrdinalIgnoreCase) == 0))
+                if (values.Any(v => string.Equals(v, "true", StringComparison.OrdinalIgnoreCase)))
                 {
                     return new StaticLargeObjectManifest(objectName, containerName, lastModified, eTag, length, contentType, metadata);
                 }
diff --git a/OpenStack/OpenStack/Storage/StorageServiceClientDefinition.cs b/OpenStack/OpenStack/Storage/StorageServiceClientDefinition.cs
index 033dae5..bc571c8 100644
--- a/OpenStack/OpenStack/Storage/StorageServiceClientDefinition.cs
+++ b/OpenStack/OpenStack/Storage/StorageServiceClientDefinition.cs
@@ -57,7 +57,7 @@ namespace OpenStack.Storage
                 return
                     catalog.Any(
                         s =>
-                            string.Compare(s.Name, StorageServiceClient.StorageServiceName, StringComparison.OrdinalIgnoreCase) == 0 &&
+                            string.Equals(s.Name, StorageServiceClient.StorageServiceName, StringComparison.OrdinalIgnoreCase) &&
                             s.Endpoints.Any(e => this.ListSupportedVersions().Contains(e.Version)));
             }
             return false;
diff --git a/OpenStack/OpenStack/Storage/StorageServiceRestClient.cs b/OpenStack/OpenStack/Storage/StorageServiceRestClient.cs
index 6ffe8a4..9c5ceb7 100644
--- a/OpenStack/OpenStack/Storage/StorageServiceRestClient.cs
+++ b/OpenStack/OpenStack/Storage/StorageServiceRestClient.cs
@@ -137,7 +137,7 @@ namespace OpenStack.Storage
             var client = this.GetHttpClient(this.context);
 
             var baseUri = CreateRequestUri(GetServiceEndpoint(this.context), containerName);
-            var prefix = string.Compare("/", folderName, StringComparison.Ordinal) == 0
+            var prefix = string.Equals("/", folderName, StringComparison.Ordinal)
                 ? string.Empty
                 : string.Format("&prefix={0}", folderName);