diff --git a/lib.typ b/lib.typ
index 4a76183..7d07bc2 100644
--- a/lib.typ
+++ b/lib.typ
@@ -115,7 +115,7 @@
   )
 }
 
-#let mainBody(
+#let main-body(
   settings: (),
   body
 ) = {
diff --git a/modules/titlepage.typ b/modules/titlepage.typ
index 61977cc..7cb6448 100644
--- a/modules/titlepage.typ
+++ b/modules/titlepage.typ
@@ -1,4 +1,4 @@
-#let openTitlePage(settings: ()) = {
+#let open-title-page(settings: ()) = {
   set page(
     paper: "a4",
     margin: (left: 30mm, right: 30mm, top: 40mm, bottom: 40mm),
@@ -16,7 +16,7 @@
   set par(leading: 1em)
 }
 
-#let finishTitlePage(
+#let finish-title-page(
   settings: (),
   degree: "",
   program: "",
@@ -29,37 +29,37 @@
   place-of-work: "",
   supervisor: "",
   advisor: "",
-  startDate: none,
+  start-date: none,
   submission-date: none,
 ) = {
 
   v(5mm)
-  align(center, text(font: settings.fontHeading, 1.9em, weight: 700, "University of Applied Sciences Karlsruhe"))
+  align(center, text(font: settings.font-heading, 1.9em, weight: 700, "University of Applied Sciences Karlsruhe"))
   
   v(15mm)
 
-  align(center, text(font: settings.fontHeading, 1.5em, weight: 100, degree + "’s Thesis in " + program))
+  align(center, text(font: settings.font-heading, 1.5em, weight: 100, degree + "’s Thesis in " + program))
   v(8mm)
 
   if title-german.len() > 0 {
     if subtitle.len() > 0 or subtitle-german.len() > 0 {
-      align(center, text(font: settings.fontHeading, 1.2em, weight: 700, title))
-      align(center, text(font: settings.fontHeading, 1.2em, weight: 500, subtitle))
+      align(center, text(font: settings.font-heading, 1.2em, weight: 700, title))
+      align(center, text(font: settings.font-heading, 1.2em, weight: 500, subtitle))
       v(10mm)
-      align(center, text(font: settings.fontHeading, 1.2em, weight: 700, title-german))
-      align(center, text(font: settings.fontHeading, 1.2em, weight: 500, subtitle-german))  
+      align(center, text(font: settings.font-heading, 1.2em, weight: 700, title-german))
+      align(center, text(font: settings.font-heading, 1.2em, weight: 500, subtitle-german))  
     } else {
-      align(center, text(font: settings.fontHeading, 1.4em, weight: 700, title))
+      align(center, text(font: settings.font-heading, 1.4em, weight: 700, title))
       v(10mm)
-      align(center, text(font: settings.fontHeading, 1.4em, weight: 700, title-german))
+      align(center, text(font: settings.font-heading, 1.4em, weight: 700, title-german))
     }
   } else {
     if subtitle.len() > 0 {
-      align(center, text(font: settings.fontHeading, 1.8em, weight: 700, title))
+      align(center, text(font: settings.font-heading, 1.8em, weight: 700, title))
       v(5mm)
-      align(center, text(font: settings.fontHeading, 1.4em, weight: 500, subtitle))
+      align(center, text(font: settings.font-heading, 1.4em, weight: 500, subtitle))
     } else {
-      align(center, text(font: settings.fontHeading, 2.0em, weight: 700, title))
+      align(center, text(font: settings.font-heading, 2.0em, weight: 700, title))
     }
     
   }
@@ -77,7 +77,7 @@
         strong("Place of Work: "), place-of-work,
         strong("Supervisor: "), supervisor,
         strong("Advisor: "), advisor,
-        strong("Start Date: "), startDate,
+        strong("Start Date: "), start-date,
         strong("Submission Date: "), submission-date,
       )
     )
@@ -93,7 +93,7 @@
         strong("Matriculation Number: "), matriculation-number,
         strong("Place of Work: "), place-of-work,
         strong("Supervisor: "), supervisor,
-        strong("Start Date: "), startDate,
+        strong("Start Date: "), start-date,
         strong("Submission Date: "), submission-date,
       )
     )
diff --git a/template/settings/metadata.typ b/template/settings/metadata.typ
index 9de3bce..f348bcf 100644
--- a/template/settings/metadata.typ
+++ b/template/settings/metadata.typ
@@ -9,6 +9,6 @@
 #let place-of-work = "ABC"
 #let supervisor = "Prof Dr. Max Mustermann"
 #let advisor = "Prof Dr. John Doe"
-#let startDate = "01.03.2024"
+#let start-date = "01.03.2024"
 #let submission-date = "31.08.2024"
 #let place = "Karlsruhe"
\ No newline at end of file
diff --git a/template/settings/settings.typ b/template/settings/settings.typ
index 3668a86..b58bc49 100644
--- a/template/settings/settings.typ
+++ b/template/settings/settings.typ
@@ -3,14 +3,14 @@
   font-body-size: 12pt,
   font-figures-subtitle-size: 0.85em,
   // At the moment only used on the title page
-  fontHeading: "New Computer Modern Sans",
+  font-heading: "New Computer Modern Sans",
   font-heading-size: 16pt,
   headings-numbering-style: "1.1.",
   headings-spacing: (
     below: 0.85em,
     above: 1.75em
   ),
-  citationStyle: "ieee",
+  citation-style: "ieee",
   space-before-paragraph: 24pt,
   distance-between-lines: 1em,
   list-indentation: 2.5em,
diff --git a/template/thesis.typ b/template/thesis.typ
index fbfaa15..2a4dce0 100644
--- a/template/thesis.typ
+++ b/template/thesis.typ
@@ -7,7 +7,7 @@
 #show: make-glossary
 
 #set document(title: title-english, author: author)
-#openTitlePage(settings: settings)
+#open-title-page(settings: settings)
 // Customize your company logo or just use the one from the university
 #grid(
   columns: (1fr, 1fr),
@@ -19,7 +19,7 @@
   ]
 )
 
-#finishTitlePage(
+#finish-title-page(
   settings: settings,
   degree: degree,
   program: program,
@@ -30,14 +30,14 @@
   place-of-work: place-of-work,
   supervisor: supervisor,
   advisor: advisor,
-  startDate: startDate,
+  start-date: start-date,
   submission-date: submission-date,
 )
 
 #preface(settings: settings)
 
 // Citations - applied here so that you are able to use a local CSL file to define the citation style
-#set cite(style: settings.citationStyle)
+#set cite(style: settings.citation-style)
 
 // Statutory Declaration
 #include "supplementary/statutoryDeclaration.typ"
@@ -53,7 +53,7 @@
 
 #listings(abbreviations: abbreviations)
 
-#show: mainBody.with(
+#show: main-body.with(
   settings: settings
 )