diff --git a/backend/service/addSchedule.go b/backend/service/addSchedule.go
index a7a2ffa..4cf41bc 100644
--- a/backend/service/addSchedule.go
+++ b/backend/service/addSchedule.go
@@ -16,7 +16,7 @@ func AddSchedules(app *pocketbase.PocketBase) {
 		// Every hour update all courses (5 segments - minute, hour, day, month, weekday) "0 * * * *"
 		// Every three hours update all courses (5 segments - minute, hour, day, month, weekday) "0 */3 * * *"
 		// Every 10 minutes update all courses (5 segments - minute, hour, day, month, weekday) "*/10 * * * *"
-		scheduler.MustAdd("updateCourse", "*/30 * * * *", func() {
+		scheduler.MustAdd("updateCourse", "0 */3 * * *", func() {
 
 			courses := events.GetAllCourses(app)
 
diff --git a/backend/service/db/dbEvents.go b/backend/service/db/dbEvents.go
index d1427ca..3079fbd 100644
--- a/backend/service/db/dbEvents.go
+++ b/backend/service/db/dbEvents.go
@@ -115,10 +115,10 @@ func GetAllModulesForCourse(app *pocketbase.PocketBase, course string, semester
 	return events, nil
 }
 
-func GetAllModulesDistinct(app *pocketbase.PocketBase) (model.Events, error) {
+func GetAllModulesDistinctByNameAndCourse(app *pocketbase.PocketBase) (model.Events, error) {
 	var events model.Events
 
-	err := app.Dao().DB().Select("*").From("events").Distinct(true).All(&events)
+	err := app.Dao().DB().Select("*").From("events").GroupBy("Name", "course").Distinct(true).All(&events)
 	if err != nil {
 		print("Error while getting events from database: ", err)
 		return nil, err
diff --git a/backend/service/events/eventService.go b/backend/service/events/eventService.go
index 48efbcd..450ae43 100644
--- a/backend/service/events/eventService.go
+++ b/backend/service/events/eventService.go
@@ -28,8 +28,10 @@ func replaceEmptyEntry(modules model.Events, replacement string) {
 	}
 }
 
+// GetAllModulesDistinct returns all modules distinct by name and course from the database
+// That means you get all modules with duplicates if they have different courses
 func GetAllModulesDistinct(app *pocketbase.PocketBase, c echo.Context) error {
-	modules, err := db.GetAllModulesDistinct(app)
+	modules, err := db.GetAllModulesDistinctByNameAndCourse(app)
 
 	replaceEmptyEntry(modules, "Sonderveranstaltungen")
 
diff --git a/frontend/src/components/AdditionalModules.vue b/frontend/src/components/AdditionalModules.vue
index c9ef74b..dd49a71 100644
--- a/frontend/src/components/AdditionalModules.vue
+++ b/frontend/src/components/AdditionalModules.vue
@@ -30,7 +30,7 @@ async function nextStep() {
   await router.push("/rename-modules");
 }
 
-const display = (module: Module) => module.Name + " (" + module.Course + ")";
+const display = (module: Module) => module.name + " (" + module.course + ")";
 
 const selectAll = ref(false);
 
diff --git a/frontend/src/components/RenameModules.vue b/frontend/src/components/RenameModules.vue
index 1d46a96..c246ff9 100644
--- a/frontend/src/components/RenameModules.vue
+++ b/frontend/src/components/RenameModules.vue
@@ -7,7 +7,7 @@ import { ref } from "vue";
 
 const tableData = ref(moduleStore().modules.map((module) => {
   return {
-    Course: module.Course,
+    Course: module.course,
     Module: module,
   }
 })
@@ -36,14 +36,14 @@ async function finalStep() {
   <DataTable :value="tableData" editMode="cell" tableClass="editable-cells-table" responsiveLayout="scroll">
     <Column v-for="col of columns" :key="col.field" :field="col.field" :header="col.header">
       <template #body="{ data, field }" >
-        <div>{{  field === 'Module' ? data[field].UserDefinedName : data[field] }}</div>
+        <div>{{  field === 'Module' ? data[field].userDefinedName : data[field] }}</div>
       </template>
       <template #editor="{ data, field }">
         <template v-if="field !== 'Module'">
           <div>{{ data[field] }}</div>
         </template>
         <template v-else>
-          <InputText class="w-full" v-model="data[field].UserDefinedName" autofocus />
+          <InputText class="w-full" v-model="data[field].userDefinedName" autofocus />
         </template>
       </template>
     </Column>