diff --git a/app/src/main/java/org/traccar/client/Protocol.java b/app/src/main/java/org/traccar/client/ProtocolFormatter.java
similarity index 99%
rename from app/src/main/java/org/traccar/client/Protocol.java
rename to app/src/main/java/org/traccar/client/ProtocolFormatter.java
index 68ac547..1941ea1 100644
--- a/app/src/main/java/org/traccar/client/Protocol.java
+++ b/app/src/main/java/org/traccar/client/ProtocolFormatter.java
@@ -23,7 +23,7 @@ import java.util.TimeZone;
 import android.location.Location;
 import android.net.Uri;
 
-public class Protocol {
+public class ProtocolFormatter {
 
     public static String formatRequest(String address, int port, String id, Location l, double battery) {
 
diff --git a/app/src/main/java/org/traccar/client/TraccarService.java b/app/src/main/java/org/traccar/client/TraccarService.java
index afb007c..55a5656 100644
--- a/app/src/main/java/org/traccar/client/TraccarService.java
+++ b/app/src/main/java/org/traccar/client/TraccarService.java
@@ -72,7 +72,7 @@ public class TraccarService extends Service {
             Log.w(LOG_TAG, error);
         }
 
-        clientController = new ClientController(this, address, port, Protocol.createLoginMessage(id));
+        clientController = new ClientController(this, address, port, ProtocolFormatter.createLoginMessage(id));
         clientController.start();
 
         positionProvider = new PositionProvider(this, provider, interval * 1000, positionListener);
@@ -123,7 +123,7 @@ public class TraccarService extends Service {
         public void onPositionUpdate(Location location) {
             if (location != null) {
                 StatusActivity.addMessage(getString(R.string.status_location_update));
-                clientController.setNewLocation(Protocol.createLocationMessage(extended, location, getBatteryLevel()));
+                clientController.setNewLocation(ProtocolFormatter.createLocationMessage(extended, location, getBatteryLevel()));
             }
         }
 
@@ -155,7 +155,7 @@ public class TraccarService extends Service {
                 } else if (key.equals(TraccarActivity.KEY_ID)) {
 
                     id = sharedPreferences.getString(TraccarActivity.KEY_ID, null);
-                    clientController.setNewLogin(Protocol.createLoginMessage(id));
+                    clientController.setNewLogin(ProtocolFormatter.createLoginMessage(id));
 
                 } else if (key.equals(TraccarActivity.KEY_PROVIDER)) {
 
diff --git a/app/src/test/java/org/traccar/client/ProtocolTest.java b/app/src/test/java/org/traccar/client/ProtocolFormatterTest.java
similarity index 82%
rename from app/src/test/java/org/traccar/client/ProtocolTest.java
rename to app/src/test/java/org/traccar/client/ProtocolFormatterTest.java
index c1dd9e9..3f9df6e 100644
--- a/app/src/test/java/org/traccar/client/ProtocolTest.java
+++ b/app/src/test/java/org/traccar/client/ProtocolFormatterTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
-public class ProtocolTest {
+public class ProtocolFormatterTest {
 
     @Test
     public void testFormatRequest() throws Exception {
@@ -20,7 +20,7 @@ public class ProtocolTest {
         Location location = new Location("gps");
         location.setTime(0);
 
-        String url = Protocol.formatRequest("localhost", 5055, "123456789012345", location, 0);
+        String url = ProtocolFormatter.formatRequest("localhost", 5055, "123456789012345", location, 0);
 
         assertEquals("http://localhost:5055?id=123456789012345&timestamp=0&lat=0.0&lon=0.0&speed=0.0&bearing=0.0&altitude=0.0&batt=0.0", url);