diff --git a/src/handlers/questionnaire-submit.lisp b/src/handlers/questionnaire-submit.lisp
index 3ac3708..b114635 100644
--- a/src/handlers/questionnaire-submit.lisp
+++ b/src/handlers/questionnaire-submit.lisp
@@ -6,19 +6,17 @@
         (survey (make-survey uri)))
     (and (= (length parts) 3)
          (string= (first parts) "survey")
-         (and (funcall survey 'id)
-              (every #'digit-char-p (second parts)))
+         (funcall survey 'id)
          (search "submit" (third parts)))))
 
 (defun questionnaire-submit-uri (request)
   (questionnaire-submit-uri-p (request-uri request)))
 
-(defun ensure-data-file-exist (id &optional lang)
-  (ensure-directories-exist (format nil "~a~a/~a-~a.lisp"
+(defun ensure-data-file-exist (survey-id)
+  (ensure-directories-exist (format nil "~a~a/~a.lisp"
                                     *survey-data-dir*
-                                    id
-                                    (generate-uuid)
-                                    lang)))
+                                    survey-id
+                                    (generate-uuid))))
 
 (define-easy-handler (questionnaire-submit :uri #'questionnaire-submit-uri) nil
   (let ((post-params (post-parameters* *request*))
diff --git a/src/handlers/questionnaire.lisp b/src/handlers/questionnaire.lisp
index 70c9b8f..40c11b1 100644
--- a/src/handlers/questionnaire.lisp
+++ b/src/handlers/questionnaire.lisp
@@ -12,7 +12,7 @@
 (defun questionnaire-uri (request)
   (questionnaire-uri-p (request-uri request)))
 
-(defun return-sus-form (lang)
+(defun choose-sus-form (lang)
   "Based on LANG decide which sus form to show."
   (check-type lang string)
   (cond ((string= lang "en") #'ml-survey/views:sus-form-en)
@@ -22,4 +22,4 @@
 (define-easy-handler (questionnaire :uri #'questionnaire-uri) (lang)
   (let ((survey (make-survey (request-uri*))))
     (setf *html-lang* lang)
-    (funcall (return-sus-form lang) (funcall survey 'id))))
+    (funcall (choose-sus-form lang) (funcall survey 'id))))