Renaming the (scheme) library to (chibi). Leaving (scheme) as an alias for backwards compatibility.

benchmarks/shootout/binarytrees.chibi

@@ -3,7 +3,7 @@
 ;;; The Computer Language Benchmarks Game
 ;;; http://shootout.alioth.debian.org/
 
-(import (scheme) (srfi 9))
+(import (chibi) (srfi 9))
 
 (define-record-type node
   (make-node value left right)

benchmarks/shootout/chameneos-redux.chibi

@@ -5,7 +5,7 @@
 
 ;;; based on Racket version by Matthew Flatt
 
-(import (scheme)
+(import (chibi)
         (srfi 18)
         (chibi match))
 

benchmarks/shootout/knucleotide.chibi

@@ -5,7 +5,7 @@
 
 ;;; based on Racket version by Matthew Flatt
 
-(import (scheme)
+(import (chibi)
         (srfi 69)
         (srfi 95)
         (chibi io))

build-lib/chibi/char-set/compute.sld

@@ -3,7 +3,7 @@
 ;; char-set representations.
 
 (define-library (chibi char-set compute)
-  (import (scheme) (chibi iset) (chibi char-set))
+  (import (chibi) (chibi iset) (chibi char-set))
   (include "derived.scm" "compute.scm")
   (export
    char-set:lower-case

lib/chibi/ast.sld

@@ -34,6 +34,6 @@
    object-size integer->immediate gc atomically
    string-contains integer->error-string
    flatten-dot update-free-vars!)
-  (import (scheme))
+  (import (chibi))
   (include-shared "ast")
   (include "ast.scm"))

lib/chibi/base64.sld

@@ -3,5 +3,5 @@
   (export base64-encode base64-encode-string
           base64-decode base64-decode-string
           base64-encode-header)
-  (import (scheme) (srfi 33) (chibi io))
+  (import (chibi) (srfi 33) (chibi io))
   (include "base64.scm"))

lib/chibi/channel.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi channel)
-  (import (scheme) (srfi 9) (srfi 18))
+  (import (chibi) (srfi 9) (srfi 18))
   (export Channel make-channel channel? channel-empty?
           channel-send! channel-receive!)
   (include "channel.scm"))

lib/chibi/char-set.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi char-set)
-  (import (scheme) (chibi char-set base) (chibi char-set extras))
+  (import (chibi) (chibi char-set base) (chibi char-set extras))
   (export
    Char-Set char-set? char-set-contains?
    char-set ucs-range->char-set char-set-copy char-set-size

lib/chibi/char-set/ascii.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi char-set ascii)
-  (import (scheme) (chibi iset base))
+  (import (chibi) (chibi iset base))
   (export char-set-contains?
           char-set:lower-case  char-set:upper-case  char-set:title-case
           char-set:letter      char-set:digit       char-set:letter+digit

lib/chibi/char-set/base.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi char-set base)
-  (import (scheme) (chibi iset base))
+  (import (chibi) (chibi iset base))
   (export (rename Integer-Set Char-Set)
           (rename iset? char-set?)
           immutable-char-set

lib/chibi/char-set/extras.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi char-set extras)
-  (import (scheme) (chibi iset) (chibi char-set base))
+  (import (chibi) (chibi iset) (chibi char-set base))
   (include "extras.scm")
   (export
    char-set ucs-range->char-set char-set-copy char-set-size

lib/chibi/char-set/full.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi char-set full)
-  (import (scheme) (chibi iset base) (chibi char-set base))
+  (import (chibi) (chibi iset base) (chibi char-set base))
   (export char-set:lower-case  char-set:upper-case  char-set:title-case
           char-set:letter      char-set:digit       char-set:letter+digit
           char-set:graphic     char-set:printing    char-set:whitespace

lib/chibi/disasm.sld

@@ -6,5 +6,5 @@
 
 (define-library (chibi disasm)
   (export disasm)
-  (import (scheme))
+  (import (chibi))
   (include-shared "disasm"))

lib/chibi/equiv.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi equiv)
   (export equiv?)
-  (import (scheme))
+  (import (chibi))
   (import (srfi 69))
   (include "equiv.scm"))

lib/chibi/filesystem.sld

@@ -30,7 +30,7 @@
           open/create      open/exclusive         open/truncate
           open/append      open/non-block
           is-a-tty?)
