diff --git a/Sources/SendGrid/Models/AdvancedSuppressionManager.swift b/Sources/SendGrid/Models/AdvancedSuppressionManager.swift
index ceed024..ade8efb 100644
--- a/Sources/SendGrid/Models/AdvancedSuppressionManager.swift
+++ b/Sources/SendGrid/Models/AdvancedSuppressionManager.swift
@@ -13,7 +13,7 @@ public struct AdvancedSuppressionManager: Content {
         self.groupsToDisplay = groupsToDisplay
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case groupId = "group_id"
         case groupsToDisplay = "groups_to_display"
     }
diff --git a/Sources/SendGrid/Models/EmailAttachment.swift b/Sources/SendGrid/Models/EmailAttachment.swift
index 37b2f88..0c54332 100644
--- a/Sources/SendGrid/Models/EmailAttachment.swift
+++ b/Sources/SendGrid/Models/EmailAttachment.swift
@@ -36,7 +36,7 @@ public struct EmailAttachment: Content {
         self.contentId = contentId
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case content
         case type
         case filename
diff --git a/Sources/SendGrid/Models/MailSettings.swift b/Sources/SendGrid/Models/MailSettings.swift
index 4c09acf..735e143 100644
--- a/Sources/SendGrid/Models/MailSettings.swift
+++ b/Sources/SendGrid/Models/MailSettings.swift
@@ -35,7 +35,7 @@ public struct MailSettings: Content {
         self.spamCheck = spamCheck
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case bcc
         case bypassListManagement = "bypass_list_management"
         case footer
@@ -111,7 +111,7 @@ public struct SpamCheck: Content {
         self.postToUrl = postToUrl
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case enable
         case threshold
         case postToUrl = "post_to_url"
diff --git a/Sources/SendGrid/Models/Personalization.swift b/Sources/SendGrid/Models/Personalization.swift
index 19eb3e0..25acac9 100644
--- a/Sources/SendGrid/Models/Personalization.swift
+++ b/Sources/SendGrid/Models/Personalization.swift
@@ -44,7 +44,7 @@ public struct Personalization: Content {
         self.sendAt = sendAt
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case to
         case cc
         case bcc
diff --git a/Sources/SendGrid/Models/SendGridEmail.swift b/Sources/SendGrid/Models/SendGridEmail.swift
index c0c3289..77cb66a 100644
--- a/Sources/SendGrid/Models/SendGridEmail.swift
+++ b/Sources/SendGrid/Models/SendGridEmail.swift
@@ -87,7 +87,7 @@ public struct SendGridEmail: Content {
         self.trackingSettings = trackingSettings
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case personalizations
         case from
         case replyTo = "reply_to"
diff --git a/Sources/SendGrid/Models/TrackingSettings.swift b/Sources/SendGrid/Models/TrackingSettings.swift
index 6f6f502..f435caf 100644
--- a/Sources/SendGrid/Models/TrackingSettings.swift
+++ b/Sources/SendGrid/Models/TrackingSettings.swift
@@ -30,7 +30,7 @@ public struct TrackingSettings: Content {
         self.ganalytics = ganalytics
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case clickTracking = "click_tracking"
         case openTracking = "open_tracking"
         case subscriptionTracking = "subscription_tracking"
@@ -51,7 +51,7 @@ public struct ClickTracking: Content {
         self.enableText = enableText
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case enable
         case enableText = "enable_text"
     }
@@ -70,7 +70,7 @@ public struct OpenTracking: Content {
         self.substitutionTag = substitutionTag
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case enable
         case substitutionTag = "substitution_tag"
     }
@@ -97,7 +97,7 @@ public struct SubscriptionTracking: Content {
         self.html = html
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case enable
         case text
         case html
@@ -138,7 +138,7 @@ public struct GoogleAnalytics: Content {
         self.utmCampaign = utmCampaign
     }
     
-    public enum CodingKeys: CodingKey, String {
+    public enum CodingKeys: String, CodingKey {
         case enable
         case utmSource = "utm_source"
         case utmMedium = "utm_medium"