diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
index e1c40c0deec749530d838f3cccde140495cdd6fb..0bd0eaf80c02fb4f55021845dfefd0498c0d6359 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
@@ -4,6 +4,6 @@ import java.time.Instant
 
 data class DefaultContactDiaryElement(
     override val createdAt: Instant,
-    override val defaultPeople: List<DefaultPerson>,
-    override val defaultLocations: List<DefaultLocation>
+    override val people: List<Person>,
+    override val locations: List<Location>
 ) : ContactDiaryElement
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
index 111b0338b2d18d55201b851ed7b56a7e9368b2de..df56603f9474a59633e449a1a659a7caa0a6d0e3 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
@@ -1,5 +1,3 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-data class DefaultLocation(
-    var locationName: String
-)
+data class DefaultLocation(override var location: Location) : Location
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
index cb4f112716db73e9fad37d696f4724302089e48c..01642d99272011d023f2636fd630c33cc99e1233 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
@@ -1,5 +1,3 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-data class DefaultPerson(
-    var completeName: String
-)
+data class DefaultPerson(override var person: Person) : Person