diff --git a/app/models/build.coffee b/app/models/build.coffee
index 1d5d6b23..bc61ad4d 100644
--- a/app/models/build.coffee
+++ b/app/models/build.coffee
@@ -14,7 +14,7 @@ Build = Model.extend DurationCalculations,
   _duration:         DS.attr('number')
   _config:           DS.attr('object')
   _startedAt:        DS.attr()
-  _finishedAt:       DS.attr()
+  _finishedAt:       DS.attr('string')
   pullRequest:       DS.attr('boolean')
   pullRequestTitle:  DS.attr()
   pullRequestNumber: DS.attr('number')
diff --git a/app/serializers/build.js b/app/serializers/build.js
index f770a456..94f878f1 100644
--- a/app/serializers/build.js
+++ b/app/serializers/build.js
@@ -7,10 +7,10 @@ var Serializer = V2FallbackSerializer.extend({
     _config: {
       key: 'config'
     },
-    _finishedAt: {
+    _finished_at: {
       key: 'finished_at'
     },
-    _startedAt: {
+    _started_at: {
       key: 'started_at'
     },
     _duration: {
diff --git a/app/serializers/job.coffee b/app/serializers/job.coffee
index 87274108..2616a6c5 100644
--- a/app/serializers/job.coffee
+++ b/app/serializers/job.coffee
@@ -5,8 +5,8 @@ Serializer = V2FallbackSerializer.extend
   isNewSerializerAPI: true
   attrs: {
     _config: { key: 'config' }
-    _finishedAt: { key: 'finished_at' }
-    _startedAt:  { key: 'started_at' }
+    _finished_at: { key: 'finished_at' }
+    _started_at:  { key: 'started_at' }
   }
 
   keyForV2Relationship: (key, typeClass, method) ->
diff --git a/app/serializers/request.coffee b/app/serializers/request.coffee
index 0f019e16..a7afbc88 100644
--- a/app/serializers/request.coffee
+++ b/app/serializers/request.coffee
@@ -3,8 +3,8 @@
 
 Serializer = ApplicationSerializer.extend
   attrs: {
-    branchName: { key: 'branch' }
-    tagName:    { key: 'tag' }
+    branch_name: { key: 'branch' }
+    tag_name:    { key: 'tag' }
     repo:       { key: 'repository_id' }
   }
 
diff --git a/app/serializers/v3.js b/app/serializers/v3.js
index 65f1c557..0c12ec62 100644
--- a/app/serializers/v3.js
+++ b/app/serializers/v3.js
@@ -27,7 +27,7 @@ export default DS.JSONSerializer.extend({
     }
   },
 
-  extractAttributes() {
+  extractAttributes(modelClass, resourceHash) {
     let attributes = this._super(...arguments);
     for(let key in attributes) {
       if(key.startsWith('@')) {