diff --git a/src/main.lisp b/src/main.lisp
index a78b731..34203df 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -279,18 +279,18 @@ with the image attached to us"
   "Takes the form as an alist and sends a table formatted email
 with the image attached"
   (let* ((first-name (trim-whitespace
-                      (cdr (assoc "firstname" form
+                      (cdr (assoc "first-name" form
                                   :test 'string=))))
          (last-name (trim-whitespace
-                     (cdr (assoc "lastname" form
+                     (cdr (assoc "last-name" form
                                  :test 'string=))))
          (parent-name (concatenate 'string
                                    (trim-whitespace
-                                    (cdr (assoc "parentfirstname" form
+                                    (cdr (assoc "parent-first-name" form
                                                 :test 'string=)))
                                    " "
                                    (trim-whitespace
-                                    (cdr (assoc "parentlastname" form
+                                    (cdr (assoc "parent-last-name" form
                                                 :test 'string=))))))
     (not (cl-smtp:send-email
           "mail.tfcconnection.org"
@@ -321,18 +321,18 @@ with the image attached"
   "Takes the form as an alist and sends a table formatted email
 with the image attached"
   (let* ((first-name (trim-whitespace
-                      (cdr (assoc "firstname" form
+                      (cdr (assoc "first-name" form
                                   :test 'string=))))
          (last-name (trim-whitespace
-                     (cdr (assoc "lastname" form
+                     (cdr (assoc "last-name" form
                                  :test 'string=))))
          (parent-name (concatenate 'string
                                    (trim-whitespace
-                                    (cdr (assoc "parentfirstname" form
+                                    (cdr (assoc "parent-first-name" form
                                                 :test 'string=)))
                                    " "
                                    (trim-whitespace
-                                    (cdr (assoc "parentlastname" form
+                                    (cdr (assoc "parent-last-name" form
                                                 :test 'string=))))))
     (not (cl-smtp:send-email
           "mail.tfcconnection.org"
@@ -364,17 +364,17 @@ with the image attached"
   (let* ((data (tbnl:post-parameters* tbnl:*request*))
          (registration (cdr (assoc "registration" data :test 'string=)))
          (image (cdr (assoc "image" data :test 'string=)))
-         (first-name (cdr (assoc "firstname" data :test 'string=)))
-         (last-name (cdr (assoc "lastname" data :test 'string=)))
+         (first-name (cdr (assoc "first-name" data :test 'string=)))
+         (last-name (cdr (assoc "last-name" data :test 'string=)))
          (image (cdr (assoc "image" data :test 'string=)))
          (attachment nil))
     (loop :for d :in data
           :do (progn
                 (uiop:println d)
-                (if (string= "firstname" (car d))
+                (if (string= "first-name" (car d))
                     (progn
                       (setf first-name (cdr d))))
-                (if (string= "lastname" (car d))
+                (if (string= "last-name" (car d))
                     (progn
                       (setf last-name (cdr d))))
                 (if (string= "image" (car d))
@@ -428,8 +428,8 @@ with the image attached"
                       (log:info (tbnl:headers-out*))
                       (mail-camp-form data nil))
                      ((string= registration "later")
-                      (let ((first-name (cdr (assoc "firstname" data :test 'string=)))
-                            (last-name (cdr (assoc "lastname" data :test 'string=))))
+                      (let ((first-name (cdr (assoc "first-name" data :test 'string=)))
+                            (last-name (cdr (assoc "last-name" data :test 'string=))))
                         (mail-camp-form data nil)
                         (with-html-string
                           (:div