~ chicken-core (chicken-5) 9c442c97700fa74bb9bb7f5ce7df3e8e4ce8f562


commit 9c442c97700fa74bb9bb7f5ce7df3e8e4ce8f562
Author:     Peter Bex <peter.bex@xs4all.nl>
AuthorDate: Sun Jul 13 15:03:19 2014 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jul 13 22:56:35 2014 +0200

    Enforce consistent official spelling of CHICKEN to be all-caps in code, manual and README (#362)
    
    Signed-off-by: felix <felix@call-with-current-continuation.org>

diff --git a/GNUmakefile b/GNUmakefile
index 0ab14716..31a72ffd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,7 +1,7 @@
 # GNUmakefile - toplevel makefile.  This simply includes the
 # platform-specific makefile or quits when no platform is selected.
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/LICENSE b/LICENSE
index 66ce000e..ec575177 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,8 @@
 == Main license
 
-Chicken falls under the following main license:
+CHICKEN falls under the following main license:
 
-  Copyright (c) 2007-2014, The Chicken Team
+  Copyright (c) 2007-2014, The CHICKEN Team
   Copyright (c) 2000-2007, Felix L. Winkelmann
   All rights reserved.
   
@@ -202,7 +202,7 @@ extras.scm:
 
 == Tests
 
-Tests are ''not'' part of a typical binary Chicken distribution, so
+Tests are ''not'' part of a typical binary CHICKEN distribution, so
 these licenses are only relevant in atypical situations:
 
 tests/slatex.scm
diff --git a/Makefile b/Makefile
index 40f0f4af..317683a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # See GNUmakefile for the actual makefile used by gmake
 
 all:
-	@echo "Sorry, Chicken can only be built with GNU Make."
+	@echo "Sorry, CHICKEN can only be built with GNU Make."
 	@echo ""
 	@echo "The '${MAKE}' command you just used is probably your system's"
 	@echo "default Make program, which apparently is not GNU Make."
diff --git a/Makefile.aix b/Makefile.aix
index bf27df33..68b33b7c 100644
--- a/Makefile.aix
+++ b/Makefile.aix
@@ -1,6 +1,6 @@
 # Makefile.aix - configuration for AIX -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # Copyright (c) 2013-2014, Erik W. Falor
 # All rights reserved.
diff --git a/Makefile.android b/Makefile.android
index fdcd4feb..819587f9 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -1,6 +1,6 @@
 # Makefile.android - configuration for Android -*- Makefile -*-
 #
-# Copyright (c) 2013-2014, The Chicken Team
+# Copyright (c) 2013-2014, The CHICKEN Team
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/Makefile.bsd b/Makefile.bsd
index 365ffb67..af28814b 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -1,6 +1,6 @@
 # Makefile.bsd - configuration for BSD UNIX -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.cross-linux-mingw b/Makefile.cross-linux-mingw
index 5bf80f90..32a6f2f8 100644
--- a/Makefile.cross-linux-mingw
+++ b/Makefile.cross-linux-mingw
@@ -1,6 +1,6 @@
 # Makefile.cross-linux-mingw - configuration for MinGW (crosscompiled from Linux) -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.cygwin b/Makefile.cygwin
index a55d80f9..376f6b8a 100644
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@ -1,6 +1,6 @@
 # Makefile.cygwin - configuration for Linux -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.haiku b/Makefile.haiku
index ed49cb69..a1f58413 100644
--- a/Makefile.haiku
+++ b/Makefile.haiku
@@ -1,6 +1,6 @@
 # Makefile.haiku - configuration for Haiku -*- Makefile -*-
 #
-# Copyright (c) 2011-2014, The Chicken Team
+# Copyright (c) 2011-2014, The CHICKEN Team
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/Makefile.hurd b/Makefile.hurd
index e0cd5931..6a97db64 100644
--- a/Makefile.hurd
+++ b/Makefile.hurd
@@ -1,6 +1,6 @@
 # Makefile.hurd - configuration for Hurd -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.ios b/Makefile.ios
index e2819ea5..6f82e008 100644
--- a/Makefile.ios
+++ b/Makefile.ios
@@ -1,6 +1,6 @@
 # Makefile.ios - configuration for Apple iOS -*- Makefile -*-
 #
-# Copyright (c) 2013, The Chicken Team
+# Copyright (c) 2013, The CHICKEN Team
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/Makefile.linux b/Makefile.linux
index 010b560e..3f2aca17 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,6 +1,6 @@
 # Makefile.linux - configuration for Linux -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.macosx b/Makefile.macosx
index 0fd4185a..9ce4682b 100644
--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -1,6 +1,6 @@
 # Makefile.macosx - configuration for Apple Macintosh OS X -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.mingw b/Makefile.mingw
index a72d4672..3d8cfba4 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,6 +1,6 @@
 # Makefile.mingw - configuration for MinGW (no MSYS) -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.mingw-msys b/Makefile.mingw-msys
index 2af2dc17..9ec6750f 100644
--- a/Makefile.mingw-msys
+++ b/Makefile.mingw-msys
@@ -1,6 +1,6 @@
 # Makefile.mingw - configuration for MinGW (MSYS) -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/Makefile.solaris b/Makefile.solaris
index 7c6c87c2..dc7afb23 100644
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -1,6 +1,6 @@
 # Makefile.solaris - configuration for Solaris -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/NEWS b/NEWS
index a9c7732a..10208536 100644
--- a/NEWS
+++ b/NEWS
@@ -245,7 +245,7 @@
     large values). Note that random shouldn't be used for
     security-critical code.
   - CVE-2012-6123: Added checks for embedded '\0' characters in strings
-    passed to some C functions on a lower level than Chicken's FFI.
+    passed to some C functions on a lower level than CHICKEN's FFI.
 
 - Build system
   - version information has been moved into a separate unit to make the
@@ -468,7 +468,7 @@
   - string-comparison handles embedded '\0' characters.
   - numerical predicates handle infinity and NaN correctly.
   - deprecated "[+-]nan", "[+-]inf" and other notations "accidentally"
-    accepted by Chicken due to the underlying C library's strtod() function,
+    accepted by CHICKEN due to the underlying C library's strtod() function,
     standardizing on "[+-]nan.0" and "[+-]inf.0" from R6RS (and soon R7RS),
     when displaying numbers only these forms are generated now.
   - signals are queued to some extent and the interrupt handling has
diff --git a/README b/README
index 68db8ca6..ec1d6e48 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
   =========================================
 
 
-  (c) 2008-2014, The Chicken Team
+  (c) 2008-2014, The CHICKEN Team
   (c) 2000-2007, Felix L. Winkelmann
 
   version 4.9.1
@@ -35,8 +35,8 @@
         4. Loads of extra libraries.
 
         Note: Should you have any trouble in setting up and using
-        CHICKEN, please ask questions on the Chicken mailing list. You
-        can subscribe to the list from the Chicken homepage,
+        CHICKEN, please ask questions on the CHICKEN mailing list. You
+        can subscribe to the list from the CHICKEN homepage,
         http://www.call-with-current-continuation.org)
 
 
