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-efs.cabal b/amazonka-efs.cabal
--- a/amazonka-efs.cabal
+++ b/amazonka-efs.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-efs
-version:               1.2.0.2
+version:               1.3.0
 synopsis:              Amazon Elastic File System SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -60,7 +60,7 @@
         , Network.AWS.EFS.Types.Sum
 
     build-depends:
-          amazonka-core == 1.2.0.*
+          amazonka-core == 1.3.0.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-efs-test
@@ -80,9 +80,9 @@
         , Test.AWS.EFS.Internal
 
     build-depends:
-          amazonka-core == 1.2.0.*
-        , amazonka-test == 1.2.0.*
-        , amazonka-efs == 1.2.0.*
+          amazonka-core == 1.3.0.*
+        , amazonka-test == 1.3.0.*
+        , amazonka-efs == 1.3.0.*
         , base
         , bytestring
         , lens
diff --git a/gen/Network/AWS/EFS.hs b/gen/Network/AWS/EFS.hs
--- a/gen/Network/AWS/EFS.hs
+++ b/gen/Network/AWS/EFS.hs
@@ -28,30 +28,30 @@
     -- ** SecurityGroupLimitExceeded
     , _SecurityGroupLimitExceeded
 
+    -- ** SecurityGroupNotFound
+    , _SecurityGroupNotFound
+
     -- ** MountTargetConflict
     , _MountTargetConflict
 
     -- ** UnsupportedAvailabilityZone
     , _UnsupportedAvailabilityZone
 
-    -- ** SecurityGroupNotFound
-    , _SecurityGroupNotFound
-
-    -- ** FileSystemAlreadyExists
-    , _FileSystemAlreadyExists
-
     -- ** FileSystemLimitExceeded
     , _FileSystemLimitExceeded
 
     -- ** NetworkInterfaceLimitExceeded
     , _NetworkInterfaceLimitExceeded
 
-    -- ** FileSystemNotFound
-    , _FileSystemNotFound
+    -- ** FileSystemAlreadyExists
+    , _FileSystemAlreadyExists
 
     -- ** SubnetNotFound
     , _SubnetNotFound
 
+    -- ** FileSystemNotFound
+    , _FileSystemNotFound
+
     -- ** IncorrectFileSystemLifeCycleState
     , _IncorrectFileSystemLifeCycleState
 
@@ -88,14 +88,14 @@
     -- ** DescribeMountTargets
     , module Network.AWS.EFS.DescribeMountTargets
 
+    -- ** DescribeFileSystems
+    , module Network.AWS.EFS.DescribeFileSystems
+
     -- ** DeleteMountTarget
     , module Network.AWS.EFS.DeleteMountTarget
 
     -- ** CreateTags
     , module Network.AWS.EFS.CreateTags
-
-    -- ** DescribeFileSystems
-    , module Network.AWS.EFS.DescribeFileSystems
 
     -- ** DeleteTags
     , module Network.AWS.EFS.DeleteTags
diff --git a/gen/Network/AWS/EFS/DescribeFileSystems.hs b/gen/Network/AWS/EFS/DescribeFileSystems.hs
--- a/gen/Network/AWS/EFS/DescribeFileSystems.hs
+++ b/gen/Network/AWS/EFS/DescribeFileSystems.hs
@@ -55,9 +55,9 @@
     , DescribeFileSystems
     -- * Request Lenses
     , dfsFileSystemId
-    , dfsMaxItems
     , dfsCreationToken
     , dfsMarker
+    , dfsMaxItems
 
     -- * Destructuring the Response
     , describeFileSystemsResponse
@@ -66,7 +66,7 @@
     , dfsrsFileSystems
     , dfsrsMarker
     , dfsrsNextMarker
-    , dfsrsStatus
+    , dfsrsResponseStatus
     ) where
 
 import           Network.AWS.EFS.Types
