diff --git a/client/app/src/main/java/events/CreateEventController.java b/client/app/src/main/java/events/CreateEventController.java
index bbfa90e..acf5fd0 100644
--- a/client/app/src/main/java/events/CreateEventController.java
+++ b/client/app/src/main/java/events/CreateEventController.java
@@ -91,7 +91,7 @@ public class CreateEventController {
         dataController.createEvent(event);
     }
 
-    //Marc Beyer//
+    //Marco Kühn//
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
diff --git a/client/app/src/main/java/events/EditEventController.java b/client/app/src/main/java/events/EditEventController.java
index 6c448f6..f371205 100644
--- a/client/app/src/main/java/events/EditEventController.java
+++ b/client/app/src/main/java/events/EditEventController.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package events;
 
 import helper.HttpRequestException;
diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java
index 8473f08..fd6e399 100644
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@@ -1,4 +1,4 @@
-/* Marco Kühn, Marc Beyer */
+// Marco Kühn, Marc Beyer //
 package main;
 
 import config.Config;
diff --git a/client/app/src/main/java/main/OptionController.java b/client/app/src/main/java/main/OptionController.java
index e2915aa..e967840 100644
--- a/client/app/src/main/java/main/OptionController.java
+++ b/client/app/src/main/java/main/OptionController.java
@@ -1,4 +1,4 @@
-/* Marco Kühn */
+// Marco Kühn //
 package main;
 
 import com.jfoenix.controls.*;
diff --git a/client/app/src/main/java/ui/DayPane.java b/client/app/src/main/java/ui/DayPane.java
index 26dc3e3..99b083d 100644
--- a/client/app/src/main/java/ui/DayPane.java
+++ b/client/app/src/main/java/ui/DayPane.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package ui;
 
 import javafx.scene.control.Label;
diff --git a/client/app/src/main/java/ui/EventPane.java b/client/app/src/main/java/ui/EventPane.java
index 8e74cc2..95fc5a4 100644
--- a/client/app/src/main/java/ui/EventPane.java
+++ b/client/app/src/main/java/ui/EventPane.java
@@ -1,3 +1,4 @@
+//Marc Beyer, Marco Kühn//
 package ui;
 
 import container.Event;
diff --git a/client/app/src/main/java/ui/SvgBtnCreator.java b/client/app/src/main/java/ui/SvgBtnCreator.java
index c481fcb..219f509 100644
--- a/client/app/src/main/java/ui/SvgBtnCreator.java
+++ b/client/app/src/main/java/ui/SvgBtnCreator.java
@@ -1,3 +1,4 @@
+//Marco Kühn//
 package ui;
 
 import javafx.geometry.Bounds;
diff --git a/client/app/src/main/java/users/EditUserController.java b/client/app/src/main/java/users/EditUserController.java
index 3b00b42..e00d5de 100644
--- a/client/app/src/main/java/users/EditUserController.java
+++ b/client/app/src/main/java/users/EditUserController.java
@@ -1,4 +1,4 @@
-/* Marc Beyer */
+// Marc Beyer //
 package users;
 
 import container.DataController;
diff --git a/client/data/src/main/java/container/DataController.java b/client/data/src/main/java/container/DataController.java
index 1c9d5d5..577e769 100644
--- a/client/data/src/main/java/container/DataController.java
+++ b/client/data/src/main/java/container/DataController.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package container;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/client/data/src/main/java/container/Event.java b/client/data/src/main/java/container/Event.java
index b9958bd..0724a87 100644
--- a/client/data/src/main/java/container/Event.java
+++ b/client/data/src/main/java/container/Event.java
@@ -1,3 +1,4 @@
+//Marco Kühn//
 package container;
 
 import java.time.Duration;
diff --git a/client/data/src/main/java/container/HttpRequest.java b/client/data/src/main/java/container/HttpRequest.java
index 8ddf2d2..e423bca 100644
--- a/client/data/src/main/java/container/HttpRequest.java
+++ b/client/data/src/main/java/container/HttpRequest.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package container;
 
 import helper.Tuple;
diff --git a/client/data/src/main/java/container/User.java b/client/data/src/main/java/container/User.java
index 37e5d27..4dd7b54 100644
--- a/client/data/src/main/java/container/User.java
+++ b/client/data/src/main/java/container/User.java
@@ -1,3 +1,4 @@
+//Marco Kühn//
 package container;
 
 public class User {