diff --git a/src/main/java/com/stripe/model/EphemeralKey.java b/src/main/java/com/stripe/model/EphemeralKey.java
index 46add31cba9..1c7e2616cbd 100644
--- a/src/main/java/com/stripe/model/EphemeralKey.java
+++ b/src/main/java/com/stripe/model/EphemeralKey.java
@@ -24,7 +24,7 @@ public class EphemeralKey extends ApiResource implements HasId {
   Long expires;
 
   /** Unique identifier for the object. */
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   @SerializedName("id")
   String id;
 
@@ -100,7 +100,7 @@ public EphemeralKey delete(RequestOptions options) throws StripeException {
   @Setter
   @EqualsAndHashCode(callSuper = false)
   public static class AssociatedObject extends StripeObject implements HasId {
-    @Getter(onMethod = @__({@Override}))
+    @Getter(onMethod_ = {@Override})
     String id;
 
     String type;
diff --git a/src/main/java/com/stripe/model/Event.java b/src/main/java/com/stripe/model/Event.java
index 689d3aec79b..511711e3107 100644
--- a/src/main/java/com/stripe/model/Event.java
+++ b/src/main/java/com/stripe/model/Event.java
@@ -34,7 +34,7 @@ public class Event extends ApiResource implements HasId {
   EventData data;
 
   /** Unique identifier for the object. */
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   @SerializedName("id")
   String id;
 
diff --git a/src/main/java/com/stripe/model/File.java b/src/main/java/com/stripe/model/File.java
index ffa9924809f..117678c8597 100644
--- a/src/main/java/com/stripe/model/File.java
+++ b/src/main/java/com/stripe/model/File.java
@@ -25,7 +25,7 @@ public class File extends ApiResource implements HasId {
   String filename;
 
   /** Unique identifier for the object. */
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   @SerializedName("id")
   String id;
 
diff --git a/src/main/java/com/stripe/model/StripeCollection.java b/src/main/java/com/stripe/model/StripeCollection.java
index a1c994b717f..3faeadf49e8 100644
--- a/src/main/java/com/stripe/model/StripeCollection.java
+++ b/src/main/java/com/stripe/model/StripeCollection.java
@@ -39,16 +39,13 @@ public abstract class StripeCollection<T extends HasId> extends StripeObject
     implements StripeCollectionInterface<T> {
   String object;
 
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   List<T> data;
 
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   Boolean hasMore;
 
-  @Getter(onMethod = @__({@Override}))
-  Long totalCount;
-
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   String url;
 
   /**
@@ -59,11 +56,21 @@ public abstract class StripeCollection<T extends HasId> extends StripeObject
    */
   @Deprecated Long count;
 
-  @Getter(onMethod = @__({@Override}))
+  /**
+   * The {@code total_count} attribute.
+   *
+   * @deprecated Use pagination parameters instead.
+   * @see <a href="https://stripe.com/docs/api/java#pagination">Pagination</a>
+   */
+  @Deprecated
+  @Getter(onMethod_ = {@Override})
+  Long totalCount;
+
+  @Getter(onMethod_ = {@Override})
   @Setter(onMethod = @__({@Override}))
   private RequestOptions requestOptions;
 
-  @Getter(onMethod = @__({@Override}))
+  @Getter(onMethod_ = {@Override})
   @Setter(onMethod = @__({@Override}))
   private Map<String, Object> requestParams;
 
diff --git a/src/main/java/com/stripe/model/StripeCollectionInterface.java b/src/main/java/com/stripe/model/StripeCollectionInterface.java
index 78427246722..e93bfb3f81b 100644
--- a/src/main/java/com/stripe/model/StripeCollectionInterface.java
+++ b/src/main/java/com/stripe/model/StripeCollectionInterface.java
@@ -9,10 +9,17 @@ public interface StripeCollectionInterface<T> {
 
   Boolean getHasMore();
 
-  Long getTotalCount();
-
   String getUrl();
 
+  /**
+   * The {@code total_count} attribute.
+   *
+   * @deprecated Use pagination parameters instead.
+   * @see <a href="https://stripe.com/docs/api/java#pagination">Pagination</a>
+   */
+  @Deprecated
+  Long getTotalCount();
+
   /**
    * Get request options that were used to fetch the collection. This is useful for purposes of
    * pagination.
diff --git a/src/main/java/com/stripe/param/FileCreateParams.java b/src/main/java/com/stripe/param/FileCreateParams.java
index 18af5cb8032..7011af1d949 100644
--- a/src/main/java/com/stripe/param/FileCreateParams.java
+++ b/src/main/java/com/stripe/param/FileCreateParams.java
@@ -228,7 +228,7 @@ public enum Purpose implements ApiRequestParams.EnumParam {
     @SerializedName("tax_document_user_upload")
     TAX_DOCUMENT_USER_UPLOAD("tax_document_user_upload");
 
-    @Getter(onMethod = @__({@Override}))
+    @Getter(onMethod_ = {@Override})
     private final String value;
 
     Purpose(String value) {
diff --git a/src/main/java/com/stripe/param/FileListParams.java b/src/main/java/com/stripe/param/FileListParams.java
index 3fa281d51cb..b4dc2f3d8fd 100644
--- a/src/main/java/com/stripe/param/FileListParams.java
+++ b/src/main/java/com/stripe/param/FileListParams.java
@@ -262,7 +262,7 @@ public enum Purpose implements ApiRequestParams.EnumParam {
     @SerializedName("tax_document_user_upload")
     TAX_DOCUMENT_USER_UPLOAD("tax_document_user_upload");
 
-    @Getter(onMethod = @__({@Override}))
+    @Getter(onMethod_ = {@Override})
     private final String value;
 
     Purpose(String value) {