-  (import (scheme))
+  (import (chibi))
   (include-shared "filesystem")
   (include "filesystem.scm"))
 

lib/chibi/generic.sld

@@ -3,5 +3,5 @@
 
 (define-library (chibi generic)
   (export define-generic define-method make-generic generic-add!)
-  (import (scheme))
+  (import (chibi))
   (include "generic.scm"))

lib/chibi/heap-stats.sld

@@ -20,5 +20,5 @@
 
 (define-library (chibi heap-stats)
   (export heap-stats heap-dump)
-  (import (scheme))
+  (import (chibi))
   (include-shared "heap-stats"))

lib/chibi/highlight.sld

@@ -2,5 +2,5 @@
 (define-library (chibi highlight)
   (export highlight highlight-detect-language highlighter-for highlight-style
           highlight-scheme highlight-c highlight-assembly)
-  (import (scheme) (srfi 1) (chibi io))
+  (import (chibi) (srfi 1) (chibi io))
   (include "highlight.scm"))

lib/chibi/io.sld

@@ -12,6 +12,6 @@
           open-input-bytevector open-output-bytevector get-output-bytevector
           string->utf8 utf8->string
           write-u8 read-u8 peek-u8)
-  (import (scheme) (chibi ast))
+  (import (chibi) (chibi ast))
   (include-shared "io/io")
   (include "io/io.scm"))

lib/chibi/iset/base.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi iset base)
-  (import (scheme) (srfi 9) (srfi 33))
+  (import (chibi) (srfi 9) (srfi 33))
   (include "base.scm")
   (export
    %make-iset make-iset iset? iset-contains? Integer-Set

lib/chibi/iset/constructors.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi iset constructors)
-  (import (scheme) (srfi 33) (chibi iset base) (chibi iset iterators))
+  (import (chibi) (srfi 33) (chibi iset base) (chibi iset iterators))
   (include "constructors.scm")
   (export
    iset iset-copy list->iset list->iset! iset-map

lib/chibi/iset/iterators.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi iset iterators)
-  (import (scheme) (srfi 9) (srfi 33) (chibi iset base))
+  (import (chibi) (srfi 9) (srfi 33) (chibi iset base))
   (include "iterators.scm")
   (export
    iset-empty? iset-fold iset-fold-node iset-for-each iset-for-each-node

lib/chibi/iset/optimize.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi iset optimize)
-  (import (scheme) (srfi 9) (srfi 33)
+  (import (chibi) (srfi 9) (srfi 33)
           (chibi iset base)
           (chibi iset iterators)
           (chibi iset constructors))

lib/chibi/loop.sld

@@ -4,6 +4,6 @@
           listing listing-reverse appending appending-reverse
           summing multiplying in-string in-string-reverse
           in-vector in-vector-reverse)
-  (import (scheme))
+  (import (chibi))
   (include "loop/loop.scm"))
 

lib/chibi/match.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi match)
   (export match match-lambda match-lambda* match-let match-letrec match-let*)
-  (import (scheme))
+  (import (chibi))
   (include "match/match.scm"))
 

lib/chibi/mime.sld

@@ -3,5 +3,5 @@
   (export mime-ref assoc-ref mime-header-fold mime-headers->list
           mime-parse-content-type mime-decode-header
           mime-message-fold mime-message->sxml)
-  (import (scheme) (chibi base64) (chibi quoted-printable) (chibi io))
+  (import (chibi) (chibi base64) (chibi quoted-printable) (chibi io))
   (include "mime.scm"))

lib/chibi/modules.scm

@@ -28,7 +28,7 @@
 
 (define (module-dir mod)
   (let ((name (module-name mod)))
-    (if (member name '((scheme) (meta)))
+    (if (member name '((chibi) (meta)))
         ""
         (module-name-prefix name))))
 

lib/chibi/modules.sld

@@ -4,5 +4,5 @@
           module-ast module-ast-set! module-ref module-contains?
           analyze-module containing-module load-module module-exports
           module-name->file procedure-analysis)
-  (import (scheme) (meta) (chibi ast))
+  (import (chibi) (meta) (chibi ast))
   (include "modules.scm"))

lib/chibi/net.sld

@@ -13,6 +13,6 @@
           socket-opt/keepalive socket-opt/oobinline socket-opt/sndbuf
           socket-opt/rcvbuf socket-opt/dontroute socket-opt/rcvlowat
           socket-opt/sndlowat)
