diff --git a/development/makedoc b/development/makedoc
index 0f52b06..529f536 100755
--- a/development/makedoc
+++ b/development/makedoc
@@ -17,6 +17,7 @@
 : ${subrdir:=${TOPLEVELDIR}/subr}
 : ${makedocdir:=${TOPLEVELDIR}/obj/makedoc}
 : ${makedocsystem:="org.melusina.webmachine"}
+: ${makedocpackage:=${makedocsystem#'org.melusina.'}}
 
 . "${subrdir}/stdlib.sh"
 
@@ -44,7 +45,7 @@ makedoc_extract()
 	--eval '(with-compilation-unit () (load "libexec/lisp/docstrings.lisp"))' \
 	--eval "(sb-texinfo:generate-includes
  \"obj/makedoc/include/\"
- (list :${makedocsystem}) :base-package :${makedocsystem})" \
+ (list :${makedocpackage}) :base-package :${makedocpackage})" \
 	--eval '(quit)'
 }
 
diff --git a/development/testsuite b/development/testsuite
index c983663..9e851c5 100755
--- a/development/testsuite
+++ b/development/testsuite
@@ -15,6 +15,7 @@
 
 : ${TOPLEVELDIR:=$(git rev-parse --show-toplevel)}
 : ${testsuitesystem:="org.melusina.webmachine/testsuite"}
