diff --git a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
index 7e73b656eb1015aa02c2a12a583e0a7ee3811b9c..857d3bfb4772aee7377645aed8009a8376aa2423 100644
--- a/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
+++ b/RCTAppleHealthKit/RCTAppleHealthKit+Queries.m
@@ -147,15 +147,15 @@
                         }
                         
                         NSDictionary *elem = @{
-                                               @"type" : type,
-                                               @"energy" : @(energy),
-                                               @"isTracked" : @(isTracked),
+                                               @"activityName" : type,
+                                               @"calories" : @(energy),
+                                               @"tracked" : @(isTracked),
                                                @"sourceName" : [[[sample sourceRevision] source] name],
-                                               @"sourceBundleId" : [[[sample sourceRevision] source] bundleIdentifier],
+                                               @"sourceId" : [[[sample sourceRevision] source] bundleIdentifier],
                                                @"device": [[sample sourceRevision] productType],
                                                @"distance" : @(distance),
-                                               @"startDate" : startDateString,
-                                               @"endDate" : endDateString
+                                               @"start" : startDateString,
+                                               @"end" : endDateString
                                                };
                         
                         [data addObject:elem];
@@ -174,13 +174,13 @@
                         }
                         
                         NSDictionary *elem = @{
-                                               @"value" : @(value),
-                                               @"isTracked" : @(isTracked),
+                                               @"quantity" : @(value),
+                                               @"tracked" : @(isTracked),
                                                @"sourceName" : [[[sample sourceRevision] source] name],
-                                               @"sourceBundleId" : [[[sample sourceRevision] source] bundleIdentifier],
+                                               @"sourceId" : [[[sample sourceRevision] source] bundleIdentifier],
                                                @"device": [[sample sourceRevision] productType],
-                                               @"startDate" : startDateString,
-                                               @"endDate" : endDateString
+                                               @"start" : startDateString,
+                                               @"end" : endDateString
                                                };
                         
                         [data addObject:elem];