diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java
index b710b1a8c..8724e9c69 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/data/TrackSelectionTest.java
@@ -67,7 +67,7 @@ public class TrackSelectionTest extends TestCase {
     @Test
     public void testFilterBuildSelection_onlyOneCategory() {
         // given
-        TrackSelection filter = new TrackSelection().addCategory("running");
+        TrackSelection filter = new TrackSelection().addActivityType("running");
 
         // when
         SelectionData selection = filter.buildSelection();
@@ -82,10 +82,10 @@ public class TrackSelectionTest extends TestCase {
     public void testFilterBuildSelection_severalCategories() {
         // given
         TrackSelection filter = new TrackSelection()
-                .addCategory("running")
-                .addCategory("road biking")
-                .addCategory("mountain biking")
-                .addCategory("trail walking");
+                .addActivityType("running")
+                .addActivityType("road biking")
+                .addActivityType("mountain biking")
+                .addActivityType("trail walking");
 
         // when
         SelectionData selection = filter.buildSelection();
@@ -136,8 +136,8 @@ public class TrackSelectionTest extends TestCase {
                 .addTrackId(trackId1)
                 .addTrackId(trackId2)
                 .addTrackId(trackId3)
-                .addCategory("running")
-                .addCategory("road biking");
+                .addActivityType("running")
+                .addActivityType("road biking");
 
         // when
         SelectionData selection = filter.buildSelection();
@@ -188,8 +188,8 @@ public class TrackSelectionTest extends TestCase {
         long oneDay = 24 * 60 * 60 * 1000;
 
         TrackSelection filter = new TrackSelection()
-                .addCategory("running")
-                .addCategory("road biking")
+                .addActivityType("running")
+                .addActivityType("road biking")
                 .addDateRange(instant, instant.plusMillis(oneDay));
 
         // when
diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
index c80d5129c..968f13c93 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
@@ -96,7 +96,7 @@ public class ExportImportTest {
     private final ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context);
 
     private static final String TRACK_ICON = "the track icon";
-    private static final String TRACK_CATEGORY = "the category";
+    private static final String TRACK_ACTIVITY_TYPE = "the activity type";
     private static final String TRACK_DESCRIPTION = "the description";
 
     private File tmpFile;
@@ -181,7 +181,7 @@ public class ExportImportTest {
 
         Track track = contentProviderUtils.getTrack(trackId);
         track.setIcon(TRACK_ICON);
-        track.setCategory(TRACK_CATEGORY);
+        track.setActivityType(TRACK_ACTIVITY_TYPE);
         track.setDescription(TRACK_DESCRIPTION);
         contentProviderUtils.updateTrack(track);
 
@@ -216,7 +216,7 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getActivityType(), importedTrack.getActivityType());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
         assertEquals(track.getIcon(), importedTrack.getIcon());
@@ -323,7 +323,7 @@ public class ExportImportTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals(track.getCategory(), importedTrack.getCategory());
+        assertEquals(track.getActivityType(), importedTrack.getActivityType());
         assertEquals(track.getDescription(), importedTrack.getDescription());
         assertEquals(track.getName(), importedTrack.getName());
 
diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java
index 256e9ecfa..c63bb4c49 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java
@@ -79,7 +79,7 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("the category", importedTrack.getCategory());
+        assertEquals("the category", importedTrack.getActivityType());
         assertEquals("the description", importedTrack.getDescription());
         assertEquals("2021-01-07 22:51", importedTrack.getName());
         assertEquals("UNKNOWN", importedTrack.getIcon());
@@ -133,7 +133,7 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -181,7 +181,7 @@ public class GPXTrackImporterTest {
         // 2. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("20210907_213924.gpx", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java
index f60cfd221..b7acb8f92 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java
@@ -70,7 +70,7 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -119,7 +119,7 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("", importedTrack.getCategory());
+        assertEquals("", importedTrack.getActivityType());
         assertEquals("", importedTrack.getDescription());
         assertEquals("", importedTrack.getName());
         assertEquals("", importedTrack.getIcon());
@@ -159,7 +159,7 @@ public class KMLTrackImporterTest {
         // 1. track
         Track importedTrack = contentProviderUtils.getTrack(importTrackId);
         assertNotNull(importedTrack);
-        assertEquals("unknown", importedTrack.getCategory());
+        assertEquals("unknown", importedTrack.getActivityType());
         assertEquals("Test Track", importedTrack.getDescription());
         assertEquals("2020-11-28 18:06", importedTrack.getName());
         assertEquals("UNKNOWN", importedTrack.getIcon());
diff --git a/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java
index 16a1a59a8..142d49221 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/share/DescriptionGeneratorTest.java
@@ -80,7 +80,7 @@ public class DescriptionGeneratorTest {
         stats.setTotalAltitudeLoss(6000f);
         stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
-        track.setCategory("hiking");
+        track.setActivityType("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"
@@ -118,7 +118,7 @@ public class DescriptionGeneratorTest {
         stats.setTotalAltitudeLoss(6000f);
         stats.setStartTime(START_TIME);
         track.setTrackStatistics(stats);
-        track.setCategory("hiking");
+        track.setActivityType("hiking");
         String expected = //"Created by"
                 "<a href='https://github.com/OpenTracksApp/OpenTracks'>OpenTracks (Debug)</a><p>"
                         + "Name: -<br>"
diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java
index 42a53fc2a..7d65cf6a2 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java
@@ -41,7 +41,7 @@ public class AggregatedStatisticsTest {
 
         Track track = new Track();
         track.setIcon(TrackIconUtils.getIconValue(context, category));
-        track.setCategory(category);
+        track.setActivityType(category);
         track.setTrackStatistics(statistics);
         return track;
     }
@@ -243,8 +243,8 @@ public class AggregatedStatisticsTest {
         // Check order
 
         {
-            assertEquals(biking, aggregatedStatistics.getItem(0).getCategory());
-            assertEquals(driving, aggregatedStatistics.getItem(3).getCategory());
+            assertEquals(biking, aggregatedStatistics.getItem(0).getActivityType());
+            assertEquals(driving, aggregatedStatistics.getItem(3).getActivityType());
         }
     }
 }
diff --git a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java
index ce12e3be8..4e98d08c1 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/EspressoAggregatedFilterTest.java
@@ -51,7 +51,7 @@ public class EspressoAggregatedFilterTest {
     @Before
     public void setUp() {
         Pair<Track, List<TrackPoint>> pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 20);
-        pair.first.setCategory(CATEGORY);
+        pair.first.setActivityType(CATEGORY);
         TestDataUtil.insertTrackWithLocations(new ContentProviderUtils(ApplicationProvider.getApplicationContext()), pair.first, pair.second);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
index 6ea2453b9..18ae5fea5 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
@@ -74,7 +74,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         viewBinding.fields.trackEditName.setText(track.getName());
 
-        viewBinding.fields.trackEditActivityType.setText(track.getCategory());
+        viewBinding.fields.trackEditActivityType.setText(track.getActivityType());
 
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.fields.trackEditActivityType.setAdapter(adapter);
diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index a619f02b8..6297ce09b 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -193,7 +193,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                 int totalDistanceIndex = cursor.getColumnIndexOrThrow(TracksColumns.TOTALDISTANCE);
                 int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
                 int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
-                int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
+                int activityTypeIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE);
                 int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
                 int markerCountIndex = cursor.getColumnIndexOrThrow(TracksColumns.MARKER_COUNT);
 
@@ -209,13 +209,13 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
                 int markerCount = cursor.getInt(markerCountIndex);
                 long startTime = cursor.getLong(startTimeIndex);
                 int startTimeOffset = cursor.getInt(startTimeOffsetIndex);
-                String category = icon != null && !icon.equals("") ? null : cursor.getString(categoryIndex);
+                String activityType = icon != null && !icon.equals("") ? null : cursor.getString(activityTypeIndex);
                 String description = cursor.getString(descriptionIndex);
 
                 ListItemUtils.setListItem(TrackListActivity.this, view, isRecording,
                         iconId, R.string.image_track, name, totalTime, totalDistance, markerCount,
                         OffsetDateTime.ofInstant(Instant.ofEpochMilli(startTime), ZoneOffset.ofTotalSeconds(startTimeOffset)),
-                        category, description, false);
+                        activityType, description, false);
             }
         };
         viewBinding.trackList.setAdapter(resourceCursorAdapter);
@@ -552,7 +552,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         @Override
         public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
             final String[] PROJECTION = new String[]{TracksColumns._ID, TracksColumns.NAME,
-                    TracksColumns.DESCRIPTION, TracksColumns.CATEGORY, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
+                    TracksColumns.DESCRIPTION, TracksColumns.ACTIVITY_TYPE, TracksColumns.STARTTIME, TracksColumns.STARTTIME_OFFSET,
                     TracksColumns.TOTALDISTANCE, TracksColumns.TOTALTIME, TracksColumns.ICON, TracksColumns.MARKER_COUNT};
 
             final String sortOrder = TracksColumns.STARTTIME + " DESC";
@@ -562,7 +562,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
             } else {
                 final String SEARCH_QUERY = TracksColumns.NAME + " LIKE ? OR " +
                         TracksColumns.DESCRIPTION + " LIKE ? OR " +
-                        TracksColumns.CATEGORY + " LIKE ?";
+                        TracksColumns.ACTIVITY_TYPE + " LIKE ?";
                 final String[] selectionArgs = new String[]{"%" + searchQuery + "%", "%" + searchQuery + "%", "%" + searchQuery + "%"};
                 return new CursorLoader(TrackListActivity.this, TracksColumns.CONTENT_URI, PROJECTION, SEARCH_QUERY, selectionArgs, sortOrder);
             }
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
index 769cfd7d0..4e387c5d7 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -319,8 +319,8 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
     @Override
     public void onChooseActivityTypeDone(String iconValue) {
         Track track = contentProviderUtils.getTrack(trackId);
-        String category = getString(TrackIconUtils.getIconActivityType(iconValue));
-        TrackUtils.updateTrack(this, track, null, category, null, contentProviderUtils);
+        String activityType = getString(TrackIconUtils.getIconActivityType(iconValue));
+        TrackUtils.updateTrack(this, track, null, activityType, null, contentProviderUtils);
     }
 
     private class CustomFragmentPagerAdapter extends FragmentStateAdapter {
diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
index b4403ce30..977f03f2e 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -50,7 +50,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
 
         viewBinding.trackEditName.setText(track.getName());
 
-        viewBinding.trackEditActivityType.setText(track.getCategory());
+        viewBinding.trackEditActivityType.setText(track.getActivityType());
 
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, ActivityType.getLocalizedStrings(this));
         viewBinding.trackEditActivityType.setAdapter(adapter);
@@ -74,7 +74,7 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements
         {
             Pair<String, String> parts = SpeedFormatter.Builder()
                     .setUnit(PreferencesUtils.getUnitSystem())
-                    .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track.getCategory()))
+                    .setReportSpeedOrPace(PreferencesUtils.isReportSpeed(track.getActivityType()))
                     .build(this)
                     .getSpeedParts(track.getTrackStatistics().getAverageMovingSpeed());
             viewBinding.speed.setText(parts.first);
diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java
index a9dc3b4a1..727cd3681 100644
--- a/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java
@@ -164,7 +164,7 @@ public class ChartFragment extends Fragment implements TrackDataHub.Listener {
                 return;
             }
 
-            category = track.getCategory();
+            category = track.getActivityType();
             boolean reportSpeed = PreferencesUtils.isReportSpeed(category);
             if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
                 viewBinding.chartView.setReportSpeed(reportSpeed);
diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
index be696ee9b..ae12513ce 100644
--- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java
@@ -100,7 +100,7 @@ public class ContentProviderUtils {
         int uuidIndex = cursor.getColumnIndexOrThrow(TracksColumns.UUID);
         int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME);
         int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
-        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
+        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE);
         int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
         int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
         int stopTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STOPTIME);
@@ -129,7 +129,7 @@ public class ContentProviderUtils {
             track.setDescription(cursor.getString(descriptionIndex));
         }
         if (!cursor.isNull(categoryIndex)) {
-            track.setCategory(cursor.getString(categoryIndex));
+            track.setActivityType(cursor.getString(categoryIndex));
         }
 
         if (!cursor.isNull(startTimeIndex)) {
@@ -290,7 +290,7 @@ public class ContentProviderUtils {
         values.put(TracksColumns.UUID, UUIDUtils.toBytes(track.getUuid()));
         values.put(TracksColumns.NAME, track.getName());
         values.put(TracksColumns.DESCRIPTION, track.getDescription());
-        values.put(TracksColumns.CATEGORY, track.getCategory());
+        values.put(TracksColumns.ACTIVITY_TYPE, track.getActivityType());
         values.put(TracksColumns.STARTTIME_OFFSET, track.getZoneOffset().getTotalSeconds());
         if (trackStatistics.getStartTime() != null) {
             values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli());
diff --git a/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java b/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java
index c33f5de69..712cb6282 100644
--- a/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java
+++ b/src/main/java/de/dennisguse/opentracks/data/TrackSelection.java
@@ -30,9 +30,9 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec
         return this;
     }
 
-    public TrackSelection addCategory(String category) {
-        if (!this.categories.contains(category)) {
-            this.categories.add(category);
+    public TrackSelection addActivityType(String activityType) {
+        if (!this.categories.contains(activityType)) {
+            this.categories.add(activityType);
         }
         return this;
     }
@@ -53,7 +53,7 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec
         }
         if (!categories.isEmpty()) {
             selection += selection.isEmpty() ? "" : " AND ";
-            selection += String.format(TracksColumns.CATEGORY + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
+            selection += String.format(TracksColumns.ACTIVITY_TYPE + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
         }
         if (from != null && to != null) {
             selection += selection.isEmpty() ? "" : " AND ";
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
index 3885fa3cf..b1bae70a6 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
@@ -44,7 +44,7 @@ public class Track {
 
     private String name = "";
     private String description = "";
-    private String category = "";
+    private String activityType = "";
 
     private String icon = "";
 
@@ -97,12 +97,12 @@ public class Track {
         this.description = description;
     }
 
-    public String getCategory() {
-        return category;
+    public String getActivityType() {
+        return activityType;
     }
 
-    public void setCategory(String category) {
-        this.category = category;
+    public void setActivityType(String activityType) {
+        this.activityType = activityType;
     }
 
     public String getIcon() {
diff --git a/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java b/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java
index 0f9b1bbc8..ac5347957 100644
--- a/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java
+++ b/src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java
@@ -39,7 +39,7 @@ public interface TracksColumns extends BaseColumns {
     String UUID = "uuid"; // identifier to make tracks globally unique (prevent re-import)
     String NAME = "name"; // track name
     String DESCRIPTION = "description"; // track description
-    String CATEGORY = "category"; // track activity type
+    String ACTIVITY_TYPE = "category"; // track activity type
     String STARTTIME = "starttime"; // track start time
     String STARTTIME_OFFSET = "starttime_offset"; // in plus/minus in seconds
     String STOPTIME = "stoptime"; // track stop time
@@ -63,7 +63,7 @@ public interface TracksColumns extends BaseColumns {
             + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
             + NAME + " TEXT, "
             + DESCRIPTION + " TEXT, "
-            + CATEGORY + " TEXT, "
+            + ACTIVITY_TYPE + " TEXT, "
             + STARTTIME + " INTEGER, "
             + STOPTIME + " INTEGER, "
             + NUMPOINTS + " INTEGER, "
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java
index 350cf7732..a054f45f2 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java
@@ -89,7 +89,7 @@ public class StatisticsRecordedFragment extends Fragment {
 
         if (PreferencesUtils.isKey(R.string.stats_rate_key, key) && track != null) {
             updateUInecessary = true;
-            preferenceReportSpeed = PreferencesUtils.isReportSpeed(track.getCategory());
+            preferenceReportSpeed = PreferencesUtils.isReportSpeed(track.getActivityType());
         }
 
         if (key != null && updateUInecessary && isResumed()) {
@@ -155,7 +155,7 @@ public class StatisticsRecordedFragment extends Fragment {
 
                     sensorStatistics = contentProviderUtils.getSensorStats(trackId);
 
-                    boolean prefsChanged = this.track == null || (!this.track.getCategory().equals(track.getCategory()));
+                    boolean prefsChanged = this.track == null || (!this.track.getActivityType().equals(track.getActivityType()));
                     this.track = track;
                     if (prefsChanged) {
                         sharedPreferenceChangeListener.onSharedPreferenceChanged(null, getString(R.string.stats_rate_key));
@@ -191,7 +191,7 @@ public class StatisticsRecordedFragment extends Fragment {
 
         // Set activity type
         {
-            String trackIconValue = TrackIconUtils.getIconValue(getContext(), track.getCategory());
+            String trackIconValue = TrackIconUtils.getIconValue(getContext(), track.getActivityType());
             viewBinding.statsActivityTypeIcon.setImageDrawable(ContextCompat.getDrawable(getContext(), TrackIconUtils.getIconDrawable(trackIconValue)));
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
index 2f80c1fe1..1257d47ad 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
@@ -20,12 +20,12 @@ public class TrackFilenameGenerator {
 
     public static final String UUID_KEY = "{uuid}";
     public static final String TRACKNAME_KEY = "{name}";
-    public static final String CATEGORY_KEY = "{category}";
+    public static final String ACTIVITY_TYPE_KEY = "{category}";
     public static final String STARTTIME_TIME_KEY = "{time}";
     public static final String STARTTIME_DATE_KEY = "{date}";
 
     public static String getAllOptions() {
-        return Stream.of(UUID_KEY, TRACKNAME_KEY, CATEGORY_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY)
+        return Stream.of(UUID_KEY, TRACKNAME_KEY, ACTIVITY_TYPE_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY)
                 .collect(Collectors.joining(", "));
     }
 
@@ -44,7 +44,7 @@ public class TrackFilenameGenerator {
 
         values.put(UUID_KEY, track.getUuid().toString().substring(0, 8));
         values.put(TRACKNAME_KEY, track.getName());
-        values.put(CATEGORY_KEY, track.getCategory());
+        values.put(ACTIVITY_TYPE_KEY, track.getActivityType());
         values.put(STARTTIME_TIME_KEY, track.getStartTime().toLocalTime().toString());
         values.put(STARTTIME_DATE_KEY, track.getStartTime().toLocalDate().toString());
 
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
index 34e1acfd9..f1d466e5a 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
@@ -268,7 +268,7 @@ public class GPXTrackExporter implements TrackExporter {
             printWriter.println("<trk>");
             printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
             printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
-            printWriter.println("<type>" + StringUtils.formatCData(track.getCategory()) + "</type>");
+            printWriter.println("<type>" + StringUtils.formatCData(track.getActivityType()) + "</type>");
 
             printWriter.println("<extensions>");
             printWriter.println("<topografix:color>c0c0c0</topografix:color>");
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
index 702914eb8..0380508a6 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KMLTrackExporter.java
@@ -59,7 +59,7 @@ public class KMLTrackExporter implements TrackExporter {
     private static final String TRACK_STYLE = "track";
     private static final String SCHEMA_ID = "schema";
 
-    public static final String EXTENDED_DATA_TYPE_CATEGORY = "type";
+    public static final String EXTENDED_DATA_TYPE_ACTIVITYTYPE = "type";
 
     public static final String EXTENDED_DATA_TYPE_SPEED = "speed";
     public static final String EXTENDED_DATA_TYPE_DISTANCE = "distance";
@@ -311,7 +311,7 @@ public class KMLTrackExporter implements TrackExporter {
             printWriter.println("<opentracks:trackid>" + track.getUuid() + "</opentracks:trackid>");
 
             printWriter.println("<styleUrl>#" + TRACK_STYLE + "</styleUrl>");
-            writeCategory(track.getCategory());
+            writeActivityType(track.getActivityType());
             printWriter.println("<MultiTrack>");
             printWriter.println("<altitudeMode>absolute</altitudeMode>");
             printWriter.println("<interpolate>1</interpolate>");
@@ -426,19 +426,19 @@ public class KMLTrackExporter implements TrackExporter {
     /**
      * Writes a placemark.
      *
-     * @param name        the name
-     * @param category    the category
-     * @param description the description
-     * @param location    the location
+     * @param name         the name
+     * @param activityType the activityType
+     * @param description  the description
+     * @param location     the location
      */
-    private void writePlacemark(String name, String category, String description, Location location, ZoneOffset zoneOffset) {
+    private void writePlacemark(String name, String activityType, String description, Location location, ZoneOffset zoneOffset) {
         if (location != null) {
             printWriter.println("<Placemark>");
             printWriter.println("<name>" + StringUtils.formatCData(name) + "</name>");
             printWriter.println("<description>" + StringUtils.formatCData(description) + "</description>");
             printWriter.println("<TimeStamp><when>" + getTime(zoneOffset, location) + "</when></TimeStamp>");
             printWriter.println("<styleUrl>#" + KMLTrackExporter.MARKER_STYLE + "</styleUrl>");
-            writeCategory(category);
+            writeActivityType(activityType);
             printWriter.println("<Point>");
             printWriter.println("<coordinates>" + getCoordinates(location, ",") + "</coordinates>");
             printWriter.println("</Point>");
@@ -459,7 +459,7 @@ public class KMLTrackExporter implements TrackExporter {
         printWriter.println("</Camera>");
         printWriter.println("<TimeStamp><when>" + getTime(zoneOffset, marker.getLocation()) + "</when></TimeStamp>");
         printWriter.println("<styleUrl>#" + MARKER_STYLE + "</styleUrl>");
-        writeCategory(marker.getCategory());
+        writeActivityType(marker.getCategory());
 
         if (exportPhotos) {
             printWriter.println("<Icon><href>" + KmzTrackExporter.buildKmzImageFilePath(marker) + "</href></Icon>");
@@ -514,23 +514,15 @@ public class KMLTrackExporter implements TrackExporter {
         return result;
     }
 
-    /**
-     * Writes the category.
-     *
-     * @param category the category
-     */
-    private void writeCategory(String category) {
-        if (category == null || category.equals("")) {
+    private void writeActivityType(String actiivtyType) {
+        if (actiivtyType == null || actiivtyType.equals("")) {
             return;
         }
         printWriter.println("<ExtendedData>");
-        printWriter.println("<Data name=\"" + EXTENDED_DATA_TYPE_CATEGORY + "\"><value>" + StringUtils.formatCData(category) + "</value></Data>");
+        printWriter.println("<Data name=\"" + EXTENDED_DATA_TYPE_ACTIVITYTYPE + "\"><value>" + StringUtils.formatCData(actiivtyType) + "</value></Data>");
         printWriter.println("</ExtendedData>");
     }
 
-    /**
-     * Writes the track style.
-     */
     private void writeTrackStyle() {
         printWriter.println("<Style id=\"" + TRACK_STYLE + "\">");
         printWriter.println("<LineStyle><color>7f0000ff</color><width>4</width></LineStyle>");
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java
index 1d978e662..71a190dad 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GpxTrackImporter.java
@@ -98,7 +98,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
 
     private String name;
     private String description;
-    private String category;
+    private String activityType;
     private String latitude;
     private String longitude;
     private String altitude;
@@ -159,7 +159,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
             case TAG_GPX -> onFileEnd();
             case TAG_MARKER -> onMarkerEnd();
             case TAG_TRACK -> {
-                trackImporter.setTrack(context, name, uuid, description, category, null, zoneOffset);
+                trackImporter.setTrack(context, name, uuid, description, activityType, null, zoneOffset);
                 zoneOffset = null;
             }
             case TAG_TRACK_SEGMENT -> onTrackSegmentEnd();
@@ -176,7 +176,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
             }
             case TAG_TYPE -> {
                 if (content != null) {
-                    category = content.trim();
+                    activityType = content.trim();
                 }
             }
             case TAG_TIME -> {
@@ -385,7 +385,7 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private void onMarkerStart(Attributes attributes) {
         name = null;
         description = null;
-        category = null;
+        activityType = null;
         photoUrl = null;
         latitude = attributes.getValue(ATTRIBUTE_LAT);
         longitude = attributes.getValue(ATTRIBUTE_LON);
@@ -415,8 +415,8 @@ public class GpxTrackImporter extends DefaultHandler implements XMLImporter.Trac
         if (description != null) {
             marker.setDescription(description);
         }
-        if (category != null) {
-            marker.setCategory(category);
+        if (activityType != null) {
+            marker.setCategory(activityType);
         }
 
         if (photoUrl != null) {
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java
index 9e2b0389a..19abd056d 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlTrackImporter.java
@@ -61,7 +61,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private static final String TAG_MULTI_TRACK = "MultiTrack";
     private static final String TAG_KML22_MULTI_TRACK = "gx:MultiTrack";
 
-    private static final String TAG_DATA_CATEGORY = "Data"; //used for Track.category
+    private static final String TAG_DATA_ACTIVITYTYPE = "Data";
 
     private static final String TAG_SIMPLE_ARRAY_DATA = "SimpleArrayData";
     private static final String TAG_KML22_SIMPLE_ARRAY_DATA = "gx:SimpleArrayData";
@@ -113,7 +113,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
     private String icon;
     private String name;
     private String description;
-    private String category;
+    private String activityType;
     private String latitude;
     private String longitude;
     private String altitude;
@@ -146,7 +146,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                 }
                 onTrackSegmentStart();
             }
-            case TAG_DATA_CATEGORY, TAG_SIMPLE_ARRAY_DATA, TAG_KML22_SIMPLE_ARRAY_DATA ->
+            case TAG_DATA_ACTIVITYTYPE, TAG_SIMPLE_ARRAY_DATA, TAG_KML22_SIMPLE_ARRAY_DATA ->
                     dataType = attributes.getValue(ATTRIBUTE_NAME);
         }
     }
@@ -165,15 +165,15 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
                     onMarkerEnd();
             case TAG_COORDINATES -> onMarkerLocationEnd();
             case TAG_MULTI_TRACK, TAG_KML22_MULTI_TRACK -> {
-                trackImporter.setTrack(context, name, uuid, description, category, icon, zoneOffset);
+                trackImporter.setTrack(context, name, uuid, description, activityType, icon, zoneOffset);
                 zoneOffset = null;
             }
             case TAG_TRACK, TAG_KML22_TRACK -> onTrackSegmentEnd();
             case TAG_COORD, TAG_KML22_COORD -> onCoordEnded();
             case TAG_VALUE, TAG_KML22_VALUE -> {
-                if (KMLTrackExporter.EXTENDED_DATA_TYPE_CATEGORY.equals(dataType)) {
+                if (KMLTrackExporter.EXTENDED_DATA_TYPE_ACTIVITYTYPE.equals(dataType)) {
                     if (content != null) {
-                        category = content.trim();
+                        activityType = content.trim();
                     }
                 } else {
                     onExtendedDataValueEnd();
@@ -233,7 +233,7 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
         name = null;
         icon = null;
         description = null;
-        category = null;
+        activityType = null;
         photoUrl = null;
         latitude = null;
         longitude = null;
@@ -260,13 +260,13 @@ public class KmlTrackImporter extends DefaultHandler implements XMLImporter.Trac
         Marker marker = new Marker(null, new TrackPoint(TrackPoint.Type.TRACKPOINT, location, whenList.get(0))); //TODO Creating marker without need
         marker.setName(name != null ? name : "");
         marker.setDescription(description != null ? description : "");
-        marker.setCategory(category != null ? category : "");
+        marker.setCategory(activityType != null ? activityType : "");
         marker.setPhotoUrl(photoUrl);
         markers.add(marker);
 
         name = null;
         description = null;
-        category = null;
+        activityType = null;
         photoUrl = null;
         whenList.clear();
     }
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
index e70d12290..39a575c2b 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
@@ -90,7 +90,7 @@ public class TrackImporter {
         this.markers.addAll(markers);
     }
 
-    void setTrack(Context context, String name, String uuid, String description, String category, String icon, @Nullable ZoneOffset zoneOffset) {
+    void setTrack(Context context, String name, String uuid, String description, String activityType, String icon, @Nullable ZoneOffset zoneOffset) {
         track = new Track(zoneOffset != null ? zoneOffset : ZoneOffset.UTC);
         track.setName(name != null ? name : "");
 
@@ -103,11 +103,11 @@ public class TrackImporter {
 
         track.setDescription(description != null ? description : "");
 
-        if (category != null) {
-            track.setCategory(category);
+        if (activityType != null) {
+            track.setActivityType(activityType);
 
             if (icon == null) {
-                icon = TrackIconUtils.getIconValue(context, category);
+                icon = TrackIconUtils.getIconValue(context, activityType);
             }
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/RecordingData.java b/src/main/java/de/dennisguse/opentracks/services/RecordingData.java
index 4f63baae6..6ebab6866 100644
--- a/src/main/java/de/dennisguse/opentracks/services/RecordingData.java
+++ b/src/main/java/de/dennisguse/opentracks/services/RecordingData.java
@@ -2,8 +2,6 @@ package de.dennisguse.opentracks.services;
 
 import androidx.annotation.NonNull;
 
-import java.util.Objects;
-
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
@@ -18,7 +16,7 @@ public record RecordingData(Track track, TrackPoint latestTrackPoint, SensorData
         if (track == null) {
             return "";
         }
-        return track.getCategory();
+        return track.getActivityType();
     }
 
     @NonNull
diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
index 58082b790..ba85691a6 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
@@ -73,7 +73,7 @@ class TrackRecordingManager implements SharedPreferences.OnSharedPreferenceChang
         onNewTrackPoint(segmentStartTrackPoint);
 
         String category = PreferencesUtils.getDefaultActivity();
-        track.setCategory(category);
+        track.setActivityType(category);
         track.setIcon(TrackIconUtils.getIconValue(context, category));
         track.setTrackStatistics(trackStatisticsUpdater.getTrackStatistics());
         //TODO Pass TrackPoint
diff --git a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java
index ae644201e..75f4fa98f 100644
--- a/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java
+++ b/src/main/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.java
@@ -182,7 +182,7 @@ public class VoiceAnnouncement {
             sensorStatistics = contentProviderUtils.getSensorStats(track.getId());
         }
 
-        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track.getCategory()), lastInterval, sensorStatistics);
+        Spannable announcement = VoiceAnnouncementUtils.getAnnouncement(context, track.getTrackStatistics(), PreferencesUtils.getUnitSystem(), PreferencesUtils.isReportSpeed(track.getActivityType()), lastInterval, sensorStatistics);
 
         if (announcement.length() > 0) {
             // We don't care about the utterance id. It is supplied here to force onUtteranceCompleted to be called.
diff --git a/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java
index 9bb698f67..2dec8ed1a 100644
--- a/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java
+++ b/src/main/java/de/dennisguse/opentracks/share/DescriptionGenerator.java
@@ -72,7 +72,7 @@ public class DescriptionGenerator {
         builder.append(paragraphSeparator);
 
         writeString(track.getName(), builder, R.string.generic_name_line, lineBreak);
-        writeString(track.getCategory(), builder, R.string.description_activity_type, lineBreak);
+        writeString(track.getActivityType(), builder, R.string.description_activity_type, lineBreak);
         writeString(track.getDescription(), builder, R.string.generic_description_line, lineBreak);
         builder.append(generateTrackStatisticsDescription(track.getTrackStatistics(), html));
 
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java
index d40081305..2878def59 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatistics.java
@@ -26,7 +26,7 @@ public class AggregatedStatistics {
         dataList.addAll(dataMap.values());
         Collections.sort(dataList, (o1, o2) -> {
             if (o1.getCountTracks() == o2.getCountTracks()) {
-                return o1.getCategory().compareTo(o2.getCategory());
+                return o1.getActivityType().compareTo(o2.getActivityType());
             }
             return (o1.getCountTracks() < o2.getCountTracks() ? 1 : -1);
         });
@@ -34,11 +34,11 @@ public class AggregatedStatistics {
 
     @VisibleForTesting
     public void aggregate(@NonNull Track track) {
-        String category = track.getCategory();
-        if (dataMap.containsKey(category)) {
-            dataMap.get(category).add(track.getTrackStatistics());
+        String activityType = track.getActivityType();
+        if (dataMap.containsKey(activityType)) {
+            dataMap.get(activityType).add(track.getTrackStatistics());
         } else {
-            dataMap.put(category, new AggregatedStatistic(category, track.getTrackStatistics()));
+            dataMap.put(activityType, new AggregatedStatistic(activityType, track.getTrackStatistics()));
         }
     }
 
@@ -46,8 +46,8 @@ public class AggregatedStatistics {
         return dataMap.size();
     }
 
-    public AggregatedStatistic get(String category) {
-        return dataMap.get(category);
+    public AggregatedStatistic get(String activityType) {
+        return dataMap.get(activityType);
     }
 
     public AggregatedStatistic getItem(int position) {
@@ -55,17 +55,17 @@ public class AggregatedStatistics {
     }
 
     public static class AggregatedStatistic {
-        private final String category;
+        private final String activityType;
         private final TrackStatistics trackStatistics;
         private int countTracks = 1;
 
-        public AggregatedStatistic(String category, TrackStatistics trackStatistics) {
-            this.category = category;
+        public AggregatedStatistic(String activityType, TrackStatistics trackStatistics) {
+            this.activityType = activityType;
             this.trackStatistics = trackStatistics;
         }
 
-        public String getCategory() {
-            return category;
+        public String getActivityType() {
+            return activityType;
         }
 
         public TrackStatistics getTrackStatistics() {
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java
index 5a6659ee3..5380f8e43 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java
@@ -90,7 +90,7 @@ public class AggregatedStatisticsActivity extends AbstractActivity implements Fi
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == R.id.aggregated_statistics_filter) {
             ArrayList<FilterDialogFragment.FilterItem> filterItems = new ArrayList<>();
-            adapter.getCategories().stream().forEach(category -> filterItems.add(new FilterDialogFragment.FilterItem(category, category, true)));
+            adapter.getCategories().stream().forEach(activityType -> filterItems.add(new FilterDialogFragment.FilterItem(activityType, activityType, true)));
             FilterDialogFragment.showDialog(getSupportFragmentManager(), filterItems);
             return true;
         }
@@ -116,7 +116,7 @@ public class AggregatedStatisticsActivity extends AbstractActivity implements Fi
     public void onFilterDone(ArrayList<FilterDialogFragment.FilterItem> filterItems, LocalDateTime from, LocalDateTime to) {
         setMenuVisibility(true);
         selection.addDateRange(from.atZone(ZoneId.systemDefault()).toInstant(), to.atZone(ZoneId.systemDefault()).toInstant());
-        filterItems.stream().filter(fi -> fi.isChecked).forEach(fi -> selection.addCategory(fi.value));
+        filterItems.stream().filter(fi -> fi.isChecked).forEach(fi -> selection.addActivityType(fi.value));
         viewModel.updateSelection(selection);
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index d7f1f7091..25fe32766 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -62,7 +62,7 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-        if (TrackIconUtils.isSpeedIcon(context.getResources(), aggregatedStatistic.getCategory())) {
+        if (TrackIconUtils.isSpeedIcon(context.getResources(), aggregatedStatistic.getActivityType())) {
             viewHolder.setSpeed(aggregatedStatistic);
         } else {
             viewHolder.setPace(aggregatedStatistic);
@@ -80,7 +80,7 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
     public List<String> getCategories() {
         List<String> categories = new ArrayList<>();
         for (int i = 0; i < aggregatedStatistics.getCount(); i++) {
-            categories.add(aggregatedStatistics.getItem(i).getCategory());
+            categories.add(aggregatedStatistics.getItem(i).getActivityType());
         }
         return categories;
     }
@@ -159,13 +159,13 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
 
         //TODO Check preference handling.
         private void setCommonValues(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
-            String category = aggregatedStatistic.getCategory();
+            String activityType = aggregatedStatistic.getActivityType();
 
-            reportSpeed = PreferencesUtils.isReportSpeed(category);
+            reportSpeed = PreferencesUtils.isReportSpeed(activityType);
             unitSystem = PreferencesUtils.getUnitSystem();
 
             sportIcon.setImageResource(getIcon(aggregatedStatistic));
-            typeLabel.setText(category);
+            typeLabel.setText(activityType);
             numTracks.setText(StringUtils.valueInParentheses(String.valueOf(aggregatedStatistic.getCountTracks())));
 
             Pair<String, String> parts = DistanceFormatter.Builder()
@@ -178,7 +178,7 @@ public class AggregatedStatisticsAdapter extends BaseAdapter {
         }
 
         private int getIcon(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
-            String iconValue = TrackIconUtils.getIconValue(context, aggregatedStatistic.getCategory());
+            String iconValue = TrackIconUtils.getIconValue(context, aggregatedStatistic.getActivityType());
             return TrackIconUtils.getIconDrawable(iconValue);
         }
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
index c077056e9..d44b038c4 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/intervals/IntervalsFragment.java
@@ -151,7 +151,7 @@ public class IntervalsFragment extends Fragment {
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(getContext());
         Track track = contentProviderUtils.getTrack(trackId);
         if (track != null) {
-            isReportSpeed = PreferencesUtils.isReportSpeed(track.getCategory());
+            isReportSpeed = PreferencesUtils.isReportSpeed(track.getActivityType());
         }
 
         viewModel = new ViewModelProvider(getActivity()).get(IntervalStatisticsModel.class);
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
index 3cb366158..8f142e62f 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
@@ -32,24 +32,24 @@ public class TrackUtils {
     private TrackUtils() {
     }
 
-    public static void updateTrack(Context context, Track track, String name, String category, String description, ContentProviderUtils contentProviderUtils) {
-        updateTrack(context, track, name, category, TrackIconUtils.getIconValue(context, category), description, contentProviderUtils);
+    public static void updateTrack(Context context, Track track, String name, String activityType, String description, ContentProviderUtils contentProviderUtils) {
+        updateTrack(context, track, name, activityType, TrackIconUtils.getIconValue(context, activityType), description, contentProviderUtils);
     }
 
-    public static void updateTrack(Context context, Track track, String name, String category, String iconValue, String description, ContentProviderUtils contentProviderUtils) {
+    public static void updateTrack(Context context, Track track, String name, String activityType, String iconValue, String description, ContentProviderUtils contentProviderUtils) {
         boolean update = false;
         if (name != null) {
             track.setName(name);
             update = true;
         }
-        if (category != null) {
-            track.setCategory(category);
+        if (activityType != null) {
+            track.setActivityType(activityType);
             update = true;
         }
         if (iconValue != null) {
             track.setIcon(iconValue);
-        } else if (category != null){
-            track.setIcon(TrackIconUtils.getIconValue(context, category));
+        } else if (activityType != null) {
+            track.setIcon(TrackIconUtils.getIconValue(context, activityType));
         }
         if (description != null) {
             track.setDescription(description);