diff --git a/application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php b/application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php
index 376a0fedc..f5a09deff 100644
--- a/application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php
+++ b/application/controllers/api/frontend/v1/tempus/OperationalResourceToCalenderAPI.php
@@ -45,7 +45,7 @@ class OperationalResourceToCalenderAPI extends FHCAPI_Controller
 		$result = $this->KalenderModel->loadWhere(['kalender_id' => $calenderID]);
 		if (empty($result)) $this->terminateWithError("Calendar with id '$calenderID' not found");
  
-		$calenderGroupID = $this->getDataOrTerminateWithError($result)[0]->eindeutige_gruppen_id;
+		$calenderGroupID = $this->getDataOrTerminateWithError($result)[0]->eindeutige_kalender_gruppen_id;
 		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
 
 
@@ -72,7 +72,7 @@ class OperationalResourceToCalenderAPI extends FHCAPI_Controller
 
 		$calendar = $this->getDataOrTerminateWithError($result)[0];
 		
-		$calenderGroupID = $calendar->eindeutige_gruppen_id;
+		$calenderGroupID = $calendar->eindeutige_kalender_gruppen_id;
 		if (!isset($calenderGroupID)) $this->terminateWithError("Calendar with id '$calenderID' does not have a valid group id");
 
 		$result = $this->kalenderlib->addOperationalResourcesToKalenderEvent($calendar, $assignedResources);
diff --git a/application/controllers/system/MigrateKalender.php b/application/controllers/system/MigrateKalender.php
index ec199ee08..5932bd748 100644
--- a/application/controllers/system/MigrateKalender.php
+++ b/application/controllers/system/MigrateKalender.php
@@ -293,7 +293,7 @@ class MigrateKalender extends CLI_Controller
 				 $createHelperTypeQuery .
 		"WITH test AS (
 			SELECT 
-				tk.eindeutige_gruppen_id AS eindeutige_gruppen_id,
+				tk.eindeutige_kalender_gruppen_id AS eindeutige_kalender_gruppen_id,
 				array_agg(tk.kalender_id),
 				array_agg(
 					ROW(tsb.betriebsmittel_id, tsb.insertamum, tsb.insertvon)::betriebsmittel_info
@@ -301,7 +301,7 @@ class MigrateKalender extends CLI_Controller
 			FROM sync.tbl_stundenplandev_kalender AS sk
 			JOIN lehre.tbl_kalender tk ON tk.kalender_id = sk.kalender_id
 			JOIN lehre.tbl_stundenplan_betriebsmittel tsb ON tsb.stundenplandev_id = sk.stundenplandev_id 
-			GROUP BY tk.eindeutige_gruppen_id 
+			GROUP BY tk.eindeutige_kalender_gruppen_id 
 			)
 			INSERT INTO lehre.tbl_betriebsmittel_kalender (
 				eindeutige_kalender_gruppen_id, 
@@ -310,7 +310,7 @@ class MigrateKalender extends CLI_Controller
 				insertvon
 				)
 			SELECT
-				t.eindeutige_gruppen_id,
+				t.eindeutige_kalender_gruppen_id,
 				bm.betriebsmittel_id,
 				bm.insertamum,
 				bm.insertvon
@@ -326,9 +326,9 @@ class MigrateKalender extends CLI_Controller
 		$dbModel = new DB_Model();
 
 		$query = "UPDATE lehre.tbl_kalender
-			SET eindeutige_gruppen_id = gen_random_uuid()
+			SET eindeutige_kalender_gruppen_id = gen_random_uuid()
 			WHERE vorgaenger_kalender_id IS NULL
-			AND eindeutige_gruppen_id IS NULL;";
+			AND eindeutige_kalender_gruppen_id IS NULL;";
 
 		$dbModel->db->query($query);
 
@@ -343,7 +343,7 @@ class MigrateKalender extends CLI_Controller
 					kalender_id,
 					vorgaenger_kalender_id,
 					kalender_id AS root_id,
-					eindeutige_gruppen_id as root_eindeutige_gruppen_id
+					eindeutige_kalender_gruppen_id as root_eindeutige_kalender_gruppen_id
 				FROM lehre.tbl_kalender
 				WHERE vorgaenger_kalender_id IS NULL
 
@@ -353,18 +353,18 @@ class MigrateKalender extends CLI_Controller
 					i.kalender_id,
 					i.vorgaenger_kalender_id,
 					t.root_id,
