diff --git a/src/handlers/create-survey.lisp b/src/handlers/create-survey.lisp
index 58a2b89..3cf2c92 100644
--- a/src/handlers/create-survey.lisp
+++ b/src/handlers/create-survey.lisp
@@ -3,6 +3,6 @@
 (define-easy-handler (create-survey :uri "/create-survey") nil
   (let ((post-params (post-parameters* *request*))
         (uid (generate-uuid))
-        (stored-surveys (load-response (make-surveys-db-path))))
-    (store-response (make-surveys-db-path) (push (list uid post-params) stored-surveys))
+        (stored-surveys (load-response (make-surveys-db-file))))
+    (store-response (make-surveys-db-file) (push (list uid post-params) stored-surveys))
     (ml-survey/views:create-survey uid)))
diff --git a/src/handlers/questionnaire-submit.lisp b/src/handlers/questionnaire-submit.lisp
index 720e46b..adf3a4c 100644
--- a/src/handlers/questionnaire-submit.lisp
+++ b/src/handlers/questionnaire-submit.lisp
@@ -14,7 +14,7 @@
 
 (defun ensure-data-file-exist (survey-id questionnaire-id)
   (ensure-directories-exist (format nil "~a/~a/~a.lisp"
-                                    *survey-data-dir*
+                                    (surveys-data-dir)
                                     survey-id
                                     questionnaire-id)))
 
diff --git a/src/handlers/survey.lisp b/src/handlers/survey.lisp
index 1151494..bcf582f 100644
--- a/src/handlers/survey.lisp
+++ b/src/handlers/survey.lisp
@@ -5,7 +5,7 @@
              (case action
                (id (second (split-uri uri)))
 
-               (id-p (let ((ids (mapcar #'car (load-response (make-surveys-db-path)))))
+               (id-p (let ((ids (mapcar #'car (load-response (make-surveys-db-file)))))
                        (if (member (parse-integer (survey-fn 'id)) ids) t nil)))
 
                (uri-p (let ((parts (split-uri uri)))
@@ -15,7 +15,7 @@
                              (survey-fn 'id-p))))
 
                (properties (first (rest (assoc (parse-integer (survey-fn 'id))
-                                               (load-response (make-surveys-db-path)))))))))
+                                               (load-response (make-surveys-db-file)))))))))
     #'survey-fn))
 
 (defun survey-uri (request)
diff --git a/src/handlers/surveys.lisp b/src/handlers/surveys.lisp
index e915de1..193506e 100644
--- a/src/handlers/surveys.lisp
+++ b/src/handlers/surveys.lisp
@@ -1,5 +1,5 @@
 (in-package :ml-survey/handlers)
 
 (define-easy-handler (surveys :uri "/") nil
-  (let ((stored-surveys (load-response (make-surveys-db-path))))
+  (let ((stored-surveys (load-response (make-surveys-db-file))))
     (ml-survey/views:surveys stored-surveys)))