diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 8be502793..3178cffca 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,11 +1,11 @@
 1998-07-14  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
 
-	* boot-9.scm: Let the user start in module `(user)' instead of
-	module `(guile)'.  Also make sure that `(user)' uses suitable
-	modules.  This change improves Guile stability substantially since
-	bindings will only be copied from the root module: If the user
-	redefines builtins in `(user)' it won't affect the internal
-	operation of Guile itself.
+	* boot-9.scm: Let the user start in module `(guile-repl)' instead
+	of module `(guile)'.  Also make sure that `(guile-repl)' uses
+	suitable modules.  This change improves Guile stability
+	substantially since bindings will only be copied from the root
+	module: If the user redefines builtins in `(guile-repl)' it won't
+	affect the internal operation of Guile itself.
 
 1998-06-19  Mikael Djurfeldt  <mdj@barbara.nada.kth.se>
 
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 5ea08f75a..b40c320e0 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2916,7 +2916,7 @@
 	 (isatty? (current-input-port)))
     (begin
       (define-module (guile) :use-module (ice-9 readline))
-      (define-module (user) :use-module (ice-9 readline))))
+      (define-module (guile-repl) :use-module (ice-9 readline))))
 
 
 ;;; {Load debug extension code into user module if debug extensions present.}
@@ -2925,7 +2925,7 @@
 ;;;
 
 (if (memq 'debug-extensions *features*)
-    (define-module (user) :use-module (ice-9 debug)))
+    (define-module (guile-repl) :use-module (ice-9 debug)))
 
 
 ;;; {Load session support into user module if present.}
@@ -2934,7 +2934,7 @@
 ;;;
 
 (if (%search-load-path "ice-9/session.scm")
-    (define-module (user) :use-module (ice-9 session)))
+    (define-module (guile-repl) :use-module (ice-9 session)))
 
 ;;; {Load thread code into user module if threads are present.}
 ;;;
@@ -2942,7 +2942,7 @@
 ;;;
 
 (if (memq 'threads *features*)
-    (define-module (user) :use-module (ice-9 threads)))
+    (define-module (guile-repl) :use-module (ice-9 threads)))
 
 
 ;;; {Load emacs interface support if emacs option is given.}
@@ -2955,13 +2955,13 @@
     (begin
       (if (memq 'debug-extensions *features*)
 	  (debug-enable 'backtrace))
-      (define-module (user) :use-module (ice-9 emacs))))
+      (define-module (guile-repl) :use-module (ice-9 emacs))))
 
 
 ;;; {Load regexp code if regexp primitives are available.}
 
 (if (memq 'regex *features*)
-    (define-module (user) :use-module (ice-9 regex)))
+    (define-module (guile-repl) :use-module (ice-9 regex)))
 
 
 (define-module (guile))
@@ -2992,4 +2992,4 @@
 
 
 
-(define-module (user))
+(define-module (guile-repl))