diff --git a/core/src/main/resources/ctsms-criterionproperties.properties b/core/src/main/resources/ctsms-criterionproperties.properties
index ad0573c7207e..130be60e6b14 100644
--- a/core/src/main/resources/ctsms-criterionproperties.properties
+++ b/core/src/main/resources/ctsms-criterionproperties.properties
@@ -1,6 +1,6 @@
 
 inventory.id=ID
-inventory.department.id=Department
+inventory.department.id=Site
 inventory.category.id=Category
 inventory.name=Inventory name
 inventory.bookable=Bookable
@@ -22,7 +22,7 @@ inventory.statusEntries.type.id=Availability status type
 inventory.statusEntries.type.inventoryActive=Availability status type - inventory available
 
 staff.id=ID
-staff.department.id=Department
+staff.department.id=Site
 staff.category.id=Category
 staff.personParticulars.firstName=First name
 staff.personParticulars.lastName=Last name
@@ -66,7 +66,7 @@ staff.cvPositions.section.id=CV section
 staff.files=\#Files
 
 course.id=ID
-course.department.id=Department
+course.department.id=Site
 course.category.id=Category
 course.trial.id=Trial
 course.name=Course name
@@ -87,7 +87,7 @@ course.lecturers.staff.id=Lecturer
 course.lecturers=\#Lecturers
 
 trial.id=ID
-trial.department.id=Department
+trial.department.id=Site
 trial.name=Trial code
 trial.deferredDelete=Marked for deletion
 trial.status.id=Trial status
@@ -119,7 +119,7 @@ trial.dutyRosterTurns=\#Duties
 trial.courses=\#Courses
 
 proband.id=ID
-proband.department.id=Department
+proband.department.id=Site
 proband.category.id=Category
 proband.category.locked=Locked category
 proband.personParticulars.firstNameHash=First name
@@ -282,7 +282,7 @@ inputField.category=Category
 inputField.deferredDelete=Marked for deletion
 
 user.id=ID
-user.department.id=Department
+user.department.id=Site
 user.name=Username
 user.locked=Locked (any host)
 user.lockedUntrusted=Locked (untrusted hosts)
@@ -301,7 +301,7 @@ user.parent.id=Parent
 
 massMail.id=ID
 massMail.name=Mass mail name
-massMail.department.id=Department
+massMail.department.id=Site
 massMail.start=Sending start
 massMail.start.startByPeriod=Sending start (window)
 massMail.status.id=Mass mail status
diff --git a/core/src/main/resources/ctsms-criterionproperties_de.properties b/core/src/main/resources/ctsms-criterionproperties_de.properties
index b457a09cb178..8adaa517e5b6 100644
--- a/core/src/main/resources/ctsms-criterionproperties_de.properties
+++ b/core/src/main/resources/ctsms-criterionproperties_de.properties
@@ -1,6 +1,6 @@
 
 inventory.id=ID
-inventory.department.id=Organisationseinheit
+inventory.department.id=Site
 inventory.category.id=Kategorie
 inventory.name=Inventarname
 inventory.bookable=Buchbar
@@ -22,7 +22,7 @@ inventory.statusEntries.type.id=Verf\u00FCgbarkeit Status Typ
 inventory.statusEntries.type.inventoryActive=Verf\u00FCgbarkeit Status Typ - Inventar verf\u00FCgbar
 
 staff.id=ID
-staff.department.id=Organisationseinheit
+staff.department.id=Site
 staff.category.id=Kategorie
 staff.personParticulars.firstName=Vorname
 staff.personParticulars.lastName=Nachname
@@ -66,7 +66,7 @@ staff.cvPositions.section.id=CV Abschnitt
 staff.files=\#Dateien
 
 course.id=ID
-course.department.id=Organisationseinheit
+course.department.id=Site
 course.category.id=Kategorie
 course.trial.id=Studie
 course.name=Kursname
@@ -87,7 +87,7 @@ course.lecturers.staff.id=Vortragender
 course.lecturers=\#Vortragende
 
 trial.id=ID
-trial.department.id=Organisationseinheit
+trial.department.id=Site
 trial.name=Studien-Code
 trial.deferredDelete=Zur L\u00F6schung vorgemerkt
 trial.status.id=Studienstatus
@@ -119,7 +119,7 @@ trial.dutyRosterTurns=\#Dienste
 trial.courses=\#Kurse
 
 proband.id=ID
-proband.department.id=Organisationseinheit
+proband.department.id=Site
 proband.category.id=Kategorie
 proband.category.locked=Gesperrte Kategorie
 proband.personParticulars.firstNameHash=Vorname
@@ -281,7 +281,7 @@ inputField.category=Kategorie
 inputField.deferredDelete=Zur L\u00F6schung vorgemerkt
 
 user.id=ID
-user.department.id=Organisationseinheit
+user.department.id=Site
 user.name=Benutzername
 user.locked=Gesperrt (jeder Computer)
 user.lockedUntrusted=Gesperrt (nicht vertrauensw\u00FCrdige Computer)
@@ -300,7 +300,7 @@ user.parent.id=\u00DCbergeordneter Benutzer
 
 massMail.id=ID
 massMail.name=Massenmail Name
-massMail.department.id=Organisationseinheit
+massMail.department.id=Site
 massMail.start=Sendestart
 massMail.start.startByPeriod=Sendestart (Fenster)
 massMail.status.id=Massenmail Status
diff --git a/core/src/main/resources/ctsms-criterionproperties_ff.properties b/core/src/main/resources/ctsms-criterionproperties_ff.properties
index 125f0b1ec9f5..9f56bfe58ccb 100644
--- a/core/src/main/resources/ctsms-criterionproperties_ff.properties
+++ b/core/src/main/resources/ctsms-criterionproperties_ff.properties
@@ -1,6 +1,6 @@
 
 inventory.id=ID
-inventory.department.id=Department
+inventory.department.id=Site
 inventory.category.id=Category
 inventory.name=Inventory name
 inventory.bookable=Bookable
@@ -22,7 +22,7 @@ inventory.statusEntries.type.id=Availability status type
 inventory.statusEntries.type.inventoryActive=Availability status type - inventory available
 
 staff.id=ID
-staff.department.id=Department
+staff.department.id=Site
 staff.category.id=Category
 staff.personParticulars.firstName=First name
 staff.personParticulars.lastName=Last name
@@ -66,7 +66,7 @@ staff.cvPositions.section.id=CV section
 staff.files=\#Files
 
 course.id=ID
-course.department.id=Department
+course.department.id=Site
 course.category.id=Category
 course.trial.id=Trial
 course.name=Course name
@@ -87,7 +87,7 @@ course.lecturers.staff.id=Lecturer
 course.lecturers=\#Lecturers
 
 trial.id=ID
-trial.department.id=Department
+trial.department.id=Site
 trial.name=Trial code
 trial.deferredDelete=Marked for deletion
 trial.status.id=Trial status
@@ -119,7 +119,7 @@ trial.dutyRosterTurns=\#Duties
 trial.courses=\#Courses
 
 proband.id=ID
-proband.department.id=Department
+proband.department.id=Site
 proband.category.id=Category
 proband.category.locked=Locked category
 proband.personParticulars.firstNameHash=First name
@@ -282,7 +282,7 @@ inputField.category=Category
 inputField.deferredDelete=Marked for deletion
 
 user.id=ID
-user.department.id=Department
+user.department.id=Site
 user.name=Username
 user.locked=Locked (any host)
 user.lockedUntrusted=Locked (untrusted hosts)
@@ -301,7 +301,7 @@ user.parent.id=Parent
 
 massMail.id=ID
 massMail.name=Mass mail name
-massMail.department.id=Department
+massMail.department.id=Site
 massMail.start=Sending start
 massMail.start.startByPeriod=Sending start (window)
 massMail.status.id=Mass mail status
diff --git a/core/src/main/resources/ctsms-criterionproperties_kg.properties b/core/src/main/resources/ctsms-criterionproperties_kg.properties
index 125f0b1ec9f5..9f56bfe58ccb 100644
--- a/core/src/main/resources/ctsms-criterionproperties_kg.properties
+++ b/core/src/main/resources/ctsms-criterionproperties_kg.properties
@@ -1,6 +1,6 @@
 
 inventory.id=ID
-inventory.department.id=Department
+inventory.department.id=Site
 inventory.category.id=Category
 inventory.name=Inventory name
 inventory.bookable=Bookable
@@ -22,7 +22,7 @@ inventory.statusEntries.type.id=Availability status type
 inventory.statusEntries.type.inventoryActive=Availability status type - inventory available
 
 staff.id=ID
-staff.department.id=Department
+staff.department.id=Site
 staff.category.id=Category
 staff.personParticulars.firstName=First name
 staff.personParticulars.lastName=Last name
@@ -66,7 +66,7 @@ staff.cvPositions.section.id=CV section
 staff.files=\#Files
 
 course.id=ID
-course.department.id=Department
+course.department.id=Site
 course.category.id=Category
 course.trial.id=Trial
 course.name=Course name
@@ -87,7 +87,7 @@ course.lecturers.staff.id=Lecturer
 course.lecturers=\#Lecturers
 
 trial.id=ID
-trial.department.id=Department
+trial.department.id=Site
 trial.name=Trial code
 trial.deferredDelete=Marked for deletion
 trial.status.id=Trial status
@@ -119,7 +119,7 @@ trial.dutyRosterTurns=\#Duties
 trial.courses=\#Courses
 
 proband.id=ID
-proband.department.id=Department
+proband.department.id=Site
 proband.category.id=Category
 proband.category.locked=Locked category
 proband.personParticulars.firstNameHash=First name
@@ -282,7 +282,7 @@ inputField.category=Category
 inputField.deferredDelete=Marked for deletion
 
 user.id=ID
-user.department.id=Department
+user.department.id=Site
 user.name=Username
 user.locked=Locked (any host)
 user.lockedUntrusted=Locked (untrusted hosts)
@@ -301,7 +301,7 @@ user.parent.id=Parent
 
 massMail.id=ID
 massMail.name=Mass mail name
-massMail.department.id=Department
+massMail.department.id=Site
 massMail.start=Sending start
 massMail.start.startByPeriod=Sending start (window)
 massMail.status.id=Mass mail status
diff --git a/core/src/main/resources/ctsms-criterionrestrictions.properties b/core/src/main/resources/ctsms-criterionrestrictions.properties
index 40dd43c4ab97..cbde5080c696 100644
--- a/core/src/main/resources/ctsms-criterionrestrictions.properties
+++ b/core/src/main/resources/ctsms-criterionrestrictions.properties
@@ -46,18 +46,18 @@ IS_EQ_CONTEXT_USER_ID=is active user
 IS_NE_CONTEXT_USER_ID=is not active user
 IS_ID_EQ_CONTEXT_USER_ID=is active user
 IS_ID_NE_CONTEXT_USER_ID=is not active user
-IS_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user department
-IS_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user department
-IS_ID_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user department
-IS_ID_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user department
+IS_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user site
+IS_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user site
+IS_ID_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user site
+IS_ID_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user site
 IS_EQ_CONTEXT_IDENTITY_ID=is active person/org.
 IS_NE_CONTEXT_IDENTITY_ID=is not active person/org.
 IS_ID_EQ_CONTEXT_IDENTITY_ID=is active person/org.
 IS_ID_NE_CONTEXT_IDENTITY_ID=is not active person/org.
-IS_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. department
-IS_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. department
-IS_ID_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. department
-IS_ID_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. department
+IS_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. site
+IS_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. site
+IS_ID_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. site
+IS_ID_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. site
 TRUE=\u2200
 #IS_ID_EQ_ENTITY_ID=is self
 #IS_ID_NE_ENTITY_ID=is not self
diff --git a/core/src/main/resources/ctsms-criterionrestrictions_ff.properties b/core/src/main/resources/ctsms-criterionrestrictions_ff.properties
index 6329dc37b852..0c7d15aa82b2 100644
--- a/core/src/main/resources/ctsms-criterionrestrictions_ff.properties
+++ b/core/src/main/resources/ctsms-criterionrestrictions_ff.properties
@@ -46,18 +46,18 @@ IS_EQ_CONTEXT_USER_ID=is active user
 IS_NE_CONTEXT_USER_ID=is not active user
 IS_ID_EQ_CONTEXT_USER_ID=is active user
 IS_ID_NE_CONTEXT_USER_ID=is not active user
-IS_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user department
-IS_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user department
-IS_ID_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user department
-IS_ID_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user department
+IS_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user site
+IS_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user site
+IS_ID_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user site
+IS_ID_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user site
 IS_EQ_CONTEXT_IDENTITY_ID=is active person/org.
 IS_NE_CONTEXT_IDENTITY_ID=is not active person/org.
 IS_ID_EQ_CONTEXT_IDENTITY_ID=is active person/org.
 IS_ID_NE_CONTEXT_IDENTITY_ID=is not active person/org.
-IS_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. department
-IS_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. department
-IS_ID_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. department
-IS_ID_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. department
+IS_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. site
+IS_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. site
+IS_ID_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. site
+IS_ID_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. site
 TRUE=∀
 #IS_ID_EQ_ENTITY_ID=is self
 #IS_ID_NE_ENTITY_ID=is not self
diff --git a/core/src/main/resources/ctsms-criterionrestrictions_kg.properties b/core/src/main/resources/ctsms-criterionrestrictions_kg.properties
index 6329dc37b852..0c7d15aa82b2 100644
--- a/core/src/main/resources/ctsms-criterionrestrictions_kg.properties
+++ b/core/src/main/resources/ctsms-criterionrestrictions_kg.properties
@@ -46,18 +46,18 @@ IS_EQ_CONTEXT_USER_ID=is active user
 IS_NE_CONTEXT_USER_ID=is not active user
 IS_ID_EQ_CONTEXT_USER_ID=is active user
 IS_ID_NE_CONTEXT_USER_ID=is not active user
-IS_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user department
-IS_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user department
-IS_ID_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user department
-IS_ID_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user department
+IS_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user site
+IS_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user site
+IS_ID_EQ_CONTEXT_USER_DEPARTMENT_ID=is active user site
+IS_ID_NE_CONTEXT_USER_DEPARTMENT_ID=is not active user site
 IS_EQ_CONTEXT_IDENTITY_ID=is active person/org.
 IS_NE_CONTEXT_IDENTITY_ID=is not active person/org.
 IS_ID_EQ_CONTEXT_IDENTITY_ID=is active person/org.
 IS_ID_NE_CONTEXT_IDENTITY_ID=is not active person/org.
-IS_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. department
-IS_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. department
-IS_ID_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. department
-IS_ID_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. department
+IS_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. site
+IS_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. site
+IS_ID_EQ_CONTEXT_IDENTITY_DEPARTMENT_ID=is active person/org. site
+IS_ID_NE_CONTEXT_IDENTITY_DEPARTMENT_ID=is not active person/org. site
 TRUE=∀
 #IS_ID_EQ_ENTITY_ID=is self
 #IS_ID_NE_ENTITY_ID=is not self
diff --git a/core/src/main/resources/ctsms-messages.properties b/core/src/main/resources/ctsms-messages.properties
index f58e21b35d80..aa5d743474b5 100644
--- a/core/src/main/resources/ctsms-messages.properties
+++ b/core/src/main/resources/ctsms-messages.properties
@@ -2,9 +2,9 @@
 property_not_found_or_invalid_type=property {0} not found in class {1} or of invalid type
 criteria_property_type_not_supported=type {0} of property {1} not supported
 named_parameter_unknown_user=active user is unknown
-named_parameter_unknown_user_department=active user's department is unknown
+named_parameter_unknown_user_department=active user's site is unknown
 named_parameter_unknown_identity=active person's person/organisation is unknown
-named_parameter_unknown_identity_department=department of the active user's person/organisation is unknown
+named_parameter_unknown_identity_department=site of the active user's person/organisation is unknown
 named_parameter_explicit_variable_period=period in days not supported
 unsupported_db_module=unsupported DB module {0}
 sql_set_operation_keyword_undefined=SQL set operation keyword for {0} undefined
diff --git a/core/src/main/resources/ctsms-messages_de.properties b/core/src/main/resources/ctsms-messages_de.properties
index e8a4de0890c2..adea4944a3da 100644
--- a/core/src/main/resources/ctsms-messages_de.properties
+++ b/core/src/main/resources/ctsms-messages_de.properties
@@ -2,9 +2,9 @@
 property_not_found_or_invalid_type=Eigenschaft {0} in Klasse {1} nicht auffindbar oder ung\u00FCltiger Typ
 criteria_property_type_not_supported=Typ {0} der Eigenschaft {1} nicht unterst\u00FCtzt
 named_parameter_unknown_user=aktiver Benutzer unbekannt
-named_parameter_unknown_user_department=Organisationseinheit des aktiven Benutzers unbekannt
+named_parameter_unknown_user_department=Site des aktiven Benutzers unbekannt
 named_parameter_unknown_identity=Person/Organisation des aktiven Benutzers unbekannt
-named_parameter_unknown_identity_department=Organisationseinheit der Person/Organisation des aktiven Benutzers unbekannt
+named_parameter_unknown_identity_department=Site der Person/Organisation des aktiven Benutzers unbekannt
 named_parameter_explicit_variable_period=Dauer in Tagen nicht unterst\u00FCtzt
 unsupported_db_module=DB Modul {0} nicht unterst\u00FCtzt
 sql_set_operation_keyword_undefined=SQL Schl\u00FCsselwort f\u00FCr Mengenoperation {0} nicht definiert
diff --git a/core/src/main/resources/ctsms-messages_ff.properties b/core/src/main/resources/ctsms-messages_ff.properties
index de9cc2765c06..6877ff1f9bf6 100644
--- a/core/src/main/resources/ctsms-messages_ff.properties
+++ b/core/src/main/resources/ctsms-messages_ff.properties
@@ -2,9 +2,9 @@
 property_not_found_or_invalid_type=property {0} not found in class {1} or of invalid type
 criteria_property_type_not_supported=type {0} of property {1} not supported
 named_parameter_unknown_user=active user is unknown
-named_parameter_unknown_user_department=active user's department is unknown
+named_parameter_unknown_user_department=active user's site is unknown
 named_parameter_unknown_identity=active person's person/organisation is unknown
-named_parameter_unknown_identity_department=department of the active user's person/organisation is unknown
+named_parameter_unknown_identity_department=site of the active user's person/organisation is unknown
 named_parameter_explicit_variable_period=period in days not supported
 unsupported_db_module=unsupported DB module {0}
 sql_set_operation_keyword_undefined=SQL set operation keyword for {0} undefined
diff --git a/core/src/main/resources/ctsms-messages_kg.properties b/core/src/main/resources/ctsms-messages_kg.properties
index de9cc2765c06..6877ff1f9bf6 100644
--- a/core/src/main/resources/ctsms-messages_kg.properties
+++ b/core/src/main/resources/ctsms-messages_kg.properties
@@ -2,9 +2,9 @@
 property_not_found_or_invalid_type=property {0} not found in class {1} or of invalid type
 criteria_property_type_not_supported=type {0} of property {1} not supported
 named_parameter_unknown_user=active user is unknown
-named_parameter_unknown_user_department=active user's department is unknown
+named_parameter_unknown_user_department=active user's site is unknown
 named_parameter_unknown_identity=active person's person/organisation is unknown
-named_parameter_unknown_identity_department=department of the active user's person/organisation is unknown
+named_parameter_unknown_identity_department=site of the active user's person/organisation is unknown
 named_parameter_explicit_variable_period=period in days not supported
 unsupported_db_module=unsupported DB module {0}
 sql_set_operation_keyword_undefined=SQL set operation keyword for {0} undefined
diff --git a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-de.vsl b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-de.vsl
index 31f082b10343..e8e3fd6bbb8c 100644
--- a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-de.vsl
+++ b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-de.vsl
@@ -4,16 +4,16 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
-   • Kurs:                   $courseparticipationstatusentry_course_name
-   • Kurs CV Titel:          $courseparticipationstatusentry_course_cvtitle
-   • Kurs Org.einheit:       $courseparticipationstatusentry_course_department
-   • Kurs Kategorie:         $courseparticipationstatusentry_course_category
+   • Kurs:                 $courseparticipationstatusentry_course_name
+   • Kurs CV Titel:        $courseparticipationstatusentry_course_cvtitle
+   • Kurs Site:            $courseparticipationstatusentry_course_department
+   • Kurs Kategorie:       $courseparticipationstatusentry_course_category
 
-   • Teilnehmer:             $courseparticipationstatusentry_staff_name
-   • Teilnehmer Org.einheit: $courseparticipationstatusentry_staff_department
-   • Teilnehmer Kategorie:   $courseparticipationstatusentry_staff_category
+   • Teilnehmer:           $courseparticipationstatusentry_staff_name
+   • Teilnehmer Site:      $courseparticipationstatusentry_staff_department
+   • Teilnehmer Kategorie: $courseparticipationstatusentry_staff_category
 
-   • Teilnahmestatus:        $courseparticipationstatusentry_status
+   • Teilnahmestatus:      $courseparticipationstatusentry_status
 
 Kommentar:
 
diff --git a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-ff.vsl b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-ff.vsl
index ad85d5b6cbec..3a945cca5ed9 100644
--- a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-ff.vsl
@@ -10,7 +10,7 @@ this is a notification for the following event:
    • Course category:      $courseparticipationstatusentry_course_category
 
    • Participant:          $courseparticipationstatusentry_staff_name
-   • Participant dept.:    $courseparticipationstatusentry_staff_department
+   • Participant site:    $courseparticipationstatusentry_staff_department
    • Participant category: $courseparticipationstatusentry_staff_category
 
    • Participation status: $courseparticipationstatusentry_status
diff --git a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-kg.vsl b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-kg.vsl
index ad85d5b6cbec..3a945cca5ed9 100644
--- a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated-kg.vsl
@@ -10,7 +10,7 @@ this is a notification for the following event:
    • Course category:      $courseparticipationstatusentry_course_category
 
    • Participant:          $courseparticipationstatusentry_staff_name
-   • Participant dept.:    $courseparticipationstatusentry_staff_department
+   • Participant site:    $courseparticipationstatusentry_staff_department
    • Participant category: $courseparticipationstatusentry_staff_category
 
    • Participation status: $courseparticipationstatusentry_status
diff --git a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated.vsl b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated.vsl
index ad85d5b6cbec..677ba26ecce3 100644
--- a/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated.vsl
+++ b/core/src/main/resources/ctsms-notification-courseparticipationstatusupdated.vsl
@@ -6,11 +6,11 @@ this is a notification for the following event:
 
    • Course:               $courseparticipationstatusentry_course_name
    • Course CV title:      $courseparticipationstatusentry_course_cvtitle
-   • Course department:    $courseparticipationstatusentry_course_department
+   • Course site:          $courseparticipationstatusentry_course_department
    • Course category:      $courseparticipationstatusentry_course_category
 
    • Participant:          $courseparticipationstatusentry_staff_name
-   • Participant dept.:    $courseparticipationstatusentry_staff_department
+   • Participant site:     $courseparticipationstatusentry_staff_department
    • Participant category: $courseparticipationstatusentry_staff_category
 
    • Participation status: $courseparticipationstatusentry_status
diff --git a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-de.vsl b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-de.vsl
index 6e081b1b15d2..1119babf0885 100644
--- a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-de.vsl
+++ b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-de.vsl
@@ -1,11 +1,11 @@
-Liebes $ecrfstatusentry_listentry_trial_name Studienteammitglied oder Angehörige/r der Org.einheit $ecrfstatusentry_listentry_trial_department,
+Liebes $ecrfstatusentry_listentry_trial_name Studienteammitglied oder Angehörige/r der Site $ecrfstatusentry_listentry_trial_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
    • Studie:                $ecrfstatusentry_listentry_trial_name
-   • Studie Org.einheit:    $ecrfstatusentry_listentry_trial_department
+   • Studie Site:           $ecrfstatusentry_listentry_trial_department
    • Proband:               #if($string_utils.isEmpty($ecrfstatusentry_listentry_proband_alias))$ecrfstatusentry_listentry_proband_id#{else}$ecrfstatusentry_listentry_proband_alias#end
 
    • eCRF:                  $ecrfstatusentry_ecrf_name
diff --git a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ff.vsl b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ff.vsl
index 34206ada8e32..942f07aefa83 100644
--- a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ff.vsl
@@ -1,4 +1,4 @@
-Dear $ecrfstatusentry_listentry_trial_name trial team member or member of dept. $ecrfstatusentry_listentry_trial_department,
+Dear $ecrfstatusentry_listentry_trial_name trial team member or member of site $ecrfstatusentry_listentry_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ig.vsl b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ig.vsl
index 96c134c1fae5..592a50280a07 100644
--- a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $ecrfstatusentry_listentry_trial_name onye otu ikpe ma ọ bụ onye otu dept. $ecrfstatusentry_listentry_trial_department,
+Ezigbo $ecrfstatusentry_listentry_trial_name onye otu ikpe ma ọ bụ onye otu site $ecrfstatusentry_listentry_trial_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-kg.vsl b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-kg.vsl
index 34206ada8e32..942f07aefa83 100644
--- a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-kg.vsl
@@ -1,4 +1,4 @@
-Dear $ecrfstatusentry_listentry_trial_name trial team member or member of dept. $ecrfstatusentry_listentry_trial_department,
+Dear $ecrfstatusentry_listentry_trial_name trial team member or member of site $ecrfstatusentry_listentry_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ln.vsl b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ln.vsl
index 3ae1c41d5ec5..ae768a06af40 100644
--- a/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-ecrfstatusupdated-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $ecrfstatusentry_listentry_trial_name membre ya équipe ya procès to membre ya dept. $ecrfstatusentry_listentry_trial_department, .
+Ndeko $ecrfstatusentry_listentry_trial_name membre ya équipe ya procès to membre ya site $ecrfstatusentry_listentry_trial_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-ecrfstatusupdated.vsl b/core/src/main/resources/ctsms-notification-ecrfstatusupdated.vsl
index 34206ada8e32..fad10cd7c080 100644
--- a/core/src/main/resources/ctsms-notification-ecrfstatusupdated.vsl
+++ b/core/src/main/resources/ctsms-notification-ecrfstatusupdated.vsl
@@ -1,11 +1,11 @@
-Dear $ecrfstatusentry_listentry_trial_name trial team member or member of dept. $ecrfstatusentry_listentry_trial_department,
+Dear $ecrfstatusentry_listentry_trial_name trial team member or member of site $ecrfstatusentry_listentry_trial_department,
 
 this is a notification for the following event:
 
    $type
 
    • Trial:                $ecrfstatusentry_listentry_trial_name
-   • Trial department:     $ecrfstatusentry_listentry_trial_department
+   • Trial site:           $ecrfstatusentry_listentry_trial_department
    • Proband:              #if($string_utils.isEmpty($ecrfstatusentry_listentry_proband_alias))$ecrfstatusentry_listentry_proband_id#{else}$ecrfstatusentry_listentry_proband_alias#end
 
    • eCRF:                 $ecrfstatusentry_ecrf_name
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-de.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-de.vsl
index 476c09f6b00a..3391e986c21e 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-de.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-de.vsl
@@ -1,4 +1,4 @@
-Hallo $course_name Vortragender oder Angehörige/r der Org.einheit $course_department,
+Hallo $course_name Vortragender oder Angehörige/r der Site $course_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Kurs:                 $course_name
    • Kurs CV Titel:        $course_cvtitle
-   • Kurs Org.einheit:     $course_department
+   • Kurs Site:            $course_department
    • Kurs Kategorie:       $course_category
 
    • Kursende:             $course_stop
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-ff.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-ff.vsl
index 767f06744c1d..0ba4b13dc69a 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-ff.vsl
@@ -1,4 +1,4 @@
-Dear $course_name lecturer or member of dept. $course_department,
+Dear $course_name lecturer or member of site $course_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-ig.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-ig.vsl
index 72a79193bf97..88d5f6bac0ff 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $course_name onye nkuzi ma ọ bụ onye otu dept. $course_department,
+Ezigbo $course_name onye nkuzi ma ọ bụ onye otu site $course_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-kg.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-kg.vsl
index 767f06744c1d..0ba4b13dc69a 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-kg.vsl
@@ -1,4 +1,4 @@
-Dear $course_name lecturer or member of dept. $course_department,
+Dear $course_name lecturer or member of site $course_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-ln.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-ln.vsl
index 00fd847c45b3..7bf3db17756e 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $course_name molakisi to membre ya dept. $course_department, .
+Ndeko $course_name molakisi to membre ya site $course_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-ro.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-ro.vsl
index e8e1be2f72dd..f5bf094135ad 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-ro.vsl
@@ -1,4 +1,4 @@
-Stimate $course_name lector sau membru al dept. $course_department,
+Stimate $course_name lector sau membru al site $course_department,
 
 aceasta este o notificare pentru următorul eveniment:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse-zh.vsl b/core/src/main/resources/ctsms-notification-expiringcourse-zh.vsl
index dc6cd0aa2771..27520087f15b 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse-zh.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse-zh.vsl
@@ -1,4 +1,4 @@
-Dear $course_name lecturer or member of dept. $course_department,
+Dear $course_name lecturer or member of site $course_department,
 
 这是针对以下事件的通知：
 
diff --git a/core/src/main/resources/ctsms-notification-expiringcourse.vsl b/core/src/main/resources/ctsms-notification-expiringcourse.vsl
index 767f06744c1d..3e9e0590a200 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourse.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourse.vsl
@@ -1,4 +1,4 @@
-Dear $course_name lecturer or member of dept. $course_department,
+Dear $course_name lecturer or member of site $course_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Course:              $course_name
    • Course CV title:     $course_cvtitle
-   • Course department:   $course_department
+   • Course site:         $course_department
    • Course category:     $course_category
 
    • Course end:          $course_stop
diff --git a/core/src/main/resources/ctsms-notification-expiringcourseparticipation-de.vsl b/core/src/main/resources/ctsms-notification-expiringcourseparticipation-de.vsl
index 3c87898f938e..08175da22b92 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourseparticipation-de.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourseparticipation-de.vsl
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Kurs:                 $courseparticipationstatusentry_course_name
    • Kurs CV Titel:        $courseparticipationstatusentry_course_cvtitle
-   • Kurs Org.einheit:     $courseparticipationstatusentry_course_department
+   • Kurs Site:            $courseparticipationstatusentry_course_department
    • Kurskategorie:        $courseparticipationstatusentry_course_category
 
    • Kursende:             $courseparticipationstatusentry_course_stop
diff --git a/core/src/main/resources/ctsms-notification-expiringcourseparticipation.vsl b/core/src/main/resources/ctsms-notification-expiringcourseparticipation.vsl
index 8f7a152bf31f..9599f16ab178 100644
--- a/core/src/main/resources/ctsms-notification-expiringcourseparticipation.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringcourseparticipation.vsl
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Course:              $courseparticipationstatusentry_course_name
    • Course CV title:     $courseparticipationstatusentry_course_cvtitle
-   • Course department:   $courseparticipationstatusentry_course_department
+   • Course site:         $courseparticipationstatusentry_course_department
    • Course category:     $courseparticipationstatusentry_course_category
 
    • Course end:          $courseparticipationstatusentry_course_stop
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl
index 4ff3ac9e3813..443008731d93 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-de.vsl
@@ -1,11 +1,11 @@
-Hallo #if($notification.password.user.identity)Benutzer $password_user_name#{else}Angehörige/r der Org.einheit $password_user_department#end,
+Hallo #if($notification.password.user.identity)Benutzer $password_user_name#{else}Angehörige/r der Site $password_user_department#end,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
    • Benutzername:           $password_user_name
-   • Benutzer Org.einheit:   $password_user_department
+   • Benutzer Site:          $password_user_department
 
    • Passwort Ablauf:        $password_expiration
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-ff.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-ff.vsl
index d9e196c66d8f..6e598ccfd2bc 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-ff.vsl
@@ -1,4 +1,4 @@
-Dear #if($notification.password.user.identity)user $password_user_name#{else}member of dept. $password_user_department#end,
+Dear #if($notification.password.user.identity)user $password_user_name#{else}member of site $password_user_department#end,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-ig.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-ig.vsl
index d3e95311daeb..bbb5a57a7cee 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo onye ọrụ # if($notification.password.user.identity) $password_user_name#{else}onye otu dept. $password_user_department#njedebe,
+Ezigbo onye ọrụ # if($notification.password.user.identity) $password_user_name#{else}onye otu site $password_user_department#njedebe,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-kg.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-kg.vsl
index d9e196c66d8f..6e598ccfd2bc 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-kg.vsl
@@ -1,4 +1,4 @@
-Dear #if($notification.password.user.identity)user $password_user_name#{else}member of dept. $password_user_department#end,
+Dear #if($notification.password.user.identity)user $password_user_name#{else}member of site $password_user_department#end,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-ln.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-ln.vsl
index 137eecbb02cf..7ef46fd01aff 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko #soki($notification.mot ya nzela.identité.mosaleli)mosaleli $password_user_name#{else}membre ya dept. $password_user_department#nsuka,
+Ndeko #soki($notification.mot ya nzela.identité.mosaleli)mosaleli $password_user_name#{else}membre ya site $password_user_department#nsuka,
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword-ro.vsl b/core/src/main/resources/ctsms-notification-expiringpassword-ro.vsl
index 58e6dfb6e7d8..e62c6f01debc 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword-ro.vsl
@@ -1,4 +1,4 @@
-Stimate #if($notification.password.user.identity)utilizator $password_user_name#{else}membru al dept. $password_user_department#sfârșit,
+Stimate #if($notification.password.user.identity)utilizator $password_user_name#{else}membru al site $password_user_department#sfârșit,
 
 aceasta este o notificare pentru următorul eveniment:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringpassword.vsl b/core/src/main/resources/ctsms-notification-expiringpassword.vsl
index d9e196c66d8f..e918f1e3e0fb 100644
--- a/core/src/main/resources/ctsms-notification-expiringpassword.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringpassword.vsl
@@ -1,11 +1,11 @@
-Dear #if($notification.password.user.identity)user $password_user_name#{else}member of dept. $password_user_department#end,
+Dear #if($notification.password.user.identity)user $password_user_name#{else}member of site $password_user_department#end,
 
 this is a notification for the following event:
 
    $type
 
    • Username:            $password_user_name
-   • User department:     $password_user_department
+   • User site:           $password_user_department
 
    • Password expiration: $password_expiration
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-de.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-de.vsl
index 9f9e40e5bff4..0f197085a28b 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-de.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-de.vsl
@@ -1,18 +1,18 @@
-Hallo Angehörige/r der Org.einheit $proband_department,
+Hallo Angehörige/r der Site $proband_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
-   • Proband:             #if($string_utils.isEmpty($proband_alias))$proband_id#{else}$proband_alias#end
+   • Proband:            #if($string_utils.isEmpty($proband_alias))$proband_id#{else}$proband_alias#end
 
-   • Proband Org.einheit: $proband_department
-   • Proband Kategorie:   $proband_category
+   • Proband Site:       $proband_department
+   • Proband Kategorie:  $proband_category
 
-   • Löschung geplant:    $proband_autodeletedeadline
+   • Löschung geplant:   $proband_autodeletedeadline
 
-   • Zuletzt bearbeitet:  $proband_modifiedtimestamp
-   • Benutzer:            #if($notification.proband.modifiedUser.identity)$proband_modifieduser_identity_name#{else}$proband_modifieduser_name#end
+   • Zuletzt bearbeitet: $proband_modifiedtimestamp
+   • Benutzer:           #if($notification.proband.modifiedUser.identity)$proband_modifieduser_identity_name#{else}$proband_modifieduser_name#end
 
 
 Sofern keine Einverständniserklärung des Probanden vorliegt, ist die Löschung von Datensätzen eine Erfordernis des Datenschutzes, um sensible Inforamtionen des Probanden zu schützen und personenbezogene Daten zu verwerfen. Die Löschung kann folgedessen nicht rückgängig gemacht werden.
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ff.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ff.vsl
index 17a57e42ec38..8309d41db372 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ff.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $proband_department,
+Dear member of site $proband_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ig.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ig.vsl
index 2bc59a14aec7..7bb5b079adff 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo onye otu dept. $proband_department,
+Ezigbo onye otu site $proband_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-kg.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-kg.vsl
index 17a57e42ec38..8309d41db372 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-kg.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $proband_department,
+Dear member of site $proband_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ln.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ln.vsl
index 6cf6cc678f2e..ee64544a22c3 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko mosangani ya dept. $proband_department, .
+Ndeko mosangani ya site $proband_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ro.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ro.vsl
index 67b74fcd12fa..362075b75604 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-ro.vsl
@@ -1,4 +1,4 @@
-Dragă membru al dept. $proband_department,
+Dragă membru al site $proband_department,
 
 aceasta este o notificare pentru următorul eveniment:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-sw.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-sw.vsl
index 77f60189085a..40f4c944271c 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete-sw.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete-sw.vsl
@@ -1,4 +1,4 @@
-Ndugu mwanachama wa dept. $proband_department,
+Ndugu mwanachama wa site $proband_department,
 
 hii ni arifa ya tukio lifuatalo:
 
diff --git a/core/src/main/resources/ctsms-notification-expiringprobandautodelete.vsl b/core/src/main/resources/ctsms-notification-expiringprobandautodelete.vsl
index 17a57e42ec38..c10f1b4ac142 100644
--- a/core/src/main/resources/ctsms-notification-expiringprobandautodelete.vsl
+++ b/core/src/main/resources/ctsms-notification-expiringprobandautodelete.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $proband_department,
+Dear member of site $proband_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Proband:                 #if($string_utils.isEmpty($proband_alias))$proband_id#{else}$proband_alias#end
 
-   • Proband deptartment:     $proband_department
+   • Proband site:            $proband_department
    • Proband category:        $proband_category
 
    • Deletetion scheduled:    $proband_autodeletedeadline
diff --git a/core/src/main/resources/ctsms-notification-inventoryinactive-de.vsl b/core/src/main/resources/ctsms-notification-inventoryinactive-de.vsl
index 1a7c0d9a965f..f5eec99e9c5b 100644
--- a/core/src/main/resources/ctsms-notification-inventoryinactive-de.vsl
+++ b/core/src/main/resources/ctsms-notification-inventoryinactive-de.vsl
@@ -1,11 +1,11 @@
-Hallo Angehörige/r der Org.einheit $inventorystatusentry_inventory_department,
+Hallo Angehörige/r der Site $inventorystatusentry_inventory_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
    • Inventar:             $inventorystatusentry_inventory_name
-   • Inventar Org.einheit: $inventorystatusentry_inventory_department
+   • Inventar Site:        $inventorystatusentry_inventory_department
    • Inventar Kategorie:   $inventorystatusentry_inventory_category
 
    • Typ:                  $inventorystatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-inventoryinactive-ff.vsl b/core/src/main/resources/ctsms-notification-inventoryinactive-ff.vsl
index 11199c9c90b3..286114b22cd6 100644
--- a/core/src/main/resources/ctsms-notification-inventoryinactive-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-inventoryinactive-ff.vsl
@@ -1,11 +1,11 @@
-Dear member of dept. $inventorystatusentry_inventory_department,
+Dear member of site $inventorystatusentry_inventory_department,
 
 this is a notification for the following event:
 
    $type
 
    • Inventory:       $inventorystatusentry_inventory_name
