diff --git a/moshi/src/main/java/com/squareup/moshi/JsonReader.java b/moshi/src/main/java/com/squareup/moshi/JsonReader.java
index e4b1142..a2c06c3 100644
--- a/moshi/src/main/java/com/squareup/moshi/JsonReader.java
+++ b/moshi/src/main/java/com/squareup/moshi/JsonReader.java
@@ -422,7 +422,7 @@ public abstract class JsonReader implements Closeable {
         ByteString[] result = new ByteString[strings.length];
         Buffer buffer = new Buffer();
         for (int i = 0; i < strings.length; i++) {
-          JsonUt8Writer.string(buffer, strings[i]);
+          JsonUtf8Writer.string(buffer, strings[i]);
           buffer.readByte(); // Skip the leading double quote (but leave the trailing one).
           result[i] = buffer.readByteString();
         }
diff --git a/moshi/src/main/java/com/squareup/moshi/JsonUt8Writer.java b/moshi/src/main/java/com/squareup/moshi/JsonUtf8Writer.java
similarity index 99%
rename from moshi/src/main/java/com/squareup/moshi/JsonUt8Writer.java
rename to moshi/src/main/java/com/squareup/moshi/JsonUtf8Writer.java
index 7dd59ab..a049573 100644
--- a/moshi/src/main/java/com/squareup/moshi/JsonUt8Writer.java
+++ b/moshi/src/main/java/com/squareup/moshi/JsonUtf8Writer.java
@@ -27,7 +27,7 @@ import static com.squareup.moshi.JsonScope.NONEMPTY_ARRAY;
 import static com.squareup.moshi.JsonScope.NONEMPTY_DOCUMENT;
 import static com.squareup.moshi.JsonScope.NONEMPTY_OBJECT;
 
-final class JsonUt8Writer extends JsonWriter {
+final class JsonUtf8Writer extends JsonWriter {
 
   /*
    * From RFC 7159, "All Unicode characters may be placed within the
@@ -62,7 +62,7 @@ final class JsonUt8Writer extends JsonWriter {
 
   private String deferredName;
 
-  JsonUt8Writer(BufferedSink sink) {
+  JsonUtf8Writer(BufferedSink sink) {
     if (sink == null) {
       throw new NullPointerException("sink == null");
     }
diff --git a/moshi/src/main/java/com/squareup/moshi/JsonWriter.java b/moshi/src/main/java/com/squareup/moshi/JsonWriter.java
index 7e74f6c..96c86bd 100644
--- a/moshi/src/main/java/com/squareup/moshi/JsonWriter.java
+++ b/moshi/src/main/java/com/squareup/moshi/JsonWriter.java
@@ -138,7 +138,7 @@ public abstract class JsonWriter implements Closeable, Flushable {
 
   /** Returns a new instance that writes UTF-8 encoded JSON to {@code sink}. */
   public static JsonWriter of(BufferedSink sink) {
-    return new JsonUt8Writer(sink);
+    return new JsonUtf8Writer(sink);
   }
 
   JsonWriter() {
diff --git a/moshi/src/test/java/com/squareup/moshi/JsonCodecFactory.java b/moshi/src/test/java/com/squareup/moshi/JsonCodecFactory.java
index afa4e32..1bab51a 100644
--- a/moshi/src/test/java/com/squareup/moshi/JsonCodecFactory.java
+++ b/moshi/src/test/java/com/squareup/moshi/JsonCodecFactory.java
@@ -35,7 +35,7 @@ abstract class JsonCodecFactory {
 
       @Override JsonWriter newWriter() {
         buffer = new Buffer();
-        return new JsonUt8Writer(buffer);
+        return new JsonUtf8Writer(buffer);
       }
 
       @Override String json() {
diff --git a/moshi/src/test/java/com/squareup/moshi/JsonUt8WriterTest.java b/moshi/src/test/java/com/squareup/moshi/JsonUtf8WriterTest.java
similarity index 98%
rename from moshi/src/test/java/com/squareup/moshi/JsonUt8WriterTest.java
rename to moshi/src/test/java/com/squareup/moshi/JsonUtf8WriterTest.java
index 6227d49..b5b424a 100644
--- a/moshi/src/test/java/com/squareup/moshi/JsonUt8WriterTest.java
+++ b/moshi/src/test/java/com/squareup/moshi/JsonUtf8WriterTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public final class JsonUt8WriterTest {
+public final class JsonUtf8WriterTest {
   @Test public void prettyPrintObject() throws IOException {
     Buffer buffer = new Buffer();
     JsonWriter writer = JsonWriter.of(buffer);