diff --git a/source/Src/SemanticLogging/SemanticLoggingEventSource.cs b/source/Src/SemanticLogging/SemanticLoggingEventSource.cs
index 101ad64..ba6e9bd 100644
--- a/source/Src/SemanticLogging/SemanticLoggingEventSource.cs
+++ b/source/Src/SemanticLogging/SemanticLoggingEventSource.cs
@@ -115,7 +115,7 @@ internal void RollingFlatFileSinkWriteFailed(string message)
             }
         }
 
-        [Event(500, Level = EventLevel.Critical, Keywords = Keywords.Sink, Message = "A Windows Azure Table sink failed to write a batch of events. Message: {0}")]
+        [Event(500, Level = EventLevel.Critical, Keywords = Keywords.Sink, Message = "An Azure Table sink failed to write a batch of events. Message: {0}")]
         internal void WindowsAzureTableSinkPublishEventsFailed(string message)
         {
             if (this.IsEnabled())
@@ -124,7 +124,7 @@ internal void WindowsAzureTableSinkPublishEventsFailed(string message)
             }
         }
 
-        [Event(501, Level = EventLevel.Critical, Keywords = Keywords.Sink, Message = "A Windows Azure Table sink failed to create a table. Message: {0}")]
+        [Event(501, Level = EventLevel.Critical, Keywords = Keywords.Sink, Message = "An Azure Table sink failed to create a table. Message: {0}")]
         internal void WindowsAzureTableSinkTableCreationFailed(string message)
         {
             if (this.IsEnabled())
@@ -133,7 +133,7 @@ internal void WindowsAzureTableSinkTableCreationFailed(string message)
             }
         }
 
-        [Event(502, Level = EventLevel.Warning, Keywords = Keywords.Sink, Message = "A transient fault occurred in a Windows Azure Table sink. Message: {0}")]
+        [Event(502, Level = EventLevel.Warning, Keywords = Keywords.Sink, Message = "A transient fault occurred in an Azure Table sink. Message: {0}")]
         internal void WindowsAzureTableSinkTransientError(string message)
         {
             if (this.IsEnabled())
@@ -142,7 +142,7 @@ internal void WindowsAzureTableSinkTransientError(string message)
             }
         }
 
-        [Event(503, Level = EventLevel.Critical, Keywords = Keywords.Sink, Message = "A Windows Azure Table sink failed to create an entity. Message: {0}")]
+        [Event(503, Level = EventLevel.Critical, Keywords = Keywords.Sink, Message = "An Azure Table sink failed to create an entity. Message: {0}")]
         internal void WindowsAzureTableSinkEntityCreationFailed(string message)
         {
             if (this.IsEnabled())
@@ -151,7 +151,7 @@ internal void WindowsAzureTableSinkEntityCreationFailed(string message)
             }
         }
 
-        [Event(504, Level = EventLevel.Error, Keywords = Keywords.Sink, Message = "A Windows Azure Table sink discarded {0} events due to failures while attempting to publish a batch.")]
+        [Event(504, Level = EventLevel.Error, Keywords = Keywords.Sink, Message = "An Azure Table sink discarded {0} events due to failures while attempting to publish a batch.")]
         internal void WindowsAzureTableSinkPublishEventsFailedAndDiscardsEntries(int numberOfEntries)
         {
             if (this.IsEnabled())
diff --git a/source/Src/SemanticLogging/SemanticLoggingEventSourceResources.resx b/source/Src/SemanticLogging/SemanticLoggingEventSourceResources.resx
index 6ed6724..320a748 100644
--- a/source/Src/SemanticLogging/SemanticLoggingEventSourceResources.resx
+++ b/source/Src/SemanticLogging/SemanticLoggingEventSourceResources.resx
@@ -211,18 +211,18 @@
     <value>An unhandled exception occurred for the trace session '{0}'. Message: {1}</value>
   </data>
   <data name="event_WindowsAzureTableSinkEntityCreationFailed" xml:space="preserve">
-    <value>A Windows Azure Table sink failed to create an entity. Message: {0}</value>
+    <value>A Microsoft Azure Table sink failed to create an entity. Message: {0}</value>
   </data>
   <data name="event_WindowsAzureTableSinkPublishEventsFailed" xml:space="preserve">
-    <value>A Windows Azure Table sink failed to write a batch of events. Message: {0}</value>
+    <value>A Microsoft Azure Table sink failed to write a batch of events. Message: {0}</value>
   </data>
   <data name="event_WindowsAzureTableSinkPublishEventsFailedAndDiscardsEntries" xml:space="preserve">
-    <value>A Windows Azure Table sink discarded {0} events due to failures while attempting to publish a batch.</value>
+    <value>A Microsoft Azure Table sink discarded {0} events due to failures while attempting to publish a batch.</value>
   </data>
   <data name="event_WindowsAzureTableSinkTableCreationFailed" xml:space="preserve">
-    <value>A Windows Azure Table sink failed to create a table. Message: {0}</value>
+    <value>A Microsoft Azure Table sink failed to create a table. Message: {0}</value>
   </data>
   <data name="event_WindowsAzureTableSinkTransientError" xml:space="preserve">
-    <value>A transient fault occurred in a Windows Azure Table sink. Message: {0}</value>
+    <value>A transient fault occurred in a Microsoft Azure Table sink. Message: {0}</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/source/Tests/SemanticLogging.Tests/Sinks/WindowsAzureTableSinkFixture_Integration.cs b/source/Tests/SemanticLogging.Tests/Sinks/WindowsAzureTableSinkFixture_Integration.cs
index c3dd6c0..055600c 100644
--- a/source/Tests/SemanticLogging.Tests/Sinks/WindowsAzureTableSinkFixture_Integration.cs
+++ b/source/Tests/SemanticLogging.Tests/Sinks/WindowsAzureTableSinkFixture_Integration.cs
@@ -39,7 +39,7 @@ protected override void Arrange()
                 || connectionString.Contains("[AccountName]")
                 || connectionString.Contains("[AccountKey]"))
             {
-                Assert.Inconclusive("Cannot run tests because the Windows Azure Storage credentials are not configured");
+                Assert.Inconclusive("Cannot run tests because the Azure Storage credentials are not configured");
             }
 
             this.account = CloudStorageAccount.Parse(connectionString);
diff --git a/source/Tests/SemanticLogging.Tests/UsingEventListener/WindowsAzureTableSinkFixture_Integration.cs b/source/Tests/SemanticLogging.Tests/UsingEventListener/WindowsAzureTableSinkFixture_Integration.cs
index 407cf1b..3fadd48 100644
--- a/source/Tests/SemanticLogging.Tests/UsingEventListener/WindowsAzureTableSinkFixture_Integration.cs
+++ b/source/Tests/SemanticLogging.Tests/UsingEventListener/WindowsAzureTableSinkFixture_Integration.cs
@@ -30,7 +30,7 @@ protected override void Arrange()
                 || connectionString.Contains("[AccountName]")
                 || connectionString.Contains("[AccountKey]"))
             {
-                Assert.Inconclusive("Cannot run tests because the Windows Azure Storage credentials are not configured");
+                Assert.Inconclusive("Cannot run tests because the Azure Storage credentials are not configured");
             }
 
             this.account = CloudStorageAccount.Parse(connectionString);