diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.2.0.2`
+`1.3.0`
 
 
 ## Description
diff --git a/amazonka-ds.cabal b/amazonka-ds.cabal
--- a/amazonka-ds.cabal
+++ b/amazonka-ds.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-ds
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Directory Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -70,7 +70,7 @@
         , Network.AWS.DirectoryService.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-ds-test
@@ -90,9 +90,9 @@
         , Test.AWS.DirectoryService.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-ds == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-ds == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/DirectoryService.hs b/gen/Network/AWS/DirectoryService.hs
--- a/gen/Network/AWS/DirectoryService.hs
+++ b/gen/Network/AWS/DirectoryService.hs
@@ -26,12 +26,12 @@
     -- * Errors
     -- $errors
 
-    -- ** AuthenticationFailedException
-    , _AuthenticationFailedException
-
     -- ** DirectoryUnavailableException
     , _DirectoryUnavailableException
 
+    -- ** AuthenticationFailedException
+    , _AuthenticationFailedException
+
     -- ** InvalidParameterException
     , _InvalidParameterException
 
@@ -74,12 +74,12 @@
     -- ** ConnectDirectory
     , module Network.AWS.DirectoryService.ConnectDirectory
 
-    -- ** DescribeDirectories
-    , module Network.AWS.DirectoryService.DescribeDirectories
-
     -- ** CreateAlias
     , module Network.AWS.DirectoryService.CreateAlias
 
+    -- ** DescribeDirectories
+    , module Network.AWS.DirectoryService.DescribeDirectories
+
     -- ** CreateDirectory
     , module Network.AWS.DirectoryService.CreateDirectory
 
@@ -92,27 +92,27 @@
     -- ** DisableRadius
     , module Network.AWS.DirectoryService.DisableRadius
 
-    -- ** DescribeSnapshots
-    , module Network.AWS.DirectoryService.DescribeSnapshots
-
     -- ** RestoreFromSnapshot
     , module Network.AWS.DirectoryService.RestoreFromSnapshot
 
+    -- ** DescribeSnapshots
+    , module Network.AWS.DirectoryService.DescribeSnapshots
+
     -- ** DeleteSnapshot
     , module Network.AWS.DirectoryService.DeleteSnapshot
 
-    -- ** CreateSnapshot
-    , module Network.AWS.DirectoryService.CreateSnapshot
-
     -- ** DeleteDirectory
     , module Network.AWS.DirectoryService.DeleteDirectory
 
-    -- ** DisableSSO
-    , module Network.AWS.DirectoryService.DisableSSO
+    -- ** CreateSnapshot
+    , module Network.AWS.DirectoryService.CreateSnapshot
 
     -- ** CreateComputer
     , module Network.AWS.DirectoryService.CreateComputer
 
+    -- ** DisableSSO
+    , module Network.AWS.DirectoryService.DisableSSO
+
     -- ** GetDirectoryLimits
     , module Network.AWS.DirectoryService.GetDirectoryLimits
 
@@ -169,16 +169,16 @@
     , dcsdCustomerUserName
     , dcsdSubnetIds
     , dcsdVPCId
-    , dcsdConnectIPs
     , dcsdSecurityGroupId
+    , dcsdConnectIPs
     , dcsdAvailabilityZones
 
     -- ** DirectoryDescription
     , DirectoryDescription
     , directoryDescription
     , ddRadiusStatus
-    , ddDirectoryId
     , ddStage
+    , ddDirectoryId
     , ddAccessURL
     , ddShortName
     , ddSize
@@ -186,12 +186,12 @@
     , ddLaunchTime
     , ddAlias
     , ddName
-    , ddSSOEnabled
     , ddStageLastUpdatedDateTime
-    , ddStageReason
+    , ddSSOEnabled
     , ddDNSIPAddrs
     , ddVPCSettings
     , ddType
+    , ddStageReason
     , ddConnectSettings
     , ddDescription
 
@@ -223,9 +223,9 @@
     , RadiusSettings
     , radiusSettings
     , rsDisplayLabel
-    , rsRadiusServers
     , rsRadiusRetries
     , rsAuthenticationProtocol
+    , rsRadiusServers
     , rsUseSameUsername
     , rsSharedSecret
     , rsRadiusTimeout
@@ -234,8 +234,8 @@
     -- ** Snapshot
     , Snapshot
     , snapshot
-    , sDirectoryId
     , sStatus
+    , sDirectoryId
     , sStartTime
     , sName
     , sType
diff --git a/gen/Network/AWS/DirectoryService/ConnectDirectory.hs b/gen/Network/AWS/DirectoryService/ConnectDirectory.hs
--- a/gen/Network/AWS/DirectoryService/ConnectDirectory.hs
+++ b/gen/Network/AWS/DirectoryService/ConnectDirectory.hs
@@ -39,7 +39,7 @@
     , ConnectDirectoryResponse
     -- * Response Lenses
     , cdrsDirectoryId
-    , cdrsStatus
+    , cdrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -157,8 +157,8 @@
 --
 -- /See:/ 'connectDirectoryResponse' smart constructor.
 data ConnectDirectoryResponse = ConnectDirectoryResponse'
-    { _cdrsDirectoryId :: !(Maybe Text)
-    , _cdrsStatus      :: !Int
+    { _cdrsDirectoryId    :: !(Maybe Text)
+    , _cdrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'ConnectDirectoryResponse' with the minimum fields required to make a request.
@@ -167,14 +167,14 @@
 --
 -- * 'cdrsDirectoryId'
 --
--- * 'cdrsStatus'
+-- * 'cdrsResponseStatus'
 connectDirectoryResponse
-    :: Int -- ^ 'cdrsStatus'
+    :: Int -- ^ 'cdrsResponseStatus'
     -> ConnectDirectoryResponse
-connectDirectoryResponse pStatus_ =
+connectDirectoryResponse pResponseStatus_ =
     ConnectDirectoryResponse'
     { _cdrsDirectoryId = Nothing
-    , _cdrsStatus = pStatus_
+    , _cdrsResponseStatus = pResponseStatus_
     }
 
 -- | The identifier of the new directory.
@@ -182,5 +182,5 @@
 cdrsDirectoryId = lens _cdrsDirectoryId (\ s a -> s{_cdrsDirectoryId = a});
 
 -- | The response status code.
-cdrsStatus :: Lens' ConnectDirectoryResponse Int
-cdrsStatus = lens _cdrsStatus (\ s a -> s{_cdrsStatus = a});
+cdrsResponseStatus :: Lens' ConnectDirectoryResponse Int
+cdrsResponseStatus = lens _cdrsResponseStatus (\ s a -> s{_cdrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/CreateAlias.hs b/gen/Network/AWS/DirectoryService/CreateAlias.hs
--- a/gen/Network/AWS/DirectoryService/CreateAlias.hs
+++ b/gen/Network/AWS/DirectoryService/CreateAlias.hs
@@ -41,7 +41,7 @@
     -- * Response Lenses
     , carsDirectoryId
     , carsAlias
-    , carsStatus
+    , carsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -123,9 +123,9 @@
 --
 -- /See:/ 'createAliasResponse' smart constructor.
 data CreateAliasResponse = CreateAliasResponse'
-    { _carsDirectoryId :: !(Maybe Text)
-    , _carsAlias       :: !(Maybe Text)
-    , _carsStatus      :: !Int
+    { _carsDirectoryId    :: !(Maybe Text)
+    , _carsAlias          :: !(Maybe Text)
+    , _carsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateAliasResponse' with the minimum fields required to make a request.
@@ -136,15 +136,15 @@
 --
 -- * 'carsAlias'
 --
--- * 'carsStatus'
+-- * 'carsResponseStatus'
 createAliasResponse
-    :: Int -- ^ 'carsStatus'
+    :: Int -- ^ 'carsResponseStatus'
     -> CreateAliasResponse
-createAliasResponse pStatus_ =
+createAliasResponse pResponseStatus_ =
     CreateAliasResponse'
     { _carsDirectoryId = Nothing
     , _carsAlias = Nothing
-    , _carsStatus = pStatus_
+    , _carsResponseStatus = pResponseStatus_
     }
 
 -- | The identifier of the directory.
@@ -156,5 +156,5 @@
 carsAlias = lens _carsAlias (\ s a -> s{_carsAlias = a});
 
 -- | The response status code.
-carsStatus :: Lens' CreateAliasResponse Int
-carsStatus = lens _carsStatus (\ s a -> s{_carsStatus = a});
+carsResponseStatus :: Lens' CreateAliasResponse Int
+carsResponseStatus = lens _carsResponseStatus (\ s a -> s{_carsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/CreateComputer.hs b/gen/Network/AWS/DirectoryService/CreateComputer.hs
--- a/gen/Network/AWS/DirectoryService/CreateComputer.hs
+++ b/gen/Network/AWS/DirectoryService/CreateComputer.hs
@@ -39,7 +39,7 @@
     , CreateComputerResponse
     -- * Response Lenses
     , ccrsComputer
-    , ccrsStatus
+    , ccrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -149,8 +149,8 @@
 --
 -- /See:/ 'createComputerResponse' smart constructor.
 data CreateComputerResponse = CreateComputerResponse'
-    { _ccrsComputer :: !(Maybe Computer)
-    , _ccrsStatus   :: !Int
+    { _ccrsComputer       :: !(Maybe Computer)
+    , _ccrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateComputerResponse' with the minimum fields required to make a request.
@@ -159,14 +159,14 @@
 --
 -- * 'ccrsComputer'
 --
--- * 'ccrsStatus'
+-- * 'ccrsResponseStatus'
 createComputerResponse
-    :: Int -- ^ 'ccrsStatus'
+    :: Int -- ^ 'ccrsResponseStatus'
     -> CreateComputerResponse
-createComputerResponse pStatus_ =
+createComputerResponse pResponseStatus_ =
     CreateComputerResponse'
     { _ccrsComputer = Nothing
-    , _ccrsStatus = pStatus_
+    , _ccrsResponseStatus = pResponseStatus_
     }
 
 -- | A Computer object the represents the computer account.
@@ -174,5 +174,5 @@
 ccrsComputer = lens _ccrsComputer (\ s a -> s{_ccrsComputer = a});
 
 -- | The response status code.
-ccrsStatus :: Lens' CreateComputerResponse Int
-ccrsStatus = lens _ccrsStatus (\ s a -> s{_ccrsStatus = a});
+ccrsResponseStatus :: Lens' CreateComputerResponse Int
+ccrsResponseStatus = lens _ccrsResponseStatus (\ s a -> s{_ccrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/CreateDirectory.hs b/gen/Network/AWS/DirectoryService/CreateDirectory.hs
--- a/gen/Network/AWS/DirectoryService/CreateDirectory.hs
+++ b/gen/Network/AWS/DirectoryService/CreateDirectory.hs
@@ -39,7 +39,7 @@
     , CreateDirectoryResponse
     -- * Response Lenses
     , crsDirectoryId
-    , crsStatus
+    , crsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -157,8 +157,8 @@
 --
 -- /See:/ 'createDirectoryResponse' smart constructor.
 data CreateDirectoryResponse = CreateDirectoryResponse'
-    { _crsDirectoryId :: !(Maybe Text)
-    , _crsStatus      :: !Int
+    { _crsDirectoryId    :: !(Maybe Text)
+    , _crsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateDirectoryResponse' with the minimum fields required to make a request.
@@ -167,14 +167,14 @@
 --
 -- * 'crsDirectoryId'
 --
--- * 'crsStatus'
+-- * 'crsResponseStatus'
 createDirectoryResponse
-    :: Int -- ^ 'crsStatus'
+    :: Int -- ^ 'crsResponseStatus'
     -> CreateDirectoryResponse
-createDirectoryResponse pStatus_ =
+createDirectoryResponse pResponseStatus_ =
     CreateDirectoryResponse'
     { _crsDirectoryId = Nothing
-    , _crsStatus = pStatus_
+    , _crsResponseStatus = pResponseStatus_
     }
 
 -- | The identifier of the directory that was created.
@@ -182,5 +182,5 @@
 crsDirectoryId = lens _crsDirectoryId (\ s a -> s{_crsDirectoryId = a});
 
 -- | The response status code.
-crsStatus :: Lens' CreateDirectoryResponse Int
-crsStatus = lens _crsStatus (\ s a -> s{_crsStatus = a});
+crsResponseStatus :: Lens' CreateDirectoryResponse Int
+crsResponseStatus = lens _crsResponseStatus (\ s a -> s{_crsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/CreateSnapshot.hs b/gen/Network/AWS/DirectoryService/CreateSnapshot.hs
--- a/gen/Network/AWS/DirectoryService/CreateSnapshot.hs
+++ b/gen/Network/AWS/DirectoryService/CreateSnapshot.hs
@@ -37,7 +37,7 @@
     , CreateSnapshotResponse
     -- * Response Lenses
     , csrsSnapshotId
-    , csrsStatus
+    , csrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -114,8 +114,8 @@
 --
 -- /See:/ 'createSnapshotResponse' smart constructor.
 data CreateSnapshotResponse = CreateSnapshotResponse'
-    { _csrsSnapshotId :: !(Maybe Text)
-    , _csrsStatus     :: !Int
+    { _csrsSnapshotId     :: !(Maybe Text)
+    , _csrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'CreateSnapshotResponse' with the minimum fields required to make a request.
@@ -124,14 +124,14 @@
 --
 -- * 'csrsSnapshotId'
 --
--- * 'csrsStatus'
+-- * 'csrsResponseStatus'
 createSnapshotResponse
-    :: Int -- ^ 'csrsStatus'
+    :: Int -- ^ 'csrsResponseStatus'
     -> CreateSnapshotResponse
-createSnapshotResponse pStatus_ =
+createSnapshotResponse pResponseStatus_ =
     CreateSnapshotResponse'
     { _csrsSnapshotId = Nothing
-    , _csrsStatus = pStatus_
+    , _csrsResponseStatus = pResponseStatus_
     }
 
 -- | The identifier of the snapshot that was created.
@@ -139,5 +139,5 @@
 csrsSnapshotId = lens _csrsSnapshotId (\ s a -> s{_csrsSnapshotId = a});
 
 -- | The response status code.
-csrsStatus :: Lens' CreateSnapshotResponse Int
-csrsStatus = lens _csrsStatus (\ s a -> s{_csrsStatus = a});
+csrsResponseStatus :: Lens' CreateSnapshotResponse Int
+csrsResponseStatus = lens _csrsResponseStatus (\ s a -> s{_csrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/DeleteDirectory.hs b/gen/Network/AWS/DirectoryService/DeleteDirectory.hs
--- a/gen/Network/AWS/DirectoryService/DeleteDirectory.hs
+++ b/gen/Network/AWS/DirectoryService/DeleteDirectory.hs
@@ -34,7 +34,7 @@
     , DeleteDirectoryResponse
     -- * Response Lenses
     , drsDirectoryId
-    , drsStatus
+    , drsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -101,8 +101,8 @@
 --
 -- /See:/ 'deleteDirectoryResponse' smart constructor.
 data DeleteDirectoryResponse = DeleteDirectoryResponse'
-    { _drsDirectoryId :: !(Maybe Text)
-    , _drsStatus      :: !Int
+    { _drsDirectoryId    :: !(Maybe Text)
+    , _drsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteDirectoryResponse' with the minimum fields required to make a request.
@@ -111,14 +111,14 @@
 --
 -- * 'drsDirectoryId'
 --
--- * 'drsStatus'
+-- * 'drsResponseStatus'
 deleteDirectoryResponse
-    :: Int -- ^ 'drsStatus'
+    :: Int -- ^ 'drsResponseStatus'
     -> DeleteDirectoryResponse
-deleteDirectoryResponse pStatus_ =
+deleteDirectoryResponse pResponseStatus_ =
     DeleteDirectoryResponse'
     { _drsDirectoryId = Nothing
-    , _drsStatus = pStatus_
+    , _drsResponseStatus = pResponseStatus_
     }
 
 -- | The directory identifier.
@@ -126,5 +126,5 @@
 drsDirectoryId = lens _drsDirectoryId (\ s a -> s{_drsDirectoryId = a});
 
 -- | The response status code.
-drsStatus :: Lens' DeleteDirectoryResponse Int
-drsStatus = lens _drsStatus (\ s a -> s{_drsStatus = a});
+drsResponseStatus :: Lens' DeleteDirectoryResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/DeleteSnapshot.hs b/gen/Network/AWS/DirectoryService/DeleteSnapshot.hs
--- a/gen/Network/AWS/DirectoryService/DeleteSnapshot.hs
+++ b/gen/Network/AWS/DirectoryService/DeleteSnapshot.hs
@@ -34,7 +34,7 @@
     , DeleteSnapshotResponse
     -- * Response Lenses
     , dsrsSnapshotId
-    , dsrsStatus
+    , dsrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -101,8 +101,8 @@
 --
 -- /See:/ 'deleteSnapshotResponse' smart constructor.
 data DeleteSnapshotResponse = DeleteSnapshotResponse'
-    { _dsrsSnapshotId :: !(Maybe Text)
-    , _dsrsStatus     :: !Int
+    { _dsrsSnapshotId     :: !(Maybe Text)
+    , _dsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DeleteSnapshotResponse' with the minimum fields required to make a request.
@@ -111,14 +111,14 @@
 --
 -- * 'dsrsSnapshotId'
 --
--- * 'dsrsStatus'
+-- * 'dsrsResponseStatus'
 deleteSnapshotResponse
-    :: Int -- ^ 'dsrsStatus'
+    :: Int -- ^ 'dsrsResponseStatus'
     -> DeleteSnapshotResponse
-deleteSnapshotResponse pStatus_ =
+deleteSnapshotResponse pResponseStatus_ =
     DeleteSnapshotResponse'
     { _dsrsSnapshotId = Nothing
-    , _dsrsStatus = pStatus_
+    , _dsrsResponseStatus = pResponseStatus_
     }
 
 -- | The identifier of the directory snapshot that was deleted.
@@ -126,5 +126,5 @@
 dsrsSnapshotId = lens _dsrsSnapshotId (\ s a -> s{_dsrsSnapshotId = a});
 
 -- | The response status code.
-dsrsStatus :: Lens' DeleteSnapshotResponse Int
-dsrsStatus = lens _dsrsStatus (\ s a -> s{_dsrsStatus = a});
+dsrsResponseStatus :: Lens' DeleteSnapshotResponse Int
+dsrsResponseStatus = lens _dsrsResponseStatus (\ s a -> s{_dsrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/DescribeDirectories.hs b/gen/Network/AWS/DirectoryService/DescribeDirectories.hs
--- a/gen/Network/AWS/DirectoryService/DescribeDirectories.hs
+++ b/gen/Network/AWS/DirectoryService/DescribeDirectories.hs
@@ -50,7 +50,7 @@
     -- * Response Lenses
     , ddrsDirectoryDescriptions
     , ddrsNextToken
-    , ddrsStatus
+    , ddrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -147,7 +147,7 @@
 data DescribeDirectoriesResponse = DescribeDirectoriesResponse'
     { _ddrsDirectoryDescriptions :: !(Maybe [DirectoryDescription])
     , _ddrsNextToken             :: !(Maybe Text)
-    , _ddrsStatus                :: !Int
+    , _ddrsResponseStatus        :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeDirectoriesResponse' with the minimum fields required to make a request.
@@ -158,15 +158,15 @@
 --
 -- * 'ddrsNextToken'
 --
--- * 'ddrsStatus'
+-- * 'ddrsResponseStatus'
 describeDirectoriesResponse
-    :: Int -- ^ 'ddrsStatus'
+    :: Int -- ^ 'ddrsResponseStatus'
     -> DescribeDirectoriesResponse
-describeDirectoriesResponse pStatus_ =
+describeDirectoriesResponse pResponseStatus_ =
     DescribeDirectoriesResponse'
     { _ddrsDirectoryDescriptions = Nothing
     , _ddrsNextToken = Nothing
-    , _ddrsStatus = pStatus_
+    , _ddrsResponseStatus = pResponseStatus_
     }
 
 -- | The list of DirectoryDescription objects that were retrieved.
@@ -185,5 +185,5 @@
 ddrsNextToken = lens _ddrsNextToken (\ s a -> s{_ddrsNextToken = a});
 
 -- | The response status code.
-ddrsStatus :: Lens' DescribeDirectoriesResponse Int
-ddrsStatus = lens _ddrsStatus (\ s a -> s{_ddrsStatus = a});
+ddrsResponseStatus :: Lens' DescribeDirectoriesResponse Int
+ddrsResponseStatus = lens _ddrsResponseStatus (\ s a -> s{_ddrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/DescribeSnapshots.hs b/gen/Network/AWS/DirectoryService/DescribeSnapshots.hs
--- a/gen/Network/AWS/DirectoryService/DescribeSnapshots.hs
+++ b/gen/Network/AWS/DirectoryService/DescribeSnapshots.hs
@@ -47,7 +47,7 @@
     -- * Response Lenses
     , dssrsNextToken
     , dssrsSnapshots
-    , dssrsStatus
+    , dssrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -146,9 +146,9 @@
 --
 -- /See:/ 'describeSnapshotsResponse' smart constructor.
 data DescribeSnapshotsResponse = DescribeSnapshotsResponse'
-    { _dssrsNextToken :: !(Maybe Text)
-    , _dssrsSnapshots :: !(Maybe [Snapshot])
-    , _dssrsStatus    :: !Int
+    { _dssrsNextToken      :: !(Maybe Text)
+    , _dssrsSnapshots      :: !(Maybe [Snapshot])
+    , _dssrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeSnapshotsResponse' with the minimum fields required to make a request.
@@ -159,15 +159,15 @@
 --
 -- * 'dssrsSnapshots'
 --
--- * 'dssrsStatus'
+-- * 'dssrsResponseStatus'
 describeSnapshotsResponse
-    :: Int -- ^ 'dssrsStatus'
+    :: Int -- ^ 'dssrsResponseStatus'
     -> DescribeSnapshotsResponse
-describeSnapshotsResponse pStatus_ =
+describeSnapshotsResponse pResponseStatus_ =
     DescribeSnapshotsResponse'
     { _dssrsNextToken = Nothing
     , _dssrsSnapshots = Nothing
-    , _dssrsStatus = pStatus_
+    , _dssrsResponseStatus = pResponseStatus_
     }
 
 -- | If not null, more results are available. Pass this value in the
@@ -185,5 +185,5 @@
 dssrsSnapshots = lens _dssrsSnapshots (\ s a -> s{_dssrsSnapshots = a}) . _Default . _Coerce;
 
 -- | The response status code.
-dssrsStatus :: Lens' DescribeSnapshotsResponse Int
-dssrsStatus = lens _dssrsStatus (\ s a -> s{_dssrsStatus = a});
+dssrsResponseStatus :: Lens' DescribeSnapshotsResponse Int
+dssrsResponseStatus = lens _dssrsResponseStatus (\ s a -> s{_dssrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/DisableRadius.hs b/gen/Network/AWS/DirectoryService/DisableRadius.hs
--- a/gen/Network/AWS/DirectoryService/DisableRadius.hs
+++ b/gen/Network/AWS/DirectoryService/DisableRadius.hs
@@ -34,7 +34,7 @@
     , disableRadiusResponse
     , DisableRadiusResponse
     -- * Response Lenses
-    , drrsStatus
+    , drrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -100,22 +100,22 @@
 --
 -- /See:/ 'disableRadiusResponse' smart constructor.
 newtype DisableRadiusResponse = DisableRadiusResponse'
-    { _drrsStatus :: Int
+    { _drrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DisableRadiusResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'drrsStatus'
+-- * 'drrsResponseStatus'
 disableRadiusResponse
-    :: Int -- ^ 'drrsStatus'
+    :: Int -- ^ 'drrsResponseStatus'
     -> DisableRadiusResponse
-disableRadiusResponse pStatus_ =
+disableRadiusResponse pResponseStatus_ =
     DisableRadiusResponse'
-    { _drrsStatus = pStatus_
+    { _drrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-drrsStatus :: Lens' DisableRadiusResponse Int
-drrsStatus = lens _drrsStatus (\ s a -> s{_drrsStatus = a});
+drrsResponseStatus :: Lens' DisableRadiusResponse Int
+drrsResponseStatus = lens _drrsResponseStatus (\ s a -> s{_drrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/DisableSSO.hs b/gen/Network/AWS/DirectoryService/DisableSSO.hs
--- a/gen/Network/AWS/DirectoryService/DisableSSO.hs
+++ b/gen/Network/AWS/DirectoryService/DisableSSO.hs
@@ -35,7 +35,7 @@
     , disableSSOResponse
     , DisableSSOResponse
     -- * Response Lenses
-    , dssorsStatus
+    , dssorsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -130,22 +130,22 @@
 --
 -- /See:/ 'disableSSOResponse' smart constructor.
 newtype DisableSSOResponse = DisableSSOResponse'
-    { _dssorsStatus :: Int
+    { _dssorsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DisableSSOResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dssorsStatus'
+-- * 'dssorsResponseStatus'
 disableSSOResponse
-    :: Int -- ^ 'dssorsStatus'
+    :: Int -- ^ 'dssorsResponseStatus'
     -> DisableSSOResponse
-disableSSOResponse pStatus_ =
+disableSSOResponse pResponseStatus_ =
     DisableSSOResponse'
-    { _dssorsStatus = pStatus_
+    { _dssorsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-dssorsStatus :: Lens' DisableSSOResponse Int
-dssorsStatus = lens _dssorsStatus (\ s a -> s{_dssorsStatus = a});
+dssorsResponseStatus :: Lens' DisableSSOResponse Int
+dssorsResponseStatus = lens _dssorsResponseStatus (\ s a -> s{_dssorsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/EnableRadius.hs b/gen/Network/AWS/DirectoryService/EnableRadius.hs
--- a/gen/Network/AWS/DirectoryService/EnableRadius.hs
+++ b/gen/Network/AWS/DirectoryService/EnableRadius.hs
@@ -35,7 +35,7 @@
     , enableRadiusResponse
     , EnableRadiusResponse
     -- * Response Lenses
-    , errsStatus
+    , errsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -113,22 +113,22 @@
 --
 -- /See:/ 'enableRadiusResponse' smart constructor.
 newtype EnableRadiusResponse = EnableRadiusResponse'
-    { _errsStatus :: Int
+    { _errsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'EnableRadiusResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'errsStatus'
+-- * 'errsResponseStatus'
 enableRadiusResponse
-    :: Int -- ^ 'errsStatus'
+    :: Int -- ^ 'errsResponseStatus'
     -> EnableRadiusResponse
-enableRadiusResponse pStatus_ =
+enableRadiusResponse pResponseStatus_ =
     EnableRadiusResponse'
-    { _errsStatus = pStatus_
+    { _errsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-errsStatus :: Lens' EnableRadiusResponse Int
-errsStatus = lens _errsStatus (\ s a -> s{_errsStatus = a});
+errsResponseStatus :: Lens' EnableRadiusResponse Int
+errsResponseStatus = lens _errsResponseStatus (\ s a -> s{_errsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/EnableSSO.hs b/gen/Network/AWS/DirectoryService/EnableSSO.hs
--- a/gen/Network/AWS/DirectoryService/EnableSSO.hs
+++ b/gen/Network/AWS/DirectoryService/EnableSSO.hs
@@ -35,7 +35,7 @@
     , enableSSOResponse
     , EnableSSOResponse
     -- * Response Lenses
-    , esrsStatus
+    , esrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -130,22 +130,22 @@
 --
 -- /See:/ 'enableSSOResponse' smart constructor.
 newtype EnableSSOResponse = EnableSSOResponse'
-    { _esrsStatus :: Int
+    { _esrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'EnableSSOResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'esrsStatus'
+-- * 'esrsResponseStatus'
 enableSSOResponse
-    :: Int -- ^ 'esrsStatus'
+    :: Int -- ^ 'esrsResponseStatus'
     -> EnableSSOResponse
-enableSSOResponse pStatus_ =
+enableSSOResponse pResponseStatus_ =
     EnableSSOResponse'
-    { _esrsStatus = pStatus_
+    { _esrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-esrsStatus :: Lens' EnableSSOResponse Int
-esrsStatus = lens _esrsStatus (\ s a -> s{_esrsStatus = a});
+esrsResponseStatus :: Lens' EnableSSOResponse Int
+esrsResponseStatus = lens _esrsResponseStatus (\ s a -> s{_esrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/GetDirectoryLimits.hs b/gen/Network/AWS/DirectoryService/GetDirectoryLimits.hs
--- a/gen/Network/AWS/DirectoryService/GetDirectoryLimits.hs
+++ b/gen/Network/AWS/DirectoryService/GetDirectoryLimits.hs
@@ -32,7 +32,7 @@
     , GetDirectoryLimitsResponse
     -- * Response Lenses
     , gdlrsDirectoryLimits
-    , gdlrsStatus
+    , gdlrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -88,7 +88,7 @@
 -- /See:/ 'getDirectoryLimitsResponse' smart constructor.
 data GetDirectoryLimitsResponse = GetDirectoryLimitsResponse'
     { _gdlrsDirectoryLimits :: !(Maybe DirectoryLimits)
-    , _gdlrsStatus          :: !Int
+    , _gdlrsResponseStatus  :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetDirectoryLimitsResponse' with the minimum fields required to make a request.
@@ -97,14 +97,14 @@
 --
 -- * 'gdlrsDirectoryLimits'
 --
--- * 'gdlrsStatus'
+-- * 'gdlrsResponseStatus'
 getDirectoryLimitsResponse
-    :: Int -- ^ 'gdlrsStatus'
+    :: Int -- ^ 'gdlrsResponseStatus'
     -> GetDirectoryLimitsResponse
-getDirectoryLimitsResponse pStatus_ =
+getDirectoryLimitsResponse pResponseStatus_ =
     GetDirectoryLimitsResponse'
     { _gdlrsDirectoryLimits = Nothing
-    , _gdlrsStatus = pStatus_
+    , _gdlrsResponseStatus = pResponseStatus_
     }
 
 -- | A DirectoryLimits object that contains the directory limits for the
@@ -113,5 +113,5 @@
 gdlrsDirectoryLimits = lens _gdlrsDirectoryLimits (\ s a -> s{_gdlrsDirectoryLimits = a});
 
 -- | The response status code.
-gdlrsStatus :: Lens' GetDirectoryLimitsResponse Int
-gdlrsStatus = lens _gdlrsStatus (\ s a -> s{_gdlrsStatus = a});
+gdlrsResponseStatus :: Lens' GetDirectoryLimitsResponse Int
+gdlrsResponseStatus = lens _gdlrsResponseStatus (\ s a -> s{_gdlrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/GetSnapshotLimits.hs b/gen/Network/AWS/DirectoryService/GetSnapshotLimits.hs
--- a/gen/Network/AWS/DirectoryService/GetSnapshotLimits.hs
+++ b/gen/Network/AWS/DirectoryService/GetSnapshotLimits.hs
@@ -34,7 +34,7 @@
     , GetSnapshotLimitsResponse
     -- * Response Lenses
     , gslrsSnapshotLimits
-    , gslrsStatus
+    , gslrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -102,7 +102,7 @@
 -- /See:/ 'getSnapshotLimitsResponse' smart constructor.
 data GetSnapshotLimitsResponse = GetSnapshotLimitsResponse'
     { _gslrsSnapshotLimits :: !(Maybe SnapshotLimits)
-    , _gslrsStatus         :: !Int
+    , _gslrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'GetSnapshotLimitsResponse' with the minimum fields required to make a request.
@@ -111,14 +111,14 @@
 --
 -- * 'gslrsSnapshotLimits'
 --
--- * 'gslrsStatus'
+-- * 'gslrsResponseStatus'
 getSnapshotLimitsResponse
-    :: Int -- ^ 'gslrsStatus'
+    :: Int -- ^ 'gslrsResponseStatus'
     -> GetSnapshotLimitsResponse
-getSnapshotLimitsResponse pStatus_ =
+getSnapshotLimitsResponse pResponseStatus_ =
     GetSnapshotLimitsResponse'
     { _gslrsSnapshotLimits = Nothing
-    , _gslrsStatus = pStatus_
+    , _gslrsResponseStatus = pResponseStatus_
     }
 
 -- | A SnapshotLimits object that contains the manual snapshot limits for the
@@ -127,5 +127,5 @@
 gslrsSnapshotLimits = lens _gslrsSnapshotLimits (\ s a -> s{_gslrsSnapshotLimits = a});
 
 -- | The response status code.
-gslrsStatus :: Lens' GetSnapshotLimitsResponse Int
-gslrsStatus = lens _gslrsStatus (\ s a -> s{_gslrsStatus = a});
+gslrsResponseStatus :: Lens' GetSnapshotLimitsResponse Int
+gslrsResponseStatus = lens _gslrsResponseStatus (\ s a -> s{_gslrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/RestoreFromSnapshot.hs b/gen/Network/AWS/DirectoryService/RestoreFromSnapshot.hs
--- a/gen/Network/AWS/DirectoryService/RestoreFromSnapshot.hs
+++ b/gen/Network/AWS/DirectoryService/RestoreFromSnapshot.hs
@@ -42,7 +42,7 @@
     , restoreFromSnapshotResponse
     , RestoreFromSnapshotResponse
     -- * Response Lenses
-    , rfsrsStatus
+    , rfsrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -109,22 +109,22 @@
 --
 -- /See:/ 'restoreFromSnapshotResponse' smart constructor.
 newtype RestoreFromSnapshotResponse = RestoreFromSnapshotResponse'
-    { _rfsrsStatus :: Int
+    { _rfsrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'RestoreFromSnapshotResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'rfsrsStatus'
+-- * 'rfsrsResponseStatus'
 restoreFromSnapshotResponse
-    :: Int -- ^ 'rfsrsStatus'
+    :: Int -- ^ 'rfsrsResponseStatus'
     -> RestoreFromSnapshotResponse
-restoreFromSnapshotResponse pStatus_ =
+restoreFromSnapshotResponse pResponseStatus_ =
     RestoreFromSnapshotResponse'
-    { _rfsrsStatus = pStatus_
+    { _rfsrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-rfsrsStatus :: Lens' RestoreFromSnapshotResponse Int
-rfsrsStatus = lens _rfsrsStatus (\ s a -> s{_rfsrsStatus = a});
+rfsrsResponseStatus :: Lens' RestoreFromSnapshotResponse Int
+rfsrsResponseStatus = lens _rfsrsResponseStatus (\ s a -> s{_rfsrsResponseStatus = a});
diff --git a/gen/Network/AWS/DirectoryService/Types.hs b/gen/Network/AWS/DirectoryService/Types.hs
--- a/gen/Network/AWS/DirectoryService/Types.hs
+++ b/gen/Network/AWS/DirectoryService/Types.hs
@@ -16,8 +16,8 @@
       directoryService
 
     -- * Errors
-    , _AuthenticationFailedException
     , _DirectoryUnavailableException
+    , _AuthenticationFailedException
     , _InvalidParameterException
     , _UnsupportedOperationException
     , _EntityAlreadyExistsException
@@ -77,16 +77,16 @@
     , dcsdCustomerUserName
     , dcsdSubnetIds
     , dcsdVPCId
-    , dcsdConnectIPs
     , dcsdSecurityGroupId
+    , dcsdConnectIPs
     , dcsdAvailabilityZones
 
     -- * DirectoryDescription
     , DirectoryDescription
     , directoryDescription
     , ddRadiusStatus
-    , ddDirectoryId
     , ddStage
+    , ddDirectoryId
     , ddAccessURL
     , ddShortName
     , ddSize
@@ -94,12 +94,12 @@
     , ddLaunchTime
     , ddAlias
     , ddName
-    , ddSSOEnabled
     , ddStageLastUpdatedDateTime
-    , ddStageReason
+    , ddSSOEnabled
     , ddDNSIPAddrs
     , ddVPCSettings
     , ddType
+    , ddStageReason
     , ddConnectSettings
     , ddDescription
 
@@ -131,9 +131,9 @@
     , RadiusSettings
     , radiusSettings
     , rsDisplayLabel
-    , rsRadiusServers
     , rsRadiusRetries
     , rsAuthenticationProtocol
+    , rsRadiusServers
     , rsUseSameUsername
     , rsSharedSecret
     , rsRadiusTimeout
@@ -142,8 +142,8 @@
     -- * Snapshot
     , Snapshot
     , snapshot
-    , sDirectoryId
     , sStatus
+    , sDirectoryId
     , sStartTime
     , sName
     , sType
@@ -193,15 +193,15 @@
       | has (hasStatus 509) e = Just "limit_exceeded"
       | otherwise = Nothing
 
--- | An authentication error occurred.
-_AuthenticationFailedException :: AsError a => Getting (First ServiceError) a ServiceError
-_AuthenticationFailedException =
-    _ServiceError . hasCode "AuthenticationFailedException"
-
 -- | The specified directory is unavailable or could not be found.
 _DirectoryUnavailableException :: AsError a => Getting (First ServiceError) a ServiceError
 _DirectoryUnavailableException =
     _ServiceError . hasCode "DirectoryUnavailableException"
+
+-- | An authentication error occurred.
+_AuthenticationFailedException :: AsError a => Getting (First ServiceError) a ServiceError
+_AuthenticationFailedException =
+    _ServiceError . hasCode "AuthenticationFailedException"
 
 -- | One or more parameters are not valid.
 _InvalidParameterException :: AsError a => Getting (First ServiceError) a ServiceError
diff --git a/gen/Network/AWS/DirectoryService/Types/Product.hs b/gen/Network/AWS/DirectoryService/Types/Product.hs
--- a/gen/Network/AWS/DirectoryService/Types/Product.hs
+++ b/gen/Network/AWS/DirectoryService/Types/Product.hs
@@ -186,8 +186,8 @@
     { _dcsdCustomerUserName  :: !(Maybe Text)
     , _dcsdSubnetIds         :: !(Maybe [Text])
     , _dcsdVPCId             :: !(Maybe Text)
-    , _dcsdConnectIPs        :: !(Maybe [Text])
     , _dcsdSecurityGroupId   :: !(Maybe Text)
+    , _dcsdConnectIPs        :: !(Maybe [Text])
     , _dcsdAvailabilityZones :: !(Maybe [Text])
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -201,10 +201,10 @@
 --
 -- * 'dcsdVPCId'
 --
--- * 'dcsdConnectIPs'
---
 -- * 'dcsdSecurityGroupId'
 --
+-- * 'dcsdConnectIPs'
+--
 -- * 'dcsdAvailabilityZones'
 directoryConnectSettingsDescription
     :: DirectoryConnectSettingsDescription
@@ -213,8 +213,8 @@
     { _dcsdCustomerUserName = Nothing
     , _dcsdSubnetIds = Nothing
     , _dcsdVPCId = Nothing
-    , _dcsdConnectIPs = Nothing
     , _dcsdSecurityGroupId = Nothing
+    , _dcsdConnectIPs = Nothing
     , _dcsdAvailabilityZones = Nothing
     }
 
@@ -230,14 +230,14 @@
 dcsdVPCId :: Lens' DirectoryConnectSettingsDescription (Maybe Text)
 dcsdVPCId = lens _dcsdVPCId (\ s a -> s{_dcsdVPCId = a});
 
--- | The IP addresses of the AD Connector servers.
-dcsdConnectIPs :: Lens' DirectoryConnectSettingsDescription [Text]
-dcsdConnectIPs = lens _dcsdConnectIPs (\ s a -> s{_dcsdConnectIPs = a}) . _Default . _Coerce;
-
 -- | The security group identifier for the AD Connector directory.
 dcsdSecurityGroupId :: Lens' DirectoryConnectSettingsDescription (Maybe Text)
 dcsdSecurityGroupId = lens _dcsdSecurityGroupId (\ s a -> s{_dcsdSecurityGroupId = a});
 
+-- | The IP addresses of the AD Connector servers.
+dcsdConnectIPs :: Lens' DirectoryConnectSettingsDescription [Text]
+dcsdConnectIPs = lens _dcsdConnectIPs (\ s a -> s{_dcsdConnectIPs = a}) . _Default . _Coerce;
+
 -- | A list of the Availability Zones that the directory is in.
 dcsdAvailabilityZones :: Lens' DirectoryConnectSettingsDescription [Text]
 dcsdAvailabilityZones = lens _dcsdAvailabilityZones (\ s a -> s{_dcsdAvailabilityZones = a}) . _Default . _Coerce;
@@ -251,8 +251,8 @@
                    (x .:? "CustomerUserName") <*>
                      (x .:? "SubnetIds" .!= mempty)
                      <*> (x .:? "VpcId")
-                     <*> (x .:? "ConnectIps" .!= mempty)
                      <*> (x .:? "SecurityGroupId")
+                     <*> (x .:? "ConnectIps" .!= mempty)
                      <*> (x .:? "AvailabilityZones" .!= mempty))
 
 -- | Contains information about an AWS Directory Service directory.
@@ -260,8 +260,8 @@
 -- /See:/ 'directoryDescription' smart constructor.
 data DirectoryDescription = DirectoryDescription'
     { _ddRadiusStatus             :: !(Maybe RadiusStatus)
-    , _ddDirectoryId              :: !(Maybe Text)
     , _ddStage                    :: !(Maybe DirectoryStage)
+    , _ddDirectoryId              :: !(Maybe Text)
     , _ddAccessURL                :: !(Maybe Text)
     , _ddShortName                :: !(Maybe Text)
     , _ddSize                     :: !(Maybe DirectorySize)
@@ -269,12 +269,12 @@
     , _ddLaunchTime               :: !(Maybe POSIX)
     , _ddAlias                    :: !(Maybe Text)
     , _ddName                     :: !(Maybe Text)
-    , _ddSSOEnabled               :: !(Maybe Bool)
     , _ddStageLastUpdatedDateTime :: !(Maybe POSIX)
-    , _ddStageReason              :: !(Maybe Text)
+    , _ddSSOEnabled               :: !(Maybe Bool)
     , _ddDNSIPAddrs               :: !(Maybe [Text])
     , _ddVPCSettings              :: !(Maybe DirectoryVPCSettingsDescription)
     , _ddType                     :: !(Maybe DirectoryType)
+    , _ddStageReason              :: !(Maybe Text)
     , _ddConnectSettings          :: !(Maybe DirectoryConnectSettingsDescription)
     , _ddDescription              :: !(Maybe Text)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
@@ -285,10 +285,10 @@
 --
 -- * 'ddRadiusStatus'
 --
--- * 'ddDirectoryId'
---
 -- * 'ddStage'
 --
+-- * 'ddDirectoryId'
+--
 -- * 'ddAccessURL'
 --
 -- * 'ddShortName'
@@ -303,11 +303,9 @@
 --
 -- * 'ddName'
 --
--- * 'ddSSOEnabled'
---
 -- * 'ddStageLastUpdatedDateTime'
 --
--- * 'ddStageReason'
+-- * 'ddSSOEnabled'
 --
 -- * 'ddDNSIPAddrs'
 --
@@ -315,6 +313,8 @@
 --
 -- * 'ddType'
 --
+-- * 'ddStageReason'
+--
 -- * 'ddConnectSettings'
 --
 -- * 'ddDescription'
@@ -323,8 +323,8 @@
 directoryDescription =
     DirectoryDescription'
     { _ddRadiusStatus = Nothing
-    , _ddDirectoryId = Nothing
     , _ddStage = Nothing
+    , _ddDirectoryId = Nothing
     , _ddAccessURL = Nothing
     , _ddShortName = Nothing
     , _ddSize = Nothing
@@ -332,12 +332,12 @@
     , _ddLaunchTime = Nothing
     , _ddAlias = Nothing
     , _ddName = Nothing
-    , _ddSSOEnabled = Nothing
     , _ddStageLastUpdatedDateTime = Nothing
-    , _ddStageReason = Nothing
+    , _ddSSOEnabled = Nothing
     , _ddDNSIPAddrs = Nothing
     , _ddVPCSettings = Nothing
     , _ddType = Nothing
+    , _ddStageReason = Nothing
     , _ddConnectSettings = Nothing
     , _ddDescription = Nothing
     }
@@ -346,14 +346,14 @@
 ddRadiusStatus :: Lens' DirectoryDescription (Maybe RadiusStatus)
 ddRadiusStatus = lens _ddRadiusStatus (\ s a -> s{_ddRadiusStatus = a});
 
--- | The directory identifier.
-ddDirectoryId :: Lens' DirectoryDescription (Maybe Text)
-ddDirectoryId = lens _ddDirectoryId (\ s a -> s{_ddDirectoryId = a});
-
 -- | The current stage of the directory.
 ddStage :: Lens' DirectoryDescription (Maybe DirectoryStage)
 ddStage = lens _ddStage (\ s a -> s{_ddStage = a});
 
+-- | The directory identifier.
+ddDirectoryId :: Lens' DirectoryDescription (Maybe Text)
+ddDirectoryId = lens _ddDirectoryId (\ s a -> s{_ddDirectoryId = a});
+
 -- | The access URL for the directory, such as
 -- 'http:\/\/\<alias>.awsapps.com'.
 ddAccessURL :: Lens' DirectoryDescription (Maybe Text)
@@ -384,18 +384,14 @@
 ddName :: Lens' DirectoryDescription (Maybe Text)
 ddName = lens _ddName (\ s a -> s{_ddName = a});
 
--- | Indicates if single-sign on is enabled for the directory. For more
--- information, see EnableSso and DisableSso.
-ddSSOEnabled :: Lens' DirectoryDescription (Maybe Bool)
-ddSSOEnabled = lens _ddSSOEnabled (\ s a -> s{_ddSSOEnabled = a});
-
 -- | The date and time that the stage was last updated.
 ddStageLastUpdatedDateTime :: Lens' DirectoryDescription (Maybe UTCTime)
 ddStageLastUpdatedDateTime = lens _ddStageLastUpdatedDateTime (\ s a -> s{_ddStageLastUpdatedDateTime = a}) . mapping _Time;
 
--- | Additional information about the directory stage.
-ddStageReason :: Lens' DirectoryDescription (Maybe Text)
-ddStageReason = lens _ddStageReason (\ s a -> s{_ddStageReason = a});
+-- | Indicates if single-sign on is enabled for the directory. For more
+-- information, see EnableSso and DisableSso.
+ddSSOEnabled :: Lens' DirectoryDescription (Maybe Bool)
+ddSSOEnabled = lens _ddSSOEnabled (\ s a -> s{_ddSSOEnabled = a});
 
 -- | The IP addresses of the DNS servers for the directory. For a Simple AD
 -- directory, these are the IP addresses of the Simple AD directory
@@ -415,6 +411,10 @@
 ddType :: Lens' DirectoryDescription (Maybe DirectoryType)
 ddType = lens _ddType (\ s a -> s{_ddType = a});
 
+-- | Additional information about the directory stage.
+ddStageReason :: Lens' DirectoryDescription (Maybe Text)
+ddStageReason = lens _ddStageReason (\ s a -> s{_ddStageReason = a});
+
 -- | A DirectoryConnectSettingsDescription object that contains additional
 -- information about an AD Connector directory. This member is only present
 -- if the directory is an AD Connector directory.
@@ -430,8 +430,8 @@
           = withObject "DirectoryDescription"
               (\ x ->
                  DirectoryDescription' <$>
-                   (x .:? "RadiusStatus") <*> (x .:? "DirectoryId") <*>
-                     (x .:? "Stage")
+                   (x .:? "RadiusStatus") <*> (x .:? "Stage") <*>
+                     (x .:? "DirectoryId")
                      <*> (x .:? "AccessUrl")
                      <*> (x .:? "ShortName")
                      <*> (x .:? "Size")
@@ -439,12 +439,12 @@
                      <*> (x .:? "LaunchTime")
                      <*> (x .:? "Alias")
                      <*> (x .:? "Name")
-                     <*> (x .:? "SsoEnabled")
                      <*> (x .:? "StageLastUpdatedDateTime")
-                     <*> (x .:? "StageReason")
+                     <*> (x .:? "SsoEnabled")
                      <*> (x .:? "DnsIpAddrs" .!= mempty)
                      <*> (x .:? "VpcSettings")
                      <*> (x .:? "Type")
+                     <*> (x .:? "StageReason")
                      <*> (x .:? "ConnectSettings")
                      <*> (x .:? "Description"))
 
@@ -628,9 +628,9 @@
 -- /See:/ 'radiusSettings' smart constructor.
 data RadiusSettings = RadiusSettings'
     { _rsDisplayLabel           :: !(Maybe Text)
-    , _rsRadiusServers          :: !(Maybe [Text])
     , _rsRadiusRetries          :: !(Maybe Nat)
     , _rsAuthenticationProtocol :: !(Maybe RadiusAuthenticationProtocol)
+    , _rsRadiusServers          :: !(Maybe [Text])
     , _rsUseSameUsername        :: !(Maybe Bool)
     , _rsSharedSecret           :: !(Maybe (Sensitive Text))
     , _rsRadiusTimeout          :: !(Maybe Nat)
@@ -643,12 +643,12 @@
 --
 -- * 'rsDisplayLabel'
 --
--- * 'rsRadiusServers'
---
 -- * 'rsRadiusRetries'
 --
 -- * 'rsAuthenticationProtocol'
 --
+-- * 'rsRadiusServers'
+--
 -- * 'rsUseSameUsername'
 --
 -- * 'rsSharedSecret'
@@ -661,9 +661,9 @@
 radiusSettings =
     RadiusSettings'
     { _rsDisplayLabel = Nothing
-    , _rsRadiusServers = Nothing
     , _rsRadiusRetries = Nothing
     , _rsAuthenticationProtocol = Nothing
+    , _rsRadiusServers = Nothing
     , _rsUseSameUsername = Nothing
     , _rsSharedSecret = Nothing
     , _rsRadiusTimeout = Nothing
@@ -674,11 +674,6 @@
 rsDisplayLabel :: Lens' RadiusSettings (Maybe Text)
 rsDisplayLabel = lens _rsDisplayLabel (\ s a -> s{_rsDisplayLabel = a});
 
--- | An array of strings that contains the IP addresses of the RADIUS server
--- endpoints, or the IP addresses of your RADIUS server load balancer.
-rsRadiusServers :: Lens' RadiusSettings [Text]
-rsRadiusServers = lens _rsRadiusServers (\ s a -> s{_rsRadiusServers = a}) . _Default . _Coerce;
-
 -- | The maximum number of times that communication with the RADIUS server is
 -- attempted.
 rsRadiusRetries :: Lens' RadiusSettings (Maybe Natural)
@@ -688,6 +683,11 @@
 rsAuthenticationProtocol :: Lens' RadiusSettings (Maybe RadiusAuthenticationProtocol)
 rsAuthenticationProtocol = lens _rsAuthenticationProtocol (\ s a -> s{_rsAuthenticationProtocol = a});
 
+-- | An array of strings that contains the IP addresses of the RADIUS server
+-- endpoints, or the IP addresses of your RADIUS server load balancer.
+rsRadiusServers :: Lens' RadiusSettings [Text]
+rsRadiusServers = lens _rsRadiusServers (\ s a -> s{_rsRadiusServers = a}) . _Default . _Coerce;
+
 -- | Not currently used.
 rsUseSameUsername :: Lens' RadiusSettings (Maybe Bool)
 rsUseSameUsername = lens _rsUseSameUsername (\ s a -> s{_rsUseSameUsername = a});
@@ -713,10 +713,9 @@
           = withObject "RadiusSettings"
               (\ x ->
                  RadiusSettings' <$>
-                   (x .:? "DisplayLabel") <*>
-                     (x .:? "RadiusServers" .!= mempty)
-                     <*> (x .:? "RadiusRetries")
+                   (x .:? "DisplayLabel") <*> (x .:? "RadiusRetries")
                      <*> (x .:? "AuthenticationProtocol")
+                     <*> (x .:? "RadiusServers" .!= mempty)
                      <*> (x .:? "UseSameUsername")
                      <*> (x .:? "SharedSecret")
                      <*> (x .:? "RadiusTimeout")
@@ -727,10 +726,10 @@
           = object
               (catMaybes
                  [("DisplayLabel" .=) <$> _rsDisplayLabel,
-                  ("RadiusServers" .=) <$> _rsRadiusServers,
                   ("RadiusRetries" .=) <$> _rsRadiusRetries,
                   ("AuthenticationProtocol" .=) <$>
                     _rsAuthenticationProtocol,
+                  ("RadiusServers" .=) <$> _rsRadiusServers,
                   ("UseSameUsername" .=) <$> _rsUseSameUsername,
                   ("SharedSecret" .=) <$> _rsSharedSecret,
                   ("RadiusTimeout" .=) <$> _rsRadiusTimeout,
@@ -740,8 +739,8 @@
 --
 -- /See:/ 'snapshot' smart constructor.
 data Snapshot = Snapshot'
-    { _sDirectoryId :: !(Maybe Text)
-    , _sStatus      :: !(Maybe SnapshotStatus)
+    { _sStatus      :: !(Maybe SnapshotStatus)
+    , _sDirectoryId :: !(Maybe Text)
     , _sStartTime   :: !(Maybe POSIX)
     , _sName        :: !(Maybe Text)
     , _sType        :: !(Maybe SnapshotType)
@@ -752,10 +751,10 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'sDirectoryId'
---
 -- * 'sStatus'
 --
+-- * 'sDirectoryId'
+--
 -- * 'sStartTime'
 --
 -- * 'sName'
@@ -767,22 +766,22 @@
     :: Snapshot
 snapshot =
     Snapshot'
-    { _sDirectoryId = Nothing
-    , _sStatus = Nothing
+    { _sStatus = Nothing
+    , _sDirectoryId = Nothing
     , _sStartTime = Nothing
     , _sName = Nothing
     , _sType = Nothing
     , _sSnapshotId = Nothing
     }
 
--- | The directory identifier.
-sDirectoryId :: Lens' Snapshot (Maybe Text)
-sDirectoryId = lens _sDirectoryId (\ s a -> s{_sDirectoryId = a});
-
 -- | The snapshot status.
 sStatus :: Lens' Snapshot (Maybe SnapshotStatus)
 sStatus = lens _sStatus (\ s a -> s{_sStatus = a});
 
+-- | The directory identifier.
+sDirectoryId :: Lens' Snapshot (Maybe Text)
+sDirectoryId = lens _sDirectoryId (\ s a -> s{_sDirectoryId = a});
+
 -- | The date and time that the snapshot was taken.
 sStartTime :: Lens' Snapshot (Maybe UTCTime)
 sStartTime = lens _sStartTime (\ s a -> s{_sStartTime = a}) . mapping _Time;
@@ -804,7 +803,7 @@
           = withObject "Snapshot"
               (\ x ->
                  Snapshot' <$>
-                   (x .:? "DirectoryId") <*> (x .:? "Status") <*>
+                   (x .:? "Status") <*> (x .:? "DirectoryId") <*>
                      (x .:? "StartTime")
                      <*> (x .:? "Name")
                      <*> (x .:? "Type")
diff --git a/gen/Network/AWS/DirectoryService/UpdateRadius.hs b/gen/Network/AWS/DirectoryService/UpdateRadius.hs
--- a/gen/Network/AWS/DirectoryService/UpdateRadius.hs
+++ b/gen/Network/AWS/DirectoryService/UpdateRadius.hs
@@ -35,7 +35,7 @@
     , updateRadiusResponse
     , UpdateRadiusResponse
     -- * Response Lenses
-    , urrsStatus
+    , urrsResponseStatus
     ) where
 
 import           Network.AWS.DirectoryService.Types
@@ -114,22 +114,22 @@
 --
 -- /See:/ 'updateRadiusResponse' smart constructor.
 newtype UpdateRadiusResponse = UpdateRadiusResponse'
-    { _urrsStatus :: Int
+    { _urrsResponseStatus :: Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'UpdateRadiusResponse' with the minimum fields required to make a request.
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'urrsStatus'
+-- * 'urrsResponseStatus'
 updateRadiusResponse
-    :: Int -- ^ 'urrsStatus'
+    :: Int -- ^ 'urrsResponseStatus'
     -> UpdateRadiusResponse
-updateRadiusResponse pStatus_ =
+updateRadiusResponse pResponseStatus_ =
     UpdateRadiusResponse'
-    { _urrsStatus = pStatus_
+    { _urrsResponseStatus = pResponseStatus_
     }
 
 -- | The response status code.
-urrsStatus :: Lens' UpdateRadiusResponse Int
-urrsStatus = lens _urrsStatus (\ s a -> s{_urrsStatus = a});
+urrsResponseStatus :: Lens' UpdateRadiusResponse Int
+urrsResponseStatus = lens _urrsResponseStatus (\ s a -> s{_urrsResponseStatus = a});
diff --git a/test/Test/AWS/Gen/DirectoryService.hs b/test/Test/AWS/Gen/DirectoryService.hs
--- a/test/Test/AWS/Gen/DirectoryService.hs
+++ b/test/Test/AWS/Gen/DirectoryService.hs
@@ -34,12 +34,12 @@
 --         , testConnectDirectory $
 --             connectDirectory
 --
---         , testDescribeDirectories $
---             describeDirectories
---
 --         , testCreateAlias $
 --             createAlias
 --
+--         , testDescribeDirectories $
+--             describeDirectories
+--
 --         , testCreateDirectory $
 --             createDirectory
 --
@@ -52,27 +52,27 @@
 --         , testDisableRadius $
 --             disableRadius
 --
---         , testDescribeSnapshots $
---             describeSnapshots
---
 --         , testRestoreFromSnapshot $
 --             restoreFromSnapshot
 --
+--         , testDescribeSnapshots $
+--             describeSnapshots
+--
 --         , testDeleteSnapshot $
 --             deleteSnapshot
 --
---         , testCreateSnapshot $
---             createSnapshot
---
 --         , testDeleteDirectory $
 --             deleteDirectory
 --
---         , testDisableSSO $
---             disableSSO
+--         , testCreateSnapshot $
+--             createSnapshot
 --
 --         , testCreateComputer $
 --             createComputer
 --
+--         , testDisableSSO $
+--             disableSSO
+--
 --         , testGetDirectoryLimits $
 --             getDirectoryLimits
 --
@@ -88,12 +88,12 @@
 --         , testConnectDirectoryResponse $
 --             connectDirectoryResponse
 --
---         , testDescribeDirectoriesResponse $
---             describeDirectoriesResponse
---
 --         , testCreateAliasResponse $
 --             createAliasResponse
 --
+--         , testDescribeDirectoriesResponse $
+--             describeDirectoriesResponse
+--
 --         , testCreateDirectoryResponse $
 --             createDirectoryResponse
 --
@@ -106,27 +106,27 @@
 --         , testDisableRadiusResponse $
 --             disableRadiusResponse
 --
---         , testDescribeSnapshotsResponse $
---             describeSnapshotsResponse
---
 --         , testRestoreFromSnapshotResponse $
 --             restoreFromSnapshotResponse
 --
+--         , testDescribeSnapshotsResponse $
+--             describeSnapshotsResponse
+--
 --         , testDeleteSnapshotResponse $
 --             deleteSnapshotResponse
 --
---         , testCreateSnapshotResponse $
---             createSnapshotResponse
---
 --         , testDeleteDirectoryResponse $
 --             deleteDirectoryResponse
 --
---         , testDisableSSOResponse $
---             disableSSOResponse
+--         , testCreateSnapshotResponse $
+--             createSnapshotResponse
 --
 --         , testCreateComputerResponse $
 --             createComputerResponse
 --
+--         , testDisableSSOResponse $
+--             disableSSOResponse
+--
 --         , testGetDirectoryLimitsResponse $
 --             getDirectoryLimitsResponse
 --
@@ -148,16 +148,16 @@
     "ConnectDirectory"
     "fixture/ConnectDirectory.yaml"
 
-testDescribeDirectories :: DescribeDirectories -> TestTree
-testDescribeDirectories = req
-    "DescribeDirectories"
-    "fixture/DescribeDirectories.yaml"
-
 testCreateAlias :: CreateAlias -> TestTree
 testCreateAlias = req
     "CreateAlias"
     "fixture/CreateAlias.yaml"
 
+testDescribeDirectories :: DescribeDirectories -> TestTree
+testDescribeDirectories = req
+    "DescribeDirectories"
+    "fixture/DescribeDirectories.yaml"
+
 testCreateDirectory :: CreateDirectory -> TestTree
 testCreateDirectory = req
     "CreateDirectory"
@@ -178,41 +178,41 @@
     "DisableRadius"
     "fixture/DisableRadius.yaml"
 
-testDescribeSnapshots :: DescribeSnapshots -> TestTree
-testDescribeSnapshots = req
-    "DescribeSnapshots"
-    "fixture/DescribeSnapshots.yaml"
-
 testRestoreFromSnapshot :: RestoreFromSnapshot -> TestTree
 testRestoreFromSnapshot = req
     "RestoreFromSnapshot"
     "fixture/RestoreFromSnapshot.yaml"
 
+testDescribeSnapshots :: DescribeSnapshots -> TestTree
+testDescribeSnapshots = req
+    "DescribeSnapshots"
+    "fixture/DescribeSnapshots.yaml"
+
 testDeleteSnapshot :: DeleteSnapshot -> TestTree
 testDeleteSnapshot = req
     "DeleteSnapshot"
     "fixture/DeleteSnapshot.yaml"
 
-testCreateSnapshot :: CreateSnapshot -> TestTree
-testCreateSnapshot = req
-    "CreateSnapshot"
-    "fixture/CreateSnapshot.yaml"
-
 testDeleteDirectory :: DeleteDirectory -> TestTree
 testDeleteDirectory = req
     "DeleteDirectory"
     "fixture/DeleteDirectory.yaml"
 
-testDisableSSO :: DisableSSO -> TestTree
-testDisableSSO = req
-    "DisableSSO"
-    "fixture/DisableSSO.yaml"
+testCreateSnapshot :: CreateSnapshot -> TestTree
+testCreateSnapshot = req
+    "CreateSnapshot"
+    "fixture/CreateSnapshot.yaml"
 
 testCreateComputer :: CreateComputer -> TestTree
 testCreateComputer = req
     "CreateComputer"
     "fixture/CreateComputer.yaml"
 
+testDisableSSO :: DisableSSO -> TestTree
+testDisableSSO = req
+    "DisableSSO"
+    "fixture/DisableSSO.yaml"
+
 testGetDirectoryLimits :: GetDirectoryLimits -> TestTree
 testGetDirectoryLimits = req
     "GetDirectoryLimits"
@@ -239,13 +239,6 @@
     directoryService
     (Proxy :: Proxy ConnectDirectory)
 
-testDescribeDirectoriesResponse :: DescribeDirectoriesResponse -> TestTree
-testDescribeDirectoriesResponse = res
-    "DescribeDirectoriesResponse"
-    "fixture/DescribeDirectoriesResponse.proto"
-    directoryService
-    (Proxy :: Proxy DescribeDirectories)
-
 testCreateAliasResponse :: CreateAliasResponse -> TestTree
 testCreateAliasResponse = res
     "CreateAliasResponse"
@@ -253,6 +246,13 @@
     directoryService
     (Proxy :: Proxy CreateAlias)
 
+testDescribeDirectoriesResponse :: DescribeDirectoriesResponse -> TestTree
+testDescribeDirectoriesResponse = res
+    "DescribeDirectoriesResponse"
+    "fixture/DescribeDirectoriesResponse.proto"
+    directoryService
+    (Proxy :: Proxy DescribeDirectories)
+
 testCreateDirectoryResponse :: CreateDirectoryResponse -> TestTree
 testCreateDirectoryResponse = res
     "CreateDirectoryResponse"
@@ -281,13 +281,6 @@
     directoryService
     (Proxy :: Proxy DisableRadius)
 
-testDescribeSnapshotsResponse :: DescribeSnapshotsResponse -> TestTree
-testDescribeSnapshotsResponse = res
-    "DescribeSnapshotsResponse"
-    "fixture/DescribeSnapshotsResponse.proto"
-    directoryService
-    (Proxy :: Proxy DescribeSnapshots)
-
 testRestoreFromSnapshotResponse :: RestoreFromSnapshotResponse -> TestTree
 testRestoreFromSnapshotResponse = res
     "RestoreFromSnapshotResponse"
@@ -295,6 +288,13 @@
     directoryService
     (Proxy :: Proxy RestoreFromSnapshot)
 
+testDescribeSnapshotsResponse :: DescribeSnapshotsResponse -> TestTree
+testDescribeSnapshotsResponse = res
+    "DescribeSnapshotsResponse"
+    "fixture/DescribeSnapshotsResponse.proto"
+    directoryService
+    (Proxy :: Proxy DescribeSnapshots)
+
 testDeleteSnapshotResponse :: DeleteSnapshotResponse -> TestTree
 testDeleteSnapshotResponse = res
     "DeleteSnapshotResponse"
@@ -302,13 +302,6 @@
     directoryService
     (Proxy :: Proxy DeleteSnapshot)
 
-testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
-testCreateSnapshotResponse = res
-    "CreateSnapshotResponse"
-    "fixture/CreateSnapshotResponse.proto"
-    directoryService
-    (Proxy :: Proxy CreateSnapshot)
-
 testDeleteDirectoryResponse :: DeleteDirectoryResponse -> TestTree
 testDeleteDirectoryResponse = res
     "DeleteDirectoryResponse"
@@ -316,12 +309,12 @@
     directoryService
     (Proxy :: Proxy DeleteDirectory)
 
-testDisableSSOResponse :: DisableSSOResponse -> TestTree
-testDisableSSOResponse = res
-    "DisableSSOResponse"
-    "fixture/DisableSSOResponse.proto"
+testCreateSnapshotResponse :: CreateSnapshotResponse -> TestTree
+testCreateSnapshotResponse = res
+    "CreateSnapshotResponse"
+    "fixture/CreateSnapshotResponse.proto"
     directoryService
-    (Proxy :: Proxy DisableSSO)
+    (Proxy :: Proxy CreateSnapshot)
 
 testCreateComputerResponse :: CreateComputerResponse -> TestTree
 testCreateComputerResponse = res
@@ -329,6 +322,13 @@
     "fixture/CreateComputerResponse.proto"
     directoryService
     (Proxy :: Proxy CreateComputer)
+
+testDisableSSOResponse :: DisableSSOResponse -> TestTree
+testDisableSSOResponse = res
+    "DisableSSOResponse"
+    "fixture/DisableSSOResponse.proto"
+    directoryService
+    (Proxy :: Proxy DisableSSO)
 
 testGetDirectoryLimitsResponse :: GetDirectoryLimitsResponse -> TestTree
 testGetDirectoryLimitsResponse = res
