diff --git a/README.md b/README.md
index 2ffd2caf..386291ae 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ Where `options` is a hash which can contain:
   (miscellaneous logs), `info` (requests logs), `error` (serious
   errors, consider filing an issue).</dd>
 
-<dt>heartbeat_delay (milliseconds)</dt>
+<dt>server_heartbeat_interval (milliseconds)</dt>
 <dd>In order to keep proxies and load balancers from closing long
   running http requests we need to pretend that the connecion is
   active and send a heartbeat packet once in a while. This setting
diff --git a/src/chunking-test.coffee b/src/chunking-test.coffee
index 7ec1af7b..04d99f53 100644
--- a/src/chunking-test.coffee
+++ b/src/chunking-test.coffee
@@ -36,6 +36,7 @@ exports.app =
             origins       : @options.origins,
             cookie_needed : not not @options.jsessionid,
             entropy       : utils.random32(),
+            server_heartbeat_interval : @options.server_heartbeat_interval,
         }
         res.setHeader('Content-Type', 'application/json; charset=UTF-8')
         res.writeHead(200)
diff --git a/src/sockjs.coffee b/src/sockjs.coffee
index acb92d33..20a7776b 100644
--- a/src/sockjs.coffee
+++ b/src/sockjs.coffee
@@ -135,8 +135,8 @@ class Server extends events.EventEmitter
             origins: ['*:*']
             websocket: true
             jsessionid: false
-            heartbeat_delay: 25000
             disconnect_delay: 5000
+            server_heartbeat_interval: 25000
             log: (severity, line) -> console.log(line)
             sockjs_url: 'http://cdn.sockjs.org/sockjs-0.3.min.js'
         if user_options
diff --git a/src/transport.coffee b/src/transport.coffee
index 4d3d8493..138cacba 100644
--- a/src/transport.coffee
+++ b/src/transport.coffee
@@ -59,7 +59,7 @@ MAP = {}
 
 class Session
     constructor: (@session_id, server) ->
-        @server_heartbeat_interval = server.options.heartbeat_delay
+        @server_heartbeat_interval = server.options.server_heartbeat_interval
         @disconnect_delay = server.options.disconnect_delay
         @prefix = server.options.prefix
         @send_buffer = []