diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Path.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/GeoPath.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Path.java
rename to Core/src/org/sleuthkit/autopsy/geolocation/datamodel/GeoPath.java
index ed007b2bba..366aed8c08 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Path.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/GeoPath.java
@@ -30,7 +30,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 /**
  * Class representing a series of waypoints that form a path.
  */
-public class Path {
+public class GeoPath {
 
     private final List<Waypoint> waypointList;
     private final String pathName;
@@ -97,7 +97,7 @@ public class Path {
      * @param artifact BlackboardARtifact that this path represents, required
      * @param pathName Name for this path, maybe null or empty string.
      */
-    Path(BlackboardArtifact artifact, String pathName) {
+    GeoPath(BlackboardArtifact artifact, String pathName) {
         this.waypointList = new ArrayList<>();
         this.pathName = pathName;
         this.artifact = artifact;
@@ -133,7 +133,7 @@ public class Path {
     /**
      * Returns the label\display name for this path.
      *
-     * @return Path label, empty string
+     * @return GeoPath label, empty string
      */
     public String getLabel() {
         return pathName != null ? pathName : "";
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Route.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Route.java
index 8ca5bd0123..c08d2637ba 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Route.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Route.java
@@ -32,7 +32,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute;
  * more that two points.
  *
  */
-public class Route extends Path{
+public class Route extends GeoPath{
     private final Long timestamp;
 
     // This list is not expected to change after construction so the 
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java
index 5e92826961..aed8b76848 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java
@@ -31,7 +31,7 @@ import org.sleuthkit.datamodel.blackboardutils.attributes.GeoWaypoint.GeoTrackPo
 /**
  * A GPS track with which wraps the TSK_GPS_TRACK artifact.
  */
-public final class Track extends Path{
+public final class Track extends GeoPath{
 
     private final Long startTimestamp;
     private final Long endTimeStamp;
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Waypoint.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Waypoint.java
index c3eb3b8aaf..acc9e89352 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Waypoint.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Waypoint.java
@@ -43,7 +43,7 @@ public class Waypoint {
     final private String label;
     final private AbstractFile image;
     final private BlackboardArtifact artifact;
-    final private Path path;
+    final private GeoPath path;
 
     final private List<Waypoint.Property> propertiesList;
 
@@ -78,7 +78,7 @@ public class Waypoint {
      * @throws GeoLocationDataException Exception will be thrown if artifact did
      *                                  not have a valid longitude and latitude.
      */
-    Waypoint(BlackboardArtifact artifact, String label, Long timestamp, Double latitude, Double longitude, Double altitude, AbstractFile image, Map<BlackboardAttribute.ATTRIBUTE_TYPE, BlackboardAttribute> attributeMap, Path path) throws GeoLocationDataException {
+    Waypoint(BlackboardArtifact artifact, String label, Long timestamp, Double latitude, Double longitude, Double altitude, AbstractFile image, Map<BlackboardAttribute.ATTRIBUTE_TYPE, BlackboardAttribute> attributeMap, GeoPath path) throws GeoLocationDataException {
         if (longitude == null || latitude == null) {
             throw new GeoLocationDataException("Invalid waypoint, null value passed for longitude or latitude");
         }
@@ -178,7 +178,7 @@ public class Waypoint {
      * @return The waypoint route or null if the waypoint is not apart of a
      *         route.
      */
-    public Path getPath() {
+    public GeoPath getPath() {
         return path;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java
index 66d37c6913..708b3a4803 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/WaypointBuilder.java
@@ -132,7 +132,7 @@ public final class WaypointBuilder {
     public static List<Route> getRoutes(List<Waypoint> waypoints) {
         List<Route> routeList = new ArrayList<>();
         for (Waypoint point : waypoints) {
-            Path path = point.getPath();
+            GeoPath path = point.getPath();
             if (path instanceof Route) {
                 Route route = (Route) path;
                 if (!routeList.contains(route)) {
@@ -154,7 +154,7 @@ public final class WaypointBuilder {
     public static List<Track> getTracks(List<Waypoint> waypoints) {
         List<Track> trackList = new ArrayList<>();
         for (Waypoint point : waypoints) {
-            Path path = point.getPath();
+            GeoPath path = point.getPath();
             if (path instanceof Track) {
                 Track route = (Track) path;
                 if (!trackList.contains(route)) {