-					t.root_eindeutige_gruppen_id 
+					t.root_eindeutige_kalender_gruppen_id 
 				FROM lehre.tbl_kalender i
 				JOIN tree t
 				ON i.vorgaenger_kalender_id = t.kalender_id
-				where i.eindeutige_gruppen_id is NULL
+				where i.eindeutige_kalender_gruppen_id is NULL
 			
 			)
 			UPDATE lehre.tbl_kalender k
-			SET eindeutige_gruppen_id = t.root_eindeutige_gruppen_id
+			SET eindeutige_kalender_gruppen_id = t.root_eindeutige_kalender_gruppen_id
 			FROM tree t
 			WHERE k.kalender_id = t.kalender_id
-			AND k.eindeutige_gruppen_id IS NULL;";
+			AND k.eindeutige_kalender_gruppen_id IS NULL;";
 
 		$dbModel->db->query($query);
 	}
diff --git a/application/libraries/KalenderLib.php b/application/libraries/KalenderLib.php
index c4c72c167..58f69c2b4 100644
--- a/application/libraries/KalenderLib.php
+++ b/application/libraries/KalenderLib.php
@@ -39,7 +39,7 @@ class KalenderLib
 		$end_date = date('Y-m-d', strtotime($end_date . ' +1 day'));
 
 		$this->_ci->KalenderModel->addSelect('tbl_kalender.kalender_id,
-												tbl_kalender.eindeutige_gruppen_id,
+												tbl_kalender.eindeutige_kalender_gruppen_id,
 												tbl_kalender.status_kurzbz,
 												tbl_kalender.typ,
 												tbl_kalender.von,
@@ -137,7 +137,7 @@ class KalenderLib
 		$this->_ci->KalenderModel->db->where('tbl_kalender.von >=', $start_date);
 		$this->_ci->KalenderModel->db->where('tbl_kalender.bis <', $end_date);
 
-		$this->_ci->KalenderModel->addOrder('tbl_kalender.eindeutige_gruppen_id', 'DESC');
+		$this->_ci->KalenderModel->addOrder('tbl_kalender.eindeutige_kalender_gruppen_id', 'DESC');
 	}
 
 	private function _mapEvents($data, $collisionCheck = true)
@@ -160,7 +160,7 @@ class KalenderLib
 
 				$events[$id] = (object) [
 					'kalender_id' => $id,
-					'eindeutige_gruppen_id' => $row->eindeutige_gruppen_id,
+					'eindeutige_kalender_gruppen_id' => $row->eindeutige_kalender_gruppen_id,
 					'type' => $row->typ,
 					'beginn' => $von->format('H:i:s'),
 					'ende' => $bis->format('H:i:s'),
@@ -398,7 +398,7 @@ class KalenderLib
 		$this->_ci->KalenderModel->addSelect([ 
 			"(
 				SELECT COUNT(*) FROM lehre.tbl_betriebsmittel_kalender 
-				WHERE tbl_betriebsmittel_kalender.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_gruppen_id
+				WHERE tbl_betriebsmittel_kalender.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id
 			) AS has_assigned_resources"
 		]);
 
@@ -600,7 +600,7 @@ class KalenderLib
 				'bis' => $end_date,
 				'typ' => 'lehreinheit',
 				'status_kurzbz' => 'planning',
-				'eindeutige_gruppen_id' => $this->_ci->KalenderModel->generateUniqueGroupId(),
+				'eindeutige_kalender_gruppen_id' => $this->_ci->KalenderModel->generateUniqueGroupId(),
 				'insertvon' => getAuthUID(),
 				'insertamum' => date('Y-m-d H:i:s')
 			)
