diff --git a/includes/project_issue.json.inc b/includes/project_issue.json.inc
index 07124df..ec8c279 100644
--- a/includes/project_issue.json.inc
+++ b/includes/project_issue.json.inc
@@ -59,8 +59,8 @@ function project_issue_json($issue) {
       // Attachments are keyed by comment ID. We treat the original issue node
       // as post 0, so as to have all issue attachments in one property that can
       // be processed by API consumers.
-      $attachments[0]['contributor'] = $author->uid;
-      $attachments[0]['comment'] = 0;
+      $attachments[0]['contributorId'] = $author->uid;
+      $attachments[0]['commentId'] = 0;
       $attachments[0]['urls'][$fid] = file_create_url($file->filepath);
     }
 
@@ -68,7 +68,7 @@ function project_issue_json($issue) {
     $return = array(
       // Increase minor version when adding information.
       // Increase major version when breaking backwards compatibility.
-      'api-version' => '1.0',
+      'apiVersion' => '1.0',
       'title' => $issue->title,
       'id' => $issue->nid,
       'created' => $issue->created,
@@ -76,38 +76,41 @@ function project_issue_json($issue) {
       'url' => url('node/' . $issue->nid, $options),
       'component' => $issue->project_issue['component'],
       'category' => $issue->project_issue['category'],
-      'priority-id' => $issue->project_issue['priority'],
+      'priorityId' => $issue->project_issue['priority'],
       'priority' => project_issue_priority($issue->project_issue['priority']),
-      'status-id' => $issue->project_issue['sid'],
+      'statusId' => $issue->project_issue['sid'],
       'status' => project_issue_state($issue->project_issue['sid']),
-      'version-id' => $release->nid,
+      'versionId' => $release->nid,
       'version' => $release->project_release['version'],
-      'author-id' => $author->uid,
-      'author-name' => $author->name,
-      'author-url' => $author->url,
-      'assigned-id' => $assigned->uid,
-      'assigned-name' => $assigned->name,
-      'assigned-url' => $assigned->url,
-      'project-id' => $project->nid,
-      'project-title' => $project->title,
-      'project-url' => url('node/' . $project->nid, $options),
-      'project-name' => $project->project['uri'],
+      'authorId' => $author->uid,
+      'authorName' => $author->name,
+      'authorUrl' => $author->url,
+      'assignedId' => $assigned->uid,
+      'assignedName' => $assigned->name,
+      'assignedUrl' => $assigned->url,
+      'projectId' => $project->nid,
+      'projectTitle' => $project->title,
+      'projectUrl' => url('node/' . $project->nid, $options),
+      'projectName' => $project->project['uri'],
       'attachments' => $attachments,
     );
 
     // Retrieve and populate comments and contributors (comment authors).
-    $result = db_query("SELECT c.cid, c.status, c.timestamp, c.thread, u.name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d AND c.status = %d ORDER BY c.cid ASC", $issue->nid, COMMENT_PUBLISHED);
+    $result = db_query("SELECT c.cid, c.pid, c.status, c.timestamp, c.thread, u.name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d AND c.status = %d ORDER BY c.cid ASC", $issue->nid, COMMENT_PUBLISHED);
     while ($row = db_fetch_object($result)) {
       $return['contributors'][$row->uid] = array(
-        'name' => $row->name,
+        'id' => $row->uid,
         'uid' => $row->uid,
+        'name' => $row->name,
         'url' => url('user/' . $row->uid, $options),
       );
       $return['comments'][$row->cid] = array(
-        'contributor' => $row->uid,
+        'id' => $row->cid,
+        'contributorId' => $row->uid,
         'url' => url('node/' . $issue->nid, array('absolute' => TRUE, 'fragment' => 'comment-' . $row->cid)),
         'created' => $row->timestamp,
         'status' => $row->status,
+        'parentId' => $row->pid,
         'thread' => $row->thread,
       );
     }
diff --git a/project_issue.api.php b/project_issue.api.php
index 5e4dd6b..d885b8b 100644
--- a/project_issue.api.php
+++ b/project_issue.api.php
@@ -48,8 +48,8 @@ function hook_project_issue_internal_links_alter(&$links, $node) {
 function hook_project_issue_json_alter(&$issue) {
   $result = comment_upload_fetch_all($issue['id'], FALSE);
   while ($row = db_fetch_object($result)) {
-    $issue['attachments'][$row->cid]['contributor'] = $row->uid;
-    $issue['attachments'][$row->cid]['comment'] = $row->cid;
+    $issue['attachments'][$row->cid]['contributorId'] = $row->uid;
+    $issue['attachments'][$row->cid]['commentId'] = $row->cid;
     $issue['attachments'][$row->cid]['urls'][$row->fid] = file_create_url($row->filepath);
   }
 }