diff --git a/Libraries/src/Amazon.Lambda.CloudWatchEvents/CloudWatchEvent.cs b/Libraries/src/Amazon.Lambda.CloudWatchEvents/CloudWatchEvent.cs
index d531b5d17..55968369e 100644
--- a/Libraries/src/Amazon.Lambda.CloudWatchEvents/CloudWatchEvent.cs
+++ b/Libraries/src/Amazon.Lambda.CloudWatchEvents/CloudWatchEvent.cs
@@ -1,4 +1,4 @@
-namespace CloudWatchEvents
+namespace Amazon.Lambda.CloudWatchEvents
 {
     using System;
     using System.Collections.Generic;
diff --git a/Libraries/src/Amazon.Lambda.Serialization.Json/AwsResolver.cs b/Libraries/src/Amazon.Lambda.Serialization.Json/AwsResolver.cs
index 9b87f5395..586f485a4 100644
--- a/Libraries/src/Amazon.Lambda.Serialization.Json/AwsResolver.cs
+++ b/Libraries/src/Amazon.Lambda.Serialization.Json/AwsResolver.cs
@@ -82,7 +82,8 @@ protected override IList<JsonProperty> CreateProperties(Type type, MemberSeriali
                 }
             }
             else if (type.FullName.StartsWith("Amazon.Lambda.CloudWatchEvents.")
-                     && (type.GetTypeInfo().BaseType?.FullName?.StartsWith("CloudWatchEvents.CloudWatchEvent`", StringComparison.Ordinal) ?? false))
+                     && (type.GetTypeInfo().BaseType?.FullName?.StartsWith("Amazon.Lambda.CloudWatchEvents.CloudWatchEvent`",
+                             StringComparison.Ordinal) ?? false))
             {
                 foreach (JsonProperty property in properties)
                 {