diff --git a/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs b/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
index 92f562834..461fa72a3 100644
--- a/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
+++ b/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
@@ -25,7 +25,7 @@ namespace Twilio.Rest.Accounts.V1.Credential
 {
 
     /// <summary> Create a new AWS Credential </summary>
-    public class CreateAwsOptions : IOptions<AwsResource>
+    public class CreateAwsOptions : IOptions<AwsCreateResource>
     {
         
         ///<summary> A string that contains the AWS access credentials in the format `<AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY>`. For example, `AKIAIOSFODNN7EXAMPLE:wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY` </summary> 
@@ -101,7 +101,7 @@ public List<KeyValuePair<string, string>> GetParams()
 
 
     /// <summary> Fetch the AWS credentials specified by the provided Credential Sid </summary>
-    public class FetchAwsOptions : IOptions<AwsResource>
+    public class FetchAwsOptions : IOptions<AwsFetchResource>
     {
     
         ///<summary> The Twilio-provided string that uniquely identifies the AWS resource to fetch. </summary> 
@@ -131,7 +131,7 @@ public List<KeyValuePair<string, string>> GetParams()
 
 
     /// <summary> Retrieves a collection of AWS Credentials belonging to the account used to make the request </summary>
-    public class ReadAwsOptions : ReadOptions<AwsResource>
+    public class ReadAwsOptions : ReadOptions<AwsReadResource>
     {
     
 
@@ -155,7 +155,7 @@ public List<KeyValuePair<string, string>> GetParams()
     }
 
     /// <summary> Modify the properties of a given Account </summary>
-    public class UpdateAwsOptions : IOptions<AwsResource>
+    public class UpdateAwsOptions : IOptions<AwsUpdateResource>
     {
     
         ///<summary> The Twilio-provided string that uniquely identifies the AWS resource to update. </summary> 
diff --git a/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs b/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
index 4af96ba0a..21b3952a8 100644
--- a/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
+++ b/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
@@ -24,16 +24,191 @@
 using Twilio.Http;
 
 
-
 namespace Twilio.Rest.Accounts.V1.Credential
 {
+            
+public class AwsCreateResource : Resource
+{
+        ///<summary> The unique string that we created to identify the AWS resource. </summary> 
+        [JsonProperty("sid")]
+            public string Sid { get; private set; }
+
+        ///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that created the AWS resource. </summary> 
+        [JsonProperty("account_sid")]
+            public string AccountSid { get; private set; }
+
+        ///<summary> The string that you assigned to describe the resource. </summary> 
+        [JsonProperty("friendly_name")]
+            public string FriendlyName { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was created specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_created")]
+            public DateTime? DateCreated { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was last updated specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_updated")]
+            public DateTime? DateUpdated { get; private set; }
+
+        ///<summary> The URI for this resource, relative to `https://accounts.twilio.com` </summary> 
+        [JsonProperty("url")]
+            public Uri Url { get; private set; }
+
+    public static AwsCreateResource FromJson(string json) {
+        try {
+            return JsonConvert.DeserializeObject<AwsCreateResource>(json);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+    public static string ToJson(object model) {
+        try {
+            return JsonConvert.SerializeObject(model);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+}
+        public class AwsFetchResource : Resource
+{
+        ///<summary> The unique string that we created to identify the AWS resource. </summary> 
+        [JsonProperty("sid")]
+            public string Sid { get; private set; }
+
+        ///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that created the AWS resource. </summary> 
+        [JsonProperty("account_sid")]
+            public string AccountSid { get; private set; }
+
+        ///<summary> The string that you assigned to describe the resource. </summary> 
+        [JsonProperty("friendly_name")]
+            public string FriendlyName { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was created specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_created")]
+            public DateTime? DateCreated { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was last updated specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_updated")]
+            public DateTime? DateUpdated { get; private set; }
+
+        ///<summary> The URI for this resource, relative to `https://accounts.twilio.com` </summary> 
+        [JsonProperty("url")]
+            public Uri Url { get; private set; }
+
+
+    public static AwsFetchResource FromJson(string json) {
+        try {
+            return JsonConvert.DeserializeObject<AwsFetchResource>(json);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+    public static string ToJson(object model) {
+        try {
+            return JsonConvert.SerializeObject(model);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+}
+        public class AwsReadResource : Resource
+{
+        ///<summary> The unique string that we created to identify the AWS resource. </summary> 
+        [JsonProperty("sid")]
+            public string Sid { get; private set; }
+
+        ///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that created the AWS resource. </summary> 
+        [JsonProperty("account_sid")]
+            public string AccountSid { get; private set; }
+
+        ///<summary> The string that you assigned to describe the resource. </summary> 
+        [JsonProperty("friendly_name")]
+            public string FriendlyName { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was created specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_created")]
+            public DateTime? DateCreated { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was last updated specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_updated")]
+            public DateTime? DateUpdated { get; private set; }
+
+        ///<summary> The URI for this resource, relative to `https://accounts.twilio.com` </summary> 
+        [JsonProperty("url")]
+            public Uri Url { get; private set; }
+
+    public static AwsReadResource FromJson(string json) {
+        try {
+            return JsonConvert.DeserializeObject<AwsReadResource>(json);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+    public static string ToJson(object model) {
+        try {
+            return JsonConvert.SerializeObject(model);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+}
+        public class AwsUpdateResource : Resource
+{
+        ///<summary> The unique string that we created to identify the AWS resource. </summary> 
+        [JsonProperty("sid")]
+            public string Sid { get; private set; }
+
+        ///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that created the AWS resource. </summary> 
+        [JsonProperty("account_sid")]
+            public string AccountSid { get; private set; }
+
+        ///<summary> The string that you assigned to describe the resource. </summary> 
+        [JsonProperty("friendly_name")]
+            public string FriendlyName { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was created specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_created")]
+            public DateTime? DateCreated { get; private set; }
+
+        ///<summary> The date and time in GMT when the resource was last updated specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
+        [JsonProperty("date_updated")]
+            public DateTime? DateUpdated { get; private set; }
+
+        ///<summary> The URI for this resource, relative to `https://accounts.twilio.com` </summary> 
+        [JsonProperty("url")]
+            public Uri Url { get; private set; }
+
+
+    public static AwsUpdateResource FromJson(string json) {
+        try {
+            return JsonConvert.DeserializeObject<AwsUpdateResource>(json);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+    public static string ToJson(object model) {
+        try {
+            return JsonConvert.SerializeObject(model);
+        }
+        catch (JsonException e) {
+            throw new ApiException(e.Message, e);
+        }
+    }
+}
+
     public class AwsResource : Resource
     {
     
 
     
 
-        
+            
         private static Request BuildCreateRequest(CreateAwsOptions options, ITwilioRestClient client)
         {
             
@@ -54,11 +229,11 @@ private static Request BuildCreateRequest(CreateAwsOptions options, ITwilioRestC
         /// <param name="options"> Create Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static AwsResource Create(CreateAwsOptions options, ITwilioRestClient client = null)
+        public static AwsCreateResource Create(CreateAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
+            return AwsCreateResource.FromJson(response.Content);
         }
 
         #if !NET35
@@ -66,11 +241,11 @@ public static AwsResource Create(CreateAwsOptions options, ITwilioRestClient cli
         /// <param name="options"> Create Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(CreateAwsOptions options, ITwilioRestClient client = null)
+        public static async System.Threading.Tasks.Task<AwsCreateResource> CreateAsync(CreateAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
+            return AwsCreateResource.FromJson(response.Content);
         }
         #endif
 
@@ -80,7 +255,7 @@ public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(CreateA
         /// <param name="accountSid"> The SID of the Subaccount that this Credential should be associated with. Must be a valid Subaccount of the account issuing the request. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static AwsResource Create(
+        public static AwsCreateResource Create(
                                           string credentials,
                                           string friendlyName = null,
                                           string accountSid = null,
@@ -97,7 +272,7 @@ public static AwsResource Create(
         /// <param name="accountSid"> The SID of the Subaccount that this Credential should be associated with. Must be a valid Subaccount of the account issuing the request. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(
+        public static async System.Threading.Tasks.Task<AwsCreateResource> CreateAsync(
                                                                                   string credentials,
                                                                                   string friendlyName = null,
                                                                                   string accountSid = null,
@@ -108,7 +283,7 @@ public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(
         }
         #endif
 
-        
+            
         /// <summary> Delete a Credential from your account </summary>
         /// <param name="options"> Delete Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
@@ -176,7 +351,7 @@ public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid
             return await DeleteAsync(options, client);
         }
         #endif
-        
+            
         private static Request BuildFetchRequest(FetchAwsOptions options, ITwilioRestClient client)
         {
             
@@ -198,11 +373,11 @@ private static Request BuildFetchRequest(FetchAwsOptions options, ITwilioRestCli
         /// <param name="options"> Fetch Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static AwsResource Fetch(FetchAwsOptions options, ITwilioRestClient client = null)
+        public static AwsFetchResource Fetch(FetchAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
+            return AwsFetchResource.FromJson(response.Content);
         }
 
         #if !NET35
@@ -210,18 +385,18 @@ public static AwsResource Fetch(FetchAwsOptions options, ITwilioRestClient clien
         /// <param name="options"> Fetch Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(FetchAwsOptions options, ITwilioRestClient client = null)
+        public static async System.Threading.Tasks.Task<AwsFetchResource> FetchAsync(FetchAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
+            return AwsFetchResource.FromJson(response.Content);
         }
         #endif
         /// <summary> Fetch the AWS credentials specified by the provided Credential Sid </summary>
         /// <param name="pathSid"> The Twilio-provided string that uniquely identifies the AWS resource to fetch. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static AwsResource Fetch(
+        public static AwsFetchResource Fetch(
                                          string pathSid, 
                                         ITwilioRestClient client = null)
         {
@@ -234,13 +409,13 @@ public static AwsResource Fetch(
         /// <param name="pathSid"> The Twilio-provided string that uniquely identifies the AWS resource to fetch. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(string pathSid, ITwilioRestClient client = null)
+        public static async System.Threading.Tasks.Task<AwsFetchResource> FetchAsync(string pathSid, ITwilioRestClient client = null)
         {
             var options = new FetchAwsOptions(pathSid){  };
             return await FetchAsync(options, client);
         }
         #endif
-        
+            
         private static Request BuildReadRequest(ReadAwsOptions options, ITwilioRestClient client)
         {
             
@@ -259,12 +434,12 @@ private static Request BuildReadRequest(ReadAwsOptions options, ITwilioRestClien
         /// <param name="options"> Read Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static ResourceSet<AwsResource> Read(ReadAwsOptions options, ITwilioRestClient client = null)
+        public static ResourceSet<AwsReadResource> Read(ReadAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = client.Request(BuildReadRequest(options, client));
-            var page = Page<AwsResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<AwsResource>(page, options, client);
+            var page = Page<AwsReadResource>.FromJson("credentials", response.Content);
+            return new ResourceSet<AwsReadResource>(page, options, client);
         }
 
         #if !NET35
@@ -272,13 +447,13 @@ public static ResourceSet<AwsResource> Read(ReadAwsOptions options, ITwilioRestC
         /// <param name="options"> Read Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(ReadAwsOptions options, ITwilioRestClient client = null)
+        public static async System.Threading.Tasks.Task<ResourceSet<AwsReadResource>> ReadAsync(ReadAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildReadRequest(options, client));
 
-            var page = Page<AwsResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<AwsResource>(page, options, client);
+            var page = Page<AwsReadResource>.FromJson("credentials", response.Content);
+            return new ResourceSet<AwsReadResource>(page, options, client);
         }
         #endif
         /// <summary> Retrieves a collection of AWS Credentials belonging to the account used to make the request </summary>
@@ -286,7 +461,7 @@ public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAs
         /// <param name="limit"> Record limit </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static ResourceSet<AwsResource> Read(
+        public static ResourceSet<AwsReadResource> Read(
                                                      long? pageSize = null,
                                                      long? limit = null,
                                                     ITwilioRestClient client = null)
@@ -301,7 +476,7 @@ public static ResourceSet<AwsResource> Read(
         /// <param name="limit"> Record limit </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(
+        public static async System.Threading.Tasks.Task<ResourceSet<AwsReadResource>> ReadAsync(
                                                                                              long? pageSize = null,
                                                                                              long? limit = null,
                                                                                             ITwilioRestClient client = null)
@@ -359,7 +534,7 @@ public static Page<AwsResource> PreviousPage(Page<AwsResource> page, ITwilioRest
             return Page<AwsResource>.FromJson("credentials", response.Content);
         }
 
-        
+            
         private static Request BuildUpdateRequest(UpdateAwsOptions options, ITwilioRestClient client)
         {
             
@@ -382,11 +557,11 @@ private static Request BuildUpdateRequest(UpdateAwsOptions options, ITwilioRestC
         /// <param name="options"> Update Aws parameters </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static AwsResource Update(UpdateAwsOptions options, ITwilioRestClient client = null)
+        public static AwsUpdateResource Update(UpdateAwsOptions options, ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
+            return AwsUpdateResource.FromJson(response.Content);
         }
 
         /// <summary> Modify the properties of a given Account </summary>
@@ -394,12 +569,12 @@ public static AwsResource Update(UpdateAwsOptions options, ITwilioRestClient cli
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
         #if !NET35
-        public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(UpdateAwsOptions options,
+        public static async System.Threading.Tasks.Task<AwsUpdateResource> UpdateAsync(UpdateAwsOptions options,
                                                                                                     ITwilioRestClient client = null)
         {
             client = client ?? TwilioClient.GetRestClient();
             var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
+            return AwsUpdateResource.FromJson(response.Content);
         }
         #endif
 
@@ -408,7 +583,7 @@ public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(UpdateA
         /// <param name="friendlyName"> A descriptive string that you create to describe the resource. It can be up to 64 characters long. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> A single instance of Aws </returns>
-        public static AwsResource Update(
+        public static AwsUpdateResource Update(
                                           string pathSid,
                                           string friendlyName = null,
                                             ITwilioRestClient client = null)
@@ -423,7 +598,7 @@ public static AwsResource Update(
         /// <param name="friendlyName"> A descriptive string that you create to describe the resource. It can be up to 64 characters long. </param>
         /// <param name="client"> Client to make requests to Twilio </param>
         /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(
+        public static async System.Threading.Tasks.Task<AwsUpdateResource> UpdateAsync(
                                                                               string pathSid,
                                                                               string friendlyName = null,
                                                                                 ITwilioRestClient client = null)
@@ -433,70 +608,5 @@ public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(
         }
         #endif
 
-    
-        /// <summary>
-        /// Converts a JSON string into a AwsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AwsResource object represented by the provided JSON </returns>
-        public static AwsResource FromJson(string json)
-        {
-            try
-            {
-                return JsonConvert.DeserializeObject<AwsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-        /// <summary>
-    /// Converts an object into a json string
-    /// </summary>
-    /// <param name="model"> C# model </param>
-    /// <returns> JSON string </returns>
-    public static string ToJson(object model)
-    {
-        try
-        {
-            return JsonConvert.SerializeObject(model);
-        }
-        catch (JsonException e)
-        {
-            throw new ApiException(e.Message, e);
-        }
-    }
-
-    
-        ///<summary> The unique string that we created to identify the AWS resource. </summary> 
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-
-        ///<summary> The SID of the [Account](https://www.twilio.com/docs/iam/api/account) that created the AWS resource. </summary> 
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-
-        ///<summary> The string that you assigned to describe the resource. </summary> 
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-
-        ///<summary> The date and time in GMT when the resource was created specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-
-        ///<summary> The date and time in GMT when the resource was last updated specified in [RFC 2822](https://www.ietf.org/rfc/rfc2822.txt) format. </summary> 
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        ///<summary> The URI for this resource, relative to `https://accounts.twilio.com` </summary> 
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-
-
-        private AwsResource() {
-
-        }
     }
 }
-