diff --git a/module/ice-9/debugging/breakpoints.scm b/module/ice-9/debugging/breakpoints.scm
index 0690699a7..7293c8e66 100644
--- a/module/ice-9/debugging/breakpoints.scm
+++ b/module/ice-9/debugging/breakpoints.scm
@@ -1,6 +1,6 @@
 ;;;; (ice-9 debugging breakpoints) -- practical breakpoints
 
-;;; Copyright (C) 2005 Neil Jerram
+;;; Copyright (C) 2005, 2010 Neil Jerram
 ;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -253,7 +253,7 @@
 ;; If a module named MODULE-NAME has been loaded, return its module
 ;; object; otherwise return #f.
 (define (module-if-already-loaded module-name)
-  (nested-ref the-root-module (append '(app modules) module-name)))
+  (nested-ref the-root-module (append '(%app modules) module-name)))
 
 ;; Construct and return a list of all loaded modules.
 (define (all-loaded-modules)
@@ -290,7 +290,7 @@
        ds)))
   ;; Add submodules recursively, starting from the root of all
   ;; modules.
-  (add-submodules-of '(app modules))
+  (add-submodules-of '(%app modules))
   ;; Return the result.
   known-modules)
 
diff --git a/module/oop/goops/stklos.scm b/module/oop/goops/stklos.scm
index 835969f13..718635e4d 100644
--- a/module/oop/goops/stklos.scm
+++ b/module/oop/goops/stklos.scm
@@ -1,4 +1,4 @@
-;;;; Copyright (C) 1999,2002, 2006 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999,2002, 2006, 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
@@ -35,7 +35,7 @@
 ;; Export all bindings that are exported from (oop goops)...
 (module-for-each (lambda (sym var)
 		   (module-add! %module-public-interface sym var))
-		 (nested-ref the-root-module '(app modules oop goops
+		 (nested-ref the-root-module '(%app modules oop goops
 						   %module-public-interface)))
 
 ;; ...but replace the following bindings: