diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore.Snippets/LoggingSnippets.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore.Snippets/LoggingSnippets.cs
index f0c11260c52b..6484276560fc 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore.Snippets/LoggingSnippets.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore.Snippets/LoggingSnippets.cs
@@ -63,9 +63,6 @@ public LoggingSnippetsTests()
             _startTime = DateTime.UtcNow;
         }
 
-        /// <summary>
-        /// Test for the GcpStackdriverLoggingConsoleUrl snippet.
-        /// </summary>
         [Fact]
         public void GetsLogViewingUrl()
         {
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerExtension.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerExtension.cs
index 75ad4328bcdc..afa8f0a1850b 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerExtension.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerExtension.cs
@@ -64,7 +64,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
     public static class ErrorReportingExceptionLoggerExtension
     {
         /// <summary>
-        /// Uses middleware that will report all uncaught exceptions to the Stackdriver
+        /// Uses middleware that will report all uncaught exceptions to the Google Cloud
         /// Error Reporting API.
         /// </summary>
         /// <param name="app">The application builder. Must not be null.</param>
@@ -76,7 +76,7 @@ public static IApplicationBuilder UseGoogleExceptionLogging(this IApplicationBui
 
         /// <summary>
         /// Adds services for middleware that will report all uncaught exceptions to the
-        /// Stackdriver Error Reporting API.
+        /// Google Cloud Error Reporting API.
         /// <para>
         /// Can be used when running on Google App Engine or Google Compute Engine.
         /// The Google Cloud Platform project to report errors to will detected from the
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerMiddleware.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerMiddleware.cs
index aaf550b9a714..8546e4649350 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerMiddleware.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/ErrorReportingExceptionLoggerMiddleware.cs
@@ -29,7 +29,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
     /// <summary>
     /// Middleware that will, when invoked, call the next <see cref="RequestDelegate"/>,
     /// catch any exception that it may throw, send that exception to the
-    /// Stackdriver Error Reporting API and rethrow the given exception.
+    /// Google Cloud Error Reporting API and rethrow the given exception.
     /// </summary>
     public sealed class ErrorReportingExceptionLoggerMiddleware
     {
@@ -49,7 +49,7 @@ public ErrorReportingExceptionLoggerMiddleware(RequestDelegate next, IExceptionL
 
         /// <summary>
         /// Invokes the next <see cref="RequestDelegate"/>, catches any exception thrown,
-        /// reports the exception to the  Stackdriver Error Reporting API and rethrows
+        /// reports the exception to the Google Cloud Error Reporting API and rethrows
         /// the exception.
         /// </summary>
         public async Task Invoke(HttpContext httpContext)
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/GoogleExceptionLogger.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/GoogleExceptionLogger.cs
index 5dc4d549ff46..96339554cc62 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/GoogleExceptionLogger.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/ErrorReporting/GoogleExceptionLogger.cs
@@ -28,7 +28,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
 #endif
 {
     /// <summary>
-    /// Google Cloud Error Reporting Logger. Reports exceptions to the Stackdriver Error Reporting API.
+    /// Google Cloud Error Reporting Logger. Reports exceptions to the Google Cloud Error Reporting API.
     /// </summary>
     /// 
     /// <example>
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLogger.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLogger.cs
index 33a8f6807148..dd18cd544a0d 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLogger.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLogger.cs
@@ -33,7 +33,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
 #endif
 {
     /// <summary>
-    /// <see cref="ILogger"/> for Google Stackdriver Logging.
+    /// <see cref="ILogger"/> for Google Cloud Logging.
     /// </summary>
     ///
     /// <example>
@@ -48,7 +48,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
     /// </example>
     ///
     /// <remarks>
-    /// Logs to Google Stackdriver Cloud Logging.
+    /// Logs to Google Cloud Logging.
     /// Docs: https://cloud.google.com/logging/docs/
     /// </remarks>
     /// <seealso cref="GoogleLoggerFactoryExtensions"/>
@@ -289,7 +289,7 @@ private void SetTraceAndSpanIfAny(LogEntry entry)
 
         /// <summary>
         /// For diagnostic purposes. Builds and returns the URL where the entries logged by
-        /// this <see cref="GoogleLogger"/> can be seen on the GCP Stackdriver Logging Console.
+        /// this <see cref="GoogleLogger"/> can be seen on the Google Cloud Logging Console.
         /// </summary>
         public Uri GetGcpConsoleLogsUrl()
         {
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerFactoryExtensions.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerFactoryExtensions.cs
index 16264d705e02..70340c10fb45 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerFactoryExtensions.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerFactoryExtensions.cs
@@ -42,7 +42,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
     /// </example>
     /// 
     /// <remarks>
-    /// Logs to Google Stackdriver Cloud Logging.
+    /// Logs to Google Cloud Logging.
     /// Docs: https://cloud.google.com/logging/docs/
     /// </remarks>
     /// <seealso cref="GoogleLogger"/>
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerProvider.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerProvider.cs
index 1618f6ebb3d4..a1c517eda5ef 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerProvider.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Logging/GoogleLoggerProvider.cs
@@ -27,7 +27,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
 #endif
 {
     /// <summary>
-    /// <see cref="ILoggerProvider"/> for Google Stackdriver Logging.
+    /// <see cref="ILoggerProvider"/> for Google Cloud Logging.
     /// </summary>
     public sealed class GoogleLoggerProvider : ILoggerProvider
     {
@@ -44,7 +44,7 @@ public sealed class GoogleLoggerProvider : ILoggerProvider
         private readonly IServiceProvider _serviceProvider;
 
         /// <summary>
-        /// <see cref="ILoggerProvider"/> for Google Stackdriver Logging.
+        /// <see cref="ILoggerProvider"/> for Google Cloud Logging.
         /// </summary>
         /// <param name="consumer">The consumer to push logs to. Must not be null.</param>
         /// <param name="logTarget">Where to log to. Must not be null.</param>
@@ -68,7 +68,7 @@ internal GoogleLoggerProvider(IConsumer<LogEntry> consumer, LogTarget logTarget,
         }
 
         /// <summary>
-        /// Create an <see cref="ILoggerProvider"/> for Google Stackdriver Logging.
+        /// Create an <see cref="ILoggerProvider"/> for Google Cloud Logging.
         /// </summary>
         /// <param name="serviceProvider">The service provider to resolve additional services from.
         /// May be null, in which case additional services (such as custom labels) will not be used.</param>
@@ -86,7 +86,7 @@ public static GoogleLoggerProvider Create(IServiceProvider serviceProvider, stri
         }
 
         /// <summary>
-        /// Create an <see cref="ILoggerProvider"/> for Google Stackdriver Logging.
+        /// Create an <see cref="ILoggerProvider"/> for Google Cloud Logging.
         /// </summary>
         /// <param name="logTarget">Where to log to. Must not be null.</param>
         /// <param name="serviceProvider">Optional, the service provider to resolve additional services from. May be null,
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceExtension.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceExtension.cs
index 7711f613fb9d..2af177d826b0 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceExtension.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceExtension.cs
@@ -31,7 +31,7 @@ namespace Google.Cloud.Diagnostics.AspNetCore
     /// <summary>
     ///  Uses the Google Cloud Trace Middleware.
     ///  Traces the time taken for all subsequent delegates to run.  The time taken
-    ///  and metadata will be sent to the Stackdriver Trace API.  Also allows for more
+    ///  and metadata will be sent to the Google Cloud Trace API.  Also allows for more
     ///  finely grained manual tracing.
     /// </summary>
     ///
@@ -80,7 +80,7 @@ public static class CloudTraceExtension
     {
         /// <summary>
         /// Uses middleware that will trace time taken for all subsequent delegates to run.
-        /// The time taken and metadata will be sent to the Stackdriver Trace API. To be
+        /// The time taken and metadata will be sent to the Google Cloud Trace API. To be
         /// used with <see cref="AddGoogleTrace"/>,
         /// </summary>
         public static IApplicationBuilder UseGoogleTrace(this IApplicationBuilder app)
diff --git a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceMiddleware.cs b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceMiddleware.cs
index a942286dc69d..66efbcc05eb8 100644
--- a/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceMiddleware.cs
+++ b/apis/Google.Cloud.Diagnostics.AspNetCore/Google.Cloud.Diagnostics.AspNetCore/Trace/CloudTraceMiddleware.cs
@@ -55,7 +55,7 @@ public CloudTraceMiddleware(
         /// <summary>
         /// Invokes the next <see cref="RequestDelegate"/> and traces the time 
         /// taken for the next delegate to run, reporting the results to the
-        /// Stackdriver Trace API.
+        /// Google Cloud Trace API.
         /// </summary>
         /// <param name="httpContext">The current HTTP context.</param>
         /// <param name="traceContext">Trace information from the current request. Must not be null.</param>
diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.IntegrationTests/AssemblyInfo.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.IntegrationTests/AssemblyInfo.cs
index 783a439ae25a..db3a5515cb26 100644
--- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.IntegrationTests/AssemblyInfo.cs
+++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.IntegrationTests/AssemblyInfo.cs
@@ -15,7 +15,7 @@
 using System.Runtime.CompilerServices;
 using Xunit;
 
-// Because of the Stackdriver limits on reading and writing entries.
+// Because of the Google Cloud limits on reading and writing entries.
 // This reduces the chances of exceeding the limits.
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 
diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/ErrorReporting/ErrorReportingOptionsTest.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/ErrorReporting/ErrorReportingOptionsTest.cs
index 89e521297a62..49db0e6f0310 100644
--- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/ErrorReporting/ErrorReportingOptionsTest.cs
+++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/ErrorReporting/ErrorReportingOptionsTest.cs
@@ -36,7 +36,7 @@ public void CreateConsumer_ErrorToLogsConsumer()
         }
 
         [Fact]
-        public void CreateConsumer_BufferdConsumer()
+        public void CreateConsumer_BufferedConsumer()
         {
             var bufferOptions = BufferOptions.SizedBuffer();
             var eventTarget = EventTarget.ForLogging(_projectId, "test-log", _loggingClient);
diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/ErrorReportingOptions.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/ErrorReportingOptions.cs
index 53481227ae95..435086336aaa 100644
--- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/ErrorReportingOptions.cs
+++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/ErrorReportingOptions.cs
@@ -54,7 +54,7 @@ public static ErrorReportingOptions Create(
 
         /// <summary>
         /// Creates an <see cref="ErrorReportingOptions"/> that will send error events to the
-        /// Stackdriver Logging API.
+        /// Google Cloud Logging API.
         /// </summary>
         /// <param name="projectId">Optional if running on Google App Engine or Google Compute Engine.
         ///     The Google Cloud Platform project ID. If running on GAE or GCE the project ID will be
diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/EventTarget.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/EventTarget.cs
index 5a508564ac59..e9c41773976b 100644
--- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/EventTarget.cs
+++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/ErrorReporting/EventTarget.cs
@@ -24,7 +24,7 @@ namespace Google.Cloud.Diagnostics.Common
     /// </summary>
     public enum EventTargetKind
     {
-        /// <summary>Stackdriver Error Logging API.</summary>
+        /// <summary>Google Cloud Error Logging API.</summary>
         Logging
     }
 
@@ -55,9 +55,9 @@ public sealed class EventTarget
         public MonitoredResource MonitoredResource { get; private set; }
 
         /// <summary>
-        /// Creates a new <see cref="EventTarget"/> instance that will report to the Stackdriver Logging API.
-        /// The events are then automatically propagated to the Stackdriver Error Logging API from the 
-        /// Stackdriver Logging API.
+        /// Creates a new <see cref="EventTarget"/> instance that will report to the Google Cloud Logging API.
+        /// The events are then automatically propagated to the Google Cloud Error Logging API from the 
+        /// Google Cloud Logging API.
         /// </summary>
         /// <remarks>
         /// For more information see "Formatting Log Error Messages"
@@ -80,9 +80,9 @@ public static EventTarget ForLogging(string projectId = null, string logName = L
         }
 
         /// <summary>
-        /// Creates a new <see cref="EventTarget"/> instance that will report to the Stackdriver Logging API.
-        /// The events are then automatically propagated to the Stackdriver Error Logging API from the 
-        /// Stackdriver Logging API.
+        /// Creates a new <see cref="EventTarget"/> instance that will report to the Google Cloud Logging API.
+        /// The events are then automatically propagated to the Google Cloud Error Logging API from the 
+        /// Google Cloud Logging API.
         /// </summary>
         /// <remarks>
         /// For more information see "Formatting Log Error Messages"
diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Logging/GrpcLogConsumer.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Logging/GrpcLogConsumer.cs
index bf5386805e23..618988381152 100644
--- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Logging/GrpcLogConsumer.cs
+++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Logging/GrpcLogConsumer.cs
@@ -22,13 +22,13 @@
 namespace Google.Cloud.Diagnostics.Common
 {
     /// <summary>
-    /// An <see cref="IConsumer{T}"/> that will send received logs to the Stackdriver Logging API.
+    /// An <see cref="IConsumer{T}"/> that will send received logs to the Google Cloud Logging API.
     /// </summary>
     internal sealed class GrpcLogConsumer : IConsumer<LogEntry>
     {
         private LoggingServiceV2Client _client;
 
-        /// <param name="client">The logging client that will push logs to the Stackdriver Logging API.</param>
+        /// <param name="client">The logging client that will push logs to the Google Cloud Logging API.</param>
         public GrpcLogConsumer(LoggingServiceV2Client client)
         {
             _client = GaxPreconditions.CheckNotNull(client, nameof(client));
diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Trace/GrpcTraceConsumer.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Trace/GrpcTraceConsumer.cs
index 7321bc298048..081fab8d6dcf 100644
--- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Trace/GrpcTraceConsumer.cs
+++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common/Trace/GrpcTraceConsumer.cs
@@ -24,13 +24,13 @@
 namespace Google.Cloud.Diagnostics.Common
 {
     /// <summary>
-    /// A <see cref="IConsumer{TraceProto}"/> that will send received traces to the Stackdriver Trace API.
+    /// A <see cref="IConsumer{TraceProto}"/> that will send received traces to the Google Cloud Trace API.
     /// </summary>
     internal sealed class GrpcTraceConsumer : IConsumer<TraceProto>
     {
         private readonly TraceServiceClient _client;
 
-        /// <param name="client">The trace client that will push traces to the Stackdriver Trace API.</param>
+        /// <param name="client">The trace client that will push traces to the Google Cloud Trace API.</param>
         internal GrpcTraceConsumer(TraceServiceClient client)
         {
             _client = GaxPreconditions.CheckNotNull(client, nameof(client));