diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
index 58c85b7ec844400ec87cac021a2fc4a3c71b11dd..50acb9f053c37a600ba5d0f97d90a880e0be0239 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
@@ -1381,6 +1381,14 @@ public enum ATTRIBUTE_TYPE {
 			bundle.getString("BlackboardAttribute.tskgeowaypoints.text"),
 			TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.JSON),
 
+		TSK_DISTANCE_TRAVELED(144, "TSK_DISTANCE_TRAVELED",
+			bundle.getString("BlackboardAttribute.tskdistancetraveled.text"),
+			TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DOUBLE),
+		
+		TSK_DISTANCE_FROM_HOMEPOINT(145, "TSK_DISTANCE_FROM_HOMEPOINT",
+			bundle.getString("BlackboardAttribute.tskdistancefromhome.text"),
+			TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DOUBLE)
+		
 		;
 
 		private final int typeID;
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index 96584aa91e722ee42eeaae568c339dc7c13f736c..9e394b7b087591ad22746995fcb8e1bb6a4afd5f 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -193,6 +193,8 @@ BlackboardAttribute.tskgroups.text=Groups
 BlackboardAttribute.tskattachments.text=Message Attachments
 BlackboardAttribute.tskgeopath.text=List of Track Points
 BlackboardAttribute.tskgeowaypoints.text=List of Waypoints
+BlackboardAttribute.tskdistancetraveled.text=Distance Traveled
+BlackboardAttribute.tskdistancefromhome.text=Distance from Homepoint
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoTrackpointsUtil.java b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoTrackpointsUtil.java
index d5df2ca7a5dbc3efe34bebdf8c5e1ce2a1e13566..1fb1f25594d208fef89e1a7a49c6fce9a039f7eb 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoTrackpointsUtil.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoTrackpointsUtil.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.datamodel.blackboardutils.attributes;
 
 import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -195,9 +196,13 @@ private List<GeoTrackPoint> getTimeOrderedPoints() {
 		 */
 		public final static class GeoTrackPoint extends TskGeoWaypointsUtil.GeoWaypointList.GeoWaypoint implements Comparable<GeoTrackPoint> {
 
+			@SerializedName("TSK_GEO_VELOCITY")
 			private final Double velocity;
+			@SerializedName("TSK_DISTANCE_FROM_HOMEPOINT")
 			private final Double distanceFromHomePoint;
+			@SerializedName("TSK_DISTANCE_TRAVELED")
 			private final Double distanceTraveled;
+			@SerializedName("TSK_DATETIME")
 			private final Long timestamp;
 
 			/**
diff --git a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoWaypointsUtil.java b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoWaypointsUtil.java
index a8d4a5e105d7043382c77acd8d66c6e06ae9c2dc..6b8a48fb8d9ac3fc64df0f251f528c0537907042 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoWaypointsUtil.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoWaypointsUtil.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.datamodel.blackboardutils.attributes;
 
 import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -143,9 +144,13 @@ public Iterator<GeoWaypointList.GeoWaypoint> iterator() {
 		 */
 		public static class GeoWaypoint {
 
+			@SerializedName("TSK_GEO_LATITUDE")
 			private final Double latitude;
+			@SerializedName("TSK_GEO_LONGITUDE")
 			private final Double longitude;
+			@SerializedName("TSK_GEO_ALTITUDE")
 			private final Double altitude;
+			@SerializedName("TSK_NAME")
 			private final String name;
 
 			/**