diff --git a/twilio/rest/authy/__init__.py b/twilio/rest/authy/__init__.py
index c17556da78..8273d61417 100644
--- a/twilio/rest/authy/__init__.py
+++ b/twilio/rest/authy/__init__.py
@@ -37,18 +37,18 @@ def v1(self):
         return self._v1
 
     @property
-    def services(self):
+    def forms(self):
         """
-        :rtype: twilio.rest.authy.v1.service.ServiceList
+        :rtype: twilio.rest.authy.v1.form.FormList
         """
-        return self.v1.services
+        return self.v1.forms
 
     @property
-    def forms(self):
+    def services(self):
         """
-        :rtype: twilio.rest.authy.v1.form.FormList
+        :rtype: twilio.rest.authy.v1.service.ServiceList
         """
-        return self.v1.forms
+        return self.v1.services
 
     def __repr__(self):
         """
diff --git a/twilio/rest/authy/v1/__init__.py b/twilio/rest/authy/v1/__init__.py
index 15e6003bc1..8a43e91001 100644
--- a/twilio/rest/authy/v1/__init__.py
+++ b/twilio/rest/authy/v1/__init__.py
@@ -22,17 +22,8 @@ def __init__(self, domain):
         """
         super(V1, self).__init__(domain)
         self.version = 'v1'
-        self._services = None
         self._forms = None
-
-    @property
-    def services(self):
-        """
-        :rtype: twilio.rest.authy.v1.service.ServiceList
-        """
-        if self._services is None:
-            self._services = ServiceList(self)
-        return self._services
+        self._services = None
 
     @property
     def forms(self):
@@ -43,6 +34,15 @@ def forms(self):
             self._forms = FormList(self)
         return self._forms
 
+    @property
+    def services(self):
+        """
+        :rtype: twilio.rest.authy.v1.service.ServiceList
+        """
+        if self._services is None:
+            self._services = ServiceList(self)
+        return self._services
+
     def __repr__(self):
         """
         Provide a friendly representation
diff --git a/twilio/rest/flex_api/__init__.py b/twilio/rest/flex_api/__init__.py
index 0470a71470..f25eb4e038 100644
--- a/twilio/rest/flex_api/__init__.py
+++ b/twilio/rest/flex_api/__init__.py
@@ -37,32 +37,32 @@ def v1(self):
         return self._v1
 
     @property
-    def flex_flow(self):
+    def channel(self):
         """
-        :rtype: twilio.rest.flex_api.v1.flex_flow.FlexFlowList
+        :rtype: twilio.rest.flex_api.v1.channel.ChannelList
         """
-        return self.v1.flex_flow
+        return self.v1.channel
 
     @property
-    def channel(self):
+    def configuration(self):
         """
-        :rtype: twilio.rest.flex_api.v1.channel.ChannelList
+        :rtype: twilio.rest.flex_api.v1.configuration.ConfigurationList
         """
-        return self.v1.channel
+        return self.v1.configuration
 
     @property
-    def web_channel(self):
+    def flex_flow(self):
         """
-        :rtype: twilio.rest.flex_api.v1.web_channel.WebChannelList
+        :rtype: twilio.rest.flex_api.v1.flex_flow.FlexFlowList
         """
-        return self.v1.web_channel
+        return self.v1.flex_flow
 
     @property
-    def configuration(self):
+    def web_channel(self):
         """
-        :rtype: twilio.rest.flex_api.v1.configuration.ConfigurationList
+        :rtype: twilio.rest.flex_api.v1.web_channel.WebChannelList
         """
-        return self.v1.configuration
+        return self.v1.web_channel
 
     def __repr__(self):
         """
diff --git a/twilio/rest/flex_api/v1/__init__.py b/twilio/rest/flex_api/v1/__init__.py
index 9fa64ca3f7..1bee2c560c 100644
--- a/twilio/rest/flex_api/v1/__init__.py
+++ b/twilio/rest/flex_api/v1/__init__.py
@@ -24,19 +24,10 @@ def __init__(self, domain):
         """
         super(V1, self).__init__(domain)
         self.version = 'v1'
-        self._flex_flow = None
         self._channel = None
-        self._web_channel = None
         self._configuration = None
-
-    @property
-    def flex_flow(self):
-        """
-        :rtype: twilio.rest.flex_api.v1.flex_flow.FlexFlowList
-        """
-        if self._flex_flow is None:
-            self._flex_flow = FlexFlowList(self)
-        return self._flex_flow
+        self._flex_flow = None
+        self._web_channel = None
 
     @property
     def channel(self):
@@ -47,15 +38,6 @@ def channel(self):
             self._channel = ChannelList(self)
         return self._channel
 
-    @property
-    def web_channel(self):
-        """
-        :rtype: twilio.rest.flex_api.v1.web_channel.WebChannelList
-        """
-        if self._web_channel is None:
-            self._web_channel = WebChannelList(self)
-        return self._web_channel
-
     @property
     def configuration(self):
         """