@@ -133,13 +133,13 @@
 
     2.4. Verifying your installation is correct
 
-        You can check whether Chicken is functioning correctly by
+        You can check whether CHICKEN is functioning correctly by
         running
 
             make <vars> check
 
         where <vars> are all the variables you used while building
-        Chicken.
+        CHICKEN.
 
         This will run the test scripts, which show a lot of output.
         The only thing that matters is the exit status at the end.
@@ -149,7 +149,7 @@
         check fails on unmodified sources, please file a bugreport.
 
         Currently "make check" only works if you have installed
-        Chicken.
+        CHICKEN.
 
     2.5. Optional features
 
@@ -242,15 +242,15 @@
 	  be the same as C_COMPILER.
 
 	PROFILE_OBJECTS=
-	  This variable allows you to profile (parts of) Chicken itself.
+	  This variable allows you to profile (parts of) CHICKEN itself.
 	  Just pass in a whitespace-separated list of objects, without
 	  the .scm-extension.  (An "object" here is an individual
 	  .scm-file which gets compiled to a .c-file)
 	  To build with profiling support, run "make spotless" first.
 	  Be warned that this is a highly experimental option and
-	  profiling doesn't work for every component of Chicken.
+	  profiling doesn't work for every component of CHICKEN.
 
-    2.6. Uninstalling Chicken
+    2.6. Uninstalling CHICKEN
 
         To remove CHICKEN from your file-system, enter (probably as
         root):
@@ -472,7 +472,7 @@
 
 	      make PLATFORM=macosx ARCH=x86-64
 
-	  - Chicken will normally select a 32-bit or 64-bit build
+	  - CHICKEN will normally select a 32-bit or 64-bit build
 	    automatically when you use the normal build step:
 
 	      make PLATFORM=macosx
@@ -490,7 +490,7 @@
 
 	      make PLATFORM=macosx ARCH=x86-64
 
-	  - Universal binaries: On 10.4 and 10.5 only, Chicken and its eggs
+	  - Universal binaries: On 10.4 and 10.5 only, CHICKEN and its eggs
 	    can be built as universal binaries which will work on either
 	    Intel or PowerPC.  Most users will not want to do this.
 
diff --git a/apply-hack.ppc.darwin.S b/apply-hack.ppc.darwin.S
index b223d175..3928821b 100644
--- a/apply-hack.ppc.darwin.S
+++ b/apply-hack.ppc.darwin.S
@@ -1,6 +1,6 @@
 /* apply-hack.ppc.s
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/apply-hack.ppc.sysv.S b/apply-hack.ppc.sysv.S
index 67faaf4d..312267b6 100644
--- a/apply-hack.ppc.sysv.S
+++ b/apply-hack.ppc.sysv.S
@@ -1,6 +1,6 @@
 /* apply-hack.ppc.s
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2007, Felix L. Winkelmann
 ; All rights reserved.		
 ;
diff --git a/apply-hack.x86-64.S b/apply-hack.x86-64.S
index f18792a2..7a74ed8d 100644
--- a/apply-hack.x86-64.S
+++ b/apply-hack.x86-64.S
@@ -1,6 +1,6 @@
 /* Apply-hack.x86-64.S
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/apply-hack.x86.S b/apply-hack.x86.S
index 2c569ecd..43223af6 100644
--- a/apply-hack.x86.S
+++ b/apply-hack.x86.S
@@ -1,6 +1,6 @@
 /* apply-hack.x86.S
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/banner.scm b/banner.scm
index 60bddf18..48f590dc 100644
--- a/banner.scm
+++ b/banner.scm
@@ -4,7 +4,7 @@
 (define-constant +product+ "CHICKEN")
 
 (define-constant +banner+ #<<EOF
-(c) 2008-2014, The Chicken Team
+(c) 2008-2014, The CHICKEN Team
 (c) 2000-2007, Felix L. Winkelmann
 
 EOF
diff --git a/batch-driver.scm b/batch-driver.scm
index b67b570d..9ae5f68a 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -1,6 +1,6 @@
 ;;;; batch-driver.scm - Driver procedure for the compiler
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
@@ -262,7 +262,7 @@
       (dribble "Disabled support for escaped symbols")
       (symbol-escape #f) )
     (when (memq '("-r5rs-syntax") options)
-      (dribble "Disabled the Chicken extensions to R5RS syntax")
+      (dribble "Disabled the CHICKEN extensions to R5RS syntax")
       (case-sensitive #f)
       (keyword-style #:none)
       (parentheses-synonyms #f)
diff --git a/build-version.scm b/build-version.scm
index f995e7cb..038e9aac 100644
--- a/build-version.scm
+++ b/build-version.scm
@@ -1,6 +1,6 @@
 ;;;; build-version.scm
 ;
-; Copyright (c) 2011-2014, The Chicken Team
+; Copyright (c) 2011-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/c-backend.scm b/c-backend.scm
index dbb2b30e..eade651d 100644
--- a/c-backend.scm
+++ b/c-backend.scm
@@ -1,6 +1,6 @@
 ;;; c-backend.scm - C-generating backend for the CHICKEN compiler
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/c-platform.scm b/c-platform.scm
index 6887b6be..1d60dcd1 100644
--- a/c-platform.scm
+++ b/c-platform.scm
@@ -1,6 +1,6 @@
 ;;;; c-platform.scm - Platform specific parameters and definitions
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/chicken-bug.scm b/chicken-bug.scm
index 57bc6285..f02219c6 100644
--- a/chicken-bug.scm
+++ b/chicken-bug.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-bug.scm - Bug report-generator
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/chicken-ffi-syntax.scm b/chicken-ffi-syntax.scm
index ebdf4f28..d07764f6 100644
--- a/chicken-ffi-syntax.scm
+++ b/chicken-ffi-syntax.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-ffi-syntax.scm
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/chicken-install.1 b/chicken-install.1
index d3ccd7bf..065f9878 100644
--- a/chicken-install.1
+++ b/chicken-install.1
@@ -3,7 +3,7 @@
 
 .SH NAME
 
-chicken-install \- download and install extension libraries for Chicken Scheme
+chicken-install \- download and install extension libraries for CHICKEN Scheme
 
 .SH SYNOPSIS
 
@@ -48,7 +48,7 @@ path selected during configuration (usually
 .SH DOCUMENTATION
 
 More information can be found in the
-.I Chicken\ User's\ Manual
+.I CHICKEN\ User's\ Manual
 
 .SH BUGS
 Submit bug reports by e-mail to
diff --git a/chicken-install.scm b/chicken-install.scm
index 732ea2a6..2ef6ef4d 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-install.scm
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/chicken-profile.scm b/chicken-profile.scm
index ae98d93b..f38b2578 100644
--- a/chicken-profile.scm
+++ b/chicken-profile.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-profile.scm - Formatted display of profile outputs - felix -*- Scheme -*-
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/chicken-status.scm b/chicken-status.scm
index f5c60c78..c3a99c77 100644
--- a/chicken-status.scm
+++ b/chicken-status.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-status.scm
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/chicken-syntax.scm b/chicken-syntax.scm
index 448ebf4d..edc42ec8 100644
--- a/chicken-syntax.scm
+++ b/chicken-syntax.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-syntax.scm - non-standard syntax extensions
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index 081957d3..9f199073 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -1,6 +1,6 @@
 ;;;; chicken-uninstall.scm
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/chicken.h b/chicken.h
index f5a103ee..6473358a 100644
--- a/chicken.h
+++ b/chicken.h
@@ -1,7 +1,7 @@
 
 /* chicken.h - General headerfile for compiler generated executables
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
@@ -149,7 +149,7 @@ void *alloca ();
 #endif
 
 
-/* Chicken Core C API */
+/* CHICKEN Core C API */
 
 #if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN
 # define C_BIG_ENDIAN