-  (import (scheme) (chibi filesystem))
+  (import (chibi) (chibi filesystem))
   (include-shared "net")
   (include "net.scm"))

lib/chibi/net/http.sld

@@ -2,6 +2,6 @@
 (define-library (chibi net http)
   (export http-get call-with-input-url with-input-from-url
           http-parse-request http-parse-form)
-  (import (scheme) (srfi 39) (chibi net) (chibi io)
+  (import (chibi) (srfi 39) (chibi net) (chibi io)
           (chibi uri) (chibi mime))
   (include "http.scm"))

lib/chibi/net/server.sld

@@ -1,5 +1,5 @@
 
 (define-library (chibi net server)
-  (import (scheme) (chibi net) (chibi filesystem) (srfi 18))
+  (import (chibi) (chibi net) (chibi filesystem) (srfi 18))
   (export run-net-server)
   (include "server.scm"))

lib/chibi/optimize.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi optimize)
-  (import (scheme) (chibi ast) (chibi match) (srfi 1))
+  (import (chibi) (chibi ast) (chibi match) (srfi 1))
   (export register-lambda-optimization!
           replace-references
           fold-every join-seq dotted-tail)

lib/chibi/optimize/profile.sld

@@ -1,7 +1,7 @@
 
 (define-library (chibi optimize profile)
   (export optimize-profile increment-cdr! profile-reset profile-report)
-  (import (scheme) (srfi 1) (srfi 69) (srfi 95)
+  (import (chibi) (srfi 1) (srfi 69) (srfi 95)
           (chibi ast) (chibi match) (chibi optimize))
   (include-shared "profile")
   (include "profile.scm"))

lib/chibi/optimize/rest.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi optimize rest)
   (export optimize-rest rest-parameter-cdrs num-parameters local-ref)
-  (import (scheme) (srfi 1) (chibi ast) (chibi match) (chibi optimize))
+  (import (chibi) (srfi 1) (chibi ast) (chibi match) (chibi optimize))
   (include-shared "rest")
   (include "rest.scm"))

lib/chibi/pathname.sld

@@ -3,5 +3,5 @@
   (export path-strip-directory path-directory ;; path-extension-pos
           path-extension path-strip-extension path-replace-extension
           path-absolute? path-relative? path-normalize make-path)
-  (import (scheme))
+  (import (chibi))
   (include "pathname.scm"))

lib/chibi/process.sld

@@ -16,7 +16,7 @@
           signal/tty-output wait/no-hang
           call-with-process-io
           process->string process->string-list process->output+error)
-  (import (scheme) (chibi io) (chibi string) (chibi filesystem))
+  (import (chibi) (chibi io) (chibi string) (chibi filesystem))
   (cond-expand (threads (import (srfi 18))) (else #f))
   (include-shared "process")
   (include "process.scm"))

lib/chibi/quoted-printable.sld

@@ -3,5 +3,5 @@
   (export quoted-printable-encode quoted-printable-encode-string
           quoted-printable-encode-header
           quoted-printable-decode quoted-printable-decode-string)
-  (import (scheme) (srfi 33) (chibi io))
+  (import (chibi) (srfi 33) (chibi io))
   (include "quoted-printable.scm"))

lib/chibi/reload.sld

