diff --git a/doc/api/_toc.markdown b/doc/api/_toc.markdown
index 4e671068eb..1c1f0712f6 100644
--- a/doc/api/_toc.markdown
+++ b/doc/api/_toc.markdown
@@ -8,7 +8,7 @@
 * [Process](process.html)
 * [Utilities](util.html)
 * [Events](events.html)
-* [Buffers](buffers.html)
+* [Buffer](buffer.html)
 * [Streams](streams.html)
 * [Crypto](crypto.html)
 * [TLS/SSL](tls.html)
diff --git a/doc/api/all.markdown b/doc/api/all.markdown
index 47a818f7bf..60c4ade3f0 100644
--- a/doc/api/all.markdown
+++ b/doc/api/all.markdown
@@ -8,7 +8,7 @@
 @include process
 @include util
 @include events
-@include buffers
+@include buffer
 @include streams
 @include crypto
 @include tls
diff --git a/doc/api/buffers.markdown b/doc/api/buffer.markdown
similarity index 100%
rename from doc/api/buffers.markdown
rename to doc/api/buffer.markdown
diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown
index fad995218f..a0e60ad503 100644
--- a/doc/api/crypto.markdown
+++ b/doc/api/crypto.markdown
@@ -107,7 +107,7 @@ Creates and returns a cipher object, with the given algorithm and password.
 On recent releases, `openssl list-cipher-algorithms` will display the
 available cipher algorithms.
 `password` is used to derive key and IV, which must be `'binary'` encoded
-string (See the [Buffers](buffers.html) for more information).
+string (See the [Buffer section](buffer.html) for more information).
 
 ## crypto.createCipheriv(algorithm, key, iv)
 
@@ -115,7 +115,7 @@ Creates and returns a cipher object, with the given algorithm, key and iv.
 
 `algorithm` is the same as the `createCipher()`. `key` is a raw key used in
 algorithm. `iv` is an Initialization vector. `key` and `iv` must be `'binary'`
-encoded string (See the [Buffers](buffers.html) for more information).
+encoded string (See the [Buffer section](buffer.html) for more information).
 
 ## Class: Cipher
 
diff --git a/doc/api/globals.markdown b/doc/api/globals.markdown
index e77aab8c7c..b42984e738 100644
--- a/doc/api/globals.markdown
+++ b/doc/api/globals.markdown
@@ -38,7 +38,7 @@ Used to print to stdout and stderr. See the [stdio](stdio.html) section.
 
 * {Object}
 
-Used to handle binary data. See the [buffers](buffers.html) section.
+Used to handle binary data. See the [buffer section](buffer.html).
 
 ## require()
 
diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index 6d04ccf958..c2a6c8989a 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -163,7 +163,7 @@ interface. This is an `EventEmitter` with the following events:
 
 Emitted when a piece of the message body is received. The chunk is a string if
 an encoding has been set with `request.setEncoding()`, otherwise it's a
-[Buffer](buffers.html).
+[Buffer](buffer.html).
 
 Note that the __data will be lost__ if there is no listener when a
 `ServerRequest` emits a `'data'` event.
@@ -766,7 +766,7 @@ server--in that case it is suggested to use the
 `['Transfer-Encoding', 'chunked']` header line when
 creating the request.
 
-The `chunk` argument should be a [buffer](buffers.html) or a string.
+The `chunk` argument should be a [buffer](buffer.html) or a string.
 
 The `encoding` argument is optional and only applies when `chunk` is a string.
 Defaults to `'utf8'`.