diff --git a/apollo-ios-codegen/Sources/ApolloCodegenLib/ApolloCodegenConfiguration.swift b/apollo-ios-codegen/Sources/ApolloCodegenLib/ApolloCodegenConfiguration.swift
index fc437b253..b5ab6b58f 100644
--- a/apollo-ios-codegen/Sources/ApolloCodegenLib/ApolloCodegenConfiguration.swift
+++ b/apollo-ios-codegen/Sources/ApolloCodegenLib/ApolloCodegenConfiguration.swift
@@ -1448,7 +1448,7 @@ extension ApolloCodegenConfiguration.ConversionStrategies {
   
   /// ``CaseConversionStrategy`` is used to specify the strategy used to convert the casing of
   /// GraphQL schema values into generated Swift code.
-  @available(*, deprecated, message: "Use EnumCaseConversionStrategy instead.")
+  @available(*, deprecated, message: "Use EnumCases instead.")
     public enum CaseConversionStrategy: String, Codable, Equatable {
       /// Generates swift code using the exact name provided in the GraphQL schema
       /// performing no conversion.
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json
index c71c5d847..5cc2b3205 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/anyhashableconvertible.json
@@ -801,6 +801,14 @@
         "text" : " conforms to ",
         "type" : "text"
       },
+      {
+        "code" : "AnyScalarType",
+        "type" : "codeVoice"
+      },
+      {
+        "text" : " and ",
+        "type" : "text"
+      },
       {
         "code" : "Hashable",
         "type" : "codeVoice"
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/graphqloperation/operationtype-14lsi.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/graphqloperation/operationtype-14lsi.json
index fd8e881ae..c402ae21c 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/graphqloperation/operationtype-14lsi.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/graphqloperation/operationtype-14lsi.json
@@ -2,8 +2,8 @@
   "defaultImplementationsSections" : [
     {
       "identifiers" : [
-        "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/GraphQLOperation\/operationType-370r3",
         "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/GraphQLOperation\/operationType-5e63x",
+        "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/GraphQLOperation\/operationType-370r3",
         "doc:\/\/ApolloAPI\/documentation\/ApolloAPI\/GraphQLOperation\/operationType-90ybj"
       ],
       "title" : "GraphQLOperation Implementations"
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json
index f85102d5a..f86956ee6 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/jsonencodable.json
@@ -901,7 +901,7 @@
         "type" : "text"
       },
       {
-        "code" : "AnyScalarType",
+        "code" : "JSONEncodable",
         "type" : "codeVoice"
       },
       {
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json
index d3cad4b2c..2fb350ad7 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apolloapi/swift/optional.json
@@ -225,6 +225,14 @@
         "text" : " conforms to ",
         "type" : "text"
       },
+      {
+        "code" : "AnyScalarType",
+        "type" : "codeVoice"
+      },
+      {
+        "text" : " and ",
+        "type" : "text"
+      },
       {
         "code" : "Hashable",
         "type" : "codeVoice"
@@ -446,7 +454,7 @@
         "type" : "text"
       },
       {
-        "code" : "AnyScalarType",
+        "code" : "JSONEncodable",
         "type" : "codeVoice"
       },
       {
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy.json b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy.json
index 12c31ac2e..ffab75757 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy.json
@@ -22,7 +22,7 @@
     {
       "inlineContent" : [
         {
-          "text" : "Use EnumCaseConversionStrategy instead.",
+          "text" : "Use EnumCases instead.",
           "type" : "text"
         }
       ],
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/camelcase.json b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/camelcase.json
index 9d258a46f..cfff41e38 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/camelcase.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/camelcase.json
@@ -33,7 +33,7 @@
     {
       "inlineContent" : [
         {
-          "text" : "Use EnumCaseConversionStrategy instead.",
+          "text" : "Use EnumCases instead.",
           "type" : "text"
         }
       ],
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/init(rawvalue:).json b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/init(rawvalue:).json
index c52121b52..ee2d427a4 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/init(rawvalue:).json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/init(rawvalue:).json
@@ -17,7 +17,7 @@
     {
       "inlineContent" : [
         {
-          "text" : "Use EnumCaseConversionStrategy instead.",
+          "text" : "Use EnumCases instead.",
           "type" : "text"
         }
       ],
diff --git a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/none.json b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/none.json
index bcac0cf87..3dc7ab565 100644
--- a/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/none.json
+++ b/docs/docc/Apollo.doccarchive/data/documentation/apollocodegenlib/apollocodegenconfiguration/conversionstrategies/caseconversionstrategy/none.json
@@ -17,7 +17,7 @@
     {
       "inlineContent" : [
         {
-          "text" : "Use EnumCaseConversionStrategy instead.",
+          "text" : "Use EnumCases instead.",
           "type" : "text"
         }
       ],