@@ -1,6 +1,6 @@
 
 (define-library (chibi reload)
-  (import (scheme)
+  (import (chibi)
           (meta)
           (srfi 39)
           (only (chibi time) current-seconds)

lib/chibi/repl.sld

@@ -1,7 +1,7 @@
 
 (define-library (chibi repl)
   (export repl)
-  (import (scheme) (only (meta) load-module)
+  (import (chibi) (only (meta) load-module)
           (chibi ast) (chibi string) (chibi io)
           (chibi process) (chibi term edit-line)
           (srfi 1) (srfi 18) (srfi 38) (srfi 95) (srfi 98))

lib/chibi/scribble.sld

@@ -1,5 +1,5 @@
 
 (define-library (chibi scribble)
   (export scribble-parse scribble-read)
-  (import (scheme))
+  (import (chibi))
   (include "scribble.scm"))

lib/chibi/string.sld

@@ -11,5 +11,5 @@
    string-find string-find-right string-skip string-skip-right
    string-fold string-fold-right string-map string-for-each
    string-contains make-string-searcher)
-  (import (scheme) (chibi ast) (chibi char-set base))
+  (import (chibi) (chibi ast) (chibi char-set base))
   (include "string.scm"))

lib/chibi/stty.sld

@@ -3,6 +3,6 @@
   (export stty with-stty with-raw-io
           get-terminal-width get-terminal-dimensions
           TCSANOW TCSADRAIN TCSAFLUSH)
-  (import (scheme) (srfi 33) (srfi 69))
+  (import (chibi) (srfi 33) (srfi 69))
   (include-shared "stty")
   (include "stty.scm"))

lib/chibi/system.sld

@@ -8,7 +8,7 @@
           set-current-group-id! set-current-effective-group-id!
           current-session-id create-session
           set-root-directory!)
-  (import (scheme))
+  (import (chibi))
   (include-shared "system")
   (body
    (define (user-information user)

lib/chibi/term/edit-line.sld

@@ -6,5 +6,5 @@
           make-buffer buffer-make-completer
           buffer-clear buffer-refresh buffer-draw
           buffer-row buffer-col)
-  (import (scheme) (chibi stty) (srfi 9))
+  (import (chibi) (chibi stty) (srfi 9))
   (include "edit-line.scm"))

lib/chibi/test.sld

@@ -16,7 +16,7 @@
           (only (srfi 1) every))
   (cond-expand
    (chibi
-    (import (only (scheme) pair-source print-exception)))
+    (import (only (chibi) pair-source print-exception)))
    (else
     (begin
       (define (pair-source x) #f)

lib/chibi/time.sld

@@ -7,5 +7,5 @@
           time-second time-minute time-hour time-day time-month time-year
           time-day-of-week time-day-of-year time-dst?
           tm? timeval? timezone?)
-  (import (scheme))
+  (import (chibi))
   (include-shared "time"))

lib/chibi/trace.sld

@@ -14,5 +14,5 @@
 
 (define-library (chibi trace)
   (export trace untrace untrace-all)
-  (import (scheme) (chibi ast) (srfi 38) (srfi 39) (srfi 69))
+  (import (chibi) (chibi ast) (srfi 38) (srfi 39) (srfi 69))
   (include "trace.scm"))

lib/chibi/type-inference.sld

@@ -1,7 +1,7 @@
 
 (define-library (chibi type-inference)
   (export type-analyze-module type-analyze procedure-signature)
-  (import (scheme) (srfi 1) (srfi 38) (srfi 69)
+  (import (chibi) (srfi 1) (srfi 38) (srfi 69)
           (chibi modules) (chibi ast) (chibi match))
   (include "type-inference.scm"))
 

lib/chibi/uri.sld

@@ -5,5 +5,5 @@
           uri-with-scheme uri-with-user uri-with-host uri-with-path
           uri-with-query uri-with-fragment
           uri-encode uri-decode uri-query->alist uri-alist->query)
-  (import (scheme) (srfi 9))
+  (import (chibi) (srfi 9))
   (include "uri.scm"))

lib/meta.scm

@@ -260,7 +260,7 @@
 (define-config-primitive body)
 (define-config-primitive begin)
 
