diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart
index d598553eeb..ff57038093 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart
@@ -44,7 +44,7 @@ const Duration _baseRetryInterval = Duration(seconds: 10);
 
 typedef _LogBatch = (List<QueuedItem> logQueues, List<InputLogEvent> logEvents);
 
-/// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logger_plugin}
+/// {@template amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin}
 /// An [AWSLoggerPlugin] for sending logs to AWS CloudWatch Logs.
 /// {@endtemplate}
 class AmplifyLoggingCloudWatchDart extends LoggingPluginInterface
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart
index 90039d355f..641f1d48ae 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart
@@ -3,13 +3,11 @@
 
 import 'dart:async';
 
-import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart';
-import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart';
-import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart';
+import 'package:amplify_logging_cloudwatch_dart/src/sdk/cloud_watch_logs.dart';
 import 'package:aws_common/aws_common.dart';
 import 'package:intl/intl.dart';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logstream_provider}
+/// {@template amplify_logging_cloudwatch_dart.cloudwatch_logstream_provider}
 /// An interface to provide custom implementation for
 /// [CloudWatchLogStreamProvider]
 /// {@endtemplate}
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart
index 02c9df7d68..80bada4d26 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart
@@ -3,7 +3,7 @@
 
 import 'package:amplify_core/amplify_core.dart';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider}
+/// {@template amplify_logging_cloudwatch_dart.app_path_provider}
 /// Provides App paths for amplify_logging_cloudwatch_dart package.
 /// {@endtemplate}
 class DartAppPathProvider implements AppPathProvider {
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart
index 691d5779cd..9e32b43bd6 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart
@@ -5,7 +5,7 @@ import 'dart:io';
 
 import 'package:amplify_core/amplify_core.dart';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider}
+/// {@template amplify_logging_cloudwatch_dart.app_path_provider}
 /// Provides App paths for amplify_logging_cloudwatch_dart package.
 /// {@endtemplate}
 class DartAppPathProvider implements AppPathProvider {
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart
index 92ea6648d3..bda44a2c08 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart
@@ -3,7 +3,7 @@
 
 import 'package:amplify_core/amplify_core.dart';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider}
+/// {@template amplify_logging_cloudwatch_dart.app_path_provider}
 /// Provides App paths for amplify_logging_cloudwatch_dart package.
 /// {@endtemplate}
 class DartAppPathProvider implements AppPathProvider {
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart
index f7ea79d8c1..f029e60b02 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart
@@ -5,7 +5,7 @@ import 'dart:collection';
 
 import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.in_memory_queued_item_store}
+/// {@template amplify_logging_cloudwatch_dart.in_memory_queued_item_store}
 /// Stores string elements in device memory.
 /// {@endtemplate}
 class InMemoryQueuedItemStore implements QueuedItemStore {
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart
index a64fe54270..c89ea3079a 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart
@@ -33,7 +33,7 @@ abstract interface class QueuedItemStore {
   FutureOr<void> close();
 }
 
-/// {@template amplify_logging_cloudwatch_dart_dart.string_database_element}
+/// {@template amplify_logging_cloudwatch_dart.string_database_element}
 /// An item stored in the [QueuedItemStore].
 /// {@endtemplate}
 class QueuedItem {
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart
index 32e271c0cd..478a0d17d6 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart
@@ -9,7 +9,7 @@ import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage.da
 import 'package:aws_signature_v4/aws_signature_v4.dart';
 import 'package:meta/meta.dart';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.remote_logging_constraint_provider}
+/// {@template amplify_logging_cloudwatch_dart.remote_logging_constraint_provider}
 /// An Interface to provide custom implementation for
 /// [RemoteLoggingConstraintProvider]
 /// It gets the [LoggingConstraints] from a remote location and cache it.
@@ -19,7 +19,7 @@ abstract class RemoteLoggingConstraintProvider {
   LoggingConstraints? get loggingConstraint;
 }
 
-/// {@template amplify_logging_cloudwatch_dart_dart.base_remote_constraints_provider}
+/// {@template amplify_logging_cloudwatch_dart.base_remote_constraints_provider}
 /// Base class for [RemoteLoggingConstraintProvider] to provide
 /// [LoggingConstraints] from a remote location and cache it.
 /// {@endtemplate}
@@ -160,7 +160,7 @@ base class BaseRemoteLoggingConstraintProvider
   }
 }
 
-/// {@template amplify_logging_cloudwatch_dart_dart.default_remote_logging_constraint_provider}
+/// {@template amplify_logging_cloudwatch_dart.default_remote_logging_constraint_provider}
 /// Default implementation of [RemoteLoggingConstraintProvider] to fetch
 /// [LoggingConstraints] from an http endpoint periodically.
 /// {@endtemplate}
diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart
index 5f635f796e..e8663607d0 100644
--- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart
+++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart
@@ -3,7 +3,7 @@
 
 import 'dart:async';
 
-/// {@template amplify_logging_cloudwatch_dart_dart.stoppable_timer}
+/// {@template amplify_logging_cloudwatch_dart.stoppable_timer}
 /// A Timer that can be stopped and started again.
 ///
 /// The `callback` function is invoked repeatedly with [duration] intervals