diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigDecimalShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigDecimalShape.java
index 3cdf3e506d6..167e3624acd 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigDecimalShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigDecimalShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.bigDecimalShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.bigDecimalShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigIntegerShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigIntegerShape.java
index 9ddf94410cb..1d59f4620b3 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigIntegerShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BigIntegerShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.bigIntegerShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.bigIntegerShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BlobShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BlobShape.java
index 363ad2de93d..2f8a3f3d6be 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BlobShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BlobShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.blobShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.blobShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BooleanShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BooleanShape.java
index 5e5d1ca43cb..d2084d573b8 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BooleanShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/BooleanShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.booleanShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.booleanShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ByteShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ByteShape.java
index 27888d0e481..964b90d74d7 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ByteShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ByteShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.byteShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.byteShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DocumentShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DocumentShape.java
index 81a1b016768..3c445a81bb1 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DocumentShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DocumentShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.documentShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.documentShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DoubleShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DoubleShape.java
index f5328a63e32..cb60e177e7a 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DoubleShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/DoubleShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.doubleShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.doubleShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/FloatShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/FloatShape.java
index c8a11373450..3c03fac33c6 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/FloatShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/FloatShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.floatShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.floatShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/IntegerShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/IntegerShape.java
index 49594a37e76..99fb616f202 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/IntegerShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/IntegerShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.integerShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.integerShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ListShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ListShape.java
index efa50cba0e7..e5bb07bb63d 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ListShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ListShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.listShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.listShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/LongShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/LongShape.java
index 898ac2a5a31..a7032ca7870 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/LongShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/LongShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.longShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.longShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MapShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MapShape.java
index 6598135085a..2d5777a8bec 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MapShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MapShape.java
@@ -61,8 +61,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.mapShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.mapShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MemberShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MemberShape.java
index fa5d73c1d0b..8c8f4857a76 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MemberShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/MemberShape.java
@@ -55,8 +55,8 @@ public ShapeId getContainer() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.memberShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.memberShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/OperationShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/OperationShape.java
index 2d4b04333e1..0cfb758bb78 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/OperationShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/OperationShape.java
@@ -55,8 +55,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.operationShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.operationShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ResourceShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ResourceShape.java
index 192e5e0b0a9..c3402cb8e5a 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ResourceShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ResourceShape.java
@@ -82,8 +82,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.resourceShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.resourceShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ServiceShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ServiceShape.java
index 2abb0522526..91be7704b53 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ServiceShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ServiceShape.java
@@ -55,8 +55,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.serviceShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.serviceShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/SetShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/SetShape.java
index 2169ce0cfbc..b3c50051a96 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/SetShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/SetShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.setShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.setShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/Shape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/Shape.java
index c53c7e95e34..623935bc117 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/Shape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/Shape.java
@@ -107,10 +107,10 @@ public static <B extends AbstractShapeBuilder<B, S>, S extends Shape> B shapeToB
      * Dispatches the shape to the appropriate {@link ShapeVisitor} method.
      *
      * @param <R> Return type of the accept.
-     * @param cases NeighborVisitor to use.
+     * @param visitor ShapeVisitor to use.
      * @return Returns the result.
      */