@@ -65,6 +47,24 @@ def configuration(self):
             self._configuration = ConfigurationList(self)
         return self._configuration
 
+    @property
+    def flex_flow(self):
+        """
+        :rtype: twilio.rest.flex_api.v1.flex_flow.FlexFlowList
+        """
+        if self._flex_flow is None:
+            self._flex_flow = FlexFlowList(self)
+        return self._flex_flow
+
+    @property
+    def web_channel(self):
+        """
+        :rtype: twilio.rest.flex_api.v1.web_channel.WebChannelList
+        """
+        if self._web_channel is None:
+            self._web_channel = WebChannelList(self)
+        return self._web_channel
+
     def __repr__(self):
         """
         Provide a friendly representation
diff --git a/twilio/rest/messaging/__init__.py b/twilio/rest/messaging/__init__.py
index 642325d1b5..82204f269c 100644
--- a/twilio/rest/messaging/__init__.py
+++ b/twilio/rest/messaging/__init__.py
@@ -37,18 +37,18 @@ def v1(self):
         return self._v1
 
     @property
-    def sessions(self):
+    def services(self):
         """
-        :rtype: twilio.rest.messaging.v1.session.SessionList
+        :rtype: twilio.rest.messaging.v1.service.ServiceList
         """
-        return self.v1.sessions
+        return self.v1.services
 
     @property
-    def services(self):
+    def sessions(self):
         """
-        :rtype: twilio.rest.messaging.v1.service.ServiceList
+        :rtype: twilio.rest.messaging.v1.session.SessionList
         """
-        return self.v1.services
+        return self.v1.sessions
 
     @property
     def webhooks(self):
diff --git a/twilio/rest/messaging/v1/__init__.py b/twilio/rest/messaging/v1/__init__.py
index 96d7d1471d..3f1e4ca386 100644
--- a/twilio/rest/messaging/v1/__init__.py
+++ b/twilio/rest/messaging/v1/__init__.py
@@ -23,19 +23,10 @@ def __init__(self, domain):
         """
         super(V1, self).__init__(domain)
         self.version = 'v1'
-        self._sessions = None
         self._services = None
+        self._sessions = None
         self._webhooks = None
 
-    @property
-    def sessions(self):
-        """
-        :rtype: twilio.rest.messaging.v1.session.SessionList
-        """
-        if self._sessions is None:
-            self._sessions = SessionList(self)
-        return self._sessions
-
     @property
     def services(self):
         """
@@ -45,6 +36,15 @@ def services(self):
             self._services = ServiceList(self)
         return self._services
 
+    @property
+    def sessions(self):
+        """
+        :rtype: twilio.rest.messaging.v1.session.SessionList
+        """
+        if self._sessions is None:
+            self._sessions = SessionList(self)
+        return self._sessions
+
     @property
     def webhooks(self):
         """
diff --git a/twilio/rest/preview/__init__.py b/twilio/rest/preview/__init__.py
index f56b433eb1..fd3e6a9f2c 100644
--- a/twilio/rest/preview/__init__.py
+++ b/twilio/rest/preview/__init__.py
@@ -168,18 +168,18 @@ def hosted_number_orders(self):
         return self.hosted_numbers.hosted_number_orders
 
     @property
-    def installed_add_ons(self):
+    def available_add_ons(self):
         """
-        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
+        :rtype: twilio.rest.preview.marketplace.available_add_on.AvailableAddOnList
         """
-        return self.marketplace.installed_add_ons
+        return self.marketplace.available_add_ons
 
     @property
-    def available_add_ons(self):
+    def installed_add_ons(self):
         """
-        :rtype: twilio.rest.preview.marketplace.available_add_on.AvailableAddOnList
+        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
         """
-        return self.marketplace.available_add_ons
+        return self.marketplace.installed_add_ons
 
     @property
     def services(self):
@@ -224,32 +224,32 @@ def branded_calls(self):
         return self.trusted_comms.branded_calls
 
     @property
-    def devices(self):
+    def cps(self):
         """
-        :rtype: twilio.rest.preview.trusted_comms.device.DeviceList
+        :rtype: twilio.rest.preview.trusted_comms.cps.CpsList
         """