@@ -78,9 +78,9 @@
 -- | /See:/ 'describeFileSystems' smart constructor.
 data DescribeFileSystems = DescribeFileSystems'
     { _dfsFileSystemId  :: !(Maybe Text)
-    , _dfsMaxItems      :: !(Maybe Nat)
     , _dfsCreationToken :: !(Maybe Text)
     , _dfsMarker        :: !(Maybe Text)
+    , _dfsMaxItems      :: !(Maybe Nat)
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeFileSystems' with the minimum fields required to make a request.
@@ -89,33 +89,25 @@
 --
 -- * 'dfsFileSystemId'
 --
--- * 'dfsMaxItems'
---
 -- * 'dfsCreationToken'
 --
 -- * 'dfsMarker'
+--
+-- * 'dfsMaxItems'
 describeFileSystems
     :: DescribeFileSystems
 describeFileSystems =
     DescribeFileSystems'
     { _dfsFileSystemId = Nothing
-    , _dfsMaxItems = Nothing
     , _dfsCreationToken = Nothing
     , _dfsMarker = Nothing
+    , _dfsMaxItems = Nothing
     }
 
 -- | Optional string. File system ID whose description you want to retrieve.
 dfsFileSystemId :: Lens' DescribeFileSystems (Maybe Text)
 dfsFileSystemId = lens _dfsFileSystemId (\ s a -> s{_dfsFileSystemId = a});
 
--- | Optional integer. Specifies the maximum number of file systems to return
--- in the response. This parameter value must be greater than 0. The number
--- of items Amazon EFS returns will be the minimum of the 'MaxItems'
--- parameter specified in the request and the service\'s internal maximum
--- number of items per page.
-dfsMaxItems :: Lens' DescribeFileSystems (Maybe Natural)
-dfsMaxItems = lens _dfsMaxItems (\ s a -> s{_dfsMaxItems = a}) . mapping _Nat;
-
 -- | Optional string. Restricts the list to the file system with this
 -- creation token (you specify a creation token at the time of creating an
 -- Amazon EFS file system).
@@ -128,6 +120,14 @@
 dfsMarker :: Lens' DescribeFileSystems (Maybe Text)
 dfsMarker = lens _dfsMarker (\ s a -> s{_dfsMarker = a});
 
+-- | Optional integer. Specifies the maximum number of file systems to return
+-- in the response. This parameter value must be greater than 0. The number
+-- of items Amazon EFS returns will be the minimum of the 'MaxItems'
+-- parameter specified in the request and the service\'s internal maximum
+-- number of items per page.
+dfsMaxItems :: Lens' DescribeFileSystems (Maybe Natural)
+dfsMaxItems = lens _dfsMaxItems (\ s a -> s{_dfsMaxItems = a}) . mapping _Nat;
+
 instance AWSRequest DescribeFileSystems where
         type Rs DescribeFileSystems =
              DescribeFileSystemsResponse
@@ -150,16 +150,15 @@
         toQuery DescribeFileSystems'{..}
           = mconcat
               ["FileSystemId" =: _dfsFileSystemId,
-               "MaxItems" =: _dfsMaxItems,
                "CreationToken" =: _dfsCreationToken,
-               "Marker" =: _dfsMarker]
+               "Marker" =: _dfsMarker, "MaxItems" =: _dfsMaxItems]
 
 -- | /See:/ 'describeFileSystemsResponse' smart constructor.
 data DescribeFileSystemsResponse = DescribeFileSystemsResponse'