-   • Inventory dept.: $inventorystatusentry_inventory_department
+   • Inventory site: $inventorystatusentry_inventory_department
    • Inventory cat.:  $inventorystatusentry_inventory_category
 
    • Type:            $inventorystatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-inventoryinactive.vsl b/core/src/main/resources/ctsms-notification-inventoryinactive.vsl
index 11199c9c90b3..d19132cf51bd 100644
--- a/core/src/main/resources/ctsms-notification-inventoryinactive.vsl
+++ b/core/src/main/resources/ctsms-notification-inventoryinactive.vsl
@@ -1,11 +1,11 @@
-Dear member of dept. $inventorystatusentry_inventory_department,
+Dear member of site $inventorystatusentry_inventory_department,
 
 this is a notification for the following event:
 
    $type
 
    • Inventory:       $inventorystatusentry_inventory_name
-   • Inventory dept.: $inventorystatusentry_inventory_department
+   • Inventory site:  $inventorystatusentry_inventory_department
    • Inventory cat.:  $inventorystatusentry_inventory_category
 
    • Type:            $inventorystatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-inventoryinactivebooking-de.vsl b/core/src/main/resources/ctsms-notification-inventoryinactivebooking-de.vsl
index ce145c6c8b12..6cf44eaa4964 100644
--- a/core/src/main/resources/ctsms-notification-inventoryinactivebooking-de.vsl
+++ b/core/src/main/resources/ctsms-notification-inventoryinactivebooking-de.vsl
@@ -5,7 +5,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
    $type
 
    • Inventar:             $inventorybooking_inventory_name
-   • Inventar Org.einheit: $inventorybooking_inventory_department
+   • Inventar Site:        $inventorybooking_inventory_department
    • Inventar Kategorie:   $inventorybooking_inventory_category
 
    • Status Type:          $inventorystatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-inventoryinactivebooking-kg.vsl b/core/src/main/resources/ctsms-notification-inventoryinactivebooking-kg.vsl
index 0a7591ea439d..1e5208c2b7a2 100644
--- a/core/src/main/resources/ctsms-notification-inventoryinactivebooking-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-inventoryinactivebooking-kg.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Inventory:       $inventorybooking_inventory_name
-   • Inventory dept.: $inventorybooking_inventory_department
+   • Inventory site: $inventorybooking_inventory_department
    • Inventory cat.:  $inventorybooking_inventory_category
 
    • Status type:     $inventorystatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-inventoryinactivebooking.vsl b/core/src/main/resources/ctsms-notification-inventoryinactivebooking.vsl
index 0a7591ea439d..2b0cc3881fa6 100644
--- a/core/src/main/resources/ctsms-notification-inventoryinactivebooking.vsl
+++ b/core/src/main/resources/ctsms-notification-inventoryinactivebooking.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Inventory:       $inventorybooking_inventory_name
-   • Inventory dept.: $inventorybooking_inventory_department
+   • Inventory site:  $inventorybooking_inventory_department
    • Inventory cat.:  $inventorybooking_inventory_category
 
    • Status type:     $inventorystatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-maintenancereminder-de.vsl b/core/src/main/resources/ctsms-notification-maintenancereminder-de.vsl
index dcb916c742f3..c4bd4f3fa16a 100644
--- a/core/src/main/resources/ctsms-notification-maintenancereminder-de.vsl
+++ b/core/src/main/resources/ctsms-notification-maintenancereminder-de.vsl
@@ -5,7 +5,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
    $type
 
    • Inventar:             $maintenancescheduleitem_inventory_name
-   • Inventar Org.einheit: $maintenancescheduleitem_inventory_department
+   • Inventar Site:        $maintenancescheduleitem_inventory_department
    • Inventar Kategorie:   $maintenancescheduleitem_inventory_category
 
    • Titel:                '$notification.maintenanceScheduleItem.title'
diff --git a/core/src/main/resources/ctsms-notification-maintenancereminder-ff.vsl b/core/src/main/resources/ctsms-notification-maintenancereminder-ff.vsl
index d271fb7c4f53..075d64d8721c 100644
--- a/core/src/main/resources/ctsms-notification-maintenancereminder-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-maintenancereminder-ff.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Inventory:       $maintenancescheduleitem_inventory_name
-   • Inventory dept.: $maintenancescheduleitem_inventory_department
+   • Inventory site: $maintenancescheduleitem_inventory_department
    • Inventory cat.:  $maintenancescheduleitem_inventory_category
 
    • Title:           '$notification.maintenanceScheduleItem.title'
diff --git a/core/src/main/resources/ctsms-notification-maintenancereminder-kg.vsl b/core/src/main/resources/ctsms-notification-maintenancereminder-kg.vsl
index d271fb7c4f53..075d64d8721c 100644
--- a/core/src/main/resources/ctsms-notification-maintenancereminder-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-maintenancereminder-kg.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Inventory:       $maintenancescheduleitem_inventory_name
-   • Inventory dept.: $maintenancescheduleitem_inventory_department
+   • Inventory site: $maintenancescheduleitem_inventory_department
    • Inventory cat.:  $maintenancescheduleitem_inventory_category
 
    • Title:           '$notification.maintenanceScheduleItem.title'
diff --git a/core/src/main/resources/ctsms-notification-maintenancereminder.vsl b/core/src/main/resources/ctsms-notification-maintenancereminder.vsl
index d271fb7c4f53..70b2299b5d36 100644
--- a/core/src/main/resources/ctsms-notification-maintenancereminder.vsl
+++ b/core/src/main/resources/ctsms-notification-maintenancereminder.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Inventory:       $maintenancescheduleitem_inventory_name
-   • Inventory dept.: $maintenancescheduleitem_inventory_department
+   • Inventory site:  $maintenancescheduleitem_inventory_department
    • Inventory cat.:  $maintenancescheduleitem_inventory_category
 
    • Title:           '$notification.maintenanceScheduleItem.title'
diff --git a/core/src/main/resources/ctsms-notification-newcourse-de.vsl b/core/src/main/resources/ctsms-notification-newcourse-de.vsl
index 0b6cab36f347..ad230e3c9779 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-de.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-de.vsl
@@ -1,4 +1,4 @@
-Hallo Angehörige/r der Org.einheit $course_department,
+Hallo Angehörige/r der Site $course_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Kurs:             $course_name
    • Kurs CV Titel:    $course_cvtitle
-   • Kurs Org.einheit: $course_department
+   • Kurs Site:        $course_department
    • Kurs Kategorie:   $course_category
 
    • Kursbeginn:       $course_start
diff --git a/core/src/main/resources/ctsms-notification-newcourse-ff.vsl b/core/src/main/resources/ctsms-notification-newcourse-ff.vsl
index 2d090b1ab10f..b20c8ae58dac 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-ff.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $course_department,
+Dear member of site $course_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-newcourse-ig.vsl b/core/src/main/resources/ctsms-notification-newcourse-ig.vsl
index 16c883d20674..81cee430ab5e 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo onye otu dept. $course_department,
+Ezigbo onye otu site $course_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-newcourse-kg.vsl b/core/src/main/resources/ctsms-notification-newcourse-kg.vsl
index 2d090b1ab10f..b20c8ae58dac 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-kg.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $course_department,
+Dear member of site $course_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-newcourse-ln.vsl b/core/src/main/resources/ctsms-notification-newcourse-ln.vsl
index 331ed9c5ebad..a2f0d5918de5 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko mosangani ya dept. $course_department, .
+Ndeko mosangani ya site $course_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-newcourse-ro.vsl b/core/src/main/resources/ctsms-notification-newcourse-ro.vsl
index 22b94f8d2d30..a5e073dc9e0e 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-ro.vsl
@@ -1,4 +1,4 @@
-Dragă membru al dept. $course_department,
+Dragă membru al site $course_department,
 
 aceasta este o notificare pentru următorul eveniment:
 
diff --git a/core/src/main/resources/ctsms-notification-newcourse-sw.vsl b/core/src/main/resources/ctsms-notification-newcourse-sw.vsl
index 64fb3d214928..d8a8c79ecc78 100644
--- a/core/src/main/resources/ctsms-notification-newcourse-sw.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse-sw.vsl
@@ -1,4 +1,4 @@
-Ndugu mwanachama wa dept. $course_department,
+Ndugu mwanachama wa site $course_department,
 
 hii ni arifa ya tukio lifuatalo:
 
diff --git a/core/src/main/resources/ctsms-notification-newcourse.vsl b/core/src/main/resources/ctsms-notification-newcourse.vsl
index 2d090b1ab10f..eabef007f7ff 100644
--- a/core/src/main/resources/ctsms-notification-newcourse.vsl
+++ b/core/src/main/resources/ctsms-notification-newcourse.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $course_department,
+Dear member of site $course_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Course:                 $course_name
    • Course CV title:        $course_cvtitle
-   • Course department:      $course_department
+   • Course site:            $course_department
    • Course category:        $course_category
 
    • Course start:           $course_start
diff --git a/core/src/main/resources/ctsms-notification-newecrffieldstatus-de.vsl b/core/src/main/resources/ctsms-notification-newecrffieldstatus-de.vsl
index 27c74136814b..78e27ea31924 100644
--- a/core/src/main/resources/ctsms-notification-newecrffieldstatus-de.vsl
+++ b/core/src/main/resources/ctsms-notification-newecrffieldstatus-de.vsl
@@ -1,11 +1,11 @@
-Liebes $ecrffieldstatusentry_listentry_trial_name Studienteammitglied oder Angehörige/r der Org.einheit $ecrffieldstatusentry_listentry_trial_department,
+Liebes $ecrffieldstatusentry_listentry_trial_name Studienteammitglied oder Angehörige/r der Site $ecrffieldstatusentry_listentry_trial_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
    • Studie:             $ecrffieldstatusentry_listentry_trial_name
-   • Studie Org.einheit: $ecrffieldstatusentry_listentry_trial_department
+   • Studie Site:        $ecrffieldstatusentry_listentry_trial_department
    • Proband:            #if($string_utils.isEmpty($ecrffieldstatusentry_listentry_proband_alias))$ecrffieldstatusentry_listentry_proband_id#{else}$ecrffieldstatusentry_listentry_proband_alias#end
 
    • eCRF:               $ecrffieldstatusentry_ecrffield_ecrf_name
diff --git a/core/src/main/resources/ctsms-notification-newecrffieldstatus-ff.vsl b/core/src/main/resources/ctsms-notification-newecrffieldstatus-ff.vsl
index 9be455ab3a1f..b6f7ce8dba17 100644
--- a/core/src/main/resources/ctsms-notification-newecrffieldstatus-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-newecrffieldstatus-ff.vsl
@@ -1,4 +1,4 @@
-Dear $ecrffieldstatusentry_listentry_trial_name trial team member or member of dept. $ecrffieldstatusentry_listentry_trial_department,
+Dear $ecrffieldstatusentry_listentry_trial_name trial team member or member of site $ecrffieldstatusentry_listentry_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-newecrffieldstatus-ig.vsl b/core/src/main/resources/ctsms-notification-newecrffieldstatus-ig.vsl
index 41ba99c39743..4b9873d55954 100644
--- a/core/src/main/resources/ctsms-notification-newecrffieldstatus-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-newecrffieldstatus-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $ecrffieldstatusentry_listentry_trial_name onye otu ikpe ma ọ bụ onye otu dept. $ecrffieldstatusentry_listentry_trial_department,
+Ezigbo $ecrffieldstatusentry_listentry_trial_name onye otu ikpe ma ọ bụ onye otu site $ecrffieldstatusentry_listentry_trial_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-newecrffieldstatus-kg.vsl b/core/src/main/resources/ctsms-notification-newecrffieldstatus-kg.vsl
index 9be455ab3a1f..b6f7ce8dba17 100644
--- a/core/src/main/resources/ctsms-notification-newecrffieldstatus-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-newecrffieldstatus-kg.vsl
@@ -1,4 +1,4 @@
-Dear $ecrffieldstatusentry_listentry_trial_name trial team member or member of dept. $ecrffieldstatusentry_listentry_trial_department,
+Dear $ecrffieldstatusentry_listentry_trial_name trial team member or member of site $ecrffieldstatusentry_listentry_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-newecrffieldstatus-ln.vsl b/core/src/main/resources/ctsms-notification-newecrffieldstatus-ln.vsl
index 9aa523ab5bfc..d2e05a72b7f4 100644
--- a/core/src/main/resources/ctsms-notification-newecrffieldstatus-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-newecrffieldstatus-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $ecrffieldstatusentry_listentry_trial_name membre ya équipe ya procès to membre ya dept. $ecrffieldstatusentry_listentry_trial_department, .
+Ndeko $ecrffieldstatusentry_listentry_trial_name membre ya équipe ya procès to membre ya site $ecrffieldstatusentry_listentry_trial_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-newecrffieldstatus.vsl b/core/src/main/resources/ctsms-notification-newecrffieldstatus.vsl
index 9be455ab3a1f..2186cec10f64 100644
--- a/core/src/main/resources/ctsms-notification-newecrffieldstatus.vsl
+++ b/core/src/main/resources/ctsms-notification-newecrffieldstatus.vsl
@@ -1,11 +1,11 @@
-Dear $ecrffieldstatusentry_listentry_trial_name trial team member or member of dept. $ecrffieldstatusentry_listentry_trial_department,
+Dear $ecrffieldstatusentry_listentry_trial_name trial team member or member of site $ecrffieldstatusentry_listentry_trial_department,
 
 this is a notification for the following event:
 
    $type
 
    • Trial:              $ecrffieldstatusentry_listentry_trial_name
-   • Trial department:   $ecrffieldstatusentry_listentry_trial_department
+   • Trial site:         $ecrffieldstatusentry_listentry_trial_department
    • Proband:            #if($string_utils.isEmpty($ecrffieldstatusentry_listentry_proband_alias))$ecrffieldstatusentry_listentry_proband_id#{else}$ecrffieldstatusentry_listentry_proband_alias#end
 
    • eCRF:               $ecrffieldstatusentry_ecrffield_ecrf_name
diff --git a/core/src/main/resources/ctsms-notification-probandinactive-de.vsl b/core/src/main/resources/ctsms-notification-probandinactive-de.vsl
index f0967963c028..4db4cb6bf292 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive-de.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive-de.vsl
@@ -1,4 +1,4 @@
-Hallo Angehörige/r der Org.einheit $probandstatusentry_proband_department,
+Hallo Angehörige/r der Site $probandstatusentry_proband_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Proband:             #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband Org.einheit: $probandstatusentry_proband_department
+   • Proband Site:        $probandstatusentry_proband_department
    • Proband Kategorie:   $probandstatusentry_proband_category
 
    • Typ:                 $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactive-ig.vsl b/core/src/main/resources/ctsms-notification-probandinactive-ig.vsl
index 4d5018e304f6..5c64ddde391c 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo onye otu dept. $probandstatusentry_proband_department,
+Ezigbo onye otu site $probandstatusentry_proband_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-probandinactive-kg.vsl b/core/src/main/resources/ctsms-notification-probandinactive-kg.vsl
index b09bf0580d47..c25b21966d2e 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive-kg.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $probandstatusentry_proband_department,
+Dear member of site $probandstatusentry_proband_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Proband:       #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site: $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Type:          $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactive-ln.vsl b/core/src/main/resources/ctsms-notification-probandinactive-ln.vsl
index b793ca24049a..0fb7e57ab0aa 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko mosangani ya dept. $probandstatusentry_proband_department, .
+Ndeko mosangani ya site $probandstatusentry_proband_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-probandinactive-ro.vsl b/core/src/main/resources/ctsms-notification-probandinactive-ro.vsl
index 4714dab80a0d..6b5f4ab6a86a 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive-ro.vsl
@@ -1,4 +1,4 @@
-Dragă membru al dept. $probandstatusentry_proband_department,
+Dragă membru al site $probandstatusentry_proband_department,
 
 aceasta este o notificare pentru următorul eveniment:
 
@@ -6,7 +6,7 @@ aceasta este o notificare pentru următorul eveniment:
 
    • Proband: #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site: $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Tip:          $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactive-sw.vsl b/core/src/main/resources/ctsms-notification-probandinactive-sw.vsl
index 3006028d121e..beba2dc92a7f 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive-sw.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive-sw.vsl
@@ -1,4 +1,4 @@
-Ndugu mwanachama wa dept. $probandstatusentry_proband_department,
+Ndugu mwanachama wa site $probandstatusentry_proband_department,
 
 hii ni arifa ya tukio lifuatalo:
 
diff --git a/core/src/main/resources/ctsms-notification-probandinactive.vsl b/core/src/main/resources/ctsms-notification-probandinactive.vsl
index b09bf0580d47..8bc13b76aa7b 100644
--- a/core/src/main/resources/ctsms-notification-probandinactive.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactive.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $probandstatusentry_proband_department,
+Dear member of site $probandstatusentry_proband_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Proband:       #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site:  $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Type:          $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-de.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-de.vsl
index 22fcda3636ed..bddda7d357ab 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-de.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-de.vsl
@@ -1,4 +1,4 @@
-Liebes $visitscheduleitem_trial_name Studienteammitglied oder Angehörige/r der Org.einheit $probandstatusentry_proband_department,
+Liebes $visitscheduleitem_trial_name Studienteammitglied oder Angehörige/r der Site $probandstatusentry_proband_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Proband:             #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband Org.einheit: $probandstatusentry_proband_department
+   • Proband Site:        $probandstatusentry_proband_department
    • Proband Kategorie:   $probandstatusentry_proband_category
 
    • Status Type:         $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ff.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ff.vsl
index 8862779e3508..6315f4b99281 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ff.vsl
@@ -1,4 +1,4 @@
-Dear $visitscheduleitem_trial_name trial team member or member of dept. $probandstatusentry_proband_department,
+Dear $visitscheduleitem_trial_name trial team member or member of site $probandstatusentry_proband_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Proband:       #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site: $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Status type:   $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ig.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ig.vsl
index d56d95ba93e9..6a4b62b14396 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $visitscheduleitem_trial_name onye otu ikpe ma ọ bụ onye otu dept. $probandstatusentry_proband_department,
+Ezigbo $visitscheduleitem_trial_name onye otu ikpe ma ọ bụ onye otu site $probandstatusentry_proband_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-kg.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-kg.vsl
index 8862779e3508..6315f4b99281 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-kg.vsl
@@ -1,4 +1,4 @@
-Dear $visitscheduleitem_trial_name trial team member or member of dept. $probandstatusentry_proband_department,
+Dear $visitscheduleitem_trial_name trial team member or member of site $probandstatusentry_proband_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Proband:       #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site: $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Status type:   $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ln.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ln.vsl
index 4be257072701..70001bc35d2b 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $visitscheduleitem_trial_name membre ya équipe ya procès to membre ya dept. $probandstatusentry_proband_department, .
+Ndeko $visitscheduleitem_trial_name membre ya équipe ya procès to membre ya site $probandstatusentry_proband_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ro.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ro.vsl
index d217a41eadf7..bc58e66b3500 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem-ro.vsl
@@ -6,7 +6,7 @@ aceasta este o notificare pentru următorul eveniment:
 
    • Proband: #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site: $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Tip stare:   $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem.vsl b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem.vsl
index 8862779e3508..a8ed005eb91a 100644
--- a/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem.vsl
+++ b/core/src/main/resources/ctsms-notification-probandinactivevisitscheduleitem.vsl
@@ -1,4 +1,4 @@
-Dear $visitscheduleitem_trial_name trial team member or member of dept. $probandstatusentry_proband_department,
+Dear $visitscheduleitem_trial_name trial team member or member of site $probandstatusentry_proband_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Proband:       #if($string_utils.isEmpty($probandstatusentry_proband_alias))$probandstatusentry_proband_id#{else}$probandstatusentry_proband_alias#end
 
-   • Proband dept.: $probandstatusentry_proband_department
+   • Proband site:  $probandstatusentry_proband_department
    • Proband cat.:  $probandstatusentry_proband_category
 
    • Status type:   $probandstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-de.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-de.vsl
index 0fb0e9f3f26d..d3ec48e01f7e 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-de.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-de.vsl
@@ -1,10 +1,10 @@
-Hallo Angehörige/r der Org.einheit $department,
+Hallo Angehörige/r der Site $department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
    $type
 
-   • Organisationseinheit: $department
+   • Site: $department
    • $number_of_probands_deleted Proband(en) gelöscht.
 
 Sofern keine Einverständniserklärung des Probanden vorliegt, ist die Löschung von Datensätzen eine Erfordernis des Datenschutzes, um sensible Inforamtionen des Probanden zu schützen und personenbezogene Daten zu verwerfen. Die Löschung kann folgedessen nicht rückgängig gemacht werden.
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-ff.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-ff.vsl
index 60f1bb4fe092..0def74f51ceb 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-ff.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $department,
+Dear member of site $department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-ig.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-ig.vsl
index 1f8136c06bbe..a1a21b31ab80 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo onye otu dept. $department,
+Ezigbo onye otu site $department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-kg.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-kg.vsl
index 60f1bb4fe092..0def74f51ceb 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-kg.vsl
@@ -1,4 +1,4 @@
-Dear member of dept. $department,
+Dear member of site $department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-ln.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-ln.vsl
index 436704ed38ff..725a3a8be707 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko mosangani ya dept. $department, .
+Ndeko mosangani ya site $department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-ro.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-ro.vsl
index f570a85fa2bd..0f493e83644c 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-ro.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-ro.vsl
@@ -1,4 +1,4 @@
-Dragă membru al dept. $department,
+Dragă membru al site $department,
 
 aceasta este o notificare pentru următorul eveniment:
 
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted-sw.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted-sw.vsl
index 19790b4927d7..dbdb6add3c93 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted-sw.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted-sw.vsl
@@ -1,4 +1,4 @@
-Ndugu mwanachama wa dept. $department,
+Ndugu mwanachama wa site $department,
 
 hii ni arifa ya tukio lifuatalo:
 
diff --git a/core/src/main/resources/ctsms-notification-probandsdeleted.vsl b/core/src/main/resources/ctsms-notification-probandsdeleted.vsl
index 60f1bb4fe092..de8e029a5134 100644
--- a/core/src/main/resources/ctsms-notification-probandsdeleted.vsl
+++ b/core/src/main/resources/ctsms-notification-probandsdeleted.vsl
@@ -1,10 +1,10 @@
-Dear member of dept. $department,
+Dear member of site $department,
 
 this is a notification for the following event:
 
    $type
 
-   • Department: $department
+   • Site: $department
    • $number_of_probands_deleted proband(s) deleted.
 
 Without informed consent of the proband, the record removal is required to implement data privacy in order to protect the proband's sensitive data and drop personally identifiable information. Therefore a deletion cannot be rolled back.
diff --git a/core/src/main/resources/ctsms-notification-staffinactive-de.vsl b/core/src/main/resources/ctsms-notification-staffinactive-de.vsl
index f4a1ddfaa681..574d9adc903e 100644
--- a/core/src/main/resources/ctsms-notification-staffinactive-de.vsl
+++ b/core/src/main/resources/ctsms-notification-staffinactive-de.vsl
@@ -5,7 +5,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
    $type
 
    • Mitarbeiter:             $staffstatusentry_staff_name
-   • Mitarbeiter Org.einheit: $staffstatusentry_staff_department
+   • Mitarbeiter Site:        $staffstatusentry_staff_department
    • Mitarbeiter Kategorie:   $staffstatusentry_staff_category
 
    • Typ:                     $staffstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-staffinactive.vsl b/core/src/main/resources/ctsms-notification-staffinactive.vsl
index 21b41369d84f..caa08152f49c 100644
--- a/core/src/main/resources/ctsms-notification-staffinactive.vsl
+++ b/core/src/main/resources/ctsms-notification-staffinactive.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Staff:       $staffstatusentry_staff_name
-   • Staff dept.: $staffstatusentry_staff_department
+   • Staff site:  $staffstatusentry_staff_department
    • Staff cat.:  $staffstatusentry_staff_category
 
    • Type:        $staffstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-de.vsl b/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-de.vsl
index 4ee8d119aa73..77242558808b 100644
--- a/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-de.vsl
+++ b/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-de.vsl
@@ -5,7 +5,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
    $type
 
    • Mitarbeiter:             $dutyrosterturn_staff_name
-   • Mitarbeiter Org.einheit: $dutyrosterturn_staff_department
+   • Mitarbeiter Site:        $dutyrosterturn_staff_department
    • Mitarbeiter Kategorie:   $dutyrosterturn_staff_category
 
    • Status Typ:              $staffstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-ff.vsl b/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-ff.vsl
index a2c80a018365..5ac25d2a9697 100644
--- a/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn-ff.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Staff:       $dutyrosterturn_staff_name
-   • Staff dept.: $dutyrosterturn_staff_department
+   • Staff site: $dutyrosterturn_staff_department
    • Staff cat.:  $dutyrosterturn_staff_category
 
    • Status type: $staffstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn.vsl b/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn.vsl
index a2c80a018365..fd65c4cd0888 100644
--- a/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn.vsl
+++ b/core/src/main/resources/ctsms-notification-staffinactivedutyrosterturn.vsl
@@ -5,7 +5,7 @@ this is a notification for the following event:
    $type
 
    • Staff:       $dutyrosterturn_staff_name
-   • Staff dept.: $dutyrosterturn_staff_department
+   • Staff site:  $dutyrosterturn_staff_department
    • Staff cat.:  $dutyrosterturn_staff_category
 
    • Status type: $staffstatusentry_type
diff --git a/core/src/main/resources/ctsms-notification-timelineeventreminder-de.vsl b/core/src/main/resources/ctsms-notification-timelineeventreminder-de.vsl
index 265d6ee2ea40..36742b40a5b4 100644
--- a/core/src/main/resources/ctsms-notification-timelineeventreminder-de.vsl
+++ b/core/src/main/resources/ctsms-notification-timelineeventreminder-de.vsl
@@ -1,4 +1,4 @@
-Liebes $timelineevent_trial_name Studienteammitglied oder Angehörige/r der Org.einheit $timelineevent_trial_department,
+Liebes $timelineevent_trial_name Studienteammitglied oder Angehörige/r der Site $timelineevent_trial_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Studien-Code:       $timelineevent_trial_name
    • Studien-Titel:      $timelineevent_trial_title
-   • Studie Org.einheit: $timelineevent_trial_department
+   • Studie Site:        $timelineevent_trial_department
    • Studienstatus:      $timelineevent_trial_status
 
    • Ereignistyp:        $timelineevent_type
diff --git a/core/src/main/resources/ctsms-notification-timelineeventreminder-ff.vsl b/core/src/main/resources/ctsms-notification-timelineeventreminder-ff.vsl
index 2ae4570297b0..dfdab31f0a05 100644
--- a/core/src/main/resources/ctsms-notification-timelineeventreminder-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-timelineeventreminder-ff.vsl
@@ -1,4 +1,4 @@
-Dear $timelineevent_trial_name trial team member or member of dept. $timelineevent_trial_department,
+Dear $timelineevent_trial_name trial team member or member of site $timelineevent_trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:   $timelineevent_trial_name
    • Trial title:  $timelineevent_trial_title
-   • Trial dept.:  $timelineevent_trial_department
+   • Trial site:  $timelineevent_trial_department
    • Trial status: $timelineevent_trial_status
 
    • Event type:   $timelineevent_type
diff --git a/core/src/main/resources/ctsms-notification-timelineeventreminder-ig.vsl b/core/src/main/resources/ctsms-notification-timelineeventreminder-ig.vsl
index f5a268ac271a..a932c9cdf813 100644
--- a/core/src/main/resources/ctsms-notification-timelineeventreminder-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-timelineeventreminder-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $timelineevent_trial_name onye otu ikpe ma ọ bụ onye otu dept. $timelineevent_trial_department,
+Ezigbo $timelineevent_trial_name onye otu ikpe ma ọ bụ onye otu site $timelineevent_trial_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-timelineeventreminder-kg.vsl b/core/src/main/resources/ctsms-notification-timelineeventreminder-kg.vsl
index 2ae4570297b0..dfdab31f0a05 100644
--- a/core/src/main/resources/ctsms-notification-timelineeventreminder-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-timelineeventreminder-kg.vsl
@@ -1,4 +1,4 @@
-Dear $timelineevent_trial_name trial team member or member of dept. $timelineevent_trial_department,
+Dear $timelineevent_trial_name trial team member or member of site $timelineevent_trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:   $timelineevent_trial_name
    • Trial title:  $timelineevent_trial_title
-   • Trial dept.:  $timelineevent_trial_department
+   • Trial site:  $timelineevent_trial_department
    • Trial status: $timelineevent_trial_status
 
    • Event type:   $timelineevent_type
diff --git a/core/src/main/resources/ctsms-notification-timelineeventreminder-ln.vsl b/core/src/main/resources/ctsms-notification-timelineeventreminder-ln.vsl
index d0d8e7f38756..c1be2934dd33 100644
--- a/core/src/main/resources/ctsms-notification-timelineeventreminder-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-timelineeventreminder-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $timelineevent_trial_name membre ya équipe ya procès to membre ya dept. $timelineevent_trial_department, .
+Ndeko $timelineevent_trial_name membre ya équipe ya procès to membre ya site $timelineevent_trial_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-timelineeventreminder.vsl b/core/src/main/resources/ctsms-notification-timelineeventreminder.vsl
index 2ae4570297b0..843307645877 100644
--- a/core/src/main/resources/ctsms-notification-timelineeventreminder.vsl
+++ b/core/src/main/resources/ctsms-notification-timelineeventreminder.vsl
@@ -1,4 +1,4 @@
-Dear $timelineevent_trial_name trial team member or member of dept. $timelineevent_trial_department,
+Dear $timelineevent_trial_name trial team member or member of site $timelineevent_trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:   $timelineevent_trial_name
    • Trial title:  $timelineevent_trial_title
-   • Trial dept.:  $timelineevent_trial_department
+   • Trial site:   $timelineevent_trial_department
    • Trial status: $timelineevent_trial_status
 
    • Event type:   $timelineevent_type
diff --git a/core/src/main/resources/ctsms-notification-trialstatusupdated-de.vsl b/core/src/main/resources/ctsms-notification-trialstatusupdated-de.vsl
index 9712322c59b3..3ec79e6fe4cb 100644
--- a/core/src/main/resources/ctsms-notification-trialstatusupdated-de.vsl
+++ b/core/src/main/resources/ctsms-notification-trialstatusupdated-de.vsl
@@ -1,4 +1,4 @@
-Liebes $trial_name Studienteammitglied oder Angehörige/r der Org.einheit $trial_department,
+Liebes $trial_name Studienteammitglied oder Angehörige/r der Site $trial_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Studien-Code:       $trial_name
    • Studien-Titel:      $trial_title
-   • Studie Org.einheit: $trial_department
+   • Studie Site: $trial_department
 
    • Studienstatus:      $trial_status
 #if($notification.trial.status.lockdown)
diff --git a/core/src/main/resources/ctsms-notification-trialstatusupdated-ff.vsl b/core/src/main/resources/ctsms-notification-trialstatusupdated-ff.vsl
index 0042bab13a38..acbace32062b 100644
--- a/core/src/main/resources/ctsms-notification-trialstatusupdated-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-trialstatusupdated-ff.vsl
@@ -1,4 +1,4 @@
-Dear $trial_name trial team member or member of dept. $trial_department,
+Dear $trial_name trial team member or member of site $trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:   $trial_name
    • Trial title:  $trial_title
-   • Trial dept.:  $trial_department
+   • Trial site:  $trial_department
 
    • Trial status: $trial_status
 #if($notification.trial.status.lockdown)
diff --git a/core/src/main/resources/ctsms-notification-trialstatusupdated-ig.vsl b/core/src/main/resources/ctsms-notification-trialstatusupdated-ig.vsl
index 97f759cba775..90ef82ffb275 100644
--- a/core/src/main/resources/ctsms-notification-trialstatusupdated-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-trialstatusupdated-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $trial_name onye otu ikpe ma ọ bụ onye otu dept. $trial_department,
+Ezigbo $trial_name onye otu ikpe ma ọ bụ onye otu site $trial_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-trialstatusupdated-kg.vsl b/core/src/main/resources/ctsms-notification-trialstatusupdated-kg.vsl
index 0042bab13a38..acbace32062b 100644
--- a/core/src/main/resources/ctsms-notification-trialstatusupdated-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-trialstatusupdated-kg.vsl
@@ -1,4 +1,4 @@
-Dear $trial_name trial team member or member of dept. $trial_department,
+Dear $trial_name trial team member or member of site $trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:   $trial_name
    • Trial title:  $trial_title
-   • Trial dept.:  $trial_department
+   • Trial site:  $trial_department
 
    • Trial status: $trial_status
 #if($notification.trial.status.lockdown)
diff --git a/core/src/main/resources/ctsms-notification-trialstatusupdated-ln.vsl b/core/src/main/resources/ctsms-notification-trialstatusupdated-ln.vsl
index 84321142caba..4c3b836cf1a1 100644
--- a/core/src/main/resources/ctsms-notification-trialstatusupdated-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-trialstatusupdated-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $trial_name membre ya équipe ya procès to membre ya dept. $trial_department, .
+Ndeko $trial_name membre ya équipe ya procès to membre ya site $trial_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-trialstatusupdated.vsl b/core/src/main/resources/ctsms-notification-trialstatusupdated.vsl
index 0042bab13a38..848039b01b40 100644
--- a/core/src/main/resources/ctsms-notification-trialstatusupdated.vsl
+++ b/core/src/main/resources/ctsms-notification-trialstatusupdated.vsl
@@ -1,4 +1,4 @@
-Dear $trial_name trial team member or member of dept. $trial_department,
+Dear $trial_name trial team member or member of site $trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:   $trial_name
    • Trial title:  $trial_title
-   • Trial dept.:  $trial_department
+   • Trial site:   $trial_department
 
    • Trial status: $trial_status
 #if($notification.trial.status.lockdown)
diff --git a/core/src/main/resources/ctsms-notification-trialtagmissing-de.vsl b/core/src/main/resources/ctsms-notification-trialtagmissing-de.vsl
index 981970625311..28ee7d7ec46d 100644
--- a/core/src/main/resources/ctsms-notification-trialtagmissing-de.vsl
+++ b/core/src/main/resources/ctsms-notification-trialtagmissing-de.vsl
@@ -1,4 +1,4 @@
-Liebes $trial_name Studienteammitglied oder Angehörige/r der Org.einheit $trial_department,
+Liebes $trial_name Studienteammitglied oder Angehörige/r der Site $trial_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
@@ -6,7 +6,7 @@ dies ist die Benachrichtigung für folgendes Ereignis:
 
    • Studien-Code:             $trial_name
    • Studien-Titel:            $trial_title
-   • Studie Org.einheit:       $trial_department
+   • Studie Site:              $trial_department
    • Studienstatus:            $trial_status
 
    • Fehlendes Studien Deatil: $trialtag
diff --git a/core/src/main/resources/ctsms-notification-trialtagmissing-ff.vsl b/core/src/main/resources/ctsms-notification-trialtagmissing-ff.vsl
index 32d9c10559c0..80df40efb245 100644
--- a/core/src/main/resources/ctsms-notification-trialtagmissing-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-trialtagmissing-ff.vsl
@@ -1,4 +1,4 @@
-Dear $trial_name trial team member or member of dept. $trial_department,
+Dear $trial_name trial team member or member of site $trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-trialtagmissing-ig.vsl b/core/src/main/resources/ctsms-notification-trialtagmissing-ig.vsl
index 80b784241aa6..bb507e4d71d2 100644
--- a/core/src/main/resources/ctsms-notification-trialtagmissing-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-trialtagmissing-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $trial_name onye otu ikpe ma ọ bụ onye otu dept. $trial_department,
+Ezigbo $trial_name onye otu ikpe ma ọ bụ onye otu site $trial_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-trialtagmissing-kg.vsl b/core/src/main/resources/ctsms-notification-trialtagmissing-kg.vsl
index 32d9c10559c0..80df40efb245 100644
--- a/core/src/main/resources/ctsms-notification-trialtagmissing-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-trialtagmissing-kg.vsl
@@ -1,4 +1,4 @@
-Dear $trial_name trial team member or member of dept. $trial_department,
+Dear $trial_name trial team member or member of site $trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-trialtagmissing-ln.vsl b/core/src/main/resources/ctsms-notification-trialtagmissing-ln.vsl
index 7f81060a1173..63697bc29c87 100644
--- a/core/src/main/resources/ctsms-notification-trialtagmissing-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-trialtagmissing-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $trial_name membre ya équipe ya procès to membre ya dept. $trial_department, .
+Ndeko $trial_name membre ya équipe ya procès to membre ya site $trial_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-trialtagmissing.vsl b/core/src/main/resources/ctsms-notification-trialtagmissing.vsl
index 32d9c10559c0..91a05003c6e2 100644
--- a/core/src/main/resources/ctsms-notification-trialtagmissing.vsl
+++ b/core/src/main/resources/ctsms-notification-trialtagmissing.vsl
@@ -1,4 +1,4 @@
-Dear $trial_name trial team member or member of dept. $trial_department,
+Dear $trial_name trial team member or member of site $trial_department,
 
 this is a notification for the following event:
 
@@ -6,7 +6,7 @@ this is a notification for the following event:
 
    • Trial code:        $trial_name
    • Trial title:       $trial_title
-   • Trial department:  $trial_department
+   • Trial site:        $trial_department
    • Trial status:      $trial_status
 
    • Missing trial tag: $trialtag
diff --git a/core/src/main/resources/ctsms-notification-useraccount-de.vsl b/core/src/main/resources/ctsms-notification-useraccount-de.vsl
index 440d1232b605..ac94c628ac53 100644
--- a/core/src/main/resources/ctsms-notification-useraccount-de.vsl
+++ b/core/src/main/resources/ctsms-notification-useraccount-de.vsl
@@ -25,7 +25,7 @@ Die Anmeldung am System erfolgt auf folgender Seite:
    $http_base_url
 
 #end
-WICHTIG: Mit diesem Benutzerkonto können direkt personenbezogene Daten von Probanden gelesen werden, die von Benutzern der Organisationseinheit "$user_department" registriert wurden. Um den Datenschutz zu gewährleisten, müssen die Zugangsdaten geheim gehalten werden. Es wird niemals dazu aufgefordert, Zugangsdaten per Email bekanntzugeben oder sich bei einem anderen Server als "$http_domain_name" anzumelden!
+WICHTIG: Mit diesem Benutzerkonto können direkt personenbezogene Daten von Probanden gelesen werden, die von Benutzern der Site "$user_department" registriert wurden. Um den Datenschutz zu gewährleisten, müssen die Zugangsdaten geheim gehalten werden. Es wird niemals dazu aufgefordert, Zugangsdaten per Email bekanntzugeben oder sich bei einem anderen Server als "$http_domain_name" anzumelden!
 
 Vielen Dank!
 
diff --git a/core/src/main/resources/ctsms-notification-useraccount.vsl b/core/src/main/resources/ctsms-notification-useraccount.vsl
index ac2d4ba12032..de1f4847896d 100644
--- a/core/src/main/resources/ctsms-notification-useraccount.vsl
+++ b/core/src/main/resources/ctsms-notification-useraccount.vsl
@@ -25,7 +25,7 @@ The system is accessible at the site below:
    $http_base_url
 
 #end
