diff --git a/amazonka-rds.cabal b/amazonka-rds.cabal
--- a/amazonka-rds.cabal
+++ b/amazonka-rds.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-rds
-version:               0.2.2
+version:               0.2.3
 synopsis:              Amazon Relational Database Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -99,5 +99,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core == 0.2.2.*
+          amazonka-core == 0.2.3.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs b/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
--- a/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
+++ b/gen/Network/AWS/RDS/DescribeDBEngineVersions.hs
@@ -214,6 +214,6 @@
 
 instance AWSPager DescribeDBEngineVersions where
     page rq rs
-        | stop (rq ^. ddbevMarker) = Nothing
+        | stop (rs ^. ddbevrMarker) = Nothing
         | otherwise = (\x -> rq & ddbevMarker ?~ x)
             <$> (rs ^. ddbevrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeDBInstances.hs b/gen/Network/AWS/RDS/DescribeDBInstances.hs
--- a/gen/Network/AWS/RDS/DescribeDBInstances.hs
+++ b/gen/Network/AWS/RDS/DescribeDBInstances.hs
@@ -169,6 +169,6 @@
 
 instance AWSPager DescribeDBInstances where
     page rq rs
-        | stop (rq ^. ddbi1Marker) = Nothing
+        | stop (rs ^. ddbirMarker) = Nothing
         | otherwise = (\x -> rq & ddbi1Marker ?~ x)
             <$> (rs ^. ddbirMarker)
diff --git a/gen/Network/AWS/RDS/DescribeDBLogFiles.hs b/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
--- a/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
+++ b/gen/Network/AWS/RDS/DescribeDBLogFiles.hs
@@ -200,6 +200,6 @@
 
 instance AWSPager DescribeDBLogFiles where
     page rq rs
-        | stop (rq ^. ddblfMarker) = Nothing
+        | stop (rs ^. ddblfrMarker) = Nothing
         | otherwise = (\x -> rq & ddblfMarker ?~ x)
             <$> (rs ^. ddblfrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs b/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBParameterGroups.hs
@@ -169,6 +169,6 @@
 
 instance AWSPager DescribeDBParameterGroups where
     page rq rs
-        | stop (rq ^. ddbpgMarker) = Nothing
+        | stop (rs ^. ddbpgrMarker) = Nothing
         | otherwise = (\x -> rq & ddbpgMarker ?~ x)
             <$> (rs ^. ddbpgrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeDBParameters.hs b/gen/Network/AWS/RDS/DescribeDBParameters.hs
--- a/gen/Network/AWS/RDS/DescribeDBParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeDBParameters.hs
@@ -180,6 +180,6 @@
 
 instance AWSPager DescribeDBParameters where
     page rq rs
-        | stop (rq ^. ddbpMarker) = Nothing
+        | stop (rs ^. ddbprMarker) = Nothing
         | otherwise = (\x -> rq & ddbpMarker ?~ x)
             <$> (rs ^. ddbprMarker)
diff --git a/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs b/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSecurityGroups.hs
@@ -164,6 +164,6 @@
 
 instance AWSPager DescribeDBSecurityGroups where
     page rq rs
-        | stop (rq ^. ddbsg1Marker) = Nothing
+        | stop (rs ^. ddbsgr1Marker) = Nothing
         | otherwise = (\x -> rq & ddbsg1Marker ?~ x)
             <$> (rs ^. ddbsgr1Marker)
diff --git a/gen/Network/AWS/RDS/DescribeDBSnapshots.hs b/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
--- a/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSnapshots.hs
@@ -199,6 +199,6 @@
 
 instance AWSPager DescribeDBSnapshots where
     page rq rs
-        | stop (rq ^. ddbsMarker) = Nothing
+        | stop (rs ^. ddbsrMarker) = Nothing
         | otherwise = (\x -> rq & ddbsMarker ?~ x)
             <$> (rs ^. ddbsrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs b/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
--- a/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeDBSubnetGroups.hs
@@ -165,6 +165,6 @@
 
 instance AWSPager DescribeDBSubnetGroups where
     page rq rs
-        | stop (rq ^. ddbsgMarker) = Nothing
+        | stop (rs ^. ddbsgrMarker) = Nothing
         | otherwise = (\x -> rq & ddbsgMarker ?~ x)
             <$> (rs ^. ddbsgrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs b/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
--- a/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
+++ b/gen/Network/AWS/RDS/DescribeEngineDefaultParameters.hs
@@ -150,6 +150,6 @@
 
 instance AWSPager DescribeEngineDefaultParameters where
     page rq rs
-        | stop (rq ^. dedpMarker) = Nothing
+        | stop (rs ^. dedprEngineDefaults . edMarker) = Nothing
         | otherwise = (\x -> rq & dedpMarker ?~ x)
             <$> (rs ^. dedprEngineDefaults . edMarker)
diff --git a/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs b/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
--- a/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
+++ b/gen/Network/AWS/RDS/DescribeEventSubscriptions.hs
@@ -169,6 +169,6 @@
 
 instance AWSPager DescribeEventSubscriptions where
     page rq rs
-        | stop (rq ^. des1Marker) = Nothing
+        | stop (rs ^. desrMarker) = Nothing
         | otherwise = (\x -> rq & des1Marker ?~ x)
             <$> (rs ^. desrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeEvents.hs b/gen/Network/AWS/RDS/DescribeEvents.hs
--- a/gen/Network/AWS/RDS/DescribeEvents.hs
+++ b/gen/Network/AWS/RDS/DescribeEvents.hs
@@ -235,6 +235,6 @@
 
 instance AWSPager DescribeEvents where
     page rq rs
-        | stop (rq ^. deMarker) = Nothing
+        | stop (rs ^. derMarker) = Nothing
         | otherwise = (\x -> rq & deMarker ?~ x)
             <$> (rs ^. derMarker)
diff --git a/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs b/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
--- a/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
+++ b/gen/Network/AWS/RDS/DescribeOptionGroupOptions.hs
@@ -173,6 +173,6 @@
 
 instance AWSPager DescribeOptionGroupOptions where
     page rq rs
-        | stop (rq ^. dogoMarker) = Nothing
+        | stop (rs ^. dogorMarker) = Nothing
         | otherwise = (\x -> rq & dogoMarker ?~ x)
             <$> (rs ^. dogorMarker)
diff --git a/gen/Network/AWS/RDS/DescribeOptionGroups.hs b/gen/Network/AWS/RDS/DescribeOptionGroups.hs
--- a/gen/Network/AWS/RDS/DescribeOptionGroups.hs
+++ b/gen/Network/AWS/RDS/DescribeOptionGroups.hs
@@ -186,6 +186,6 @@
 
 instance AWSPager DescribeOptionGroups where
     page rq rs
-        | stop (rq ^. dogMarker) = Nothing
+        | stop (rs ^. dogrMarker) = Nothing
         | otherwise = (\x -> rq & dogMarker ?~ x)
             <$> (rs ^. dogrMarker)
diff --git a/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs b/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
--- a/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
+++ b/gen/Network/AWS/RDS/DescribeOrderableDBInstanceOptions.hs
@@ -212,6 +212,6 @@
 
 instance AWSPager DescribeOrderableDBInstanceOptions where
     page rq rs
-        | stop (rq ^. dodbioMarker) = Nothing
+        | stop (rs ^. dodbiorMarker) = Nothing
         | otherwise = (\x -> rq & dodbioMarker ?~ x)
             <$> (rs ^. dodbiorMarker)
diff --git a/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs b/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
--- a/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
+++ b/gen/Network/AWS/RDS/DescribeReservedDBInstances.hs
@@ -239,6 +239,6 @@
 
 instance AWSPager DescribeReservedDBInstances where
     page rq rs
-        | stop (rq ^. drdbiMarker) = Nothing
+        | stop (rs ^. drdbirMarker) = Nothing
         | otherwise = (\x -> rq & drdbiMarker ?~ x)
             <$> (rs ^. drdbirMarker)
diff --git a/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs b/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
--- a/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
+++ b/gen/Network/AWS/RDS/DescribeReservedDBInstancesOfferings.hs
@@ -228,6 +228,6 @@
 
 instance AWSPager DescribeReservedDBInstancesOfferings where
     page rq rs
-        | stop (rq ^. drdbioMarker) = Nothing
+        | stop (rs ^. drdbiorMarker) = Nothing
         | otherwise = (\x -> rq & drdbioMarker ?~ x)
             <$> (rs ^. drdbiorMarker)
diff --git a/gen/Network/AWS/RDS/Waiters.hs b/gen/Network/AWS/RDS/Waiters.hs
--- a/gen/Network/AWS/RDS/Waiters.hs
+++ b/gen/Network/AWS/RDS/Waiters.hs
@@ -50,7 +50,8 @@
     , _waitAttempts  = 60
     , _waitDelay     = 30
     , _waitAcceptors =
-        [ matchAll "deleted" AcceptSuccess
+        [ matchError "DBInstanceNotFound" AcceptSuccess
+        , matchAll "deleted" AcceptSuccess
             (folding (concatOf ddbirDBInstances) . dbiDBInstanceStatus . _Just)
         , matchAny "creating" AcceptFailure
             (folding (concatOf ddbirDBInstances) . dbiDBInstanceStatus . _Just)