diff --git a/chicken.import.scm b/chicken.import.scm
index dfb0168b..baa7316e 100644
--- a/chicken.import.scm
+++ b/chicken.import.scm
@@ -1,6 +1,6 @@
 ;;;; chicken.import.scm - import library for "chicken" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/chicken.scm b/chicken.scm
index aded7318..3e0343a0 100644
--- a/chicken.scm
+++ b/chicken.scm
@@ -1,6 +1,6 @@
 ;;;; chicken.scm - The CHICKEN Scheme compiler (loader/main-module)
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/common-declarations.scm b/common-declarations.scm
index 0ac15a51..b20e3b19 100644
--- a/common-declarations.scm
+++ b/common-declarations.scm
@@ -1,6 +1,6 @@
 ;;;; common-declarations.scm - settings for core libraries
 ;
-; Copyright (c) 2011-2014, The Chicken Team
+; Copyright (c) 2011-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/compiler-namespace.scm b/compiler-namespace.scm
index ec552408..ab664467 100644
--- a/compiler-namespace.scm
+++ b/compiler-namespace.scm
@@ -1,6 +1,6 @@
 ;;;; compiler-namespace.scm - private namespace declarations for compiler units
 ;
-; Copyright (c) 2009-2014, The Chicken Team
+; Copyright (c) 2009-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/compiler-syntax.scm b/compiler-syntax.scm
index f533d2bf..db28e68e 100644
--- a/compiler-syntax.scm
+++ b/compiler-syntax.scm
@@ -1,6 +1,6 @@
 ;;;; compiler-syntax.scm - compiler syntax used internally
 ;
-; Copyright (c) 2009-2014, The Chicken Team
+; Copyright (c) 2009-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/compiler.scm b/compiler.scm
index 9fc9f1a3..17594588 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -5,7 +5,7 @@
 ;
 ;
 ;--------------------------------------------------------------------------------------------
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/config-arch.sh b/config-arch.sh
index 051a0b63..e193e649 100644
--- a/config-arch.sh
+++ b/config-arch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # config-arch.sh - return host architecture id, if supported by apply-hack
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2000-2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/csc.1 b/csc.1
index b4e88f82..416321ef 100644
--- a/csc.1
+++ b/csc.1
@@ -41,7 +41,7 @@ time prefix given when configuring the system.
 .SH DOCUMENTATION
 
 More information can be found in the
-.I Chicken\ User's\ Manual
+.I CHICKEN\ User's\ Manual
 
 .SH BUGS
 Submit bug reports by e-mail to
diff --git a/csc.scm b/csc.scm
index f31b3bf3..8d586ab1 100644
--- a/csc.scm
+++ b/csc.scm
@@ -1,6 +1,6 @@
 ;;;; csc.scm - Driver program for the CHICKEN compiler - felix -*- Scheme -*-
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
@@ -343,7 +343,7 @@ Usage: #{csc} FILENAME | OPTION ...
                                     (prefix, suffix or none)
        -no-parentheses-synonyms    disables list delimiter synonyms
        -no-symbol-escape           disables support for escaped symbols
-       -r5rs-syntax                disables the Chicken extensions to
+       -r5rs-syntax                disables the CHICKEN extensions to
                                     R5RS syntax
     -compile-syntax                macros are made available at run-time
     -j -emit-import-library MODULE write compile-time module information into
diff --git a/csi.import.scm b/csi.import.scm
index 47dc5cb1..d2279884 100644
--- a/csi.import.scm
+++ b/csi.import.scm
@@ -1,6 +1,6 @@
 ;;;; csi.import.scm - import library for "csi" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/csi.scm b/csi.scm
index d3b9549c..fd7b1654 100644
--- a/csi.scm
+++ b/csi.scm
@@ -1,6 +1,6 @@
 ;;;; csi.scm - Interpreter stub for CHICKEN
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
@@ -115,7 +115,7 @@ EOF
                                    (prefix, suffix or none)
         -no-parentheses-synonyms  disables list delimiter synonyms
         -no-symbol-escape         disables support for escaped symbols