-IMPORTANT: The account allows you to read personally identifiable information of subjects registered by users of the "$user_department" department. To maintain data privacy, account credentials have to be kept secrect. You will never be asked to provide credentials via email or servers other than "$http_domain_name".
+IMPORTANT: The account allows you to read personally identifiable information of subjects registered by users of the "$user_department" site. To maintain data privacy, account credentials have to be kept secrect. You will never be asked to provide credentials via email or servers other than "$http_domain_name".
 
 Thank you!
 
diff --git a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-de.vsl b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-de.vsl
index 0278b4d86afd..3f538712fc53 100644
--- a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-de.vsl
+++ b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-de.vsl
@@ -1,4 +1,4 @@
-Liebes $visitscheduleitem_trial_name Studienteammitglied oder Angehörige/r der Org.einheit $visitscheduleitem_trial_department,
+Liebes $visitscheduleitem_trial_name Studienteammitglied oder Angehörige/r der Site $visitscheduleitem_trial_department,
 
 dies ist die Benachrichtigung für folgendes Ereignis:
 
diff --git a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ff.vsl b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ff.vsl
index 0f185661ec48..e095a25cf00d 100644
--- a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ff.vsl
+++ b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ff.vsl
@@ -1,4 +1,4 @@
-Dear $visitscheduleitem_trial_name trial team member or member of dept. $visitscheduleitem_trial_department,
+Dear $visitscheduleitem_trial_name trial team member or member of site $visitscheduleitem_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ig.vsl b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ig.vsl
index 3098432d9bfa..52b970772d01 100644
--- a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ig.vsl
+++ b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ig.vsl
@@ -1,4 +1,4 @@
-Ezigbo $visitscheduleitem_trial_name onye otu ikpe ma ọ bụ onye otu dept. $visitscheduleitem_trial_department,
+Ezigbo $visitscheduleitem_trial_name onye otu ikpe ma ọ bụ onye otu site $visitscheduleitem_trial_department,
 
 Nke a bụ ọkwa maka mmemme a:
 
diff --git a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-kg.vsl b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-kg.vsl
index 0f185661ec48..e095a25cf00d 100644
--- a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-kg.vsl
+++ b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-kg.vsl
@@ -1,4 +1,4 @@
-Dear $visitscheduleitem_trial_name trial team member or member of dept. $visitscheduleitem_trial_department,
+Dear $visitscheduleitem_trial_name trial team member or member of site $visitscheduleitem_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ln.vsl b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ln.vsl
index 6d730b37f812..23beb5840520 100644
--- a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ln.vsl
+++ b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder-ln.vsl
@@ -1,4 +1,4 @@
-Ndeko $visitscheduleitem_trial_name membre ya équipe ya procès to membre ya dept. $visitscheduleitem_trial_department, .
+Ndeko $visitscheduleitem_trial_name membre ya équipe ya procès to membre ya site $visitscheduleitem_trial_department, .
 
 oyo ezali liyebisi mpo na likambo oyo elandi:
 
diff --git a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder.vsl b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder.vsl
index 0f185661ec48..e095a25cf00d 100644
--- a/core/src/main/resources/ctsms-notification-visitscheduleitemreminder.vsl
+++ b/core/src/main/resources/ctsms-notification-visitscheduleitemreminder.vsl
@@ -1,4 +1,4 @@
-Dear $visitscheduleitem_trial_name trial team member or member of dept. $visitscheduleitem_trial_department,
+Dear $visitscheduleitem_trial_name trial team member or member of site $visitscheduleitem_trial_department,
 
 this is a notification for the following event:
 
diff --git a/core/src/main/resources/ctsms-permissionprofilenames.properties b/core/src/main/resources/ctsms-permissionprofilenames.properties
index ed06ad4ff028..6e8cc49e9eec 100644
--- a/core/src/main/resources/ctsms-permissionprofilenames.properties
+++ b/core/src/main/resources/ctsms-permissionprofilenames.properties
@@ -1,74 +1,74 @@
-INVENTORY_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete inventory - all departments
-INVENTORY_MASTER_USER_DEPARTMENT=Create/Edit/Delete inventory - department of active user
-INVENTORY_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete inventory - department of person/organisation of active user
-INVENTORY_DETAIL_ALL_DEPARTMENTS=Edit inventory details - all departments
-INVENTORY_DETAIL_USER_DEPARTMENT=Edit inventory details - department of active user
-INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Edit inventory details - department of person/organisation of active user
-INVENTORY_VIEW_ALL_DEPARTMENTS=View inventory - all departments
-INVENTORY_VIEW_USER_DEPARTMENT=View inventory - department of active user
-INVENTORY_VIEW_IDENTITY_DEPARTMENT=View inventory - department of person/organisation of active user
-STAFF_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete person/organisation - all departments
-STAFF_MASTER_USER_DEPARTMENT=Create/Edit/Delete person/organisation - department of active user
-STAFF_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete person/organisation - department of person/organisation of active user
+INVENTORY_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete inventory - all sites
+INVENTORY_MASTER_USER_DEPARTMENT=Create/Edit/Delete inventory - site of active user
+INVENTORY_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete inventory - site of person/organisation of active user
+INVENTORY_DETAIL_ALL_DEPARTMENTS=Edit inventory details - all sites
+INVENTORY_DETAIL_USER_DEPARTMENT=Edit inventory details - site of active user
+INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Edit inventory details - site of person/organisation of active user
+INVENTORY_VIEW_ALL_DEPARTMENTS=View inventory - all sites
+INVENTORY_VIEW_USER_DEPARTMENT=View inventory - site of active user
+INVENTORY_VIEW_IDENTITY_DEPARTMENT=View inventory - site of person/organisation of active user
+STAFF_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete person/organisation - all sites
+STAFF_MASTER_USER_DEPARTMENT=Create/Edit/Delete person/organisation - site of active user
+STAFF_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete person/organisation - site of person/organisation of active user
 STAFF_MASTER_IDENTITY=Edit person/organisation - person/organisation of active user
 STAFF_MASTER_IDENTITY_CHILD=Edit/Delete person/organisation - person/organisation of active user and child persons/organisations
-STAFF_DETAIL_ALL_DEPARTMENTS=Edit person/organisation details - all departments
-STAFF_DETAIL_USER_DEPARTMENT=Edit person/organisation details - department of active user
-STAFF_DETAIL_IDENTITY_DEPARTMENT=Edit person/organisation details - department of person/organisation of active user
+STAFF_DETAIL_ALL_DEPARTMENTS=Edit person/organisation details - all sites
+STAFF_DETAIL_USER_DEPARTMENT=Edit person/organisation details - site of active user
+STAFF_DETAIL_IDENTITY_DEPARTMENT=Edit person/organisation details - site of person/organisation of active user
 STAFF_DETAIL_IDENTITY=Edit person/organisation details - person/organisation of active user
 STAFF_DETAIL_IDENTITY_CHILD=Edit person/organisation details - person/organisation of active user and child persons/organisations
-STAFF_VIEW_ALL_DEPARTMENTS=View person/organisation details - all departments
-STAFF_VIEW_USER_DEPARTMENT=View person/organisation details - department of active user
-STAFF_VIEW_IDENTITY_DEPARTMENT=View person/organisation details - department of person/organisation of active user
+STAFF_VIEW_ALL_DEPARTMENTS=View person/organisation details - all sites
+STAFF_VIEW_USER_DEPARTMENT=View person/organisation details - site of active user
+STAFF_VIEW_IDENTITY_DEPARTMENT=View person/organisation details - site of person/organisation of active user
 STAFF_VIEW_IDENTITY=View person/organisation details - person/organisation of active user
 STAFF_VIEW_IDENTITY_CHILD=View person/organisation details - person/organisation of active user and child persons/organisations
-COURSE_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete course - all departments
-COURSE_MASTER_USER_DEPARTMENT=Create/Edit/Delete course - department of active user
-COURSE_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete course - department of person/organisation of active user
+COURSE_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete course - all sites
+COURSE_MASTER_USER_DEPARTMENT=Create/Edit/Delete course - site of active user
+COURSE_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete course - site of person/organisation of active user
 COURSE_MASTER_LECTURER=Edit course - person/organisation of active user is lecturer
-COURSE_DETAIL_ALL_DEPARTMENTS=Edit course details - all departments
-COURSE_DETAIL_USER_DEPARTMENT=Edit course details - department of active user
-COURSE_DETAIL_IDENTITY_DEPARTMENT=Edit course details - department of person/organisation of active user
+COURSE_DETAIL_ALL_DEPARTMENTS=Edit course details - all sites
+COURSE_DETAIL_USER_DEPARTMENT=Edit course details - site of active user
+COURSE_DETAIL_IDENTITY_DEPARTMENT=Edit course details - site of person/organisation of active user
 COURSE_DETAIL_LECTURER=Edit course details - person/organisation of active user is lecturer
-COURSE_VIEW_ALL_DEPARTMENTS=View course - all departments
-COURSE_VIEW_USER_DEPARTMENT=View course - department of active user
-COURSE_VIEW_IDENTITY_DEPARTMENT=View course - department of person/organisation of active user
+COURSE_VIEW_ALL_DEPARTMENTS=View course - all sites
+COURSE_VIEW_USER_DEPARTMENT=View course - site of active user
+COURSE_VIEW_IDENTITY_DEPARTMENT=View course - site of person/organisation of active user
 COURSE_VIEW_LECTURER=View course - person/organisation of active user is lecturer
-TRIAL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete trial - all departments
-TRIAL_MASTER_USER_DEPARTMENT=Create/Edit/Delete trial - department of active user
-TRIAL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete trial - department of person/organisation of active user
+TRIAL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete trial - all sites
+TRIAL_MASTER_USER_DEPARTMENT=Create/Edit/Delete trial - site of active user
+TRIAL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete trial - site of person/organisation of active user
 TRIAL_MASTER_TEAM_MEMBER=Edit trial - person/organisation of active user is team member
-TRIAL_DETAIL_ALL_DEPARTMENTS=Edit trial details - all departments
-TRIAL_DETAIL_USER_DEPARTMENT=Edit trial details - department of active user
-TRIAL_DETAIL_IDENTITY_DEPARTMENT=Edit trial details - department of person/organisation of active user
+TRIAL_DETAIL_ALL_DEPARTMENTS=Edit trial details - all sites
+TRIAL_DETAIL_USER_DEPARTMENT=Edit trial details - site of active user
+TRIAL_DETAIL_IDENTITY_DEPARTMENT=Edit trial details - site of person/organisation of active user
 TRIAL_DETAIL_TEAM_MEMBER=Edit trial details - person/organisation of active user is team member
-TRIAL_VIEW_ALL_DEPARTMENTS=View trial - all departments
-TRIAL_VIEW_USER_DEPARTMENT=View trial - department of active user
-TRIAL_VIEW_IDENTITY_DEPARTMENT=View trial - department of person/organisation of active user
+TRIAL_VIEW_ALL_DEPARTMENTS=View trial - all sites
+TRIAL_VIEW_USER_DEPARTMENT=View trial - site of active user
+TRIAL_VIEW_IDENTITY_DEPARTMENT=View trial - site of person/organisation of active user
 TRIAL_VIEW_TEAM_MEMBER=View trial - person/organisation of active user is team member
 TRIAL_SIGNUP=Trials - Sign-Up
-PROBAND_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete proband - all departments
-PROBAND_MASTER_USER_DEPARTMENT=Create/Edit/Delete proband - department of active user
-PROBAND_DETAIL_ALL_DEPARTMENTS=Edit proband details - all departments
-PROBAND_DETAIL_USER_DEPARTMENT=Edit proband details - department of active user
-PROBAND_VIEW_ALL_DEPARTMENTS=View proband - all departments
-PROBAND_VIEW_USER_DEPARTMENT=View proband - department of active user
+PROBAND_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete proband - all sites
+PROBAND_MASTER_USER_DEPARTMENT=Create/Edit/Delete proband - site of active user
+PROBAND_DETAIL_ALL_DEPARTMENTS=Edit proband details - all sites
+PROBAND_DETAIL_USER_DEPARTMENT=Edit proband details - site of active user
+PROBAND_VIEW_ALL_DEPARTMENTS=View proband - all sites
+PROBAND_VIEW_USER_DEPARTMENT=View proband - site of active user
 PROBAND_NO_ACCESS=Probands - no access
 PROBAND_DEVICE=Probands - device
 PROBAND_SIGNUP=Probands - Sign-Up
-MASS_MAIL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete mass mail - all departments
-MASS_MAIL_MASTER_USER_DEPARTMENT=Create/Edit/Delete mass mail - department of active user
-MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete mass mail - department of person/organisation of active user
-MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Edit mass mail details - all departments
-MASS_MAIL_DETAIL_USER_DEPARTMENT=Edit mass mail details - department of active user
-MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Edit mass mail details - department of person/organisation of active user
-MASS_MAIL_VIEW_ALL_DEPARTMENTS=View mass mail - all departments
-MASS_MAIL_VIEW_USER_DEPARTMENT=View mass mail - department of active user
-MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=View mass mail - department of person/organisation of active user
+MASS_MAIL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete mass mail - all sites
+MASS_MAIL_MASTER_USER_DEPARTMENT=Create/Edit/Delete mass mail - site of active user
+MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete mass mail - site of person/organisation of active user
+MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Edit mass mail details - all sites
+MASS_MAIL_DETAIL_USER_DEPARTMENT=Edit mass mail details - site of active user
+MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Edit mass mail details - site of person/organisation of active user
+MASS_MAIL_VIEW_ALL_DEPARTMENTS=View mass mail - all sites
+MASS_MAIL_VIEW_USER_DEPARTMENT=View mass mail - site of active user
+MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=View mass mail - site of person/organisation of active user
 MASS_MAIL_SIGNUP=Mass mail - Sign-Up
-USER_ALL_DEPARTMENTS=Create/Edit/Delete user - all departments
-USER_USER_DEPARTMENT=Create/Edit/Delete user - department of active user
-USER_IDENTITY_DEPARTMENT=Create/Edit/Delete user - department of person/organisation of active user
+USER_ALL_DEPARTMENTS=Create/Edit/Delete user - all sites
+USER_USER_DEPARTMENT=Create/Edit/Delete user - site of active user
+USER_IDENTITY_DEPARTMENT=Create/Edit/Delete user - site of person/organisation of active user
 USER_ACTIVE_USER=Edit user details - active user
 INPUT_FIELD_MASTER=Create/Edit/Delete input field
 INPUT_FIELD_VIEW=View input field
diff --git a/core/src/main/resources/ctsms-permissionprofilenames_de.properties b/core/src/main/resources/ctsms-permissionprofilenames_de.properties
index 2e04e294a56c..8241f6518a6f 100644
--- a/core/src/main/resources/ctsms-permissionprofilenames_de.properties
+++ b/core/src/main/resources/ctsms-permissionprofilenames_de.properties
@@ -1,74 +1,74 @@
-INVENTORY_MASTER_ALL_DEPARTMENTS=Inventar erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-INVENTORY_MASTER_USER_DEPARTMENT=Inventar erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-INVENTORY_MASTER_IDENTITY_DEPARTMENT=Inventar erstellen/bearbeiten/l\u00F6schen - Organisationseinheit der Person/Organisation des aktiven Benutzers
-INVENTORY_DETAIL_ALL_DEPARTMENTS=Inventar Details bearbeiten - alle Organisationseinheiten
-INVENTORY_DETAIL_USER_DEPARTMENT=Inventar Details bearbeiten - Organisationseinheit des aktiven Benutzers
-INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Inventar Details bearbeiten - Organisationseinheit der Person/Organisation des aktiven Benutzers
-INVENTORY_VIEW_ALL_DEPARTMENTS=Inventar betrachten - alle Organisationseinheiten
-INVENTORY_VIEW_USER_DEPARTMENT=Inventar betrachten - Organisationseinheit des aktiven Benutzers
-INVENTORY_VIEW_IDENTITY_DEPARTMENT=Inventar betrachten - Organisationseinheit der Person/Organisation des aktiven Benutzers
-STAFF_MASTER_ALL_DEPARTMENTS=Person/Organisation erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-STAFF_MASTER_USER_DEPARTMENT=Person/Organisation erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-STAFF_MASTER_IDENTITY_DEPARTMENT=Person/Organisation erstellen/bearbeiten/l\u00F6schen - Organisationseinheit der Person/Organisation des aktiven Benutzers
+INVENTORY_MASTER_ALL_DEPARTMENTS=Inventar erstellen/bearbeiten/l\u00F6schen - alle Siteen
+INVENTORY_MASTER_USER_DEPARTMENT=Inventar erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+INVENTORY_MASTER_IDENTITY_DEPARTMENT=Inventar erstellen/bearbeiten/l\u00F6schen - Site der Person/Organisation des aktiven Benutzers
+INVENTORY_DETAIL_ALL_DEPARTMENTS=Inventar Details bearbeiten - alle Siteen
+INVENTORY_DETAIL_USER_DEPARTMENT=Inventar Details bearbeiten - Site des aktiven Benutzers
+INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Inventar Details bearbeiten - Site der Person/Organisation des aktiven Benutzers
+INVENTORY_VIEW_ALL_DEPARTMENTS=Inventar betrachten - alle Siteen
+INVENTORY_VIEW_USER_DEPARTMENT=Inventar betrachten - Site des aktiven Benutzers
+INVENTORY_VIEW_IDENTITY_DEPARTMENT=Inventar betrachten - Site der Person/Organisation des aktiven Benutzers
+STAFF_MASTER_ALL_DEPARTMENTS=Person/Organisation erstellen/bearbeiten/l\u00F6schen - alle Siteen
+STAFF_MASTER_USER_DEPARTMENT=Person/Organisation erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+STAFF_MASTER_IDENTITY_DEPARTMENT=Person/Organisation erstellen/bearbeiten/l\u00F6schen - Site der Person/Organisation des aktiven Benutzers
 STAFF_MASTER_IDENTITY=Person/Organisation bearbeiten/l\u00F6schen - Person/Organisation des aktiven Benutzers
 STAFF_MASTER_IDENTITY_CHILD=Person/Organisation bearbeiten/l\u00F6schen - Person/Organisation des aktiven Benutzers und deren unterstellte Personen/Organisationen
-STAFF_DETAIL_ALL_DEPARTMENTS=Person/Organisation Details bearbeiten - alle Organisationseinheiten
-STAFF_DETAIL_USER_DEPARTMENT=Person/Organisation Details bearbeiten - Organisationseinheit des aktiven Benutzers
-STAFF_DETAIL_IDENTITY_DEPARTMENT=Person/Organisation Details bearbeiten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+STAFF_DETAIL_ALL_DEPARTMENTS=Person/Organisation Details bearbeiten - alle Siteen
+STAFF_DETAIL_USER_DEPARTMENT=Person/Organisation Details bearbeiten - Site des aktiven Benutzers
+STAFF_DETAIL_IDENTITY_DEPARTMENT=Person/Organisation Details bearbeiten - Site der Person/Organisation des aktiven Benutzers
 STAFF_DETAIL_IDENTITY=Person/Organisation Details bearbeiten - Person/Organisation des aktiven Benutzers
 STAFF_DETAIL_IDENTITY_CHILD=Person/Organisation Details bearbeiten - Person/Organisation des aktiven Benutzers und deren unterstellte Personen/Organisationen
-STAFF_VIEW_ALL_DEPARTMENTS=Person/Organisation Details betrachten - alle Organisationseinheiten
-STAFF_VIEW_USER_DEPARTMENT=Person/Organisation Details betrachten - Organisationseinheit des aktiven Benutzers
-STAFF_VIEW_IDENTITY_DEPARTMENT=Person/Organisation Details betrachten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+STAFF_VIEW_ALL_DEPARTMENTS=Person/Organisation Details betrachten - alle Siteen
+STAFF_VIEW_USER_DEPARTMENT=Person/Organisation Details betrachten - Site des aktiven Benutzers
+STAFF_VIEW_IDENTITY_DEPARTMENT=Person/Organisation Details betrachten - Site der Person/Organisation des aktiven Benutzers
 STAFF_VIEW_IDENTITY=Person/Organisation Details betrachten - Person/Organisation des aktiven Benutzers
 STAFF_VIEW_IDENTITY_CHILD=Person/Organisation Details betrachten - Person/Organisation des aktiven Benutzers und deren unterstellte Personen/Organisationen
-COURSE_MASTER_ALL_DEPARTMENTS=Kurs erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-COURSE_MASTER_USER_DEPARTMENT=Kurs erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-COURSE_MASTER_IDENTITY_DEPARTMENT=Kurs erstellen/bearbeiten/l\u00F6schen - Organisationseinheit der Person/Organisation des aktiven Benutzers
+COURSE_MASTER_ALL_DEPARTMENTS=Kurs erstellen/bearbeiten/l\u00F6schen - alle Siteen
+COURSE_MASTER_USER_DEPARTMENT=Kurs erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+COURSE_MASTER_IDENTITY_DEPARTMENT=Kurs erstellen/bearbeiten/l\u00F6schen - Site der Person/Organisation des aktiven Benutzers
 COURSE_MASTER_LECTURER=Kurs bearbeiten - Kurse mit Person/Organisation des aktiven Benutzers als Vortragende(r)
-COURSE_DETAIL_ALL_DEPARTMENTS=Kurs Details bearbeiten - alle Organisationseinheiten
-COURSE_DETAIL_USER_DEPARTMENT=Kurs Details bearbeiten - Organisationseinheit des aktiven Benutzers
-COURSE_DETAIL_IDENTITY_DEPARTMENT=Kurs Details bearbeiten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+COURSE_DETAIL_ALL_DEPARTMENTS=Kurs Details bearbeiten - alle Siteen
+COURSE_DETAIL_USER_DEPARTMENT=Kurs Details bearbeiten - Site des aktiven Benutzers
+COURSE_DETAIL_IDENTITY_DEPARTMENT=Kurs Details bearbeiten - Site der Person/Organisation des aktiven Benutzers
 COURSE_DETAIL_LECTURER=Kurs Details bearbeiten - Kurse mit Person/Organisation des aktiven Benutzers als Vortragende(r)
-COURSE_VIEW_ALL_DEPARTMENTS=Kurs betrachten - alle Organisationseinheiten
-COURSE_VIEW_USER_DEPARTMENT=Kurs betrachten - Organisationseinheit des aktiven Benutzers
-COURSE_VIEW_IDENTITY_DEPARTMENT=Kurs betrachten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+COURSE_VIEW_ALL_DEPARTMENTS=Kurs betrachten - alle Siteen
+COURSE_VIEW_USER_DEPARTMENT=Kurs betrachten - Site des aktiven Benutzers
+COURSE_VIEW_IDENTITY_DEPARTMENT=Kurs betrachten - Site der Person/Organisation des aktiven Benutzers
 COURSE_VIEW_LECTURER=Kurs betrachten - Kurse mit Person/Organisation des aktiven Benutzers als Vortragende(r)
-TRIAL_MASTER_ALL_DEPARTMENTS=Studie erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-TRIAL_MASTER_USER_DEPARTMENT=Studie erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-TRIAL_MASTER_IDENTITY_DEPARTMENT=Studie erstellen/bearbeiten/l\u00F6schen - Organisationseinheit der Person/Organisation des aktiven Benutzers
+TRIAL_MASTER_ALL_DEPARTMENTS=Studie erstellen/bearbeiten/l\u00F6schen - alle Siteen
+TRIAL_MASTER_USER_DEPARTMENT=Studie erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+TRIAL_MASTER_IDENTITY_DEPARTMENT=Studie erstellen/bearbeiten/l\u00F6schen - Site der Person/Organisation des aktiven Benutzers
 TRIAL_MASTER_TEAM_MEMBER=Studie bearbeiten - Studie mit Person/Organisation des aktiven Benutzers als Teamitglied
-TRIAL_DETAIL_ALL_DEPARTMENTS=Studien Details bearbeiten - alle Organisationseinheiten
-TRIAL_DETAIL_USER_DEPARTMENT=Studien Details bearbeiten - Organisationseinheit des aktiven Benutzers
-TRIAL_DETAIL_IDENTITY_DEPARTMENT=Studien Details bearbeiten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+TRIAL_DETAIL_ALL_DEPARTMENTS=Studien Details bearbeiten - alle Siteen
+TRIAL_DETAIL_USER_DEPARTMENT=Studien Details bearbeiten - Site des aktiven Benutzers
+TRIAL_DETAIL_IDENTITY_DEPARTMENT=Studien Details bearbeiten - Site der Person/Organisation des aktiven Benutzers
 TRIAL_DETAIL_TEAM_MEMBER=Studien Details bearbeiten - Studie mit Person/Organisation des aktiven Benutzers als Teamitglied
-TRIAL_VIEW_ALL_DEPARTMENTS=Studie betrachten - alle Organisationseinheiten
-TRIAL_VIEW_USER_DEPARTMENT=Studie betrachten - Organisationseinheit des aktiven Benutzers
-TRIAL_VIEW_IDENTITY_DEPARTMENT=Studie betrachten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+TRIAL_VIEW_ALL_DEPARTMENTS=Studie betrachten - alle Siteen
+TRIAL_VIEW_USER_DEPARTMENT=Studie betrachten - Site des aktiven Benutzers
+TRIAL_VIEW_IDENTITY_DEPARTMENT=Studie betrachten - Site der Person/Organisation des aktiven Benutzers
 TRIAL_VIEW_TEAM_MEMBER=Studie betrachten - Studie mit Person/Organisation des aktiven Benutzers als Teamitglied
 TRIAL_SIGNUP=Studien - Sign-Up
-PROBAND_MASTER_ALL_DEPARTMENTS=Proband erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-PROBAND_MASTER_USER_DEPARTMENT=Proband erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-PROBAND_DETAIL_ALL_DEPARTMENTS=Probanden Detail bearbeiten - alle Organisationseinheiten
-PROBAND_DETAIL_USER_DEPARTMENT=Probanden Detail bearbeiten - Organisationseinheit des aktiven Benutzers
-PROBAND_VIEW_ALL_DEPARTMENTS=Proband betrachten - alle Organisationseinheiten
-PROBAND_VIEW_USER_DEPARTMENT=Proband betrachten - Organisationseinheit des aktiven Benutzers
+PROBAND_MASTER_ALL_DEPARTMENTS=Proband erstellen/bearbeiten/l\u00F6schen - alle Siteen
+PROBAND_MASTER_USER_DEPARTMENT=Proband erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+PROBAND_DETAIL_ALL_DEPARTMENTS=Probanden Detail bearbeiten - alle Siteen
+PROBAND_DETAIL_USER_DEPARTMENT=Probanden Detail bearbeiten - Site des aktiven Benutzers
+PROBAND_VIEW_ALL_DEPARTMENTS=Proband betrachten - alle Siteen
+PROBAND_VIEW_USER_DEPARTMENT=Proband betrachten - Site des aktiven Benutzers
 PROBAND_NO_ACCESS=Probanden - kein Zugriff
 PROBAND_DEVICE=Probanden - Ger\u00E4t
 PROBAND_SIGNUP=Probanden - Sign-Up
-MASS_MAIL_MASTER_ALL_DEPARTMENTS=Massenmail erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-MASS_MAIL_MASTER_USER_DEPARTMENT=Massenmail erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Massenmail erstellen/bearbeiten/l\u00F6schen - Organisationseinheit der Person/Organisation des aktiven Benutzers
-MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Massenmail Detail bearbeiten - alle Organisationseinheiten
-MASS_MAIL_DETAIL_USER_DEPARTMENT=Massenmail Detail bearbeiten - Organisationseinheit des aktiven Benutzers
-MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Massenmail Detail bearbeiten - Organisationseinheit der Person/Organisation des aktiven Benutzers
-MASS_MAIL_VIEW_ALL_DEPARTMENTS=Massenmail betrachten - alle Organisationseinheiten
-MASS_MAIL_VIEW_USER_DEPARTMENT=Massenmail betrachten - Organisationseinheit des aktiven Benutzers
-MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=Massenmail betrachten - Organisationseinheit der Person/Organisation des aktiven Benutzers
+MASS_MAIL_MASTER_ALL_DEPARTMENTS=Massenmail erstellen/bearbeiten/l\u00F6schen - alle Siteen
+MASS_MAIL_MASTER_USER_DEPARTMENT=Massenmail erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Massenmail erstellen/bearbeiten/l\u00F6schen - Site der Person/Organisation des aktiven Benutzers
+MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Massenmail Detail bearbeiten - alle Siteen
+MASS_MAIL_DETAIL_USER_DEPARTMENT=Massenmail Detail bearbeiten - Site des aktiven Benutzers
+MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Massenmail Detail bearbeiten - Site der Person/Organisation des aktiven Benutzers
+MASS_MAIL_VIEW_ALL_DEPARTMENTS=Massenmail betrachten - alle Siteen
+MASS_MAIL_VIEW_USER_DEPARTMENT=Massenmail betrachten - Site des aktiven Benutzers
+MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=Massenmail betrachten - Site der Person/Organisation des aktiven Benutzers
 MASS_MAIL_SIGNUP=Massenmail - Sign-Up
-USER_ALL_DEPARTMENTS=Benutzer erstellen/bearbeiten/l\u00F6schen - alle Organisationseinheiten
-USER_USER_DEPARTMENT=Benutzer erstellen/bearbeiten/l\u00F6schen - Organisationseinheit des aktiven Benutzers
-USER_IDENTITY_DEPARTMENT=Benutzer erstellen/bearbeiten/l\u00F6schen - Organisationseinheit der Person/Organisation des aktiven Benutzers
+USER_ALL_DEPARTMENTS=Benutzer erstellen/bearbeiten/l\u00F6schen - alle Siteen
+USER_USER_DEPARTMENT=Benutzer erstellen/bearbeiten/l\u00F6schen - Site des aktiven Benutzers
+USER_IDENTITY_DEPARTMENT=Benutzer erstellen/bearbeiten/l\u00F6schen - Site der Person/Organisation des aktiven Benutzers
 USER_ACTIVE_USER=Benutzer Details bearbeiten - aktiver Benutzer
 INPUT_FIELD_MASTER=Eingabefeld erstellen/bearbeiten/l\u00F6schen
 INPUT_FIELD_VIEW=Eingabefeld betrachten
diff --git a/core/src/main/resources/ctsms-permissionprofilenames_ff.properties b/core/src/main/resources/ctsms-permissionprofilenames_ff.properties
index ed06ad4ff028..6e8cc49e9eec 100644
--- a/core/src/main/resources/ctsms-permissionprofilenames_ff.properties
+++ b/core/src/main/resources/ctsms-permissionprofilenames_ff.properties
@@ -1,74 +1,74 @@
-INVENTORY_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete inventory - all departments
-INVENTORY_MASTER_USER_DEPARTMENT=Create/Edit/Delete inventory - department of active user
-INVENTORY_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete inventory - department of person/organisation of active user
-INVENTORY_DETAIL_ALL_DEPARTMENTS=Edit inventory details - all departments
-INVENTORY_DETAIL_USER_DEPARTMENT=Edit inventory details - department of active user
-INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Edit inventory details - department of person/organisation of active user
-INVENTORY_VIEW_ALL_DEPARTMENTS=View inventory - all departments
-INVENTORY_VIEW_USER_DEPARTMENT=View inventory - department of active user
-INVENTORY_VIEW_IDENTITY_DEPARTMENT=View inventory - department of person/organisation of active user
-STAFF_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete person/organisation - all departments
-STAFF_MASTER_USER_DEPARTMENT=Create/Edit/Delete person/organisation - department of active user
-STAFF_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete person/organisation - department of person/organisation of active user
+INVENTORY_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete inventory - all sites
+INVENTORY_MASTER_USER_DEPARTMENT=Create/Edit/Delete inventory - site of active user
+INVENTORY_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete inventory - site of person/organisation of active user
+INVENTORY_DETAIL_ALL_DEPARTMENTS=Edit inventory details - all sites
+INVENTORY_DETAIL_USER_DEPARTMENT=Edit inventory details - site of active user
+INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Edit inventory details - site of person/organisation of active user
+INVENTORY_VIEW_ALL_DEPARTMENTS=View inventory - all sites
+INVENTORY_VIEW_USER_DEPARTMENT=View inventory - site of active user
+INVENTORY_VIEW_IDENTITY_DEPARTMENT=View inventory - site of person/organisation of active user
+STAFF_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete person/organisation - all sites
+STAFF_MASTER_USER_DEPARTMENT=Create/Edit/Delete person/organisation - site of active user
+STAFF_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete person/organisation - site of person/organisation of active user
 STAFF_MASTER_IDENTITY=Edit person/organisation - person/organisation of active user
 STAFF_MASTER_IDENTITY_CHILD=Edit/Delete person/organisation - person/organisation of active user and child persons/organisations
-STAFF_DETAIL_ALL_DEPARTMENTS=Edit person/organisation details - all departments
-STAFF_DETAIL_USER_DEPARTMENT=Edit person/organisation details - department of active user
-STAFF_DETAIL_IDENTITY_DEPARTMENT=Edit person/organisation details - department of person/organisation of active user
+STAFF_DETAIL_ALL_DEPARTMENTS=Edit person/organisation details - all sites
+STAFF_DETAIL_USER_DEPARTMENT=Edit person/organisation details - site of active user
+STAFF_DETAIL_IDENTITY_DEPARTMENT=Edit person/organisation details - site of person/organisation of active user
 STAFF_DETAIL_IDENTITY=Edit person/organisation details - person/organisation of active user
 STAFF_DETAIL_IDENTITY_CHILD=Edit person/organisation details - person/organisation of active user and child persons/organisations
-STAFF_VIEW_ALL_DEPARTMENTS=View person/organisation details - all departments
-STAFF_VIEW_USER_DEPARTMENT=View person/organisation details - department of active user
-STAFF_VIEW_IDENTITY_DEPARTMENT=View person/organisation details - department of person/organisation of active user
+STAFF_VIEW_ALL_DEPARTMENTS=View person/organisation details - all sites
+STAFF_VIEW_USER_DEPARTMENT=View person/organisation details - site of active user
+STAFF_VIEW_IDENTITY_DEPARTMENT=View person/organisation details - site of person/organisation of active user
 STAFF_VIEW_IDENTITY=View person/organisation details - person/organisation of active user
 STAFF_VIEW_IDENTITY_CHILD=View person/organisation details - person/organisation of active user and child persons/organisations
-COURSE_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete course - all departments
-COURSE_MASTER_USER_DEPARTMENT=Create/Edit/Delete course - department of active user
-COURSE_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete course - department of person/organisation of active user
+COURSE_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete course - all sites
+COURSE_MASTER_USER_DEPARTMENT=Create/Edit/Delete course - site of active user
+COURSE_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete course - site of person/organisation of active user
 COURSE_MASTER_LECTURER=Edit course - person/organisation of active user is lecturer
-COURSE_DETAIL_ALL_DEPARTMENTS=Edit course details - all departments
-COURSE_DETAIL_USER_DEPARTMENT=Edit course details - department of active user
-COURSE_DETAIL_IDENTITY_DEPARTMENT=Edit course details - department of person/organisation of active user
+COURSE_DETAIL_ALL_DEPARTMENTS=Edit course details - all sites
+COURSE_DETAIL_USER_DEPARTMENT=Edit course details - site of active user
+COURSE_DETAIL_IDENTITY_DEPARTMENT=Edit course details - site of person/organisation of active user
 COURSE_DETAIL_LECTURER=Edit course details - person/organisation of active user is lecturer
-COURSE_VIEW_ALL_DEPARTMENTS=View course - all departments
-COURSE_VIEW_USER_DEPARTMENT=View course - department of active user
-COURSE_VIEW_IDENTITY_DEPARTMENT=View course - department of person/organisation of active user
+COURSE_VIEW_ALL_DEPARTMENTS=View course - all sites
+COURSE_VIEW_USER_DEPARTMENT=View course - site of active user
+COURSE_VIEW_IDENTITY_DEPARTMENT=View course - site of person/organisation of active user
 COURSE_VIEW_LECTURER=View course - person/organisation of active user is lecturer
-TRIAL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete trial - all departments
-TRIAL_MASTER_USER_DEPARTMENT=Create/Edit/Delete trial - department of active user
-TRIAL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete trial - department of person/organisation of active user
+TRIAL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete trial - all sites
+TRIAL_MASTER_USER_DEPARTMENT=Create/Edit/Delete trial - site of active user
+TRIAL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete trial - site of person/organisation of active user
 TRIAL_MASTER_TEAM_MEMBER=Edit trial - person/organisation of active user is team member
-TRIAL_DETAIL_ALL_DEPARTMENTS=Edit trial details - all departments
-TRIAL_DETAIL_USER_DEPARTMENT=Edit trial details - department of active user
-TRIAL_DETAIL_IDENTITY_DEPARTMENT=Edit trial details - department of person/organisation of active user
+TRIAL_DETAIL_ALL_DEPARTMENTS=Edit trial details - all sites
+TRIAL_DETAIL_USER_DEPARTMENT=Edit trial details - site of active user
+TRIAL_DETAIL_IDENTITY_DEPARTMENT=Edit trial details - site of person/organisation of active user
 TRIAL_DETAIL_TEAM_MEMBER=Edit trial details - person/organisation of active user is team member
-TRIAL_VIEW_ALL_DEPARTMENTS=View trial - all departments
-TRIAL_VIEW_USER_DEPARTMENT=View trial - department of active user
-TRIAL_VIEW_IDENTITY_DEPARTMENT=View trial - department of person/organisation of active user
+TRIAL_VIEW_ALL_DEPARTMENTS=View trial - all sites
+TRIAL_VIEW_USER_DEPARTMENT=View trial - site of active user
+TRIAL_VIEW_IDENTITY_DEPARTMENT=View trial - site of person/organisation of active user
 TRIAL_VIEW_TEAM_MEMBER=View trial - person/organisation of active user is team member
 TRIAL_SIGNUP=Trials - Sign-Up
-PROBAND_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete proband - all departments
-PROBAND_MASTER_USER_DEPARTMENT=Create/Edit/Delete proband - department of active user
-PROBAND_DETAIL_ALL_DEPARTMENTS=Edit proband details - all departments
-PROBAND_DETAIL_USER_DEPARTMENT=Edit proband details - department of active user
-PROBAND_VIEW_ALL_DEPARTMENTS=View proband - all departments
-PROBAND_VIEW_USER_DEPARTMENT=View proband - department of active user
+PROBAND_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete proband - all sites
+PROBAND_MASTER_USER_DEPARTMENT=Create/Edit/Delete proband - site of active user
+PROBAND_DETAIL_ALL_DEPARTMENTS=Edit proband details - all sites
+PROBAND_DETAIL_USER_DEPARTMENT=Edit proband details - site of active user
+PROBAND_VIEW_ALL_DEPARTMENTS=View proband - all sites
+PROBAND_VIEW_USER_DEPARTMENT=View proband - site of active user
 PROBAND_NO_ACCESS=Probands - no access
 PROBAND_DEVICE=Probands - device
 PROBAND_SIGNUP=Probands - Sign-Up