+: ${testsuitepackage:=${testsuitesystem#'org.melusina.'}}
 : ${testsuiteclean:='no'}
 : ${testsuitelisp:='sbcl'}
 
@@ -37,7 +38,7 @@ testsuite_run()
     fi
     testsuite_lisp\
 	--eval "(ql:quickload \"${testsuitesystem}\" :silent t)"\
-	--eval "(${testsuitesystem}:$1)"\
+	--eval "(${testsuitepackage}:$1)"\
 	--eval '(org.melusina.confidence:quit)'
 }
 
diff --git a/example/domain/user.lisp b/example/domain/user.lisp
index e34c6b5..38380d1 100644
--- a/example/domain/user.lisp
+++ b/example/domain/user.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defclass user ()
   ((id
diff --git a/example/entrypoint.lisp b/example/entrypoint.lisp
index 79762f6..818d7f5 100644
--- a/example/entrypoint.lisp
+++ b/example/entrypoint.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun create-users ()
   (dolist (user-spec 
diff --git a/example/html.lisp b/example/html.lisp
index a87a1df..e39bf06 100644
--- a/example/html.lisp
+++ b/example/html.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 
 ;;;;
diff --git a/example/javascript.lisp b/example/javascript.lisp
index 003014b..f1e682e 100644
--- a/example/javascript.lisp
+++ b/example/javascript.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun utilities-javascript ()
   (who:with-html-output (*standard-output*)
diff --git a/example/package.lisp b/example/package.lisp
index 638fbb7..ff26edb 100644
--- a/example/package.lisp
+++ b/example/package.lisp
@@ -11,16 +11,15 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine/example
+(defpackage #:webmachine/example
   (:use #:common-lisp #:parenscript)
   (:local-nicknames
    (#:who #:cl-who)
    (#:css #:cl-css)
-   (#:webmachine #:org.melusina.webmachine)
-   (#:asset #:org.melusina.webmachine/asset)
-   (#:server #:org.melusina.webmachine/server))
+   (#:asset #:webmachine/asset)
+   (#:server #:webmachine/server))
   (:import-from
-   #:org.melusina.webmachine
+   #:webmachine
    #:define-constant-resource)
   (:export
    #:functional-state-javascript
@@ -29,6 +28,6 @@
    #:create-users
    #:toplevel))
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 ;;;; End of file `package.lisp'
diff --git a/example/signature.lisp b/example/signature.lisp
index 8c04cee..4df3ecc 100644
--- a/example/signature.lisp
+++ b/example/signature.lisp
@@ -11,10 +11,9 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine/signature
+(defpackage #:webmachine/signature
   (:use #:cl #:parenscript)
   (:local-nicknames
-   (#:webmachine #:org.melusina.webmachine)
    (#:who #:cl-who))
   (:export
    #:verify-hmac-authorization-trait
@@ -24,7 +23,7 @@
    #:signature-javascript
    #:testsuite-signature-javascript))
 
-(in-package #:org.melusina.webmachine/signature)
+(in-package #:webmachine/signature)
 
 (defparameter *signature-algorithm*
   '(:external-format :utf-8
@@ -829,19 +828,19 @@ This must be implemented by resources using `HMAC-AUHTORIZATION'."))
 			#'find-key))))
 
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 
 ;;;;
 ;;;; Example 
 ;;;;
 
-(defclass private-constant-resource (org.melusina.webmachine/signature:verify-hmac-authorization-trait webmachine:constant-resource)
+(defclass private-constant-resource (webmachine/signature:verify-hmac-authorization-trait webmachine:constant-resource)
   ((signature-key-repository
     :initarg :signature-key-repository
     :initform nil)))
 
-(defmethod org.melusina.webmachine/signature:find-signature-key ((resource private-constant-resource) identity)
+(defmethod webmachine/signature:find-signature-key ((resource private-constant-resource) identity)
   (cdr (assoc identity (slot-value resource 'signature-key-repository) :test #'string=)))
 
 (defun make-example-data ()
@@ -916,8 +915,8 @@ This must be implemented by resources using `HMAC-AUHTORIZATION'."))
     (signature-state-javascript)
     (html-page-title "Signature")
     (demonstrate-signature-button)
-    (org.melusina.webmachine/signature:testsuite-javascript)
-    (org.melusina.webmachine/signature:signature-javascript)
-    (org.melusina.webmachine/signature:testsuite-signature-javascript)))
+    (webmachine/signature:testsuite-javascript)
+    (webmachine/signature:signature-javascript)
+    (webmachine/signature:testsuite-signature-javascript)))
 
 ;;;; End of file `signature.lisp'
diff --git a/example/utilities.lisp b/example/utilities.lisp
index 0a903ce..80f1e5c 100644
--- a/example/utilities.lisp
+++ b/example/utilities.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defmacro join (&body strings)
diff --git a/example/view/about.lisp b/example/view/about.lisp
index c041d8c..dfa14c5 100644
--- a/example/view/about.lisp
+++ b/example/view/about.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun about-paragraph (&key label icon badges paragraph actions)
   "Write an about paragraph."
diff --git a/example/view/features.lisp b/example/view/features.lisp
index 5ae0d86..1257e38 100644
--- a/example/view/features.lisp
+++ b/example/view/features.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun features-paragraph (&key label icon badges paragraph actions)
   "Write an features paragraph."
diff --git a/example/view/health.lisp b/example/view/health.lisp
index d9fa15e..39e4100 100644
--- a/example/view/health.lisp
+++ b/example/view/health.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun health-memory ()
   (html-page-section (:id "memory" :title "Memory")
diff --git a/example/view/home.lisp b/example/view/home.lisp
index a76c626..0f71260 100644
--- a/example/view/home.lisp
+++ b/example/view/home.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (define-constant-resource (view-home :uri "/home" :content-type :text/html)
   (html-page (:title "Home for Webmachine Example"
diff --git a/example/view/login.lisp b/example/view/login.lisp
index 8c449ea..fe04910 100644
--- a/example/view/login.lisp
+++ b/example/view/login.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun login-form ()
   (who:with-html-output (*standard-output*)
diff --git a/example/view/logout.lisp b/example/view/logout.lisp
index 1090743..5b56197 100644
--- a/example/view/logout.lisp
+++ b/example/view/logout.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (hunchentoot:define-easy-handler (logout :uri "/logout") ()
   (when hunchentoot:*session*
diff --git a/example/view/sign-up.lisp b/example/view/sign-up.lisp
index b369be8..2067e45 100644
--- a/example/view/sign-up.lisp
+++ b/example/view/sign-up.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 (defun sign-up-form ()
   (who:with-html-output (*standard-output*)
diff --git a/example/view/user.lisp b/example/view/user.lisp
index 5cb2012..9046658 100644
--- a/example/view/user.lisp
+++ b/example/view/user.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/example)
+(in-package #:webmachine/example)
 
 
 ;;;;
diff --git a/libexec/lisp/development.lisp b/libexec/lisp/development.lisp
index 65475c9..9c1769a 100644
--- a/libexec/lisp/development.lisp
+++ b/libexec/lisp/development.lisp
@@ -11,20 +11,18 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine/development
+(defpackage #:webmachine/development
   (:use #:cl)
   (:local-nicknames
-   (#:atelier #:org.melusina.atelier)
-   (#:webmachine #:org.melusina.webmachine)
-   (#:testsuite #:org.melusina.webmachine/testsuite)
-   (#:server #:org.melusina.webmachine/server)
-   (#:example #:org.melusina.webmachine/example))
+   (#:testsuite #:webmachine/testsuite)
+   (#:server #:webmachine/server)
+   (#:example #:webmachine/example))
   (:export
    #:lint
    #+quicklisp
    #:reload))
 
-(in-package #:org.melusina.webmachine/development)
+(in-package #:webmachine/development)
 
 (defun system-relative-pathname (pathname)
   (flet ((system-source-directory ()
diff --git a/server/entrypoint.lisp b/server/entrypoint.lisp
index 8196744..50d6266 100644
--- a/server/entrypoint.lisp
+++ b/server/entrypoint.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/server)
+(in-package #:webmachine/server)
 
 (defparameter *swank-port* 4005
   "The port of the SWANK listener.")
diff --git a/server/html.lisp b/server/html.lisp
index 5a17192..351cc5c 100644
--- a/server/html.lisp
+++ b/server/html.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/server)
+(in-package #:webmachine/server)
 
 
 ;;;;
diff --git a/server/package.lisp b/server/package.lisp
index a31fe2b..590619a 100644
--- a/server/package.lisp
+++ b/server/package.lisp
@@ -11,12 +11,11 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine/server
+(defpackage #:webmachine/server
   (:use #:common-lisp)
   (:local-nicknames
    (#:who #:cl-who)
-   (#:css #:cl-css)
-   (#:webmachine #:org.melusina.webmachine))
+   (#:css #:cl-css))
   (:export
    
    ;; Server
@@ -31,6 +30,6 @@
    ;; HTML
    #:html-page))
 
-(in-package #:org.melusina.webmachine/server)
+(in-package #:webmachine/server)
 
 ;;;; End of file `package.lisp'
diff --git a/src/acceptor.lisp b/src/acceptor.lisp
index d8a0e12..071e0fe 100644
--- a/src/acceptor.lisp
+++ b/src/acceptor.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 
 ;;;
diff --git a/src/asset.lisp b/src/asset.lisp
index 5646fc0..1f8dc57 100644
--- a/src/asset.lisp
+++ b/src/asset.lisp
@@ -11,22 +11,20 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine/asset
+(defpackage #:webmachine/asset
   (:use #:cl)
-  (:local-nicknames
-   (#:webmachine #:org.melusina.webmachine))
   (:export
    #:make-bootstrap-resource
    #:make-bootstrap-icons-resource
    #:make-mathjax-resource
    #:make-chartjs-resource))
 
-(in-package #:org.melusina.webmachine/asset)
+(in-package #:webmachine/asset)
 
 (defparameter *assetdir*
   #.(merge-pathnames
      #p"asset/"
-     (asdf:system-source-directory (string-downcase (package-name *package*))))
+     (asdf:system-source-directory '#:org.melusina.webmachine))
   "The pathname to the directory holding program assets.")
 
 (defun asset-pathname (pathname)
diff --git a/src/condition.lisp b/src/condition.lisp
index efefb9b..e8bcfcd 100644
--- a/src/condition.lisp
+++ b/src/condition.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defun status-code-short-description (status-code)
   "The short description associated with STATUS-CODE."
diff --git a/src/configuration.lisp b/src/configuration.lisp
index 09cd194..73a5dbb 100644
--- a/src/configuration.lisp
+++ b/src/configuration.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defparameter *catch-errors* t
   "If non-NIL, catch any error and explain them to the client.
diff --git a/src/constant-resource.lisp b/src/constant-resource.lisp
index 60fd064..39704cd 100644
--- a/src/constant-resource.lisp
+++ b/src/constant-resource.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defclass constant-resource (resource)
   ((available-p
diff --git a/src/content.lisp b/src/content.lisp
index 7008794..00548a1 100644
--- a/src/content.lisp
+++ b/src/content.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defun make-content-output-stream (raw-output-stream &key external-format encoding)
   "Make a content output stream writing to the underlying RAW-OUTPUT-STREAM.
diff --git a/src/directory-resource.lisp b/src/directory-resource.lisp
index 9ba5695..07d4d4c 100644
--- a/src/directory-resource.lisp
+++ b/src/directory-resource.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defclass directory-resource (resource)
   ((alias
diff --git a/src/file-resource.lisp b/src/file-resource.lisp
index 108408c..d101ea4 100644
--- a/src/file-resource.lisp
+++ b/src/file-resource.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defclass file-resource (resource)
   ((alias
diff --git a/src/media-type.lisp b/src/media-type.lisp
index 864e6ec..f560b2d 100644
--- a/src/media-type.lisp
+++ b/src/media-type.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defclass media-type nil
   ((name
diff --git a/src/package.lisp b/src/package.lisp
index 0c93dca..6a72266 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine
+(defpackage #:webmachine
   (:use #:cl)
   (:import-from #:trivia #:match)
   (:import-from
@@ -134,6 +134,6 @@
    #:resources
   ))
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 ;;;; End of file `package.lisp'
diff --git a/src/path.lisp b/src/path.lisp
index 74589fa..c861188 100644
--- a/src/path.lisp
+++ b/src/path.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 
 ;;;
diff --git a/src/reply.lisp b/src/reply.lisp
index fce6b25..bdf1d4f 100644
--- a/src/reply.lisp
+++ b/src/reply.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defclass reply (hunchentoot:reply)
   ((media-type
diff --git a/src/request-method.lisp b/src/request-method.lisp
index e3f4593..6340838 100644
--- a/src/request-method.lisp
+++ b/src/request-method.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 ;;;
 ;;; Request Methods
diff --git a/src/request.lisp b/src/request.lisp
index a60e3ee..99d7729 100644
--- a/src/request.lisp
+++ b/src/request.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 (defclass request (hunchentoot:request)
   ((path-parameters
diff --git a/src/resource.lisp b/src/resource.lisp
index 5d7af20..f944020 100644
--- a/src/resource.lisp
+++ b/src/resource.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 
 ;;;;
diff --git a/src/utilities.lisp b/src/utilities.lisp
index d20e794..b05b1f7 100644
--- a/src/utilities.lisp
+++ b/src/utilities.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine)
+(in-package #:webmachine)
 
 
 ;;;;
diff --git a/testsuite/acceptor.lisp b/testsuite/acceptor.lisp
index 74279dc..4038d1c 100644
--- a/testsuite/acceptor.lisp
+++ b/testsuite/acceptor.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase testsuite-acceptor ()
   (with-testsuite-acceptor ()
diff --git a/testsuite/condition.lisp b/testsuite/condition.lisp
index 6013667..5eb2022 100644
--- a/testsuite/condition.lisp
+++ b/testsuite/condition.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase testsuite-condition ()
   (assert-condition (webmachine:http-error 501) webmachine:http-condition)
diff --git a/testsuite/configuration.lisp b/testsuite/configuration.lisp
index 5cc1c79..e81088a 100644
--- a/testsuite/configuration.lisp
+++ b/testsuite/configuration.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase run-all-tests ()
   (testsuite-condition))
diff --git a/testsuite/content.lisp b/testsuite/content.lisp
index 22ee799..988b07c 100644
--- a/testsuite/content.lisp
+++ b/testsuite/content.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase testsuite-content ()
   (flet ((latin-small-ligature-oe (external-format)
diff --git a/testsuite/entrypoint.lisp b/testsuite/entrypoint.lisp
index 4e9744f..baa483c 100644
--- a/testsuite/entrypoint.lisp
+++ b/testsuite/entrypoint.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase run-all-tests ()
   (testsuite-utilities)
diff --git a/testsuite/example/signature.lisp b/testsuite/example/signature.lisp
index 272a12d..c5b6753 100644
--- a/testsuite/example/signature.lisp
+++ b/testsuite/example/signature.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase ensure-that-create-canonical-request-works-as-expected ()
   (assert-string=
diff --git a/testsuite/media-type.lisp b/testsuite/media-type.lisp
index 2ad3967..422121b 100644
--- a/testsuite/media-type.lisp
+++ b/testsuite/media-type.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase ensure-media-types-are-known (media-types)
   (loop :for important-media-type :in media-types
diff --git a/testsuite/package.lisp b/testsuite/package.lisp
index 8a40e7a..27aa797 100644
--- a/testsuite/package.lisp
+++ b/testsuite/package.lisp
@@ -11,18 +11,16 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(defpackage #:org.melusina.webmachine/testsuite
+(defpackage #:webmachine/testsuite
   (:use #:common-lisp)
   (:local-nicknames
-   (#:webmachine #:org.melusina.webmachine)
-   (#:example #:org.melusina.webmachine/example)
-   (#:signature #:org.melusina.webmachine/signature)
-   (#:confidence #:org.melusina.confidence))
+   (#:example #:webmachine/example)
+   (#:signature #:webmachine/signature))
   (:import-from
    #:alexandria
    #:ensure-list
    #:with-unique-names)
-  (:import-from #:org.melusina.confidence
+  (:import-from #:confidence
    #:define-testcase
    #:define-assertion
    #:assert-condition
@@ -36,6 +34,6 @@
    #:assert-string=
    #:assert-type))
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 ;;;; End of file `package.lisp'
diff --git a/testsuite/path.lisp b/testsuite/path.lisp
index 279a49c..c6b890c 100644
--- a/testsuite/path.lisp
+++ b/testsuite/path.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase test-match-path (path uri expected-match-p expected-parameters)
   (multiple-value-bind (actual-match-p actual-parameters)
diff --git a/testsuite/reply.lisp b/testsuite/reply.lisp
index a1c0f50..8fba4d5 100644
--- a/testsuite/reply.lisp
+++ b/testsuite/reply.lisp
@@ -11,6 +11,6 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 ;;;; End of file `reply.lisp'
diff --git a/testsuite/request-method.lisp b/testsuite/request-method.lisp
index d9f9a76..9760888 100644
--- a/testsuite/request-method.lisp
+++ b/testsuite/request-method.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 (define-testcase ensure-important-request-methods-for-web-developers-are-known ()
   (let ((important-request-methods
diff --git a/testsuite/request.lisp b/testsuite/request.lisp
index 505b06a..6fd77ec 100644
--- a/testsuite/request.lisp
+++ b/testsuite/request.lisp
@@ -11,6 +11,6 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 ;;;; End of file `request.lisp'
diff --git a/testsuite/resource.lisp b/testsuite/resource.lisp
index f852c61..7a4dd3d 100644
--- a/testsuite/resource.lisp
+++ b/testsuite/resource.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 
 ;;;;
diff --git a/testsuite/utilities.lisp b/testsuite/utilities.lisp
index 1b9e0fe..24ef3c7 100644
--- a/testsuite/utilities.lisp
+++ b/testsuite/utilities.lisp
@@ -11,7 +11,7 @@
 ;;;; you should have received as part of this distribution. The terms
 ;;;; are also available at https://opensource.org/licenses/MIT
 
-(in-package #:org.melusina.webmachine/testsuite)
+(in-package #:webmachine/testsuite)
 
 
 ;;;;