-    { _dfsrsFileSystems :: !(Maybe [FileSystemDescription])
-    , _dfsrsMarker      :: !(Maybe Text)
-    , _dfsrsNextMarker  :: !(Maybe Text)
-    , _dfsrsStatus      :: !Int
+    { _dfsrsFileSystems    :: !(Maybe [FileSystemDescription])
+    , _dfsrsMarker         :: !(Maybe Text)
+    , _dfsrsNextMarker     :: !(Maybe Text)
+    , _dfsrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeFileSystemsResponse' with the minimum fields required to make a request.
@@ -172,16 +171,16 @@
 --
 -- * 'dfsrsNextMarker'
 --
--- * 'dfsrsStatus'
+-- * 'dfsrsResponseStatus'
 describeFileSystemsResponse
-    :: Int -- ^ 'dfsrsStatus'
+    :: Int -- ^ 'dfsrsResponseStatus'
     -> DescribeFileSystemsResponse
-describeFileSystemsResponse pStatus_ =
+describeFileSystemsResponse pResponseStatus_ =
     DescribeFileSystemsResponse'
     { _dfsrsFileSystems = Nothing
     , _dfsrsMarker = Nothing
     , _dfsrsNextMarker = Nothing
-    , _dfsrsStatus = pStatus_
+    , _dfsrsResponseStatus = pResponseStatus_
     }
 
 -- | An array of file system descriptions.
@@ -199,5 +198,5 @@
 dfsrsNextMarker = lens _dfsrsNextMarker (\ s a -> s{_dfsrsNextMarker = a});
 
 -- | The response status code.
-dfsrsStatus :: Lens' DescribeFileSystemsResponse Int
-dfsrsStatus = lens _dfsrsStatus (\ s a -> s{_dfsrsStatus = a});
+dfsrsResponseStatus :: Lens' DescribeFileSystemsResponse Int
+dfsrsResponseStatus = lens _dfsrsResponseStatus (\ s a -> s{_dfsrsResponseStatus = a});
diff --git a/gen/Network/AWS/EFS/DescribeMountTargetSecurityGroups.hs b/gen/Network/AWS/EFS/DescribeMountTargetSecurityGroups.hs
--- a/gen/Network/AWS/EFS/DescribeMountTargetSecurityGroups.hs
+++ b/gen/Network/AWS/EFS/DescribeMountTargetSecurityGroups.hs
@@ -43,7 +43,7 @@
     , describeMountTargetSecurityGroupsResponse
     , DescribeMountTargetSecurityGroupsResponse
     -- * Response Lenses
-    , dmtsgrsStatus
+    , dmtsgrsResponseStatus
     , dmtsgrsSecurityGroups
     ) where
 
@@ -104,7 +104,7 @@
 
 -- | /See:/ 'describeMountTargetSecurityGroupsResponse' smart constructor.
 data DescribeMountTargetSecurityGroupsResponse = DescribeMountTargetSecurityGroupsResponse'
-    { _dmtsgrsStatus         :: !Int
+    { _dmtsgrsResponseStatus :: !Int
     , _dmtsgrsSecurityGroups :: ![Text]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -112,21 +112,21 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dmtsgrsStatus'
+-- * 'dmtsgrsResponseStatus'
 --
 -- * 'dmtsgrsSecurityGroups'
 describeMountTargetSecurityGroupsResponse
-    :: Int -- ^ 'dmtsgrsStatus'
+    :: Int -- ^ 'dmtsgrsResponseStatus'
     -> DescribeMountTargetSecurityGroupsResponse
-describeMountTargetSecurityGroupsResponse pStatus_ =
+describeMountTargetSecurityGroupsResponse pResponseStatus_ =
     DescribeMountTargetSecurityGroupsResponse'
-    { _dmtsgrsStatus = pStatus_
+    { _dmtsgrsResponseStatus = pResponseStatus_
     , _dmtsgrsSecurityGroups = mempty
     }
 
 -- | The response status code.
-dmtsgrsStatus :: Lens' DescribeMountTargetSecurityGroupsResponse Int
-dmtsgrsStatus = lens _dmtsgrsStatus (\ s a -> s{_dmtsgrsStatus = a});
+dmtsgrsResponseStatus :: Lens' DescribeMountTargetSecurityGroupsResponse Int
+dmtsgrsResponseStatus = lens _dmtsgrsResponseStatus (\ s a -> s{_dmtsgrsResponseStatus = a});
 
 -- | An array of security groups.
 dmtsgrsSecurityGroups :: Lens' DescribeMountTargetSecurityGroupsResponse [Text]
diff --git a/gen/Network/AWS/EFS/DescribeMountTargets.hs b/gen/Network/AWS/EFS/DescribeMountTargets.hs
--- a/gen/Network/AWS/EFS/DescribeMountTargets.hs
+++ b/gen/Network/AWS/EFS/DescribeMountTargets.hs
@@ -32,8 +32,8 @@
       describeMountTargets
     , DescribeMountTargets
     -- * Request Lenses
-    , dmtMaxItems
     , dmtMarker
+    , dmtMaxItems
     , dmtFileSystemId
 
     -- * Destructuring the Response
@@ -43,7 +43,7 @@
     , dmtrsMountTargets
     , dmtrsMarker
     , dmtrsNextMarker
-    , dmtrsStatus
+    , dmtrsResponseStatus
     ) where
 
 import           Network.AWS.EFS.Types
@@ -54,8 +54,8 @@
 
 -- | /See:/ 'describeMountTargets' smart constructor.
 data DescribeMountTargets = DescribeMountTargets'
-    { _dmtMaxItems     :: !(Maybe Nat)
-    , _dmtMarker       :: !(Maybe Text)
+    { _dmtMarker       :: !(Maybe Text)
+    , _dmtMaxItems     :: !(Maybe Nat)
     , _dmtFileSystemId :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -63,32 +63,32 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dmtMaxItems'
---
 -- * 'dmtMarker'
 --
+-- * 'dmtMaxItems'
+--
 -- * 'dmtFileSystemId'
 describeMountTargets
     :: Text -- ^ 'dmtFileSystemId'
     -> DescribeMountTargets
 describeMountTargets pFileSystemId_ =
     DescribeMountTargets'
-    { _dmtMaxItems = Nothing
-    , _dmtMarker = Nothing
+    { _dmtMarker = Nothing
+    , _dmtMaxItems = Nothing
     , _dmtFileSystemId = pFileSystemId_
     }
 
--- | Optional. Maximum number of mount targets to return in the response. It
--- must be an integer with a value greater than zero.
-dmtMaxItems :: Lens' DescribeMountTargets (Maybe Natural)
-dmtMaxItems = lens _dmtMaxItems (\ s a -> s{_dmtMaxItems = a}) . mapping _Nat;
-
 -- | Optional. String. Opaque pagination token returned from a previous
 -- 'DescribeMountTargets' operation. If present, it specifies to continue
 -- the list from where the previous returning call left off.
 dmtMarker :: Lens' DescribeMountTargets (Maybe Text)
 dmtMarker = lens _dmtMarker (\ s a -> s{_dmtMarker = a});
 
+-- | Optional. Maximum number of mount targets to return in the response. It
+-- must be an integer with a value greater than zero.
+dmtMaxItems :: Lens' DescribeMountTargets (Maybe Natural)
+dmtMaxItems = lens _dmtMaxItems (\ s a -> s{_dmtMaxItems = a}) . mapping _Nat;
+
 -- | String. The ID of the file system whose mount targets you want to list.
 dmtFileSystemId :: Lens' DescribeMountTargets Text
 dmtFileSystemId = lens _dmtFileSystemId (\ s a -> s{_dmtFileSystemId = a});
@@ -115,15 +115,15 @@
 instance ToQuery DescribeMountTargets where
         toQuery DescribeMountTargets'{..}
           = mconcat
-              ["MaxItems" =: _dmtMaxItems, "Marker" =: _dmtMarker,
+              ["Marker" =: _dmtMarker, "MaxItems" =: _dmtMaxItems,
                "FileSystemId" =: _dmtFileSystemId]
 
 -- | /See:/ 'describeMountTargetsResponse' smart constructor.
 data DescribeMountTargetsResponse = DescribeMountTargetsResponse'
-    { _dmtrsMountTargets :: !(Maybe [MountTargetDescription])
-    , _dmtrsMarker       :: !(Maybe Text)
-    , _dmtrsNextMarker   :: !(Maybe Text)
-    , _dmtrsStatus       :: !Int
+    { _dmtrsMountTargets   :: !(Maybe [MountTargetDescription])
+    , _dmtrsMarker         :: !(Maybe Text)
+    , _dmtrsNextMarker     :: !(Maybe Text)
+    , _dmtrsResponseStatus :: !Int
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeMountTargetsResponse' with the minimum fields required to make a request.
@@ -136,16 +136,16 @@
 --
 -- * 'dmtrsNextMarker'
 --
--- * 'dmtrsStatus'
+-- * 'dmtrsResponseStatus'
 describeMountTargetsResponse
-    :: Int -- ^ 'dmtrsStatus'
+    :: Int -- ^ 'dmtrsResponseStatus'
     -> DescribeMountTargetsResponse
-describeMountTargetsResponse pStatus_ =
+describeMountTargetsResponse pResponseStatus_ =
     DescribeMountTargetsResponse'
     { _dmtrsMountTargets = Nothing
     , _dmtrsMarker = Nothing
     , _dmtrsNextMarker = Nothing
-    , _dmtrsStatus = pStatus_
+    , _dmtrsResponseStatus = pResponseStatus_
     }
 
 -- | Returns the file system\'s mount targets as an array of
@@ -165,5 +165,5 @@
 dmtrsNextMarker = lens _dmtrsNextMarker (\ s a -> s{_dmtrsNextMarker = a});
 
 -- | The response status code.
-dmtrsStatus :: Lens' DescribeMountTargetsResponse Int
-dmtrsStatus = lens _dmtrsStatus (\ s a -> s{_dmtrsStatus = a});
+dmtrsResponseStatus :: Lens' DescribeMountTargetsResponse Int
+dmtrsResponseStatus = lens _dmtrsResponseStatus (\ s a -> s{_dmtrsResponseStatus = a});
diff --git a/gen/Network/AWS/EFS/DescribeTags.hs b/gen/Network/AWS/EFS/DescribeTags.hs
--- a/gen/Network/AWS/EFS/DescribeTags.hs
+++ b/gen/Network/AWS/EFS/DescribeTags.hs
@@ -33,8 +33,8 @@
       describeTags
     , DescribeTags
     -- * Request Lenses
-    , dtMaxItems
     , dtMarker
+    , dtMaxItems
     , dtFileSystemId
 
     -- * Destructuring the Response
@@ -43,7 +43,7 @@
     -- * Response Lenses
     , dtrsMarker
     , dtrsNextMarker
-    , dtrsStatus
+    , dtrsResponseStatus
     , dtrsTags
     ) where
 
@@ -55,8 +55,8 @@
 
 -- | /See:/ 'describeTags' smart constructor.
 data DescribeTags = DescribeTags'
-    { _dtMaxItems     :: !(Maybe Nat)
-    , _dtMarker       :: !(Maybe Text)
+    { _dtMarker       :: !(Maybe Text)
+    , _dtMaxItems     :: !(Maybe Nat)
     , _dtFileSystemId :: !Text
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
@@ -64,32 +64,32 @@
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
--- * 'dtMaxItems'
---
 -- * 'dtMarker'
 --
+-- * 'dtMaxItems'
+--
 -- * 'dtFileSystemId'
 describeTags
     :: Text -- ^ 'dtFileSystemId'
     -> DescribeTags
 describeTags pFileSystemId_ =
     DescribeTags'
-    { _dtMaxItems = Nothing
-    , _dtMarker = Nothing
+    { _dtMarker = Nothing
+    , _dtMaxItems = Nothing
     , _dtFileSystemId = pFileSystemId_
     }
 
--- | Optional. Maximum number of file system tags to return in the response.
--- It must be an integer with a value greater than zero.
-dtMaxItems :: Lens' DescribeTags (Maybe Natural)
-dtMaxItems = lens _dtMaxItems (\ s a -> s{_dtMaxItems = a}) . mapping _Nat;
-
 -- | Optional. String. Opaque pagination token returned from a previous
 -- 'DescribeTags' operation. If present, it specifies to continue the list
 -- from where the previous call left off.
 dtMarker :: Lens' DescribeTags (Maybe Text)
 dtMarker = lens _dtMarker (\ s a -> s{_dtMarker = a});
 
+-- | Optional. Maximum number of file system tags to return in the response.
+-- It must be an integer with a value greater than zero.
+dtMaxItems :: Lens' DescribeTags (Maybe Natural)
+dtMaxItems = lens _dtMaxItems (\ s a -> s{_dtMaxItems = a}) . mapping _Nat;
+
 -- | The ID of the file system whose tag set you want to retrieve.
 dtFileSystemId :: Lens' DescribeTags Text
 dtFileSystemId = lens _dtFileSystemId (\ s a -> s{_dtFileSystemId = a});
@@ -116,14 +116,14 @@
 instance ToQuery DescribeTags where
         toQuery DescribeTags'{..}
           = mconcat
-              ["MaxItems" =: _dtMaxItems, "Marker" =: _dtMarker]
+              ["Marker" =: _dtMarker, "MaxItems" =: _dtMaxItems]
 
 -- | /See:/ 'describeTagsResponse' smart constructor.
 data DescribeTagsResponse = DescribeTagsResponse'
-    { _dtrsMarker     :: !(Maybe Text)
-    , _dtrsNextMarker :: !(Maybe Text)
-    , _dtrsStatus     :: !Int
-    , _dtrsTags       :: ![Tag]
+    { _dtrsMarker         :: !(Maybe Text)
+    , _dtrsNextMarker     :: !(Maybe Text)
+    , _dtrsResponseStatus :: !Int
+    , _dtrsTags           :: ![Tag]
     } deriving (Eq,Read,Show,Data,Typeable,Generic)
 
 -- | Creates a value of 'DescribeTagsResponse' with the minimum fields required to make a request.
@@ -134,17 +134,17 @@
 --
 -- * 'dtrsNextMarker'
 --
--- * 'dtrsStatus'
+-- * 'dtrsResponseStatus'
 --
 -- * 'dtrsTags'
 describeTagsResponse
-    :: Int -- ^ 'dtrsStatus'
+    :: Int -- ^ 'dtrsResponseStatus'
     -> DescribeTagsResponse
-describeTagsResponse pStatus_ =
+describeTagsResponse pResponseStatus_ =
     DescribeTagsResponse'
     { _dtrsMarker = Nothing
     , _dtrsNextMarker = Nothing
-    , _dtrsStatus = pStatus_
+    , _dtrsResponseStatus = pResponseStatus_
     , _dtrsTags = mempty
     }
 
@@ -161,8 +161,8 @@
 dtrsNextMarker = lens _dtrsNextMarker (\ s a -> s{_dtrsNextMarker = a});
 
 -- | The response status code.
-dtrsStatus :: Lens' DescribeTagsResponse Int
-dtrsStatus = lens _dtrsStatus (\ s a -> s{_dtrsStatus = a});
+dtrsResponseStatus :: Lens' DescribeTagsResponse Int
+dtrsResponseStatus = lens _dtrsResponseStatus (\ s a -> s{_dtrsResponseStatus = a});
 
 -- | Returns tags associated with the file system as an array of 'Tag'
 -- objects.
diff --git a/gen/Network/AWS/EFS/Types.hs b/gen/Network/AWS/EFS/Types.hs
--- a/gen/Network/AWS/EFS/Types.hs
+++ b/gen/Network/AWS/EFS/Types.hs
@@ -18,14 +18,14 @@
     -- * Errors
     , _MountTargetNotFound
     , _SecurityGroupLimitExceeded
+    , _SecurityGroupNotFound
     , _MountTargetConflict
     , _UnsupportedAvailabilityZone
-    , _SecurityGroupNotFound
-    , _FileSystemAlreadyExists
     , _FileSystemLimitExceeded
     , _NetworkInterfaceLimitExceeded
-    , _FileSystemNotFound
+    , _FileSystemAlreadyExists
     , _SubnetNotFound
+    , _FileSystemNotFound
     , _IncorrectFileSystemLifeCycleState
     , _BadRequest
     , _NoFreeAddressesInSubnet
@@ -122,6 +122,12 @@
 _SecurityGroupLimitExceeded =
     _ServiceError . hasStatus 400 . hasCode "SecurityGroupLimitExceeded"
 
+-- | Returned if one of the specified security groups does not exist in the
+-- subnet\'s VPC.
+_SecurityGroupNotFound :: AsError a => Getting (First ServiceError) a ServiceError
+_SecurityGroupNotFound =
+    _ServiceError . hasStatus 400 . hasCode "SecurityGroupNotFound"
+
 -- | Returned if the mount target would violate one of the specified
 -- restrictions based on the file system\'s existing mount targets.
 _MountTargetConflict :: AsError a => Getting (First ServiceError) a ServiceError
@@ -133,18 +139,6 @@
 _UnsupportedAvailabilityZone =
     _ServiceError . hasStatus 400 . hasCode "UnsupportedAvailabilityZone"
 
--- | Returned if one of the specified security groups does not exist in the
--- subnet\'s VPC.
-_SecurityGroupNotFound :: AsError a => Getting (First ServiceError) a ServiceError
-_SecurityGroupNotFound =
-    _ServiceError . hasStatus 400 . hasCode "SecurityGroupNotFound"
-
--- | Returned if the file system you are trying to create already exists,
--- with the creation token you provided.
-_FileSystemAlreadyExists :: AsError a => Getting (First ServiceError) a ServiceError
-_FileSystemAlreadyExists =
-    _ServiceError . hasStatus 409 . hasCode "FileSystemAlreadyExists"
-
 -- | Returned if the AWS account has already created maximum number of file
 -- systems allowed per account.
 _FileSystemLimitExceeded :: AsError a => Getting (First ServiceError) a ServiceError
@@ -161,16 +155,22 @@
 _NetworkInterfaceLimitExceeded =
     _ServiceError . hasStatus 409 . hasCode "NetworkInterfaceLimitExceeded"
 
--- | Returned if the specified 'FileSystemId' does not exist in the
--- requester\'s AWS account.
-_FileSystemNotFound :: AsError a => Getting (First ServiceError) a ServiceError
-_FileSystemNotFound =
-    _ServiceError . hasStatus 404 . hasCode "FileSystemNotFound"
+-- | Returned if the file system you are trying to create already exists,
+-- with the creation token you provided.
+_FileSystemAlreadyExists :: AsError a => Getting (First ServiceError) a ServiceError
+_FileSystemAlreadyExists =
+    _ServiceError . hasStatus 409 . hasCode "FileSystemAlreadyExists"
 
 -- | Returned if there is no subnet with ID 'SubnetId' provided in the
 -- request.
 _SubnetNotFound :: AsError a => Getting (First ServiceError) a ServiceError
 _SubnetNotFound = _ServiceError . hasStatus 400 . hasCode "SubnetNotFound"
+
+-- | Returned if the specified 'FileSystemId' does not exist in the
+-- requester\'s AWS account.
+_FileSystemNotFound :: AsError a => Getting (First ServiceError) a ServiceError
+_FileSystemNotFound =
+    _ServiceError . hasStatus 404 . hasCode "FileSystemNotFound"
 
 -- | Returned if the file system\'s life cycle state is not \"created\".
 _IncorrectFileSystemLifeCycleState :: AsError a => Getting (First ServiceError) a ServiceError
diff --git a/test/Test/AWS/Gen/EFS.hs b/test/Test/AWS/Gen/EFS.hs
--- a/test/Test/AWS/Gen/EFS.hs
+++ b/test/Test/AWS/Gen/EFS.hs
@@ -34,15 +34,15 @@
 --         , testDescribeMountTargets $
 --             describeMountTargets
 --
+--         , testDescribeFileSystems $
+--             describeFileSystems
+--
 --         , testDeleteMountTarget $
 --             deleteMountTarget
 --
 --         , testCreateTags $
 --             createTags
 --
---         , testDescribeFileSystems $
---             describeFileSystems
---
 --         , testDeleteTags $
 --             deleteTags
 --
@@ -70,15 +70,15 @@
 --         , testDescribeMountTargetsResponse $
 --             describeMountTargetsResponse
 --
+--         , testDescribeFileSystemsResponse $
+--             describeFileSystemsResponse
+--
 --         , testDeleteMountTargetResponse $
 --             deleteMountTargetResponse
 --
 --         , testCreateTagsResponse $
 --             createTagsResponse
 --
---         , testDescribeFileSystemsResponse $
---             describeFileSystemsResponse
---
 --         , testDeleteTagsResponse $
 --             deleteTagsResponse
 --
@@ -112,6 +112,11 @@
     "DescribeMountTargets"
     "fixture/DescribeMountTargets.yaml"
 
+testDescribeFileSystems :: DescribeFileSystems -> TestTree
+testDescribeFileSystems = req
+    "DescribeFileSystems"
+    "fixture/DescribeFileSystems.yaml"
+
 testDeleteMountTarget :: DeleteMountTarget -> TestTree
 testDeleteMountTarget = req
     "DeleteMountTarget"
@@ -122,11 +127,6 @@
     "CreateTags"
     "fixture/CreateTags.yaml"
 
-testDescribeFileSystems :: DescribeFileSystems -> TestTree
-testDescribeFileSystems = req
-    "DescribeFileSystems"
-    "fixture/DescribeFileSystems.yaml"
-
 testDeleteTags :: DeleteTags -> TestTree
 testDeleteTags = req
     "DeleteTags"
@@ -173,6 +173,13 @@
     eFS
     (Proxy :: Proxy DescribeMountTargets)
 
+testDescribeFileSystemsResponse :: DescribeFileSystemsResponse -> TestTree
+testDescribeFileSystemsResponse = res
+    "DescribeFileSystemsResponse"
+    "fixture/DescribeFileSystemsResponse.proto"
+    eFS
+    (Proxy :: Proxy DescribeFileSystems)
+
 testDeleteMountTargetResponse :: DeleteMountTargetResponse -> TestTree
 testDeleteMountTargetResponse = res
     "DeleteMountTargetResponse"
@@ -186,13 +193,6 @@
     "fixture/CreateTagsResponse.proto"
     eFS
     (Proxy :: Proxy CreateTags)
-
-testDescribeFileSystemsResponse :: DescribeFileSystemsResponse -> TestTree
-testDescribeFileSystemsResponse = res
-    "DescribeFileSystemsResponse"
-    "fixture/DescribeFileSystemsResponse.proto"
-    eFS
-    (Proxy :: Proxy DescribeFileSystems)
 
 testDeleteTagsResponse :: DeleteTagsResponse -> TestTree
 testDeleteTagsResponse = res
