diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java
index 23c932151..335fe1c20 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java
@@ -278,7 +278,7 @@ public class SearchEngineTest {
 
     private void assertTrackResult(Track.Id trackId, ScoredResult result) {
         assertNotNull("Not a track", result.track);
-        assertNull("Ambiguous result", result.waypoint);
+        assertNull("Ambiguous result", result.marker);
         assertEquals(trackId, result.track.getId());
     }
 
@@ -293,15 +293,15 @@ public class SearchEngineTest {
         for (int i = 0; i < results.size(); i++) {
             ScoredResult result = results.get(i);
             assertNotNull(errMsg, result.track);
-            assertNull(errMsg, result.waypoint);
+            assertNull(errMsg, result.marker);
             assertEquals(errMsg, trackIds[i], result.track.getId());
         }
     }
 
     private void assertWaypointResult(Marker.Id waypointId, ScoredResult result) {
-        assertNotNull("Not a waypoint", result.waypoint);
+        assertNotNull("Not a waypoint", result.marker);
         assertNull("Ambiguous result", result.track);
-        assertEquals(waypointId, result.waypoint.getId());
+        assertEquals(waypointId, result.marker.getId());
     }
 
     private void assertWaypointResults(List<ScoredResult> results, Marker.Id... waypointIds) {
@@ -314,9 +314,9 @@ public class SearchEngineTest {
         assertEquals(results.size(), waypointIds.length);
         for (int i = 0; i < results.size(); i++) {
             ScoredResult result = results.get(i);
-            assertNotNull(errMsg, result.waypoint);
+            assertNotNull(errMsg, result.marker);
             assertNull(errMsg, result.track);
-            assertEquals(errMsg, waypointIds[i], result.waypoint.getId());
+            assertEquals(errMsg, waypointIds[i], result.marker.getId());
         }
     }
 }
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 ce2ae0104..4b58f68d4 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
@@ -53,7 +53,7 @@ public class ExportImportTest {
     private static final String TRACK_CATEGORY = "the category";
     private static final String TRACK_DESCRIPTION = "the description";
 
-    private final List<Marker> waypoints = new ArrayList<>();
+    private final List<Marker> markers = new ArrayList<>();
     private final List<TrackPoint> trackPoints = new ArrayList<>();
 
     private Track.Id importTrackId;
@@ -72,19 +72,19 @@ public class ExportImportTest {
         trackPoints.addAll(Arrays.asList(track.second));
 
         for (int i = 0; i < 3; i++) {
-            Marker waypoint = new Marker(track.second[i].getLocation());
-            waypoint.setName("the waypoint " + i);
-            waypoint.setDescription("the waypoint description " + i);
-            waypoint.setCategory("the waypoint category" + i);
-            waypoint.setIcon("the waypoing icon" + i);
-            waypoint.setPhotoUrl("the photo url" + i);
-            waypoint.setTrackId(trackId);
-            contentProviderUtils.insertMarker(waypoint);
+            Marker marker = new Marker(track.second[i].getLocation());
+            marker.setName("the marker " + i);
+            marker.setDescription("the marker description " + i);
+            marker.setCategory("the marker category" + i);
+            marker.setIcon("the waypoing icon" + i);
+            marker.setPhotoUrl("the photo url" + i);
+            marker.setTrackId(trackId);
+            contentProviderUtils.insertMarker(marker);
 
-            waypoints.add(waypoint);
+            markers.add(marker);
         }
 
-        assertEquals(waypoints.size(), contentProviderUtils.getMarkerCount(trackId));
+        assertEquals(markers.size(), contentProviderUtils.getMarkerCount(trackId));
     }
 
     @After
@@ -129,8 +129,8 @@ public class ExportImportTest {
         assertEquals(track.getIcon(), importedTrack.getIcon());
         assertEquals(track.getUuid(), importedTrack.getUuid());
 
-        // 2. waypoints
-        assertWaypoints();
+        // 2. markers
+        assertMarkers();
 
         // 3. trackpoints
         assertTrackpoints(false, false, false);
@@ -164,8 +164,8 @@ public class ExportImportTest {
         assertEquals(track.getName(), importedTrack.getName());
         assertEquals(track.getIcon(), importedTrack.getIcon());
 
-        // 2. waypoints
-        assertWaypoints();
+        // 2. markers
+        assertMarkers();
 
         // 3. trackpoints
         assertTrackpoints(true, true, true);
@@ -253,8 +253,8 @@ public class ExportImportTest {
         //TODO exporting and importing a track icon is not yet supported by GpxTrackWriter.
         //assertEquals(track.getIcon(), trackImported.getIcon());
 
-        // 2. waypoints
-        assertWaypoints();
+        // 2. markers
+        assertMarkers();
 
         // 3. trackpoints
         assertTrackpoints(false, true, true);
@@ -285,22 +285,22 @@ public class ExportImportTest {
         assertNull(trackImported);
     }
 
-    private void assertWaypoints() {
-        assertEquals(waypoints.size(), contentProviderUtils.getMarkerCount(importTrackId));
+    private void assertMarkers() {
+        assertEquals(markers.size(), contentProviderUtils.getMarkerCount(importTrackId));
 
-        List<Marker> importedWaypoints = contentProviderUtils.getMarkers(importTrackId);
-        for (int i = 0; i < waypoints.size(); i++) {
-            Marker waypoint = waypoints.get(i);
-            Marker importedWaypoint = importedWaypoints.get(i);
-            assertEquals(waypoint.getCategory(), importedWaypoint.getCategory());
-            assertEquals(waypoint.getDescription(), importedWaypoint.getDescription());
-            // assertEquals(waypoint.getIcon(), importedWaypoint.getIcon()); // TODO for KML
-            assertEquals(waypoint.getName(), importedWaypoint.getName());
-            assertEquals("", importedWaypoint.getPhotoUrl());
+        List<Marker> importedMarkers = contentProviderUtils.getMarkers(importTrackId);
+        for (int i = 0; i < markers.size(); i++) {
+            Marker marker = markers.get(i);
+            Marker importMarker = importedMarkers.get(i);
+            assertEquals(marker.getCategory(), importMarker.getCategory());
+            assertEquals(marker.getDescription(), importMarker.getDescription());
+            // assertEquals(marker.getIcon(), importMarker.getIcon()); // TODO for KML
+            assertEquals(marker.getName(), importMarker.getName());
+            assertEquals("", importMarker.getPhotoUrl());
 
-            assertEquals(waypoint.getLocation().getLatitude(), importedWaypoint.getLocation().getLatitude(), 0.001);
-            assertEquals(waypoint.getLocation().getLongitude(), importedWaypoint.getLocation().getLongitude(), 0.001);
-            assertEquals(waypoint.getLocation().getAltitude(), importedWaypoint.getLocation().getAltitude(), 0.001);
+            assertEquals(marker.getLocation().getLatitude(), importMarker.getLocation().getLatitude(), 0.001);
+            assertEquals(marker.getLocation().getLongitude(), importMarker.getLocation().getLongitude(), 0.001);
+            assertEquals(marker.getLocation().getAltitude(), importMarker.getLocation().getAltitude(), 0.001);
         }
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
index 215ac107d..3783849fc 100644
--- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java
@@ -355,7 +355,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa
             if (result.track != null) {
                 output.add(prepareTrackForDisplay(result.track));
             } else {
-                output.add(prepareMarkerForDisplay(result.waypoint));
+                output.add(prepareMarkerForDisplay(result.marker));
             }
         }
         return output;
diff --git a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java
index 4d628e63d..bbd0c3f76 100644
--- a/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java
+++ b/src/main/java/de/dennisguse/opentracks/content/DescriptionGenerator.java
@@ -28,7 +28,7 @@ import de.dennisguse.opentracks.util.StringUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
- * Generates descriptions for tracks and waypoints.
+ * Generates descriptions for tracks and markers.
  *
  * @author Jimmy Shih
  */
diff --git a/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java
index a8f9230ca..c9dd29c2a 100644
--- a/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java
+++ b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java
@@ -38,7 +38,7 @@ import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.util.UnitConversions;
 
 /**
- * Engine for searching for tracks and waypoints by text.
+ * Engine for searching for tracks and markers by text.
  *
  * @author Rodrigo Damazio
  */
@@ -53,9 +53,9 @@ public class SearchEngine {
                     TracksColumns.CATEGORY + " LIKE ?";
 
     /**
-     * WHERE query to get waypoints by name.
+     * WHERE query to get markers by name.
      */
-    private static final String WAYPOINT_SELECTION_QUERY =
+    private static final String MARKER_SELECTION_QUERY =
             MarkerColumns.NAME + " LIKE ? OR " +
                     MarkerColumns.DESCRIPTION + " LIKE ? OR " +
                     MarkerColumns.CATEGORY + " LIKE ?";
@@ -66,9 +66,9 @@ public class SearchEngine {
     private static final String TRACK_SELECTION_ORDER = TracksColumns._ID + " DESC LIMIT 1000";
 
     /**
-     * Order of waypoint results.
+     * Order of marker results.
      */
-    private static final String WAYPOINT_SELECTION_ORDER = MarkerColumns._ID + " DESC";
+    private static final String MARKER_SELECTION_ORDER = MarkerColumns._ID + " DESC";
 
     /**
      * How much we promote a match in the track category.
@@ -86,9 +86,9 @@ public class SearchEngine {
     private static final double TRACK_NAME_PROMOTION = 16.0;
 
     /**
-     * How much we promote a waypoint result if it's in the currently-selected track.
+     * How much we promote a marker result if it's in the currently-selected track.
      */
-    private static final double CURRENT_TRACK_WAYPOINT_PROMOTION = 2.0;
+    private static final double CURRENT_TRACK_MARKER_PROMOTION = 2.0;
 
     /**
      * How much we promote a track result if it's the currently-selected track.
@@ -96,9 +96,9 @@ public class SearchEngine {
     private static final double CURRENT_TRACK_DEMOTION = 0.5;
 
     /**
-     * Maximum number of waypoints which will be retrieved and scored.
+     * Maximum number of markers which will be retrieved and scored.
      */
-    private static final int MAX_SCORED_WAYPOINTS = 100;
+    private static final int MAX_SCORED_MARKERS = 100;
 
     /**
      * Oldest timestamp for which we rank based on time (2000-01-01 00:00:00.000)
@@ -115,16 +115,16 @@ public class SearchEngine {
             return scoreDiff;
         }
 
-        // Make tracks come before waypoints.
-        if (r1.waypoint != null && r2.track != null) {
+        // Make tracks come before markers.
+        if (r1.marker != null && r2.track != null) {
             return 1;
-        } else if (r1.track != null && r2.waypoint != null) {
+        } else if (r1.track != null && r2.marker != null) {
             return -1;
         }
 
         // Finally, use arbitrary ordering, by ID.
-        long id1 = r1.track != null ? r1.track.getId().getId() : r1.waypoint.getId().getId();
-        long id2 = r2.track != null ? r2.track.getId().getId() : r2.waypoint.getId().getId();
+        long id1 = r1.track != null ? r1.track.getId().getId() : r1.marker.getId().getId();
+        long id2 = r2.track != null ? r2.track.getId().getId() : r2.marker.getId().getId();
         long idDiff = id2 - id1;
         return Long.signum(idDiff);
     };
@@ -153,7 +153,7 @@ public class SearchEngine {
         TreeSet<ScoredResult> scoredResults = new TreeSet<>(SCORED_RESULT_COMPARATOR);
 
         scoreTrackResults(retrieveTracks(query), query, scoredResults);
-        scoreWaypointResults(retrieveWaypoints(query), query, scoredResults);
+        scoreMarkersResults(retrieveMarkers(query), query, scoredResults);
 
         return scoredResults;
     }
@@ -186,33 +186,33 @@ public class SearchEngine {
     }
 
     /**
-     * Retrieves waypoints matching the given query from the database.
+     * Retrieves markers matching the given query from the database.
      *
      * @param query the query to retrieve for
      */
-    private List<Marker> retrieveWaypoints(SearchQuery query) {
-        ArrayList<Marker> waypoints = new ArrayList<>();
+    private List<Marker> retrieveMarkers(SearchQuery query) {
+        ArrayList<Marker> markers = new ArrayList<>();
 
         String queryLikeSelection2 = "%" + query.textQuery + "%";
-        String[] waypointSelectionArgs = new String[]{
+        String[] markersSelectionArgs = new String[]{
                 queryLikeSelection2,
                 queryLikeSelection2,
                 queryLikeSelection2
         };
 
-        try (Cursor cursor = providerUtils.getMarkerCursor(WAYPOINT_SELECTION_QUERY, waypointSelectionArgs, WAYPOINT_SELECTION_ORDER, MAX_SCORED_WAYPOINTS)) {
+        try (Cursor cursor = providerUtils.getMarkerCursor(MARKER_SELECTION_QUERY, markersSelectionArgs, MARKER_SELECTION_ORDER, MAX_SCORED_MARKERS)) {
             if (cursor != null) {
-                waypoints.ensureCapacity(cursor.getCount());
+                markers.ensureCapacity(cursor.getCount());
                 while (cursor.moveToNext()) {
-                    Marker waypoint = providerUtils.createMarker(cursor);
-                    if (LocationUtils.isValidLocation(waypoint.getLocation())) {
-                        waypoints.add(waypoint);
+                    Marker marker = providerUtils.createMarker(cursor);
+                    if (LocationUtils.isValidLocation(marker.getLocation())) {
+                        markers.add(marker);
                     }
                 }
             }
         }
 
-        return waypoints;
+        return markers;
     }
 
     /**
@@ -258,40 +258,40 @@ public class SearchEngine {
     }
 
     /**
-     * Scores a collection of waypoint results.
+     * Scores a collection of marker results.
      *
-     * @param waypoints the results to score
-     * @param query     the query to score for
-     * @param output    the collection to fill with scored results
+     * @param markers the results to score
+     * @param query   the query to score for
+     * @param output  the collection to fill with scored results
      */
-    private void scoreWaypointResults(Collection<Marker> waypoints, SearchQuery query, Collection<ScoredResult> output) {
-        for (Marker waypoint : waypoints) {
+    private void scoreMarkersResults(Collection<Marker> markers, SearchQuery query, Collection<ScoredResult> output) {
+        for (Marker marker : markers) {
             // Calculate the score.
-            double score = scoreWaypointResult(query, waypoint);
+            double score = scoreMarkerResult(query, marker);
 
             // Add to the output.
-            output.add(new ScoredResult(waypoint, score));
+            output.add(new ScoredResult(marker, score));
         }
     }
 
     /**
-     * Scores a single waypoint result.
+     * Scores a single marker result.
      *
-     * @param query    the query to score for
-     * @param waypoint the results to score
-     * @return the score for the waypoint
+     * @param query  the query to score for
+     * @param marker the results to score
+     * @return the score for the marker
      */
-    private double scoreWaypointResult(SearchQuery query, Marker waypoint) {
+    private double scoreMarkerResult(SearchQuery query, Marker marker) {
         double score = 1.0;
 
-        Location location = waypoint.getLocation();
-        score *= getTitleBoost(query, waypoint.getName(), waypoint.getDescription(), waypoint.getCategory());
+        Location location = marker.getLocation();
+        score *= getTitleBoost(query, marker.getName(), marker.getDescription(), marker.getCategory());
         score *= getDistanceBoost(query, location.getLatitude(), location.getLongitude());
         score *= getTimeBoost(query, location.getTime());
 
-        // Score waypoints in the currently-selected track higher (searching inside the current track).
-        if (waypoint.getTrackId() != null && waypoint.getTrackId().equals(query.currentTrackId)) {
-            score *= CURRENT_TRACK_WAYPOINT_PROMOTION;
+        // Score markers in the currently-selected track higher (searching inside the current track).
+        if (marker.getTrackId() != null && marker.getTrackId().equals(query.currentTrackId)) {
+            score *= CURRENT_TRACK_MARKER_PROMOTION;
         }
 
         return score;
@@ -301,9 +301,9 @@ public class SearchEngine {
      * Calculates the boosting of the score due to the field(s) in which the match occured.
      *
      * @param query       the query to boost for
-     * @param name        the name of the track or waypoint
-     * @param description the description of the track or waypoint
-     * @param category    the category of the track or waypoint
+     * @param name        the name of the track or marker
+     * @param description the description of the track or marker
+     * @param category    the category of the track or marker
      * @return the total boost to be applied to the result
      */
     private double getTitleBoost(SearchQuery query, String name, String description, String category) {
@@ -398,18 +398,18 @@ public class SearchEngine {
      */
     public static class ScoredResult {
         public final Track track;
-        public final Marker waypoint;
+        public final Marker marker;
         final double score;
 
         ScoredResult(Track track, double score) {
             this.track = track;
-            this.waypoint = null;
+            this.marker = null;
             this.score = score;
         }
 
-        ScoredResult(Marker waypoint, double score) {
+        ScoredResult(Marker marker, double score) {
             this.track = null;
-            this.waypoint = waypoint;
+            this.marker = marker;
             this.score = score;
         }
 
@@ -418,7 +418,7 @@ public class SearchEngine {
         public String toString() {
             return "ScoredResult ["
                     + (track != null ? ("trackId=" + track.getId().getId() + ", ") : "")
-                    + (waypoint != null ? ("wptId=" + waypoint.getId().getId() + ", ") : "")
+                    + (marker != null ? ("wptId=" + marker.getId().getId() + ", ") : "")
                     + "score=" + score + "]";
         }
     }
diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
index 5aea63904..dd36070ba 100644
--- a/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataHub.java
@@ -58,14 +58,14 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
      * We may display more than this number of points.
      */
     @Deprecated
-    private static final int TARGET_DISPLAYED_TRACK_POINTS = 5000;
+    private static final int TARGET_DISPLAYED_TRACKPOINTS = 5000;
 
     /**
-     * Maximum number of waypoints to displayed.
+     * Maximum number of markers to displayed.
      */
     @VisibleForTesting
     @Deprecated
-    private static final int MAX_DISPLAYED_WAYPOINTS = 128;
+    private static final int MAX_DISPLAYED_MARKERS = 128;
 
     private static final String TAG = TrackDataHub.class.getSimpleName();
 
@@ -90,11 +90,11 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
 
     // Registered listeners
     private ContentObserver tracksTableObserver;
-    private ContentObserver waypointsTableObserver;
+    private ContentObserver markersTableObserver;
     private ContentObserver trackPointsTableObserver;
 
     public TrackDataHub(Context context) {
-        this(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACK_POINTS);
+        this(context, new TrackDataManager(), new ContentProviderUtils(context), TARGET_DISPLAYED_TRACKPOINTS);
     }
 
     @VisibleForTesting
@@ -126,13 +126,13 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
         };
         contentResolver.registerContentObserver(TracksColumns.CONTENT_URI, false, tracksTableObserver);
 
-        waypointsTableObserver = new ContentObserver(handler) {
+        markersTableObserver = new ContentObserver(handler) {
             @Override
             public void onChange(boolean selfChange) {
-                notifyWaypointsTableUpdate(trackDataManager.getListenerWaypoints());
+                notifyMarkersTableUpdate(trackDataManager.getListenerMarkers());
             }
         };
-        contentResolver.registerContentObserver(MarkerColumns.CONTENT_URI, false, waypointsTableObserver);
+        contentResolver.registerContentObserver(MarkerColumns.CONTENT_URI, false, markersTableObserver);
 
         trackPointsTableObserver = new ContentObserver(handler) {
             @Override
@@ -165,7 +165,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
         //Unregister listeners
         ContentResolver contentResolver = context.getContentResolver();
         contentResolver.unregisterContentObserver(tracksTableObserver);
-        contentResolver.unregisterContentObserver(waypointsTableObserver);
+        contentResolver.unregisterContentObserver(markersTableObserver);
         contentResolver.unregisterContentObserver(trackPointsTableObserver);
 
         if (handlerThread != null) {
@@ -191,9 +191,9 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
      *
      * @param trackDataListener the track data listener
      */
-    public void registerTrackDataListener(final TrackDataListener trackDataListener, final boolean tracksTable, final boolean waypointsTable, final boolean trackPointsTable_SampleIn, final boolean trackPointsTable_SampleOut) {
+    public void registerTrackDataListener(final TrackDataListener trackDataListener, final boolean tracksTable, final boolean markersTable, final boolean trackPointsTable_SampleIn, final boolean trackPointsTable_SampleOut) {
         runInHandlerThread(() -> {
-            trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, waypointsTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut);
+            trackDataManager.registerTrackDataListener(trackDataListener, tracksTable, markersTable, trackPointsTable_SampleIn, trackPointsTable_SampleOut);
             if (started) {
                 loadDataForListener(trackDataListener);
             }
@@ -250,7 +250,7 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
             listener.clearTrackPoints();
         }
         notifyTrackPointsTableUpdate(true, trackDataManager.getListenerTrackPoints_SampledIn(), trackDataManager.getListenerTrackPoints_SampledOut());
-        notifyWaypointsTableUpdate(trackDataManager.getListenerWaypoints());
+        notifyMarkersTableUpdate(trackDataManager.getListenerMarkers());
     }
 
     /**
@@ -277,8 +277,8 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
             notifyTrackPointsTableUpdate(isOnlyListener, trackDataListeners, sampledOutListeners);
         }
 
-        if (trackDataManager.listensForWaypoints(trackDataListener)) {
-            notifyWaypointsTableUpdate(trackDataListeners);
+        if (trackDataManager.listensForMarkers(trackDataListener)) {
+            notifyMarkersTableUpdate(trackDataListeners);
         }
     }
 
@@ -298,36 +298,36 @@ public class TrackDataHub implements SharedPreferences.OnSharedPreferenceChangeL
     }
 
     /**
-     * Notifies waypoint table update.
-     * Currently, reloads all the waypoints up to {@link #MAX_DISPLAYED_WAYPOINTS}. To be run in the {@link #handler} thread.
+     * Notifies marker table update.
+     * Currently, reloads all the markers up to {@link #MAX_DISPLAYED_MARKERS}. To be run in the {@link #handler} thread.
      *
      * @param trackDataListeners the track data listeners to notify
      */
-    private void notifyWaypointsTableUpdate(Set<TrackDataListener> trackDataListeners) {
+    private void notifyMarkersTableUpdate(Set<TrackDataListener> trackDataListeners) {
         if (trackDataListeners.isEmpty()) {
             return;
         }
 
         for (TrackDataListener trackDataListener : trackDataListeners) {
-            trackDataListener.clearWaypoints();
+            trackDataListener.clearMarkers();
         }
 
-        try (Cursor cursor = contentProviderUtils.getMarkerCursor(selectedTrackId, null, MAX_DISPLAYED_WAYPOINTS)) {
+        try (Cursor cursor = contentProviderUtils.getMarkerCursor(selectedTrackId, null, MAX_DISPLAYED_MARKERS)) {
             if (cursor != null && cursor.moveToFirst()) {
                 do {
-                    Marker waypoint = contentProviderUtils.createMarker(cursor);
-                    if (!LocationUtils.isValidLocation(waypoint.getLocation())) {
+                    Marker marker = contentProviderUtils.createMarker(cursor);
+                    if (!LocationUtils.isValidLocation(marker.getLocation())) {
                         continue;
                     }
                     for (TrackDataListener trackDataListener : trackDataListeners) {
-                        trackDataListener.onNewWaypoint(waypoint);
+                        trackDataListener.onNewMarker(marker);
                     }
                 } while (cursor.moveToNext());
             }
         }
 
         for (TrackDataListener trackDataListener : trackDataListeners) {
-            trackDataListener.onNewWaypointsDone();
+            trackDataListener.onNewMarkersDone();
         }
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java
index 4c7ef9272..98e8e8516 100644
--- a/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataListener.java
@@ -60,20 +60,20 @@ public interface TrackDataListener {
     void onNewTrackPointsDone();
 
     /**
-     * Called to clear previously sent waypoints.
+     * Called to clear previously sent markers.
      */
-    void clearWaypoints();
+    void clearMarkers();
 
     /**
-     * Called when a new waypoint is read.
+     * Called when a new marker is read.
      *
-     * @param waypoint the waypoint
+     * @param marker the marker
      */
-    void onNewWaypoint(Marker waypoint);
+    void onNewMarker(Marker marker);
 
     /**
-     * Called when finish sending new waypoints.
-     * This gets called after every batch of calls to {@link #clearWaypoints()} and {@link #onNewWaypoint(Marker)}.
+     * Called when finish sending new markers.
+     * This gets called after every batch of calls to {@link #clearMarkers()} and {@link #onNewMarker(Marker)}.
      */
-    void onNewWaypointsDone();
+    void onNewMarkersDone();
 }
diff --git a/src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java b/src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java
index df3f2ed3c..9bd35bdde 100644
--- a/src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java
+++ b/src/main/java/de/dennisguse/opentracks/content/TrackDataManager.java
@@ -29,32 +29,32 @@ class TrackDataManager {
     private static final String TAG = TrackDataManager.class.getSimpleName();
 
     private final Set<TrackDataListener> dataListenerTracks = new HashSet<>();
-    private final Set<TrackDataListener> dataListenerWaypoints = new HashSet<>();
+    private final Set<TrackDataListener> dataListenerMarkers = new HashSet<>();
     private final Set<TrackDataListener> dataListenerTrackPoints_SampledIn = new HashSet<>();
     private final Set<TrackDataListener> dataListenerTrackPoints_SampledOut = new HashSet<>();
 
-    void registerTrackDataListener(final TrackDataListener trackDataListener, boolean tracksTable, boolean waypointsTable, boolean trackPointsTable_SampleIn, boolean trackPointsTable_SampleOut) {
+    void registerTrackDataListener(final TrackDataListener trackDataListener, boolean tracksTable, boolean markersTable, boolean trackPointsTable_SampleIn, boolean trackPointsTable_SampleOut) {
         if (tracksTable) dataListenerTracks.add(trackDataListener);
-        if (waypointsTable) dataListenerWaypoints.add(trackDataListener);
+        if (markersTable) dataListenerMarkers.add(trackDataListener);
         if (trackPointsTable_SampleIn) dataListenerTrackPoints_SampledIn.add(trackDataListener);
         if (trackPointsTable_SampleOut) dataListenerTrackPoints_SampledOut.add(trackDataListener);
     }
 
     void unregisterTrackDataListener(TrackDataListener trackDataListener) {
         dataListenerTracks.add(trackDataListener);
-        dataListenerWaypoints.add(trackDataListener);
+        dataListenerMarkers.add(trackDataListener);
         dataListenerTrackPoints_SampledIn.add(trackDataListener);
         dataListenerTrackPoints_SampledOut.add(trackDataListener);
     }
 
     boolean hasListeners() {
-        return dataListenerTracks.size() + dataListenerWaypoints.size() + dataListenerTrackPoints_SampledIn.size() + dataListenerTrackPoints_SampledOut.size() > 0;
+        return dataListenerTracks.size() + dataListenerMarkers.size() + dataListenerTrackPoints_SampledIn.size() + dataListenerTrackPoints_SampledOut.size() > 0;
     }
 
     int getNumberOfListeners() {
         Set<TrackDataListener> listener = new HashSet<>();
         listener.addAll(dataListenerTracks);
-        listener.addAll(dataListenerWaypoints);
+        listener.addAll(dataListenerMarkers);
         listener.addAll(dataListenerTrackPoints_SampledIn);
         listener.addAll(dataListenerTrackPoints_SampledOut);
 
@@ -65,8 +65,8 @@ class TrackDataManager {
         return dataListenerTracks.contains(listener);
     }
 
-    boolean listensForWaypoints(TrackDataListener listener) {
-        return dataListenerWaypoints.contains(listener);
+    boolean listensForMarkers(TrackDataListener listener) {
+        return dataListenerMarkers.contains(listener);
     }
 
     boolean listensForTrackPoints_SampledIn(TrackDataListener listener) {
@@ -81,8 +81,8 @@ class TrackDataManager {
         return dataListenerTracks;
     }
 
-    Set<TrackDataListener> getListenerWaypoints() {
-        return dataListenerWaypoints;
+    Set<TrackDataListener> getListenerMarkers() {
+        return dataListenerMarkers;
     }
 
     Set<TrackDataListener> getListenerTrackPoints_SampledIn() {
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java b/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
index fbec7213e..55b39b952 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/Marker.java
@@ -30,8 +30,6 @@ import java.util.Objects;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
 /**
- * A waypoint.
- *
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
diff --git a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
index 959011eef..17e2c2d0d 100644
--- a/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
+++ b/src/main/java/de/dennisguse/opentracks/content/data/TrackPoint.java
@@ -59,10 +59,12 @@ public class TrackPoint {
         location.setTime(time);
     }
 
+    @Deprecated //See #316
     public static TrackPoint createPause() {
         return createPauseWithTime(System.currentTimeMillis());
     }
 
+    @Deprecated //See #316
     public static TrackPoint createPauseWithTime(long time) {
         Location pause = new Location(LocationManager.GPS_PROVIDER);
         pause.setLongitude(0);
@@ -71,10 +73,12 @@ public class TrackPoint {
         return new TrackPoint(pause);
     }
 
+    @Deprecated //See #316
     public static TrackPoint createResume() {
         return createResumeWithTime(System.currentTimeMillis());
     }
 
+    @Deprecated //See #316
     public static TrackPoint createResumeWithTime(long time) {
         Location resume = new Location(LocationManager.GPS_PROVIDER);
         resume.setLongitude(0);
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
index 7bb97c5aa..f9270e1ea 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChartFragment.java
@@ -242,21 +242,21 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     }
 
     @Override
-    public void clearWaypoints() {
+    public void clearMarkers() {
         if (isResumed()) {
             chartView.clearWaypoints();
         }
     }
 
     @Override
-    public void onNewWaypoint(Marker waypoint) {
-        if (isResumed() && waypoint != null && LocationUtils.isValidLocation(waypoint.getLocation())) {
-            chartView.addWaypoint(waypoint);
+    public void onNewMarker(Marker marker) {
+        if (isResumed() && marker != null && LocationUtils.isValidLocation(marker.getLocation())) {
+            chartView.addWaypoint(marker);
         }
     }
 
     @Override
-    public void onNewWaypointsDone() {
+    public void onNewMarkersDone() {
         if (isResumed()) {
             runOnUiThread(updateChart);
         }
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
index 53858f468..812d212cd 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/DeleteMarkerDialogFragment.java
@@ -64,23 +64,23 @@ public class DeleteMarkerDialogFragment extends DialogFragment {
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final Marker.Id[] waypointIds = (Marker.Id[]) getArguments().getParcelableArray(KEY_MARKER_IDS);
+        final Marker.Id[] markerIds = (Marker.Id[]) getArguments().getParcelableArray(KEY_MARKER_IDS);
 
         final FragmentActivity fragmentActivity = getActivity();
         int titleId;
         int messageId;
-        if (waypointIds == null) {
+        if (markerIds == null) {
             titleId = R.string.generic_delete_all_confirm_title;
             messageId = R.string.marker_delete_all_confirm_message;
         } else {
-            titleId = waypointIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.marker_delete_one_confirm_title;
-            messageId = waypointIds.length > 1 ? R.string.marker_delete_multiple_confirm_message : R.string.marker_delete_one_confirm_message;
+            titleId = markerIds.length > 1 ? R.string.generic_delete_selected_confirm_title : R.string.marker_delete_one_confirm_title;
+            messageId = markerIds.length > 1 ? R.string.marker_delete_multiple_confirm_message : R.string.marker_delete_one_confirm_message;
         }
         return DialogUtils.createConfirmationDialog(
                 fragmentActivity, titleId, getString(messageId), (dialog, which) -> new Thread(() -> {
                     ContentProviderUtils contentProviderUtils = new ContentProviderUtils(fragmentActivity);
-                    for (Marker.Id waypointId : waypointIds) {
-                        contentProviderUtils.deleteMarker(getContext(), waypointId);
+                    for (Marker.Id markerId : markerIds) {
+                        contentProviderUtils.deleteMarker(getContext(), markerId);
                     }
                     caller.onDeleteMarkerDone();
                 }).start());
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
index 558021ccb..45337dee3 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java
@@ -350,17 +350,17 @@ public class StatisticsRecordingFragment extends Fragment implements TrackDataLi
     }
 
     @Override
-    public void clearWaypoints() {
+    public void clearMarkers() {
         // We don't care.
     }
 
     @Override
-    public void onNewWaypoint(Marker wpt) {
+    public void onNewMarker(Marker marker) {
         // We don't care.
     }
 
     @Override
-    public void onNewWaypointsDone() {
+    public void onNewMarkersDone() {
         // We don't care.
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java b/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java
index bcb9fc0ba..227a678a5 100644
--- a/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/LocationUtils.java
@@ -41,6 +41,7 @@ public class LocationUtils {
      * @return true if the location is a valid location.
      */
     //TODO Move to TrackPoint
+    @Deprecated //See #316
     public static boolean isValidLocation(Location location) {
         return location != null
                 && Math.abs(location.getLatitude()) <= 90