diff --git a/source/Src/SemanticLogging.Database/SqlDatabaseLog.cs b/source/Src/SemanticLogging.Database/SqlDatabaseLog.cs
index 8418fbc..584d908 100644
--- a/source/Src/SemanticLogging.Database/SqlDatabaseLog.cs
+++ b/source/Src/SemanticLogging.Database/SqlDatabaseLog.cs
@@ -31,7 +31,7 @@ public static class SqlDatabaseLog
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Normally, calling <see cref="IDisposable.Dispose"/> on 
         /// the <see cref="System.Diagnostics.Tracing.EventListener"/> will block until all the entries are flushed or the interval elapses.
         /// If <see langword="null"/> is specified, then the call will block indefinitely until the flush operation finishes.</param>
-        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Windows Azure Storage before the sink starts dropping entries.
+        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to SQL Database before the sink starts dropping entries.
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Normally, calling <see cref="IDisposable.Dispose" /> on
         /// the <see cref="System.Diagnostics.Tracing.EventListener" /> will block until all the entries are flushed or the interval elapses.
         /// If <see langword="null" /> is specified, then the call will block indefinitely until the flush operation finishes.</param>
@@ -64,7 +64,7 @@ public static SinkSubscription<SqlDatabaseSink> LogToSqlDatabase(this IObservabl
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Calling <see cref="IDisposable.Dispose"/> on 
         /// the <see cref="EventListener"/> will block until all the entries are flushed or the interval elapses.
         /// If <see langword="null"/> is specified, then the call will block indefinitely until the flush operation finishes.</param>
-        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Windows Azure Storage before the sink starts dropping entries.
+        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to SQL Database before the sink starts dropping entries.
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Normally, calling <see cref="IDisposable.Dispose" /> on
         /// the <see cref="System.Diagnostics.Tracing.EventListener" /> will block until all the entries are flushed or the interval elapses.
         /// If <see langword="null" /> is specified, then the call will block indefinitely until the flush operation finishes.</param>
diff --git a/source/Src/SemanticLogging.WindowsAzure/Sinks/CloudEventEntry.cs b/source/Src/SemanticLogging.WindowsAzure/Sinks/CloudEventEntry.cs
index 14af76d..f0d2c09 100644
--- a/source/Src/SemanticLogging.WindowsAzure/Sinks/CloudEventEntry.cs
+++ b/source/Src/SemanticLogging.WindowsAzure/Sinks/CloudEventEntry.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Practices.EnterpriseLibrary.SemanticLogging.Sinks.WindowsAzure
 {
     /// <summary>
-    /// Represents a log entry in a Windows Azure Table.
+    /// Represents a log entry in an Azure Table.
     /// </summary>
     public sealed class CloudEventEntry
     {
diff --git a/source/Src/SemanticLogging.WindowsAzure/Sinks/WindowsAzureTableSink.cs b/source/Src/SemanticLogging.WindowsAzure/Sinks/WindowsAzureTableSink.cs
index db3f192..b58fea2 100644
--- a/source/Src/SemanticLogging.WindowsAzure/Sinks/WindowsAzureTableSink.cs
+++ b/source/Src/SemanticLogging.WindowsAzure/Sinks/WindowsAzureTableSink.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Practices.EnterpriseLibrary.SemanticLogging.Sinks
 {
     /// <summary>
-    /// Sink that asynchronously writes entries to a Windows Azure table.
+    /// Sink that asynchronously writes entries to an Azure table.
     /// </summary>
     public class WindowsAzureTableSink : IObserver<EventEntry>, IDisposable
     {
@@ -42,8 +42,8 @@ public class WindowsAzureTableSink : IObserver<EventEntry>, IDisposable
         /// <param name="instanceName">The name of the instance originating the entries.</param>
         /// <param name="connectionString">The connection string for the storage account.</param>
         /// <param name="tableAddress">Either the name of the table, or the absolute URI to the table.</param>
-        /// <param name="bufferInterval">The buffering interval to wait for events to accumulate before sending them to Windows Azure Storage.</param>
-        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Windows Azure Storage before the sink starts dropping entries.</param>
+        /// <param name="bufferInterval">The buffering interval to wait for events to accumulate before sending them to Azure Storage.</param>
+        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Azure Storage before the sink starts dropping entries.</param>
         /// <param name="onCompletedTimeout">Defines a timeout interval for when flushing the entries after an <see cref="OnCompleted"/> call is received and before disposing the sink.
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Normally, calling <see cref="IDisposable.Dispose"/> on 
         /// the <see cref="System.Diagnostics.Tracing.EventListener"/> will block until all the entries are flushed or the interval elapses.
@@ -142,7 +142,7 @@ public void OnError(Exception error)
         /// <summary>
         /// Provides the sink with new data to write.
         /// </summary>
-        /// <param name="value">The current entry to write to Windows Azure.</param>
+        /// <param name="value">The current entry to write.</param>
         public void OnNext(EventEntry value)
         {
             this.OnNext(value.TryConvertToCloudEventEntry());
diff --git a/source/Src/SemanticLogging.WindowsAzure/WindowsAzureTableLog.cs b/source/Src/SemanticLogging.WindowsAzure/WindowsAzureTableLog.cs
index a50bbc6..a9c6f74 100644
--- a/source/Src/SemanticLogging.WindowsAzure/WindowsAzureTableLog.cs
+++ b/source/Src/SemanticLogging.WindowsAzure/WindowsAzureTableLog.cs
@@ -28,7 +28,7 @@ public static class WindowsAzureTableLog
         /// <param name="bufferingInterval">The buffering interval between each batch publishing. Default value is <see cref="Buffering.DefaultBufferingInterval" />.</param>
         /// <param name="sortKeysAscending">The value indicating whether to sort the row keys in ascending order.</param>
         /// <param name="onCompletedTimeout">Defines a timeout interval for when flushing the entries after an <see cref="WindowsAzureTableSink.OnCompleted" /> call is received and before disposing the sink.</param>
-        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Windows Azure Storage before the sink starts dropping entries.
+        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Azure Storage before the sink starts dropping entries.
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Normally, calling <see cref="IDisposable.Dispose" /> on
         /// the <see cref="System.Diagnostics.Tracing.EventListener" /> will block until all the entries are flushed or the interval elapses.
         /// If <see langword="null" /> is specified, then the call will block indefinitely until the flush operation finishes.</param>
@@ -61,7 +61,7 @@ public static SinkSubscription<WindowsAzureTableSink> LogToWindowsAzureTable(thi
         /// <param name="bufferingInterval">The buffering interval between each batch publishing.</param>
         /// <param name="sortKeysAscending">The value indicating whether to sort the row keys in ascending order.</param>
         /// <param name="listenerDisposeTimeout">Defines a timeout interval for the flush operation when the listener is disposed.</param>
-        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Windows Azure Storage before the sink starts dropping entries.
+        /// <param name="maxBufferSize">The maximum number of entries that can be buffered while it's sending to Azure Storage before the sink starts dropping entries.
         /// This means that if the timeout period elapses, some event entries will be dropped and not sent to the store. Calling <see cref="IDisposable.Dispose" /> on
         /// the <see cref="EventListener" /> will block until all the entries are flushed or the interval elapses.
         /// If <see langword="null" /> is specified, then the call will block indefinitely until the flush operation finishes.</param>
diff --git a/source/Tests/SemanticLogging.Tests/UsingEventListener/EventTableEntity.cs b/source/Tests/SemanticLogging.Tests/UsingEventListener/EventTableEntity.cs
index 264b581..84186bf 100644
--- a/source/Tests/SemanticLogging.Tests/UsingEventListener/EventTableEntity.cs
+++ b/source/Tests/SemanticLogging.Tests/UsingEventListener/EventTableEntity.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.Practices.EnterpriseLibrary.SemanticLogging.Tests.EventListeners
 {
     /// <summary>
-    /// Represents a log entry in a Windows Azure Table.
+    /// Represents a log entry in an Azure Table.
     /// </summary>
     internal class TestCloudTableEntry : TableEntity
     {