-        -r5rs-syntax              disables the Chicken extensions to
+        -r5rs-syntax              disables the CHICKEN extensions to
                                    R5RS syntax
     -s  -script PATHNAME          use interpreter for shell scripts
         -ss PATHNAME              shell script with `main' procedure
@@ -1076,7 +1076,7 @@ EOF
 	(unless quiet (display "Disabled support for escaped symbols\n"))
 	(symbol-escape #f) )
       (when (member* '("-r5rs-syntax") args)
-	(unless quiet (display "Disabled the Chicken extensions to R5RS syntax\n"))
+	(unless quiet (display "Disabled the CHICKEN extensions to R5RS syntax\n"))
 	(case-sensitive #f)
 	(keyword-style #:none)
 	(parentheses-synonyms #f)
diff --git a/data-structures.import.scm b/data-structures.import.scm
index 109671d4..2ddd78b7 100644
--- a/data-structures.import.scm
+++ b/data-structures.import.scm
@@ -1,6 +1,6 @@
 ;;;; data-structures.import.scm - import library for "data-structures" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/data-structures.scm b/data-structures.scm
index 51d7e142..a94c163d 100644
--- a/data-structures.scm
+++ b/data-structures.scm
@@ -1,6 +1,6 @@
 ;;; data-structures.scm - Optional data structures extensions
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without
diff --git a/defaults.make b/defaults.make
index 52867819..6c1794f7 100644
--- a/defaults.make
+++ b/defaults.make
@@ -1,6 +1,6 @@
 # defaults.make - default settings -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/eval.scm b/eval.scm
index a131fbf6..befdc29a 100644
--- a/eval.scm
+++ b/eval.scm
@@ -1,6 +1,6 @@
 ;;;; eval.scm - Interpreter for CHICKEN
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/expand.scm b/expand.scm
index 1b5a74e3..f14c79f3 100644
--- a/expand.scm
+++ b/expand.scm
@@ -1,6 +1,6 @@
 ;;;; expand.scm - The HI/LO expander
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/extras.import.scm b/extras.import.scm
index 8a396c97..0ca78c6f 100644
--- a/extras.import.scm
+++ b/extras.import.scm
@@ -1,6 +1,6 @@
 ;;;; extras.import.scm - import library for "extras" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/extras.scm b/extras.scm
index e28bbed8..427a49a9 100644
--- a/extras.scm
+++ b/extras.scm
@@ -1,6 +1,6 @@
 ;;; extras.scm - Optional non-standard extensions
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/files.import.scm b/files.import.scm
index 661fdf5f..44d0e00e 100644
--- a/files.import.scm
+++ b/files.import.scm
@@ -1,6 +1,6 @@
 ;;;; files.import.scm - import library for "files" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/files.scm b/files.scm
index e85f8059..bc8b4e4f 100644
--- a/files.scm
+++ b/files.scm
@@ -1,6 +1,6 @@
 ;;;; files.scm - File and pathname operations
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/foreign.import.scm b/foreign.import.scm
index a0f83132..bef1635a 100644
--- a/foreign.import.scm
+++ b/foreign.import.scm
@@ -1,6 +1,6 @@
 ;;;; foreign.import.scm - import library for "foreign" pseudo module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/irregex.import.scm b/irregex.import.scm
index 0cc1f1c2..99b11a2e 100644
--- a/irregex.import.scm
+++ b/irregex.import.scm
@@ -1,6 +1,6 @@
 ;;;; irregex.import.scm - import library for "regex" module (irregex API)
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/irregex.scm b/irregex.scm
index cabe1158..afeb11d0 100644
--- a/irregex.scm
+++ b/irregex.scm
@@ -1,6 +1,6 @@
 ;;;; irregex.scm - container for irregex-core.scm
 ;
-; Copyright (c) 2010-2014, The Chicken Team
+; Copyright (c) 2010-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/lfa2.scm b/lfa2.scm
index 3c0d120f..be49afa3 100644
--- a/lfa2.scm
+++ b/lfa2.scm
@@ -1,6 +1,6 @@
 ;;;; lfa2.scm - a lightweight "secondary" flow analysis
 ;
-; Copyright (c) 2012-2014, The Chicken Team
+; Copyright (c) 2012-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/library.scm b/library.scm
index 1cf6d037..0797ea76 100644
--- a/library.scm
+++ b/library.scm
@@ -1,6 +1,6 @@
 ;;;; library.scm - R5RS library for the CHICKEN compiler
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/lolevel.import.scm b/lolevel.import.scm
index b2eb27ef..7a60cc56 100644
--- a/lolevel.import.scm
+++ b/lolevel.import.scm
@@ -1,6 +1,6 @@
 ;;;; lolevel.import.scm - import library for "lolevel" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/lolevel.scm b/lolevel.scm
index 86ae299c..4056ca8c 100644
--- a/lolevel.scm
+++ b/lolevel.scm
@@ -1,6 +1,6 @@
 ;;;; lolevel.scm - Low-level routines for CHICKEN
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/manual/Accessing external objects b/manual/Accessing external objects
index dcc95887..2fcec623 100644
--- a/manual/Accessing external objects	
+++ b/manual/Accessing external objects	
@@ -192,7 +192,7 @@ When you call a C function which needs to return quantities of data, several iss
 * if you malloc in C, and intend to leave it there, and directly access parts of that data from Scheme, you will need C accessor functions to pinpoint the parts you need and return them as Scheme objects; you will also need a finalizer if you intend for this data to be garbage-collected
 * building up lists or other complex Scheme structures from individual pairs, or putting non-immediate objects into vectors, is cumbersome in C
 
-So some would advise you to just return a pointer to Scheme, use memcpy or any other function(s) which you need to get the data into Chicken-managed memory and into the desired kind of data structure, then free the C data.  For this example, we are trying to return an array of doubles into an f64vector; we can accomplish that by adding a specialized copy function to the C library being integrated:
+So some would advise you to just return a pointer to Scheme, use memcpy or any other function(s) which you need to get the data into CHICKEN-managed memory and into the desired kind of data structure, then free the C data.  For this example, we are trying to return an array of doubles into an f64vector; we can accomplish that by adding a specialized copy function to the C library being integrated:
 
 <enscript highlight=C>
 void CopyResults(double* vector) {
diff --git a/manual/Exceptions b/manual/Exceptions
index 171f0e7e..d8022633 100644
--- a/manual/Exceptions
+++ b/manual/Exceptions
@@ -3,12 +3,12 @@
 
 == Exceptions
 
-Chicken's exception handling is based on the
+CHICKEN's exception handling is based on the
 [[http://srfi.schemers.org/srfi-12/srfi-12.html|SRFI-12]] exception
 system.  This document contains the core of the SRFI-12 spec
-as well as Chicken implementation specifics.
+as well as CHICKEN implementation specifics.
 
-== Chicken implementation
+== CHICKEN implementation
 
 === System conditions
 
@@ -302,7 +302,7 @@ created with {{make-composite-condition}}, the procedure returns the value that
 is associated with ''prop-key'' in one of the components that satisfies
 {{(condition-predicate ''kind-key'')}}.
 
-On Chicken, this procedure accepts an optional third argument
+On CHICKEN, this procedure accepts an optional third argument
 DEFAULT. If the condition does not have a value for the desired
 property and if the optional argument is given, no error is signaled
 and the accessor returns the third argument.
diff --git a/manual/Extensions b/manual/Extensions
index 25dbd0bb..566edc74 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -54,7 +54,7 @@ on the command line.
 Sometimes an extension requires a C library to compile. Compilation
 can fail when your system has this library in a nonstandard
 location. Normally the C compiler searches in the default locations
-{{/usr}} and {{/usr/local}}, and in the prefix where Chicken itself
+{{/usr}} and {{/usr/local}}, and in the prefix where CHICKEN itself
 was installed. Sometimes this is not enough, so you'll need to supply
 {{chicken-install}} with some extra hints to the C compiler/linker. Here's
 an example:
@@ -631,7 +631,7 @@ or by modifying {{config.make}}. Eggs will then be installed in
 
 === Changing repository location
 
-When Chicken is installed a repository for eggs is created and initialized
+When CHICKEN is installed a repository for eggs is created and initialized
 in a default location (usually something like {{/usr/local/lib/chicken/6/}}).
 It is possible to keep an eggs repository in another location. This can be
 configured at build-time by passing {{VARDIR=<directory>}} to {{make(3)}}
diff --git a/manual/Foreign type specifiers b/manual/Foreign type specifiers
index 6422e78f..dd4ddabd 100644
--- a/manual/Foreign type specifiers	
+++ b/manual/Foreign type specifiers	
@@ -67,7 +67,7 @@ As an argument type, these expect a fixnum value, and as a return type
 they return a fixnum.  Values outside the ranges prescribed above are
 silently truncated; you should use e.g. {{integer}} if you need the full
 32-bit range.  Note: {{int32}} is not recognized as an argument type
-prior to Chicken 4.7.2.
+prior to CHICKEN 4.7.2.
 
 Notes for 64-bit architectures:
 
@@ -107,7 +107,7 @@ gaps in the sequence; the same goes for their negative counterparts.)
 On a 64-bit system the range is 62 bits plus the sign bit, the
 maximum range of a fixnum.  (Numbers between 2^62 and 2^64-1 have gaps.)
 
-{{unsigned-integer64}} is not valid as a return type until Chicken 4.6.4.
+{{unsigned-integer64}} is not valid as a return type until CHICKEN 4.6.4.
 
 <type>long</type><br>
 <type>unsigned-long</type>
@@ -239,7 +239,7 @@ e.g. via {{(address->pointer 0)}}.)
 <type>nonnull-pointer-vector</type>
 
 A vector of foreign pointer objects; see [[Unit lolevel#Pointer vectors|Pointer vectors]].
-Permitted only as an argument type, not as return type.  This type was introduced in Chicken 4.6.3.
+Permitted only as an argument type, not as return type.  This type was introduced in CHICKEN 4.6.3.
 
 A pointer vector contains a C array of void pointers, and the argument
 is passed as a {{void **}} pointer to these contents.  Just as for
@@ -266,7 +266,7 @@ The value {{#f}} is also allowed and is passed as a {{NULL}} pointer.
 
 An arbitrary, raw Scheme data object (immediate or non-immediate).  A
 {{scheme-object}} is passed or returned as a {{C_word}}, the
-internal Chicken type for objects.  Typically, this consists of an
+internal CHICKEN type for objects.  Typically, this consists of an
 object header and tag bits.  It is up to you to build or take apart
 such objects using the core library routines in {{chicken.h}} and
 {{runtime.c}}.  
diff --git a/manual/Getting started b/manual/Getting started
index 1837b8ea..74bd1a00 100644
--- a/manual/Getting started	
+++ b/manual/Getting started	
@@ -287,10 +287,11 @@ To invoke the CHICKEN interpreter, you use the {{csi}} command.
  $ csi
  
  CHICKEN
- (c)2008-2010 The Chicken Team
- (c)2000-2007 Felix L. Winkelmann
- Version 4.6.0
- macosx-unix-gnu-x86 [ manyargs dload ptables ]
+ (c) 2008-2014, The CHICKEN Team
+ (c) 2000-2007, Felix L. Winkelmann
+ Version 4.9.0.1 (stability/4.9.0) (rev 8b3189b)
+ linux-unix-gnu-x86-64 [ 64bit manyargs dload ptables ]
+ bootstrapped 2014-06-07
  
  #;1>
 
diff --git a/manual/Parameters b/manual/Parameters
index bf0e7d76..fc2ce1a5 100644
--- a/manual/Parameters
+++ b/manual/Parameters
@@ -3,7 +3,7 @@
 
 == Parameters
 
-Parameters are Chicken's form of dynamic variables, except that they are
+Parameters are CHICKEN's form of dynamic variables, except that they are
 procedures rather than actual variables.  A parameter is a procedure of
 zero or one arguments. To retrieve the value of a parameter call the
 parameter-procedure with zero arguments. To change the setting of the
diff --git a/manual/The R5RS standard b/manual/The R5RS standard
index 7b053306..b79a5462 100644
--- a/manual/The R5RS standard	
+++ b/manual/The R5RS standard	
@@ -1,4 +1,4 @@
-This document describes Chicken's R5RS support, with a heavy emphasis
+This document describes CHICKEN's R5RS support, with a heavy emphasis
 on syntax and procedures.  It is based directly on the
 ''Revised^5 Report on the Algorithmic Language Scheme''.
 [[toc:]]
@@ -3126,7 +3126,7 @@ implementations.
 <procedure>(transcript-on filename)</procedure><br>
 <procedure>(transcript-off)</procedure><br>
 
-(These procedures are not implemented in Chicken.)
+(These procedures are not implemented in CHICKEN.)
 
 Filename must be a string naming an output file to be created. The
 effect of transcript-on is to open the named file for output, and to
diff --git a/manual/The User's Manual b/manual/The User's Manual
index 5416fcb1..e70fa023 100644
--- a/manual/The User's Manual	
+++ b/manual/The User's Manual	
@@ -6,7 +6,7 @@
 <img style="float:right; border-left:1px solid #ccc;border-bottom:1px solid #ccc;margin-left:1em;" src="http://www.call-with-current-continuation.org/chicken4.png" alt="Stylized picture of a chicken"/>
 </nowiki>
 
-This is the manual for Chicken Scheme, version 4.9.1
+This is the manual for CHICKEN Scheme, version 4.9.1
 
 ; [[Getting started]] : What is CHICKEN and how do I use it?
 
diff --git a/manual/Unit irregex b/manual/Unit irregex
index 00739f34..9b78eadc 100644
--- a/manual/Unit irregex	
+++ b/manual/Unit irregex	
@@ -13,7 +13,7 @@ standard Scheme strings, or over arbitrarily chunked streams of
 strings.
 
 On systems that support dynamic loading, the {{irregex}} unit can
-be made available in the Chicken interpreter ({{csi}}) by entering
+be made available in the CHICKEN interpreter ({{csi}}) by entering
 
 <enscript highlight=scheme>
 (require-extension irregex)
diff --git a/manual/Unit library b/manual/Unit library
index a8197efe..8e21522e 100644
--- a/manual/Unit library	
+++ b/manual/Unit library	
@@ -391,7 +391,7 @@ and bindings of keyword symbols is not allowed.
 The parameter {{keyword-style}} and the compiler/interpreter option
 {{-keyword-style}} can be used to allow an additional keyword
 syntax, either compatible to Common LISP, or to DSSSL.  As long as this
-parameter is set to {{#:suffix}}, Chicken conforms to
+parameter is set to {{#:suffix}}, CHICKEN conforms to
 [[http://srfi.schemers.org/srfi-88/srfi-88.html|SRFI-88]].
 
 
@@ -499,10 +499,6 @@ Returns the error code of the last system call.
 Returns the value of the environment variable {{STRING}} or
 {{#f}} if that variable is not defined. See also [[http://srfi.schemers.org/srfi-98/|SRFI-98]].
 
-<procedure>(getenv STRING)</procedure>
-
-{{getenv}} was removed in Chicken 4.6.4.  Use {{get-environment-variable}} instead.
-
 ==== machine-byte-order
 
 <procedure>(machine-byte-order)</procedure>
@@ -584,7 +580,7 @@ process is currently running, which is one of the following:
 <procedure>(c-runtime)</procedure>
 
 Returns a symbol that designates what kind of C runtime library has been linked
-with this version of the Chicken libraries. Possible return values are
+with this version of the CHICKEN libraries. Possible return values are
 {{static}}, {{dynamic}} or {{unknown}}. On systems not compiled with the
 Microsoft C compiler, {{c-runtime}} always returns {{unknown}}.
 
@@ -1259,7 +1255,7 @@ You can undo special handling of read-syntax by passing {{#f}} as the second arg
 As a special case, your handler can return zero values, via {{(values)}}.  This causes
 the reader to completely ignore whatever input you've read, rather than returning some
 possibly unspecified value.  This can be useful in macro context, reading comments,
-conditional compilation, and so forth.  Available in Chicken 4.6.6 and later.
+conditional compilation, and so forth.  Available in CHICKEN 4.6.6 and later.
 
 Note that all of CHICKEN's special non-standard read-syntax is handled directly by the reader.
 To disable built-in read-syntax, define a handler that triggers an error (for example).
diff --git a/manual/Unit lolevel b/manual/Unit lolevel
index bf5d24ff..c7911220 100644
--- a/manual/Unit lolevel	
+++ b/manual/Unit lolevel	
@@ -19,7 +19,7 @@ The abstract class of ''pointer'' is divided into 2 categories:
 
 ; ''pointer-like object'' : is a closure, port, [[#Locatives|locative]], or a pointer object.
 
-SWIG-pointers are currently an issue due to "bitrot" in the SWIG Chicken
+SWIG-pointers are currently an issue due to "bitrot" in the SWIG CHICKEN
 translator. While they are considered a pointer object unexpected results are
 possible.
 
diff --git a/manual/Unit ports b/manual/Unit ports
index cc5b5216..fa3c5e53 100644
--- a/manual/Unit ports	
+++ b/manual/Unit ports	
@@ -155,7 +155,7 @@ perform arbitrary operations as long as they can be invoked
 as {{(READ FROM)}} and {{(WRITE X TO)}}, respectively.
 {{copy-port}} returns an undefined value.
 
-{{copy-port}} was introduced in Chicken 4.6.0.
+{{copy-port}} was introduced in CHICKEN 4.6.0.
 
 === Funky ports
 
diff --git a/manual/Unit srfi-13 b/manual/Unit srfi-13
index 822f7c72..4ba0c97a 100644
--- a/manual/Unit srfi-13	
+++ b/manual/Unit srfi-13	
@@ -9,7 +9,7 @@ omitted from this document.  For full documentation, see the
 document]].
 
 On systems that support dynamic loading, the {{srfi-13}} unit can
-be made available in the Chicken interpreter ({{csi}}) by entering
+be made available in the CHICKEN interpreter ({{csi}}) by entering
 
 <enscript highlight=scheme>
 (require-extension srfi-13)
@@ -29,7 +29,7 @@ This SRFI considers strings simply to be a sequence of "code points" or
 character encodings. Operations such as comparison or reversal are always
 done code point by code point.
 
-Chicken's native strings are simple byte sequences (not Unicode code points).
+CHICKEN's native strings are simple byte sequences (not Unicode code points).
 Comparison or reversal is done byte-wise.  If Unicode semantics are
 desired, see the [[/egg/utf8|utf8]] egg.
 
@@ -40,12 +40,12 @@ SRFI 13 makes no attempt to deal with these issues; it uses a simple 1-1
 locale- and context-independent case-mapping, specifically Unicode's 1-1
 case-mappings given in [[ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt]].
 
-On Chicken, case-mapping is restricted to operate on ASCII characters.
+On CHICKEN, case-mapping is restricted to operate on ASCII characters.
 
 === String equality & string normalisation
 
 SRFI 13 string equality is simply based upon comparing the encoding
-values used for the characters.  On Chicken, strings are compared 
+values used for the characters.  On CHICKEN, strings are compared 
 byte-wise.
 
 === String inequality
@@ -69,7 +69,7 @@ the string.
 
 === Shared storage
 
-Chicken does not currently have shared-text substrings, nor does its
+CHICKEN does not currently have shared-text substrings, nor does its
 implementation of SRFI 13 routines ever return one of the
 strings that was passed in as a parameter, as is allowed by the
 specification.
diff --git a/manual/Unit srfi-18 b/manual/Unit srfi-18
index dd33b99d..96b30db3 100644
--- a/manual/Unit srfi-18	
+++ b/manual/Unit srfi-18	
@@ -7,7 +7,7 @@
 A multithreading package, largely following the specification
 of [[http://srfi.schemers.org/srfi-18/srfi-18.html|SRFI-18]].  This
 document contains the core of the SRFI-18 documentation as well as
-information on Chicken deviations from the spec.
+information on CHICKEN deviations from the spec.
 
 The threads implemented in CHICKEN are so called "green" threads,
 based on first-class continuations. Native threads that map directly
@@ -26,7 +26,7 @@ SRFI-18 defines the following multithreading datatypes:
 It also defines a mechanism to handle exceptions and some multithreading
 exception datatypes.
 
-== Chicken implementation
+== CHICKEN implementation
 
 === Notes
 
diff --git a/manual/Unit srfi-4 b/manual/Unit srfi-4
index f2bc17aa..f2c263b9 100644
--- a/manual/Unit srfi-4	
+++ b/manual/Unit srfi-4	
@@ -6,7 +6,7 @@ Homogeneous numeric vector datatypes.  Also see the [[http://srfi.schemers.org/s
 
 [[toc:]]
 
-== Chicken implementation
+== CHICKEN implementation
 
 * Procedures for blob conversion, subvectors and vector I/O are provided.
 * SRFI-17 setters for {{XXXvector-ref}} are defined.
@@ -208,7 +208,7 @@ The type of the fill value must be compatible with the elements of the
 vector datatype.  It is an error if otherwise -- for example, if an
 inexact integer is passed to {{make-u8vector}}.
 
-On Chicken, these procedures have been extended to allow allocating
+On CHICKEN, these procedures have been extended to allow allocating
 the storage in non-garbage collected memory, as follows:
 
 The optional arguments {{NONGC}} and {{FINALIZE}} define whether the
diff --git a/manual/Using the compiler b/manual/Using the compiler
index 894e9d4e..fc2c2b68 100644
--- a/manual/Using the compiler	
+++ b/manual/Using the compiler	
@@ -143,7 +143,7 @@ the source text should be read from standard input.
 
 ; -prologue FILENAME : Includes the file named {{FILENAME}} at the start of the compiled source file.  The include-path is not searched. This option may be given multiple times.
 
-; -r5rs-syntax : Disables the Chicken extensions to R5RS syntax. Does not disable [[Non-standard read syntax|non-standard read syntax]].
+; -r5rs-syntax : Disables the CHICKEN extensions to R5RS syntax. Does not disable [[Non-standard read syntax|non-standard read syntax]].
 
 ; -raw : Disables the generation of any implicit code that uses the Scheme libraries (that is all runtime system files besides {{runtime.c}} and {{chicken.h}}).
 
diff --git a/manual/Using the interpreter b/manual/Using the interpreter
index 14ae4ccb..586a64ba 100644
--- a/manual/Using the interpreter	
+++ b/manual/Using the interpreter	
@@ -49,7 +49,7 @@ The options recognized by the interpreter are:
 
 ; -q  -quiet : Do not print a startup message. Also disables generation of call-trace information for interpreted code.
 
-;     -r5rs-syntax : Disables the Chicken extensions to R5RS syntax. Does not disable [[Non-standard read syntax|non-standard read syntax]].
+;     -r5rs-syntax : Disables the CHICKEN extensions to R5RS syntax. Does not disable [[Non-standard read syntax|non-standard read syntax]].
 
 ; -s  -script PATHNAME : This is equivalent to {{-batch -quiet -no-init PATHNAME}}. Arguments following {{PATHNAME}} are available by using  {{command-line-arguments}} and are not processed as interpreter options. Extra options in the environment variable {{CSI_OPTIONS}} are ignored.
 
diff --git a/manual/faq b/manual/faq
index 08946274..18f79c9a 100644
--- a/manual/faq
+++ b/manual/faq
@@ -3,7 +3,7 @@
 
 == FAQ
 
-This is the list of Frequently Asked Questions about Chicken Scheme.
+This is the list of Frequently Asked Questions about CHICKEN Scheme.
 If you have a question not answered here, feel free to post to the chicken-users mailing list;
 if you consider your question general enough, feel free to add it to this list.
 
@@ -94,7 +94,7 @@ require mandatory locking of every object that could be potentially
 shared between two threads. The garbage-collection algorithm would
 then become much more complex and inefficient, since the location of
 every object has to be accessed via a thread synchronization
-protocol. Such a design would make native threads in Chicken
+protocol. Such a design would make native threads in CHICKEN
 essentially equivalent to Unix processes and shared memory.
 
 For a different approach to concurrency, please see the
@@ -336,14 +336,14 @@ When you try to {{use}} a built-in unit such as {{srfi-18}}, you may get the fol
 
 Another symptom is that {{(require 'srfi-18)}} will silently fail.
 
-This typically happens because the Chicken libraries have been installed in a non-standard location, such as your home directory.  The workaround is to explicitly tell the dynamic linker where to look for your libraries:
+This typically happens because the CHICKEN libraries have been installed in a non-standard location, such as your home directory.  The workaround is to explicitly tell the dynamic linker where to look for your libraries:
 
  export DYLD_LIBRARY_PATH=~/scheme/chicken/lib:$DYLD_LIBRARY_PATH ;; Mac
  export LD_LIBRARY_PATH=~/scheme/chicken/lib:$LD_LIBRARY_PATH    ;; Linux
 
 ==== How can I increase the size of the trace shown when runtime errors are detected?
 
-When a runtime error is detected, Chicken will print the last entries from the trace of functions called
+When a runtime error is detected, CHICKEN will print the last entries from the trace of functions called
 (unless your executable was compiled with the {{-no-trace}} option.
 By default, only 16 entries will be shown.
 To increase this number pass the {{-:aN}} parameter to your executable.
@@ -813,7 +813,7 @@ add:
 contained in the three tools {{chicken-install}}, {{chicken-uninstall}} and {{chicken-status}}.
 See the [[Extensions]] chapter for more information.
 
-==== How can I install Chicken eggs to a non-default location?
+==== How can I install CHICKEN eggs to a non-default location?
 
 You can just set the {{CHICKEN_REPOSITORY}} environment variable.
 It should contain the path where you want eggs to be installed:
diff --git a/misc/flymake-chicken.el b/misc/flymake-chicken.el
index 62c7b82a..8ac944e1 100644
--- a/misc/flymake-chicken.el
+++ b/misc/flymake-chicken.el
@@ -17,7 +17,7 @@
 (require 'flymake)
 
 (defgroup flymake-chicken nil
-  "Flymake Chicken Customizations")
+  "Flymake CHICKEN Customizations")
 
 (defcustom flymake-chicken-program "chicken-flymake"
   "How to invoke csc."
diff --git a/modules.scm b/modules.scm
index 439c7091..e102b9d8 100644
--- a/modules.scm
+++ b/modules.scm
@@ -1,6 +1,6 @@
 ;;;; modules.scm - module-system support
 ;
-; Copyright (c) 2011-2014, The Chicken Team
+; Copyright (c) 2011-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/optimizer.scm b/optimizer.scm
index a593bc11..fb411914 100644
--- a/optimizer.scm
+++ b/optimizer.scm
@@ -1,6 +1,6 @@
 ;;;; optimizer.scm - The CHICKEN Scheme compiler (optimizations)
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/ports.import.scm b/ports.import.scm
index a719575d..99a76f07 100644
--- a/ports.import.scm
+++ b/ports.import.scm
@@ -1,6 +1,6 @@
 ;;;; ports.import.scm - import library for "ports" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/ports.scm b/ports.scm
index b19c6d53..f255160b 100644
--- a/ports.scm
+++ b/ports.scm
@@ -1,6 +1,6 @@
 ;;; ports.scm - Optional non-standard ports
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/posix-common.scm b/posix-common.scm
index 5d0a732c..69b625d7 100644
--- a/posix-common.scm
+++ b/posix-common.scm
@@ -1,6 +1,6 @@
 ;;;; posix-common.scm - common code for UNIX and Windows versions of the posix unit
 ;
-; Copyright (c) 2010-2014, The Chicken Team
+; Copyright (c) 2010-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/posix.import.scm b/posix.import.scm
index d57a886a..02d3ca8c 100644
--- a/posix.import.scm
+++ b/posix.import.scm
@@ -1,6 +1,6 @@
 ;;;; posix.import.scm - import library for "posix" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/posixunix.scm b/posixunix.scm
index da92f63a..b6f9fccc 100644
--- a/posixunix.scm
+++ b/posixunix.scm
@@ -1,6 +1,6 @@
 ;;;; posixunix.scm - Miscellaneous file- and process-handling routines
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/posixwin.scm b/posixwin.scm
index cfd44a83..c41e18db 100644
--- a/posixwin.scm
+++ b/posixwin.scm
@@ -1,6 +1,6 @@
 ;;;; posixwin.scm - Miscellaneous file- and process-handling routines, available on Windows
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/private-namespace.scm b/private-namespace.scm
index 08cc5192..a71b552b 100644
--- a/private-namespace.scm
+++ b/private-namespace.scm
@@ -1,6 +1,6 @@
 ;;;; compiler-namespace.scm - A simple namespace system to keep compiler variables hidden
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/profiler.scm b/profiler.scm
index 9ec1cc4a..6e3c084b 100644
--- a/profiler.scm
+++ b/profiler.scm
@@ -1,6 +1,6 @@
 ;;;; profiler.scm - Support code for profiling applications
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/rules.make b/rules.make
index e12632ec..d405f5c1 100644
--- a/rules.make
+++ b/rules.make
@@ -1,6 +1,6 @@
 # rules.make - basic build rules -*- Makefile -*-
 #
-# Copyright (c) 2008-2014, The Chicken Team
+# Copyright (c) 2008-2014, The CHICKEN Team
 # Copyright (c) 2000-2007, Felix L. Winkelmann
 # All rights reserved.
 #
diff --git a/runtime.c b/runtime.c
index f8917cf4..1a68906c 100644
--- a/runtime.c
+++ b/runtime.c
@@ -1,6 +1,6 @@
 /* runtime.c - Runtime code for compiler generated executables
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/scheduler.scm b/scheduler.scm
index 0bf9a849..f6e996f2 100644
--- a/scheduler.scm
+++ b/scheduler.scm
@@ -1,6 +1,6 @@
 ; scheduler.scm - Basic scheduler for multithreading
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/scrutinizer.scm b/scrutinizer.scm
index 7094848f..49f72c65 100644
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@ -1,6 +1,6 @@
 ;;;; scrutinizer.scm - The CHICKEN Scheme compiler (local flow analysis)
 ;
-; Copyright (c) 2009-2014, The Chicken Team
+; Copyright (c) 2009-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/setup-api.scm b/setup-api.scm
index eae46d86..1532a0fd 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -1,6 +1,6 @@
 ;;;; setup-api.scm - build + installation API for eggs
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/setup-download.scm b/setup-download.scm
index 9ded61ad..e87446e4 100644
--- a/setup-download.scm
+++ b/setup-download.scm
@@ -1,6 +1,6 @@
 ;;;; setup-download.scm
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-1.import.scm b/srfi-1.import.scm
index 5c52a59c..061eb738 100644
--- a/srfi-1.import.scm
+++ b/srfi-1.import.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-1.import.scm - import library for "srfi-1" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-13.import.scm b/srfi-13.import.scm
index baa2a564..c14bf0eb 100644
--- a/srfi-13.import.scm
+++ b/srfi-13.import.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-13.import.scm - import library for "srfi-13" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-14.import.scm b/srfi-14.import.scm
index b9302630..af179279 100644
--- a/srfi-14.import.scm
+++ b/srfi-14.import.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-14.import.scm - import library for "srfi-14" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-18.import.scm b/srfi-18.import.scm
index dd4f7c7e..8c6968c7 100644
--- a/srfi-18.import.scm
+++ b/srfi-18.import.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-18.import.scm - import library for "srfi-18" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-18.scm b/srfi-18.scm
index 7b54b840..189ba669 100644
--- a/srfi-18.scm
+++ b/srfi-18.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-18.scm - Simple thread unit - felix
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/srfi-4.import.scm b/srfi-4.import.scm
index cc79a3e5..db682f63 100644
--- a/srfi-4.import.scm
+++ b/srfi-4.import.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-4.import.scm - import library for "srfi-4" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-4.scm b/srfi-4.scm
index b1fea14a..fffa8da6 100644
--- a/srfi-4.scm
+++ b/srfi-4.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-4.scm - Homogeneous numeric vectors
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/srfi-69.import.scm b/srfi-69.import.scm
index 2d2b3d6e..600fb35d 100644
--- a/srfi-69.import.scm
+++ b/srfi-69.import.scm
@@ -1,6 +1,6 @@
 ;;;; srfi-69.import.scm - import library for "srfi-69" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/srfi-69.scm b/srfi-69.scm
index 2fa162f8..c65235a4 100644
--- a/srfi-69.scm
+++ b/srfi-69.scm
@@ -1,6 +1,6 @@
 ;;; srfi-69.scm - Optional non-standard extensions
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/stub.scm b/stub.scm
index b521d6f5..88ad58f3 100644
--- a/stub.scm
+++ b/stub.scm
@@ -1,6 +1,6 @@
 ;;;; stub.scm
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/support.scm b/support.scm
index dc8a22cf..d91f53b2 100644
--- a/support.scm
+++ b/support.scm
@@ -1,6 +1,6 @@
 ;;;; support.scm - Miscellaneous support code for the CHICKEN compiler
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
@@ -1662,7 +1662,7 @@ Usage: chicken FILENAME OPTION ...
                                   (prefix, suffix or none)
     -no-parentheses-synonyms     disables list delimiter synonyms
     -no-symbol-escape            disables support for escaped symbols
-    -r5rs-syntax                 disables the Chicken extensions to
+    -r5rs-syntax                 disables the CHICKEN extensions to
                                   R5RS syntax
     -compile-syntax              macros are made available at run-time
     -emit-import-library MODULE  write compile-time module information into
diff --git a/tcp.import.scm b/tcp.import.scm
index bd046b53..4779eb80 100644
--- a/tcp.import.scm
+++ b/tcp.import.scm
@@ -1,6 +1,6 @@
 ;;;; tcp.import.scm - import library for "tcp" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/tcp.scm b/tcp.scm
index cf81792f..ce7bb74f 100644
--- a/tcp.scm
+++ b/tcp.scm
@@ -1,6 +1,6 @@
 ;;;; tcp.scm - Networking stuff
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/tests/loopy-loop.scm b/tests/loopy-loop.scm
index 59e53643..fbdb5707 100644
--- a/tests/loopy-loop.scm
+++ b/tests/loopy-loop.scm
@@ -479,7 +479,7 @@
       . rest))
     ))
 
-;; Chicken-specific implementation using internal knowledge of the
+;; CHICKEN-specific implementation using internal knowledge of the
 ;; vector+alist representation.  The ##sys#slot form will cause most
 ;; other implementations to choke, so comment this out if needed.
 
diff --git a/tests/null.scm b/tests/null.scm
index cb2bfd96..006f3412 100644
--- a/tests/null.scm
+++ b/tests/null.scm
@@ -1,6 +1,6 @@
 ;;;; null.scm - the empty program
 ;
-; Copyright (c) 2010-2014, The Chicken Team
+; Copyright (c) 2010-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/tests/r7rs-tests.scm b/tests/r7rs-tests.scm
index 1933b2b3..4c98869e 100644
--- a/tests/r7rs-tests.scm
+++ b/tests/r7rs-tests.scm
@@ -216,7 +216,7 @@
 ;; Edge case
 (test "" read-escaped-string (string-append "    " (string #\newline) "    "))
 
-;; NOT YET (is ambiguous with existing \xNN syntax in Chicken)
+;; NOT YET (is ambiguous with existing \xNN syntax in CHICKEN)
 #;(test #\tab escaped-char "x9;")
 #;(test #\tab escaped-char "x09;")
 
diff --git a/tweaks.scm b/tweaks.scm
index 98330148..a6391326 100644
--- a/tweaks.scm
+++ b/tweaks.scm
@@ -1,6 +1,6 @@
 ;;;; tweaks.scm - Some inline-routines and declarations for the compiler 
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
diff --git a/types.db b/types.db
index bb9bb8e4..2ec7bfd1 100644
--- a/types.db
+++ b/types.db
@@ -1,6 +1,6 @@
 ;;;; types.db - Type-information for core library functions -*- Scheme -*-
 ;
-; Copyright (c) 2009-2014, The Chicken Team
+; Copyright (c) 2009-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/utils.import.scm b/utils.import.scm
index 9bb8a866..a992b40c 100644
--- a/utils.import.scm
+++ b/utils.import.scm
@@ -1,6 +1,6 @@
 ;;;; utils.import.scm - import library for "utils" module
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
diff --git a/utils.scm b/utils.scm
index aec5ddb8..52969b95 100644
--- a/utils.scm
+++ b/utils.scm
@@ -1,6 +1,6 @@
 ;;;; utils.scm - Utilities for scripting and file stuff
 ;
-; Copyright (c) 2008-2014, The Chicken Team
+; Copyright (c) 2008-2014, The CHICKEN Team
 ; Copyright (c) 2000-2007, Felix L. Winkelmann
 ; All rights reserved.
 ;
Trap