-MASS_MAIL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete mass mail - all departments
-MASS_MAIL_MASTER_USER_DEPARTMENT=Create/Edit/Delete mass mail - department of active user
-MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete mass mail - department of person/organisation of active user
-MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Edit mass mail details - all departments
-MASS_MAIL_DETAIL_USER_DEPARTMENT=Edit mass mail details - department of active user
-MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Edit mass mail details - department of person/organisation of active user
-MASS_MAIL_VIEW_ALL_DEPARTMENTS=View mass mail - all departments
-MASS_MAIL_VIEW_USER_DEPARTMENT=View mass mail - department of active user
-MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=View mass mail - department of person/organisation of active user
+MASS_MAIL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete mass mail - all sites
+MASS_MAIL_MASTER_USER_DEPARTMENT=Create/Edit/Delete mass mail - site of active user
+MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete mass mail - site of person/organisation of active user
+MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Edit mass mail details - all sites
+MASS_MAIL_DETAIL_USER_DEPARTMENT=Edit mass mail details - site of active user
+MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Edit mass mail details - site of person/organisation of active user
+MASS_MAIL_VIEW_ALL_DEPARTMENTS=View mass mail - all sites
+MASS_MAIL_VIEW_USER_DEPARTMENT=View mass mail - site of active user
+MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=View mass mail - site of person/organisation of active user
 MASS_MAIL_SIGNUP=Mass mail - Sign-Up
-USER_ALL_DEPARTMENTS=Create/Edit/Delete user - all departments
-USER_USER_DEPARTMENT=Create/Edit/Delete user - department of active user
-USER_IDENTITY_DEPARTMENT=Create/Edit/Delete user - department of person/organisation of active user
+USER_ALL_DEPARTMENTS=Create/Edit/Delete user - all sites
+USER_USER_DEPARTMENT=Create/Edit/Delete user - site of active user
+USER_IDENTITY_DEPARTMENT=Create/Edit/Delete user - site of person/organisation of active user
 USER_ACTIVE_USER=Edit user details - active user
 INPUT_FIELD_MASTER=Create/Edit/Delete input field
 INPUT_FIELD_VIEW=View input field
diff --git a/core/src/main/resources/ctsms-permissionprofilenames_kg.properties b/core/src/main/resources/ctsms-permissionprofilenames_kg.properties
index ed06ad4ff028..6e8cc49e9eec 100644
--- a/core/src/main/resources/ctsms-permissionprofilenames_kg.properties
+++ b/core/src/main/resources/ctsms-permissionprofilenames_kg.properties
@@ -1,74 +1,74 @@
-INVENTORY_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete inventory - all departments
-INVENTORY_MASTER_USER_DEPARTMENT=Create/Edit/Delete inventory - department of active user
-INVENTORY_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete inventory - department of person/organisation of active user
-INVENTORY_DETAIL_ALL_DEPARTMENTS=Edit inventory details - all departments
-INVENTORY_DETAIL_USER_DEPARTMENT=Edit inventory details - department of active user
-INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Edit inventory details - department of person/organisation of active user
-INVENTORY_VIEW_ALL_DEPARTMENTS=View inventory - all departments
-INVENTORY_VIEW_USER_DEPARTMENT=View inventory - department of active user
-INVENTORY_VIEW_IDENTITY_DEPARTMENT=View inventory - department of person/organisation of active user
-STAFF_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete person/organisation - all departments
-STAFF_MASTER_USER_DEPARTMENT=Create/Edit/Delete person/organisation - department of active user
-STAFF_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete person/organisation - department of person/organisation of active user
+INVENTORY_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete inventory - all sites
+INVENTORY_MASTER_USER_DEPARTMENT=Create/Edit/Delete inventory - site of active user
+INVENTORY_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete inventory - site of person/organisation of active user
+INVENTORY_DETAIL_ALL_DEPARTMENTS=Edit inventory details - all sites
+INVENTORY_DETAIL_USER_DEPARTMENT=Edit inventory details - site of active user
+INVENTORY_DETAIL_IDENTITY_DEPARTMENT=Edit inventory details - site of person/organisation of active user
+INVENTORY_VIEW_ALL_DEPARTMENTS=View inventory - all sites
+INVENTORY_VIEW_USER_DEPARTMENT=View inventory - site of active user
+INVENTORY_VIEW_IDENTITY_DEPARTMENT=View inventory - site of person/organisation of active user
+STAFF_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete person/organisation - all sites
+STAFF_MASTER_USER_DEPARTMENT=Create/Edit/Delete person/organisation - site of active user
+STAFF_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete person/organisation - site of person/organisation of active user
 STAFF_MASTER_IDENTITY=Edit person/organisation - person/organisation of active user
 STAFF_MASTER_IDENTITY_CHILD=Edit/Delete person/organisation - person/organisation of active user and child persons/organisations
-STAFF_DETAIL_ALL_DEPARTMENTS=Edit person/organisation details - all departments
-STAFF_DETAIL_USER_DEPARTMENT=Edit person/organisation details - department of active user
-STAFF_DETAIL_IDENTITY_DEPARTMENT=Edit person/organisation details - department of person/organisation of active user
+STAFF_DETAIL_ALL_DEPARTMENTS=Edit person/organisation details - all sites
+STAFF_DETAIL_USER_DEPARTMENT=Edit person/organisation details - site of active user
+STAFF_DETAIL_IDENTITY_DEPARTMENT=Edit person/organisation details - site of person/organisation of active user
 STAFF_DETAIL_IDENTITY=Edit person/organisation details - person/organisation of active user
 STAFF_DETAIL_IDENTITY_CHILD=Edit person/organisation details - person/organisation of active user and child persons/organisations
-STAFF_VIEW_ALL_DEPARTMENTS=View person/organisation details - all departments
-STAFF_VIEW_USER_DEPARTMENT=View person/organisation details - department of active user
-STAFF_VIEW_IDENTITY_DEPARTMENT=View person/organisation details - department of person/organisation of active user
+STAFF_VIEW_ALL_DEPARTMENTS=View person/organisation details - all sites
+STAFF_VIEW_USER_DEPARTMENT=View person/organisation details - site of active user
+STAFF_VIEW_IDENTITY_DEPARTMENT=View person/organisation details - site of person/organisation of active user
 STAFF_VIEW_IDENTITY=View person/organisation details - person/organisation of active user
 STAFF_VIEW_IDENTITY_CHILD=View person/organisation details - person/organisation of active user and child persons/organisations
-COURSE_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete course - all departments
-COURSE_MASTER_USER_DEPARTMENT=Create/Edit/Delete course - department of active user
-COURSE_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete course - department of person/organisation of active user
+COURSE_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete course - all sites
+COURSE_MASTER_USER_DEPARTMENT=Create/Edit/Delete course - site of active user
+COURSE_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete course - site of person/organisation of active user
 COURSE_MASTER_LECTURER=Edit course - person/organisation of active user is lecturer
-COURSE_DETAIL_ALL_DEPARTMENTS=Edit course details - all departments
-COURSE_DETAIL_USER_DEPARTMENT=Edit course details - department of active user
-COURSE_DETAIL_IDENTITY_DEPARTMENT=Edit course details - department of person/organisation of active user
+COURSE_DETAIL_ALL_DEPARTMENTS=Edit course details - all sites
+COURSE_DETAIL_USER_DEPARTMENT=Edit course details - site of active user
+COURSE_DETAIL_IDENTITY_DEPARTMENT=Edit course details - site of person/organisation of active user
 COURSE_DETAIL_LECTURER=Edit course details - person/organisation of active user is lecturer
-COURSE_VIEW_ALL_DEPARTMENTS=View course - all departments
-COURSE_VIEW_USER_DEPARTMENT=View course - department of active user
-COURSE_VIEW_IDENTITY_DEPARTMENT=View course - department of person/organisation of active user
+COURSE_VIEW_ALL_DEPARTMENTS=View course - all sites
+COURSE_VIEW_USER_DEPARTMENT=View course - site of active user
+COURSE_VIEW_IDENTITY_DEPARTMENT=View course - site of person/organisation of active user
 COURSE_VIEW_LECTURER=View course - person/organisation of active user is lecturer
-TRIAL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete trial - all departments
-TRIAL_MASTER_USER_DEPARTMENT=Create/Edit/Delete trial - department of active user
-TRIAL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete trial - department of person/organisation of active user
+TRIAL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete trial - all sites
+TRIAL_MASTER_USER_DEPARTMENT=Create/Edit/Delete trial - site of active user
+TRIAL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete trial - site of person/organisation of active user
 TRIAL_MASTER_TEAM_MEMBER=Edit trial - person/organisation of active user is team member
-TRIAL_DETAIL_ALL_DEPARTMENTS=Edit trial details - all departments
-TRIAL_DETAIL_USER_DEPARTMENT=Edit trial details - department of active user
-TRIAL_DETAIL_IDENTITY_DEPARTMENT=Edit trial details - department of person/organisation of active user
+TRIAL_DETAIL_ALL_DEPARTMENTS=Edit trial details - all sites
+TRIAL_DETAIL_USER_DEPARTMENT=Edit trial details - site of active user
+TRIAL_DETAIL_IDENTITY_DEPARTMENT=Edit trial details - site of person/organisation of active user
 TRIAL_DETAIL_TEAM_MEMBER=Edit trial details - person/organisation of active user is team member
-TRIAL_VIEW_ALL_DEPARTMENTS=View trial - all departments
-TRIAL_VIEW_USER_DEPARTMENT=View trial - department of active user
-TRIAL_VIEW_IDENTITY_DEPARTMENT=View trial - department of person/organisation of active user
+TRIAL_VIEW_ALL_DEPARTMENTS=View trial - all sites
+TRIAL_VIEW_USER_DEPARTMENT=View trial - site of active user
+TRIAL_VIEW_IDENTITY_DEPARTMENT=View trial - site of person/organisation of active user
 TRIAL_VIEW_TEAM_MEMBER=View trial - person/organisation of active user is team member
 TRIAL_SIGNUP=Trials - Sign-Up
-PROBAND_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete proband - all departments
-PROBAND_MASTER_USER_DEPARTMENT=Create/Edit/Delete proband - department of active user
-PROBAND_DETAIL_ALL_DEPARTMENTS=Edit proband details - all departments
-PROBAND_DETAIL_USER_DEPARTMENT=Edit proband details - department of active user
-PROBAND_VIEW_ALL_DEPARTMENTS=View proband - all departments
-PROBAND_VIEW_USER_DEPARTMENT=View proband - department of active user
+PROBAND_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete proband - all sites
+PROBAND_MASTER_USER_DEPARTMENT=Create/Edit/Delete proband - site of active user
+PROBAND_DETAIL_ALL_DEPARTMENTS=Edit proband details - all sites
+PROBAND_DETAIL_USER_DEPARTMENT=Edit proband details - site of active user
+PROBAND_VIEW_ALL_DEPARTMENTS=View proband - all sites
+PROBAND_VIEW_USER_DEPARTMENT=View proband - site of active user
 PROBAND_NO_ACCESS=Probands - no access
 PROBAND_DEVICE=Probands - device
 PROBAND_SIGNUP=Probands - Sign-Up
-MASS_MAIL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete mass mail - all departments
-MASS_MAIL_MASTER_USER_DEPARTMENT=Create/Edit/Delete mass mail - department of active user
-MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete mass mail - department of person/organisation of active user
-MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Edit mass mail details - all departments
-MASS_MAIL_DETAIL_USER_DEPARTMENT=Edit mass mail details - department of active user
-MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Edit mass mail details - department of person/organisation of active user
-MASS_MAIL_VIEW_ALL_DEPARTMENTS=View mass mail - all departments
-MASS_MAIL_VIEW_USER_DEPARTMENT=View mass mail - department of active user
-MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=View mass mail - department of person/organisation of active user
+MASS_MAIL_MASTER_ALL_DEPARTMENTS=Create/Edit/Delete mass mail - all sites
+MASS_MAIL_MASTER_USER_DEPARTMENT=Create/Edit/Delete mass mail - site of active user
+MASS_MAIL_MASTER_IDENTITY_DEPARTMENT=Create/Edit/Delete mass mail - site of person/organisation of active user
+MASS_MAIL_DETAIL_ALL_DEPARTMENTS=Edit mass mail details - all sites
+MASS_MAIL_DETAIL_USER_DEPARTMENT=Edit mass mail details - site of active user
+MASS_MAIL_DETAIL_IDENTITY_DEPARTMENT=Edit mass mail details - site of person/organisation of active user
+MASS_MAIL_VIEW_ALL_DEPARTMENTS=View mass mail - all sites
+MASS_MAIL_VIEW_USER_DEPARTMENT=View mass mail - site of active user
+MASS_MAIL_VIEW_IDENTITY_DEPARTMENT=View mass mail - site of person/organisation of active user
 MASS_MAIL_SIGNUP=Mass mail - Sign-Up
-USER_ALL_DEPARTMENTS=Create/Edit/Delete user - all departments
-USER_USER_DEPARTMENT=Create/Edit/Delete user - department of active user
-USER_IDENTITY_DEPARTMENT=Create/Edit/Delete user - department of person/organisation of active user
+USER_ALL_DEPARTMENTS=Create/Edit/Delete user - all sites
+USER_USER_DEPARTMENT=Create/Edit/Delete user - site of active user
+USER_IDENTITY_DEPARTMENT=Create/Edit/Delete user - site of person/organisation of active user
 USER_ACTIVE_USER=Edit user details - active user
 INPUT_FIELD_MASTER=Create/Edit/Delete input field
 INPUT_FIELD_VIEW=View input field
diff --git a/core/src/main/resources/ctsms-probandlist-excel-labels.properties b/core/src/main/resources/ctsms-probandlist-excel-labels.properties
index 77307db98e55..c05bb105874a 100644
--- a/core/src/main/resources/ctsms-probandlist-excel-labels.properties
+++ b/core/src/main/resources/ctsms-probandlist-excel-labels.properties
@@ -55,7 +55,7 @@ proband.dateOfBirth=Date of birth
 proband.age=Age
 proband.gender.name=Gender
 
-proband.department.name=Department
+proband.department.name=Site
 proband.category.name=Category
 proband.citizenship=Citizenship
 proband.privacyConsentStatus.name=Data privacy consent status
diff --git a/core/src/main/resources/ctsms-probandlist-excel-labels_de.properties b/core/src/main/resources/ctsms-probandlist-excel-labels_de.properties
index 4734283c081b..863657e26244 100644
--- a/core/src/main/resources/ctsms-probandlist-excel-labels_de.properties
+++ b/core/src/main/resources/ctsms-probandlist-excel-labels_de.properties
@@ -56,7 +56,7 @@ proband.dateOfBirth=Geburtsdatum
 proband.age=Alter
 proband.gender.name=Geschlecht
 
-proband.department.name=Org.Einheit
+proband.department.name=Site
 proband.category.name=Kategorie
 proband.citizenship=Staatsangeh\u00F6rigkeit
 proband.privacyConsentStatus.name=Datenschutz-Einverst\u00E4ndniserkl\u00E4rung
diff --git a/core/src/main/resources/ctsms-probandlist-excel-labels_ff.properties b/core/src/main/resources/ctsms-probandlist-excel-labels_ff.properties
index c101ce6acd82..d2894be27c89 100644
--- a/core/src/main/resources/ctsms-probandlist-excel-labels_ff.properties
+++ b/core/src/main/resources/ctsms-probandlist-excel-labels_ff.properties
@@ -55,7 +55,7 @@ proband.dateOfBirth=Date of birth
 proband.age=Age
 proband.gender.name=Gender
 
-proband.department.name=Department
+proband.department.name=Site
 proband.category.name=Category
 proband.citizenship=Citizenship
 proband.privacyConsentStatus.name=Data privacy consent status
diff --git a/core/src/main/resources/ctsms-probandlist-excel-labels_kg.properties b/core/src/main/resources/ctsms-probandlist-excel-labels_kg.properties
index c101ce6acd82..d2894be27c89 100644
--- a/core/src/main/resources/ctsms-probandlist-excel-labels_kg.properties
+++ b/core/src/main/resources/ctsms-probandlist-excel-labels_kg.properties
@@ -55,7 +55,7 @@ proband.dateOfBirth=Date of birth
 proband.age=Age
 proband.gender.name=Gender
 
-proband.department.name=Department
+proband.department.name=Site
 proband.category.name=Category
 proband.citizenship=Citizenship
 proband.privacyConsentStatus.name=Data privacy consent status
diff --git a/core/src/main/resources/ctsms-searchresult-excel-labels.properties b/core/src/main/resources/ctsms-searchresult-excel-labels.properties
index c5fa0a9046d9..38def91e25ad 100644
--- a/core/src/main/resources/ctsms-searchresult-excel-labels.properties
+++ b/core/src/main/resources/ctsms-searchresult-excel-labels.properties
@@ -33,7 +33,7 @@ INVENTORY_DB.name=Name
 INVENTORY_DB.bookable=Bookable
 INVENTORY_DB.pieces=Pieces
 INVENTORY_DB.category.name=Category
-INVENTORY_DB.department.name=Department
+INVENTORY_DB.department.name=Site
 INVENTORY_DB.parent.id=Parent inventory ID
 INVENTORY_DB.parent.name=Parent name
 INVENTORY_DB.owner.id=Owner ID
@@ -48,7 +48,7 @@ STAFF_DB.employee=Employee
 STAFF_DB.dateOfBirth=Date of birth
 STAFF_DB.gender.name=Gender
 STAFF_DB.category.name=Category
-STAFF_DB.department.name=Department
+STAFF_DB.department.name=Site
 STAFF_DB.parent.id=Parent person/organisation ID
 STAFF_DB.parent.name=Parent name
 
@@ -67,7 +67,7 @@ COURSE_DB.expires=Expires
 COURSE_DB.validityPeriod.name=Validity period
 COURSE_DB.validityPeriodDays=Validity period days
 COURSE_DB.category.name=Category
-COURSE_DB.department.name=Department
+COURSE_DB.department.name=Site
 COURSE_DB.institution.id=Institution ID
 COURSE_DB.institution.name=Institution name
 
@@ -80,7 +80,7 @@ TRIAL_DB.type.name=Trial type
 TRIAL_DB.status.name=Status
 TRIAL_DB.sponsoring.name=Sponsoring
 TRIAL_DB.surveyStatus.name=Survey status
-TRIAL_DB.department.name=Department
+TRIAL_DB.department.name=Site
 TRIAL_DB.dutySelfAllocationLocked=Duty self-allocation locked
 TRIAL_DB.dutySelfAllocationLockedUntil=Duties fixed until
 TRIAL_DB.dutySelfAllocationLockedFrom=Duties fixed from
@@ -117,7 +117,7 @@ INPUT_FIELD_DB.validationErrorMsg=Validation error message
 USER_DB.id=User ID
 USER_DB.deferredDelete=Marked for deletion
 USER_DB.name=Username
-USER_DB.department.name=Department
+USER_DB.department.name=Site
 USER_DB.locked=Locked
 USER_DB.authMethod.name=Authentication method
 USER_DB.locale=Locale
@@ -140,7 +140,7 @@ PROBAND_DB.dateOfBirth=Date of birth
 PROBAND_DB.age=Age
 PROBAND_DB.gender.name=Gender
 PROBAND_DB.category.name=Category
-PROBAND_DB.department.name=Department
+PROBAND_DB.department.name=Site
 PROBAND_DB.comment=Comment
 PROBAND_DB.autoDelete=Auto-delete
 PROBAND_DB.autoDeleteDeadline=Auto-delete deadline
diff --git a/core/src/main/resources/ctsms-searchresult-excel-labels_de.properties b/core/src/main/resources/ctsms-searchresult-excel-labels_de.properties
index 27ec1f6feeaf..3840f4d6dc03 100644
--- a/core/src/main/resources/ctsms-searchresult-excel-labels_de.properties
+++ b/core/src/main/resources/ctsms-searchresult-excel-labels_de.properties
@@ -33,7 +33,7 @@ INVENTORY_DB.name=Name
 INVENTORY_DB.bookable=Buchbar
 INVENTORY_DB.pieces=St\u00FCck
 INVENTORY_DB.category.name=Kategorie
-INVENTORY_DB.department.name=Organisationseinheit
+INVENTORY_DB.department.name=Site
 INVENTORY_DB.parent.id=\u00DCbergeordnetes Inventar ID
 INVENTORY_DB.parent.name=\u00DCbergeordnetes Inventar Name
 INVENTORY_DB.owner.id=Eigent\u00FCmer ID
@@ -48,7 +48,7 @@ STAFF_DB.employee=Mitarbeiter
 STAFF_DB.dateOfBirth=Geburtsdatum
 STAFF_DB.gender.name=Geschlecht
 STAFF_DB.category.name=Kategorie
-STAFF_DB.department.name=Organisationseinheit
+STAFF_DB.department.name=Site
 STAFF_DB.parent.id=\u00DCbergeordnete Person/Organisation ID
 STAFF_DB.parent.name=\u00DCbergeordnete Person/Organisation Name
 
@@ -67,7 +67,7 @@ COURSE_DB.expires=L\u00E4uft ab
 COURSE_DB.validityPeriod.name=G\u00FCltigkeitsdauer
 COURSE_DB.validityPeriodDays=G\u00FCltigkeitsdauer in Tagen
 COURSE_DB.category.name=Kategorie
-COURSE_DB.department.name=Organisationseinheit
+COURSE_DB.department.name=Site
 COURSE_DB.institution.id=Institution ID
 COURSE_DB.institution.name=Institution Name
 
@@ -80,7 +80,7 @@ TRIAL_DB.type.name=Studienart
 TRIAL_DB.status.name=Status
 TRIAL_DB.sponsoring.name=Sponsoring
 TRIAL_DB.surveyStatus.name=Kundenbefragung
-TRIAL_DB.department.name=Organisationseinheit
+TRIAL_DB.department.name=Site
 TRIAL_DB.dutySelfAllocationLocked=Dienst Selbstzuteilung gesperrt
 TRIAL_DB.dutySelfAllocationLockedUntil=Dienste fixiert bis
 TRIAL_DB.dutySelfAllocationLockedFrom=Dienste fixiert ab
@@ -117,7 +117,7 @@ INPUT_FIELD_DB.validationErrorMsg=Fehlermeldung f\u00FCr die G\u00FCltigkeitspr\
 USER_DB.id=Benutzer ID
 USER_DB.deferredDelete=Zur L\u00F6schung vorgemerkt
 USER_DB.name=Benutzername
-USER_DB.department.name=Organisationseinheit
+USER_DB.department.name=Site
 USER_DB.locked=Gesperrt
 USER_DB.authMethod.name=Authentifizierungsmethode
 USER_DB.locale=Sprache
@@ -140,7 +140,7 @@ PROBAND_DB.dateOfBirth=Geburtsdatum
 PROBAND_DB.age=Alter
 PROBAND_DB.gender.name=Geschlecht
 PROBAND_DB.category.name=Kategorie
-PROBAND_DB.department.name=Organisationseinheit
+PROBAND_DB.department.name=Site
 PROBAND_DB.comment=Kommentar
 PROBAND_DB.autoDelete=Automatische L\u00F6schung
 PROBAND_DB.autoDeleteDeadline=Deadline f\u00FCr automatische L\u00F6schung
diff --git a/core/src/main/resources/ctsms-searchresult-excel-labels_ff.properties b/core/src/main/resources/ctsms-searchresult-excel-labels_ff.properties
index c5fa0a9046d9..38def91e25ad 100644
--- a/core/src/main/resources/ctsms-searchresult-excel-labels_ff.properties
+++ b/core/src/main/resources/ctsms-searchresult-excel-labels_ff.properties
@@ -33,7 +33,7 @@ INVENTORY_DB.name=Name
 INVENTORY_DB.bookable=Bookable
 INVENTORY_DB.pieces=Pieces
 INVENTORY_DB.category.name=Category
-INVENTORY_DB.department.name=Department
+INVENTORY_DB.department.name=Site
 INVENTORY_DB.parent.id=Parent inventory ID
 INVENTORY_DB.parent.name=Parent name
 INVENTORY_DB.owner.id=Owner ID
@@ -48,7 +48,7 @@ STAFF_DB.employee=Employee
 STAFF_DB.dateOfBirth=Date of birth
 STAFF_DB.gender.name=Gender
 STAFF_DB.category.name=Category
-STAFF_DB.department.name=Department
+STAFF_DB.department.name=Site
 STAFF_DB.parent.id=Parent person/organisation ID
 STAFF_DB.parent.name=Parent name
 
@@ -67,7 +67,7 @@ COURSE_DB.expires=Expires
 COURSE_DB.validityPeriod.name=Validity period
 COURSE_DB.validityPeriodDays=Validity period days
 COURSE_DB.category.name=Category
-COURSE_DB.department.name=Department
+COURSE_DB.department.name=Site
 COURSE_DB.institution.id=Institution ID
 COURSE_DB.institution.name=Institution name
 
@@ -80,7 +80,7 @@ TRIAL_DB.type.name=Trial type
 TRIAL_DB.status.name=Status
 TRIAL_DB.sponsoring.name=Sponsoring
 TRIAL_DB.surveyStatus.name=Survey status
-TRIAL_DB.department.name=Department
+TRIAL_DB.department.name=Site
 TRIAL_DB.dutySelfAllocationLocked=Duty self-allocation locked
 TRIAL_DB.dutySelfAllocationLockedUntil=Duties fixed until
 TRIAL_DB.dutySelfAllocationLockedFrom=Duties fixed from
@@ -117,7 +117,7 @@ INPUT_FIELD_DB.validationErrorMsg=Validation error message
 USER_DB.id=User ID
 USER_DB.deferredDelete=Marked for deletion
 USER_DB.name=Username
-USER_DB.department.name=Department
+USER_DB.department.name=Site
 USER_DB.locked=Locked
 USER_DB.authMethod.name=Authentication method
 USER_DB.locale=Locale
@@ -140,7 +140,7 @@ PROBAND_DB.dateOfBirth=Date of birth
 PROBAND_DB.age=Age
 PROBAND_DB.gender.name=Gender
 PROBAND_DB.category.name=Category
-PROBAND_DB.department.name=Department
+PROBAND_DB.department.name=Site
 PROBAND_DB.comment=Comment
 PROBAND_DB.autoDelete=Auto-delete
 PROBAND_DB.autoDeleteDeadline=Auto-delete deadline
diff --git a/core/src/main/resources/ctsms-searchresult-excel-labels_kg.properties b/core/src/main/resources/ctsms-searchresult-excel-labels_kg.properties
index c5fa0a9046d9..38def91e25ad 100644
--- a/core/src/main/resources/ctsms-searchresult-excel-labels_kg.properties
+++ b/core/src/main/resources/ctsms-searchresult-excel-labels_kg.properties
@@ -33,7 +33,7 @@ INVENTORY_DB.name=Name
 INVENTORY_DB.bookable=Bookable
 INVENTORY_DB.pieces=Pieces
 INVENTORY_DB.category.name=Category
-INVENTORY_DB.department.name=Department
+INVENTORY_DB.department.name=Site
 INVENTORY_DB.parent.id=Parent inventory ID
 INVENTORY_DB.parent.name=Parent name
 INVENTORY_DB.owner.id=Owner ID
@@ -48,7 +48,7 @@ STAFF_DB.employee=Employee
 STAFF_DB.dateOfBirth=Date of birth
 STAFF_DB.gender.name=Gender
 STAFF_DB.category.name=Category
-STAFF_DB.department.name=Department
+STAFF_DB.department.name=Site
 STAFF_DB.parent.id=Parent person/organisation ID
 STAFF_DB.parent.name=Parent name
 
@@ -67,7 +67,7 @@ COURSE_DB.expires=Expires
 COURSE_DB.validityPeriod.name=Validity period
 COURSE_DB.validityPeriodDays=Validity period days
 COURSE_DB.category.name=Category
-COURSE_DB.department.name=Department
+COURSE_DB.department.name=Site
 COURSE_DB.institution.id=Institution ID
 COURSE_DB.institution.name=Institution name
 
@@ -80,7 +80,7 @@ TRIAL_DB.type.name=Trial type
 TRIAL_DB.status.name=Status
 TRIAL_DB.sponsoring.name=Sponsoring
 TRIAL_DB.surveyStatus.name=Survey status
-TRIAL_DB.department.name=Department
+TRIAL_DB.department.name=Site
 TRIAL_DB.dutySelfAllocationLocked=Duty self-allocation locked
 TRIAL_DB.dutySelfAllocationLockedUntil=Duties fixed until
 TRIAL_DB.dutySelfAllocationLockedFrom=Duties fixed from
@@ -117,7 +117,7 @@ INPUT_FIELD_DB.validationErrorMsg=Validation error message
 USER_DB.id=User ID
 USER_DB.deferredDelete=Marked for deletion
 USER_DB.name=Username
-USER_DB.department.name=Department
+USER_DB.department.name=Site
 USER_DB.locked=Locked
 USER_DB.authMethod.name=Authentication method
 USER_DB.locale=Locale
@@ -140,7 +140,7 @@ PROBAND_DB.dateOfBirth=Date of birth
 PROBAND_DB.age=Age
 PROBAND_DB.gender.name=Gender
 PROBAND_DB.category.name=Category
-PROBAND_DB.department.name=Department
+PROBAND_DB.department.name=Site
 PROBAND_DB.comment=Comment
 PROBAND_DB.autoDelete=Auto-delete
 PROBAND_DB.autoDeleteDeadline=Auto-delete deadline
diff --git a/core/src/main/resources/ctsms-serviceexceptionmessages.properties b/core/src/main/resources/ctsms-serviceexceptionmessages.properties
index 3e3bd520ee62..9ef4cc2c6ee7 100644
--- a/core/src/main/resources/ctsms-serviceexceptionmessages.properties
+++ b/core/src/main/resources/ctsms-serviceexceptionmessages.properties
@@ -6,9 +6,9 @@ unsupported_position_movement=unsupported order rearrangement - {0}
 invalid_zip_code=zip code {0} does not match the regexp pattern /{1}/
 
 cannot_decrypt_proband=cannot decrypt proband
-proband_department_not_equal_to_user_department=proband department must match the user's department
-proband_department_changed=proband department cannot be changed
-proband_department_not_changed=proband department not changed
+proband_department_not_equal_to_user_department=proband site must match the user's site
+proband_department_changed=proband site cannot be changed
+proband_department_not_changed=proband site not changed
 
 duplicate_proband_child=duplicate child ID {0}
 proband_child_null=child ID is null
@@ -47,7 +47,7 @@ proband_graph_loop=the children would yield a loop: {0}
 timeline_event_graph_loop=parent timeline event would yield a loop: {0}
 user_graph_loop=the parent user would yield a loop: {0}
 
-invalid_department_id=invalid department ID {0}
+invalid_department_id=invalid site ID {0}
 invalid_inventory_id=invalid inventory ID {0}
 invalid_inventory_category_id=invalid inventory category ID {0}
 invalid_inventory_status_type_id=invalid inventory status type ID {0}
@@ -205,7 +205,7 @@ entity_version_not_zero=record version is not equal to 0
 
 invalid_locale=invalid locale
 invalid_time_zone=invalid time zone
-department_password_wrong=department password wrong
+department_password_wrong=site password wrong
 invalid_date_format_pattern=invalid date format '{0}'
 invalid_decimal_separatorn=invalid decimal separator '{0}'
 decrypt_flag_not_set=PII decryption has to be enabled for PII decryption from any host
@@ -750,7 +750,7 @@ journal_entry_criteria_only_allowed=query ID must not be null only
 journal_entry_input_field_only_allowed=input field ID must not be null only
 journal_entry_mass_mail_only_allowed=mass mail ID must not be null only
 
-old_department_password_wrong=old department password wrong
+old_department_password_wrong=old site password wrong
 invalid_parent_user_id=invalid parent user ID {0}
 invalid_regexp_pattern_from_file_extension=invalid regexp pattern from mime type file extension {0}: {1}
 file_extension_zero_length=mime type file extension with length 0
diff --git a/core/src/main/resources/ctsms-serviceexceptionmessages_de.properties b/core/src/main/resources/ctsms-serviceexceptionmessages_de.properties
index 717686bd15ab..5c5345b5b692 100644
--- a/core/src/main/resources/ctsms-serviceexceptionmessages_de.properties
+++ b/core/src/main/resources/ctsms-serviceexceptionmessages_de.properties
@@ -6,9 +6,9 @@ unsupported_position_movement=Ver\u00E4nderung der Reihung nicht unterst\u00FCtz
 invalid_zip_code=Postleitzahl {0} entspricht nicht dem regul\u00E4ren Ausdruck /{1}/
 
 cannot_decrypt_proband=Proband kann nicht entschl\u00FCsselt werden
-proband_department_not_equal_to_user_department=Org.Einheit des Probanden muss jener des Benutzers entsprechen
-proband_department_changed=Org.Einheit des Probanden kann nicht ge\u00E4ndert werden
-proband_department_not_changed=Org.Einheit des Probanden unver\u00E4ndert
+proband_department_not_equal_to_user_department=Site des Probanden muss jener des Benutzers entsprechen
+proband_department_changed=Site des Probanden kann nicht ge\u00E4ndert werden
+proband_department_not_changed=Site des Probanden unver\u00E4ndert
 
 duplicate_proband_child=Kind ID {0} mehrfach angegeben
 proband_child_null=ID eines Kindes ist null
@@ -48,7 +48,7 @@ proband_graph_loop=die Kinder w\u00FCrden eine Schleife ergeben: {0}
 timeline_event_graph_loop=bestimmendes Zeitlinienereignis w\u00FCrde eine Schleife ergeben: {0}
 user_graph_loop=der \u00FCbergeordnete Benutzer w\u00FCrde eine Schleife ergeben: {0}
 
-invalid_department_id=ung\u00FCltige Organisationseinheit ID {0}
+invalid_department_id=ung\u00FCltige Site ID {0}
 invalid_inventory_id=ung\u00FCltige Inventar ID {0}
 invalid_inventory_category_id=ung\u00FCltige Inventarkategorie ID {0}
 invalid_inventory_status_type_id=ung\u00FCltige Inventarstatustyp ID {0}
@@ -206,7 +206,7 @@ entity_version_not_zero=Datensatzversion ist ungleich 0
 
 invalid_locale=ung\u00FCltige Spracheinstellung
 invalid_time_zone=ung\u00FCltige Zeitzone
-department_password_wrong=Passwort der Organisationseinheit ist falsch
+department_password_wrong=Passwort der Site ist falsch
 invalid_date_format_pattern=ung\u00FCltiges Datumsformat '{0}'
 invalid_decimal_separator=ung\u00FCltiges Dezimaltrennzeichen '{0}'
 decrypt_flag_not_set=PII Entschl\u00FCsselung muss aktiviert sein f\u00FCr PII Entschl\u00FCsselung von jedem Computer
@@ -751,7 +751,7 @@ journal_entry_criteria_only_allowed=nur Abfrage ID darf nicht null sein
 journal_entry_input_field_only_allowed=nur Eingabefeld ID darf nicht null sein
 journal_entry_mass_mail_only_allowed=nur Massenmail ID darf nicht null sein
 
-old_department_password_wrong=altes Passwort der Organisationseinheit falsch
+old_department_password_wrong=altes Passwort der Site falsch
 invalid_parent_user_id=ung\u00FCltige Benutzer ID {0} des \u00FCbergeordneten Benutzers
 invalid_regexp_pattern_from_file_extension=der von den Dateiendungen des Mime-Typs abgeleitete regul\u00E4re Ausdruck ist ung\u00FCltig {0}\: {1}
 file_extension_zero_length=Dateiendung des Mime-Typs mit L\u00E4nge 0
diff --git a/core/src/main/resources/ctsms-serviceexceptionmessages_ff.properties b/core/src/main/resources/ctsms-serviceexceptionmessages_ff.properties
index 73d62a9c53fc..77127053367a 100644
--- a/core/src/main/resources/ctsms-serviceexceptionmessages_ff.properties
+++ b/core/src/main/resources/ctsms-serviceexceptionmessages_ff.properties
@@ -6,9 +6,9 @@ unsupported_position_movement=unsupported order rearrangement - {0}
 invalid_zip_code=zip code {0} does not match the regexp pattern /{1}/
 
 cannot_decrypt_proband=cannot decrypt proband
-proband_department_not_equal_to_user_department=proband department must match the user's department
-proband_department_changed=proband department cannot be changed
-proband_department_not_changed=proband department not changed
+proband_department_not_equal_to_user_department=proband site must match the user's site
+proband_department_changed=proband site cannot be changed
+proband_department_not_changed=proband site not changed
 
 duplicate_proband_child=duplicate child ID {0}
 proband_child_null=child ID is null
@@ -47,7 +47,7 @@ proband_graph_loop=the children would yield a loop\: {0}
 timeline_event_graph_loop=parent timeline event would yield a loop\: {0}
 user_graph_loop=the parent user would yield a loop\: {0}
 
-invalid_department_id=invalid department ID {0}
+invalid_department_id=invalid site ID {0}
 invalid_inventory_id=invalid inventory ID {0}
 invalid_inventory_category_id=invalid inventory category ID {0}
 invalid_inventory_status_type_id=invalid inventory status type ID {0}
@@ -205,7 +205,7 @@ entity_version_not_zero=record version is not equal to 0
 
 invalid_locale=invalid locale
 invalid_time_zone=invalid time zone
-department_password_wrong=department password wrong
+department_password_wrong=site password wrong
 invalid_date_format_pattern=invalid date format ''{0}''
 invalid_decimal_separatorn=invalid decimal separator ''{0}''
 decrypt_flag_not_set=PII decryption has to be enabled for PII decryption from any host
@@ -750,7 +750,7 @@ journal_entry_criteria_only_allowed=query ID must not be null only
 journal_entry_input_field_only_allowed=input field ID must not be null only
 journal_entry_mass_mail_only_allowed=mass mail ID must not be null only
 
-old_department_password_wrong=old department password wrong
+old_department_password_wrong=old site password wrong
 invalid_parent_user_id=invalid parent user ID {0}
 invalid_regexp_pattern_from_file_extension=invalid regexp pattern from mime type file extension {0}\: {1}
 file_extension_zero_length=mime type file extension with length 0
diff --git a/core/src/main/resources/ctsms-serviceexceptionmessages_kg.properties b/core/src/main/resources/ctsms-serviceexceptionmessages_kg.properties
index 73d62a9c53fc..77127053367a 100644
--- a/core/src/main/resources/ctsms-serviceexceptionmessages_kg.properties
+++ b/core/src/main/resources/ctsms-serviceexceptionmessages_kg.properties
@@ -6,9 +6,9 @@ unsupported_position_movement=unsupported order rearrangement - {0}
 invalid_zip_code=zip code {0} does not match the regexp pattern /{1}/
 
 cannot_decrypt_proband=cannot decrypt proband
-proband_department_not_equal_to_user_department=proband department must match the user's department
-proband_department_changed=proband department cannot be changed
-proband_department_not_changed=proband department not changed
+proband_department_not_equal_to_user_department=proband site must match the user's site
+proband_department_changed=proband site cannot be changed
+proband_department_not_changed=proband site not changed
 
 duplicate_proband_child=duplicate child ID {0}
 proband_child_null=child ID is null
@@ -47,7 +47,7 @@ proband_graph_loop=the children would yield a loop\: {0}
 timeline_event_graph_loop=parent timeline event would yield a loop\: {0}
 user_graph_loop=the parent user would yield a loop\: {0}
 
-invalid_department_id=invalid department ID {0}
+invalid_department_id=invalid site ID {0}
 invalid_inventory_id=invalid inventory ID {0}
 invalid_inventory_category_id=invalid inventory category ID {0}
 invalid_inventory_status_type_id=invalid inventory status type ID {0}
