diff --git a/benchmark-suite/benchmarks/bytevectors.bm b/benchmark-suite/benchmarks/bytevectors.bm
index 66c88aa3e..b30bb38cd 100644
--- a/benchmark-suite/benchmarks/bytevectors.bm
+++ b/benchmark-suite/benchmarks/bytevectors.bm
@@ -1,7 +1,7 @@
 ;;; -*- mode: scheme; coding: iso-8859-1; -*-
 ;;; R6RS Byte Vectors.
 ;;;
-;;; Copyright 2009 Free Software Foundation, Inc.
+;;; Copyright 2009, 2010 Free Software Foundation, Inc.
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public License
@@ -19,9 +19,9 @@
 ;;; Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define-module (benchmarks bytevector)
-  :use-module (rnrs bytevector)
-  :use-module (srfi srfi-4)
-  :use-module (benchmark-suite lib))
+  #:use-module (rnrs bytevectors)
+  #:use-module (srfi srfi-4)
+  #:use-module (benchmark-suite lib))
 
 (define bv (make-bytevector 16384))
 
diff --git a/doc/ref/api-data.texi b/doc/ref/api-data.texi
index 420660b69..40bd96909 100755
--- a/doc/ref/api-data.texi
+++ b/doc/ref/api-data.texi
@@ -4033,7 +4033,7 @@ or @code{#f} if they are stored in an 8-bit buffer
 @cindex bytevector
 @cindex R6RS
 
-A @dfn{bytevector} is a raw bit string.  The @code{(rnrs bytevector)}
+A @dfn{bytevector} is a raw bit string.  The @code{(rnrs bytevectors)}
 module provides the programming interface specified by the
 @uref{http://www.r6rs.org/, Revised^6 Report on the Algorithmic Language
 Scheme (R6RS)}.  It contains procedures to manipulate bytevectors and
diff --git a/doc/ref/api-foreign.texi b/doc/ref/api-foreign.texi
index 2a4f0df23..728c7869e 100644
--- a/doc/ref/api-foreign.texi
+++ b/doc/ref/api-foreign.texi
@@ -770,7 +770,7 @@ code makes @code{memcpy} available to Scheme:
 To invoke @code{memcpy}, one must pass it foreign pointers:
 
 @example
-(use-modules (rnrs bytevector))
+(use-modules (rnrs bytevectors))
 
 (define src
   (bytevector->foreign (u8-list->bytevector '(0 1 2 3 4 5 6 7))))
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 853a3cf9a..de8077e0c 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -2214,7 +2214,7 @@ void
 scm_bootstrap_bytevectors (void)
 {
   /* This must be instantiated here because the generalized-vector API may
-     want to access bytevectors even though `(rnrs bytevector)' hasn't been
+     want to access bytevectors even though `(rnrs bytevectors)' hasn't been
      loaded.  */
   scm_null_bytevector = make_bytevector (0, SCM_ARRAY_ELEMENT_TYPE_VU8);
 
diff --git a/module/6/rnrs.scm b/module/6/rnrs.scm
index d8d756786..8fb83e192 100644
--- a/module/6/rnrs.scm
+++ b/module/6/rnrs.scm
@@ -75,7 +75,7 @@
 	  values apply quasiquote unquote unquote-splicing let-syntax 
 	  letrec-syntax syntax-rules identifier-syntax
 
-	  ;; (rnrs bytevector)
+	  ;; (rnrs bytevectors)
 	  
 	  endianness native-endianness bytevector? make-bytevector 
 	  bytevector-length bytevector=? bytevector-fill! bytevector-copy! 
@@ -218,7 +218,7 @@
 	  (rnrs arithmetic flonums (6))
 	  (rnrs base (6))
 
-	  (rnrs bytevector)
+	  (rnrs bytevectors)
 
 	  (rnrs conditions (6))
 	  (rnrs control (6))
diff --git a/module/language/assembly.scm b/module/language/assembly.scm
index 946caea8b..e119628da 100644
--- a/module/language/assembly.scm
+++ b/module/language/assembly.scm
@@ -19,7 +19,7 @@
 ;;; Code:
 
 (define-module (language assembly)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module (system base pmatch)
   #:use-module (system vm instruction)
   #:use-module ((srfi srfi-1) #:select (fold))
diff --git a/module/language/assembly/compile-bytecode.scm b/module/language/assembly/compile-bytecode.scm
index 8a4c5cd41..02695d7ba 100644
--- a/module/language/assembly/compile-bytecode.scm
+++ b/module/language/assembly/compile-bytecode.scm
@@ -23,7 +23,7 @@
   #:use-module (language assembly)
   #:use-module (system vm instruction)
   #:use-module (srfi srfi-4)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module (rnrs io ports)
   #:use-module ((srfi srfi-1) #:select (fold))
   #:use-module ((srfi srfi-26) #:select (cut))
diff --git a/module/language/assembly/decompile-bytecode.scm b/module/language/assembly/decompile-bytecode.scm
index 3ae96d2eb..605e3dfdf 100644
--- a/module/language/assembly/decompile-bytecode.scm
+++ b/module/language/assembly/decompile-bytecode.scm
@@ -22,7 +22,7 @@
   #:use-module (system vm instruction)
   #:use-module (system base pmatch)
   #:use-module (srfi srfi-4)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module (language assembly)
   #:use-module ((system vm objcode) #:select (byte-order))
   #:export (decompile-bytecode))
diff --git a/module/language/glil/compile-assembly.scm b/module/language/glil/compile-assembly.scm
index 0add22ec3..76c19b468 100644
--- a/module/language/glil/compile-assembly.scm
+++ b/module/language/glil/compile-assembly.scm
@@ -27,7 +27,7 @@
   #:use-module ((system vm program) #:select (make-binding))
   #:use-module (ice-9 receive)
   #:use-module ((srfi srfi-1) #:select (fold))
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:export (compile-assembly))
 
 ;; Variable cache cells go in the object table, and serialize as their
diff --git a/module/language/tree-il/primitives.scm b/module/language/tree-il/primitives.scm
index c5a80c038..eae68dec4 100644
--- a/module/language/tree-il/primitives.scm
+++ b/module/language/tree-il/primitives.scm
@@ -20,7 +20,7 @@
 
 (define-module (language tree-il primitives)
   #:use-module (system base pmatch)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module (system base syntax)
   #:use-module (language tree-il)
   #:use-module (srfi srfi-4)
diff --git a/module/rnrs/bytevector.scm b/module/rnrs/bytevectors.scm
similarity index 94%
rename from module/rnrs/bytevector.scm
rename to module/rnrs/bytevectors.scm
index 9b8ac450b..b33afe0f2 100644
--- a/module/rnrs/bytevector.scm
+++ b/module/rnrs/bytevectors.scm
@@ -1,4 +1,4 @@
-;;;; bytevector.scm --- R6RS bytevector API           -*- coding: utf-8 -*-
+;;;; bytevectors.scm --- R6RS bytevector API           -*- coding: utf-8 -*-
 
 ;;;;	Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ;;;;
@@ -28,9 +28,9 @@
 ;;;
 ;;; Code:
 
-(define-module (rnrs bytevector)
-  :export-syntax (endianness)
-  :export (native-endianness bytevector?
+(define-module (rnrs bytevectors)
+  #:export-syntax (endianness)
+  #:export (native-endianness bytevector?
            make-bytevector bytevector-length bytevector=? bytevector-fill!
            bytevector-copy! bytevector-copy
            uniform-array->bytevector
diff --git a/module/srfi/srfi-4.scm b/module/srfi/srfi-4.scm
index 8438ba33a..818ae7a73 100644
--- a/module/srfi/srfi-4.scm
+++ b/module/srfi/srfi-4.scm
@@ -27,7 +27,7 @@
 ;;; Code:
 
 (define-module (srfi srfi-4)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:export (;; Unsigned 8-bit vectors.
             u8vector? make-u8vector u8vector u8vector-length u8vector-ref
             u8vector-set! u8vector->list list->u8vector
diff --git a/module/srfi/srfi-4/gnu.scm b/module/srfi/srfi-4/gnu.scm
index ccb1ab1d8..8cd5e895b 100644
--- a/module/srfi/srfi-4/gnu.scm
+++ b/module/srfi/srfi-4/gnu.scm
@@ -1,6 +1,6 @@
 ;;; Extensions to SRFI-4
 
-;; 	Copyright (C) 2009 Free Software Foundation, Inc.
+;; 	Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 ;;; Code:
 
 (define-module (srfi srfi-4 gnu)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module (srfi srfi-4)
   #:export (;; Complex numbers with 32- and 64-bit components.
             c32vector? make-c32vector c32vector c32vector-length c32vector-ref
diff --git a/module/system/foreign.scm b/module/system/foreign.scm
index 9f389f25c..692dd92e6 100644
--- a/module/system/foreign.scm
+++ b/module/system/foreign.scm
@@ -17,7 +17,7 @@
 
 
 (define-module (system foreign)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:export (void
             float double
             int unsigned-int long unsigned-long size_t
diff --git a/test-suite/standalone/test-ffi b/test-suite/standalone/test-ffi
index debe4e112..7c859f2d3 100755
--- a/test-suite/standalone/test-ffi
+++ b/test-suite/standalone/test-ffi
@@ -3,7 +3,7 @@ exec guile -q -s "$0" "$@"
 !#
 
 (use-modules (system foreign)
-             (rnrs bytevector))
+             (rnrs bytevectors))
 
 (define lib
   (dynamic-link (string-append (getenv "builddir") "/libtest-ffi")))
@@ -179,7 +179,7 @@ exec guile -q -s "$0" "$@"
 ;;; Global symbols.
 ;;;
 
-(use-modules ((rnrs bytevector) #:select (utf8->string)))
+(use-modules ((rnrs bytevectors) #:select (utf8->string)))
 
 (if (defined? 'setlocale)
     (setlocale LC_ALL "C"))
diff --git a/test-suite/tests/asm-to-bytecode.test b/test-suite/tests/asm-to-bytecode.test
index 29505a8a4..0d8fecb5a 100644
--- a/test-suite/tests/asm-to-bytecode.test
+++ b/test-suite/tests/asm-to-bytecode.test
@@ -15,7 +15,7 @@
 ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define-module (test-suite tests asm-to-bytecode)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module ((rnrs io ports) #:select (open-bytevector-output-port))
   #:use-module (test-suite lib)
   #:use-module (system vm instruction)
diff --git a/test-suite/tests/bytevectors.test b/test-suite/tests/bytevectors.test
index 3a7cc2db3..68523b741 100644
--- a/test-suite/tests/bytevectors.test
+++ b/test-suite/tests/bytevectors.test
@@ -20,7 +20,7 @@
 (define-module (test-bytevector)
   :use-module (test-suite lib)
   :use-module (system base compile)
-  :use-module (rnrs bytevector))
+  :use-module (rnrs bytevectors))
 
 ;;; Some of the tests in here are examples taken from the R6RS Standard
 ;;; Libraries document.
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test
index b1add5382..10fdf4626 100644
--- a/test-suite/tests/foreign.test
+++ b/test-suite/tests/foreign.test
@@ -22,7 +22,7 @@
 
 (define-module (test-foreign)
   #:use-module (system foreign)
-  #:use-module (rnrs bytevector)
+  #:use-module (rnrs bytevectors)
   #:use-module (test-suite lib))
 
 
diff --git a/test-suite/tests/r6rs-ports.test b/test-suite/tests/r6rs-ports.test
index e41d18aab..dae6295e2 100644
--- a/test-suite/tests/r6rs-ports.test
+++ b/test-suite/tests/r6rs-ports.test
@@ -22,7 +22,7 @@
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-11)
   :use-module (rnrs io ports)
-  :use-module (rnrs bytevector))
+  :use-module (rnrs bytevectors))
 
 ;;; All these tests assume Guile 1.8's port system, where characters are
 ;;; treated as octets.