diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/SubnetworkInfo.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/SubnetworkInfo.java
index 05eb0c95fc03..5be0d875d738 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/SubnetworkInfo.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/SubnetworkInfo.java
@@ -67,7 +67,7 @@ public Subnetwork apply(SubnetworkInfo subnetwork) {
   /**
    * A builder for {@code SubnetworkInfo} objects.
    */
-  public static abstract class Builder {
+  public abstract static class Builder {
 
     abstract Builder id(String id);
 
@@ -81,7 +81,7 @@ public static abstract class Builder {
     /**
      * Sets an optional textual description of the subnetwork.
      */
-    abstract public Builder description(String description);
+    public abstract Builder description(String description);
 
     abstract Builder gatewayAddress(String gatewayAddress);
 
@@ -89,7 +89,7 @@ public static abstract class Builder {
      * Sets the identity of the network to which this subnetwork belongs. Only networks that are in
      * subnet mode can have subnetworks.
      */
-    abstract public Builder network(NetworkId network);
+    public abstract Builder network(NetworkId network);
 
     /**
      * Sets the range of internal IPv4 addresses that are owned by this subnetwork. This range must
@@ -98,12 +98,12 @@ public static abstract class Builder {
      *
      * @see <a href="https://wikipedia.org/wiki/Classless_Inter-Domain_Routing">CIDR</a>
      */
-    abstract public Builder ipRange(String ipRange);
+    public abstract Builder ipRange(String ipRange);
 
     /**
      * Creates a {@code SubnetworkInfo} object.
      */
-    abstract public SubnetworkInfo build();
+    public abstract SubnetworkInfo build();
   }
 
   static final class BuilderImpl extends Builder {
diff --git a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SubnetworkInfoTest.java b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SubnetworkInfoTest.java
index 64d2e92852c9..83ba0bf9baab 100644
--- a/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SubnetworkInfoTest.java
+++ b/gcloud-java-compute/src/test/java/com/google/gcloud/compute/SubnetworkInfoTest.java
@@ -30,9 +30,9 @@ public class SubnetworkInfoTest {
       SubnetworkId.of("project", "region", "subnetwork");
   private static final String GATEWAY_ADDRESS = "192.168.1.1";
   private static final NetworkId NETWORK_ID = NetworkId.of("project", "network");
-  private static final String IP_CIDR_RANGE = "192.168.0.0/16";
+  private static final String IP_RANGE = "192.168.0.0/16";
   private static final SubnetworkInfo SUBNETWORK_INFO =
-      SubnetworkInfo.builder(SUBNETWORK_ID, NETWORK_ID, IP_CIDR_RANGE)
+      SubnetworkInfo.builder(SUBNETWORK_ID, NETWORK_ID, IP_RANGE)
           .id(ID)
           .creationTimestamp(CREATION_TIMESTAMP)
           .description(DESCRIPTION)
@@ -51,7 +51,7 @@ public void testToBuilder() {
 
   @Test
   public void testToBuilderIncomplete() {
-    SubnetworkInfo subnetworkInfo = SubnetworkInfo.of(SUBNETWORK_ID, NETWORK_ID, IP_CIDR_RANGE);
+    SubnetworkInfo subnetworkInfo = SubnetworkInfo.of(SUBNETWORK_ID, NETWORK_ID, IP_RANGE);
     assertEquals(subnetworkInfo, subnetworkInfo.toBuilder().build());
   }
 
@@ -63,25 +63,25 @@ public void testBuilder() {
     assertEquals(DESCRIPTION, SUBNETWORK_INFO.description());
     assertEquals(GATEWAY_ADDRESS, SUBNETWORK_INFO.gatewayAddress());
     assertEquals(NETWORK_ID, SUBNETWORK_INFO.network());
-    assertEquals(IP_CIDR_RANGE, SUBNETWORK_INFO.ipRange());
+    assertEquals(IP_RANGE, SUBNETWORK_INFO.ipRange());
   }
 
   @Test
   public void testOf() {
-    SubnetworkInfo subnetworkInfo = SubnetworkInfo.of(SUBNETWORK_ID, NETWORK_ID, IP_CIDR_RANGE);
+    SubnetworkInfo subnetworkInfo = SubnetworkInfo.of(SUBNETWORK_ID, NETWORK_ID, IP_RANGE);
     assertNull(subnetworkInfo.id());
     assertEquals(SUBNETWORK_ID, subnetworkInfo.subnetworkId());
     assertNull(subnetworkInfo.creationTimestamp());
     assertNull(subnetworkInfo.description());
     assertNull(subnetworkInfo.gatewayAddress());
     assertEquals(NETWORK_ID, subnetworkInfo.network());
-    assertEquals(IP_CIDR_RANGE, subnetworkInfo.ipRange());
+    assertEquals(IP_RANGE, subnetworkInfo.ipRange());
   }
 
   @Test
   public void testToAndFromPb() {
     compareSubnetworkInfo(SUBNETWORK_INFO, SubnetworkInfo.fromPb(SUBNETWORK_INFO.toPb()));
-    SubnetworkInfo subnetworkInfo = SubnetworkInfo.of(SUBNETWORK_ID, NETWORK_ID, IP_CIDR_RANGE);
+    SubnetworkInfo subnetworkInfo = SubnetworkInfo.of(SUBNETWORK_ID, NETWORK_ID, IP_RANGE);
     compareSubnetworkInfo(subnetworkInfo, SubnetworkInfo.fromPb(subnetworkInfo.toPb()));
   }