@@ -205,7 +205,7 @@ entity_version_not_zero=record version is not equal to 0
 
 invalid_locale=invalid locale
 invalid_time_zone=invalid time zone
-department_password_wrong=department password wrong
+department_password_wrong=site password wrong
 invalid_date_format_pattern=invalid date format ''{0}''
 invalid_decimal_separatorn=invalid decimal separator ''{0}''
 decrypt_flag_not_set=PII decryption has to be enabled for PII decryption from any host
@@ -750,7 +750,7 @@ journal_entry_criteria_only_allowed=query ID must not be null only
 journal_entry_input_field_only_allowed=input field ID must not be null only
 journal_entry_mass_mail_only_allowed=mass mail ID must not be null only
 
-old_department_password_wrong=old department password wrong
+old_department_password_wrong=old site password wrong
 invalid_parent_user_id=invalid parent user ID {0}
 invalid_regexp_pattern_from_file_extension=invalid regexp pattern from mime type file extension {0}\: {1}
 file_extension_zero_length=mime type file extension with length 0
diff --git a/core/src/main/resources/ctsms-serviceexceptionmessages_sl.properties b/core/src/main/resources/ctsms-serviceexceptionmessages_sl.properties
index f6d554bba6a8..63a99391b49e 100644
--- a/core/src/main/resources/ctsms-serviceexceptionmessages_sl.properties
+++ b/core/src/main/resources/ctsms-serviceexceptionmessages_sl.properties
@@ -6,7 +6,7 @@ unsupported_position_movement=nepodprta preureditev vrstnega reda - {0}
 invalid_zip_code=poštna številka {0} se ne ujema z vzorcem regularnega izraza /{1}/
 
 cannot_decrypt_proband=ne more dešifrirati probanda
-proband_department_not_equal_to_user_department=proband Department se mora ujemati z uporabnikovim oddelkom
+proband_department_not_equal_to_user_department=proband site se mora ujemati z uporabnikovim oddelkom
 proband_department_changed=proband oddelka ni mogoče spremeniti
 proband_department_not_changed=proband oddelek ni spremenjen
 
diff --git a/core/src/main/resources/ctsms-systemmessagetitles.properties b/core/src/main/resources/ctsms-systemmessagetitles.properties
index ac586c71edba..2fd2405a8e52 100644
--- a/core/src/main/resources/ctsms-systemmessagetitles.properties
+++ b/core/src/main/resources/ctsms-systemmessagetitles.properties
@@ -270,7 +270,7 @@ proband_list_entry_tag_positions_rotated_up={1} proband list attributes rotated
 
 proband_created=proband {0} created
 proband_updated=proband {0} updated
-proband_department_updated=department changed
+proband_department_updated=site changed
 #don't embed the proband name here!
 proband_deleted=proband deleted
 #don't embed the proband name here!
@@ -409,7 +409,7 @@ hyperlink_deleted=hyperlink deleted - {0}
 journal_exported=journal exported - {0}
 ecrf_journal_exported=eCRF journal exported - {0}
 
-department_password_changed=department password changed - {0}
+department_password_changed=site password changed - {0}
 failed_logon=logon failed - {0}
 successful_logon=successful logon - {0}
 
diff --git a/core/src/main/resources/ctsms-systemmessagetitles_de.properties b/core/src/main/resources/ctsms-systemmessagetitles_de.properties
index 2db43827fd49..6ddca84a8d23 100644
--- a/core/src/main/resources/ctsms-systemmessagetitles_de.properties
+++ b/core/src/main/resources/ctsms-systemmessagetitles_de.properties
@@ -270,7 +270,7 @@ proband_list_entry_tag_positions_rotated_up={1} Probandenlistenattribute nach ob
 
 proband_created=Proband {0} erstellt
 proband_updated=Proband {0} aktualisiert
-proband_department_updated=Organisationseinheit ge\u00E4ndert
+proband_department_updated=Site ge\u00E4ndert
 #don't embed the proband name here!
 proband_deleted=Proband gel\u00F6scht
 #don't embed the proband name here!
@@ -409,7 +409,7 @@ hyperlink_deleted=Hyperlink gel\u00F6scht - {0}
 journal_exported=Protokoll exportiert - {0}
 ecrf_journal_exported=eCRF Protokoll exportiert - {0}
 
-department_password_changed=Passwort der Organisationseinheit ge\u00E4ndert - {0}
+department_password_changed=Passwort der Site ge\u00E4ndert - {0}
 failed_logon=Anmeldung fehlgeschlagen - {0}
 successful_logon=erfolgreiche Anmeldung - {0}
 
diff --git a/core/src/main/resources/ctsms-systemmessagetitles_ff.properties b/core/src/main/resources/ctsms-systemmessagetitles_ff.properties
index 205a70fd6c8b..401db354ca9d 100644
--- a/core/src/main/resources/ctsms-systemmessagetitles_ff.properties
+++ b/core/src/main/resources/ctsms-systemmessagetitles_ff.properties
@@ -270,7 +270,7 @@ proband_list_entry_tag_positions_rotated_up={1} proband list attributes rotated
 
 proband_created=proband {0} created
 proband_updated=proband {0} updated
-proband_department_updated=department changed
+proband_department_updated=site changed
 #don't embed the proband name here!
 proband_deleted=proband deleted
 #don't embed the proband name here!
@@ -409,7 +409,7 @@ hyperlink_deleted=hyperlink deleted - {0}
 journal_exported=journal exported - {0}
 ecrf_journal_exported=eCRF journal exported - {0}
 
-department_password_changed=department password changed - {0}
+department_password_changed=site password changed - {0}
 failed_logon=logon failed - {0}
 successful_logon=successful logon - {0}
 
diff --git a/core/src/main/resources/ctsms-systemmessagetitles_kg.properties b/core/src/main/resources/ctsms-systemmessagetitles_kg.properties
index 205a70fd6c8b..401db354ca9d 100644
--- a/core/src/main/resources/ctsms-systemmessagetitles_kg.properties
+++ b/core/src/main/resources/ctsms-systemmessagetitles_kg.properties
@@ -270,7 +270,7 @@ proband_list_entry_tag_positions_rotated_up={1} proband list attributes rotated
 
 proband_created=proband {0} created
 proband_updated=proband {0} updated
-proband_department_updated=department changed
+proband_department_updated=site changed
 #don't embed the proband name here!
 proband_deleted=proband deleted
 #don't embed the proband name here!
@@ -409,7 +409,7 @@ hyperlink_deleted=hyperlink deleted - {0}
 journal_exported=journal exported - {0}
 ecrf_journal_exported=eCRF journal exported - {0}
 
-department_password_changed=department password changed - {0}
+department_password_changed=site password changed - {0}
 failed_logon=logon failed - {0}
 successful_logon=successful logon - {0}
 
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels.properties
index ec078a549805..aeb295688a89 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels.properties
@@ -19,7 +19,7 @@ admin_upcoming_course_overview_title=Upcoming and Ongoing Courses
 
 admin_upcoming_course_overview_upcomingcourse_list_header=course(s)
 admin_upcoming_course_overview_upcomingcourse_list_course_name_column=Course
-admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Department
+admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Site
 admin_upcoming_course_overview_upcomingcourse_list_course_category_column=Category
 admin_upcoming_course_overview_upcomingcourse_list_course_self_registration_column=Self-registration
 admin_upcoming_course_overview_upcomingcourse_list_course_trial_column=Trial
@@ -41,7 +41,7 @@ expiring_course_overview_reminder_period_days_tooltip=The period can be specifie
 
 expiring_course_overview_expiringcourse_list_header=course(s)
 expiring_course_overview_expiringcourse_list_course_name_column=Course
-expiring_course_overview_expiringcourse_list_course_department_column=Department
+expiring_course_overview_expiringcourse_list_course_department_column=Site
 expiring_course_overview_expiringcourse_list_course_category_column=Category
 expiring_course_overview_expiringcourse_list_course_self_registration_column=Self-registration
 expiring_course_overview_expiringcourse_list_course_stop_column=Course stop
@@ -62,7 +62,7 @@ admin_expiring_participation_overview_reminder_period_days_tooltip=The period ca
 
 admin_expiring_participation_overview_expiringparticipation_list_header=participation status item(s)
 admin_expiring_participation_overview_expiringparticipation_list_staff_name_column=Participant
-admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Participant department
+admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Participant site
 admin_expiring_participation_overview_expiringparticipation_list_course_name_column=Course
 admin_expiring_participation_overview_expiringparticipation_list_course_category_column=Category
 admin_expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Self-registration
@@ -80,7 +80,7 @@ participate_self_registration_course_button_label=Invite
 search_open_course_participant_lists_button_label=Open participant lists
 
 search_course_result_list_course_name_column=Course
-search_course_result_list_course_department_column=Department
+search_course_result_list_course_department_column=Site
 search_course_result_list_course_category_column=Category
 search_course_result_list_trial_column=Trial
 search_course_result_list_course_stop_column=Course stop
@@ -102,9 +102,9 @@ course_name_label=Name*:
 course_name=Name
 course_name_tooltip=A course name is required. It need not be unique and should not be a cryptic token<br/>(like a course number). Participants should be able to derive the course content<br/>and goals (e.g. "First Aid Q1/2012").
 
-course_department_label=Department*:
-course_department=Department
-course_department_tooltip=It is required to assign the course to a department.
+course_department_label=Site*:
+course_department=Site
+course_department_tooltip=It is required to assign the course to a site.
 
 course_category_label=Category*:
 course_category=Category
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_de.properties
index cf6734a7fb18..b81224ee236d 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_de.properties
@@ -18,7 +18,7 @@ admin_upcoming_course_overview_title=Laufende und neue Kurse
 
 admin_upcoming_course_overview_upcomingcourse_list_header=Kurs(e)
 admin_upcoming_course_overview_upcomingcourse_list_course_name_column=Kurs
-admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Org.einheit
+admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Site
 admin_upcoming_course_overview_upcomingcourse_list_course_category_column=Kategorie
 admin_upcoming_course_overview_upcomingcourse_list_course_self_registration_column=Selbstanmeldung
 admin_upcoming_course_overview_upcomingcourse_list_course_trial_column=Studie
@@ -40,7 +40,7 @@ expiring_course_overview_reminder_period_days_tooltip=Die Dauer kann ausdr\u00FC
 
 expiring_course_overview_expiringcourse_list_header=Kurs(e)
 expiring_course_overview_expiringcourse_list_course_name_column=Kurs
-expiring_course_overview_expiringcourse_list_course_department_column=Org.einheit
+expiring_course_overview_expiringcourse_list_course_department_column=Site
 expiring_course_overview_expiringcourse_list_course_category_column=Kategorie
 expiring_course_overview_expiringcourse_list_course_self_registration_column=Selbstanmeldung
 expiring_course_overview_expiringcourse_list_course_stop_column=Kursende
@@ -61,7 +61,7 @@ admin_expiring_participation_overview_reminder_period_days_tooltip=Die Dauer kan
 
 admin_expiring_participation_overview_expiringparticipation_list_header=Teilnahmestatuseintr\u00E4ge
 admin_expiring_participation_overview_expiringparticipation_list_staff_name_column=Teilnehmer
-admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Teilnehmer Org.einheit
+admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Teilnehmer Site
 admin_expiring_participation_overview_expiringparticipation_list_course_name_column=Kurs
 admin_expiring_participation_overview_expiringparticipation_list_course_category_column=Kategorie
 admin_expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Selbstanmeldung
@@ -79,7 +79,7 @@ participate_self_registration_course_button_label=Einladen
 search_open_course_participant_lists_button_label=Teilnehmerlisten \u00F6ffnen
 
 search_course_result_list_course_name_column=Kurs
-search_course_result_list_course_department_column=Organisationseinheit
+search_course_result_list_course_department_column=Site
 search_course_result_list_course_category_column=Kategorie
 search_course_result_list_trial_column=Studie
 search_course_result_list_course_stop_column=Kursende
@@ -101,9 +101,9 @@ course_name_label=Name*:
 course_name=Name
 course_name_tooltip=Der Kursname ist erforderlich. Dieser muss nicht zwingend eindeutig sein, und sollte kein abstraktes K\u00FCrzel<br/>(wie Kursnummer) sein. Teilnehmer sollten Kursinhalt bzw. Ziele daraus ableiten k\u00F6nnen<br/>(z.B. "Erste Hilfe Q1/2012").
 
-course_department_label=Organisationseinheit*:
-course_department=Organisationseinheit
-course_department_tooltip=Es ist erforderlich, den Kurs einer Organisationseinheit zuzuordnen.
+course_department_label=Site*:
+course_department=Site
+course_department_tooltip=Es ist erforderlich, den Kurs einer Site zuzuordnen.
 
 course_category_label=Kategorie*:
 course_category=Kategorie
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_ff.properties
index 63a6e2327d53..191b3b53fe63 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_ff.properties
@@ -19,7 +19,7 @@ admin_upcoming_course_overview_title=Upcoming and Ongoing Courses
 
 admin_upcoming_course_overview_upcomingcourse_list_header=course(s)
 admin_upcoming_course_overview_upcomingcourse_list_course_name_column=Course
-admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Department
+admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Site
 admin_upcoming_course_overview_upcomingcourse_list_course_category_column=Category
 admin_upcoming_course_overview_upcomingcourse_list_course_self_registration_column=Self-registration
 admin_upcoming_course_overview_upcomingcourse_list_course_trial_column=Trial
@@ -41,7 +41,7 @@ expiring_course_overview_reminder_period_days_tooltip=The period can be specifie
 
 expiring_course_overview_expiringcourse_list_header=course(s)
 expiring_course_overview_expiringcourse_list_course_name_column=Course
-expiring_course_overview_expiringcourse_list_course_department_column=Department
+expiring_course_overview_expiringcourse_list_course_department_column=Site
 expiring_course_overview_expiringcourse_list_course_category_column=Category
 expiring_course_overview_expiringcourse_list_course_self_registration_column=Self-registration
 expiring_course_overview_expiringcourse_list_course_stop_column=Course stop
@@ -62,7 +62,7 @@ admin_expiring_participation_overview_reminder_period_days_tooltip=The period ca
 
 admin_expiring_participation_overview_expiringparticipation_list_header=participation status item(s)
 admin_expiring_participation_overview_expiringparticipation_list_staff_name_column=Participant
-admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Participant department
+admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Participant site
 admin_expiring_participation_overview_expiringparticipation_list_course_name_column=Course
 admin_expiring_participation_overview_expiringparticipation_list_course_category_column=Category
 admin_expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Self-registration
@@ -80,7 +80,7 @@ participate_self_registration_course_button_label=Invite
 search_open_course_participant_lists_button_label=Open participant lists
 
 search_course_result_list_course_name_column=Course
-search_course_result_list_course_department_column=Department
+search_course_result_list_course_department_column=Site
 search_course_result_list_course_category_column=Category
 search_course_result_list_trial_column=Trial
 search_course_result_list_course_stop_column=Course stop
@@ -102,9 +102,9 @@ course_name_label=Name*\:
 course_name=Name
 course_name_tooltip=A course name is required. It need not be unique and should not be a cryptic token<br/>(like a course number). Participants should be able to derive the course content<br/>and goals (e.g. "First Aid Q1/2012").
 
-course_department_label=Department*\:
-course_department=Department
-course_department_tooltip=It is required to assign the course to a department.
+course_department_label=Site*\:
+course_department=Site
+course_department_tooltip=It is required to assign the course to a site.
 
 course_category_label=Category*\:
 course_category=Category
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_kg.properties
index 63a6e2327d53..191b3b53fe63 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/course/labels_kg.properties
@@ -19,7 +19,7 @@ admin_upcoming_course_overview_title=Upcoming and Ongoing Courses
 
 admin_upcoming_course_overview_upcomingcourse_list_header=course(s)
 admin_upcoming_course_overview_upcomingcourse_list_course_name_column=Course
-admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Department
+admin_upcoming_course_overview_upcomingcourse_list_course_department_column=Site
 admin_upcoming_course_overview_upcomingcourse_list_course_category_column=Category
 admin_upcoming_course_overview_upcomingcourse_list_course_self_registration_column=Self-registration
 admin_upcoming_course_overview_upcomingcourse_list_course_trial_column=Trial
@@ -41,7 +41,7 @@ expiring_course_overview_reminder_period_days_tooltip=The period can be specifie
 
 expiring_course_overview_expiringcourse_list_header=course(s)
 expiring_course_overview_expiringcourse_list_course_name_column=Course
-expiring_course_overview_expiringcourse_list_course_department_column=Department
+expiring_course_overview_expiringcourse_list_course_department_column=Site
 expiring_course_overview_expiringcourse_list_course_category_column=Category
 expiring_course_overview_expiringcourse_list_course_self_registration_column=Self-registration
 expiring_course_overview_expiringcourse_list_course_stop_column=Course stop
@@ -62,7 +62,7 @@ admin_expiring_participation_overview_reminder_period_days_tooltip=The period ca
 
 admin_expiring_participation_overview_expiringparticipation_list_header=participation status item(s)
 admin_expiring_participation_overview_expiringparticipation_list_staff_name_column=Participant
-admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Participant department
+admin_expiring_participation_overview_expiringparticipation_list_staff_department_column=Participant site
 admin_expiring_participation_overview_expiringparticipation_list_course_name_column=Course
 admin_expiring_participation_overview_expiringparticipation_list_course_category_column=Category
 admin_expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Self-registration
@@ -80,7 +80,7 @@ participate_self_registration_course_button_label=Invite
 search_open_course_participant_lists_button_label=Open participant lists
 
 search_course_result_list_course_name_column=Course
-search_course_result_list_course_department_column=Department
+search_course_result_list_course_department_column=Site
 search_course_result_list_course_category_column=Category
 search_course_result_list_trial_column=Trial
 search_course_result_list_course_stop_column=Course stop
@@ -102,9 +102,9 @@ course_name_label=Name*\:
 course_name=Name
 course_name_tooltip=A course name is required. It need not be unique and should not be a cryptic token<br/>(like a course number). Participants should be able to derive the course content<br/>and goals (e.g. "First Aid Q1/2012").
 
-course_department_label=Department*\:
-course_department=Department
-course_department_tooltip=It is required to assign the course to a department.
+course_department_label=Site*\:
+course_department=Site
+course_department_tooltip=It is required to assign the course to a site.
 
 course_category_label=Category*\:
 course_category=Category
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels.properties
index 05412f327ee6..d88bb3d4832d 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels.properties
@@ -222,7 +222,7 @@ input_field_association_ecrf_fields_tab_label=eCRF Fields
 
 input_field_association_probandlistentrytag_list_header=proband list attribute(s)
 input_field_association_probandlistentrytag_list_trial_name_column=Trial
-input_field_association_probandlistentrytag_list_trial_department_column=Department
+input_field_association_probandlistentrytag_list_trial_department_column=Site
 input_field_association_probandlistentrytag_list_trial_status_column=Trial status
 input_field_association_probandlistentrytag_list_title_column=Input field title
 input_field_association_probandlistentrytag_list_optional_column=Optional
@@ -232,7 +232,7 @@ input_field_association_probandlistentrytag_list_number_of_values_column=#Values
 
 input_field_association_inquiry_list_header=inquiries
 input_field_association_inquiry_list_trial_name_column=Trial
-input_field_association_inquiry_list_trial_department_column=Department
+input_field_association_inquiry_list_trial_department_column=Site
 input_field_association_inquiry_list_trial_status_column=Trial status
 input_field_association_inquiry_list_title_column=Input field title
 input_field_association_inquiry_list_category_column=Category
@@ -245,7 +245,7 @@ input_field_association_inquiry_list_number_of_values_column=#Values entered
 
 input_field_association_ecrffield_list_header=eCRF field(s)
 input_field_association_ecrffield_list_trial_name_column=Trial
-input_field_association_ecrffield_list_trial_department_column=Department
+input_field_association_ecrffield_list_trial_department_column=Site
 input_field_association_ecrffield_list_trial_status_column=Trial status
 input_field_association_ecrffield_list_ecrf_name_column=eCRF name
 input_field_association_ecrffield_list_section_column=Section
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_de.properties
index a9d878e811d7..f699f5779a31 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_de.properties
@@ -222,7 +222,7 @@ input_field_association_ecrf_fields_tab_label=eCRF Felder
 
 input_field_association_probandlistentrytag_list_header=Probandenlistenattribut(e)
 input_field_association_probandlistentrytag_list_trial_name_column=Studie
-input_field_association_probandlistentrytag_list_trial_department_column=Organisationseinheit
+input_field_association_probandlistentrytag_list_trial_department_column=Site
 input_field_association_probandlistentrytag_list_trial_status_column=Studienstatus
 input_field_association_probandlistentrytag_list_title_column=Eingabefeld Titel
 input_field_association_probandlistentrytag_list_optional_column=Optional
@@ -232,7 +232,7 @@ input_field_association_probandlistentrytag_list_number_of_values_column=#Eingeg
 
 input_field_association_inquiry_list_header=Erhebung(en)
 input_field_association_inquiry_list_trial_name_column=Studie
-input_field_association_inquiry_list_trial_department_column=Organisationseinheit
+input_field_association_inquiry_list_trial_department_column=Site
 input_field_association_inquiry_list_trial_status_column=Studienstatus
 input_field_association_inquiry_list_title_column=Eingabefeld Titel
 input_field_association_inquiry_list_category_column=Kategorie
@@ -245,7 +245,7 @@ input_field_association_inquiry_list_number_of_values_column=#Eingegebene Werte
 
 input_field_association_ecrffield_list_header=eCRF Feld(er)
 input_field_association_ecrffield_list_trial_name_column=Studie
-input_field_association_ecrffield_list_trial_department_column=Organisationseinheit
+input_field_association_ecrffield_list_trial_department_column=Site
 input_field_association_ecrffield_list_trial_status_column=Studienstatus
 input_field_association_ecrffield_list_ecrf_name_column=eCRF Name
 input_field_association_ecrffield_list_section_column=Abschnitt
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_ff.properties
index 53cfcbb0eb30..dffd89d7f6de 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_ff.properties
@@ -222,7 +222,7 @@ input_field_association_ecrf_fields_tab_label=eCRF Fields
 
 input_field_association_probandlistentrytag_list_header=proband list attribute(s)
 input_field_association_probandlistentrytag_list_trial_name_column=Trial
-input_field_association_probandlistentrytag_list_trial_department_column=Department
+input_field_association_probandlistentrytag_list_trial_department_column=Site
 input_field_association_probandlistentrytag_list_trial_status_column=Trial status
 input_field_association_probandlistentrytag_list_title_column=Input field title
 input_field_association_probandlistentrytag_list_optional_column=Optional
@@ -232,7 +232,7 @@ input_field_association_probandlistentrytag_list_number_of_values_column=\#Value
 
 input_field_association_inquiry_list_header=inquiries
 input_field_association_inquiry_list_trial_name_column=Trial
-input_field_association_inquiry_list_trial_department_column=Department
+input_field_association_inquiry_list_trial_department_column=Site
 input_field_association_inquiry_list_trial_status_column=Trial status
 input_field_association_inquiry_list_title_column=Input field title
 input_field_association_inquiry_list_category_column=Category
@@ -245,7 +245,7 @@ input_field_association_inquiry_list_number_of_values_column=\#Values entered
 
 input_field_association_ecrffield_list_header=eCRF field(s)
 input_field_association_ecrffield_list_trial_name_column=Trial
-input_field_association_ecrffield_list_trial_department_column=Department
+input_field_association_ecrffield_list_trial_department_column=Site
 input_field_association_ecrffield_list_trial_status_column=Trial status
 input_field_association_ecrffield_list_ecrf_name_column=eCRF name
 input_field_association_ecrffield_list_section_column=Section
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_kg.properties
index 53cfcbb0eb30..dffd89d7f6de 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inputfield/labels_kg.properties
@@ -222,7 +222,7 @@ input_field_association_ecrf_fields_tab_label=eCRF Fields
 
 input_field_association_probandlistentrytag_list_header=proband list attribute(s)
 input_field_association_probandlistentrytag_list_trial_name_column=Trial
-input_field_association_probandlistentrytag_list_trial_department_column=Department
+input_field_association_probandlistentrytag_list_trial_department_column=Site
 input_field_association_probandlistentrytag_list_trial_status_column=Trial status
 input_field_association_probandlistentrytag_list_title_column=Input field title
 input_field_association_probandlistentrytag_list_optional_column=Optional
@@ -232,7 +232,7 @@ input_field_association_probandlistentrytag_list_number_of_values_column=\#Value
 
 input_field_association_inquiry_list_header=inquiries
 input_field_association_inquiry_list_trial_name_column=Trial
-input_field_association_inquiry_list_trial_department_column=Department
+input_field_association_inquiry_list_trial_department_column=Site
 input_field_association_inquiry_list_trial_status_column=Trial status
 input_field_association_inquiry_list_title_column=Input field title
 input_field_association_inquiry_list_category_column=Category
@@ -245,7 +245,7 @@ input_field_association_inquiry_list_number_of_values_column=\#Values entered
 
 input_field_association_ecrffield_list_header=eCRF field(s)
 input_field_association_ecrffield_list_trial_name_column=Trial
-input_field_association_ecrffield_list_trial_department_column=Department
+input_field_association_ecrffield_list_trial_department_column=Site
 input_field_association_ecrffield_list_trial_status_column=Trial status
 input_field_association_ecrffield_list_ecrf_name_column=eCRF name
 input_field_association_ecrffield_list_section_column=Section
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels.properties
index beeb1a0af1fb..0323b797896c 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels.properties
@@ -18,9 +18,9 @@ inventory_main_tab_label=Inventory
 #inventory booking schedule:
 booking_schedule_title=Inventory Booking Calendar
 
-booking_schedule_department_filter_label=Department:
-booking_schedule_department_filter=Department
-booking_schedule_department_filter_tooltip=Filter events for the selected department.
+booking_schedule_department_filter_label=Site:
+booking_schedule_department_filter=Site
+booking_schedule_department_filter_tooltip=Filter events for the selected site.
 
 booking_schedule_inventory_category_filter_label=Inventory category:
 booking_schedule_inventory_category_filter=Inventory category
@@ -104,7 +104,7 @@ inventory_maintenance_overview_inventorymaintenance_list_due_in_column=Due in
 dismiss_maintenance_item_button_label=Dismiss maintenance reminder reminder
 
 inventorymaintenance_list_inventory_name_column=Inventory
-inventorymaintenance_list_inventory_department_column=Department
+inventorymaintenance_list_inventory_department_column=Site
 inventorymaintenance_list_inventory_category_column=Category
 inventorymaintenance_list_maintenance_type_column=Type
 inventorymaintenance_list_maintenance_title_column=Title
@@ -118,7 +118,7 @@ inventory_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status i
 
 inventory_status_overview_inventorystatus_list_header=inventory status item(s)
 inventory_status_overview_inventorystatus_list_inventory_name_column=Inventory
-inventory_status_overview_inventorystatus_list_inventory_department_column=Department
+inventory_status_overview_inventorystatus_list_inventory_department_column=Site
 inventory_status_overview_inventorystatus_list_inventory_category_column=Category
 inventory_status_overview_inventorystatus_list_status_type_column=Type
 inventory_status_overview_inventorystatus_list_start_column=Start
@@ -128,7 +128,7 @@ inventory_status_overview_inventorystatus_list_colliding_inventory_booking_colum
 
 #search
 search_inventory_result_list_inventory_name_column=Inventory
-search_inventory_result_list_inventory_department_column=Department
+search_inventory_result_list_inventory_department_column=Site
 search_inventory_result_list_inventory_category_column=Category
 search_inventory_result_list_owner_name_column=Owner
 search_inventory_result_list_bookable_column=Bookable
@@ -143,9 +143,9 @@ inventory_name_label=Name*:
 inventory_name=Name
 inventory_name_tooltip=An inventory name is required. This token need not be unique but should allow others<br/>to adequately identify the inventory object, e.g. "Room 4711". Remember that information<br>like model or inventory numbers can be entered separately in the "inventory tags" tab.
 
-inventory_department_label=Department*:
-inventory_department=Department
-inventory_department_tooltip=It is required to assign the inventory to a department.
+inventory_department_label=Site*:
+inventory_department=Site
+inventory_department_tooltip=It is required to assign the inventory to a site.
 
 inventory_category_label=Category*:
 inventory_category=Category
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_de.properties
index b825095426a4..5a1de153be22 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_de.properties
@@ -18,9 +18,9 @@ inventory_main_tab_label=Inventar
 #inventory booking schedule:
 booking_schedule_title=Inventarbuchungskalender
 
-booking_schedule_department_filter_label=Organisationseinheit\:
-booking_schedule_department_filter=Organisationseinheit
-booking_schedule_department_filter_tooltip=Ereignisse nach der ausgew\u00E4hlten Organisationseinheit filtern.
+booking_schedule_department_filter_label=Site\:
+booking_schedule_department_filter=Site
+booking_schedule_department_filter_tooltip=Ereignisse nach der ausgew\u00E4hlten Site filtern.
 
 booking_schedule_inventory_category_filter_label=Inventarkategorie\:
 booking_schedule_inventory_category_filter=Inventarkategorie
@@ -102,7 +102,7 @@ inventory_maintenance_overview_inventorymaintenance_list_due_in_column=F\u00E4ll
 dismiss_maintenance_item_button_label=Wartungserinnerung schlie\u00DFen
 
 inventorymaintenance_list_inventory_name_column=Inventar
-inventorymaintenance_list_inventory_department_column=Org.einheit
+inventorymaintenance_list_inventory_department_column=Site
 inventorymaintenance_list_inventory_category_column=Kategorie
 inventorymaintenance_list_maintenance_type_column=Typ
 inventorymaintenance_list_maintenance_title_column=Titel
@@ -116,7 +116,7 @@ inventory_status_overview_ignore_obsolete_filter_tooltip=Langfristige Statuseint
 
 inventory_status_overview_inventorystatus_list_header=Inventarstatuseintr\u00E4ge
 inventory_status_overview_inventorystatus_list_inventory_name_column=Inventar
-inventory_status_overview_inventorystatus_list_inventory_department_column=Organisationseinheit
+inventory_status_overview_inventorystatus_list_inventory_department_column=Site
 inventory_status_overview_inventorystatus_list_inventory_category_column=Kategorie
 inventory_status_overview_inventorystatus_list_status_type_column=Typ
 inventory_status_overview_inventorystatus_list_start_column=Start
@@ -126,7 +126,7 @@ inventory_status_overview_inventorystatus_list_colliding_inventory_booking_colum
 
 #search
 search_inventory_result_list_inventory_name_column=Inventar
-search_inventory_result_list_inventory_department_column=Organisationseinheit
+search_inventory_result_list_inventory_department_column=Site
 search_inventory_result_list_inventory_category_column=Kategorie
 search_inventory_result_list_owner_name_column=Eigent\u00FCmer
 search_inventory_result_list_bookable_column=Buchbar
@@ -141,9 +141,9 @@ inventory_name_label=Name*:
 inventory_name=Name
 inventory_name_tooltip=Ein Inventarname ist erforderlich. Dieses K\u00FCrzel muss nicht eindeutig sein, sollte anderen<br/>jedoch erm\u00F6glichen, das Inventarobjekt bestm\u00F6glich zu identifizieren, z.B. "Room 4711". Hinweis\: Daten wie Modell- oder<br>Inventarnummern k\u00F6nnen separat unter "Invetardetails" angegeben werden.
 
-inventory_department_label=Organisationseinheit*:
-inventory_department=Organisationseinheit
-inventory_department_tooltip=Es ist erforderlich, das Inventar einer Organisationseinheit zuzuordnen.
+inventory_department_label=Site*:
+inventory_department=Site
+inventory_department_tooltip=Es ist erforderlich, das Inventar einer Site zuzuordnen.
 
 inventory_category_label=Kategorie*:
 inventory_category=Kategorie
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_ff.properties
index a0a2fcbb5922..44c7b9ef8ab1 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_ff.properties
@@ -18,9 +18,9 @@ inventory_main_tab_label=Inventory
 #inventory booking schedule:
 booking_schedule_title=Inventory Booking Calendar
 
-booking_schedule_department_filter_label=Department\:
-booking_schedule_department_filter=Department
-booking_schedule_department_filter_tooltip=Filter events for the selected department.
+booking_schedule_department_filter_label=Site\:
+booking_schedule_department_filter=Site
+booking_schedule_department_filter_tooltip=Filter events for the selected site.
 
 booking_schedule_inventory_category_filter_label=Inventory category\:
 booking_schedule_inventory_category_filter=Inventory category
@@ -104,7 +104,7 @@ inventory_maintenance_overview_inventorymaintenance_list_due_in_column=Due in
 dismiss_maintenance_item_button_label=Dismiss maintenance reminder reminder
 
 inventorymaintenance_list_inventory_name_column=Inventory
-inventorymaintenance_list_inventory_department_column=Department
+inventorymaintenance_list_inventory_department_column=Site
 inventorymaintenance_list_inventory_category_column=Category
 inventorymaintenance_list_maintenance_type_column=Type
 inventorymaintenance_list_maintenance_title_column=Title
@@ -118,7 +118,7 @@ inventory_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status i
 
 inventory_status_overview_inventorystatus_list_header=inventory status item(s)
 inventory_status_overview_inventorystatus_list_inventory_name_column=Inventory
-inventory_status_overview_inventorystatus_list_inventory_department_column=Department
+inventory_status_overview_inventorystatus_list_inventory_department_column=Site
 inventory_status_overview_inventorystatus_list_inventory_category_column=Category
 inventory_status_overview_inventorystatus_list_status_type_column=Type
 inventory_status_overview_inventorystatus_list_start_column=Start
@@ -128,7 +128,7 @@ inventory_status_overview_inventorystatus_list_colliding_inventory_booking_colum
 
 #search
 search_inventory_result_list_inventory_name_column=Inventory
-search_inventory_result_list_inventory_department_column=Department
+search_inventory_result_list_inventory_department_column=Site
 search_inventory_result_list_inventory_category_column=Category
 search_inventory_result_list_owner_name_column=Owner
 search_inventory_result_list_bookable_column=Bookable
@@ -143,9 +143,9 @@ inventory_name_label=Name*\:
 inventory_name=Name
 inventory_name_tooltip=An inventory name is required. This token need not be unique but should allow others<br/>to adequately identify the inventory object, e.g. "Room 4711". Remember that information<br>like model or inventory numbers can be entered separately in the "inventory tags" tab.
 
-inventory_department_label=Department*\:
-inventory_department=Department
-inventory_department_tooltip=It is required to assign the inventory to a department.
+inventory_department_label=Site*\:
+inventory_department=Site
+inventory_department_tooltip=It is required to assign the inventory to a site.
 
 inventory_category_label=Category*\:
 inventory_category=Category
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_kg.properties
index a0a2fcbb5922..44c7b9ef8ab1 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/inventory/labels_kg.properties
@@ -18,9 +18,9 @@ inventory_main_tab_label=Inventory
 #inventory booking schedule:
 booking_schedule_title=Inventory Booking Calendar
 
-booking_schedule_department_filter_label=Department\:
-booking_schedule_department_filter=Department
-booking_schedule_department_filter_tooltip=Filter events for the selected department.
+booking_schedule_department_filter_label=Site\:
+booking_schedule_department_filter=Site
+booking_schedule_department_filter_tooltip=Filter events for the selected site.
 
 booking_schedule_inventory_category_filter_label=Inventory category\:
 booking_schedule_inventory_category_filter=Inventory category
@@ -104,7 +104,7 @@ inventory_maintenance_overview_inventorymaintenance_list_due_in_column=Due in
 dismiss_maintenance_item_button_label=Dismiss maintenance reminder reminder
 
 inventorymaintenance_list_inventory_name_column=Inventory
-inventorymaintenance_list_inventory_department_column=Department
+inventorymaintenance_list_inventory_department_column=Site
 inventorymaintenance_list_inventory_category_column=Category
 inventorymaintenance_list_maintenance_type_column=Type
 inventorymaintenance_list_maintenance_title_column=Title
@@ -118,7 +118,7 @@ inventory_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status i
 
 inventory_status_overview_inventorystatus_list_header=inventory status item(s)
 inventory_status_overview_inventorystatus_list_inventory_name_column=Inventory
-inventory_status_overview_inventorystatus_list_inventory_department_column=Department
+inventory_status_overview_inventorystatus_list_inventory_department_column=Site
 inventory_status_overview_inventorystatus_list_inventory_category_column=Category
 inventory_status_overview_inventorystatus_list_status_type_column=Type
 inventory_status_overview_inventorystatus_list_start_column=Start
@@ -128,7 +128,7 @@ inventory_status_overview_inventorystatus_list_colliding_inventory_booking_colum
 
 #search
 search_inventory_result_list_inventory_name_column=Inventory
-search_inventory_result_list_inventory_department_column=Department
+search_inventory_result_list_inventory_department_column=Site
 search_inventory_result_list_inventory_category_column=Category
 search_inventory_result_list_owner_name_column=Owner
 search_inventory_result_list_bookable_column=Bookable
@@ -143,9 +143,9 @@ inventory_name_label=Name*\:
 inventory_name=Name
 inventory_name_tooltip=An inventory name is required. This token need not be unique but should allow others<br/>to adequately identify the inventory object, e.g. "Room 4711". Remember that information<br>like model or inventory numbers can be entered separately in the "inventory tags" tab.
 
-inventory_department_label=Department*\:
-inventory_department=Department
-inventory_department_tooltip=It is required to assign the inventory to a department.
+inventory_department_label=Site*\:
+inventory_department=Site
+inventory_department_tooltip=It is required to assign the inventory to a site.
 
 inventory_category_label=Category*\:
 inventory_category=Category
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties
index 21b519cb8880..b025fc5e40d8 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/labels.properties
@@ -243,7 +243,7 @@ ecrffieldstatus_proband_id_column=Proband ID
 ecrffieldstatus_position_column=Proband list position
 ecrffieldstatus_proband_name_column=Proband
 ecrffieldstatus_animal_name_column=Animal
-ecrffieldstatus_proband_department_column=Department
+ecrffieldstatus_proband_department_column=Site
 ecrffieldstatus_ecrf_name_column=eCRF name
 ecrffieldstatus_group_title_column=Group
 ecrffieldstatus_ecrf_revision_column=eCRF revision
@@ -586,9 +586,9 @@ shift_duration_summary_table_header_calendar=Calendar
 shift_duration_summary_table_header_calendar_tooltip=The calendar filter is optional.
 
 shift_duration_summary_table_trial_name_column=Trial
-shift_duration_summary_table_trial_department_column=Department
+shift_duration_summary_table_trial_department_column=Site
 shift_duration_summary_table_staff_name_column=Employee
-shift_duration_summary_table_staff_department_column=Department
+shift_duration_summary_table_staff_department_column=Site
 shift_duration_summary_table_night_shift_count_column=Night shifts
 shift_duration_summary_table_total_night_duration_column=Night working hours
 shift_duration_summary_table_extra_shift_count_column=Holiday shifts
@@ -616,7 +616,7 @@ booking_duration_summary_table_header_stop=Stop
 booking_duration_summary_table_header_stop_tooltip=The stop timestamp is optional.
 
 booking_duration_summary_table_inventory_name_column=Inventory