-        return self.trusted_comms.devices
+        return self.trusted_comms.cps
 
     @property
-    def phone_calls(self):
+    def current_calls(self):
         """
-        :rtype: twilio.rest.preview.trusted_comms.phone_call.PhoneCallList
+        :rtype: twilio.rest.preview.trusted_comms.current_call.CurrentCallList
         """
-        return self.trusted_comms.phone_calls
+        return self.trusted_comms.current_calls
 
     @property
-    def current_calls(self):
+    def devices(self):
         """
-        :rtype: twilio.rest.preview.trusted_comms.current_call.CurrentCallList
+        :rtype: twilio.rest.preview.trusted_comms.device.DeviceList
         """
-        return self.trusted_comms.current_calls
+        return self.trusted_comms.devices
 
     @property
-    def cps(self):
+    def phone_calls(self):
         """
-        :rtype: twilio.rest.preview.trusted_comms.cps.CpsList
+        :rtype: twilio.rest.preview.trusted_comms.phone_call.PhoneCallList
         """
-        return self.trusted_comms.cps
+        return self.trusted_comms.phone_calls
 
     def __repr__(self):
         """
diff --git a/twilio/rest/preview/marketplace/__init__.py b/twilio/rest/preview/marketplace/__init__.py
index 878918c078..bcf31a09a1 100644
--- a/twilio/rest/preview/marketplace/__init__.py
+++ b/twilio/rest/preview/marketplace/__init__.py
@@ -22,17 +22,8 @@ def __init__(self, domain):
         """
         super(Marketplace, self).__init__(domain)
         self.version = 'marketplace'
-        self._installed_add_ons = None
         self._available_add_ons = None
-
-    @property
-    def installed_add_ons(self):
-        """
-        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
-        """
-        if self._installed_add_ons is None:
-            self._installed_add_ons = InstalledAddOnList(self)
-        return self._installed_add_ons
+        self._installed_add_ons = None
 
     @property
     def available_add_ons(self):
@@ -43,6 +34,15 @@ def available_add_ons(self):
             self._available_add_ons = AvailableAddOnList(self)
         return self._available_add_ons
 
+    @property
+    def installed_add_ons(self):
+        """
+        :rtype: twilio.rest.preview.marketplace.installed_add_on.InstalledAddOnList
+        """
+        if self._installed_add_ons is None:
+            self._installed_add_ons = InstalledAddOnList(self)
+        return self._installed_add_ons
+
     def __repr__(self):
         """
         Provide a friendly representation
diff --git a/twilio/rest/preview/trusted_comms/__init__.py b/twilio/rest/preview/trusted_comms/__init__.py
index 289c35f3c8..16cb71bc12 100644
--- a/twilio/rest/preview/trusted_comms/__init__.py
+++ b/twilio/rest/preview/trusted_comms/__init__.py
@@ -26,10 +26,10 @@ def __init__(self, domain):
         super(TrustedComms, self).__init__(domain)
         self.version = 'TrustedComms'
         self._branded_calls = None
+        self._cps = None
+        self._current_calls = None
         self._devices = None
         self._phone_calls = None
-        self._current_calls = None
-        self._cps = None
 
     @property
     def branded_calls(self):
@@ -40,6 +40,24 @@ def branded_calls(self):
             self._branded_calls = BrandedCallList(self)
         return self._branded_calls
 
+    @property
+    def cps(self):
+        """
+        :rtype: twilio.rest.preview.trusted_comms.cps.CpsList
+        """
+        if self._cps is None:
+            self._cps = CpsList(self)
+        return self._cps
+
+    @property
+    def current_calls(self):
+        """
+        :rtype: twilio.rest.preview.trusted_comms.current_call.CurrentCallList
+        """
+        if self._current_calls is None:
+            self._current_calls = CurrentCallList(self)
+        return self._current_calls
+
     @property
     def devices(self):
         """
@@ -58,24 +76,6 @@ def phone_calls(self):
             self._phone_calls = PhoneCallList(self)
         return self._phone_calls
 