-;; The `import' binding used by (scheme) and (scheme base), etc.
+;; The `import' binding used by (chibi) and (scheme base), etc.
 (define-syntax repl-import
   (er-macro-transformer
    (let ((meta-env (current-environment)))
@@ -286,8 +286,9 @@
                (error "couldn't find module" (car ls))))))))))))
 
 (define *modules*
-  (list (cons '(scheme) (make-module #f (interaction-environment)
+  (list (cons '(chibi) (make-module #f (interaction-environment)
-                                     '((include "init-7.scm"))))
+                                    '((include "init-7.scm"))))
+        (cons '(scheme) (make-module #f (interaction-environment) '()))
         (cons '(meta) (make-module #f (current-environment) '()))
         (cons '(srfi 0) (make-module (list 'cond-expand)
                                      (current-environment)

lib/scheme/base.sld

@@ -1,6 +1,6 @@
 
 (define-library (scheme base)
-  (import (except (scheme) equal?)
+  (import (except (chibi) equal?)
           (rename (chibi equiv) (equiv? equal?))
           (only (chibi string) string-map string-for-each)
           (chibi io)

lib/scheme/char.sld

@@ -6,13 +6,13 @@
     (import (chibi char-set full)
             (chibi char-set base)
             (chibi iset base)
-            (only (scheme) digit-value))
+            (only (chibi) digit-value))
     (include "char/full.scm")
     (include "char/case-offsets.scm"))
    (else
     (include "char/ascii.scm")
     (import
-     (only (scheme)
+     (only (chibi)
            string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>?
            char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>?
            char-alphabetic?  char-lower-case? char-numeric?

lib/scheme/char/normalization.sld

@@ -2,7 +2,7 @@
 ;; being removed.
 
 (define-library (scheme char normalization)
-  (import (rename (scheme)
+  (import (rename (chibi)
                   (string=? string-ni=?)
                   (string<? string-ni<?)
                   (string>? string-ni>?)

lib/scheme/complex.sld

@@ -1,4 +1,4 @@
 
 (define-library (scheme complex)
-  (import (scheme))
+  (import (chibi))
   (export angle imag-part magnitude make-polar make-rectangular real-part))

lib/scheme/cxr.sld

@@ -1,6 +1,6 @@
 
 (define-library (scheme cxr)
-  (import (scheme))
+  (import (chibi))
   (export
    caaar caadr cadar caddr cdaar cdadr cddar cdddr
    caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr

lib/scheme/division.sld

@@ -2,7 +2,7 @@
 ;; being removed.
 
 (define-library (scheme division)
-  (import (scheme))
+  (import (chibi))
   (export ceiling-quotient ceiling-remainder ceiling/
           centered-quotient centered-remainder centered/
           euclidean-quotient euclidean-remainder euclidean/

lib/scheme/eval.sld

@@ -1,4 +1,4 @@
 
 (define-library (scheme eval)
-  (import (scheme) (meta))
+  (import (chibi) (meta))
   (export eval environment null-environment scheme-report-environment))

lib/scheme/file.sld

@@ -1,6 +1,6 @@
 
 (define-library (scheme file)
-  (import (scheme) (only (chibi filesystem) delete-file file-exists?))
+  (import (chibi) (only (chibi filesystem) delete-file file-exists?))
   (export
    call-with-input-file call-with-output-file
    delete-file file-exists?

lib/scheme/inexact.sld

@@ -1,5 +1,5 @@
 
 (define-library (scheme inexact)
-  (import (scheme))
+  (import (chibi))
   (export acos asin atan cos exp finite? log nan? sin sqrt tan)
   (include "inexact.scm"))

lib/scheme/lazy.sld

@@ -1,5 +1,5 @@
 
 (define-library (scheme lazy)
-  (import (scheme))
+  (import (chibi))
   (export delay force delay-force make-promise)
   (begin (define (make-promise x) (delay x))))

lib/scheme/load.sld

@@ -1,4 +1,4 @@
 
 (define-library (scheme load)
-  (import (scheme))
+  (import (chibi))
   (export load))

lib/scheme/process-context.sld

@@ -1,5 +1,5 @@
 
 (define-library (scheme process-context)
-  (import (scheme) (srfi 98) (only (chibi process) exit))
+  (import (chibi) (srfi 98) (only (chibi process) exit))
   (export get-environment-variable get-environment-variables
           command-line exit))

lib/scheme/repl.sld

@@ -1,4 +1,4 @@
 
 (define-library (scheme repl)
-  (import (scheme))
+  (import (chibi))
   (export interaction-environment))

lib/scheme/time.sld

@@ -6,7 +6,7 @@
 
 (define-library (scheme time)
   (export current-second current-jiffy jiffies-per-second)
-  (import (scheme))
+  (import (chibi))
   (import (scheme process-context))
   (import (scheme time tai))
   (include-shared "time")

lib/scheme/write.sld

@@ -1,6 +1,6 @@
 
 (define-library (scheme write)
-  (import (rename (scheme) (write write-simple) (display display-simple))
+  (import (rename (chibi) (write write-simple) (display display-simple))
           (rename (srfi 38) (write/ss write)))
   (export display write write-simple)
   (begin

lib/srfi/1.sld

@@ -18,7 +18,7 @@
    lset<= lset= lset-adjoin lset-union lset-union! lset-intersection
    lset-intersection! lset-difference lset-difference! lset-xor lset-xor!
    lset-diff+intersection lset-diff+intersection!)
-  (import (scheme))
+  (import (chibi))
   (include "1/predicates.scm"
            "1/selectors.scm"
            "1/search.scm"

lib/srfi/11.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 11)
   (export let-values let*-values)
-  (import (scheme))
+  (import (chibi))
   (begin
    (define-syntax let*-values
      (syntax-rules ()

lib/srfi/16.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 16)
   (export case-lambda)
-  (import (scheme))
+  (import (chibi))
   (begin
    (define-syntax %case
      (syntax-rules ()

lib/srfi/18.sld

@@ -15,7 +15,7 @@
    join-timeout-exception? abandoned-mutex-exception?
    terminated-thread-exception? uncaught-exception?
    uncaught-exception-reason)
-  (import (scheme) (srfi 9) (chibi ast)
+  (import (chibi) (srfi 9) (chibi ast)
           (except (chibi time) time->seconds seconds->time))
   (include "18/types.scm")
   (include-shared "18/threads")

lib/srfi/2.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 2)
   (export and-let*)
-  (import (scheme))
+  (import (chibi))
   (begin
    (define-syntax and-let*
      (syntax-rules ()

lib/srfi/26.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 26)
   (export cut cute)
-  (import (scheme))
+  (import (chibi))
   (begin
    (define-syntax %cut
      (syntax-rules (<> <...>)

lib/srfi/27.sld

@@ -5,6 +5,6 @@
           random-source-state-ref random-source-state-set!
           random-source-randomize! random-source-pseudo-randomize!
           random-source-make-integers random-source-make-reals)
-  (import (scheme))
+  (import (chibi))
   (include-shared "27/rand")
   (include "27/constructors.scm"))

lib/srfi/33.sld

@@ -12,6 +12,6 @@
           first-set-bit
           extract-bit-field test-bit-field? clear-bit-field 
           replace-bit-field  copy-bit-field)
-  (import (scheme))
+  (import (chibi))
   (include-shared "33/bit")
   (include "33/bitwise.scm"))

lib/srfi/38.sld

@@ -1,6 +1,6 @@
 
 (define-library (srfi 38)
-  (import (scheme) (srfi 69) (chibi ast))
+  (import (chibi) (srfi 69) (chibi ast))
   (export write-with-shared-structure write/ss
           read-with-shared-structure read/ss)
   (include "38.scm"))

lib/srfi/39.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 39)
   (export make-parameter parameterize)
-  (import (scheme))
+  (import (chibi))
   (include-shared "39/param")
   (cond-expand
    (threads

lib/srfi/46.sld

@@ -1,4 +1,4 @@
 
 (define-library (srfi 46)
-  (import (scheme))
+  (import (chibi))
   (export syntax-rules))

lib/srfi/55.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 55)
   (export require-extension)
-  (import (scheme))
+  (import (chibi))
   (begin
    (define-syntax require-extension
      (syntax-rules ()

lib/srfi/6.sld

@@ -1,4 +1,4 @@
 
 (define-library (srfi 6)
   (export open-input-string open-output-string get-output-string)
-  (import (scheme)))
+  (import (chibi)))

lib/srfi/69.sld

@@ -10,6 +10,6 @@
    hash-table-walk hash-table-fold hash-table->alist
    hash-table-copy hash-table-merge!
    hash string-hash string-ci-hash hash-by-identity)
-  (import (scheme) (srfi 9))
+  (import (chibi) (srfi 9))
   (include-shared "69/hash")
   (include "69/type.scm" "69/interface.scm"))

lib/srfi/8.sld

@@ -1,7 +1,7 @@
 
 (define-library (srfi 8)
   (export receive)
-  (import (scheme))
+  (import (chibi))
   (body
    (define-syntax receive
      (syntax-rules ()

lib/srfi/9.sld

@@ -1,5 +1,5 @@
 
 (define-library (srfi 9)
   (export define-record-type)
-  (import (scheme))
+  (import (chibi))
   (include "9.scm"))

lib/srfi/95.sld

@@ -1,6 +1,6 @@
 
 (define-library (srfi 95)
   (export sorted? merge merge! sort sort! object-cmp)
-  (import (scheme))
+  (import (chibi))
   (include-shared "95/qsort")
   (include "95/sort.scm"))

lib/srfi/99/records/inspection.sld

@@ -2,5 +2,5 @@
 (define-library (srfi 99 records inspection)
   (export record? record-rtd rtd-name rtd-parent
           rtd-field-names rtd-all-field-names rtd-field-mutable?)
-  (import (scheme) (chibi ast))
+  (import (chibi) (chibi ast))
   (include "inspection.scm"))

lib/srfi/99/records/procedural.sld

@@ -1,5 +1,5 @@
 
 (define-library (srfi 99 records procedural)
   (export make-rtd rtd? rtd-constructor rtd-predicate rtd-accessor rtd-mutator)
-  (import (scheme) (chibi ast) (srfi 99 records inspection))
+  (import (chibi) (chibi ast) (srfi 99 records inspection))
   (include "procedural.scm"))

lib/srfi/99/records/syntactic.sld

@@ -1,5 +1,5 @@
 
 (define-library (srfi 99 records syntactic)
   (export define-record-type)
-  (import (scheme) (srfi 99 records inspection))
+  (import (chibi) (srfi 99 records inspection))
   (include "syntactic.scm"))

tests/srfi-1-tests.scm

@@ -1,4 +1,4 @@
-(import (scheme) (chibi test) (srfi 1))
+(import (chibi) (chibi test) (srfi 1))
 
 (test-begin "srfi-1")
 

tests/srfi-16-tests.scm

@@ -1,6 +1,6 @@
 
 (cond-expand
- (modules (import (scheme) (chibi test) (srfi 16)))
+ (modules (import (chibi) (chibi test) (srfi 16)))
  (else #f))
 
 (define plus

tests/srfi-38-tests.scm

@@ -1,6 +1,6 @@
 
 (cond-expand
- (chibi (import (scheme) (chibi test) (srfi 38)))
+ (chibi (import (chibi) (chibi test) (srfi 38)))
  (chicken (use chicken test srfi-38)))
 
 (test-begin "read/write")

tools/chibi-doc

@@ -1,7 +1,7 @@
 #! /usr/bin/env chibi-scheme
 
 (import
- (scheme) (srfi 1) (chibi modules) (chibi ast) (chibi io) (chibi match)
+ (chibi) (srfi 1) (chibi modules) (chibi ast) (chibi io) (chibi match)
  (chibi time) (chibi filesystem) (chibi scribble) (chibi highlight)
  (chibi type-inference))
 

tools/chibi-ffi

@@ -26,7 +26,7 @@
 ;; using the stubber.
 
 ;; For bootstrapping purposes we depend only on the core language.
-(import (scheme))
+(import (chibi))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; globals

tools/chibi-genstatic

@@ -36,7 +36,7 @@
 ;; which presents a bootstrapping issue on platforms with no dynamic
 ;; loading.
 
-(import (scheme)
+(import (chibi)
         (only (chibi pathname) path-directory)
         (only (meta) find-module module-name->file))
 

tools/extract-case-offsets.scm

@@ -15,7 +15,7 @@
 ;;                        "char-downcase-offsets"
 ;;   -o <output-file>   - the output file, defaults to stdout
 
-(import (scheme) (srfi 1) (srfi 69) (srfi 95) (chibi io) (chibi string)
+(import (chibi) (srfi 1) (srfi 69) (srfi 95) (chibi io) (chibi string)
         (chibi iset) (chibi iset optimize))
 
 (define (warn . args)

tools/extract-unicode-props.scm

@@ -28,7 +28,7 @@
 ;; in the data/ current directory, unless overridden with the --data or
 ;; --derived options.
 
-(import (scheme) (chibi io) (chibi string))
+(import (chibi) (chibi io) (chibi string))
 
 (define (warn . args)
   (let ((err (current-error-port)))

tools/optimize-char-sets.scm

@@ -8,7 +8,7 @@
 ;; Imports (module name) and writes optimized versions of all exported
 ;; char-sets to stdout.
 
-(import (scheme) (srfi 1) (srfi 69)
+(import (chibi) (srfi 1) (srfi 69)
         (chibi io) (chibi string) (chibi modules)
         (chibi char-set) (chibi iset) (chibi iset optimize)
         (only (meta) load-module))