-booking_duration_summary_table_inventory_department_column=Department
+booking_duration_summary_table_inventory_department_column=Site
 booking_duration_summary_table_proband_name_column=Proband
 booking_duration_summary_table_course_name_column=Course
 booking_duration_summary_table_trial_name_column=Trial
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties
index faa8c32cdc07..df6f2fb61b71 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_de.properties
@@ -244,7 +244,7 @@ ecrffieldstatus_proband_id_column=Proband ID
 ecrffieldstatus_position_column=Probandenliste Position
 ecrffieldstatus_proband_name_column=Proband
 ecrffieldstatus_animal_name_column=Tier
-ecrffieldstatus_proband_department_column=Org.Einheit
+ecrffieldstatus_proband_department_column=Site
 ecrffieldstatus_ecrf_name_column=eCRF Name
 ecrffieldstatus_group_title_column=Gruppe
 ecrffieldstatus_ecrf_revision_column=eCRF Version
@@ -589,9 +589,9 @@ shift_duration_summary_table_header_calendar=Kalender
 shift_duration_summary_table_header_calendar_tooltip=Optional kann nach dem Kalender gefiltert werden.
 
 shift_duration_summary_table_trial_name_column=Studie
-shift_duration_summary_table_trial_department_column=Organisationseinheit
+shift_duration_summary_table_trial_department_column=Site
 shift_duration_summary_table_staff_name_column=Mitarbeiter
-shift_duration_summary_table_staff_department_column=Organisationseinheit
+shift_duration_summary_table_staff_department_column=Site
 shift_duration_summary_table_night_shift_count_column=Nachdienste
 shift_duration_summary_table_total_night_duration_column=Nachtarbeitsstunden
 shift_duration_summary_table_extra_shift_count_column=Feiertagsdienste
@@ -619,7 +619,7 @@ booking_duration_summary_table_header_stop=Ende
 booking_duration_summary_table_header_stop_tooltip=Der Endzeitpunkt ist optional.
 
 booking_duration_summary_table_inventory_name_column=Inventar
-booking_duration_summary_table_inventory_department_column=Organisationseinheit
+booking_duration_summary_table_inventory_department_column=Site
 booking_duration_summary_table_proband_name_column=Proband
 booking_duration_summary_table_course_name_column=Kurs
 booking_duration_summary_table_trial_name_column=Studie
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_ff.properties
index 474c74bf2875..1abf7a25f785 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_ff.properties
@@ -243,7 +243,7 @@ ecrffieldstatus_proband_id_column=Proband ID
 ecrffieldstatus_position_column=Proband list position
 ecrffieldstatus_proband_name_column=Proband
 ecrffieldstatus_animal_name_column=Animal
-ecrffieldstatus_proband_department_column=Department
+ecrffieldstatus_proband_department_column=Site
 ecrffieldstatus_ecrf_name_column=eCRF name
 ecrffieldstatus_group_title_column=Group
 ecrffieldstatus_ecrf_revision_column=eCRF revision
@@ -586,9 +586,9 @@ shift_duration_summary_table_header_calendar=Calendar
 shift_duration_summary_table_header_calendar_tooltip=The calendar filter is optional.
 
 shift_duration_summary_table_trial_name_column=Trial
-shift_duration_summary_table_trial_department_column=Department
+shift_duration_summary_table_trial_department_column=Site
 shift_duration_summary_table_staff_name_column=Employee
-shift_duration_summary_table_staff_department_column=Department
+shift_duration_summary_table_staff_department_column=Site
 shift_duration_summary_table_night_shift_count_column=Night shifts
 shift_duration_summary_table_total_night_duration_column=Night working hours
 shift_duration_summary_table_extra_shift_count_column=Holiday shifts
@@ -616,7 +616,7 @@ booking_duration_summary_table_header_stop=Stop
 booking_duration_summary_table_header_stop_tooltip=The stop timestamp is optional.
 
 booking_duration_summary_table_inventory_name_column=Inventory
-booking_duration_summary_table_inventory_department_column=Department
+booking_duration_summary_table_inventory_department_column=Site
 booking_duration_summary_table_proband_name_column=Proband
 booking_duration_summary_table_course_name_column=Course
 booking_duration_summary_table_trial_name_column=Trial
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_kg.properties
index 474c74bf2875..1abf7a25f785 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/labels_kg.properties
@@ -243,7 +243,7 @@ ecrffieldstatus_proband_id_column=Proband ID
 ecrffieldstatus_position_column=Proband list position
 ecrffieldstatus_proband_name_column=Proband
 ecrffieldstatus_animal_name_column=Animal
-ecrffieldstatus_proband_department_column=Department
+ecrffieldstatus_proband_department_column=Site
 ecrffieldstatus_ecrf_name_column=eCRF name
 ecrffieldstatus_group_title_column=Group
 ecrffieldstatus_ecrf_revision_column=eCRF revision
@@ -586,9 +586,9 @@ shift_duration_summary_table_header_calendar=Calendar
 shift_duration_summary_table_header_calendar_tooltip=The calendar filter is optional.
 
 shift_duration_summary_table_trial_name_column=Trial
-shift_duration_summary_table_trial_department_column=Department
+shift_duration_summary_table_trial_department_column=Site
 shift_duration_summary_table_staff_name_column=Employee
-shift_duration_summary_table_staff_department_column=Department
+shift_duration_summary_table_staff_department_column=Site
 shift_duration_summary_table_night_shift_count_column=Night shifts
 shift_duration_summary_table_total_night_duration_column=Night working hours
 shift_duration_summary_table_extra_shift_count_column=Holiday shifts
@@ -616,7 +616,7 @@ booking_duration_summary_table_header_stop=Stop
 booking_duration_summary_table_header_stop_tooltip=The stop timestamp is optional.
 
 booking_duration_summary_table_inventory_name_column=Inventory
-booking_duration_summary_table_inventory_department_column=Department
+booking_duration_summary_table_inventory_department_column=Site
 booking_duration_summary_table_proband_name_column=Proband
 booking_duration_summary_table_course_name_column=Course
 booking_duration_summary_table_trial_name_column=Trial
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels.properties
index fc5b75ee1057..422d95f63ad0 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels.properties
@@ -22,7 +22,7 @@ recipient_overview_massmailrecipient_list_trial_name_column=Trial
 
 #search
 search_mass_mail_result_list_mass_mail_name_column=Name
-search_mass_mail_result_list_mass_mail_department_column=Department
+search_mass_mail_result_list_mass_mail_department_column=Site
 search_mass_mail_result_list_mass_mail_type_column=Type
 search_mass_mail_result_list_trial_column=Trial
 search_mass_mail_result_list_proband_list_status_column=Enrollment status
@@ -40,9 +40,9 @@ mass_mail_name_label=Name*:
 mass_mail_name=Name
 mass_mail_name_tooltip=A name of the mass mail is required, e.g. "Newsletter 2018/01".
 
-mass_mail_department_label=Department*:
-mass_mail_department=Department
-mass_mail_department_tooltip=It is required to assign the mass mail to a department.
+mass_mail_department_label=Site*:
+mass_mail_department=Site
+mass_mail_department_tooltip=It is required to assign the mass mail to a site.
 
 mass_mail_type_label=Type*:
 trial_type=Type
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_de.properties
index 1681f29f4ee9..ccc2f2b6ecbc 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_de.properties
@@ -22,7 +22,7 @@ recipient_overview_massmailrecipient_list_trial_name_column=Studie
 
 #search
 search_mass_mail_result_list_mass_mail_name_column=Name
-search_mass_mail_result_list_mass_mail_department_column=Organisationseinheit
+search_mass_mail_result_list_mass_mail_department_column=Site
 search_mass_mail_result_list_mass_mail_type_column=Typ
 search_mass_mail_result_list_trial_column=Studie
 search_mass_mail_result_list_proband_list_status_column=Enrollment Status
@@ -40,9 +40,9 @@ mass_mail_name_label=Name*:
 mass_mail_name=Name
 mass_mail_name_tooltip=Ein Name des Massenmails ist erforderlich, z.B. "Newsletter 2018/01".
 
-mass_mail_department_label=Organisationseinheit*:
-mass_mail_department=Organisationseinheit
-mass_mail_department_tooltip=Es ist erforderlich, das Massenmail einer Organisationseinheit zuzuordnen.
+mass_mail_department_label=Site*:
+mass_mail_department=Site
+mass_mail_department_tooltip=Es ist erforderlich, das Massenmail einer Site zuzuordnen.
 
 mass_mail_type_label=Typ*:
 mass_mail_type=Typ
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_ff.properties
index 91e73ff2a63c..a85c2b48cb6b 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_ff.properties
@@ -22,7 +22,7 @@ recipient_overview_massmailrecipient_list_trial_name_column=Trial
 
 #search
 search_mass_mail_result_list_mass_mail_name_column=Name
-search_mass_mail_result_list_mass_mail_department_column=Department
+search_mass_mail_result_list_mass_mail_department_column=Site
 search_mass_mail_result_list_mass_mail_type_column=Type
 search_mass_mail_result_list_trial_column=Trial
 search_mass_mail_result_list_proband_list_status_column=Enrollment status
@@ -40,9 +40,9 @@ mass_mail_name_label=Name*\:
 mass_mail_name=Name
 mass_mail_name_tooltip=A name of the mass mail is required, e.g. "Newsletter 2018/01".
 
-mass_mail_department_label=Department*\:
-mass_mail_department=Department
-mass_mail_department_tooltip=It is required to assign the mass mail to a department.
+mass_mail_department_label=Site*\:
+mass_mail_department=Site
+mass_mail_department_tooltip=It is required to assign the mass mail to a site.
 
 mass_mail_type_label=Type*\:
 trial_type=Type
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_kg.properties
index 91e73ff2a63c..a85c2b48cb6b 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/massmail/labels_kg.properties
@@ -22,7 +22,7 @@ recipient_overview_massmailrecipient_list_trial_name_column=Trial
 
 #search
 search_mass_mail_result_list_mass_mail_name_column=Name
-search_mass_mail_result_list_mass_mail_department_column=Department
+search_mass_mail_result_list_mass_mail_department_column=Site
 search_mass_mail_result_list_mass_mail_type_column=Type
 search_mass_mail_result_list_trial_column=Trial
 search_mass_mail_result_list_proband_list_status_column=Enrollment status
@@ -40,9 +40,9 @@ mass_mail_name_label=Name*\:
 mass_mail_name=Name
 mass_mail_name_tooltip=A name of the mass mail is required, e.g. "Newsletter 2018/01".
 
-mass_mail_department_label=Department*\:
-mass_mail_department=Department
-mass_mail_department_tooltip=It is required to assign the mass mail to a department.
+mass_mail_department_label=Site*\:
+mass_mail_department=Site
+mass_mail_department_tooltip=It is required to assign the mass mail to a site.
 
 mass_mail_type_label=Type*\:
 trial_type=Type
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels.properties
index 58fe6c7ac281..6fe2e6b659fa 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels.properties
@@ -31,7 +31,7 @@ proband_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status ite
 proband_status_overview_probandstatus_list_header=proband status item(s)
 proband_status_overview_probandstatus_list_particulars_last_name_column=Proband
 proband_status_overview_probandstatus_list_particulars_animal_name_column=Animal
-proband_status_overview_probandstatus_list_proband_department_column=Department
+proband_status_overview_probandstatus_list_proband_department_column=Site
 proband_status_overview_probandstatus_list_proband_category_column=Category
 proband_status_overview_probandstatus_list_status_type_column=Type
 proband_status_overview_probandstatus_list_start_column=Start
@@ -54,7 +54,7 @@ auto_deletion_proband_overview_reminder_period_days_tooltip=The period can be sp
 
 auto_deletion_proband_overview_autodeletionproband_list_header=proband(s)
 auto_deletion_proband_overview_autodeletionproband_list_particulars_last_name_column=Proband
-auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Department
+auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Site
 auto_deletion_proband_overview_autodeletionproband_list_proband_category_column=Category
 auto_deletion_proband_overview_autodeletionproband_list_auto_delete_deadline_column=Due on
 auto_deletion_proband_overview_autodeletionproband_list_due_in_column=Due in
@@ -73,7 +73,7 @@ search_open_probandletters_button_label=Open proband letters
 
 search_proband_result_list_particulars_last_name_column=Name
 search_proband_result_list_particulars_animal_name_column=Animal
-search_proband_result_list_proband_department_column=Department
+search_proband_result_list_proband_department_column=Site
 search_proband_result_list_proband_category_column=Category
 search_proband_result_list_locked_column=Locked
 search_proband_result_list_rating_column=Rating
@@ -152,9 +152,9 @@ citizenship_label=Citizenship:
 citizenship=Citizenship
 citizenship_tooltip=Citizenship can be specified optionally.
 
-proband_department_label=Department*:
-proband_department=Department
-proband_department_tooltip=It is required to assign the proband to a department.
+proband_department_label=Site*:
+proband_department=Site
+proband_department_tooltip=It is required to assign the proband to a site.
 
 proband_category_label=Category*:
 proband_category=Category
@@ -468,7 +468,7 @@ probandecrfstatus_proband_list_header=proband list entries
 probandecrfstatus_proband_list_position_column=Position
 probandecrfstatus_proband_list_group_column=Group
 probandecrfstatus_proband_list_trial_name_column=Trial
-probandecrfstatus_proband_list_trial_department_column=Department
+probandecrfstatus_proband_list_trial_department_column=Site
 probandecrfstatus_proband_list_field_status_counts_column=eCRF issues
 probandecrfstatus_proband_list_status_counts_column=eCRF status
 probandecrfstatus_proband_list_ecrf_progress_column=Progress
@@ -695,7 +695,7 @@ trial_participation_trialparticipation_list_rating_column=Rating
 trial_participation_trialparticipation_list_position_column=Position
 trial_participation_trialparticipation_list_group_column=Group
 trial_participation_trialparticipation_list_trial_name_column=Trial
-trial_participation_trialparticipation_list_trial_department_column=Department
+trial_participation_trialparticipation_list_trial_department_column=Site
 
 proband_list_status_tab_label=Enrollment Status History
 proband_list_entry_tag_values_tab_label=Proband List Attributes
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_de.properties
index 90febb2a35f6..846623a2b700 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_de.properties
@@ -31,7 +31,7 @@ proband_status_overview_ignore_obsolete_filter_tooltip=Langfristige Statuseintr\
 proband_status_overview_probandstatus_list_header=Probandenstatuseintr\u00E4ge
 proband_status_overview_probandstatus_list_particulars_last_name_column=Proband
 proband_status_overview_probandstatus_list_particulars_animal_name_column=Tier
-proband_status_overview_probandstatus_list_proband_department_column=Organisationseinheit
+proband_status_overview_probandstatus_list_proband_department_column=Site
 proband_status_overview_probandstatus_list_proband_category_column=Kategorie
 proband_status_overview_probandstatus_list_status_type_column=Typ
 proband_status_overview_probandstatus_list_start_column=Start
@@ -54,7 +54,7 @@ auto_deletion_proband_overview_reminder_period_days_tooltip=Die Dauer kann ausdr
 
 auto_deletion_proband_overview_autodeletionproband_list_header=Proband(en)
 auto_deletion_proband_overview_autodeletionproband_list_particulars_last_name_column=Proband
-auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Organisationseinheit
+auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Site
 auto_deletion_proband_overview_autodeletionproband_list_proband_category_column=Kategorie
 auto_deletion_proband_overview_autodeletionproband_list_auto_delete_deadline_column=F\u00E4llig am
 auto_deletion_proband_overview_autodeletionproband_list_due_in_column=F\u00E4llig in
@@ -73,7 +73,7 @@ search_open_probandletters_button_label=Probandenbriefe \u00F6ffnen
 
 search_proband_result_list_particulars_last_name_column=Name
 search_proband_result_list_particulars_animal_name_column=Tier
-search_proband_result_list_proband_department_column=Organisationseinheit
+search_proband_result_list_proband_department_column=Site
 search_proband_result_list_proband_category_column=Kategorie
 search_proband_result_list_locked_column=Gesperrt
 search_proband_result_list_rating_column=Bewertung
@@ -152,9 +152,9 @@ citizenship_label=Staatsangeh\u00F6rigkeit\:
 citizenship=Staatsangeh\u00F6rigkeit
 citizenship_tooltip=Die Staatsangeh\u00F6rigkeit kann optional angegeben werden.
 
-proband_department_label=Organisationseinheit*:
-proband_department=Organisationseinheit
-proband_department_tooltip=Es ist erforderlich, den Probanden einer Organisationseinheit zuzuordnen.
+proband_department_label=Site*:
+proband_department=Site
+proband_department_tooltip=Es ist erforderlich, den Probanden einer Site zuzuordnen.
 
 proband_category_label=Kategorie*:
 proband_category=Kategorie
@@ -466,7 +466,7 @@ probandecrfstatus_proband_list_header=Probandenlisteneintr\u00E4ge
 probandecrfstatus_proband_list_position_column=Position
 probandecrfstatus_proband_list_group_column=Gruppe
 probandecrfstatus_proband_list_trial_name_column=Studie
-probandecrfstatus_proband_list_trial_department_column=Org.Einheit
+probandecrfstatus_proband_list_trial_department_column=Site
 probandecrfstatus_proband_list_proband_date_of_birth_column=Geburtsdatum
 probandecrfstatus_proband_list_field_status_counts_column=eCRF Issues
 probandecrfstatus_proband_list_status_counts_column=eCRF Status
@@ -694,7 +694,7 @@ trial_participation_trialparticipation_list_rating_column=Bewertung
 trial_participation_trialparticipation_list_position_column=Position
 trial_participation_trialparticipation_list_group_column=Gruppe
 trial_participation_trialparticipation_list_trial_name_column=Studie
-trial_participation_trialparticipation_list_trial_department_column=Org.Einheit
+trial_participation_trialparticipation_list_trial_department_column=Site
 
 proband_list_status_tab_label=Enrollment Status Verlauf
 proband_list_entry_tag_values_tab_label=Probandenlistenattribute
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_ff.properties
index 60c1a0493e5a..6fe1921ec79b 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_ff.properties
@@ -31,7 +31,7 @@ proband_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status ite
 proband_status_overview_probandstatus_list_header=proband status item(s)
 proband_status_overview_probandstatus_list_particulars_last_name_column=Proband
 proband_status_overview_probandstatus_list_particulars_animal_name_column=Animal
-proband_status_overview_probandstatus_list_proband_department_column=Department
+proband_status_overview_probandstatus_list_proband_department_column=Site
 proband_status_overview_probandstatus_list_proband_category_column=Category
 proband_status_overview_probandstatus_list_status_type_column=Type
 proband_status_overview_probandstatus_list_start_column=Start
@@ -54,7 +54,7 @@ auto_deletion_proband_overview_reminder_period_days_tooltip=The period can be sp
 
 auto_deletion_proband_overview_autodeletionproband_list_header=proband(s)
 auto_deletion_proband_overview_autodeletionproband_list_particulars_last_name_column=Proband
-auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Department
+auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Site
 auto_deletion_proband_overview_autodeletionproband_list_proband_category_column=Category
 auto_deletion_proband_overview_autodeletionproband_list_auto_delete_deadline_column=Due on
 auto_deletion_proband_overview_autodeletionproband_list_due_in_column=Due in
@@ -73,7 +73,7 @@ search_open_probandletters_button_label=Open proband letters
 
 search_proband_result_list_particulars_last_name_column=Name
 search_proband_result_list_particulars_animal_name_column=Animal
-search_proband_result_list_proband_department_column=Department
+search_proband_result_list_proband_department_column=Site
 search_proband_result_list_proband_category_column=Category
 search_proband_result_list_locked_column=Locked
 search_proband_result_list_rating_column=Rating
@@ -152,9 +152,9 @@ citizenship_label=Citizenship\:
 citizenship=Citizenship
 citizenship_tooltip=Citizenship can be specified optionally.
 
-proband_department_label=Department*\:
-proband_department=Department
-proband_department_tooltip=It is required to assign the proband to a department.
+proband_department_label=Site*\:
+proband_department=Site
+proband_department_tooltip=It is required to assign the proband to a site.
 
 proband_category_label=Category*\:
 proband_category=Category
@@ -468,7 +468,7 @@ probandecrfstatus_proband_list_header=proband list entries
 probandecrfstatus_proband_list_position_column=Position
 probandecrfstatus_proband_list_group_column=Group
 probandecrfstatus_proband_list_trial_name_column=Trial
-probandecrfstatus_proband_list_trial_department_column=Department
+probandecrfstatus_proband_list_trial_department_column=Site
 probandecrfstatus_proband_list_field_status_counts_column=eCRF issues
 probandecrfstatus_proband_list_status_counts_column=eCRF status
 probandecrfstatus_proband_list_ecrf_progress_column=Progress
@@ -695,7 +695,7 @@ trial_participation_trialparticipation_list_rating_column=Rating
 trial_participation_trialparticipation_list_position_column=Position
 trial_participation_trialparticipation_list_group_column=Group
 trial_participation_trialparticipation_list_trial_name_column=Trial
-trial_participation_trialparticipation_list_trial_department_column=Department
+trial_participation_trialparticipation_list_trial_department_column=Site
 
 proband_list_status_tab_label=Enrollment Status History
 proband_list_entry_tag_values_tab_label=Proband List Attributes
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_kg.properties
index 60c1a0493e5a..6fe1921ec79b 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/proband/labels_kg.properties
@@ -31,7 +31,7 @@ proband_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status ite
 proband_status_overview_probandstatus_list_header=proband status item(s)
 proband_status_overview_probandstatus_list_particulars_last_name_column=Proband
 proband_status_overview_probandstatus_list_particulars_animal_name_column=Animal
-proband_status_overview_probandstatus_list_proband_department_column=Department
+proband_status_overview_probandstatus_list_proband_department_column=Site
 proband_status_overview_probandstatus_list_proband_category_column=Category
 proband_status_overview_probandstatus_list_status_type_column=Type
 proband_status_overview_probandstatus_list_start_column=Start
@@ -54,7 +54,7 @@ auto_deletion_proband_overview_reminder_period_days_tooltip=The period can be sp
 
 auto_deletion_proband_overview_autodeletionproband_list_header=proband(s)
 auto_deletion_proband_overview_autodeletionproband_list_particulars_last_name_column=Proband
-auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Department
+auto_deletion_proband_overview_autodeletionproband_list_proband_department_column=Site
 auto_deletion_proband_overview_autodeletionproband_list_proband_category_column=Category
 auto_deletion_proband_overview_autodeletionproband_list_auto_delete_deadline_column=Due on
 auto_deletion_proband_overview_autodeletionproband_list_due_in_column=Due in
@@ -73,7 +73,7 @@ search_open_probandletters_button_label=Open proband letters
 
 search_proband_result_list_particulars_last_name_column=Name
 search_proband_result_list_particulars_animal_name_column=Animal
-search_proband_result_list_proband_department_column=Department
+search_proband_result_list_proband_department_column=Site
 search_proband_result_list_proband_category_column=Category
 search_proband_result_list_locked_column=Locked
 search_proband_result_list_rating_column=Rating
@@ -152,9 +152,9 @@ citizenship_label=Citizenship\:
 citizenship=Citizenship
 citizenship_tooltip=Citizenship can be specified optionally.
 
-proband_department_label=Department*\:
-proband_department=Department
-proband_department_tooltip=It is required to assign the proband to a department.
+proband_department_label=Site*\:
+proband_department=Site
+proband_department_tooltip=It is required to assign the proband to a site.
 
 proband_category_label=Category*\:
 proband_category=Category
@@ -468,7 +468,7 @@ probandecrfstatus_proband_list_header=proband list entries
 probandecrfstatus_proband_list_position_column=Position
 probandecrfstatus_proband_list_group_column=Group
 probandecrfstatus_proband_list_trial_name_column=Trial
-probandecrfstatus_proband_list_trial_department_column=Department
+probandecrfstatus_proband_list_trial_department_column=Site
 probandecrfstatus_proband_list_field_status_counts_column=eCRF issues
 probandecrfstatus_proband_list_status_counts_column=eCRF status
 probandecrfstatus_proband_list_ecrf_progress_column=Progress
@@ -695,7 +695,7 @@ trial_participation_trialparticipation_list_rating_column=Rating
 trial_participation_trialparticipation_list_position_column=Position
 trial_participation_trialparticipation_list_group_column=Group
 trial_participation_trialparticipation_list_trial_name_column=Trial
-trial_participation_trialparticipation_list_trial_department_column=Department
+trial_participation_trialparticipation_list_trial_department_column=Site
 
 proband_list_status_tab_label=Enrollment Status History
 proband_list_entry_tag_values_tab_label=Proband List Attributes
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels.properties
index 592cb82757b2..9dc4dd6cd960 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels.properties
@@ -28,7 +28,7 @@ staff_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status items
 
 staff_status_overview_staffstatus_list_header=employee status item(s)
 staff_status_overview_staffstatus_list_personparticulars_last_name_column=Employee
-staff_status_overview_staffstatus_list_staff_department_column=Department
+staff_status_overview_staffstatus_list_staff_department_column=Site
 staff_status_overview_staffstatus_list_staff_category_column=Category
 staff_status_overview_staffstatus_list_status_type_column=Type
 staff_status_overview_staffstatus_list_start_column=Start
@@ -59,7 +59,7 @@ expiring_participation_overview_reminder_period_days_tooltip=The period can be s
 
 expiring_participation_overview_expiringparticipation_list_header=participation status item(s)
 expiring_participation_overview_expiringparticipation_list_course_name_column=Course
-expiring_participation_overview_expiringparticipation_list_course_department_column=Department
+expiring_participation_overview_expiringparticipation_list_course_department_column=Site
 expiring_participation_overview_expiringparticipation_list_course_category_column=Category
 expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Self-registration
 expiring_participation_overview_expiringparticipation_list_course_stop_column=Course stop
@@ -79,7 +79,7 @@ search_open_all_trials_trainingrecords_certificates_button_label=Open Training R
 
 search_staff_result_list_personparticulars_last_name_column=Name
 search_staff_result_list_organisationparticulars_organisation_name_column=Organisation
-search_staff_result_list_staff_department_column=Department
+search_staff_result_list_staff_department_column=Site
 search_staff_result_list_staff_category_column=Category
 search_staff_result_list_person_column=Person
 search_staff_result_list_employee_column=Employee
@@ -146,9 +146,9 @@ citizenship_label=Citizenship:
 citizenship=Citizenship
 citizenship_tooltip=Citizenship can be specified optionally.
 
-staff_department_label=Department*:
-staff_department=Department
-staff_department_tooltip=It is required to assign the person/organisation to a department.
+staff_department_label=Site*:
+staff_department=Site
+staff_department_tooltip=It is required to assign the person/organisation to a site.
 
 staff_category_label=Category*:
 staff_category=Category
@@ -487,17 +487,17 @@ staff_association_patients_tab_label=Patients
 
 staff_association_account_list_header=user(s)
 staff_association_account_list_username_column=Username
-staff_association_account_list_user_department_column=Department
+staff_association_account_list_user_department_column=Site
 staff_association_account_list_auth_method_column=Authentication
 
 staff_association_ownershipinventory_list_header=inventory record(s)
 staff_association_ownershipinventory_list_inventory_name_column=Inventory
-staff_association_ownershipinventory_list_inventory_department_column=Department
+staff_association_ownershipinventory_list_inventory_department_column=Site
 staff_association_ownershipinventory_list_inventory_category_column=Category
 
 staff_association_inventorybooking_list_header=inventory booking(s)
 staff_association_inventorybooking_list_inventory_name_column=Inventory
-staff_association_inventorybooking_list_inventory_department_column=Department
+staff_association_inventorybooking_list_inventory_department_column=Site
 staff_association_inventorybooking_list_inventory_category_column=Category
 staff_association_inventorybooking_list_course_name_column=Course
 staff_association_inventorybooking_list_trial_name_column=Trial
@@ -518,12 +518,12 @@ staff_association_addresseeinventorystatus_list_originator_name_column=Originato
 
 staff_association_institutioncourses_list_header=course(s)
 staff_association_institutioncourses_list_course_name_column=Course
-staff_association_institutioncourses_list_course_department_column=Department
+staff_association_institutioncourses_list_course_department_column=Site
 staff_association_institutioncourses_list_course_category_column=Category
 
 staff_association_institutioncvpositions_list_header=CV position(s)
 staff_association_institutioncvpositions_list_staff_name_column=Person
-staff_association_institutioncvpositions_list_staff_department_column=Department
+staff_association_institutioncvpositions_list_staff_department_column=Site
 staff_association_institutioncvpositions_list_staff_category_column=Category
 staff_association_institutioncvpositions_list_section_name_column=CV section
 staff_association_institutioncvpositions_list_title_column=Title
@@ -532,17 +532,17 @@ staff_association_institutioncvpositions_list_stop_column=Stop
 
 staff_association_lectures_list_header=lecturer(s)
 staff_association_lectures_list_course_name_column=Course
-staff_association_lectures_list_course_department_column=Department
+staff_association_lectures_list_course_department_column=Site
 staff_association_lectures_list_course_category_column=Category
 
 staff_association_trial_membership_list_header=trial team member(s)
 staff_association_trial_membership_list_trial_name_column=Trial
-staff_association_trial_membership_list_trial_department_column=Department
+staff_association_trial_membership_list_trial_department_column=Site
 staff_association_trial_membership_list_trial_status_column=Trial status
 
 staff_association_patients_list_header=proband(s)
 staff_association_patients_list_last_name_column=Name
 staff_association_patients_list_animal_name_column=Animal
-staff_association_patients_list_proband_department_column=Department
+staff_association_patients_list_proband_department_column=Site
 staff_association_patients_list_proband_category_column=Category
 staff_association_patients_list_gender_column=Gender
\ No newline at end of file
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_de.properties
index 894ee938c26b..7b1b62bc49a7 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_de.properties
@@ -28,7 +28,7 @@ staff_status_overview_ignore_obsolete_filter_tooltip=Langfristige Statuseintr\u0
 
 staff_status_overview_staffstatus_list_header=Mitarbeiterstatuseintr\u00E4ge
 staff_status_overview_staffstatus_list_personparticulars_last_name_column=Mitarbeiter
-staff_status_overview_staffstatus_list_staff_department_column=Organisationseinheit
+staff_status_overview_staffstatus_list_staff_department_column=Site
 staff_status_overview_staffstatus_list_staff_category_column=Kategorie
 staff_status_overview_staffstatus_list_status_type_column=Typ
 staff_status_overview_staffstatus_list_start_column=Start
@@ -59,7 +59,7 @@ expiring_participation_overview_reminder_period_days_tooltip=Die Dauer kann ausd
 
 expiring_participation_overview_expiringparticipation_list_header=Teilnahmestatuseintr\u00E4ge
 expiring_participation_overview_expiringparticipation_list_course_name_column=Kurs
-expiring_participation_overview_expiringparticipation_list_course_department_column=Organisationseinheit
+expiring_participation_overview_expiringparticipation_list_course_department_column=Site
 expiring_participation_overview_expiringparticipation_list_course_category_column=Kategorie
 expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Selbstanmeldung
 expiring_participation_overview_expiringparticipation_list_course_stop_column=Kursende
@@ -79,7 +79,7 @@ search_open_all_trials_trainingrecords_certificates_button_label=Training Record
 
 search_staff_result_list_personparticulars_last_name_column=Name
 search_staff_result_list_organisationparticulars_organisation_name_column=Organisation
-search_staff_result_list_staff_department_column=Organisationseinheit
+search_staff_result_list_staff_department_column=Site
 search_staff_result_list_staff_category_column=Kategorie
 search_staff_result_list_person_column=Person
 search_staff_result_list_employee_column=Mitarbeiter
@@ -145,9 +145,9 @@ citizenship_label=Staatsangeh\u00F6rigkeit\:
 citizenship=Staatsangeh\u00F6rigkeit
 citizenship_tooltip=Die Staatsangeh\u00F6rigkeit kann optional angegeben werden.
 
-staff_department_label=Organisationseinheit*:
-staff_department=Organisationseinheit
-staff_department_tooltip=Es ist erforderlich, die Person/Organisation einer Organisationseinheit zuzuordnen.
+staff_department_label=Site*:
+staff_department=Site
+staff_department_tooltip=Es ist erforderlich, die Person/Organisation einer Site zuzuordnen.
 
 staff_category_label=Kategorie*:
 staff_category=Kategorie
@@ -485,17 +485,17 @@ staff_association_patients_tab_label=Patienten
 
 staff_association_account_list_header=Benutzer
 staff_association_account_list_username_column=Benutzername
-staff_association_account_list_user_department_column=Organisationseinheit
+staff_association_account_list_user_department_column=Site
 staff_association_account_list_auth_method_column=Authentifizierung
 
 staff_association_ownershipinventory_list_header=Inventareintr\u00E4ge
 staff_association_ownershipinventory_list_inventory_name_column=Inventar
-staff_association_ownershipinventory_list_inventory_department_column=Organisationseinheit
+staff_association_ownershipinventory_list_inventory_department_column=Site
 staff_association_ownershipinventory_list_inventory_category_column=Kategorie
 
 staff_association_inventorybooking_list_header=Inventarbuchung(en)
 staff_association_inventorybooking_list_inventory_name_column=Inventar
-staff_association_inventorybooking_list_inventory_department_column=Organisationseinheit
+staff_association_inventorybooking_list_inventory_department_column=Site
 staff_association_inventorybooking_list_inventory_category_column=Kategorie
 staff_association_inventorybooking_list_course_name_column=Kurs
 staff_association_inventorybooking_list_trial_name_column=Studie
@@ -516,12 +516,12 @@ staff_association_addresseeinventorystatus_list_originator_name_column=Auftragge
 
 staff_association_institutioncourses_list_header=Kurs(e)
 staff_association_institutioncourses_list_course_name_column=Kurs
-staff_association_institutioncourses_list_course_department_column=Organisationseinheit
+staff_association_institutioncourses_list_course_department_column=Site
 staff_association_institutioncourses_list_course_category_column=Kategorie
 
 staff_association_institutioncvpositions_list_header=CV position(s)
 staff_association_institutioncvpositions_list_staff_name_column=Person
-staff_association_institutioncvpositions_list_staff_department_column=Organisationseinheit
+staff_association_institutioncvpositions_list_staff_department_column=Site
 staff_association_institutioncvpositions_list_staff_category_column=Kategorie
 staff_association_institutioncvpositions_list_section_name_column=CV Abschnitt
 staff_association_institutioncvpositions_list_title_column=Titel
@@ -530,17 +530,17 @@ staff_association_institutioncvpositions_list_stop_column=Ende
 
 staff_association_lectures_list_header=Vortragende(r)
 staff_association_lectures_list_course_name_column=Kurs
-staff_association_lectures_list_course_department_column=Organisationseinheit
+staff_association_lectures_list_course_department_column=Site
 staff_association_lectures_list_course_category_column=Kategorie
 
 staff_association_trial_membership_list_header=Studienteammitglied(er)
 staff_association_trial_membership_list_trial_name_column=Studie
-staff_association_trial_membership_list_trial_department_column=Organisationseinheit
+staff_association_trial_membership_list_trial_department_column=Site
 staff_association_trial_membership_list_trial_status_column=Studienstatus
 
 staff_association_patients_list_header=Proband(en)
 staff_association_patients_list_last_name_column=Name
 staff_association_patients_list_animal_name_column=Tier
-staff_association_patients_list_proband_department_column=Organisationseinheit
+staff_association_patients_list_proband_department_column=Site
 staff_association_patients_list_proband_category_column=Kategorie
 staff_association_patients_list_gender_column=Geschlecht
\ No newline at end of file
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_ff.properties
index 3efc3d870078..5e5d4c5031e1 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_ff.properties
@@ -28,7 +28,7 @@ staff_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status items
 
 staff_status_overview_staffstatus_list_header=employee status item(s)
 staff_status_overview_staffstatus_list_personparticulars_last_name_column=Employee
-staff_status_overview_staffstatus_list_staff_department_column=Department
+staff_status_overview_staffstatus_list_staff_department_column=Site
 staff_status_overview_staffstatus_list_staff_category_column=Category
 staff_status_overview_staffstatus_list_status_type_column=Type
 staff_status_overview_staffstatus_list_start_column=Start
@@ -59,7 +59,7 @@ expiring_participation_overview_reminder_period_days_tooltip=The period can be s
 
 expiring_participation_overview_expiringparticipation_list_header=participation status item(s)
 expiring_participation_overview_expiringparticipation_list_course_name_column=Course
-expiring_participation_overview_expiringparticipation_list_course_department_column=Department
+expiring_participation_overview_expiringparticipation_list_course_department_column=Site
 expiring_participation_overview_expiringparticipation_list_course_category_column=Category
 expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Self-registration
 expiring_participation_overview_expiringparticipation_list_course_stop_column=Course stop
@@ -79,7 +79,7 @@ search_open_all_trials_trainingrecords_certificates_button_label=Open Training R
 
 search_staff_result_list_personparticulars_last_name_column=Name
 search_staff_result_list_organisationparticulars_organisation_name_column=Organisation
-search_staff_result_list_staff_department_column=Department
+search_staff_result_list_staff_department_column=Site
 search_staff_result_list_staff_category_column=Category
 search_staff_result_list_person_column=Person
 search_staff_result_list_employee_column=Employee
@@ -146,9 +146,9 @@ citizenship_label=Citizenship\:
 citizenship=Citizenship
 citizenship_tooltip=Citizenship can be specified optionally.
 
-staff_department_label=Department*\:
-staff_department=Department
-staff_department_tooltip=It is required to assign the person/organisation to a department.
+staff_department_label=Site*\:
+staff_department=Site
+staff_department_tooltip=It is required to assign the person/organisation to a site.
 
 staff_category_label=Category*\:
 staff_category=Category
@@ -487,17 +487,17 @@ staff_association_patients_tab_label=Patients
 
 staff_association_account_list_header=user(s)
 staff_association_account_list_username_column=Username
-staff_association_account_list_user_department_column=Department
+staff_association_account_list_user_department_column=Site
 staff_association_account_list_auth_method_column=Authentication
 
 staff_association_ownershipinventory_list_header=inventory record(s)
 staff_association_ownershipinventory_list_inventory_name_column=Inventory
-staff_association_ownershipinventory_list_inventory_department_column=Department
+staff_association_ownershipinventory_list_inventory_department_column=Site
 staff_association_ownershipinventory_list_inventory_category_column=Category
 
 staff_association_inventorybooking_list_header=inventory booking(s)
 staff_association_inventorybooking_list_inventory_name_column=Inventory
-staff_association_inventorybooking_list_inventory_department_column=Department
+staff_association_inventorybooking_list_inventory_department_column=Site
 staff_association_inventorybooking_list_inventory_category_column=Category
 staff_association_inventorybooking_list_course_name_column=Course
 staff_association_inventorybooking_list_trial_name_column=Trial
@@ -518,12 +518,12 @@ staff_association_addresseeinventorystatus_list_originator_name_column=Originato
 
 staff_association_institutioncourses_list_header=course(s)
 staff_association_institutioncourses_list_course_name_column=Course
-staff_association_institutioncourses_list_course_department_column=Department
+staff_association_institutioncourses_list_course_department_column=Site
 staff_association_institutioncourses_list_course_category_column=Category
 
 staff_association_institutioncvpositions_list_header=CV position(s)
 staff_association_institutioncvpositions_list_staff_name_column=Person