-    public abstract <R> R accept(ShapeVisitor<R> cases);
+    public abstract <R> R accept(ShapeVisitor<R> visitor);
 
     /**
      * Get the {@link ShapeId} of the shape.
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ShortShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ShortShape.java
index bd09a4677cb..4bfff318927 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ShortShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ShortShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.shortShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.shortShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StringShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StringShape.java
index f37f57b8d7d..63f006c662d 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StringShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StringShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.stringShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.stringShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StructureShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StructureShape.java
index 0f85e5bb10b..686f20bc9eb 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StructureShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/StructureShape.java
@@ -40,8 +40,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.structureShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.structureShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/TimestampShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/TimestampShape.java
index 967de42bb38..39d154900de 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/TimestampShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/TimestampShape.java
@@ -36,8 +36,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.timestampShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.timestampShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/UnionShape.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/UnionShape.java
index 0929a6c656d..4536a58fb48 100644
--- a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/UnionShape.java
+++ b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/UnionShape.java
@@ -37,8 +37,8 @@ public Builder toBuilder() {
     }
 
     @Override
-    public <R> R accept(ShapeVisitor<R> cases) {
-        return cases.unionShape(this);
+    public <R> R accept(ShapeVisitor<R> visitor) {
+        return visitor.unionShape(this);
     }
 
     @Override
diff --git a/smithy-model/src/test/java/software/amazon/smithy/model/shapes/ShapeVisitorDefaultTest.java b/smithy-model/src/test/java/software/amazon/smithy/model/shapes/ShapeVisitorDefaultTest.java
index f9868c7e0ad..0e9fbda1642 100644
--- a/smithy-model/src/test/java/software/amazon/smithy/model/shapes/ShapeVisitorDefaultTest.java
+++ b/smithy-model/src/test/java/software/amazon/smithy/model/shapes/ShapeVisitorDefaultTest.java
@@ -22,67 +22,67 @@
 public class ShapeVisitorDefaultTest {
 
     @Test
-    public void sendsCasesToDefaultValue() {
-        ShapeVisitor<Integer> cases = new ShapeVisitor.Default<Integer>() {
+    public void sendsVisitorToDefaultValue() {
+        ShapeVisitor<Integer> visitor = new ShapeVisitor.Default<Integer>() {
             @Override
             protected Integer getDefault(Shape shape) {
                 return 1;
             }
         };
 
-        testCases(cases);
+        testCases(visitor);
     }
 
-    private void testCases(ShapeVisitor<Integer> cases) {
+    private void testCases(ShapeVisitor<Integer> visitor) {
         Integer value = 1;
-        assertEquals(value, BlobShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, BooleanShape.builder().id("ns.foo#Bar").build().accept(cases));
+        assertEquals(value, BlobShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, BooleanShape.builder().id("ns.foo#Bar").build().accept(visitor));
         assertEquals(value, ListShape.builder()
                 .id("ns.foo#Bar")
                 .member(MemberShape.builder().id("ns.foo#Bar$member").target("ns.foo#Baz").build())
                 .build()
-                .accept(cases));
+                .accept(visitor));
         assertEquals(value, SetShape.builder()
                 .id("ns.foo#Bar")
                 .member(MemberShape.builder().id("ns.foo#Bar$member").target("ns.foo#Baz").build())
                 .build()
-                .accept(cases));
+                .accept(visitor));
         assertEquals(value, MapShape.builder()
                 .id("ns.foo#Bar")
                 .key(MemberShape.builder().id("ns.foo#Bar$key").target("ns.foo#Baz").build())
                 .value(MemberShape.builder().id("ns.foo#Bar$value").target("ns.foo#Baz").build())
                 .build()
-                .accept(cases));
+                .accept(visitor));
         assertEquals(value, OperationShape.builder()
                 .id("ns.foo#Bar")
                 .build()
-                .accept(cases));
-        assertEquals(value, ResourceShape.builder().id("ns.foo#Bar").build().accept(cases));
+                .accept(visitor));
+        assertEquals(value, ResourceShape.builder().id("ns.foo#Bar").build().accept(visitor));
         assertEquals(value, ServiceShape.builder()
                 .id("ns.foo#Bar")
                 .version("2017-01-17")
                 .build()
-                .accept(cases));
-        assertEquals(value, StringShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, StructureShape.builder().id("ns.foo#Bar").build().accept(cases));
+                .accept(visitor));
+        assertEquals(value, StringShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, StructureShape.builder().id("ns.foo#Bar").build().accept(visitor));
         assertEquals(value, UnionShape.builder()
                 .id("ns.foo#Bar")
                 .addMember(MemberShape.builder().id("ns.foo#Bar$baz").target("ns.foo#Abc").build())
                 .build()
-                .accept(cases));
+                .accept(visitor));
         assertEquals(value, MemberShape.builder()
                 .id("ns.foo#Bar$member")
                 .target("ns.foo#Bam")
                 .build()
-                .accept(cases));
-        assertEquals(value, TimestampShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, ByteShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, ShortShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, IntegerShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, LongShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, FloatShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, DoubleShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, BigDecimalShape.builder().id("ns.foo#Bar").build().accept(cases));
-        assertEquals(value, BigIntegerShape.builder().id("ns.foo#Bar").build().accept(cases));
+                .accept(visitor));
+        assertEquals(value, TimestampShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, ByteShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, ShortShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, IntegerShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, LongShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, FloatShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, DoubleShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, BigDecimalShape.builder().id("ns.foo#Bar").build().accept(visitor));
+        assertEquals(value, BigIntegerShape.builder().id("ns.foo#Bar").build().accept(visitor));
     }
 }
diff --git a/smithy-model/src/test/java/software/amazon/smithy/model/validation/NodeValidationVisitorTest.java b/smithy-model/src/test/java/software/amazon/smithy/model/validation/NodeValidationVisitorTest.java
index fa9b0c6a7b3..9767510fa0c 100644
--- a/smithy-model/src/test/java/software/amazon/smithy/model/validation/NodeValidationVisitorTest.java
+++ b/smithy-model/src/test/java/software/amazon/smithy/model/validation/NodeValidationVisitorTest.java
@@ -56,11 +56,11 @@ public static void after() {
     public void nodeValidationVisitorTest(String target, String value, String[] errors) {
         ShapeId targetId = ShapeId.from(target);
         Node nodeValue = Node.parse(value);
-        NodeValidationVisitor cases = NodeValidationVisitor.builder()
+        NodeValidationVisitor visitor = NodeValidationVisitor.builder()
                 .value(nodeValue)
                 .model(MODEL)
                 .build();
-        List<ValidationEvent> events = MODEL.expectShape(targetId).accept(cases);
+        List<ValidationEvent> events = MODEL.expectShape(targetId).accept(visitor);
 
         if (errors != null) {
             List<String> messages = events.stream().map(ValidationEvent::getMessage).collect(Collectors.toList());
@@ -291,55 +291,55 @@ public static Collection<Object[]> data() {
 
     @Test
     public void canSuccessfullyValidateTimestampsAsUnixTimestamps() {
-        NodeValidationVisitor cases = NodeValidationVisitor.builder()
+        NodeValidationVisitor visitor = NodeValidationVisitor.builder()
                 .value(Node.from(1234))
                 .model(MODEL)
                 .timestampValidationStrategy(TimestampValidationStrategy.EPOCH_SECONDS)
                 .build();
         List<ValidationEvent> events = MODEL
                 .expectShape(ShapeId.from("ns.foo#TimestampList$member"))
-                .accept(cases);
+                .accept(visitor);
 
         assertThat(events, empty());
     }
 
     @Test
     public void canUnsuccessfullyValidateTimestampsAsUnixTimestamps() {
-        NodeValidationVisitor cases = NodeValidationVisitor.builder()
+        NodeValidationVisitor visitor = NodeValidationVisitor.builder()
                 .value(Node.from("foo"))
                 .model(MODEL)
                 .timestampValidationStrategy(TimestampValidationStrategy.EPOCH_SECONDS)
                 .build();
         List<ValidationEvent> events = MODEL
                 .expectShape(ShapeId.from("ns.foo#TimestampList$member"))
-                .accept(cases);
+                .accept(visitor);
 
         assertThat(events, not(empty()));
     }
 
     @Test
     public void doesNotAllowNullByDefault() {
-        NodeValidationVisitor cases = NodeValidationVisitor.builder()
+        NodeValidationVisitor visitor = NodeValidationVisitor.builder()
                 .value(Node.nullNode())
                 .model(MODEL)
                 .build();
         List<ValidationEvent> events = MODEL
                 .expectShape(ShapeId.from("smithy.api#String"))
-                .accept(cases);
+                .accept(visitor);
 
         assertThat(events, not(empty()));
     }
 
     @Test
     public void canConfigureToSupportNull() {
-        NodeValidationVisitor cases = NodeValidationVisitor.builder()
+        NodeValidationVisitor visitor = NodeValidationVisitor.builder()
                 .value(Node.nullNode())
                 .model(MODEL)
                 .allowBoxedNull(true)
                 .build();
         List<ValidationEvent> events = MODEL
                 .expectShape(ShapeId.from("smithy.api#String"))
-                .accept(cases);
+                .accept(visitor);
 
         assertThat(events, empty());
     }