diff --git a/package.lisp b/package.lisp
index b9454f1..eaeeb9c 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,4 +1,4 @@
-(defpackage dev.metalisp.survey
+(defpackage ml-survey
   (:use #:cl)
   (:import-from #:hunchentoot
                 #:define-easy-handler
@@ -14,7 +14,7 @@
   (:import-from #:dev.metalisp.sbt/utility
                 #:spacing))
 
-(defpackage dev.metalisp.survey/forms
+(defpackage ml-survey/forms
   (:use #:cl)
   (:import-from #:spinneret
                 #:*html*
@@ -32,11 +32,11 @@
                 #:multi-form)
   (:export #:sus-form-en #:sus-form-de))
 
-(defpackage dev.metalisp.survey/partials
+(defpackage ml-survey/partials
   (:use #:cl)
   (:export #:navbar-en #:navbar-de))
 
-(defpackage dev.metalisp.survey/pages
+(defpackage ml-survey/pages
   (:use #:cl)
   (:import-from #:dev.metalisp.sbt
                 #:with-page)
diff --git a/src/forms/sus.lisp b/src/forms/sus.lisp
index 71214a2..5cfbff9 100644
--- a/src/forms/sus.lisp
+++ b/src/forms/sus.lisp
@@ -1,8 +1,8 @@
-(in-package :dev.metalisp.survey/forms)
+(in-package :ml-survey/forms)
 
 (defun sus-form-en ()
   (with-page (:title "SUS Form")
-    (dev.metalisp.survey/partials:navbar-en)
+    (ml-survey/partials:navbar-en)
     (:section :class "container"
               (:h2 "Usability Feedback Form")
               (:p "Please fill out the following forms and press the submit button.")
@@ -106,7 +106,7 @@
 
 (defun sus-form-de ()
   (with-page (:title "SUS Formular")
-    (dev.metalisp.survey/partials:navbar-de)
+    (ml-survey/partials:navbar-de)
     (:section :class "container"
               (:h2 "Usability Feedback Formular")
               (:p "Bitte füllen Sie die folgende Formular aus und klicken Sie auf die Schaltfläche 'Senden'.")
diff --git a/src/main.lisp b/src/main.lisp
index 55fb889..31d4e65 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -1,4 +1,4 @@
-(in-package :dev.metalisp.survey)
+(in-package :ml-survey)
 
 (defun create-server (name port &key address document-root)
   (let ((acceptor (make-instance 'hunchentoot:easy-acceptor
@@ -53,12 +53,12 @@
 (defun return-sus-form (lang)
   "Based on LANG decide which sus form to show."
   (check-type lang string)
-  (cond ((string= lang "en") (dev.metalisp.survey/forms:sus-form-en))
-        ((string= lang "de") (dev.metalisp.survey/forms:sus-form-de))
+  (cond ((string= lang "en") (ml-survey/forms:sus-form-en))
+        ((string= lang "de") (ml-survey/forms:sus-form-de))
         (t (error "Unsupported language: ~A" lang))))
 
 (define-easy-handler (imprint :uri "/imprint") ()
-  (dev.metalisp.survey/pages:imprint))
+  (ml-survey/pages:imprint))
 
 (define-easy-handler (sus :uri "/sus") (lang)
   (setf *html-lang* lang)
@@ -100,19 +100,18 @@
 (define-easy-handler (survey :uri #'survey-uri) ()
   (let* ((id (subseq (hunchentoot:request-uri*) (length "/survey/")))
          (survey (assoc (parse-integer id) (load-response (make-surveys-db-path)))))
-    (dev.metalisp.survey/pages:survey survey)
-    (hunchentoot:request-uri*)))
+    (ml-survey/pages:survey survey)))
 
 (define-easy-handler (new-survey :uri "/new-survey") nil
-  (dev.metalisp.survey/pages:new-survey))
+  (ml-survey/pages:new-survey))
 
 (define-easy-handler (create-survey :uri "/create-survey") nil
   (let ((post-params (post-parameters* *request*))
         (uid (* (get-universal-time) (random 999)))
         (stored-surveys (load-response (make-surveys-db-path))))
     (store-response (make-surveys-db-path) (push (list uid post-params) stored-surveys))
-    (dev.metalisp.survey/pages:create-survey uid)))
+    (ml-survey/pages:create-survey uid)))
 
 (define-easy-handler (surveys :uri "/") nil
   (let ((stored-surveys (load-response (make-surveys-db-path))))
-    (dev.metalisp.survey/pages:surveys stored-surveys)))
+    (ml-survey/pages:surveys stored-surveys)))
diff --git a/src/pages.lisp b/src/pages.lisp
index e0c4f96..d633214 100644
--- a/src/pages.lisp
+++ b/src/pages.lisp
@@ -1,11 +1,11 @@
-(in-package :dev.metalisp.survey/pages)
+(in-package :ml-survey/pages)
 
 (defun index ()
   (let ((collection '("English" ("/sus?lang=en" "System Usability Scale")
                       "Deutsch" ("/sus?lang=de" "System Usability Scale"
                                  "/demographics?lang=de" "Demografie"))))
     (with-page (:title "Survey")
-      (dev.metalisp.survey/partials:navbar-en)
+      (ml-survey/partials:navbar-en)
       (:section :class "container"
                 (:h2 :class "mb-3" "Surveys")
                 (loop for (lang anchors) on collection by #'cddr do
@@ -30,7 +30,7 @@
 (defun new-survey ()
   "Generates the view to create a new survey."
   (with-page (:title "New Survey")
-    (dev.metalisp.survey/partials:navbar-en)
+    (ml-survey/partials:navbar-en)
     (:section :class "container"
               (:h2 :class "mb-3" "New Survey")
               (:form :action "/create-survey" :method "post"
@@ -87,7 +87,7 @@
 (defun surveys (surveys)
   "Generates the view to show all surveys available."
   (with-page (:title "Surveys")
-    (dev.metalisp.survey/partials:navbar-en)
+    (ml-survey/partials:navbar-en)
     (:section :class "container"
               (:h2 :class "mb-3" "Your Surveys")
               (:div :class "btn-toolbar my-3"
@@ -112,7 +112,7 @@
 (defun create-survey (survey-id)
   "Generates the view to show the survey created."
   (with-page (:title "Surveys")
-    (dev.metalisp.survey/partials:navbar-en)
+    (ml-survey/partials:navbar-en)
     (:section :class "container"
               (:h2 "Your Surveys")
               (if survey-id
@@ -125,7 +125,7 @@
   (let ((id (format nil "~a" (first survey)))
         (properties (first (rest survey))))
     (with-page (:title "Surveys")
-      (dev.metalisp.survey/partials:navbar-en)
+      (ml-survey/partials:navbar-en)
       (:section :class "container"
                 (:h2 id)
                 (:ul :class "list-group"
diff --git a/src/partials/_navbar.lisp b/src/partials/_navbar.lisp
index 9842278..32ee29b 100644
--- a/src/partials/_navbar.lisp
+++ b/src/partials/_navbar.lisp
@@ -1,4 +1,4 @@
-(in-package :dev.metalisp.survey/partials)
+(in-package :ml-survey/partials)
 
 (defmacro navbar-brand (src width)
   `(spinneret:with-html