diff --git a/build.gradle b/build.gradle
index d7ed29a8e..bc45106e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        applicationId "com.google.android.maps.mytracks"
+        applicationId "de.dennisguse.opentracks"
         minSdkVersion 21
         targetSdkVersion 28
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java b/src/androidTest/java/de/dennisguse/opentracks/BootReceiverTest.java
similarity index 94%
rename from src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/BootReceiverTest.java
index 5f572443c..e64c857e9 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/BootReceiverTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -24,7 +24,7 @@ import android.content.Intent;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.google.android.apps.mytracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingService;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -39,7 +39,7 @@ import java.util.List;
  */
 @RunWith(AndroidJUnit4.class)
 public class BootReceiverTest {
-    private static final String SERVICE_NAME = "com.google.android.apps.mytracks.services.TrackRecordingService";
+    private static final String SERVICE_NAME = "de.dennisguse.opentracks.services.TrackRecordingService";
 
     /**
      * Tests the behavior when receive notification which is the phone boot.
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/src/androidTest/java/de/dennisguse/opentracks/ChartValueSeriesTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/ChartValueSeriesTest.java
index 0b878e2c0..b1b9d4180 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/ChartValueSeriesTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java
similarity index 92%
rename from src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java
rename to src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java
index 773f655ba..02439159e 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 /**
  * Commons utilities for creating stubs of track, location. The class will be
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java
index 398771d95..5e440ca49 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderTest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
@@ -22,7 +22,7 @@ import android.net.Uri;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.google.android.apps.mytracks.content.CustomContentProvider.DatabaseHelper;
+import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java
similarity index 98%
rename from src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java
index 6bc893e65..663ed450b 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/CustomContentProviderUtilsImplTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/CustomContentProviderUtilsImplTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -25,11 +25,11 @@ import android.test.mock.MockContentResolver;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationFactory;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationIterator;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
-import com.google.android.apps.mytracks.stats.TripStatistics;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.services.TrackRecordingServiceTest.MockContext;
+import de.dennisguse.opentracks.stats.TripStatistics;
 import com.google.android.testing.mocking.AndroidMock;
 import com.google.android.testing.mocking.UsesMocks;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java
index 1b38a5092..5bb8aa07d 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorImplTest.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.R;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java
index 2e2d91bab..298af9c07 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.ContentUris;
 import android.location.Location;
@@ -24,10 +24,10 @@ import android.test.mock.MockContentResolver;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.google.android.apps.mytracks.content.SearchEngine.ScoredResult;
-import com.google.android.apps.mytracks.content.SearchEngine.SearchQuery;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
-import com.google.android.apps.mytracks.stats.TripStatistics;
+import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
+import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
+import de.dennisguse.opentracks.services.TrackRecordingServiceTest.MockContext;
+import de.dennisguse.opentracks.stats.TripStatistics;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java
similarity index 98%
rename from src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java
index b8015bc57..b4c9c5eda 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -28,13 +28,13 @@ import android.test.mock.MockContentResolver;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.TrackStubUtils;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationFactory;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationIterator;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.TrackStubUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.services.TrackRecordingServiceTest.MockContext;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 import com.google.android.testing.mocking.AndroidMock;
 import com.google.android.testing.mocking.UsesMocks;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/WaypointCreationRequestTest.java
similarity index 94%
rename from src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/content/WaypointCreationRequestTest.java
index ae0cad1b0..7ce02fd5e 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/WaypointCreationRequestTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.os.Parcel;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 
 import org.junit.Assert;
 import org.junit.runner.RunWith;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java
index b8fd08768..e01481858 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java
@@ -14,19 +14,19 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.location.Location;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.google.android.apps.mytracks.ChartView;
-import com.google.android.apps.mytracks.TrackStubUtils;
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.sensor.Sensor;
-import com.google.android.apps.mytracks.content.sensor.Sensor.SensorDataSet;
-import com.google.android.apps.mytracks.util.UnitConversions;
+import de.dennisguse.opentracks.ChartView;
+import de.dennisguse.opentracks.TrackStubUtils;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.sensor.Sensor;
+import de.dennisguse.opentracks.content.sensor.Sensor.SensorDataSet;
+import de.dennisguse.opentracks.util.UnitConversions;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java
similarity index 92%
rename from src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java
rename to src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java
index 02cac3707..11dbb2b7d 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.ContentUris;
 import android.location.Location;
@@ -22,13 +22,13 @@ import android.location.LocationManager;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.Factory;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TracksColumns;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.WaypointsColumns;
-import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils.Factory;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.WaypointsColumns;
+import de.dennisguse.opentracks.testing.TestingProviderUtilsFactory;
 import com.google.android.testing.mocking.AndroidMock;
 import com.google.android.testing.mocking.UsesMocks;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java
similarity index 98%
rename from src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java
index 812081636..e20131d75 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 import com.google.android.testing.mocking.AndroidMock;
 
 import org.easymock.Capture;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java
similarity index 96%
rename from src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java
index 70a343100..b637b07a2 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporterTest.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 import com.google.android.testing.mocking.AndroidMock;
 
 import org.easymock.Capture;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LocationsMatcher.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java
rename to src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LocationsMatcher.java
index a91ed960f..6d725f96b 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/LocationsMatcher.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.location.Location;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java
similarity index 98%
rename from src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java
index 4e91d4d70..9c477e0d3 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import junit.framework.TestCase;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/ControlRecordingServiceTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/ControlRecordingServiceTest.java
index 6d1faab98..532b58892 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/ControlRecordingServiceTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.RemoteException;
 import android.test.ServiceTestCase;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 import com.google.android.testing.mocking.UsesMocks;
 
 import org.easymock.EasyMock;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
similarity index 97%
rename from src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
index 3a9800031..378ecf748 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -37,16 +37,16 @@ import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.CustomContentProvider;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.CustomContentProvider;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java
similarity index 95%
rename from src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java
index f18b0ad4a..d8899e138 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskTest.java
similarity index 99%
rename from src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskTest.java
index 8bdfa1317..6e445daec 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 import android.speech.tts.TextToSpeech;
@@ -23,8 +23,8 @@ import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.test.AndroidTestCase;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.StringUtils;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
 import com.google.android.testing.mocking.AndroidMock;
 import com.google.android.testing.mocking.UsesMocks;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TripStatisticsTest.java
similarity index 98%
rename from src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/stats/TripStatisticsTest.java
index 73c6e529e..583d7fff2 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TripStatisticsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.stats;
+package de.dennisguse.opentracks.stats;
 
 import junit.framework.TestCase;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java
similarity index 98%
rename from src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java
index a0391f961..ef508319a 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.os.Environment;
 
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
similarity index 99%
rename from src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
index 152f665b1..0f6ad3c38 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
diff --git a/src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
similarity index 96%
rename from src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java
rename to src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
index 7506a5fff..f38c4f67e 100644
--- a/src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 import org.junit.Assert;
 import org.junit.runner.RunWith;
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 1219470ef..4f89f3aab 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.maps.mytracks"
+    package="de.dennisguse.opentracks"
     android:installLocation="auto"
     android:versionCode="74"
     android:versionName="2.0.6">
@@ -34,10 +34,10 @@ limitations under the License.
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- Permissions to access My Tracks data -->
-    <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
+    <uses-permission android:name="de.dennisguse.opentracks.MYTRACKS_NOTIFICATIONS" />
     <!-- Permission to receive My Tracks internal broadcasts -->
     <permission
-        android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
+        android:name="de.dennisguse.opentracks.MYTRACKS_NOTIFICATIONS"
         android:permissionGroup="android.permission-group.LOCATION"
         android:protectionLevel="signature" />
     <!-- Required features -->
@@ -85,10 +85,10 @@ limitations under the License.
         tools:replace="android:label">
         <!-- Activities -->
         <activity
-            android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
+            android:name="de.dennisguse.opentracks.AggregatedStatsActivity"
             android:label="@string/menu_aggregated_statistics" />
-        <activity android:name="com.google.android.apps.mytracks.DeleteActivity" />
-        <activity android:name="com.google.android.apps.mytracks.io.file.importer.ImportActivity">
+        <activity android:name="de.dennisguse.opentracks.DeleteActivity" />
+        <activity android:name="de.dennisguse.opentracks.io.file.importer.ImportActivity">
             <intent-filter>
                 <action android:name="android.intent.action.ATTACH_DATA" />
                 <action android:name="android.intent.action.VIEW" />
@@ -103,17 +103,17 @@ limitations under the License.
                 <data android:scheme="file" />
             </intent-filter>
         </activity>
-        <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
-        <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
+        <activity android:name="de.dennisguse.opentracks.MarkerEditActivity" />
+        <activity android:name="de.dennisguse.opentracks.MarkerDetailActivity" />
         <activity
-            android:name="com.google.android.apps.mytracks.MarkerListActivity"
+            android:name="de.dennisguse.opentracks.MarkerListActivity"
             android:label="@string/menu_markers">
             <meta-data
                 android:name="android.app.default_searchable"
-                android:value="com.google.android.apps.mytracks.SearchListActivity" />
+                android:value="de.dennisguse.opentracks.SearchListActivity" />
         </activity>
         <activity
-            android:name="com.google.android.apps.mytracks.SearchListActivity"
+            android:name="de.dennisguse.opentracks.SearchListActivity"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -123,31 +123,31 @@ limitations under the License.
                 android:resource="@xml/search" />
         </activity>
         <activity
-            android:name="com.google.android.apps.mytracks.TrackDetailActivity"
-            android:parentActivityName="com.google.android.apps.mytracks.TrackListActivity">
+            android:name="de.dennisguse.opentracks.TrackDetailActivity"
+            android:parentActivityName="de.dennisguse.opentracks.TrackListActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.google.android.apps.mytracks.TrackListActivity" />
+                android:value="de.dennisguse.opentracks.TrackListActivity" />
         </activity>
-        <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
-        <activity android:name="com.google.android.apps.mytracks.TrackListActivity">
+        <activity android:name="de.dennisguse.opentracks.TrackEditActivity" />
+        <activity android:name="de.dennisguse.opentracks.TrackListActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <meta-data
                 android:name="android.app.default_searchable"
-                android:value="com.google.android.apps.mytracks.SearchListActivity" />
+                android:value="de.dennisguse.opentracks.SearchListActivity" />
         </activity>
-        <activity android:name="com.google.android.apps.mytracks.io.file.exporter.SaveActivity" />
-        <activity android:name="com.google.android.apps.mytracks.settings.AdvancedSettingsActivity" />
-        <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
-        <activity android:name="com.google.android.apps.mytracks.settings.RecordingSettingsActivity" />
-        <activity android:name="com.google.android.apps.mytracks.settings.SensorSettingsActivity" />
-        <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
-        <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
+        <activity android:name="de.dennisguse.opentracks.io.file.exporter.SaveActivity" />
+        <activity android:name="de.dennisguse.opentracks.settings.AdvancedSettingsActivity" />
+        <activity android:name="de.dennisguse.opentracks.settings.ChartSettingsActivity" />
+        <activity android:name="de.dennisguse.opentracks.settings.RecordingSettingsActivity" />
+        <activity android:name="de.dennisguse.opentracks.settings.SensorSettingsActivity" />
+        <activity android:name="de.dennisguse.opentracks.settings.SettingsActivity" />
+        <activity android:name="de.dennisguse.opentracks.settings.StatsSettingsActivity" />
         <activity
-            android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
+            android:name="de.dennisguse.opentracks.widgets.TrackWidgetConfigActivity"
             android:label="@string/track_widget_config_title">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -155,28 +155,28 @@ limitations under the License.
         </activity>
 
         <service
-            android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
+            android:name="de.dennisguse.opentracks.services.ControlRecordingService"
             android:exported="false" />
         <service
-            android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
+            android:name="de.dennisguse.opentracks.services.TrackRecordingService"
             android:enabled="true"
             android:exported="false"
             android:icon="@drawable/ic_arrow_320"
             android:label="@string/recording_service" />
         <!-- Receivers -->
-        <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
+        <receiver android:name="de.dennisguse.opentracks.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
+        <receiver android:name="de.dennisguse.opentracks.widgets.TrackWidgetProvider">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="com.google.android.apps.mytracks.TRACK_PAUSED" />
-                <action android:name="com.google.android.apps.mytracks.TRACK_RESUMED" />
-                <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
-                <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
-                <action android:name="com.google.android.apps.mytracks.TRACK_UPDATE" />
+                <action android:name="de.dennisguse.opentracks.TRACK_PAUSED" />
+                <action android:name="de.dennisguse.opentracks.TRACK_RESUMED" />
+                <action android:name="de.dennisguse.opentracks.TRACK_STARTED" />
+                <action android:name="de.dennisguse.opentracks.TRACK_STOPPED" />
+                <action android:name="de.dennisguse.opentracks.TRACK_UPDATE" />
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
@@ -184,19 +184,19 @@ limitations under the License.
         </receiver>
         <!-- Providers -->
         <provider
-            android:name="com.google.android.apps.mytracks.content.CustomContentProvider"
-            android:authorities="com.google.android.maps.mytracks"
+            android:name="de.dennisguse.opentracks.content.CustomContentProvider"
+            android:authorities="de.dennisguse.opentracks"
             android:exported="false"
             android:grantUriPermissions="true" />
         <!-- Search suggestion provider -->
         <provider
-            android:name="com.google.android.apps.mytracks.content.SearchEngineProvider"
-            android:authorities="com.google.android.maps.mytracks.search"
+            android:name="de.dennisguse.opentracks.content.SearchEngineProvider"
+            android:authorities="de.dennisguse.opentracks.search"
             android:exported="false" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.google.android.apps.mytracks.fileprovider"
+            android:authorities="de.dennisguse.opentracks.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/AbstractActivity.java
rename to src/main/java/de/dennisguse/opentracks/AbstractActivity.java
index 4286a0a57..c649ed60f 100644
--- a/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.app.ActionBar;
 import android.os.Bundle;
@@ -24,7 +24,7 @@ import android.view.MenuItem;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.apps.mytracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
 
 /**
  * @author Jimmy Shih
diff --git a/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractTrackActivity.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java
rename to src/main/java/de/dennisguse/opentracks/AbstractTrackActivity.java
index 01fa4c0f1..2f53eb78a 100644
--- a/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/AbstractTrackActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -29,13 +29,13 @@ import android.widget.AbsListView;
 import android.widget.ListView;
 import android.widget.SearchView;
 
-import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment;
-import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment.ConfirmDeleteCaller;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment.ConfirmDeleteCaller;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/src/main/java/de/dennisguse/opentracks/AggregatedStatsActivity.java
similarity index 84%
rename from src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java
rename to src/main/java/de/dennisguse/opentracks/AggregatedStatsActivity.java
index c2b8cdf27..347c85f40 100644
--- a/src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/AggregatedStatsActivity.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.os.Bundle;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.StatsUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.StatsUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.List;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/BootReceiver.java b/src/main/java/de/dennisguse/opentracks/BootReceiver.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/BootReceiver.java
rename to src/main/java/de/dennisguse/opentracks/BootReceiver.java
index eded4b317..7728d8bfb 100644
--- a/src/main/java/com/google/android/apps/mytracks/BootReceiver.java
+++ b/src/main/java/de/dennisguse/opentracks/BootReceiver.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingService;
 
 import static android.content.Intent.ACTION_BOOT_COMPLETED;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java b/src/main/java/de/dennisguse/opentracks/ChartValueSeries.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java
rename to src/main/java/de/dennisguse/opentracks/ChartValueSeries.java
index 212c09a0c..369dd8800 100644
--- a/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java
+++ b/src/main/java/de/dennisguse/opentracks/ChartValueSeries.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -25,7 +25,7 @@ import android.graphics.Path;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.stats.ExtremityMonitor;
+import de.dennisguse.opentracks.stats.ExtremityMonitor;
 
 import java.text.NumberFormat;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/ChartView.java b/src/main/java/de/dennisguse/opentracks/ChartView.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/ChartView.java
rename to src/main/java/de/dennisguse/opentracks/ChartView.java
index 8683d410c..fef767a6c 100644
--- a/src/main/java/com/google/android/apps/mytracks/ChartView.java
+++ b/src/main/java/de/dennisguse/opentracks/ChartView.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.content.Context;
 import android.content.Intent;
@@ -33,16 +33,15 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.widget.Scroller;
 
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.stats.ExtremityMonitor;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
-
 import java.text.NumberFormat;
 import java.util.ArrayList;
 
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.stats.ExtremityMonitor;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+
 /**
  * Visualization of the chart.
  *
diff --git a/src/main/java/com/google/android/apps/mytracks/Constants.java b/src/main/java/de/dennisguse/opentracks/Constants.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/Constants.java
rename to src/main/java/de/dennisguse/opentracks/Constants.java
index f8725cb25..b0dfc3a34 100644
--- a/src/main/java/com/google/android/apps/mytracks/Constants.java
+++ b/src/main/java/de/dennisguse/opentracks/Constants.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 /**
  * Common constants.
diff --git a/src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java b/src/main/java/de/dennisguse/opentracks/ContextualActionModeCallback.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java
rename to src/main/java/de/dennisguse/opentracks/ContextualActionModeCallback.java
index b86e03b5d..62144ca3c 100644
--- a/src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java
+++ b/src/main/java/de/dennisguse/opentracks/ContextualActionModeCallback.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.view.Menu;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/DeleteActivity.java b/src/main/java/de/dennisguse/opentracks/DeleteActivity.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/DeleteActivity.java
rename to src/main/java/de/dennisguse/opentracks/DeleteActivity.java
index 0f241245e..d2fc4114a 100644
--- a/src/main/java/com/google/android/apps/mytracks/DeleteActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/DeleteActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -22,8 +22,8 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity for delete tracks.
diff --git a/src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java b/src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java
rename to src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java
index 6343a1c67..941933302 100644
--- a/src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java
+++ b/src/main/java/de/dennisguse/opentracks/DeleteAsyncTask.java
@@ -1,4 +1,4 @@
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 /*
  * Copyright 2013 Google Inc.
@@ -19,7 +19,7 @@ package com.google.android.apps.mytracks;
 import android.content.Context;
 import android.os.AsyncTask;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
 
 /**
  * Async Task to delete tracks.
diff --git a/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java
similarity index 90%
rename from src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java
rename to src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java
index a1e95e8bc..db122a1f4 100644
--- a/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/MarkerDetailActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.database.Cursor;
 import android.os.Bundle;
@@ -25,11 +25,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
-import com.google.android.apps.mytracks.fragments.MarkerDetailFragment;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
+import de.dennisguse.opentracks.fragments.MarkerDetailFragment;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java
rename to src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
index ff3f01bbc..bafe8ef19 100644
--- a/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/MarkerEditActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -25,13 +25,13 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity to add/edit a marker.
diff --git a/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
rename to src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
index ceb78cc71..152919e60 100644
--- a/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/MarkerListActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.content.Context;
 import android.content.Intent;
@@ -40,16 +40,16 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.WaypointsColumns;
-import com.google.android.apps.mytracks.fragments.DeleteMarkerDialogFragment;
-import com.google.android.apps.mytracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.ListItemUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.WaypointsColumns;
+import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
+import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.ListItemUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * Activity to show a list of markers in a track.
diff --git a/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/SearchListActivity.java
rename to src/main/java/de/dennisguse/opentracks/SearchListActivity.java
index 7f012e77f..4894f22c4 100644
--- a/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.app.SearchManager;
 import android.content.Context;
@@ -38,26 +38,26 @@ import android.widget.ListView;
 
 import androidx.annotation.NonNull;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.SearchEngine;
-import com.google.android.apps.mytracks.content.SearchEngine.ScoredResult;
-import com.google.android.apps.mytracks.content.SearchEngine.SearchQuery;
-import com.google.android.apps.mytracks.content.SearchEngineProvider;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment;
-import com.google.android.apps.mytracks.fragments.DeleteMarkerDialogFragment;
-import com.google.android.apps.mytracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.ListItemUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.SearchEngine;
+import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
+import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
+import de.dennisguse.opentracks.content.SearchEngineProvider;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment;
+import de.dennisguse.opentracks.fragments.DeleteMarkerDialogFragment.DeleteMarkerCaller;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.ListItemUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java b/src/main/java/de/dennisguse/opentracks/TabsAdapter.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/TabsAdapter.java
rename to src/main/java/de/dennisguse/opentracks/TabsAdapter.java
index 69b78f628..10c4e6859 100644
--- a/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/TabsAdapter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/src/main/java/com/google/android/apps/mytracks/TrackController.java b/src/main/java/de/dennisguse/opentracks/TrackController.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/TrackController.java
rename to src/main/java/de/dennisguse/opentracks/TrackController.java
index 39bb92c27..c1e187e74 100644
--- a/src/main/java/com/google/android/apps/mytracks/TrackController.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackController.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.app.Activity;
 import android.os.Handler;
@@ -23,11 +23,11 @@ import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import com.google.android.apps.mytracks.services.ITrackRecordingService;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.services.ITrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 /**
  * Track controller for record, pause, resume, and stop.
diff --git a/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
rename to src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
index 5bbb71a51..3c5308d7f 100644
--- a/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.Manifest;
 import android.content.Context;
@@ -41,28 +41,28 @@ import androidx.core.app.TaskStackBuilder;
 import androidx.core.content.FileProvider;
 import androidx.viewpager.widget.ViewPager;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TrackDataHub;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.fragments.ChartFragment;
-import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment;
-import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
-import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment;
-import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
-import com.google.android.apps.mytracks.fragments.StatsFragment;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.settings.SettingsActivity;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.apps.mytracks.util.TrackUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.fragments.ChartFragment;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
+import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.fragments.FrequencyDialogFragment;
+import de.dennisguse.opentracks.fragments.StatsFragment;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.util.TrackUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
similarity index 91%
rename from src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java
rename to src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
index 343b8715f..9312aa2d8 100644
--- a/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -28,15 +28,15 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment;
-import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.apps.mytracks.util.TrackUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.util.TrackUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity that let's the user see and edit the user editable track meta
diff --git a/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
rename to src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index 3d9018fe4..8f40ae449 100644
--- a/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks;
+package de.dennisguse.opentracks;
 
 import android.Manifest;
 import android.app.SearchManager;
@@ -53,29 +53,27 @@ import androidx.loader.app.LoaderManager.LoaderCallbacks;
 import androidx.loader.content.CursorLoader;
 import androidx.loader.content.Loader;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.TracksColumns;
-import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment;
-import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment;
-import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment.FileTypeCaller;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.exporter.SaveActivity;
-import com.google.android.apps.mytracks.io.file.importer.ImportActivity;
-import com.google.android.apps.mytracks.services.ITrackRecordingService;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.settings.SettingsActivity;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.ListItemUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.apps.mytracks.util.TrackUtils;
-import com.google.android.maps.mytracks.BuildConfig;
-import com.google.android.maps.mytracks.R;
-
 import java.util.Locale;
 
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment;
+import de.dennisguse.opentracks.fragments.FileTypeDialogFragment;
+import de.dennisguse.opentracks.fragments.FileTypeDialogFragment.FileTypeCaller;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.io.file.exporter.SaveActivity;
+import de.dennisguse.opentracks.io.file.importer.ImportActivity;
+import de.dennisguse.opentracks.services.ITrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.settings.SettingsActivity;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.ListItemUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.util.TrackUtils;
+
 /**
  * An activity displaying a list of tracks.
  *
diff --git a/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java
rename to src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java
index fd507e41c..00c75a059 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -22,7 +22,7 @@ import android.location.Location;
 import android.location.LocationManager;
 import android.net.Uri;
 
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 
 import java.util.Iterator;
 import java.util.List;
@@ -38,7 +38,7 @@ public interface ContentProviderUtils {
      * The authority (the first part of the URI) for the app's content
      * provider.
      */
-    String AUTHORITY = "com.google.android.maps.mytracks";
+    String AUTHORITY = "de.dennisguse.opentracks";
     /**
      * The default {@link LocationFactory} which creates a location each time.
      */
diff --git a/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtilsImpl.java b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtilsImpl.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtilsImpl.java
rename to src/main/java/de/dennisguse/opentracks/content/ContentProviderUtilsImpl.java
index 0aa012f62..31d69b8e7 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/ContentProviderUtilsImpl.java
+++ b/src/main/java/de/dennisguse/opentracks/content/ContentProviderUtilsImpl.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -24,10 +24,10 @@ import android.location.Location;
 import android.net.Uri;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.FileUtils;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.FileUtils;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java b/src/main/java/de/dennisguse/opentracks/content/ContentTypeIds.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java
rename to src/main/java/de/dennisguse/opentracks/content/ContentTypeIds.java
index a788154d7..4459b7565 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java
+++ b/src/main/java/de/dennisguse/opentracks/content/ContentTypeIds.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 /**
  * Utilities for serializing primitive types.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java
rename to src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java
index 066c727bf..ad607f9b4 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/CustomContentProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/content/CustomContentProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -36,7 +36,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.util.FileUtils;
+import de.dennisguse.opentracks.util.FileUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/com/google/android/apps/mytracks/content/DataSource.java b/src/main/java/de/dennisguse/opentracks/content/DataSource.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/content/DataSource.java
rename to src/main/java/de/dennisguse/opentracks/content/DataSource.java
index dcd80c9b0..9e38e1ba0 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/DataSource.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DataSource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -23,7 +23,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.database.ContentObserver;
 import android.net.Uri;
 
-import com.google.android.apps.mytracks.Constants;
+import de.dennisguse.opentracks.Constants;
 
 /**
  * Data source on the phone.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java b/src/main/java/de/dennisguse/opentracks/content/DataSourceListener.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java
rename to src/main/java/de/dennisguse/opentracks/content/DataSourceListener.java
index 1cf4d9953..673d63def 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DataSourceListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 
 /**
diff --git a/src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java b/src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java
rename to src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java
index f12f338db..f493b704a 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DataSourceManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
diff --git a/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java
rename to src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java
index 885fddf61..be2a5683f 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TripStatistics;
 
 import java.util.Vector;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
rename to src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java
index c1d57c814..d4cd05b8f 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGeneratorImpl.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.Context;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import java.util.Vector;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java
rename to src/main/java/de/dennisguse/opentracks/content/SearchEngine.java
index 8aa09cd1e..4771cc47d 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java
+++ b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.database.Cursor;
 import android.location.Location;
 
 import androidx.annotation.NonNull;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java b/src/main/java/de/dennisguse/opentracks/content/SearchEngineProvider.java
similarity index 90%
rename from src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java
rename to src/main/java/de/dennisguse/opentracks/content/SearchEngineProvider.java
index fb215e538..e49582502 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/content/SearchEngineProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.Context;
 import android.content.SearchRecentSuggestionsProvider;
@@ -26,7 +26,7 @@ import android.provider.SearchRecentSuggestions;
  */
 public class SearchEngineProvider extends SearchRecentSuggestionsProvider {
 
-    private static final String AUTHORITY = "com.google.android.maps.mytracks.search";
+    private static final String AUTHORITY = "de.dennisguse.opentracks.search";
     private static final int MODE = DATABASE_MODE_QUERIES;
 
     public SearchEngineProvider() {
diff --git a/src/main/java/com/google/android/apps/mytracks/content/SensorDataSetLocation.java b/src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/content/SensorDataSetLocation.java
rename to src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java
index a2867ad6f..eb38da5ff 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/SensorDataSetLocation.java
+++ b/src/main/java/de/dennisguse/opentracks/content/SensorDataSetLocation.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 /**
  * This class extends the standard Android location with extra information.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/Track.java b/src/main/java/de/dennisguse/opentracks/content/Track.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/content/Track.java
rename to src/main/java/de/dennisguse/opentracks/content/Track.java
index 5e234c08d..7dd5e7d47 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/content/Track.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.location.Location;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TripStatistics;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java
rename to src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
index 89de4e8ac..127a82390 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -25,10 +25,10 @@ import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationIterator;
-import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.Collections;
 import java.util.EnumSet;
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java
rename to src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java
index be89edb3a..9155f2a74 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.location.Location;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java
rename to src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java
index ec54168b3..4bf474cbb 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.util.Log;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataType.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java
rename to src/main/java/de/dennisguse/opentracks/content/TrackDataType.java
index 3c3966b35..a239023c9 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataType.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 /**
  * Types of track data.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java b/src/main/java/de/dennisguse/opentracks/content/TrackPointsColumns.java
similarity index 86%
rename from src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java
rename to src/main/java/de/dennisguse/opentracks/content/TrackPointsColumns.java
index 05af026d1..b84287b54 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackPointsColumns.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
@@ -27,9 +27,9 @@ import android.provider.BaseColumns;
 public interface TrackPointsColumns extends BaseColumns {
 
     String TABLE_NAME = "trackpoints";
-    Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/trackpoints");
-    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.trackpoint";
-    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.trackpoint";
+    Uri CONTENT_URI = Uri.parse("content://de.dennisguse.opentracks/trackpoints");
+    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.de.dennisguse.trackpoint";
+    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.de.dennisguse.trackpoint";
     String DEFAULT_SORT_ORDER = "_id";
 
     // Columns
diff --git a/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java b/src/main/java/de/dennisguse/opentracks/content/TracksColumns.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java
rename to src/main/java/de/dennisguse/opentracks/content/TracksColumns.java
index 39cb01989..eb3ae7a04 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TracksColumns.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
@@ -31,17 +31,17 @@ public interface TracksColumns extends BaseColumns {
     /**
      * Tracks provider uri.
      */
-    Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/tracks");
+    Uri CONTENT_URI = Uri.parse("content://de.dennisguse.opentracks/tracks");
 
     /**
      * Track content type.
      */
-    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.track";
+    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.de.dennisguse.track";
 
     /**
      * Track id content type.
      */
-    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.track";
+    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.de.dennisguse.track";
 
     /**
      * Tracks table default sort order.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java b/src/main/java/de/dennisguse/opentracks/content/Waypoint.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/content/Waypoint.java
rename to src/main/java/de/dennisguse/opentracks/content/Waypoint.java
index 443d52936..a1d5cf638 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java
+++ b/src/main/java/de/dennisguse/opentracks/content/Waypoint.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.location.Location;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TripStatistics;
 
 /**
  * A waypoint.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java b/src/main/java/de/dennisguse/opentracks/content/WaypointCreationRequest.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java
rename to src/main/java/de/dennisguse/opentracks/content/WaypointCreationRequest.java
index fd4397315..d52c9dea2 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java
+++ b/src/main/java/de/dennisguse/opentracks/content/WaypointCreationRequest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 
 /**
  * A request for the service to create a waypoint at the current location.
diff --git a/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java b/src/main/java/de/dennisguse/opentracks/content/WaypointsColumns.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java
rename to src/main/java/de/dennisguse/opentracks/content/WaypointsColumns.java
index 27f361c93..caa49f1a6 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java
+++ b/src/main/java/de/dennisguse/opentracks/content/WaypointsColumns.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.content;
+package de.dennisguse.opentracks.content;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
@@ -27,9 +27,9 @@ import android.provider.BaseColumns;
 public interface WaypointsColumns extends BaseColumns {
 
     String TABLE_NAME = "waypoints";
-    Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/waypoints");
-    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.waypoint";
-    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.waypoint";
+    Uri CONTENT_URI = Uri.parse("content://de.dennisguse.opentracks/waypoints");
+    String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.de.dennisguse.waypoint";
+    String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.de.dennisguse.waypoint";
     String DEFAULT_SORT_ORDER = "_id";
 
     // Columns
diff --git a/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java
rename to src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java
index 285fb5bd7..450683276 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java
+++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorDataSet.java
@@ -1,4 +1,4 @@
-package com.google.android.apps.mytracks.content.sensor;
+package de.dennisguse.opentracks.content.sensor;
 
 public final class SensorDataSet {
 
diff --git a/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorState.java
similarity index 86%
rename from src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java
rename to src/main/java/de/dennisguse/opentracks/content/sensor/SensorState.java
index bd95c231f..3ecda3685 100644
--- a/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java
+++ b/src/main/java/de/dennisguse/opentracks/content/sensor/SensorState.java
@@ -1,8 +1,8 @@
-package com.google.android.apps.mytracks.content.sensor;
+package de.dennisguse.opentracks.content.sensor;
 
 import android.content.Context;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 public enum SensorState {
     NONE,
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/AbstractDialogFragment.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/AbstractDialogFragment.java
index 4e72b5873..146f64830 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/AbstractDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/AbstractDialogFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -23,7 +23,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
-import com.google.android.apps.mytracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.DialogUtils;
 
 /**
  * @author Jimmy Shih
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
index bb6b0cc68..f9f5938b9 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.location.Location;
 import android.os.Bundle;
@@ -29,21 +29,21 @@ import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.apps.mytracks.ChartView;
-import com.google.android.apps.mytracks.TrackDetailActivity;
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TrackDataHub;
-import com.google.android.apps.mytracks.content.TrackDataListener;
-import com.google.android.apps.mytracks.content.TrackDataType;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.stats.TripStatisticsUpdater;
-import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.ChartView;
+import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.content.TrackDataListener;
+import de.dennisguse.opentracks.content.TrackDataType;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TripStatisticsUpdater;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
index cffe2d876..2f8b0c714 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -32,9 +32,9 @@ import android.widget.GridView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java
rename to src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
index 874e0c1cf..6f101ab60 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -23,7 +23,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 import java.util.List;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ConfirmDeleteDialogFragment.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/ConfirmDeleteDialogFragment.java
index b2a8f68eb..ae56f8923 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ConfirmDeleteDialogFragment.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * A DialogFragment to confirm delete.
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
index 79bf41428..334443675 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -23,10 +23,10 @@ import android.os.Bundle;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * A DialogFragment to delete marker.
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/FileTypeDialogFragment.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/FileTypeDialogFragment.java
index f1d0bb5b1..3e065f3ac 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/FileTypeDialogFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -23,9 +23,9 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * A DialogFragment to select a file type, gpx, kml, etc.
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/FrequencyDialogFragment.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/FrequencyDialogFragment.java
index 53ca2281c..07c032325 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/FrequencyDialogFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -23,9 +23,9 @@ import android.os.Bundle;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * A DialogFragment to configure frequency.
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java
index a3de73a5d..44c449924 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.content.Intent;
 import android.location.Location;
@@ -38,17 +38,17 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.apps.mytracks.MarkerEditActivity;
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.ListItemUtils;
-import com.google.android.apps.mytracks.util.StatsUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.MarkerEditActivity;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.ListItemUtils;
+import de.dennisguse.opentracks.util.StatsUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * A fragment to show marker details.
diff --git a/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
similarity index 88%
rename from src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java
rename to src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
index 610058be3..641f0f470 100644
--- a/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.fragments;
+package de.dennisguse.opentracks.fragments;
 
 import android.location.Location;
 import android.os.Bundle;
@@ -31,23 +31,23 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
-import com.google.android.apps.mytracks.TrackDetailActivity;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TrackDataHub;
-import com.google.android.apps.mytracks.content.TrackDataListener;
-import com.google.android.apps.mytracks.content.TrackDataType;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.services.ITrackRecordingService;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StatsUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.TrackDataHub;
+import de.dennisguse.opentracks.content.TrackDataListener;
+import de.dennisguse.opentracks.content.TrackDataType;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.services.ITrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StatsUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import java.util.EnumSet;
 
@@ -297,7 +297,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
     }
 
     /**
-     * Tries to fetch most recent {@link SensorDataSet} {@link com.google.android.apps.mytracks.services.sensors.SensorManager}.
+     * Tries to fetch most recent {@link SensorDataSet} {@link de.dennisguse.opentracks.services.sensors.SensorManager}.
      */
     private void updateSensorDataUI() {
         ITrackRecordingService trackRecordingService = trackRecordingServiceConnection.getServiceIfBound();
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java
similarity index 85%
rename from src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
rename to src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java
index 0806a78d1..c41eab234 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFileFormat.java
@@ -1,13 +1,13 @@
-package com.google.android.apps.mytracks.io.file;
+package de.dennisguse.opentracks.io.file;
 
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.google.android.apps.mytracks.io.file.exporter.GpxTrackWriter;
-import com.google.android.apps.mytracks.io.file.exporter.KmlTrackWriter;
-import com.google.android.apps.mytracks.io.file.exporter.TrackWriter;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.io.file.exporter.GpxTrackWriter;
+import de.dennisguse.opentracks.io.file.exporter.KmlTrackWriter;
+import de.dennisguse.opentracks.io.file.exporter.TrackWriter;
+import de.dennisguse.opentracks.R;
 
 import java.util.Locale;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
index a84fdfcbc..491375ba0 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java
@@ -14,19 +14,19 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.database.Cursor;
 import android.location.Location;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationIterator;
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.util.LocationUtils;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.util.LocationUtils;
 
 import java.io.OutputStream;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java
index 82c6a3b34..e6b1b0797 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GpxTrackWriter.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.StringUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.StringUtils;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java
index 119a61e0d..a54ae1a48 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmlTrackWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -22,17 +22,17 @@ import android.net.Uri;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.DescriptionGenerator;
-import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.DescriptionGenerator;
+import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 import java.io.OutputStream;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
index 4012fb6b4..c6f6feddc 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -23,11 +23,11 @@ import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java
index e18b71445..356d65902 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -25,11 +25,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Toast;
 
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveAsyncTask.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveAsyncTask.java
index c9cc09089..6f92c3b1a 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/SaveAsyncTask.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -22,14 +22,14 @@ import android.os.AsyncTask;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TracksColumns;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.SystemUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.TracksColumns;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.SystemUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java
index 83207bfa4..0cf8cc456 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import java.io.OutputStream;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporterListener.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporterListener.java
index 0c164b78b..01b728297 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackExporterListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 /**
  * Listener for {@link TrackExporter} progress.
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java
index f2627d1dc..31f9dabba 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/TrackWriter.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.exporter;
+package de.dennisguse.opentracks.io.file.exporter;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
 
 import java.io.OutputStream;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
index ab2db798d..f223ccb47 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
 import android.location.Location;
@@ -22,22 +22,22 @@ import android.location.LocationManager;
 import android.net.Uri;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationIterator;
-import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.services.TrackRecordingService;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.stats.TripStatisticsUpdater;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TripStatisticsUpdater;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java
index 3784b0950..463afbc63 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporter.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
 import android.location.Location;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
index e804a6fbd..f4c41225c 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -29,12 +29,12 @@ import android.widget.Toast;
 
 import androidx.core.app.TaskStackBuilder;
 
-import com.google.android.apps.mytracks.TrackDetailActivity;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java
index 4c9abed6d..8aa1621ca 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportAsyncTask.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
 import android.net.Uri;
@@ -22,14 +22,14 @@ import android.os.AsyncTask;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.exporter.KmzTrackExporter;
-import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.SystemUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter;
+import de.dennisguse.opentracks.util.FileUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.SystemUtils;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java
index 4afdb028e..8def3ba97 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
 import android.location.Location;
@@ -22,10 +22,10 @@ import android.net.Uri;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
index a13962e4e..afe048a0e 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.io.file.exporter.KmzTrackExporter;
-import com.google.android.apps.mytracks.util.FileUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter;
+import de.dennisguse.opentracks.util.FileUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java
rename to src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
index a6dfd6efc..d8b183fb4 100644
--- a/src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.importer;
+package de.dennisguse.opentracks.io.file.importer;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java b/src/main/java/de/dennisguse/opentracks/services/AbsoluteLocationListenerPolicy.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java
rename to src/main/java/de/dennisguse/opentracks/services/AbsoluteLocationListenerPolicy.java
index 002dd29d3..33d0b561d 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java
+++ b/src/main/java/de/dennisguse/opentracks/services/AbsoluteLocationListenerPolicy.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 /**
  * This is a simple location listener policy that will always dictate the same
diff --git a/src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java b/src/main/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicy.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java
rename to src/main/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicy.java
index 417b14ba1..457d75418 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java
+++ b/src/main/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicy.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 /**
  * A {@link LocationListenerPolicy} that will change based on how long the user
diff --git a/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/ControlRecordingService.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java
rename to src/main/java/de/dennisguse/opentracks/services/ControlRecordingService.java
index b76ae944c..bac4b8f5c 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/ControlRecordingService.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.app.IntentService;
 import android.content.ComponentName;
@@ -24,8 +24,8 @@ import android.os.IBinder;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.widgets.TrackWidgetProvider;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.widgets.TrackWidgetProvider;
+import de.dennisguse.opentracks.R;
 
 /**
  * A service to control starting and stopping of a recording. This service,
diff --git a/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/ITrackRecordingService.java
similarity index 91%
rename from src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java
rename to src/main/java/de/dennisguse/opentracks/services/ITrackRecordingService.java
index ec4e8d930..722f6e6c7 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/ITrackRecordingService.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.location.Location;
 
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.sensor.SensorState;
 
 /**
  * App's service.
diff --git a/src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java b/src/main/java/de/dennisguse/opentracks/services/LocationListenerPolicy.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java
rename to src/main/java/de/dennisguse/opentracks/services/LocationListenerPolicy.java
index 880e5abba..e2fd9969f 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java
+++ b/src/main/java/de/dennisguse/opentracks/services/LocationListenerPolicy.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 /**
  * This is an interface for classes that will manage the location listener
diff --git a/src/main/java/com/google/android/apps/mytracks/services/LocationManagerConnector.java b/src/main/java/de/dennisguse/opentracks/services/LocationManagerConnector.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/services/LocationManagerConnector.java
rename to src/main/java/de/dennisguse/opentracks/services/LocationManagerConnector.java
index 963551d66..6c6885ff7 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/LocationManagerConnector.java
+++ b/src/main/java/de/dennisguse/opentracks/services/LocationManagerConnector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java
rename to src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 4d92e3bb1..7b8ed8411 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -41,35 +41,35 @@ import androidx.annotation.VisibleForTesting;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.TaskStackBuilder;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.TrackDetailActivity;
-import com.google.android.apps.mytracks.TrackListActivity;
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.ContentProviderUtils.LocationIterator;
-import com.google.android.apps.mytracks.content.CustomContentProvider;
-import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
-import com.google.android.apps.mytracks.content.SensorDataSetLocation;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.content.sensor.SensorState;
-import com.google.android.apps.mytracks.services.sensors.SensorManager;
-import com.google.android.apps.mytracks.services.sensors.SensorManagerFactory;
-import com.google.android.apps.mytracks.services.tasks.AnnouncementPeriodicTaskFactory;
-import com.google.android.apps.mytracks.services.tasks.PeriodicTaskExecutor;
-import com.google.android.apps.mytracks.services.tasks.SplitPeriodicTaskFactory;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.stats.TripStatisticsUpdater;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.SystemUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.apps.mytracks.util.TrackNameUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.TrackListActivity;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.CustomContentProvider;
+import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.content.SensorDataSetLocation;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.services.sensors.SensorManager;
+import de.dennisguse.opentracks.services.sensors.SensorManagerFactory;
+import de.dennisguse.opentracks.services.tasks.AnnouncementPeriodicTaskFactory;
+import de.dennisguse.opentracks.services.tasks.PeriodicTaskExecutor;
+import de.dennisguse.opentracks.services.tasks.SplitPeriodicTaskFactory;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.stats.TripStatisticsUpdater;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.SystemUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.util.TrackNameUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -86,7 +86,7 @@ public class TrackRecordingService extends Service {
      * The name of extra intent property to indicate whether we want to resume a
      * previously recorded track.
      */
-    public static final String RESUME_TRACK_EXTRA_NAME = "com.google.android.apps.mytracks.RESUME_TRACK";
+    public static final String RESUME_TRACK_EXTRA_NAME = "de.dennisguse.opentracks.RESUME_TRACK";
 
     public static final double PAUSE_LATITUDE = 100.0;
     public static final double RESUME_LATITUDE = 200.0;
diff --git a/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
rename to src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
index a1a6896ae..e0572e840 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services;
+package de.dennisguse.opentracks.services;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -25,8 +25,8 @@ import android.os.IBinder.DeathRecipient;
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
-import com.google.android.maps.mytracks.BuildConfig;
+import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils;
+import de.dennisguse.opentracks.BuildConfig;
 
 /**
  * Wrapper for the track recording service. This handles service
diff --git a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java
rename to src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
index d8bc48a8f..560f2ac58 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.sensors;
+package de.dennisguse.opentracks.services.sensors;
 
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothGatt;
@@ -30,8 +30,8 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.sensor.SensorState;
 
 import java.util.UUID;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothLEUtils.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java
similarity index 91%
rename from src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothLEUtils.java
rename to src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java
index fa372897b..279115442 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothLEUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothLEUtils.java
@@ -1,4 +1,4 @@
-package com.google.android.apps.mytracks.services.sensors;
+package de.dennisguse.opentracks.services.sensors;
 
 import android.bluetooth.BluetoothGattCharacteristic;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothSensorManager.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
rename to src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothSensorManager.java
index b05f3fe89..5c1e8749e 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothSensorManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.sensors;
+package de.dennisguse.opentracks.services.sensors;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -24,11 +24,11 @@ import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.content.sensor.SensorState;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/SensorManager.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java
rename to src/main/java/de/dennisguse/opentracks/services/sensors/SensorManager.java
index 06fa3f207..cc0e2e121 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/SensorManager.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.sensors;
+package de.dennisguse.opentracks.services.sensors;
 
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.content.sensor.SensorState;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.content.sensor.SensorState;
 
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/src/main/java/de/dennisguse/opentracks/services/sensors/SensorManagerFactory.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
rename to src/main/java/de/dennisguse/opentracks/services/sensors/SensorManagerFactory.java
index 63a4271e7..414132bdd 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/SensorManagerFactory.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.sensors;
+package de.dennisguse.opentracks.services.sensors;
 
 import android.content.Context;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java
index 8edc5cc44..b6909fffc 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 import android.media.AudioManager;
@@ -27,12 +27,12 @@ import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.services.TrackRecordingService;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 import java.util.Locale;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactory.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactory.java
index 43ab837d1..86b5a44ef 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java b/src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTask.java
similarity index 89%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTask.java
index d71195dcb..83b540a39 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTask.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
-import com.google.android.apps.mytracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingService;
 
 /**
  * This is interface for a task that will be executed on some schedule.
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java b/src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskExecutor.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskExecutor.java
index 56af15b91..3c97362df 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskExecutor.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.util.Log;
 
-import com.google.android.apps.mytracks.services.TrackRecordingService;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
  * Execute a periodic task on a time or distance schedule.
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java b/src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskFactory.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskFactory.java
index 2d2f60710..e75581a62 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/PeriodicTaskFactory.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java b/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTask.java
similarity index 83%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTask.java
index d97d6bd12..12c21844d 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTask.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.services.TrackRecordingService;
 
 /**
  * A simple task to insert statistics markers periodically.
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java b/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTaskFactory.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTaskFactory.java
index 06bc99b0d..727d2be9d 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/SplitPeriodicTaskFactory.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
 import android.content.Context;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java b/src/main/java/de/dennisguse/opentracks/services/tasks/TimerTaskExecutor.java
similarity index 92%
rename from src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java
rename to src/main/java/de/dennisguse/opentracks/services/tasks/TimerTaskExecutor.java
index 4749a3a38..c257e02a7 100644
--- a/src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java
+++ b/src/main/java/de/dennisguse/opentracks/services/tasks/TimerTaskExecutor.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.services.tasks;
+package de.dennisguse.opentracks.services.tasks;
 
-import com.google.android.apps.mytracks.services.TrackRecordingService;
-import com.google.android.apps.mytracks.stats.TripStatistics;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.stats.TripStatistics;
 
 import java.util.Date;
 import java.util.Timer;
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java
index a74d291c0..df57332ff 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/AbstractSettingsActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.app.ActionBar;
 import android.content.Context;
@@ -27,8 +27,8 @@ import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.view.MenuItem;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.R;
 
 /**
  * An abstract activity for all the settings activities.
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java
rename to src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
index 10f5d035f..dfef4b948 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -29,10 +29,10 @@ import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Spinner;
 
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.TrackIconUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.TrackIconUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * For entering the default activity type.
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java
similarity index 96%
rename from src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java
index 071d1846d..fc2a01d13 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/AdvancedSettingsActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -29,10 +29,10 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.util.DialogUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity for advanced settings.
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java
index b44c94358..538c60785 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/ChartSettingsActivity.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity for accessing chart settings.
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java
index 6f6055c38..8b1e44e5f 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/RecordingSettingsActivity.java
@@ -14,19 +14,19 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.app.Dialog;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 
-import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment;
-import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
+import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.util.UnitConversions;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity for accessing recording settings.
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java
index d072f918a..315e43f2b 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SensorSettingsActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.Intent;
@@ -24,9 +24,9 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.provider.Settings;
 
-import com.google.android.apps.mytracks.util.BluetoothDeviceUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.BluetoothDeviceUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
similarity index 93%
rename from src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 7ae433d70..d5e6c4d45 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity for accessing settings.
diff --git a/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java
similarity index 95%
rename from src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java
rename to src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java
index f6ef3adb8..e2e480992 100644
--- a/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.settings;
+package de.dennisguse.opentracks.settings;
 
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * An activity for accessing stats settings.
diff --git a/src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java b/src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java
rename to src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java
index 5668720c2..dc6d8052e 100644
--- a/src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.stats;
+package de.dennisguse.opentracks.stats;
 
 import androidx.annotation.NonNull;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java b/src/main/java/de/dennisguse/opentracks/stats/ExtremityMonitor.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java
rename to src/main/java/de/dennisguse/opentracks/stats/ExtremityMonitor.java
index 53b45df76..eda982ce9 100644
--- a/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/ExtremityMonitor.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.stats;
+package de.dennisguse.opentracks.stats;
 
 import androidx.annotation.NonNull;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/TripStatistics.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java
rename to src/main/java/de/dennisguse/opentracks/stats/TripStatistics.java
index cd58ed4bf..d70e00fd9 100644
--- a/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TripStatistics.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.stats;
+package de.dennisguse.opentracks.stats;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java b/src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java
rename to src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java
index accca7a0c..ce2d39be1 100644
--- a/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TripStatisticsUpdater.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.stats;
+package de.dennisguse.opentracks.stats;
 
 import android.location.Location;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.apps.mytracks.util.LocationUtils;
+import de.dennisguse.opentracks.util.LocationUtils;
 
-import static com.google.android.apps.mytracks.services.TrackRecordingService.MAX_NO_MOVEMENT_SPEED;
-import static com.google.android.apps.mytracks.services.TrackRecordingService.PAUSE_LATITUDE;
+import static de.dennisguse.opentracks.services.TrackRecordingService.MAX_NO_MOVEMENT_SPEED;
+import static de.dennisguse.opentracks.services.TrackRecordingService.PAUSE_LATITUDE;
 
 /**
  * Updater for {@link TripStatistics}. For updating track trip statistics as new
diff --git a/src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java b/src/main/java/de/dennisguse/opentracks/util/BluetoothDeviceUtils.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/BluetoothDeviceUtils.java
index 230c10b11..33b15a9b5 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/BluetoothDeviceUtils.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
diff --git a/src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java b/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
index ed209ca0f..d350831ec 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -26,7 +26,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 /**
  * Utilities for creating dialogs.
diff --git a/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/FileUtils.java
index 4b31cf5a0..3027cb5f0 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/FileUtils.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.content.Intent;
@@ -32,7 +32,7 @@ public class FileUtils {
     /**
      * Used to transfer picture from the camera.
      */
-    public static final String FILEPROVIDER = "com.google.android.apps.mytracks.fileprovider";
+    public static final String FILEPROVIDER = "de.dennisguse.opentracks.fileprovider";
     /**
      * The play tracks directory in the app's cache directory.
      */
diff --git a/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
similarity index 88%
rename from src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
index ff1143be1..ad1a37cde 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
@@ -14,18 +14,18 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.DescriptionGeneratorImpl;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.Waypoint;
+import de.dennisguse.opentracks.io.file.TrackFileFormat;
+import de.dennisguse.opentracks.R;
 
 import java.io.File;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java b/src/main/java/de/dennisguse/opentracks/util/ListItemUtils.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/ListItemUtils.java
index 81accca41..3d6ac9baf 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/ListItemUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -28,7 +28,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 /**
  * Utilities to display a list item.
diff --git a/src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java b/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/LocationUtils.java
index fdf2cd5f0..b420b1830 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.location.Location;
 import android.util.Log;
 
-import com.google.android.apps.mytracks.content.Track;
+import de.dennisguse.opentracks.content.Track;
 
 import java.util.ArrayList;
 import java.util.Stack;
diff --git a/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
index feab9691e..9f553a0f8 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 
-import com.google.android.apps.mytracks.Constants;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.Constants;
+import de.dennisguse.opentracks.R;
 
 /**
  * Utilities to access preferences stored in {@link SharedPreferences}.
diff --git a/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
index c22086997..c83cd4581 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -23,10 +23,10 @@ import android.view.View;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.google.android.apps.mytracks.content.sensor.SensorDataSet;
-import com.google.android.apps.mytracks.services.sensors.SensorManager;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.content.sensor.SensorDataSet;
+import de.dennisguse.opentracks.services.sensors.SensorManager;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.R;
 
 import java.util.Locale;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/util/StringUtils.java b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/util/StringUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/StringUtils.java
index f3d739515..89be70fa8 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/StringUtils.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.location.Location;
@@ -22,7 +22,7 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java b/src/main/java/de/dennisguse/opentracks/util/SystemUtils.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/SystemUtils.java
index dd72f9472..b70561cb1 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/SystemUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -45,7 +45,7 @@ public class SystemUtils {
     public static String getAppVersion(Context context) {
         try {
             PackageInfo pi = context.getPackageManager()
-                    .getPackageInfo("com.google.android.maps.mytracks", PackageManager.GET_META_DATA);
+                    .getPackageInfo("de.dennisguse.opentracks", PackageManager.GET_META_DATA);
             return pi.versionName;
         } catch (NameNotFoundException e) {
             Log.w(TAG, "Failed to get version info.", e);
diff --git a/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
similarity index 99%
rename from src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
index 6fe798973..7e904fcec 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -33,7 +33,7 @@ import android.widget.Spinner;
 
 import androidx.annotation.NonNull;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
index ecb69d28d..a1ae7811d 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 import android.location.Address;
@@ -23,7 +23,7 @@ import android.location.Location;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.R;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackRecordingServiceConnectionUtils.java
similarity index 94%
rename from src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/TrackRecordingServiceConnectionUtils.java
index 92ccee7cb..57b1f73ad 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackRecordingServiceConnectionUtils.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -24,12 +24,12 @@ import android.content.Intent;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.google.android.apps.mytracks.TrackEditActivity;
-import com.google.android.apps.mytracks.content.WaypointCreationRequest;
-import com.google.android.apps.mytracks.services.ITrackRecordingService;
-import com.google.android.apps.mytracks.services.TrackRecordingService;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.TrackEditActivity;
+import de.dennisguse.opentracks.content.WaypointCreationRequest;
+import de.dennisguse.opentracks.services.ITrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingService;
+import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
+import de.dennisguse.opentracks.R;
 
 import java.util.List;
 
diff --git a/src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
similarity index 85%
rename from src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java
rename to src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
index 6416898c5..dd21c7c1f 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 import android.content.Context;
 
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TracksColumns;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.content.TracksColumns;
 
 /**
  * Utilities for updating track.
diff --git a/src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java b/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java
similarity index 98%
rename from src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java
rename to src/main/java/de/dennisguse/opentracks/util/UnitConversions.java
index 87a268d13..7e586e816 100644
--- a/src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java
+++ b/src/main/java/de/dennisguse/opentracks/util/UnitConversions.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.util;
+package de.dennisguse.opentracks.util;
 
 /**
  * Unit conversion constants.
diff --git a/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetConfigActivity.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
rename to src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetConfigActivity.java
index acf55bdce..0839586e5 100644
--- a/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetConfigActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.widgets;
+package de.dennisguse.opentracks.widgets;
 
 import android.app.Activity;
 import android.appwidget.AppWidgetManager;
@@ -24,8 +24,8 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.R;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java
similarity index 97%
rename from src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
rename to src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java
index df3470160..720554b0f 100644
--- a/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.widgets;
+package de.dennisguse.opentracks.widgets;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
@@ -31,16 +31,16 @@ import android.widget.RemoteViews;
 
 import androidx.core.app.TaskStackBuilder;
 
-import com.google.android.apps.mytracks.TrackDetailActivity;
-import com.google.android.apps.mytracks.TrackListActivity;
-import com.google.android.apps.mytracks.content.ContentProviderUtils;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.services.ControlRecordingService;
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.maps.mytracks.R;
+import de.dennisguse.opentracks.TrackDetailActivity;
+import de.dennisguse.opentracks.TrackListActivity;
+import de.dennisguse.opentracks.content.ContentProviderUtils;
+import de.dennisguse.opentracks.content.Track;
+import de.dennisguse.opentracks.services.ControlRecordingService;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.IntentUtils;
+import de.dennisguse.opentracks.util.PreferencesUtils;
+import de.dennisguse.opentracks.util.StringUtils;
+import de.dennisguse.opentracks.R;
 
 /**
  * A track widget to start/stop/pause/resume recording, launch the main activity, and
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index 072e50c75..83da4ef05 100644
--- a/src/main/res/values/do_not_translate.xml
+++ b/src/main/res/values/do_not_translate.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <string name="marker_statistics_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
     <string name="marker_waypoint_icon_url" translatable="false">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
     <string name="app_web_url" translatable="false">TODO</string>
-    <string name="permission_notification_value" translatable="false">com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS</string>
+    <string name="permission_notification_value" translatable="false">de.dennisguse.opentracks.MYTRACKS_NOTIFICATIONS</string>
     <string name="sensor_type_value_none" translatable="false">NONE</string>
     <string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
     <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
@@ -33,9 +33,9 @@ limitations under the License.
     <string name="stats_rate_speed" translatable="false">SPEED</string>
     <string name="stats_units_imperial" translatable="false">IMPERIAL</string>
     <string name="stats_units_metric" translatable="false">METRIC</string>
-    <string name="track_action_end" translatable="false">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
-    <string name="track_action_pause" translatable="false">com.google.android.apps.mytracks.PAUSE_CURRENT_TRACK</string>
-    <string name="track_action_resume" translatable="false">com.google.android.apps.mytracks.RESUME_CURRENT_TRACK</string>
-    <string name="track_action_start" translatable="false">com.google.android.apps.mytracks.START_NEW_TRACK</string>
+    <string name="track_action_end" translatable="false">de.dennisguse.opentracks.END_CURRENT_TRACK</string>
+    <string name="track_action_pause" translatable="false">de.dennisguse.opentracks.PAUSE_CURRENT_TRACK</string>
+    <string name="track_action_resume" translatable="false">de.dennisguse.opentracks.RESUME_CURRENT_TRACK</string>
+    <string name="track_action_start" translatable="false">de.dennisguse.opentracks.START_NEW_TRACK</string>
     <string name="value_unknown" translatable="false">-</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/third_party.xml b/src/main/res/values/third_party.xml
index 3290d8358..c7dfcb22e 100644
--- a/src/main/res/values/third_party.xml
+++ b/src/main/res/values/third_party.xml
@@ -16,12 +16,12 @@ limitations under the License.
 <resources>
     <!-- Do not translate -->
     <!-- Permissions, need to be in sync with the permissions in AndroidManifest.xml -->
-    <string name="broadcast_notifications_permission" translatable="false">com.google.android.apps.mytracks.TRACK_NOTIFICATIONS</string>
+    <string name="broadcast_notifications_permission" translatable="false">de.dennisguse.opentracks.TRACK_NOTIFICATIONS</string>
     <!-- Broadcast -->
-    <string name="track_id_broadcast_extra" translatable="false">com.google.android.apps.mytracks.TRACK_ID</string>
-    <string name="track_paused_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_PAUSED</string>
-    <string name="track_resumed_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_RESUMED</string>
-    <string name="track_started_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_STARTED</string>
-    <string name="track_stopped_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_STOPPED</string>
-    <string name="track_update_broadcast_action" translatable="false">com.google.android.apps.mytracks.TRACK_UPDATE</string>
+    <string name="track_id_broadcast_extra" translatable="false">de.dennisguse.opentracks.TRACK_ID</string>
+    <string name="track_paused_broadcast_action" translatable="false">de.dennisguse.opentracks.TRACK_PAUSED</string>
+    <string name="track_resumed_broadcast_action" translatable="false">de.dennisguse.opentracks.TRACK_RESUMED</string>
+    <string name="track_started_broadcast_action" translatable="false">de.dennisguse.opentracks.TRACK_STARTED</string>
+    <string name="track_stopped_broadcast_action" translatable="false">de.dennisguse.opentracks.TRACK_STOPPED</string>
+    <string name="track_update_broadcast_action" translatable="false">de.dennisguse.opentracks.TRACK_UPDATE</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/xml/search.xml b/src/main/res/xml/search.xml
index 6662e4fdc..8e0c06172 100644
--- a/src/main/res/xml/search.xml
+++ b/src/main/res/xml/search.xml
@@ -6,7 +6,7 @@
     android:label="@string/app_name"
     android:queryAfterZeroResults="true"
     android:searchSettingsDescription="@string/search_global_description"
-    android:searchSuggestAuthority="com.google.android.maps.mytracks.search"
+    android:searchSuggestAuthority="de.dennisguse.opentracks.search"
     android:searchSuggestSelection=" ? "
     android:searchSuggestThreshold="1"
     android:voicePromptText="@string/search_voice_prompt"
diff --git a/src/main/res/xml/settings_recording.xml b/src/main/res/xml/settings_recording.xml
index 901c27310..03a3a9f43 100644
--- a/src/main/res/xml/settings_recording.xml
+++ b/src/main/res/xml/settings_recording.xml
@@ -27,7 +27,7 @@ limitations under the License.
         android:defaultValue="@string/settings_recording_track_name_date_iso_8601_location_value"
         android:key="@string/track_name_key"
         android:title="@string/settings_recording_track_name_title" />
-    <com.google.android.apps.mytracks.settings.ActivityTypePreference
+    <de.dennisguse.opentracks.settings.ActivityTypePreference
         android:defaultValue="@string/activity_type_running"
         android:key="@string/default_activity_key"
         android:title="@string/settings_recording_default_activity_title" />
diff --git a/src/main/res/xml/track_widget_info.xml b/src/main/res/xml/track_widget_info.xml
index d958206ae..f81cc4456 100644
--- a/src/main/res/xml/track_widget_info.xml
+++ b/src/main/res/xml/track_widget_info.xml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity"
+    android:configure="de.dennisguse.opentracks.widgets.TrackWidgetConfigActivity"
     android:initialKeyguardLayout="@layout/track_widget_4x1"
     android:initialLayout="@layout/track_widget_4x2"
     android:minWidth="250dp"