diff --git a/src/base/asdf.lisp b/src/base/asdf.lisp
index eae0ec1c..9ae88dd2 100644
--- a/src/base/asdf.lisp
+++ b/src/base/asdf.lisp
@@ -3,13 +3,14 @@
 ;;; --- ASDF component classes
 ;;;
 
-(defpackage :iolib.asdf
-  (:nicknames :iolib/asdf)
+(defpackage :iolib/asdf
+  (:nicknames :iolib.asdf)
   (:use :common-lisp)
   (:export #:compile-wrapper)
   #+sb-package-locks
   (:lock t))
-(in-package :iolib.asdf)
+
+(in-package :iolib/asdf)
 
 (defun compile-wrapper (continuation)
   (let ((*readtable* (copy-readtable))
diff --git a/src/base/conditions.lisp b/src/base/conditions.lisp
index 22f68f9d..59d2dd35 100644
--- a/src/base/conditions.lisp
+++ b/src/base/conditions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Error conditions.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 ;;;-------------------------------------------------------------------------
 ;;; Subtype Errors
diff --git a/src/base/debug.lisp b/src/base/debug.lisp
index 7d6494e3..87babb77 100644
--- a/src/base/debug.lisp
+++ b/src/base/debug.lisp
@@ -3,7 +3,7 @@
 ;;; --- Debug helpers.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (defvar *safety-checks*
   #+iolib-debug t #-iolib-debug nil
diff --git a/src/base/defalias.lisp b/src/base/defalias.lisp
index 3ad9da6c..3b078f93 100644
--- a/src/base/defalias.lisp
+++ b/src/base/defalias.lisp
@@ -3,7 +3,7 @@
 ;;; --- Creating aliases in CL namespaces
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (defvar *namespaces* nil)
 
diff --git a/src/base/deffoldable.lisp b/src/base/deffoldable.lisp
index 0d82f3c1..c461198e 100644
--- a/src/base/deffoldable.lisp
+++ b/src/base/deffoldable.lisp
@@ -3,7 +3,7 @@
 ;;; --- Declaring forms as foldable(pure)
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 #+sbcl
 (defmacro %deffoldable (func argument-types return-type)
diff --git a/src/base/defobsolete.lisp b/src/base/defobsolete.lisp
index 8726f898..55df31fe 100644
--- a/src/base/defobsolete.lisp
+++ b/src/base/defobsolete.lisp
@@ -3,7 +3,7 @@
 ;;; --- Declaring forms as obsolete.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (define-condition deprecation-warning (style-warning)
   ((function-name :initarg :function-name :reader deprecation-warning-function-name)
diff --git a/src/base/dynamic-buffer.lisp b/src/base/dynamic-buffer.lisp
index e97e12fb..87dadcca 100644
--- a/src/base/dynamic-buffer.lisp
+++ b/src/base/dynamic-buffer.lisp
@@ -3,7 +3,7 @@
 ;;; --- Read/write adjustable buffer.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (defclass dynamic-buffer ()
   ((sequence     :initform nil :accessor sequence-of)
diff --git a/src/base/matching.lisp b/src/base/matching.lisp
index 4ed35f0e..208eb68a 100644
--- a/src/base/matching.lisp
+++ b/src/base/matching.lisp
@@ -3,7 +3,7 @@
 ;;; --- Match utils
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (defmacro multiple-value-case ((values &key (test 'eql)) &body body)
   (setf values (ensure-list values))
diff --git a/src/base/pkgdcl.lisp b/src/base/pkgdcl.lisp
index 877ab100..04dcc8f3 100644
--- a/src/base/pkgdcl.lisp
+++ b/src/base/pkgdcl.lisp
@@ -3,11 +3,11 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :iolib.common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.base
-  (:nicknames :iolib/base)
-  (:extend/excluding :iolib.common-lisp
+(defpackage :iolib/base
+  (:nicknames :iolib.base)
+  (:extend/excluding :iolib/common-lisp
                      #:defun #:defmethod #:defmacro #:define-compiler-macro
                      #:constantp)
   (:extend :alexandria :split-sequence)
diff --git a/src/base/reader.lisp b/src/base/reader.lisp
index e661ae5f..417b0588 100644
--- a/src/base/reader.lisp
+++ b/src/base/reader.lisp
@@ -3,7 +3,7 @@
 ;;; --- Reader utils
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 ;; Literal object dispatcher
 
diff --git a/src/base/return-star.lisp b/src/base/return-star.lisp
index c072aba9..a0e76d92 100644
--- a/src/base/return-star.lisp
+++ b/src/base/return-star.lisp
@@ -3,7 +3,7 @@
 ;;; --- RETURN* wrappers.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (cl:defmacro defun (name args &body body)
   `(,(find-right-symbol :defun :series)
@@ -35,7 +35,7 @@
 (cl:defun find-right-symbol (name &rest packages)
   (multiple-value-bind (symbol foundp)
       (if (eql (find-symbol (string name) *package*)
-               (find-symbol (string name) :iolib.base))
+               (find-symbol (string name) :iolib/base))
           ;; NAME has been imported from IOLIB.UTILS, so we must
           ;; find a default somewhere else, defaulting to the CL package
           (find-symbol (string name) (find-right-package packages))
diff --git a/src/base/sequence.lisp b/src/base/sequence.lisp
index 219baea7..db1e5de5 100644
--- a/src/base/sequence.lisp
+++ b/src/base/sequence.lisp
@@ -3,7 +3,7 @@
 ;;; --- Sequence utils
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (defmacro check-bounds (sequence start end)
   (with-gensyms (length)
diff --git a/src/base/time.lisp b/src/base/time.lisp
index 2a2cc375..45f58463 100644
--- a/src/base/time.lisp
+++ b/src/base/time.lisp
@@ -3,7 +3,7 @@
 ;;; --- Time utils.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (deftype timeout ()
   'double-float)
diff --git a/src/base/types.lisp b/src/base/types.lisp
index c51d4239..60da0398 100644
--- a/src/base/types.lisp
+++ b/src/base/types.lisp
@@ -3,7 +3,7 @@
 ;;; --- Types.
 ;;;
 
-(in-package :iolib.base)
+(in-package :iolib/base)
 
 (deftype function-designator ()
   '(or symbol function))
diff --git a/src/conf/pkgdcl.lisp b/src/conf/pkgdcl.lisp
index c1cafdaf..27d89519 100644
--- a/src/conf/pkgdcl.lisp
+++ b/src/conf/pkgdcl.lisp
@@ -3,7 +3,7 @@
 ;;; --- Package definition.
 ;;;
 
-(cl:defpackage :iolib.conf
-  (:nicknames :iolib/conf)
+(defpackage :iolib/conf
+  (:nicknames :iolib.conf)
   (:use :common-lisp)
   (:export #:load-gray-streams))
diff --git a/src/conf/requires.lisp b/src/conf/requires.lisp
index 9c7d301d..a6d511a5 100644
--- a/src/conf/requires.lisp
+++ b/src/conf/requires.lisp
@@ -3,7 +3,7 @@
 ;;; --- Load all non-ASDF deps - usually implementation-specific REQUIREs
 ;;;
 
-(in-package :iolib.conf)
+(in-package :iolib/conf)
 
 (defun load-gray-streams ()
   #+(and allegro (not (version>= 9 0)))
diff --git a/src/grovel/asdf.lisp b/src/grovel/asdf.lisp
index 279576ec..edfdf27a 100644
--- a/src/grovel/asdf.lisp
+++ b/src/grovel/asdf.lisp
@@ -28,7 +28,7 @@
 ;;; DEALINGS IN THE SOFTWARE.
 ;;;
 
-(in-package :iolib-grovel)
+(in-package :iolib/grovel)
 
 (defun ensure-pathname (thing)
   (if (typep thing 'logical-pathname)
diff --git a/src/grovel/grovel.lisp b/src/grovel/grovel.lisp
index f33cae9b..4971e8d6 100644
--- a/src/grovel/grovel.lisp
+++ b/src/grovel/grovel.lisp
@@ -28,7 +28,7 @@
 ;;; DEALINGS IN THE SOFTWARE.
 ;;;
 
-(in-package #:iolib-grovel)
+(in-package :iolib/grovel)
 
 ;;;# Utils
 
diff --git a/src/grovel/package.lisp b/src/grovel/package.lisp
index 50d72dd1..d12ee2e0 100644
--- a/src/grovel/package.lisp
+++ b/src/grovel/package.lisp
@@ -23,9 +23,11 @@
 ;;; DEALINGS IN THE SOFTWARE.
 ;;;
 
-(defpackage :iolib-grovel
-  (:nicknames :iolib/grovel)
-  (:use #:alexandria #:iolib/base)
+(in-package :iolib/common-lisp-user)
+
+(defpackage :iolib/grovel
+  (:nicknames :iolib-grovel)
+  (:use :alexandria :iolib/base)
   (:import-from #:cffi-sys #:native-namestring)
   (:export
    ;; Class name
diff --git a/src/iolib/pkgdcl.lisp b/src/iolib/pkgdcl.lisp
index 19da9488..f2eb14f1 100644
--- a/src/iolib/pkgdcl.lisp
+++ b/src/iolib/pkgdcl.lisp
@@ -3,7 +3,7 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
 (macrolet
     ((defconduit (name &body clauses)
@@ -21,7 +21,7 @@
             (:export ,@(get-symbols (cdar clauses)))))))
 
   (defconduit :iolib
-    (:use :iolib.multiplex :iolib.streams :iolib.sockets)))
+    (:use :iolib/multiplex :iolib/streams :iolib/sockets)))
 
 ;; SBCL changes *package* if LOAD-OPing :iolib in the REPL
 t
diff --git a/src/multiplex/backend-epoll.lisp b/src/multiplex/backend-epoll.lisp
index 2560a5ba..b4b694aa 100644
--- a/src/multiplex/backend-epoll.lisp
+++ b/src/multiplex/backend-epoll.lisp
@@ -3,7 +3,7 @@
 ;;; --- epoll(2) multiplexer implementation.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (defconstant +epoll-priority+ 1)
 
diff --git a/src/multiplex/backend-kqueue.lisp b/src/multiplex/backend-kqueue.lisp
index ba3e5e28..888af350 100644
--- a/src/multiplex/backend-kqueue.lisp
+++ b/src/multiplex/backend-kqueue.lisp
@@ -3,7 +3,7 @@
 ;;; --- kqueue(2) multiplexer implementation.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (defconstant +kqueue-priority+ 1)
 
diff --git a/src/multiplex/backend-poll.lisp b/src/multiplex/backend-poll.lisp
index 9bc28752..62fcd0f4 100644
--- a/src/multiplex/backend-poll.lisp
+++ b/src/multiplex/backend-poll.lisp
@@ -3,7 +3,7 @@
 ;;; --- poll(2) multiplexer implementation.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (defconstant +poll-priority+ 2)
 
diff --git a/src/multiplex/backend-select.lisp b/src/multiplex/backend-select.lisp
index 9b02afaa..97dd3abc 100644
--- a/src/multiplex/backend-select.lisp
+++ b/src/multiplex/backend-select.lisp
@@ -3,7 +3,7 @@
 ;;; --- select(2) multiplexer implementation.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (defconstant +select-priority+ 3)
 
diff --git a/src/multiplex/detect.lisp b/src/multiplex/detect.lisp
index bdcc8f87..23df889b 100644
--- a/src/multiplex/detect.lisp
+++ b/src/multiplex/detect.lisp
@@ -3,7 +3,7 @@
 ;;; --- Detect available multiplexers.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 ;;; TODO: do real detecting here
 (setf *default-multiplexer*
diff --git a/src/multiplex/event-loop.lisp b/src/multiplex/event-loop.lisp
index d42c8a72..d7c3ba2f 100644
--- a/src/multiplex/event-loop.lisp
+++ b/src/multiplex/event-loop.lisp
@@ -3,7 +3,7 @@
 ;;; --- Main event loop.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 
 ;;;-------------------------------------------------------------------------
diff --git a/src/multiplex/fd-entry.lisp b/src/multiplex/fd-entry.lisp
index 446c551c..dec57ce1 100644
--- a/src/multiplex/fd-entry.lisp
+++ b/src/multiplex/fd-entry.lisp
@@ -3,7 +3,7 @@
 ;;; fd-entry.lisp --- FD event structure.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 ;;;; EVENT
 
diff --git a/src/multiplex/fd-wait.lisp b/src/multiplex/fd-wait.lisp
index de086c32..ba7b778f 100644
--- a/src/multiplex/fd-wait.lisp
+++ b/src/multiplex/fd-wait.lisp
@@ -3,7 +3,7 @@
 ;;; --- Wait for events on single FDs.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (define-condition poll-error (error)
   ((fd :initarg :fd :reader poll-error-fd)
diff --git a/src/multiplex/multiplexer.lisp b/src/multiplex/multiplexer.lisp
index 1b0339d3..0b1d0d6d 100644
--- a/src/multiplex/multiplexer.lisp
+++ b/src/multiplex/multiplexer.lisp
@@ -3,7 +3,7 @@
 ;;; --- Base class for multiplexers.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (defvar *available-multiplexers* nil
   "An alist of (PRIORITY . MULTIPLEXER). Smaller values mean higher priority.")
diff --git a/src/multiplex/pkgdcl.lisp b/src/multiplex/pkgdcl.lisp
index 5d422014..1b5f714c 100644
--- a/src/multiplex/pkgdcl.lisp
+++ b/src/multiplex/pkgdcl.lisp
@@ -3,11 +3,11 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.multiplex
-  (:nicknames :iomux :iolib/multiplex)
-  (:use :iolib.base :cffi)
+(defpackage :iolib/multiplex
+  (:nicknames :iomux :iolib.multiplex)
+  (:use :iolib/base :cffi)
   (:export
    ;; Classes and Types
    #:timer
diff --git a/src/multiplex/queue.lisp b/src/multiplex/queue.lisp
index 678febc1..9ef48039 100644
--- a/src/multiplex/queue.lisp
+++ b/src/multiplex/queue.lisp
@@ -23,7 +23,7 @@
 ;;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 ;;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 
 ;;;
diff --git a/src/multiplex/scheduler.lisp b/src/multiplex/scheduler.lisp
index af32fff6..cd59b306 100644
--- a/src/multiplex/scheduler.lisp
+++ b/src/multiplex/scheduler.lisp
@@ -23,7 +23,7 @@
 ;;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 ;;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 ;;;
 ;;; Public interface
diff --git a/src/multiplex/timers.lisp b/src/multiplex/timers.lisp
index aa73624b..b744c1f5 100644
--- a/src/multiplex/timers.lisp
+++ b/src/multiplex/timers.lisp
@@ -23,7 +23,7 @@
 ;;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 ;;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 ;;;
 ;;; Timer
diff --git a/src/multiplex/utils.lisp b/src/multiplex/utils.lisp
index 059d43dc..39b73db4 100644
--- a/src/multiplex/utils.lisp
+++ b/src/multiplex/utils.lisp
@@ -3,7 +3,7 @@
 ;;; --- Miscellaneous utilities.
 ;;;
 
-(in-package :iolib.multiplex)
+(in-package :iolib/multiplex)
 
 (defun timeout->timeval (timeout tv)
   (with-foreign-slots ((isys:sec isys:usec) tv isys:timeval)
diff --git a/src/new-cl/conduits.lisp b/src/new-cl/conduits.lisp
index e2b8c0f6..ea24465c 100644
--- a/src/new-cl/conduits.lisp
+++ b/src/new-cl/conduits.lisp
@@ -25,7 +25,7 @@
 ;;; !!! TODO: more of the package operators probably need to be shadowed
 ;;;           Errors should be signalled as subtypes of PACKAGE-ERROR
 
-(cl:defpackage :iolib.internal.conduits
+(defpackage :iolib/internal/conduits
   (:use :common-lisp)
   #+sb-package-locks
   (:lock t)
@@ -35,7 +35,7 @@
   ;; non-CL thing
   (:export #:recompute-conduits))
 
-(in-package :iolib.internal.conduits)
+(in-package :iolib/internal/conduits)
 
 ;;;; Hack to make the HP stuff `work' even when they are not loaded.
 ;;;
diff --git a/src/new-cl/definitions.lisp b/src/new-cl/definitions.lisp
index ef785229..242c8ea2 100644
--- a/src/new-cl/definitions.lisp
+++ b/src/new-cl/definitions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Various definers
 ;;;
 
-(in-package :iolib.common-lisp)
+(in-package :iolib/common-lisp)
 
 (defmacro defconstant (name value &optional documentation
                        &environment env)
diff --git a/src/new-cl/gray-streams.lisp b/src/new-cl/gray-streams.lisp
index 6bdff81b..f6a62dd8 100644
--- a/src/new-cl/gray-streams.lisp
+++ b/src/new-cl/gray-streams.lisp
@@ -3,7 +3,7 @@
 ;;; --- GRAY stream mixin.
 ;;;
 
-(in-package :iolib.common-lisp)
+(in-package :iolib/common-lisp)
 
 (defclass trivial-gray-stream-mixin ()
   ((%open :initform t)))
diff --git a/src/new-cl/pkgdcl.lisp b/src/new-cl/pkgdcl.lisp
index 7bc9d53a..6ca920bc 100644
--- a/src/new-cl/pkgdcl.lisp
+++ b/src/new-cl/pkgdcl.lisp
@@ -1,6 +1,6 @@
 ;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
 
-(in-package :iolib.internal.conduits)
+(in-package :iolib/internal/conduits)
 
 (macrolet
     ((define-gray-streams-package ()
@@ -28,15 +28,15 @@
                 #:stream-fresh-line #:stream-finish-output #:stream-force-output
                 #:stream-clear-output #:stream-advance-to-column
                 #:stream-read-byte #:stream-write-byte)))
-         `(defpackage :iolib.common-lisp
-            (:nicknames :iolib.cl :iolib/common-lisp)
+         `(defpackage :iolib/common-lisp
+            (:nicknames :iolib.cl :iolib.common-lisp)
             (:extend/excluding :common-lisp
                                #:export #:unexport #:defpackage 
                                #:delete-package #:rename-package
                                #:defconstant
                                #:boolean)
             (:export #:defconstant #:boolean)
-            (:extend/excluding :iolib.internal.conduits
+            (:extend/excluding :iolib/internal/conduits
                                #:recompute-conduits)
             (:import-from ,#1# ,@#2#)
             (:export #:trivial-gray-stream-mixin
@@ -46,6 +46,6 @@
                      ,@#2#)))))
   (define-gray-streams-package))
 
-(defpackage :iolib.common-lisp-user
-  (:nicknames :iolib.cl-user :iolib/common-lisp-user :iolib/cl-user)
-  (:use :iolib.common-lisp))
+(defpackage :iolib/common-lisp-user
+  (:nicknames :iolib/cl-user :iolib/common-lisp-user :iolib.cl-user)
+  (:use :iolib/common-lisp))
diff --git a/src/new-cl/types.lisp b/src/new-cl/types.lisp
index 988ce9c7..e6c12f7a 100644
--- a/src/new-cl/types.lisp
+++ b/src/new-cl/types.lisp
@@ -3,7 +3,7 @@
 ;;; --- Type definitions and constructors
 ;;;
 
-(in-package :iolib.common-lisp)
+(in-package :iolib/common-lisp)
 
 (deftype boolean ()
   'cl:boolean)
diff --git a/src/os/create-process-unix.lisp b/src/os/create-process-unix.lisp
index d1313731..3c716ec5 100644
--- a/src/os/create-process-unix.lisp
+++ b/src/os/create-process-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- Wrapper over lfp_spawn(3)
 ;;;
 
-(in-package :iolib.os)
+(in-package :iolib/os)
 
 (defun tty-read-fn (fd buf nbytes)
   (handler-case
@@ -18,7 +18,7 @@
              :handle fd
              :syscall "write"))))
 
-(defclass tty-stream (iolib.streams:dual-channel-gray-stream)
+(defclass tty-stream (iolib/streams:dual-channel-gray-stream)
   ()
   (:default-initargs :read-fn  #'tty-read-fn
                      :write-fn #'tty-write-fn))
@@ -170,8 +170,8 @@
        (dup-from-path "/dev/null"))
       (unsigned-byte
        (dup-from-fd stream))
-      (iolib.streams:dual-channel-fd-mixin
-       (dup-from-fd (iolib.streams:fd-of stream)))
+      (iolib/streams:dual-channel-fd-mixin
+       (dup-from-fd (iolib/streams:fd-of stream)))
       (null
        (lfp-spawn-file-actions-addclose file-actions fd)))))
 
diff --git a/src/os/ffi-functions-unix.lisp b/src/os/ffi-functions-unix.lisp
index d2c19db5..059feccb 100644
--- a/src/os/ffi-functions-unix.lisp
+++ b/src/os/ffi-functions-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- lfp_spawn(3) and its minions
 ;;;
 
-(in-package :iolib.os)
+(in-package :iolib/os)
 
 (defsyscall (lfp-spawn "lfp_spawn")
     (:int :restart t)
diff --git a/src/os/ffi-types-unix.lisp b/src/os/ffi-types-unix.lisp
index ad78abbc..afd01e2f 100644
--- a/src/os/ffi-types-unix.lisp
+++ b/src/os/ffi-types-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- Foreign types related to lfp_spawn(3)
 ;;;
 
-(in-package :iolib.os)
+(in-package :iolib/os)
 
 (include "lfp.h")
 
diff --git a/src/os/os-unix.lisp b/src/os/os-unix.lisp
index 912cacb0..d1dd1335 100644
--- a/src/os/os-unix.lisp
+++ b/src/os/os-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- OS interface.
 ;;;
 
-(in-package :iolib.os)
+(in-package :iolib/os)
 
 ;;;; Environment access
 
diff --git a/src/os/pkgdcl.lisp b/src/os/pkgdcl.lisp
index e95239aa..e6df440c 100644
--- a/src/os/pkgdcl.lisp
+++ b/src/os/pkgdcl.lisp
@@ -3,16 +3,16 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.os
-  (:nicknames :iolib/os)
-  (:use :iolib.base :iolib.pathnames :cffi)
-  (:import-from :iolib.syscalls
+(defpackage :iolib/os
+  (:nicknames :iolib.os)
+  (:use :iolib/base :iolib/pathnames :cffi)
+  (:import-from :iolib/syscalls
                 #:defsyscall #:sstring
                 #:mode-t #:pid-t #:uid-t #:gid-t
                 #:get-monotonic-time)
-  (:import-from :iolib.pathnames #:split-root/nodes)
+  (:import-from :iolib/pathnames #:split-root/nodes)
   (:export
 
    ;; Evironment
diff --git a/src/pathnames/file-path-unix.lisp b/src/pathnames/file-path-unix.lisp
index 717e0218..82e2c94d 100644
--- a/src/pathnames/file-path-unix.lisp
+++ b/src/pathnames/file-path-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- New pathnames.
 ;;;
 
-(in-package :iolib.pathnames)
+(in-package :iolib/pathnames)
 
 ;;;-------------------------------------------------------------------------
 ;;; Classes and Types
diff --git a/src/pathnames/file-path.lisp b/src/pathnames/file-path.lisp
index cde58986..ca83362b 100644
--- a/src/pathnames/file-path.lisp
+++ b/src/pathnames/file-path.lisp
@@ -3,7 +3,7 @@
 ;;; --- New pathnames.
 ;;;
 
-(in-package :iolib.pathnames)
+(in-package :iolib/pathnames)
 
 ;;;-------------------------------------------------------------------------
 ;;; Classes and Types
diff --git a/src/pathnames/pkgdcl.lisp b/src/pathnames/pkgdcl.lisp
index 32ae007f..bc81149d 100644
--- a/src/pathnames/pkgdcl.lisp
+++ b/src/pathnames/pkgdcl.lisp
@@ -3,11 +3,11 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.pathnames
-  (:nicknames :ipath :iolib/pathnames)
-  (:use :iolib.base)
+(defpackage :iolib/pathnames
+  (:nicknames :ipath :iolib.pathnames)
+  (:use :iolib/base)
   (:export
    ;; Classes and types
    #:file-path #:file-path-designator
diff --git a/src/sockets/address-arithmetic.lisp b/src/sockets/address-arithmetic.lisp
index dc02e05c..53ebef52 100644
--- a/src/sockets/address-arithmetic.lisp
+++ b/src/sockets/address-arithmetic.lisp
@@ -3,7 +3,7 @@
 ;;; --- Arithmetic with addresses and network masks.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defun make-netmask (&key cidr class)
   "Create a subnet mask by specifying either its class(:A, :B or :C) or
diff --git a/src/sockets/address-predicates.lisp b/src/sockets/address-predicates.lisp
index b6b61082..69d69c8f 100644
--- a/src/sockets/address-predicates.lisp
+++ b/src/sockets/address-predicates.lisp
@@ -3,7 +3,7 @@
 ;;; --- Predicate functions for addresses.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 ;;;; Well-known addresses
 
diff --git a/src/sockets/address.lisp b/src/sockets/address.lisp
index 90b4a578..19b8f466 100644
--- a/src/sockets/address.lisp
+++ b/src/sockets/address.lisp
@@ -3,7 +3,7 @@
 ;;; --- IP address classes and main methods.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 ;;;; Class Definitions
 
diff --git a/src/sockets/base-sockets.lisp b/src/sockets/base-sockets.lisp
index c9fe54f5..b9cf2c3a 100644
--- a/src/sockets/base-sockets.lisp
+++ b/src/sockets/base-sockets.lisp
@@ -3,7 +3,7 @@
 ;;; --- Base socket classes.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 ;;;; Sockets
 
diff --git a/src/sockets/bsd.lisp b/src/sockets/bsd.lisp
index a326cfac..0443ae08 100644
--- a/src/sockets/bsd.lisp
+++ b/src/sockets/bsd.lisp
@@ -3,7 +3,7 @@
 ;;; --- Bindings for BSD sockets.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defmacro define-socket-creation-call (name return-type &body args)
   `(defsyscall ,name
diff --git a/src/sockets/common.lisp b/src/sockets/common.lisp
index aeb3ce5c..c29236df 100644
--- a/src/sockets/common.lisp
+++ b/src/sockets/common.lisp
@@ -3,7 +3,7 @@
 ;;; --- Various helpers for bsd-sockets.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 ;;;; Types
 
diff --git a/src/sockets/conditions.lisp b/src/sockets/conditions.lisp
index 129b8f0b..2c98efea 100644
--- a/src/sockets/conditions.lisp
+++ b/src/sockets/conditions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Socket conditions.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defgeneric error-code (err)
   (:method ((err isys:syscall-error))
@@ -23,7 +23,7 @@
 
 (defmethod print-object ((socket-error socket-error) stream)
   (print-unreadable-object (socket-error stream :type t :identity nil)
-    (let ((code (iolib.syscalls:code-of socket-error)))
+    (let ((code (iolib/syscalls:code-of socket-error)))
       (format stream "~S ~S ~S~@[, FD: ~S~]"
               (or code "[Unknown code]")
               (error-identifier socket-error)
diff --git a/src/sockets/config.lisp b/src/sockets/config.lisp
index 7b90898b..073933fd 100644
--- a/src/sockets/config.lisp
+++ b/src/sockets/config.lisp
@@ -3,7 +3,7 @@
 ;;; --- Special variable definitions.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defvar *ipv6* nil
   "Specifies the default behaviour with respect to IPv6:
diff --git a/src/sockets/dns/common.lisp b/src/sockets/dns/common.lisp
index 298f9fba..d6ec8362 100644
--- a/src/sockets/dns/common.lisp
+++ b/src/sockets/dns/common.lisp
@@ -3,7 +3,7 @@
 ;;; --- DNS client constants.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defconstant +dns-max-datagram-size+ 4096)
 
diff --git a/src/sockets/dns/conditions.lisp b/src/sockets/dns/conditions.lisp
index 9d3b6214..b9dcc3b0 100644
--- a/src/sockets/dns/conditions.lisp
+++ b/src/sockets/dns/conditions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Resolver conditions.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (define-condition resolver-error (isys:iolib-error)
   ((datum :initarg :data :reader resolver-error-datum))
diff --git a/src/sockets/dns/lookup.lisp b/src/sockets/dns/lookup.lisp
index 052e11b0..c46ae2cb 100644
--- a/src/sockets/dns/lookup.lisp
+++ b/src/sockets/dns/lookup.lisp
@@ -3,7 +3,7 @@
 ;;; --- High-level name lookup.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defconstant +max-ipv4-value+ (1- (expt 2 32))
   "Integer denoting 255.255.255.255")
diff --git a/src/sockets/dns/message.lisp b/src/sockets/dns/message.lisp
index 7f5dc9fb..43b58a34 100644
--- a/src/sockets/dns/message.lisp
+++ b/src/sockets/dns/message.lisp
@@ -3,7 +3,7 @@
 ;;; --- DNS message creation.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defclass dns-message ()
   ((id    :initform 0 :initarg :id    :accessor dns-message-id)
diff --git a/src/sockets/dns/nameservers.lisp b/src/sockets/dns/nameservers.lisp
index a0b0b9ec..4a6d8b6b 100644
--- a/src/sockets/dns/nameservers.lisp
+++ b/src/sockets/dns/nameservers.lisp
@@ -3,7 +3,7 @@
 ;;; --- Nameservers management.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defvar *resolv.conf-file* "/etc/resolv.conf")
 
diff --git a/src/sockets/dns/query.lisp b/src/sockets/dns/query.lisp
index fb9f19bc..37570f0f 100644
--- a/src/sockets/dns/query.lisp
+++ b/src/sockets/dns/query.lisp
@@ -3,7 +3,7 @@
 ;;; --- Make DNS queries.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defvar *dns-recursion-desired* t
   "Whether the \"RECURSION-DESIRED\" field should be set ot not.")
diff --git a/src/sockets/grovel.lisp b/src/sockets/grovel.lisp
index 6a47a166..5c65bba4 100644
--- a/src/sockets/grovel.lisp
+++ b/src/sockets/grovel.lisp
@@ -36,7 +36,7 @@
          #+linux "linux/netlink.h"
          "arpa/inet.h")
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (constantenum socket-error-values
   (:eprotonosupport "EPROTONOSUPPORT")
diff --git a/src/sockets/iface.lisp b/src/sockets/iface.lisp
index a7de5397..eaec2079 100644
--- a/src/sockets/iface.lisp
+++ b/src/sockets/iface.lisp
@@ -3,7 +3,7 @@
 ;;; --- Network interface lookup.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defun make-interface (name index)
   "Constructor for INTERFACE objects."
diff --git a/src/sockets/make-socket.lisp b/src/sockets/make-socket.lisp
index d526705b..4869e1c4 100644
--- a/src/sockets/make-socket.lisp
+++ b/src/sockets/make-socket.lisp
@@ -3,7 +3,7 @@
 ;;; --- Socket creation.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter *socket-type-map*
@@ -65,8 +65,8 @@ call CLOSE with :ABORT T on `VAR'."
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun make-first-level-name (family type connect)
     (if (eql :stream type)
-        (format-symbol :iolib.sockets "%~A/~A-~A-~A" :make-socket family type connect)
-        (format-symbol :iolib.sockets "%~A/~A-~A" :make-socket family type))))
+        (format-symbol :iolib/sockets "%~A/~A-~A-~A" :make-socket family type connect)
+        (format-symbol :iolib/sockets "%~A/~A-~A" :make-socket family type))))
 
 (defmacro define-socket-creator ((socket-family socket-type &optional socket-connect)
                                  (family protocol key &rest parameters) &body body)
diff --git a/src/sockets/namedb/etc-files.lisp b/src/sockets/namedb/etc-files.lisp
index 2286cd18..3f8faa72 100644
--- a/src/sockets/namedb/etc-files.lisp
+++ b/src/sockets/namedb/etc-files.lisp
@@ -3,7 +3,7 @@
 ;;; etc-files.lisp --- Common parsing routines for /etc namedb files.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defun space-char-p (char)
   (declare (type character char))
diff --git a/src/sockets/namedb/file-monitor.lisp b/src/sockets/namedb/file-monitor.lisp
index 42cb9960..8ed4ac9c 100644
--- a/src/sockets/namedb/file-monitor.lisp
+++ b/src/sockets/namedb/file-monitor.lisp
@@ -3,7 +3,7 @@
 ;;; file-monitor.lisp --- Monitor files on disk.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defclass file-monitor ()
   ((file :initform (error "Must supply a file name")
diff --git a/src/sockets/namedb/hosts.lisp b/src/sockets/namedb/hosts.lisp
index c2fd178c..fccb8d55 100644
--- a/src/sockets/namedb/hosts.lisp
+++ b/src/sockets/namedb/hosts.lisp
@@ -3,7 +3,7 @@
 ;;; hosts.lisp --- Static host lookup.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defvar *hosts-file* "/etc/hosts")
 
diff --git a/src/sockets/namedb/protocols.lisp b/src/sockets/namedb/protocols.lisp
index 283aae77..5615c9cb 100644
--- a/src/sockets/namedb/protocols.lisp
+++ b/src/sockets/namedb/protocols.lisp
@@ -3,7 +3,7 @@
 ;;; protocols.lisp --- Protocol lookup.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defvar *protocols-file* "/etc/protocols")
 
diff --git a/src/sockets/namedb/services.lisp b/src/sockets/namedb/services.lisp
index 97d06b7d..44c22262 100644
--- a/src/sockets/namedb/services.lisp
+++ b/src/sockets/namedb/services.lisp
@@ -3,7 +3,7 @@
 ;;; services.lisp --- Service lookup.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 (defvar *services-file* "/etc/services")
 
diff --git a/src/sockets/pkgdcl.lisp b/src/sockets/pkgdcl.lisp
index 2bad9453..1eb5876e 100644
--- a/src/sockets/pkgdcl.lisp
+++ b/src/sockets/pkgdcl.lisp
@@ -3,18 +3,18 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.sockets
-  (:nicknames :sockets :iolib/sockets)
-  (:use :iolib.base :iolib.streams :cffi)
-  (:import-from #:swap-bytes
+(defpackage :iolib/sockets
+  (:nicknames :sockets :iolib.sockets)
+  (:use :iolib/base :iolib/streams :cffi)
+  (:import-from :swap-bytes
                 #:htons #:ntohs #:htonl #:ntohl)
-  (:import-from #:iolib.syscalls
+  (:import-from :iolib/syscalls
                 #:defsyscall
                 #:size-t #:ssize-t #:pid-t #:uid-t #:gid-t
                 #:timeval #:sec #:usec)
-  (:import-from #:iolib.multiplex
+  (:import-from :iolib/multiplex
                 #:decode-timeout)
   (:export
    ;; Conditions
diff --git a/src/sockets/socket-methods.lisp b/src/sockets/socket-methods.lisp
index 8096c613..9f66497b 100644
--- a/src/sockets/socket-methods.lisp
+++ b/src/sockets/socket-methods.lisp
@@ -3,7 +3,7 @@
 ;;; --- Various socket methods.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 ;;;-------------------------------------------------------------------------
 ;;; Shared Initialization
diff --git a/src/sockets/socket-options.lisp b/src/sockets/socket-options.lisp
index 7927848e..cb47a4c4 100644
--- a/src/sockets/socket-options.lisp
+++ b/src/sockets/socket-options.lisp
@@ -3,7 +3,7 @@
 ;;; --- Setter and getters for various socket options.
 ;;;
 
-(in-package :iolib.sockets)
+(in-package :iolib/sockets)
 
 ;;;; Macrology
 
diff --git a/src/sockets/trivial-sockets.lisp b/src/sockets/trivial-sockets.lisp
index 25a1b5cb..0243a9f1 100644
--- a/src/sockets/trivial-sockets.lisp
+++ b/src/sockets/trivial-sockets.lisp
@@ -3,18 +3,18 @@
 ;;; --- Main socket methods.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.trivial-sockets
-  (:nicknames :iolib/trivial-sockets)
-  (:use :iolib.base :iolib.sockets)
+(defpackage :iolib/trivial-sockets
+  (:nicknames :iolib.trivial-sockets)
+  (:use :iolib/base :iolib/sockets)
   (:shadow #:socket-error #:accept-connection)
   (:export #:open-stream #:socket-error #:socket-nested-error
            #:unsupported #:unsupported-feature
            #:open-server #:close-server #:accept-connection
            #:with-server))
 
-(in-package :iolib.trivial-sockets)
+(in-package :iolib/trivial-sockets)
 
 ;;;;
 ;;;; ERRORS
diff --git a/src/streams/gray/buffer.lisp b/src/streams/gray/buffer.lisp
index c447075c..b0d4e6e0 100644
--- a/src/streams/gray/buffer.lisp
+++ b/src/streams/gray/buffer.lisp
@@ -3,7 +3,7 @@
 ;;; --- Foreign memory buffers.
 ;;;
 
-(in-package :iolib.streams)
+(in-package :iolib/streams)
 
 ;;;; Foreign Buffers
 
diff --git a/src/streams/gray/classes.lisp b/src/streams/gray/classes.lisp
index 2a84b549..68b7fab4 100644
--- a/src/streams/gray/classes.lisp
+++ b/src/streams/gray/classes.lisp
@@ -3,7 +3,7 @@
 ;;; --- fd-streams classes.
 ;;;
 
-(in-package :iolib.streams)
+(in-package :iolib/streams)
 
 ;;;; Stream Buffers
 
diff --git a/src/streams/gray/conditions.lisp b/src/streams/gray/conditions.lisp
index e806a045..7d1c8220 100644
--- a/src/streams/gray/conditions.lisp
+++ b/src/streams/gray/conditions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Gray stream conditions.
 ;;;
 
-(in-package :iolib.streams)
+(in-package :iolib/streams)
 
 (define-condition hangup (stream-error)
   ()
diff --git a/src/streams/gray/fd-mixin.lisp b/src/streams/gray/fd-mixin.lisp
index 52d35e82..67bafbff 100644
--- a/src/streams/gray/fd-mixin.lisp
+++ b/src/streams/gray/fd-mixin.lisp
@@ -3,7 +3,7 @@
 ;;; --- FD mixin definitions
 ;;;
 
-(in-package :iolib.streams)
+(in-package :iolib/streams)
 
 (defmethod shared-initialize :around ((stream dual-channel-fd-mixin) slot-names &key)
   (declare (ignore slot-names))
diff --git a/src/streams/gray/gray-stream-methods.lisp b/src/streams/gray/gray-stream-methods.lisp
index c211cd12..d147f844 100644
--- a/src/streams/gray/gray-stream-methods.lisp
+++ b/src/streams/gray/gray-stream-methods.lisp
@@ -3,7 +3,7 @@
 ;;; --- Implementation using Gray streams.
 ;;;
 
-(in-package :iolib.streams)
+(in-package :iolib/streams)
 
 ;;;-------------------------------------------------------------------------
 ;;; Instance Initialization
diff --git a/src/streams/gray/io-helpers.lisp b/src/streams/gray/io-helpers.lisp
index bb576abe..4cf171c6 100644
--- a/src/streams/gray/io-helpers.lisp
+++ b/src/streams/gray/io-helpers.lisp
@@ -3,7 +3,7 @@
 ;;; --- Low-level I/O functions.
 ;;;
 
-(in-package :iolib.streams)
+(in-package :iolib/streams)
 
 ;;;-------------------------------------------------------------------------
 ;;; Input
diff --git a/src/streams/gray/pkgdcl.lisp b/src/streams/gray/pkgdcl.lisp
index 33325460..7b941af3 100644
--- a/src/streams/gray/pkgdcl.lisp
+++ b/src/streams/gray/pkgdcl.lisp
@@ -3,11 +3,11 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.streams
-  (:nicknames :iolib/streams)
-  (:use :iolib.base :cffi)
+(defpackage :iolib/streams
+  (:nicknames :iolib.streams)
+  (:use :iolib/base :cffi)
   (:export
    ;; Classes
    #:dual-channel-fd-mixin
diff --git a/src/streams/zeta/conditions.lisp b/src/streams/zeta/conditions.lisp
index bd6cff0e..3d0461e9 100644
--- a/src/streams/zeta/conditions.lisp
+++ b/src/streams/zeta/conditions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Error conditions.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 (define-condition posix-file-error (file-error)
   ((action :initarg :action :reader posix-file-error-action)
diff --git a/src/streams/zeta/device.lisp b/src/streams/zeta/device.lisp
index 52b39e9c..50f9bb43 100644
--- a/src/streams/zeta/device.lisp
+++ b/src/streams/zeta/device.lisp
@@ -3,7 +3,7 @@
 ;;; --- Device common functions.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 ;;;-------------------------------------------------------------------------
 ;;; Classes and Types
diff --git a/src/streams/zeta/ffi-functions-unix.lisp b/src/streams/zeta/ffi-functions-unix.lisp
index f37d83e0..875c66e6 100644
--- a/src/streams/zeta/ffi-functions-unix.lisp
+++ b/src/streams/zeta/ffi-functions-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- *NIX-specific routines.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 ;;;-------------------------------------------------------------------------
 ;;; FD polling
diff --git a/src/streams/zeta/file-unix.lisp b/src/streams/zeta/file-unix.lisp
index 21a61cf9..b1029e69 100644
--- a/src/streams/zeta/file-unix.lisp
+++ b/src/streams/zeta/file-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- File devices.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 ;;;-------------------------------------------------------------------------
 ;;; Classes and Types
diff --git a/src/streams/zeta/iobuf.lisp b/src/streams/zeta/iobuf.lisp
index 879ce894..a1f3d6a6 100644
--- a/src/streams/zeta/iobuf.lisp
+++ b/src/streams/zeta/iobuf.lisp
@@ -3,7 +3,7 @@
 ;;; --- I/O buffers.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 (eval-when (:compile-toplevel)
   (declaim (optimize speed)))
diff --git a/src/streams/zeta/pkgdcl.lisp b/src/streams/zeta/pkgdcl.lisp
index 99d3bd1b..206cab65 100644
--- a/src/streams/zeta/pkgdcl.lisp
+++ b/src/streams/zeta/pkgdcl.lisp
@@ -3,9 +3,9 @@
 ;;; --- Package definition.
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.zstreams
-  (:use :iolib.base :iolib.pathnames :cffi)
+(defpackage :iolib/zstreams
+  (:use :iolib/base :iolib/pathnames :cffi)
   (:export
    ))
diff --git a/src/streams/zeta/stream.lisp b/src/streams/zeta/stream.lisp
index b1163cb8..e04eff28 100644
--- a/src/streams/zeta/stream.lisp
+++ b/src/streams/zeta/stream.lisp
@@ -3,7 +3,7 @@
 ;;; --- Zeta Streams.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 ;;;-------------------------------------------------------------------------
 ;;; Classes and Types
diff --git a/src/streams/zeta/types.lisp b/src/streams/zeta/types.lisp
index 4765f092..90eec17e 100644
--- a/src/streams/zeta/types.lisp
+++ b/src/streams/zeta/types.lisp
@@ -3,7 +3,7 @@
 ;;; --- Various types.
 ;;;
 
-(in-package :iolib.zstreams)
+(in-package :iolib/zstreams)
 
 (deftype octet () '(unsigned-byte  8))
 (deftype ub8   () '(unsigned-byte  8))
diff --git a/src/syscalls/conditions.lisp b/src/syscalls/conditions.lisp
index 64677f97..0dd095b7 100644
--- a/src/syscalls/conditions.lisp
+++ b/src/syscalls/conditions.lisp
@@ -3,7 +3,7 @@
 ;;; --- Syscall error conditions.
 ;;;
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 ;;;-------------------------------------------------------------------------
 ;;; System Errors
diff --git a/src/syscalls/designators.lisp b/src/syscalls/designators.lisp
index 997c7750..4cfccd2a 100644
--- a/src/syscalls/designators.lisp
+++ b/src/syscalls/designators.lisp
@@ -3,7 +3,7 @@
 ;;; --- CFFI type designators.
 ;;;
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 ;;;-------------------------------------------------------------------------
 ;;; CFFI Type Designators
diff --git a/src/syscalls/early.lisp b/src/syscalls/early.lisp
index a6884687..695e2b64 100644
--- a/src/syscalls/early.lisp
+++ b/src/syscalls/early.lisp
@@ -3,7 +3,7 @@
 ;;; --- Early FFI definitions.
 ;;;
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 ;;;-------------------------------------------------------------------------
 ;;; Syscall return wrapper
diff --git a/src/syscalls/ffi-functions-unix.lisp b/src/syscalls/ffi-functions-unix.lisp
index fd923cb1..fc4cde82 100644
--- a/src/syscalls/ffi-functions-unix.lisp
+++ b/src/syscalls/ffi-functions-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- *UNIX foreign function definitions.
 ;;;
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 (eval-when (:compile-toplevel)
   (declaim (optimize (speed 3) (safety 1) (debug 1))))
@@ -963,7 +963,7 @@ as indicated by WHICH and WHO to VALUE."
   "Return a pointer to the current process environment.")
 
 (defmacro %obsolete-*environ* ()
-  (iolib.base::signal-obsolete '*environ* "use function OS-ENVIRON instead"
+  (iolib/base::signal-obsolete '*environ* "use function OS-ENVIRON instead"
                                "symbol macro" :WARN)
   `(os-environ))
 
diff --git a/src/syscalls/ffi-types-unix.lisp b/src/syscalls/ffi-types-unix.lisp
index 9e9c708f..bd858177 100644
--- a/src/syscalls/ffi-types-unix.lisp
+++ b/src/syscalls/ffi-types-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- Foreign type definitions for *NIX systems.
 ;;;
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 ;;; FIXME: Find a way to use pkg-config to get these flags
 ;;;        instead of hard-coding them
diff --git a/src/syscalls/os-conditions-unix.lisp b/src/syscalls/os-conditions-unix.lisp
index b94c9db1..8cb4f58d 100644
--- a/src/syscalls/os-conditions-unix.lisp
+++ b/src/syscalls/os-conditions-unix.lisp
@@ -3,7 +3,7 @@
 ;;; --- *NIX syscall error conditions.
 ;;;
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 ;;;-------------------------------------------------------------------------
 ;;; POSIX Syscall Errors
diff --git a/src/syscalls/pkgdcl.lisp b/src/syscalls/pkgdcl.lisp
index 0d7de682..4da8a039 100644
--- a/src/syscalls/pkgdcl.lisp
+++ b/src/syscalls/pkgdcl.lisp
@@ -3,11 +3,11 @@
 ;;; --- Package definition
 ;;;
 
-(in-package :common-lisp-user)
+(in-package :iolib/common-lisp-user)
 
-(defpackage :iolib.syscalls
-  (:nicknames :isys :iolib/syscalls)
-  (:use :iolib.base :cffi)
+(defpackage :iolib/syscalls
+  (:nicknames :isys :iolib.syscalls)
+  (:use :iolib/base :cffi)
   (:shadow #:open #:close #:read #:write #:listen
            #:truncate #:ftruncate #:time)
   ;; Specials
diff --git a/src/syscalls/unix-syscall-path-strings.lisp b/src/syscalls/unix-syscall-path-strings.lisp
index 2368c96f..999f64ba 100644
--- a/src/syscalls/unix-syscall-path-strings.lisp
+++ b/src/syscalls/unix-syscall-path-strings.lisp
@@ -6,7 +6,7 @@
 ;;; TODO: add 8bit-chars versions of SSTRING-TO-CSTRING,
 ;;;       COUNT-SSTRING-OCTETS and CSTRING-TO-SSTRING
 
-(in-package :iolib.syscalls)
+(in-package :iolib/syscalls)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (pushnew (cond