-staff_association_institutioncvpositions_list_staff_department_column=Department
+staff_association_institutioncvpositions_list_staff_department_column=Site
 staff_association_institutioncvpositions_list_staff_category_column=Category
 staff_association_institutioncvpositions_list_section_name_column=CV section
 staff_association_institutioncvpositions_list_title_column=Title
@@ -532,17 +532,17 @@ staff_association_institutioncvpositions_list_stop_column=Stop
 
 staff_association_lectures_list_header=lecturer(s)
 staff_association_lectures_list_course_name_column=Course
-staff_association_lectures_list_course_department_column=Department
+staff_association_lectures_list_course_department_column=Site
 staff_association_lectures_list_course_category_column=Category
 
 staff_association_trial_membership_list_header=trial team member(s)
 staff_association_trial_membership_list_trial_name_column=Trial
-staff_association_trial_membership_list_trial_department_column=Department
+staff_association_trial_membership_list_trial_department_column=Site
 staff_association_trial_membership_list_trial_status_column=Trial status
 
 staff_association_patients_list_header=proband(s)
 staff_association_patients_list_last_name_column=Name
 staff_association_patients_list_animal_name_column=Animal
-staff_association_patients_list_proband_department_column=Department
+staff_association_patients_list_proband_department_column=Site
 staff_association_patients_list_proband_category_column=Category
 staff_association_patients_list_gender_column=Gender
\ No newline at end of file
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_kg.properties
index 3efc3d870078..5e5d4c5031e1 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/staff/labels_kg.properties
@@ -28,7 +28,7 @@ staff_status_overview_ignore_obsolete_filter_tooltip=Hide long-term status items
 
 staff_status_overview_staffstatus_list_header=employee status item(s)
 staff_status_overview_staffstatus_list_personparticulars_last_name_column=Employee
-staff_status_overview_staffstatus_list_staff_department_column=Department
+staff_status_overview_staffstatus_list_staff_department_column=Site
 staff_status_overview_staffstatus_list_staff_category_column=Category
 staff_status_overview_staffstatus_list_status_type_column=Type
 staff_status_overview_staffstatus_list_start_column=Start
@@ -59,7 +59,7 @@ expiring_participation_overview_reminder_period_days_tooltip=The period can be s
 
 expiring_participation_overview_expiringparticipation_list_header=participation status item(s)
 expiring_participation_overview_expiringparticipation_list_course_name_column=Course
-expiring_participation_overview_expiringparticipation_list_course_department_column=Department
+expiring_participation_overview_expiringparticipation_list_course_department_column=Site
 expiring_participation_overview_expiringparticipation_list_course_category_column=Category
 expiring_participation_overview_expiringparticipation_list_course_self_registration_column=Self-registration
 expiring_participation_overview_expiringparticipation_list_course_stop_column=Course stop
@@ -79,7 +79,7 @@ search_open_all_trials_trainingrecords_certificates_button_label=Open Training R
 
 search_staff_result_list_personparticulars_last_name_column=Name
 search_staff_result_list_organisationparticulars_organisation_name_column=Organisation
-search_staff_result_list_staff_department_column=Department
+search_staff_result_list_staff_department_column=Site
 search_staff_result_list_staff_category_column=Category
 search_staff_result_list_person_column=Person
 search_staff_result_list_employee_column=Employee
@@ -146,9 +146,9 @@ citizenship_label=Citizenship\:
 citizenship=Citizenship
 citizenship_tooltip=Citizenship can be specified optionally.
 
-staff_department_label=Department*\:
-staff_department=Department
-staff_department_tooltip=It is required to assign the person/organisation to a department.
+staff_department_label=Site*\:
+staff_department=Site
+staff_department_tooltip=It is required to assign the person/organisation to a site.
 
 staff_category_label=Category*\:
 staff_category=Category
@@ -487,17 +487,17 @@ staff_association_patients_tab_label=Patients
 
 staff_association_account_list_header=user(s)
 staff_association_account_list_username_column=Username
-staff_association_account_list_user_department_column=Department
+staff_association_account_list_user_department_column=Site
 staff_association_account_list_auth_method_column=Authentication
 
 staff_association_ownershipinventory_list_header=inventory record(s)
 staff_association_ownershipinventory_list_inventory_name_column=Inventory
-staff_association_ownershipinventory_list_inventory_department_column=Department
+staff_association_ownershipinventory_list_inventory_department_column=Site
 staff_association_ownershipinventory_list_inventory_category_column=Category
 
 staff_association_inventorybooking_list_header=inventory booking(s)
 staff_association_inventorybooking_list_inventory_name_column=Inventory
-staff_association_inventorybooking_list_inventory_department_column=Department
+staff_association_inventorybooking_list_inventory_department_column=Site
 staff_association_inventorybooking_list_inventory_category_column=Category
 staff_association_inventorybooking_list_course_name_column=Course
 staff_association_inventorybooking_list_trial_name_column=Trial
@@ -518,12 +518,12 @@ staff_association_addresseeinventorystatus_list_originator_name_column=Originato
 
 staff_association_institutioncourses_list_header=course(s)
 staff_association_institutioncourses_list_course_name_column=Course
-staff_association_institutioncourses_list_course_department_column=Department
+staff_association_institutioncourses_list_course_department_column=Site
 staff_association_institutioncourses_list_course_category_column=Category
 
 staff_association_institutioncvpositions_list_header=CV position(s)
 staff_association_institutioncvpositions_list_staff_name_column=Person
-staff_association_institutioncvpositions_list_staff_department_column=Department
+staff_association_institutioncvpositions_list_staff_department_column=Site
 staff_association_institutioncvpositions_list_staff_category_column=Category
 staff_association_institutioncvpositions_list_section_name_column=CV section
 staff_association_institutioncvpositions_list_title_column=Title
@@ -532,17 +532,17 @@ staff_association_institutioncvpositions_list_stop_column=Stop
 
 staff_association_lectures_list_header=lecturer(s)
 staff_association_lectures_list_course_name_column=Course
-staff_association_lectures_list_course_department_column=Department
+staff_association_lectures_list_course_department_column=Site
 staff_association_lectures_list_course_category_column=Category
 
 staff_association_trial_membership_list_header=trial team member(s)
 staff_association_trial_membership_list_trial_name_column=Trial
-staff_association_trial_membership_list_trial_department_column=Department
+staff_association_trial_membership_list_trial_department_column=Site
 staff_association_trial_membership_list_trial_status_column=Trial status
 
 staff_association_patients_list_header=proband(s)
 staff_association_patients_list_last_name_column=Name
 staff_association_patients_list_animal_name_column=Animal
-staff_association_patients_list_proband_department_column=Department
+staff_association_patients_list_proband_department_column=Site
 staff_association_patients_list_proband_category_column=Category
 staff_association_patients_list_gender_column=Gender
\ No newline at end of file
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels.properties
index 2f61c689b750..84681e4c89c5 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels.properties
@@ -38,7 +38,7 @@ timeline_event_overview_show_notify_only_filter_tooltip=Show timeline events mar
 
 timeline_event_overview_timelineevent_list_header=timeline event(s)
 timeline_event_overview_timelineevent_list_trial_name_column=Trial
-timeline_event_overview_timelineevent_list_trial_department_column=Department
+timeline_event_overview_timelineevent_list_trial_department_column=Site
 timeline_event_overview_timelineevent_list_trial_status_type_column=Trial status
 timeline_event_overview_timelineevent_list_event_type_column=Type
 timeline_event_overview_timelineevent_list_parent_title_column=Depending on
@@ -53,9 +53,9 @@ dismiss_timeline_event_button_label=Dismiss timeline event reminder
 #trial timeline
 trial_timeline_title=Timeline
 
-trial_timeline_department_filter_label=Department:
-trial_timeline_department_filter=Department
-trial_timeline_department_filter_tooltip=Filter events for trials of the selected department.
+trial_timeline_department_filter_label=Site:
+trial_timeline_department_filter=Site
+trial_timeline_department_filter_tooltip=Filter events for trials of the selected site.
 
 trial_timeline_trial_status_type_filter_label=Trial status:
 trial_timeline_trial_status_type_filter=Trial status
@@ -105,13 +105,13 @@ money_transfer_summary_paid_filter_open_option_label=open
 money_transfer_summary_list_entries_count_only_filter_label=Active subjects only:
 money_transfer_summary_list_entries_count_only_filter_tooltip=Filter for active subjects (starting from "acceptance" status) of proband list.
 
-money_transfer_summary_department_filter_label=Department\:
-money_transfer_summary_department_filter=Department
-money_transfer_summary_department_filter_tooltip=Filter trials for the selected department.
+money_transfer_summary_department_filter_label=Site\:
+money_transfer_summary_department_filter=Site
+money_transfer_summary_department_filter_tooltip=Filter trials for the selected site.
 
-money_transfer_summary_proband_department_filter_label=Probands of department\:
-money_transfer_summary_proband_department_filter=Probands of department
-money_transfer_summary_proband_department_filter_tooltip=Count reimbursements for probands of the selected department only.
+money_transfer_summary_proband_department_filter_label=Probands of site\:
+money_transfer_summary_proband_department_filter=Probands of site
+money_transfer_summary_proband_department_filter_tooltip=Count reimbursements for probands of the selected site only.
 
 money_transfer_summary_cost_type_filter_label=Asset:
 money_transfer_summary_cost_type_filter=Asset
@@ -119,7 +119,7 @@ money_transfer_summary_cost_type_filter_tooltip=Display reimbursements of the se
 
 money_transfer_overview_money_transfer_summary_list_header=trial(s)
 money_transfer_overview_money_transfer_summary_list_trial_name_column=Trial code
-money_transfer_overview_money_transfer_summary_list_department_column=Department
+money_transfer_overview_money_transfer_summary_list_department_column=Site
 money_transfer_overview_money_transfer_summary_list_trial_type_column=Trial type
 money_transfer_overview_money_transfer_summary_list_trial_status_type_column=Trial status
 money_transfer_overview_money_transfer_summary_list_sponsoring_type_column=Sponsoring
@@ -132,13 +132,13 @@ money_transfer_summary_detail_list_total_column_header=Total (\#reimbursements)
 #ecrf progress overview
 ecrf_progress_overview_title=eCRF Progress Summary
 
-ecrf_progress_summary_department_filter_label=Department\:
-ecrf_progress_summary_department_filter=Department
-ecrf_progress_summary_department_filter_tooltip=Filter trials for the selected department.
+ecrf_progress_summary_department_filter_label=Site\:
+ecrf_progress_summary_department_filter=Site
+ecrf_progress_summary_department_filter_tooltip=Filter trials for the selected site.
 
-ecrf_progress_summary_proband_department_filter_label=Probands of department\:
-ecrf_progress_summary_proband_department_filter=Probands of department
-ecrf_progress_summary_proband_department_filter_tooltip=Count eCRFs for probands of the selected department only.
+ecrf_progress_summary_proband_department_filter_label=Probands of site\:
+ecrf_progress_summary_proband_department_filter=Probands of site
+ecrf_progress_summary_proband_department_filter_tooltip=Count eCRFs for probands of the selected site only.
 
 ecrf_progress_summary_start_filter_label=Visits from:
 ecrf_progress_summary_start_filter=Visits from
@@ -150,7 +150,7 @@ ecrf_progress_summary_stop_filter_tooltip=Count eCRFs for visits before the give
 
 ecrf_progress_overview_ecrf_progress_summary_list_header=trial(s)
 ecrf_progress_overview_ecrf_progress_summary_list_trial_name_column=Trial code
-ecrf_progress_overview_ecrf_progress_summary_list_department_column=Department
+ecrf_progress_overview_ecrf_progress_summary_list_department_column=Site
 ecrf_progress_overview_ecrf_progress_summary_list_trial_status_type_column=Trial status
 ecrf_progress_overview_ecrf_progress_summary_list_proband_list_entry_count_column=#Probands
 ecrf_progress_overview_ecrf_progress_summary_list_field_status_counts_column=eCRF issues
@@ -162,9 +162,9 @@ ecrf_progress_overview_ecrf_progress_summary_list_total_charge_column=Total char
 #duty roster schedule
 duty_roster_schedule_title=Duty Roster Calendar
 
-duty_roster_schedule_department_filter_label=Department:
-duty_roster_schedule_department_filter=Department
-duty_roster_schedule_department_filter_tooltip=Filter events for trials of the selected department.
+duty_roster_schedule_department_filter_label=Site:
+duty_roster_schedule_department_filter=Site
+duty_roster_schedule_department_filter_tooltip=Filter events for trials of the selected site.
 
 duty_roster_schedule_trial_status_type_filter_label=Trial status:
 duty_roster_schedule_trial_status_type_filter=Trial status
@@ -279,7 +279,7 @@ search_trial_result_list_trial_type_column=Trial type
 search_trial_result_list_exclusive_probands_column=Exclusive participation
 search_trial_result_list_signup_column=Sign-Up
 search_trial_result_list_duty_self_allocation_locked_column=Self-allocation locked
-search_trial_result_list_trial_department_column=Department
+search_trial_result_list_trial_department_column=Site
 search_trial_result_list_trial_status_type_column=Trial status
 search_trial_result_list_proband_list_entry_count_column=#Probands
 
@@ -299,9 +299,9 @@ trial_title_label=Trial title*:
 trial_title=Trial title
 trial_title_tooltip=The trial title is required. The title is the official descriptive name of the trial.
 
-trial_department_label=Department*:
-trial_department=Department
-trial_department_tooltip=It is required to assign the trial to a department.
+trial_department_label=Site*:
+trial_department=Site
+trial_department_tooltip=It is required to assign the trial to a site.
 
 trial_type_label=Trial type*:
 trial_type=Trial type
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lock self-allocation of duties be
 
 trial_proband_alias_format_label=Proband alias format:
 trial_proband_alias_format=Proband alias format
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}"):<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}"):<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exclusive participation*:
 trial_exclusive_probands_tooltip=Subjects participating other/previous trials can be enrolled after a blocking period only.
@@ -436,7 +436,7 @@ team_member_list_notifyother_column=Notify other events
 team_member_team_member_list_staff_last_name_column=Name
 team_member_team_member_list_staff_organisation_name_column=Organisation
 
-team_member_team_member_list_staff_department_column=Department
+team_member_team_member_list_staff_department_column=Site
 
 open_trial_training_record_button_label=Open training record
 
@@ -623,7 +623,7 @@ proband_group_probandlistentry_list_header=proband list entries
 proband_group_probandlistentry_list_position_column=Position
 proband_group_probandlistentry_list_proband_name_column=Proband
 #proband_group_probandlistentry_list_proband_gender_column=Gender
-proband_group_probandlistentry_list_proband_department_column=Department
+proband_group_probandlistentry_list_proband_department_column=Site
 proband_group_probandlistentry_list_proband_date_of_birth_column=Date of birth
 
 probandlistentry_list_last_status_column=Enrollment status
@@ -1157,7 +1157,7 @@ trialecrfstatus_proband_list_group_column=Group
 trialecrfstatus_proband_list_proband_name_column=Proband
 trialecrfstatus_proband_list_animal_name_column=Animal
 trialecrfstatus_proband_list_proband_gender_column=Gender
-trialecrfstatus_proband_list_proband_department_column=Department
+trialecrfstatus_proband_list_proband_department_column=Site
 trialecrfstatus_proband_list_proband_date_of_birth_column=Date of birth
 trialecrfstatus_proband_list_field_status_counts_column=eCRF issues
 trialecrfstatus_proband_list_status_counts_column=eCRF status
@@ -1239,7 +1239,7 @@ proband_list_proband_list_proband_name_column=Proband
 proband_list_proband_list_animal_name_column=Animal
 proband_list_proband_list_proband_gender_column=Gender
 proband_list_proband_list_proband_date_of_birth_column=Date of birth
-proband_list_proband_list_proband_department_column=Department
+proband_list_proband_list_proband_department_column=Site
 
 proband_list_target_position=Target-position
 proband_list_target_position_tooltip=Proband will be moved to given position.
@@ -1343,14 +1343,14 @@ trial_association_enrollment_chart_tab_label=Enrollment Progress
 trial_association_courses_tab_label=Courses
 trial_association_courses_list_header=course(s)
 trial_association_courses_list_course_name_column=Course
-trial_association_courses_list_course_department_column=Department
+trial_association_courses_list_course_department_column=Site
 trial_association_courses_list_course_category_column=Category
 trial_association_courses_list_course_stop_column=Course stop
 
 trial_association_mass_mails_tab_label=Mass Mails
 trial_association_massmails_list_header=mass mail(s)
 trial_association_massmails_list_mass_mail_name_column=Name
-trial_association_massmails_list_mass_mail_department_column=Department
+trial_association_massmails_list_mass_mail_department_column=Site
 trial_association_massmails_list_mass_mail_type_column=Type
 trial_association_massmails_list_proband_list_status_column=Enrollment status
 trial_association_massmails_list_proband_to_column=To proband
@@ -1375,7 +1375,7 @@ trial_association_randomizationlistcodes_list_break_timestamp_column=Unblinding
 trial_association_randomizationlistcodes_list_reason_for_break_column=Unblinding Reason
 trial_association_randomizationlistcodes_list_proband_id_column=Proband ID
 trial_association_randomizationlistcodes_list_proband_name_column=Proband
-trial_association_randomizationlistcodes_list_proband_department_column=Department
+trial_association_randomizationlistcodes_list_proband_department_column=Site
 
 no_randomizationcode_values_label=No blinding data
 
@@ -1395,7 +1395,7 @@ reimbursements_proband_money_transfer_no_participation_field_set=Reimbursements
 reimbursements_proband_money_transfer_no_participation_summary_list_header=proband(s)
 reimbursements_proband_money_transfer_no_participation_summary_list_id_column=Proband ID
 reimbursements_proband_money_transfer_no_participation_summary_list_proband_name_column=Proband
-reimbursements_proband_money_transfer_no_participation_summary_list_proband_department_column=Department
+reimbursements_proband_money_transfer_no_participation_summary_list_proband_department_column=Site
 reimbursements_proband_money_transfer_no_participation_summary_list_proband_category_column=Category
 reimbursements_proband_money_transfer_no_participation_summary_list_truncated_cost_type=Asset
 reimbursements_proband_money_transfer_no_participation_summary_list_truncated_cost_type_tooltip=Choose an asset column to display.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ar.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ar.properties
index 8ff9f738de2f..3affcc7a131f 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ar.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ar.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=قفل التخصيص الذات
 
 trial_proband_alias_format_label=تنسيق الاسم المستعار Proband\:
 trial_proband_alias_format=تنسيق الاسم المستعار Proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=المشاركة الحصرية*\:
 trial_exclusive_probands_tooltip=يمكن تسجيل الأشخاص المشاركين في التجارب الأخرى/السابقة بعد فترة حظر فقط.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_da.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_da.properties
index 018961a4cfda..880f728d0286 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_da.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_da.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lås selvtildeling af opgaver, de
 
 trial_proband_alias_format_label=Proband alias format\:
 trial_proband_alias_format=Proband alias format
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Eksklusiv deltagelse*\:
 trial_exclusive_probands_tooltip=Emner, der deltager i andre/tidligere forsøg, kan kun tilmeldes efter en blokeringsperiode.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_de.properties
index 897b8eaae772..758565249d4a 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_de.properties
@@ -40,7 +40,7 @@ timeline_event_overview_show_notify_only_filter_tooltip=Nur Zeitlinienereignisse
 
 timeline_event_overview_timelineevent_list_header=Zeitlinienereignis(se)
 timeline_event_overview_timelineevent_list_trial_name_column=Studie
-timeline_event_overview_timelineevent_list_trial_department_column=Organisationseinheit
+timeline_event_overview_timelineevent_list_trial_department_column=Site
 timeline_event_overview_timelineevent_list_trial_status_type_column=Studienstatus
 timeline_event_overview_timelineevent_list_event_type_column=Typ
 timeline_event_overview_timelineevent_list_parent_title_column=Abh\u00E4ngig von
@@ -55,9 +55,9 @@ dismiss_timeline_event_button_label=Erinnerung schlie\u00DFen
 #trial timeline
 trial_timeline_title=Zeitlinie
 
-trial_timeline_department_filter_label=Organisationseinheit:
-trial_timeline_department_filter=Organisationseinheit
-trial_timeline_department_filter_tooltip=Ereignisse nach Studien der ausgew\u00E4hlten Organisationseinheit filtern.
+trial_timeline_department_filter_label=Site:
+trial_timeline_department_filter=Site
+trial_timeline_department_filter_tooltip=Ereignisse nach Studien der ausgew\u00E4hlten Site filtern.
 
 trial_timeline_trial_status_type_filter_label=Status der Studie:
 trial_timeline_trial_status_type_filter=Status der Studie
@@ -107,13 +107,13 @@ money_transfer_summary_paid_filter_open_option_label=offen
 money_transfer_summary_list_entries_count_only_filter_label=Nur aktive Probanden:
 money_transfer_summary_list_entries_count_only_filter_tooltip=Nach aktive Probanden (ab "Zusage" Status) der Probandenliste filtern.
 
-money_transfer_summary_department_filter_label=Organisationseinheit\:
-money_transfer_summary_department_filter=Organisationseinheit
-money_transfer_summary_department_filter_tooltip=Studien nach der ausgew\u00E4hlten Organisationseinheit filtern.
+money_transfer_summary_department_filter_label=Site\:
+money_transfer_summary_department_filter=Site
+money_transfer_summary_department_filter_tooltip=Studien nach der ausgew\u00E4hlten Site filtern.
 
-money_transfer_summary_proband_department_filter_label=Probanden von Org.einheit\:
-money_transfer_summary_proband_department_filter=Probanden von Org.einheit
-money_transfer_summary_proband_department_filter_tooltip=Nur Entsch\u00E4digungen vom Probanden der angegebenen Organisationseinheit z\u00E4hlen.
+money_transfer_summary_proband_department_filter_label=Probanden von Site\:
+money_transfer_summary_proband_department_filter=Probanden von Site
+money_transfer_summary_proband_department_filter_tooltip=Nur Entsch\u00E4digungen vom Probanden der angegebenen Site z\u00E4hlen.
 
 money_transfer_summary_cost_type_filter_label=Posten:
 money_transfer_summary_cost_type_filter=Posten
@@ -121,7 +121,7 @@ money_transfer_summary_cost_type_filter_tooltip=Nur Entsch\u00E4digungen des aus
 
 money_transfer_overview_money_transfer_summary_list_header=Studie(n)
 money_transfer_overview_money_transfer_summary_list_trial_name_column=Studien-Code
-money_transfer_overview_money_transfer_summary_list_department_column=Organisationseinheit
+money_transfer_overview_money_transfer_summary_list_department_column=Site
 money_transfer_overview_money_transfer_summary_list_trial_type_column=Studienart
 money_transfer_overview_money_transfer_summary_list_trial_status_type_column=Studienstatus
 money_transfer_overview_money_transfer_summary_list_sponsoring_type_column=Sponsoring
@@ -134,13 +134,13 @@ money_transfer_summary_detail_list_total_column_header=Summe (\#Entsch\u00E4digu
 #ecrf progress overview
 ecrf_progress_overview_title=\u00DCbersicht eCRF Fortschritt
 
-ecrf_progress_summary_department_filter_label=Organisationseinheit\:
-ecrf_progress_summary_department_filter=Organisationseinheit
-ecrf_progress_summary_department_filter_tooltip=Studien nach der ausgew\u00E4hlten Organisationseinheit filtern.
+ecrf_progress_summary_department_filter_label=Site\:
+ecrf_progress_summary_department_filter=Site
+ecrf_progress_summary_department_filter_tooltip=Studien nach der ausgew\u00E4hlten Site filtern.
 
-ecrf_progress_summary_proband_department_filter_label=Probanden von Org.einheit\:
-ecrf_progress_summary_proband_department_filter=Probanden von Org.einheit
-ecrf_progress_summary_proband_department_filter_tooltip=Nur eCRFs vom Probanden der angegebenen Organisationseinheit z\u00E4hlen.
+ecrf_progress_summary_proband_department_filter_label=Probanden von Site\:
+ecrf_progress_summary_proband_department_filter=Probanden von Site
+ecrf_progress_summary_proband_department_filter_tooltip=Nur eCRFs vom Probanden der angegebenen Site z\u00E4hlen.
 
 ecrf_progress_summary_start_filter_label=Visiten von:
 ecrf_progress_summary_start_filter=Visiten von
@@ -152,7 +152,7 @@ ecrf_progress_summary_stop_filter_tooltip=Nur eCRFs zu Visiten vor dem angegeben
 
 ecrf_progress_overview_ecrf_progress_summary_list_header=Studie(n)
 ecrf_progress_overview_ecrf_progress_summary_list_trial_name_column=Studien-Code
-ecrf_progress_overview_ecrf_progress_summary_list_department_column=Organisationseinheit
+ecrf_progress_overview_ecrf_progress_summary_list_department_column=Site
 ecrf_progress_overview_ecrf_progress_summary_list_trial_status_type_column=Studienstatus
 ecrf_progress_overview_ecrf_progress_summary_list_proband_list_entry_count_column=#Probanden
 ecrf_progress_overview_ecrf_progress_summary_list_field_status_counts_column=eCRF Issues
@@ -164,9 +164,9 @@ ecrf_progress_overview_ecrf_progress_summary_list_total_charge_column=Kosten ges
 #duty roster schedule
 duty_roster_schedule_title=Dienstplan Kalender
 
-duty_roster_schedule_department_filter_label=Organisationseinheit:
-duty_roster_schedule_department_filter=Organisationseinheit
-duty_roster_schedule_department_filter_tooltip=Ereignisse nach Studien der ausgew\u00E4hlten Organisationseinheit filtern.
+duty_roster_schedule_department_filter_label=Site:
+duty_roster_schedule_department_filter=Site
+duty_roster_schedule_department_filter_tooltip=Ereignisse nach Studien der ausgew\u00E4hlten Site filtern.
 
 duty_roster_schedule_trial_status_type_filter_label=Status der Studie:
 duty_roster_schedule_trial_status_type_filter=Status der Studie
@@ -279,7 +279,7 @@ search_trial_result_list_trial_type_column=Studienart
 search_trial_result_list_exclusive_probands_column=Exklusive Teilnahme
 search_trial_result_list_signup_column=Sign-Up
 search_trial_result_list_duty_self_allocation_locked_column=Selbstzuteilung gesperrt
-search_trial_result_list_trial_department_column=Organisationseinheit
+search_trial_result_list_trial_department_column=Site
 search_trial_result_list_trial_status_type_column=Studienstatus
 search_trial_result_list_proband_list_entry_count_column=#Probanden
 
@@ -299,9 +299,9 @@ trial_title_label=Studien-Titel*:
 trial_title=Studien-Titel
 trial_title_tooltip=Der Titel der Studie ist erforderlich. Der Titel ist die offizielle, beschreibende Bezeichnung der Studie.
 
-trial_department_label=Organisationseinheit*:
-trial_department=Organisationseinheit
-trial_department_tooltip=Es ist erforderlich, die Studie einer Organisationseinheit zuzuordnen.
+trial_department_label=Site*:
+trial_department=Site
+trial_department_tooltip=Es ist erforderlich, die Studie einer Site zuzuordnen.
 
 trial_type_label=Studienart*:
 trial_type=Studienart
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Selbstzuteilung von Diensten sper
 
 trial_proband_alias_format_label=Probanden Alias Format:
 trial_proband_alias_format=Probanden Alias Format
-trial_proband_alias_format_tooltip=Bei der Eintragung in die Probandenliste k\u00F6nnen verblindete Probanden automatisch erstellt werden.<br/>Der Alias wird dabei anhand des vorgegebenen Formats (zB. "STUDIEX-{0}-{7,number,0000}") generiert:<ul><li>{0} ... Org.Einheit Name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserviert)</li><li>{6} ... fortlaufende Nummer (letzte + 1), beginnend mit 0</li><li>{7} ... fortlaufende Nummer (letzte + 1), beginnend mit 1</li><li>{8} ... fortlaufende Nummer (Anzahl + 1), beginnend mit 0</li><li>{9} ... fortlaufende Nummer (Anzahl + 1), beginnend mit 1</li></ul>
+trial_proband_alias_format_tooltip=Bei der Eintragung in die Probandenliste k\u00F6nnen verblindete Probanden automatisch erstellt werden.<br/>Der Alias wird dabei anhand des vorgegebenen Formats (zB. "STUDIEX-{0}-{7,number,0000}") generiert:<ul><li>{0} ... Site Name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserviert)</li><li>{6} ... fortlaufende Nummer (letzte + 1), beginnend mit 0</li><li>{7} ... fortlaufende Nummer (letzte + 1), beginnend mit 1</li><li>{8} ... fortlaufende Nummer (Anzahl + 1), beginnend mit 0</li><li>{9} ... fortlaufende Nummer (Anzahl + 1), beginnend mit 1</li></ul>
 
 trial_exclusive_probands_label=Exklusive Teilnahme*:
 trial_exclusive_probands_tooltip=Probanden, die bei anderen/vorherigen Studien teilnehmen, k\u00F6nnen erst nach<br/>einer Sperrfrist zur Probandenliste hinzugef\u00FCgt werden.
@@ -436,7 +436,7 @@ team_member_list_notifyother_column=Andere Ereignisse benachrichtigen
 team_member_team_member_list_staff_last_name_column=Name
 team_member_team_member_list_staff_organisation_name_column=Organisation
 
-team_member_team_member_list_staff_department_column=Org.Einheit
+team_member_team_member_list_staff_department_column=Site
 
 open_trial_training_record_button_label=Training Record \u00F6ffnen
 
@@ -623,7 +623,7 @@ proband_group_probandlistentry_list_header=Probandenlisteneintr\u00E4ge
 proband_group_probandlistentry_list_position_column=Position
 proband_group_probandlistentry_list_proband_name_column=Proband
 #proband_group_probandlistentry_list_proband_gender_column=Geschlecht
-proband_group_probandlistentry_list_proband_department_column=Org.Einheit
+proband_group_probandlistentry_list_proband_department_column=Site
 proband_group_probandlistentry_list_proband_date_of_birth_column=Geburtsdatum
 
 probandlistentry_list_last_status_column=Enrollment Status
@@ -1157,7 +1157,7 @@ trialecrfstatus_proband_list_group_column=Gruppe
 trialecrfstatus_proband_list_proband_name_column=Proband
 trialecrfstatus_proband_list_animal_name_column=Tier
 trialecrfstatus_proband_list_proband_gender_column=Geschlecht
-trialecrfstatus_proband_list_proband_department_column=Org.Einheit
+trialecrfstatus_proband_list_proband_department_column=Site
 trialecrfstatus_proband_list_proband_date_of_birth_column=Geburtsdatum
 trialecrfstatus_proband_list_field_status_counts_column=eCRF Issues
 trialecrfstatus_proband_list_status_counts_column=eCRF Status
@@ -1238,7 +1238,7 @@ proband_list_proband_list_proband_name_column=Proband
 proband_list_proband_list_animal_name_column=Tier
 proband_list_proband_list_proband_gender_column=Geschlecht
 proband_list_proband_list_proband_date_of_birth_column=Geburtsdatum
-proband_list_proband_list_proband_department_column=Org.Einheit
+proband_list_proband_list_proband_department_column=Site
 
 proband_list_target_position=Ziel-Position
 proband_list_target_position_tooltip=Proband wird auf angegebene Zielposition verschoben.
@@ -1344,7 +1344,7 @@ trial_association_enrollment_chart_tab_label=Enrollment Fortschritt
 trial_association_courses_tab_label=Kurse
 trial_association_courses_list_header=Kurs(e)
 trial_association_courses_list_course_name_column=Kurs
-trial_association_courses_list_course_department_column=Organisationseinheit
+trial_association_courses_list_course_department_column=Site
 trial_association_courses_list_course_category_column=Kategorie
 trial_association_courses_list_course_stop_column=Kursende
 
@@ -1376,7 +1376,7 @@ trial_association_randomizationlistcodes_list_break_timestamp_column=Entblindung
 trial_association_randomizationlistcodes_list_reason_for_break_column=Entblindung Begr\u00FCndung
 trial_association_randomizationlistcodes_list_proband_id_column=Proband ID
 trial_association_randomizationlistcodes_list_proband_name_column=Proband
-trial_association_randomizationlistcodes_list_proband_department_column=Org.Einheit
+trial_association_randomizationlistcodes_list_proband_department_column=Site
 
 no_randomizationcode_values_label=Keine Blinding-Daten
 
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_es.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_es.properties
index 01e258ff2c17..e35fb4dceea9 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_es.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_es.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Bloquee la autoasignación de tar
 
 trial_proband_alias_format_label=Formato de alias de probando\:
 trial_proband_alias_format=Formato de alias probando
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Participación exclusiva*\:
 trial_exclusive_probands_tooltip=Los sujetos que participan en otros ensayos o en ensayos anteriores pueden inscribirse únicamente después de un período de bloqueo.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ff.properties
index eac95f079add..0c0a9d718c9b 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ff.properties
@@ -38,7 +38,7 @@ timeline_event_overview_show_notify_only_filter_tooltip=Show timeline events mar
 
 timeline_event_overview_timelineevent_list_header=timeline event(s)
 timeline_event_overview_timelineevent_list_trial_name_column=Trial
-timeline_event_overview_timelineevent_list_trial_department_column=Department
+timeline_event_overview_timelineevent_list_trial_department_column=Site
 timeline_event_overview_timelineevent_list_trial_status_type_column=Trial status
 timeline_event_overview_timelineevent_list_event_type_column=Type
 timeline_event_overview_timelineevent_list_parent_title_column=Depending on
@@ -53,9 +53,9 @@ dismiss_timeline_event_button_label=Dismiss timeline event reminder
 #trial timeline
 trial_timeline_title=Timeline
 
-trial_timeline_department_filter_label=Department\:
-trial_timeline_department_filter=Department
-trial_timeline_department_filter_tooltip=Filter events for trials of the selected department.
+trial_timeline_department_filter_label=Site\:
+trial_timeline_department_filter=Site
+trial_timeline_department_filter_tooltip=Filter events for trials of the selected site.
 
 trial_timeline_trial_status_type_filter_label=Trial status\:
 trial_timeline_trial_status_type_filter=Trial status
@@ -105,13 +105,13 @@ money_transfer_summary_paid_filter_open_option_label=open
 money_transfer_summary_list_entries_count_only_filter_label=Active subjects only\:
 money_transfer_summary_list_entries_count_only_filter_tooltip=Filter for active subjects (starting from "acceptance" status) of proband list.
 
-money_transfer_summary_department_filter_label=Department\:
-money_transfer_summary_department_filter=Department
-money_transfer_summary_department_filter_tooltip=Filter trials for the selected department.
+money_transfer_summary_department_filter_label=Site\:
+money_transfer_summary_department_filter=Site
+money_transfer_summary_department_filter_tooltip=Filter trials for the selected site.
 
-money_transfer_summary_proband_department_filter_label=Probands of department\:
-money_transfer_summary_proband_department_filter=Probands of department
-money_transfer_summary_proband_department_filter_tooltip=Count reimbursements for probands of the selected department only.
+money_transfer_summary_proband_department_filter_label=Probands of site\:
+money_transfer_summary_proband_department_filter=Probands of site
+money_transfer_summary_proband_department_filter_tooltip=Count reimbursements for probands of the selected site only.
 
 money_transfer_summary_cost_type_filter_label=Asset\:
 money_transfer_summary_cost_type_filter=Asset
@@ -119,7 +119,7 @@ money_transfer_summary_cost_type_filter_tooltip=Display reimbursements of the se
 
 money_transfer_overview_money_transfer_summary_list_header=trial(s)
 money_transfer_overview_money_transfer_summary_list_trial_name_column=Trial code
-money_transfer_overview_money_transfer_summary_list_department_column=Department
+money_transfer_overview_money_transfer_summary_list_department_column=Site
 money_transfer_overview_money_transfer_summary_list_trial_type_column=Trial type
 money_transfer_overview_money_transfer_summary_list_trial_status_type_column=Trial status
 money_transfer_overview_money_transfer_summary_list_sponsoring_type_column=Sponsoring
