diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index addf8dd..2477984 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
         <activity android:name=".AboutActivity">
         </activity>
         
-        <service android:name=".TraccarService" />
+        <service android:name=".TrackingService" />
         
         <receiver android:name=".AutostartReceiver">
             <intent-filter>
diff --git a/app/src/main/java/org/traccar/client/AutostartReceiver.java b/app/src/main/java/org/traccar/client/AutostartReceiver.java
index f87d2ac..ed8a28a 100644
--- a/app/src/main/java/org/traccar/client/AutostartReceiver.java
+++ b/app/src/main/java/org/traccar/client/AutostartReceiver.java
@@ -29,7 +29,7 @@ public class AutostartReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
     	SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
     	if (sharedPreferences.getBoolean(MainActivity.KEY_STATUS, false)) {
-    		context.startService(new Intent(context, TraccarService.class));
+    		context.startService(new Intent(context, TrackingService.class));
     	}
     }
 
diff --git a/app/src/main/java/org/traccar/client/MainActivity.java b/app/src/main/java/org/traccar/client/MainActivity.java
index 652d877..3c41710 100644
--- a/app/src/main/java/org/traccar/client/MainActivity.java
+++ b/app/src/main/java/org/traccar/client/MainActivity.java
@@ -46,7 +46,8 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
         if (getPreferenceScreen().getSharedPreferences().getBoolean(KEY_STATUS, false)) {
-            startService(new Intent(this, TraccarService.class));
+            setPreferencesEnabled(false);
+            startService(new Intent(this, TrackingService.class));
         }
     }
 
@@ -77,9 +78,9 @@ public class MainActivity extends PreferenceActivity implements OnSharedPreferen
         if (key.equals(KEY_STATUS)) {
             if (sharedPreferences.getBoolean(KEY_STATUS, false)) {
                 setPreferencesEnabled(false);
-                startService(new Intent(this, TraccarService.class));
+                startService(new Intent(this, TrackingService.class));
             } else {
-                stopService(new Intent(this, TraccarService.class));
+                stopService(new Intent(this, TrackingService.class));
                 setPreferencesEnabled(true);
             }
         } else if (key.equals(KEY_ID)) {
diff --git a/app/src/main/java/org/traccar/client/TraccarService.java b/app/src/main/java/org/traccar/client/TrackingService.java
similarity index 96%
rename from app/src/main/java/org/traccar/client/TraccarService.java
rename to app/src/main/java/org/traccar/client/TrackingService.java
index 6d8473d..5aa5a25 100644
--- a/app/src/main/java/org/traccar/client/TraccarService.java
+++ b/app/src/main/java/org/traccar/client/TrackingService.java
@@ -34,9 +34,9 @@ import android.util.Log;
 /**
  * Background service
  */
-public class TraccarService extends Service {
+public class TrackingService extends Service {
 
-    public static final String LOG_TAG = "Traccar.TraccarService";
+    public static final String LOG_TAG = "Traccar.TrackingService";
 
     private String id;
     private String address;
@@ -149,7 +149,7 @@ public class TraccarService extends Service {
 
                     interval = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_INTERVAL, null));
                     positionProvider.stopUpdates();
-                    positionProvider = new PositionProvider(TraccarService.this, provider, interval * 1000, positionListener);
+                    positionProvider = new PositionProvider(TrackingService.this, provider, interval * 1000, positionListener);
                     positionProvider.startUpdates();
 
                 } else if (key.equals(MainActivity.KEY_ID)) {
@@ -161,7 +161,7 @@ public class TraccarService extends Service {
 
                     provider = sharedPreferences.getString(MainActivity.KEY_PROVIDER, null);
                     positionProvider.stopUpdates();
-                    positionProvider = new PositionProvider(TraccarService.this, provider, interval * 1000, positionListener);
+                    positionProvider = new PositionProvider(TrackingService.this, provider, interval * 1000, positionListener);
                     positionProvider.startUpdates();
 
                 } else if (key.equals(MainActivity.KEY_EXTENDED)) {