@@ -1000,19 +1000,19 @@ class KalenderLib
 			";
 
 			$params = array_merge(
-				[$calendar->eindeutige_gruppen_id],
+				[$calendar->eindeutige_kalender_gruppen_id],
 				$allowedResourceIDs
 			);
 
 			$this->_ci->db->query($query, $params);
 		} else {
-			$this->_ci->db->where('eindeutige_kalender_gruppen_id', $calendar->eindeutige_gruppen_id);
+			$this->_ci->db->where('eindeutige_kalender_gruppen_id', $calendar->eindeutige_kalender_gruppen_id);
 			$this->_ci->db->delete('lehre.tbl_betriebsmittel_kalender');
 		}
 
 		foreach ($assignedResources as $assignedResource) {
 			$data = [
-				'eindeutige_kalender_gruppen_id' => $calendar->eindeutige_gruppen_id,
+				'eindeutige_kalender_gruppen_id' => $calendar->eindeutige_kalender_gruppen_id,
 				'betriebsmittel_id' => $assignedResource['betriebsmittel_id'],
 				'anmerkung' => $assignedResource['anmerkung'] ?? null,
 				'quelle' => 'tempus_neu',
@@ -1134,7 +1134,7 @@ class KalenderLib
 		
 		$kalender_entry = getData($entryResult);
 		
-		$calendarResources = $this->_ci->BetriebsmittelKalenderModel->loadWhere(['eindeutige_kalender_gruppen_id' => $kalender_entry->eindeutige_gruppen_id]);
+		$calendarResources = $this->_ci->BetriebsmittelKalenderModel->loadWhere(['eindeutige_kalender_gruppen_id' => $kalender_entry->eindeutige_kalender_gruppen_id]);
 		if (isError($calendarResources)) return $calendarResources;
 		
 		$calendarResourcesItems = getData($calendarResources);
@@ -1293,7 +1293,7 @@ class KalenderLib
 				'typ' => 'lehreinheit',
 				'status_kurzbz' => 'planning',
 				'vorgaenger_kalender_id' => $old_id,
-				'eindeutige_gruppen_id' => $kalender_entry->eindeutige_gruppen_id,
+				'eindeutige_kalender_gruppen_id' => $kalender_entry->eindeutige_kalender_gruppen_id,
 				'insertvon' => getAuthUID(),
 				'insertamum' => date('Y-m-d H:i:s')
 			)
diff --git a/application/libraries/collision/checks/ResourcesCollisionCheck.php b/application/libraries/collision/checks/ResourcesCollisionCheck.php
index 0be789b7f..0c957965d 100644
--- a/application/libraries/collision/checks/ResourcesCollisionCheck.php
+++ b/application/libraries/collision/checks/ResourcesCollisionCheck.php
@@ -28,7 +28,7 @@ class ResourcesCollisionCheck implements ICollisionCheck
 		if ($this->_ci->variablelib->getVar('ignore_resources_collisions') === 'true') return [];
 
 		$this->_ci->KalenderModel->addSelect('kalender_id, von, bis, bm.beschreibung AS betriebsmittel_beschreibung');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender bk', 'bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_gruppen_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender bk', 'bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id');
 		$this->_ci->KalenderModel->addJoin('wawi.tbl_betriebsmittel bm', 'bm.betriebsmittel_id = bk.betriebsmittel_id');
 
 		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
@@ -59,9 +59,9 @@ class ResourcesCollisionCheck implements ICollisionCheck
 		if (empty($kalender_ids)) return [];
 
 		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender current_bk', 'current_bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_gruppen_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender current_bk', 'current_bk.eindeutige_kalender_gruppen_id = tbl_kalender.eindeutige_kalender_gruppen_id');
 		$this->_ci->KalenderModel->addJoin('lehre.tbl_betriebsmittel_kalender other_bk', 'other_bk.betriebsmittel_id = current_bk.betriebsmittel_id');
-		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.eindeutige_gruppen_id = other_bk.eindeutige_kalender_gruppen_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.eindeutige_kalender_gruppen_id = other_bk.eindeutige_kalender_gruppen_id');
 
 		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
 		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
diff --git a/application/models/ressource/Betriebsmittel_model.php b/application/models/ressource/Betriebsmittel_model.php
index 682961cee..23468b9f8 100644
--- a/application/models/ressource/Betriebsmittel_model.php
+++ b/application/models/ressource/Betriebsmittel_model.php
@@ -43,7 +43,7 @@ class Betriebsmittel_model extends DB_Model
 					AND 
 				NOT EXISTS(
 					SELECT 1 FROM lehre.tbl_betriebsmittel_kalender
-					JOIN lehre.tbl_kalender ON tbl_kalender.eindeutige_gruppen_id = tbl_betriebsmittel_kalender.eindeutige_kalender_gruppen_id
+					JOIN lehre.tbl_kalender ON tbl_kalender.eindeutige_kalender_gruppen_id = tbl_betriebsmittel_kalender.eindeutige_kalender_gruppen_id
 					WHERE
 						betriebsmittel_id=tbl_betriebsmittel.betriebsmittel_id
 					AND tbl_kalender.von <= ?
diff --git a/application/models/ressource/Kalender_model.php b/application/models/ressource/Kalender_model.php
index 98d8ddd65..7c059f091 100644
--- a/application/models/ressource/Kalender_model.php
+++ b/application/models/ressource/Kalender_model.php
@@ -18,7 +18,7 @@ class Kalender_model extends DB_Model
 	{
 		while (true) {
 			$uniqueGroupId = generateUUID();
-			$result = $this->loadWhere(['eindeutige_gruppen_id' => $uniqueGroupId]);
+			$result = $this->loadWhere(['eindeutige_kalender_gruppen_id' => $uniqueGroupId]);
 			if (!hasData($result)) {
 				return $uniqueGroupId;
 			}
diff --git a/public/js/components/Calendar/Base/Grid/Line/Event.js b/public/js/components/Calendar/Base/Grid/Line/Event.js
index ba4fb57dd..66b6e9538 100644
--- a/public/js/components/Calendar/Base/Grid/Line/Event.js
+++ b/public/js/components/Calendar/Base/Grid/Line/Event.js
@@ -144,7 +144,7 @@ export default {
 		style="z-index: 11"
 		:draggable="draggable"
 		:data-id="'event-' + event.orig.kalender_id"
-		:data-group-id="'event-group-' + event.orig.eindeutige_gruppen_id"
+		:data-group-id="'event-group-' + event.orig.eindeutige_kalender_gruppen_id"
 		ref="eventEl"
 		@dragstart="onDragStart"
 		v-draggable:move.noimage="draggable ? dragKalenderCollection : {}"
diff --git a/public/js/components/Tempus/Tempus.js b/public/js/components/Tempus/Tempus.js
index 85361df23..b2c59c595 100644
--- a/public/js/components/Tempus/Tempus.js
+++ b/public/js/components/Tempus/Tempus.js
@@ -1029,7 +1029,7 @@ export default {
 
       setTimeout(() => {
         const eventEl = document.querySelector(
-          `[data-group-id="event-group-${this.currentlyUpdatedEvent.eindeutige_gruppen_id}"]`,
+          `[data-group-id="event-group-${this.currentlyUpdatedEvent.eindeutige_kalender_gruppen_id}"]`,
         );
         if (!eventEl) return;
 
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 688c44e1d..b7d13d1e5 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -100,6 +100,7 @@ require_once('dbupdate_3.4/77375_ressourcen.php');
 require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
 require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
 require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
+require_once('dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php b/system/dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php
new file mode 100644
index 000000000..b45460f4e
--- /dev/null
+++ b/system/dbupdate_3.4/78318_rename_column_of_eindeutige_gruppen_id_to_eindeutige_kalender_gruppen_id_in_tbl_kalender.php
@@ -0,0 +1,16 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+$result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'lehre' AND table_name = 'tbl_kalender' AND column_name = 'eindeutige_gruppen_id'");
+if($db->db_num_rows($result) === 1)
+{
+
+	$qry = "ALTER TABLE lehre.tbl_kalender
+			RENAME COLUMN eindeutige_gruppen_id TO eindeutige_kalender_gruppen_id";
+
+	if(!$db->db_query($qry))
+		echo '<strong>lehre.tbl_kalender: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_kalender column eindeutige_gruppen_id renamed to eindeutige_kalender_gruppen_id';
+
+}
\ No newline at end of file
diff --git a/system/seeders/015_kalender.sql b/system/seeders/015_kalender.sql
index 345e003a3..2ba23c754 100644
--- a/system/seeders/015_kalender.sql
+++ b/system/seeders/015_kalender.sql
@@ -161,7 +161,7 @@ VALUES
 
 -- Calendar setup for resources tests
 INSERT INTO lehre.tbl_kalender
-(von, bis, typ, status_kurzbz, vorgaenger_kalender_id, eindeutige_gruppen_id, insertamum, insertvon, updateamum, updatevon)
+(von, bis, typ, status_kurzbz, vorgaenger_kalender_id, eindeutige_kalender_gruppen_id, insertamum, insertvon, updateamum, updatevon)
 VALUES
 (date_trunc('week', CURRENT_DATE) + INTERVAL '6 day' + TIME '19:30:00', date_trunc('week', CURRENT_DATE) + INTERVAL '6 day' + TIME '20:15:00', 'lehreinheit', 'live', NULL, 'ec1bd001-facf-4b21-a671-bcb2d4f037fd', now(), 'demoadmin', NULL, 'demoadmin'),
 (date_trunc('week', CURRENT_DATE) + INTERVAL '6 day' + TIME '20:15:00', date_trunc('week', CURRENT_DATE) + INTERVAL '6 day' + TIME '21:00:00', 'lehreinheit', 'live', NULL, 'ec2bd001-facf-4b21-a671-bcb2d4f037fd', now(), 'demoadmin', NULL, 'demoadmin'),