diff --git a/src/main/java/ctbrec/Config.java b/src/main/java/ctbrec/Config.java
index 13522edf..a1499ed2 100644
--- a/src/main/java/ctbrec/Config.java
+++ b/src/main/java/ctbrec/Config.java
@@ -40,7 +40,7 @@ public class Config {
 
     private void load() throws FileNotFoundException, IOException {
         Moshi moshi = new Moshi.Builder()
-                .add(Model.class, new ModelAdapter())
+                .add(Model.class, new ModelJsonAdapter())
                 .build();
         JsonAdapter<Settings> adapter = moshi.adapter(Settings.class);
         File configDir = OS.getConfigDir();
@@ -76,7 +76,7 @@ public class Config {
 
     public void save() throws IOException {
         Moshi moshi = new Moshi.Builder()
-                .add(Model.class, new ModelAdapter())
+                .add(Model.class, new ModelJsonAdapter())
                 .build();
         JsonAdapter<Settings> adapter = moshi.adapter(Settings.class).indent("  ");
         String json = adapter.toJson(settings);
diff --git a/src/main/java/ctbrec/ModelAdapter.java b/src/main/java/ctbrec/ModelJsonAdapter.java
similarity index 97%
rename from src/main/java/ctbrec/ModelAdapter.java
rename to src/main/java/ctbrec/ModelJsonAdapter.java
index ccb0989f..2aeaefae 100644
--- a/src/main/java/ctbrec/ModelAdapter.java
+++ b/src/main/java/ctbrec/ModelJsonAdapter.java
@@ -8,7 +8,7 @@ import com.squareup.moshi.JsonReader;
 import com.squareup.moshi.JsonReader.Token;
 import com.squareup.moshi.JsonWriter;
 
-public class ModelAdapter extends JsonAdapter<Model> {
+public class ModelJsonAdapter extends JsonAdapter<Model> {
 
     @Override
     public Model fromJson(JsonReader reader) throws IOException {
diff --git a/src/main/java/ctbrec/recorder/RemoteRecorder.java b/src/main/java/ctbrec/recorder/RemoteRecorder.java
index abe6a876..8b8818a3 100644
--- a/src/main/java/ctbrec/recorder/RemoteRecorder.java
+++ b/src/main/java/ctbrec/recorder/RemoteRecorder.java
@@ -19,7 +19,7 @@ import ctbrec.Hmac;
 import ctbrec.HttpClient;
 import ctbrec.InstantJsonAdapter;
 import ctbrec.Model;
-import ctbrec.ModelAdapter;
+import ctbrec.ModelJsonAdapter;
 import ctbrec.Recording;
 import okhttp3.MediaType;
 import okhttp3.Request;
@@ -34,7 +34,7 @@ public class RemoteRecorder implements Recorder {
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     private Moshi moshi = new Moshi.Builder()
             .add(Instant.class, new InstantJsonAdapter())
-            .add(Model.class, new ModelAdapter())
+            .add(Model.class, new ModelJsonAdapter())
             .build();
     private JsonAdapter<ModelListResponse> modelListResponseAdapter = moshi.adapter(ModelListResponse.class);
     private JsonAdapter<RecordingListResponse> recordingListResponseAdapter = moshi.adapter(RecordingListResponse.class);
diff --git a/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/src/main/java/ctbrec/recorder/server/RecorderServlet.java
index 7cf93228..78790799 100644
--- a/src/main/java/ctbrec/recorder/server/RecorderServlet.java
+++ b/src/main/java/ctbrec/recorder/server/RecorderServlet.java
@@ -23,7 +23,7 @@ import com.squareup.moshi.Moshi;
 import ctbrec.ChaturbateModel;
 import ctbrec.InstantJsonAdapter;
 import ctbrec.Model;
-import ctbrec.ModelAdapter;
+import ctbrec.ModelJsonAdapter;
 import ctbrec.Recording;
 import ctbrec.recorder.Recorder;
 
@@ -55,7 +55,7 @@ public class RecorderServlet extends AbstractCtbrecServlet {
             LOG.debug("Request: {}", json);
             Moshi moshi = new Moshi.Builder()
                     .add(Instant.class, new InstantJsonAdapter())
-                    .add(Model.class, new ModelAdapter())
+                    .add(Model.class, new ModelJsonAdapter())
                     .build();
             JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
             Request request = requestAdapter.fromJson(json);