-    @property
-    def current_calls(self):
-        """
-        :rtype: twilio.rest.preview.trusted_comms.current_call.CurrentCallList
-        """
-        if self._current_calls is None:
-            self._current_calls = CurrentCallList(self)
-        return self._current_calls
-
-    @property
-    def cps(self):
-        """
-        :rtype: twilio.rest.preview.trusted_comms.cps.CpsList
-        """
-        if self._cps is None:
-            self._cps = CpsList(self)
-        return self._cps
-
     def __repr__(self):
         """
         Provide a friendly representation
diff --git a/twilio/rest/video/__init__.py b/twilio/rest/video/__init__.py
index 0283a60684..f9f1c1bde5 100644
--- a/twilio/rest/video/__init__.py
+++ b/twilio/rest/video/__init__.py
@@ -36,6 +36,13 @@ def v1(self):
             self._v1 = V1(self)
         return self._v1
 
+    @property
+    def compositions(self):
+        """
+        :rtype: twilio.rest.video.v1.composition.CompositionList
+        """
+        return self.v1.compositions
+
     @property
     def composition_hooks(self):
         """
@@ -64,13 +71,6 @@ def recording_settings(self):
         """
         return self.v1.recording_settings
 
-    @property
-    def compositions(self):
-        """
-        :rtype: twilio.rest.video.v1.composition.CompositionList
-        """
-        return self.v1.compositions
-
     @property
     def rooms(self):
         """
diff --git a/twilio/rest/video/v1/__init__.py b/twilio/rest/video/v1/__init__.py
index 498a5e5dc8..d238ca7446 100644
--- a/twilio/rest/video/v1/__init__.py
+++ b/twilio/rest/video/v1/__init__.py
@@ -26,13 +26,22 @@ def __init__(self, domain):
         """
         super(V1, self).__init__(domain)
         self.version = 'v1'
+        self._compositions = None
         self._composition_hooks = None
         self._composition_settings = None
         self._recordings = None
         self._recording_settings = None
-        self._compositions = None
         self._rooms = None
 
+    @property
+    def compositions(self):
+        """
+        :rtype: twilio.rest.video.v1.composition.CompositionList
+        """
+        if self._compositions is None:
+            self._compositions = CompositionList(self)
+        return self._compositions
+
     @property
     def composition_hooks(self):
         """
@@ -69,15 +78,6 @@ def recording_settings(self):
             self._recording_settings = RecordingSettingsList(self)
         return self._recording_settings
 
-    @property
-    def compositions(self):
-        """
-        :rtype: twilio.rest.video.v1.composition.CompositionList
-        """
-        if self._compositions is None:
-            self._compositions = CompositionList(self)
-        return self._compositions
-
     @property
     def rooms(self):
         """
diff --git a/twilio/rest/wireless/__init__.py b/twilio/rest/wireless/__init__.py
index dfc6588853..df3e45da84 100644
--- a/twilio/rest/wireless/__init__.py
+++ b/twilio/rest/wireless/__init__.py
@@ -36,6 +36,13 @@ def v1(self):
             self._v1 = V1(self)
         return self._v1
 
+    @property
+    def usage_records(self):
+        """
+        :rtype: twilio.rest.wireless.v1.usage_record.UsageRecordList
+        """
+        return self.v1.usage_records
+
     @property
     def commands(self):
         """
@@ -50,13 +57,6 @@ def rate_plans(self):
         """
         return self.v1.rate_plans
 
-    @property
-    def usage_records(self):
-        """
-        :rtype: twilio.rest.wireless.v1.usage_record.UsageRecordList
-        """
-        return self.v1.usage_records
-
     @property
     def sims(self):
         """
diff --git a/twilio/rest/wireless/v1/__init__.py b/twilio/rest/wireless/v1/__init__.py
index f622f7c7d3..c0b2cbdcdf 100644
--- a/twilio/rest/wireless/v1/__init__.py
+++ b/twilio/rest/wireless/v1/__init__.py
@@ -24,11 +24,20 @@ def __init__(self, domain):
         """
         super(V1, self).__init__(domain)
         self.version = 'v1'
+        self._usage_records = None
         self._commands = None
         self._rate_plans = None
-        self._usage_records = None
         self._sims = None
 
+    @property
+    def usage_records(self):
+        """
+        :rtype: twilio.rest.wireless.v1.usage_record.UsageRecordList
+        """
+        if self._usage_records is None:
+            self._usage_records = UsageRecordList(self)
+        return self._usage_records
+
     @property
     def commands(self):
         """
@@ -47,15 +56,6 @@ def rate_plans(self):
             self._rate_plans = RatePlanList(self)
         return self._rate_plans
 
-    @property
-    def usage_records(self):
-        """
-        :rtype: twilio.rest.wireless.v1.usage_record.UsageRecordList
-        """
-        if self._usage_records is None:
-            self._usage_records = UsageRecordList(self)
-        return self._usage_records
-
     @property
     def sims(self):
         """