@@ -132,13 +132,13 @@ money_transfer_summary_detail_list_total_column_header=Total (\#reimbursements)
 #ecrf progress overview
 ecrf_progress_overview_title=eCRF Progress Summary
 
-ecrf_progress_summary_department_filter_label=Department\:
-ecrf_progress_summary_department_filter=Department
-ecrf_progress_summary_department_filter_tooltip=Filter trials for the selected department.
+ecrf_progress_summary_department_filter_label=Site\:
+ecrf_progress_summary_department_filter=Site
+ecrf_progress_summary_department_filter_tooltip=Filter trials for the selected site.
 
-ecrf_progress_summary_proband_department_filter_label=Probands of department\:
-ecrf_progress_summary_proband_department_filter=Probands of department
-ecrf_progress_summary_proband_department_filter_tooltip=Count eCRFs for probands of the selected department only.
+ecrf_progress_summary_proband_department_filter_label=Probands of site\:
+ecrf_progress_summary_proband_department_filter=Probands of site
+ecrf_progress_summary_proband_department_filter_tooltip=Count eCRFs for probands of the selected site only.
 
 ecrf_progress_summary_start_filter_label=Visits from\:
 ecrf_progress_summary_start_filter=Visits from
@@ -150,7 +150,7 @@ ecrf_progress_summary_stop_filter_tooltip=Count eCRFs for visits before the give
 
 ecrf_progress_overview_ecrf_progress_summary_list_header=trial(s)
 ecrf_progress_overview_ecrf_progress_summary_list_trial_name_column=Trial code
-ecrf_progress_overview_ecrf_progress_summary_list_department_column=Department
+ecrf_progress_overview_ecrf_progress_summary_list_department_column=Site
 ecrf_progress_overview_ecrf_progress_summary_list_trial_status_type_column=Trial status
 ecrf_progress_overview_ecrf_progress_summary_list_proband_list_entry_count_column=\#Probands
 ecrf_progress_overview_ecrf_progress_summary_list_field_status_counts_column=eCRF issues
@@ -162,9 +162,9 @@ ecrf_progress_overview_ecrf_progress_summary_list_total_charge_column=Total char
 #duty roster schedule
 duty_roster_schedule_title=Duty Roster Calendar
 
-duty_roster_schedule_department_filter_label=Department\:
-duty_roster_schedule_department_filter=Department
-duty_roster_schedule_department_filter_tooltip=Filter events for trials of the selected department.
+duty_roster_schedule_department_filter_label=Site\:
+duty_roster_schedule_department_filter=Site
+duty_roster_schedule_department_filter_tooltip=Filter events for trials of the selected site.
 
 duty_roster_schedule_trial_status_type_filter_label=Trial status\:
 duty_roster_schedule_trial_status_type_filter=Trial status
@@ -279,7 +279,7 @@ search_trial_result_list_trial_type_column=Trial type
 search_trial_result_list_exclusive_probands_column=Exclusive participation
 search_trial_result_list_signup_column=Sign-Up
 search_trial_result_list_duty_self_allocation_locked_column=Self-allocation locked
-search_trial_result_list_trial_department_column=Department
+search_trial_result_list_trial_department_column=Site
 search_trial_result_list_trial_status_type_column=Trial status
 search_trial_result_list_proband_list_entry_count_column=\#Probands
 
@@ -299,9 +299,9 @@ trial_title_label=Trial title*\:
 trial_title=Trial title
 trial_title_tooltip=The trial title is required. The title is the official descriptive name of the trial.
 
-trial_department_label=Department*\:
-trial_department=Department
-trial_department_tooltip=It is required to assign the trial to a department.
+trial_department_label=Site*\:
+trial_department=Site
+trial_department_tooltip=It is required to assign the trial to a site.
 
 trial_type_label=Trial type*\:
 trial_type=Trial type
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lock self-allocation of duties be
 
 trial_proband_alias_format_label=Proband alias format\:
 trial_proband_alias_format=Proband alias format
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exclusive participation*\:
 trial_exclusive_probands_tooltip=Subjects participating other/previous trials can be enrolled after a blocking period only.
@@ -436,7 +436,7 @@ team_member_list_notifyother_column=Notify other events
 team_member_team_member_list_staff_last_name_column=Name
 team_member_team_member_list_staff_organisation_name_column=Organisation
 
-team_member_team_member_list_staff_department_column=Department
+team_member_team_member_list_staff_department_column=Site
 
 open_trial_training_record_button_label=Open training record
 
@@ -623,7 +623,7 @@ proband_group_probandlistentry_list_header=proband list entries
 proband_group_probandlistentry_list_position_column=Position
 proband_group_probandlistentry_list_proband_name_column=Proband
 #proband_group_probandlistentry_list_proband_gender_column=Gender
-proband_group_probandlistentry_list_proband_department_column=Department
+proband_group_probandlistentry_list_proband_department_column=Site
 proband_group_probandlistentry_list_proband_date_of_birth_column=Date of birth
 
 probandlistentry_list_last_status_column=Enrollment status
@@ -1157,7 +1157,7 @@ trialecrfstatus_proband_list_group_column=Group
 trialecrfstatus_proband_list_proband_name_column=Proband
 trialecrfstatus_proband_list_animal_name_column=Animal
 trialecrfstatus_proband_list_proband_gender_column=Gender
-trialecrfstatus_proband_list_proband_department_column=Department
+trialecrfstatus_proband_list_proband_department_column=Site
 trialecrfstatus_proband_list_proband_date_of_birth_column=Date of birth
 trialecrfstatus_proband_list_field_status_counts_column=eCRF issues
 trialecrfstatus_proband_list_status_counts_column=eCRF status
@@ -1239,7 +1239,7 @@ proband_list_proband_list_proband_name_column=Proband
 proband_list_proband_list_animal_name_column=Animal
 proband_list_proband_list_proband_gender_column=Gender
 proband_list_proband_list_proband_date_of_birth_column=Date of birth
-proband_list_proband_list_proband_department_column=Department
+proband_list_proband_list_proband_department_column=Site
 
 proband_list_target_position=Target-position
 proband_list_target_position_tooltip=Proband will be moved to given position.
@@ -1343,14 +1343,14 @@ trial_association_enrollment_chart_tab_label=Enrollment Progress
 trial_association_courses_tab_label=Courses
 trial_association_courses_list_header=course(s)
 trial_association_courses_list_course_name_column=Course
-trial_association_courses_list_course_department_column=Department
+trial_association_courses_list_course_department_column=Site
 trial_association_courses_list_course_category_column=Category
 trial_association_courses_list_course_stop_column=Course stop
 
 trial_association_mass_mails_tab_label=Mass Mails
 trial_association_massmails_list_header=mass mail(s)
 trial_association_massmails_list_mass_mail_name_column=Name
-trial_association_massmails_list_mass_mail_department_column=Department
+trial_association_massmails_list_mass_mail_department_column=Site
 trial_association_massmails_list_mass_mail_type_column=Type
 trial_association_massmails_list_proband_list_status_column=Enrollment status
 trial_association_massmails_list_proband_to_column=To proband
@@ -1375,7 +1375,7 @@ trial_association_randomizationlistcodes_list_break_timestamp_column=Unblinding
 trial_association_randomizationlistcodes_list_reason_for_break_column=Unblinding Reason
 trial_association_randomizationlistcodes_list_proband_id_column=Proband ID
 trial_association_randomizationlistcodes_list_proband_name_column=Proband
-trial_association_randomizationlistcodes_list_proband_department_column=Department
+trial_association_randomizationlistcodes_list_proband_department_column=Site
 
 no_randomizationcode_values_label=No blinding data
 
@@ -1395,7 +1395,7 @@ reimbursements_proband_money_transfer_no_participation_field_set=Reimbursements
 reimbursements_proband_money_transfer_no_participation_summary_list_header=proband(s)
 reimbursements_proband_money_transfer_no_participation_summary_list_id_column=Proband ID
 reimbursements_proband_money_transfer_no_participation_summary_list_proband_name_column=Proband
-reimbursements_proband_money_transfer_no_participation_summary_list_proband_department_column=Department
+reimbursements_proband_money_transfer_no_participation_summary_list_proband_department_column=Site
 reimbursements_proband_money_transfer_no_participation_summary_list_proband_category_column=Category
 reimbursements_proband_money_transfer_no_participation_summary_list_truncated_cost_type=Asset
 reimbursements_proband_money_transfer_no_participation_summary_list_truncated_cost_type_tooltip=Choose an asset column to display.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fi.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fi.properties
index 04e28d06fffa..f38909682ded 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fi.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fi.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lukitse tehtävien itsejako, joka
 
 trial_proband_alias_format_label=Proband-aliaksen muoto\:
 trial_proband_alias_format=Proband-aliaksen muoto
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Eksklusiivinen osallistuminen*\:
 trial_exclusive_probands_tooltip=Muihin/aiempiin kokeisiin osallistuvat koehenkilöt voidaan ilmoittautua vain estojakson jälkeen.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fr.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fr.properties
index 383f5a386109..078ce433fb75 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fr.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_fr.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Verrouillez l’auto-attribution
 
 trial_proband_alias_format_label=Format d'alias du proposant \:
 trial_proband_alias_format=Format d'alias du proposant
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Participation exclusive* \:
 trial_exclusive_probands_tooltip=Les sujets participant à d'autres essais/antécédents peuvent être inscrits après une période de blocage uniquement.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hi.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hi.properties
index 748dbf760907..61ecf3e6c7f2 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hi.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hi.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=दिए गए टाइमस
 
 trial_proband_alias_format_label=प्रोबैंड उपनाम प्रारूप\:
 trial_proband_alias_format=प्रोबैंड उपनाम प्रारूप
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=विशेष भागीदारी*\:
 trial_exclusive_probands_tooltip=अन्य/पिछले परीक्षणों में भाग लेने वाले विषयों को केवल अवरुद्ध अवधि के बाद नामांकित किया जा सकता है।
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hr.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hr.properties
index d128ee98dfee..7c64dafa509a 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hr.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hr.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Zaključaj samoraspodjelu dužnos
 
 trial_proband_alias_format_label=Proband alias format\:
 trial_proband_alias_format=Proband alias format
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Ekskluzivno sudjelovanje*\:
 trial_exclusive_probands_tooltip=Ispitanici koji sudjeluju u drugim/prethodnim ispitivanjima mogu se uključiti samo nakon razdoblja blokiranja.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hu.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hu.properties
index 498c1b7b7208..c938827d4dd7 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hu.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_hu.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=A feladatok önkiosztásának zá
 
 trial_proband_alias_format_label=Proband alias formátuma\:
 trial_proband_alias_format=Proband alias formátum
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exkluzív részvétel*\:
 trial_exclusive_probands_tooltip=Az egyéb/korábbi kísérletekben részt vevő alanyok csak egy letiltási időszak után jelentkezhetnek be.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ig.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ig.properties
index ce0d1ed2feb7..1fa166c98946 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ig.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ig.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Kpọchie ikenye onwe nke ọrụ
 
 trial_proband_alias_format_label=Ụdị utu aha proband\:
 trial_proband_alias_format=Proband utu aha usoro
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=nsonye pụrụiche*\:
 trial_exclusive_probands_tooltip=Enwere ike ịdebanye aha ndị na-esonye na nnwale ndị ọzọ ma ọ bụrụ na oge nkwụsị naanị.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_it.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_it.properties
index 309ff2eaa800..88f18b36219f 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_it.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_it.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Blocca l'autoassegnazione dei com
 
 trial_proband_alias_format_label=Formato alias Proband\:
 trial_proband_alias_format=Formato alias Proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Partecipazione esclusiva*\:
 trial_exclusive_probands_tooltip=I soggetti che partecipano ad altri/precedenti studi possono essere arruolati solo dopo un periodo di blocco.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ja.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ja.properties
index 0a52c4dfcf3f..ac3ff3760142 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ja.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ja.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=指定されたタイムスタン
 
 trial_proband_alias_format_label=発端者の別名の形式\:
 trial_proband_alias_format=発端者の別名の形式
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=独占参加*\:
 trial_exclusive_probands_tooltip=他の/以前の試験に参加している被験者は、ブロック期間後にのみ登録できます。
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_kg.properties
index eac95f079add..0c0a9d718c9b 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_kg.properties
@@ -38,7 +38,7 @@ timeline_event_overview_show_notify_only_filter_tooltip=Show timeline events mar
 
 timeline_event_overview_timelineevent_list_header=timeline event(s)
 timeline_event_overview_timelineevent_list_trial_name_column=Trial
-timeline_event_overview_timelineevent_list_trial_department_column=Department
+timeline_event_overview_timelineevent_list_trial_department_column=Site
 timeline_event_overview_timelineevent_list_trial_status_type_column=Trial status
 timeline_event_overview_timelineevent_list_event_type_column=Type
 timeline_event_overview_timelineevent_list_parent_title_column=Depending on
@@ -53,9 +53,9 @@ dismiss_timeline_event_button_label=Dismiss timeline event reminder
 #trial timeline
 trial_timeline_title=Timeline
 
-trial_timeline_department_filter_label=Department\:
-trial_timeline_department_filter=Department
-trial_timeline_department_filter_tooltip=Filter events for trials of the selected department.
+trial_timeline_department_filter_label=Site\:
+trial_timeline_department_filter=Site
+trial_timeline_department_filter_tooltip=Filter events for trials of the selected site.
 
 trial_timeline_trial_status_type_filter_label=Trial status\:
 trial_timeline_trial_status_type_filter=Trial status
@@ -105,13 +105,13 @@ money_transfer_summary_paid_filter_open_option_label=open
 money_transfer_summary_list_entries_count_only_filter_label=Active subjects only\:
 money_transfer_summary_list_entries_count_only_filter_tooltip=Filter for active subjects (starting from "acceptance" status) of proband list.
 
-money_transfer_summary_department_filter_label=Department\:
-money_transfer_summary_department_filter=Department
-money_transfer_summary_department_filter_tooltip=Filter trials for the selected department.
+money_transfer_summary_department_filter_label=Site\:
+money_transfer_summary_department_filter=Site
+money_transfer_summary_department_filter_tooltip=Filter trials for the selected site.
 
-money_transfer_summary_proband_department_filter_label=Probands of department\:
-money_transfer_summary_proband_department_filter=Probands of department
-money_transfer_summary_proband_department_filter_tooltip=Count reimbursements for probands of the selected department only.
+money_transfer_summary_proband_department_filter_label=Probands of site\:
+money_transfer_summary_proband_department_filter=Probands of site
+money_transfer_summary_proband_department_filter_tooltip=Count reimbursements for probands of the selected site only.
 
 money_transfer_summary_cost_type_filter_label=Asset\:
 money_transfer_summary_cost_type_filter=Asset
@@ -119,7 +119,7 @@ money_transfer_summary_cost_type_filter_tooltip=Display reimbursements of the se
 
 money_transfer_overview_money_transfer_summary_list_header=trial(s)
 money_transfer_overview_money_transfer_summary_list_trial_name_column=Trial code
-money_transfer_overview_money_transfer_summary_list_department_column=Department
+money_transfer_overview_money_transfer_summary_list_department_column=Site
 money_transfer_overview_money_transfer_summary_list_trial_type_column=Trial type
 money_transfer_overview_money_transfer_summary_list_trial_status_type_column=Trial status
 money_transfer_overview_money_transfer_summary_list_sponsoring_type_column=Sponsoring
@@ -132,13 +132,13 @@ money_transfer_summary_detail_list_total_column_header=Total (\#reimbursements)
 #ecrf progress overview
 ecrf_progress_overview_title=eCRF Progress Summary
 
-ecrf_progress_summary_department_filter_label=Department\:
-ecrf_progress_summary_department_filter=Department
-ecrf_progress_summary_department_filter_tooltip=Filter trials for the selected department.
+ecrf_progress_summary_department_filter_label=Site\:
+ecrf_progress_summary_department_filter=Site
+ecrf_progress_summary_department_filter_tooltip=Filter trials for the selected site.
 
-ecrf_progress_summary_proband_department_filter_label=Probands of department\:
-ecrf_progress_summary_proband_department_filter=Probands of department
-ecrf_progress_summary_proband_department_filter_tooltip=Count eCRFs for probands of the selected department only.
+ecrf_progress_summary_proband_department_filter_label=Probands of site\:
+ecrf_progress_summary_proband_department_filter=Probands of site
+ecrf_progress_summary_proband_department_filter_tooltip=Count eCRFs for probands of the selected site only.
 
 ecrf_progress_summary_start_filter_label=Visits from\:
 ecrf_progress_summary_start_filter=Visits from
@@ -150,7 +150,7 @@ ecrf_progress_summary_stop_filter_tooltip=Count eCRFs for visits before the give
 
 ecrf_progress_overview_ecrf_progress_summary_list_header=trial(s)
 ecrf_progress_overview_ecrf_progress_summary_list_trial_name_column=Trial code
-ecrf_progress_overview_ecrf_progress_summary_list_department_column=Department
+ecrf_progress_overview_ecrf_progress_summary_list_department_column=Site
 ecrf_progress_overview_ecrf_progress_summary_list_trial_status_type_column=Trial status
 ecrf_progress_overview_ecrf_progress_summary_list_proband_list_entry_count_column=\#Probands
 ecrf_progress_overview_ecrf_progress_summary_list_field_status_counts_column=eCRF issues
@@ -162,9 +162,9 @@ ecrf_progress_overview_ecrf_progress_summary_list_total_charge_column=Total char
 #duty roster schedule
 duty_roster_schedule_title=Duty Roster Calendar
 
-duty_roster_schedule_department_filter_label=Department\:
-duty_roster_schedule_department_filter=Department
-duty_roster_schedule_department_filter_tooltip=Filter events for trials of the selected department.
+duty_roster_schedule_department_filter_label=Site\:
+duty_roster_schedule_department_filter=Site
+duty_roster_schedule_department_filter_tooltip=Filter events for trials of the selected site.
 
 duty_roster_schedule_trial_status_type_filter_label=Trial status\:
 duty_roster_schedule_trial_status_type_filter=Trial status
@@ -279,7 +279,7 @@ search_trial_result_list_trial_type_column=Trial type
 search_trial_result_list_exclusive_probands_column=Exclusive participation
 search_trial_result_list_signup_column=Sign-Up
 search_trial_result_list_duty_self_allocation_locked_column=Self-allocation locked
-search_trial_result_list_trial_department_column=Department
+search_trial_result_list_trial_department_column=Site
 search_trial_result_list_trial_status_type_column=Trial status
 search_trial_result_list_proband_list_entry_count_column=\#Probands
 
@@ -299,9 +299,9 @@ trial_title_label=Trial title*\:
 trial_title=Trial title
 trial_title_tooltip=The trial title is required. The title is the official descriptive name of the trial.
 
-trial_department_label=Department*\:
-trial_department=Department
-trial_department_tooltip=It is required to assign the trial to a department.
+trial_department_label=Site*\:
+trial_department=Site
+trial_department_tooltip=It is required to assign the trial to a site.
 
 trial_type_label=Trial type*\:
 trial_type=Trial type
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lock self-allocation of duties be
 
 trial_proband_alias_format_label=Proband alias format\:
 trial_proband_alias_format=Proband alias format
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exclusive participation*\:
 trial_exclusive_probands_tooltip=Subjects participating other/previous trials can be enrolled after a blocking period only.
@@ -436,7 +436,7 @@ team_member_list_notifyother_column=Notify other events
 team_member_team_member_list_staff_last_name_column=Name
 team_member_team_member_list_staff_organisation_name_column=Organisation
 
-team_member_team_member_list_staff_department_column=Department
+team_member_team_member_list_staff_department_column=Site
 
 open_trial_training_record_button_label=Open training record
 
@@ -623,7 +623,7 @@ proband_group_probandlistentry_list_header=proband list entries
 proband_group_probandlistentry_list_position_column=Position
 proband_group_probandlistentry_list_proband_name_column=Proband
 #proband_group_probandlistentry_list_proband_gender_column=Gender
-proband_group_probandlistentry_list_proband_department_column=Department
+proband_group_probandlistentry_list_proband_department_column=Site
 proband_group_probandlistentry_list_proband_date_of_birth_column=Date of birth
 
 probandlistentry_list_last_status_column=Enrollment status
@@ -1157,7 +1157,7 @@ trialecrfstatus_proband_list_group_column=Group
 trialecrfstatus_proband_list_proband_name_column=Proband
 trialecrfstatus_proband_list_animal_name_column=Animal
 trialecrfstatus_proband_list_proband_gender_column=Gender
-trialecrfstatus_proband_list_proband_department_column=Department
+trialecrfstatus_proband_list_proband_department_column=Site
 trialecrfstatus_proband_list_proband_date_of_birth_column=Date of birth
 trialecrfstatus_proband_list_field_status_counts_column=eCRF issues
 trialecrfstatus_proband_list_status_counts_column=eCRF status
@@ -1239,7 +1239,7 @@ proband_list_proband_list_proband_name_column=Proband
 proband_list_proband_list_animal_name_column=Animal
 proband_list_proband_list_proband_gender_column=Gender
 proband_list_proband_list_proband_date_of_birth_column=Date of birth
-proband_list_proband_list_proband_department_column=Department
+proband_list_proband_list_proband_department_column=Site
 
 proband_list_target_position=Target-position
 proband_list_target_position_tooltip=Proband will be moved to given position.
@@ -1343,14 +1343,14 @@ trial_association_enrollment_chart_tab_label=Enrollment Progress
 trial_association_courses_tab_label=Courses
 trial_association_courses_list_header=course(s)
 trial_association_courses_list_course_name_column=Course
-trial_association_courses_list_course_department_column=Department
+trial_association_courses_list_course_department_column=Site
 trial_association_courses_list_course_category_column=Category
 trial_association_courses_list_course_stop_column=Course stop
 
 trial_association_mass_mails_tab_label=Mass Mails
 trial_association_massmails_list_header=mass mail(s)
 trial_association_massmails_list_mass_mail_name_column=Name
-trial_association_massmails_list_mass_mail_department_column=Department
+trial_association_massmails_list_mass_mail_department_column=Site
 trial_association_massmails_list_mass_mail_type_column=Type
 trial_association_massmails_list_proband_list_status_column=Enrollment status
 trial_association_massmails_list_proband_to_column=To proband
@@ -1375,7 +1375,7 @@ trial_association_randomizationlistcodes_list_break_timestamp_column=Unblinding
 trial_association_randomizationlistcodes_list_reason_for_break_column=Unblinding Reason
 trial_association_randomizationlistcodes_list_proband_id_column=Proband ID
 trial_association_randomizationlistcodes_list_proband_name_column=Proband
-trial_association_randomizationlistcodes_list_proband_department_column=Department
+trial_association_randomizationlistcodes_list_proband_department_column=Site
 
 no_randomizationcode_values_label=No blinding data
 
@@ -1395,7 +1395,7 @@ reimbursements_proband_money_transfer_no_participation_field_set=Reimbursements
 reimbursements_proband_money_transfer_no_participation_summary_list_header=proband(s)
 reimbursements_proband_money_transfer_no_participation_summary_list_id_column=Proband ID
 reimbursements_proband_money_transfer_no_participation_summary_list_proband_name_column=Proband
-reimbursements_proband_money_transfer_no_participation_summary_list_proband_department_column=Department
+reimbursements_proband_money_transfer_no_participation_summary_list_proband_department_column=Site
 reimbursements_proband_money_transfer_no_participation_summary_list_proband_category_column=Category
 reimbursements_proband_money_transfer_no_participation_summary_list_truncated_cost_type=Asset
 reimbursements_proband_money_transfer_no_participation_summary_list_truncated_cost_type_tooltip=Choose an asset column to display.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ko.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ko.properties
index d5ff0ad649cf..5d667fa1e973 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ko.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ko.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=지정된 타임스탬프 이후
 
 trial_proband_alias_format_label=발의안 별칭 형식\:
 trial_proband_alias_format=프로밴드 별칭 형식
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=독점 참여*\:
 trial_exclusive_probands_tooltip=다른/이전 시험에 참여한 피험자는 차단 기간 이후에만 등록할 수 있습니다.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ln.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ln.properties
index e20dc061b0ab..201ddbb4573f 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ln.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ln.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lock auto-allocation ya misala ko
 
 trial_proband_alias_format_label=Format ya alias ya Proband\:
 trial_proband_alias_format=Format ya alias ya Proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Participation exclusive*\:
 trial_exclusive_probands_tooltip=Ba sujets oyo ba participer na ba épreuves misusu/ya kala bakoki ko inscrire bango sima ya période ya blocage kaka.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_nl.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_nl.properties
index 2cda8d97ca8b..aaac4d324893 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_nl.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_nl.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Vergrendel de zelftoewijzing van
 
 trial_proband_alias_format_label=Proband-aliasformaat\:
 trial_proband_alias_format=Proband-aliasformaat
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exclusieve deelname*\:
 trial_exclusive_probands_tooltip=Proefpersonen die aan andere/eerdere onderzoeken hebben deelgenomen, kunnen alleen na een blokkeringsperiode worden ingeschreven.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_pt.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_pt.properties
index ec64906fc69b..0afff4258092 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_pt.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_pt.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Bloqueie a autoalocação de tare
 
 trial_proband_alias_format_label=Formato de alias do Proband\:
 trial_proband_alias_format=Formato de alias do Proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Participação exclusiva*\:
 trial_exclusive_probands_tooltip=Os indivíduos que participam de outros ensaios/estudos anteriores podem ser inscritos somente após um período de bloqueio.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ro.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ro.properties
index 83b827e1e427..b327a81fbbcb 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ro.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ro.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Blocați auto-alocarea sarcinilor
 
 trial_proband_alias_format_label=Format de alias probant\:
 trial_proband_alias_format=Format alias proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Participare exclusivă*\:
 trial_exclusive_probands_tooltip=Subiecții care participă la alte studii/anterioare pot fi înscriși numai după o perioadă de blocare.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ru.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ru.properties
index 5064c1f7f819..88829831168d 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ru.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_ru.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Заблокировать сам
 
 trial_proband_alias_format_label=Формат псевдонима пробанда\:
 trial_proband_alias_format=Формат псевдонима пробанда
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Эксклюзивное участие*\:
 trial_exclusive_probands_tooltip=Субъекты, участвующие в других/предыдущих исследованиях, могут быть включены в исследование только после периода блокировки.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sk.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sk.properties
index edbb3c49da5f..888cc864e2a8 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sk.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sk.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Uzamknite samorozdelenie povinnos
 
 trial_proband_alias_format_label=Formát aliasu probanda\:
 trial_proband_alias_format=Formát alias proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exkluzívna účasť*\:
 trial_exclusive_probands_tooltip=Subjekty, ktoré sa zúčastňujú iných/predchádzajúcich skúšok, môžu byť zaradené až po uplynutí obdobia blokovania.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sl.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sl.properties
index 1ca38e95624b..ecfd4bfbf4dd 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sl.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sl.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Zakleni samododeljevanje dolžnos
 
 trial_proband_alias_format_label=Format vzdevka proband\:
 trial_proband_alias_format=Format vzdevka Proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Ekskluzivna udeležba*\:
 trial_exclusive_probands_tooltip=Preiskovanci, ki sodelujejo v drugih/prejšnjih preskušanjih, se lahko vključijo samo po obdobju blokiranja.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sv.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sv.properties
index 544284d6c53a..37d068f2d7bd 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sv.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sv.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Lås självtilldelning av arbetsu
 
 trial_proband_alias_format_label=Proband alias format\:
 trial_proband_alias_format=Proband alias format
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Exklusivt deltagande*\:
 trial_exclusive_probands_tooltip=Försökspersoner som deltar i andra/tidigare försök kan endast registreras efter en spärrperiod.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sw.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sw.properties
index 2d827ca56168..7eb2c1068eb6 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sw.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_sw.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Funga ugawaji binafsi wa majukumu
 
 trial_proband_alias_format_label=Muundo wa lakabu ya Proband\:
 trial_proband_alias_format=Muundo wa lakabu ya Proband
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Ushiriki wa kipekee*\:
 trial_exclusive_probands_tooltip=Mada zinazoshiriki majaribio mengine/ya awali zinaweza kusajiliwa baada ya muda wa kuzuia pekee.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_tr.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_tr.properties
index b797bcea8438..329648533312 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_tr.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_tr.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Verilen zaman damgasından sonra
 
 trial_proband_alias_format_label=Proband takma ad biçimi\:
 trial_proband_alias_format=Proband takma ad biçimi
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Özel katılım*\:
 trial_exclusive_probands_tooltip=Diğer/önceki denemelere katılan denekler yalnızca bir engelleme süresinden sonra kaydedilebilir.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_uk.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_uk.properties
index 8bd31e6004e0..5410fc182dc5 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_uk.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_uk.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Заблокувати самор
 
 trial_proband_alias_format_label=Формат псевдоніма пробанду\:
 trial_proband_alias_format=Формат псевдоніма пробанду
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Ексклюзивна участь*\:
 trial_exclusive_probands_tooltip=Суб’єкти, які беруть участь у інших/попередніх дослідженнях, можуть бути зареєстровані лише після періоду блокування.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_yo.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_yo.properties
index 37f112596d0a..f6cfb643bafa 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_yo.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_yo.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=Titiipa ipinfunni ti ara ẹni ti
 
 trial_proband_alias_format_label=Ilana inagijẹ Proband\:
 trial_proband_alias_format=Proband inagijẹ kika
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=Ikopa iyasoto*\:
 trial_exclusive_probands_tooltip=Awọn koko-ọrọ ti o kopa miiran/awọn idanwo iṣaaju le ṣe iforukọsilẹ lẹhin akoko idinamọ nikan.
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_zh.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_zh.properties
index 1de1de2b54ae..3a929d8f738e 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_zh.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/trial/labels_zh.properties
@@ -341,7 +341,7 @@ trial_duty_self_allocation_locked_from_tooltip=锁定在给定时间戳之后开
 
 trial_proband_alias_format_label=先证者别名格式：
 trial_proband_alias_format=先证者别名格式
-trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... department name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
+trial_proband_alias_format_tooltip=Blinded proband records can be created automatically when adding to the proband list. In this case,<br/>the alias will be generated according to the given format (eg. "TRIALX-{0}-{7,number,0000}")\:<ul><li>{0} ... site name</li><li>{1}, {2}, {3}, {4}, {5}, ... null (reserved)</li><li>{6} ... consecutive number (last + 1), beginning with 0</li><li>{7} ... consecutive number (last + 1), beginning with 1</li><li>{8} ... consecutive number (total + 1), beginning with 0</li><li>{9} ... consecutive number (total + 1), beginning with 1</li></ul>
 
 trial_exclusive_probands_label=独家参与*：
 trial_exclusive_probands_tooltip=参与其他/之前试验的受试者只能在阻断期后入组。
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels.properties
index 5276d6f049e9..dfa6f2b7c047 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels.properties
@@ -38,10 +38,10 @@ change_settings_title=Change UI settings
 
 #search:
 search_user_result_list_user_name_column=Username
-search_user_result_list_user_department_column=User department
+search_user_result_list_user_department_column=User site
 search_user_result_list_identity_last_name_column=Person
 search_user_result_list_identity_organisation_name_column=Organisation
-search_user_result_list_identity_department_column=Person/org. department
+search_user_result_list_identity_department_column=Person/org. site
 search_user_result_list_parent_column=Parent user
 search_user_result_list_unlocked_column=Unlocked
 search_user_result_list_decrypt_column=Decrypt PII
@@ -69,9 +69,9 @@ user_auth_method_label=Authentication method*:
 user_auth_method=Authentication method
 user_auth_method_tooltip=Select the authentication method.
 
-user_department_label=Department*:
-user_department=Department
-user_department_tooltip=It is required to assign the user to a department.<br/>This cannot be modified for existing records.
+user_department_label=Site*:
+user_department=Site
+user_department_tooltip=It is required to assign the user to a site.<br/>This cannot be modified for existing records.
 
 user_identity_label=Person/organisation:
 user_identity_tooltip=A person/organisation can be optionally selected as a user identity.\n
@@ -190,13 +190,13 @@ user_deferred_delete_reason=Reason
 user_deferred_delete_reason_tooltip=Please leave a reason for deletion.
 user_add_confirmation_dialog_message=You are editing an existing user.<br/>Do you really want to create another user?
 
-user_department_password_prompt_dialog_message=The department password is required.
+user_department_password_prompt_dialog_message=The site password is required.
 
-user_new_department_password=new department's password
-user_new_department_password_tooltip=The new department's password.
+user_new_department_password=new site's password
+user_new_department_password_tooltip=The new site's password.
 
-user_old_department_password=old department's password
-user_old_department_password_tooltip=The current department's password.
+user_old_department_password=old site's password
+user_old_department_password_tooltip=The current site's password.
 
 #password:
 password_main_field_set=Password
@@ -262,9 +262,9 @@ password_last_successful_logon_host_label=Last successful logon host:
 set_new_password_button_label=Set new password
 set_new_password_reset_otp_secret_button_label=Set new password and reset 2FA OTP
 
-password_department_password_prompt_dialog_message=The department password is required.
-password_department_password=new department's password
-password_department_password_tooltip=The new department's password.
+password_department_password_prompt_dialog_message=The site password is required.
+password_department_password=new site's password
+password_department_password_tooltip=The new site's password.
 
 update_inherit_user_permission_profiles_button_label=Inherit permissions from parent user
 
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_de.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_de.properties
index 993b1278ca61..551b7239a101 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_de.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_de.properties
@@ -38,10 +38,10 @@ change_settings_title=UI Einstellungen \u00E4ndern
 
 #search:
 search_user_result_list_user_name_column=Benutzername
-search_user_result_list_user_department_column=Benutzer Org.einheit
+search_user_result_list_user_department_column=Benutzer Site
 search_user_result_list_identity_last_name_column=Person
 search_user_result_list_identity_organisation_name_column=Organisation
-search_user_result_list_identity_department_column=Person/Org. Org.einheit
+search_user_result_list_identity_department_column=Person/Org. Site
 search_user_result_list_parent_column=\u00DCbergeordneter Benutzer
 search_user_result_list_unlocked_column=Entsperrt
 search_user_result_list_decrypt_column=PII entschl\u00FCsseln
@@ -69,9 +69,9 @@ user_auth_method_label=Authentifizierungsmethode*:
 user_auth_method=Authentifizierungsmethode
 user_auth_method_tooltip=Die Authentifizierungsmethode festlegen.
 
-user_department_label=Organisationseinheit*:
-user_department=Organisationseinheit
-user_department_tooltip=Es ist erforderlich, den Benutzer einer Organisationseinheit zuzuordnen.<br/>Diese Festlegung kann bei existierenden Eintr\u00E4gen nicht mehr ver\u00E4ndert werden.
+user_department_label=Site*:
+user_department=Site
+user_department_tooltip=Es ist erforderlich, den Benutzer einer Site zuzuordnen.<br/>Diese Festlegung kann bei existierenden Eintr\u00E4gen nicht mehr ver\u00E4ndert werden.
 
 user_identity_label=Person/Organisation\:
 user_identity_tooltip=Optional kann eine Person/Organisation als Identit\u00E4t ausgew\u00E4hlt werden.\n
@@ -189,13 +189,13 @@ user_deferred_delete_reason=Begr\u00FCndung
 user_deferred_delete_reason_tooltip=Bitte eine Begr\u00FCndung f\u00FCr die L\u00F6schung hinterlassen.
 user_add_confirmation_dialog_message=Eine vorhandenes Benutzerkonto ist ge\u00F6ffnet.<br/>Soll daraus wirklich eine neues Benutzerkonto erstellt werden?
 
-user_department_password_prompt_dialog_message=Das Passwort f\u00FCr die Org.Einheit ist erforderlich.
+user_department_password_prompt_dialog_message=Das Passwort f\u00FCr die Site ist erforderlich.
 
-user_new_department_password=neue Org.Einheit Passwort
-user_new_department_password_tooltip=Passwort der neuen Org.Einheit.
+user_new_department_password=neue Site Passwort
+user_new_department_password_tooltip=Passwort der neuen Site.
 
-user_old_department_password=alte Org.Einheit Passwort
-user_old_department_password_tooltip=Passwort der bisheerigen Org.Einheit.
+user_old_department_password=alte Site Passwort
+user_old_department_password_tooltip=Passwort der bisheerigen Site.
 
 #password:
 password_main_field_set=Passwort
@@ -261,10 +261,10 @@ password_last_successful_logon_host_label=Host der letzten erfolgreichen Anmeldu
 set_new_password_button_label=Neues Passwort setzen
 set_new_password_reset_otp_secret_button_label=Neues Passwort setzen und 2FA OTP zur\u00FCcksetzen
 
-password_department_password_prompt_dialog_message=Das Passwort f\u00FCr die Org.Einheit ist erforderlich.
+password_department_password_prompt_dialog_message=Das Passwort f\u00FCr die Site ist erforderlich.
 
-password_department_password=neue Org.Einheit Passwort
-password_department_password_tooltip=Passwort der neuen Org.Einheit.
+password_department_password=neue Site Passwort
+password_department_password_tooltip=Passwort der neuen Site.
 
 update_inherit_user_permission_profiles_button_label=Berechtigungen des \u00FCbergeordneten Benutzers \u00FCbernehmen
 
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_ff.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_ff.properties
index 128d51b8d4b9..e2d7643b2396 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_ff.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_ff.properties
@@ -38,10 +38,10 @@ change_settings_title=Change UI settings
 
 #search:
 search_user_result_list_user_name_column=Username
-search_user_result_list_user_department_column=User department
+search_user_result_list_user_department_column=User site
 search_user_result_list_identity_last_name_column=Person
 search_user_result_list_identity_organisation_name_column=Organisation
-search_user_result_list_identity_department_column=Person/org. department
+search_user_result_list_identity_department_column=Person/org. site
 search_user_result_list_parent_column=Parent user
 search_user_result_list_unlocked_column=Unlocked
 search_user_result_list_decrypt_column=Decrypt PII
@@ -69,9 +69,9 @@ user_auth_method_label=Authentication method*\:
 user_auth_method=Authentication method
 user_auth_method_tooltip=Select the authentication method.
 
-user_department_label=Department*\:
-user_department=Department
-user_department_tooltip=It is required to assign the user to a department.<br/>This cannot be modified for existing records.
+user_department_label=Site*\:
+user_department=Site
+user_department_tooltip=It is required to assign the user to a site.<br/>This cannot be modified for existing records.
 
 user_identity_label=Person/organisation\:
 user_identity_tooltip=A person/organisation can be optionally selected as a user identity.\n
@@ -190,13 +190,13 @@ user_deferred_delete_reason=Reason
 user_deferred_delete_reason_tooltip=Please leave a reason for deletion.
 user_add_confirmation_dialog_message=You are editing an existing user.<br/>Do you really want to create another user?
 
-user_department_password_prompt_dialog_message=The department password is required.
+user_department_password_prompt_dialog_message=The site password is required.
 
-user_new_department_password=new department's password
-user_new_department_password_tooltip=The new department's password.
+user_new_department_password=new site's password
+user_new_department_password_tooltip=The new site's password.
 
-user_old_department_password=old department's password
-user_old_department_password_tooltip=The current department's password.
+user_old_department_password=old site's password
+user_old_department_password_tooltip=The current site's password.
 
 #password:
 password_main_field_set=Password
@@ -262,9 +262,9 @@ password_last_successful_logon_host_label=Last successful logon host\:
 set_new_password_button_label=Set new password
 set_new_password_reset_otp_secret_button_label=Set new password and reset 2FA OTP
 
-password_department_password_prompt_dialog_message=The department password is required.
-password_department_password=new department's password
-password_department_password_tooltip=The new department's password.
+password_department_password_prompt_dialog_message=The site password is required.
+password_department_password=new site's password
+password_department_password_tooltip=The new site's password.
 
 update_inherit_user_permission_profiles_button_label=Inherit permissions from parent user
 
diff --git a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_kg.properties b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_kg.properties
index 128d51b8d4b9..e2d7643b2396 100644
--- a/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_kg.properties
+++ b/web/src/main/resources/org/phoenixctms/ctsms/web/user/labels_kg.properties
@@ -38,10 +38,10 @@ change_settings_title=Change UI settings
 
 #search:
 search_user_result_list_user_name_column=Username
-search_user_result_list_user_department_column=User department
+search_user_result_list_user_department_column=User site
 search_user_result_list_identity_last_name_column=Person
 search_user_result_list_identity_organisation_name_column=Organisation
-search_user_result_list_identity_department_column=Person/org. department
+search_user_result_list_identity_department_column=Person/org. site
 search_user_result_list_parent_column=Parent user
 search_user_result_list_unlocked_column=Unlocked
 search_user_result_list_decrypt_column=Decrypt PII
@@ -69,9 +69,9 @@ user_auth_method_label=Authentication method*\:
 user_auth_method=Authentication method
 user_auth_method_tooltip=Select the authentication method.
 
-user_department_label=Department*\:
-user_department=Department
-user_department_tooltip=It is required to assign the user to a department.<br/>This cannot be modified for existing records.
+user_department_label=Site*\:
+user_department=Site
+user_department_tooltip=It is required to assign the user to a site.<br/>This cannot be modified for existing records.
 
 user_identity_label=Person/organisation\:
 user_identity_tooltip=A person/organisation can be optionally selected as a user identity.\n
@@ -190,13 +190,13 @@ user_deferred_delete_reason=Reason
 user_deferred_delete_reason_tooltip=Please leave a reason for deletion.
 user_add_confirmation_dialog_message=You are editing an existing user.<br/>Do you really want to create another user?
 
-user_department_password_prompt_dialog_message=The department password is required.
+user_department_password_prompt_dialog_message=The site password is required.
 
-user_new_department_password=new department's password
-user_new_department_password_tooltip=The new department's password.
+user_new_department_password=new site's password
+user_new_department_password_tooltip=The new site's password.
 
-user_old_department_password=old department's password
-user_old_department_password_tooltip=The current department's password.
+user_old_department_password=old site's password
+user_old_department_password_tooltip=The current site's password.
 
 #password:
 password_main_field_set=Password
@@ -262,9 +262,9 @@ password_last_successful_logon_host_label=Last successful logon host\:
 set_new_password_button_label=Set new password
 set_new_password_reset_otp_secret_button_label=Set new password and reset 2FA OTP
 
-password_department_password_prompt_dialog_message=The department password is required.
-password_department_password=new department's password
-password_department_password_tooltip=The new department's password.
+password_department_password_prompt_dialog_message=The site password is required.
+password_department_password=new site's password
+password_department_password_tooltip=The new site's password.
 
 update_inherit_user_permission_profiles_button_label=Inherit permissions from parent user