diff --git a/src/main/java/envoy/event/contact/ContactOperationEvent.java b/src/main/java/envoy/event/contact/ContactOperationEvent.java
index 59a08cf..6758858 100644
--- a/src/main/java/envoy/event/contact/ContactOperationEvent.java
+++ b/src/main/java/envoy/event/contact/ContactOperationEvent.java
@@ -1,6 +1,6 @@
 package envoy.event.contact;
 
-import envoy.data.User;
+import envoy.data.Contact;
 import envoy.event.ElementOperation;
 import envoy.event.Event;
 
@@ -14,7 +14,7 @@ import envoy.event.Event;
  * @author Maximilian Käfer
  * @since Envoy Common v0.2-alpha
  */
-public class ContactOperationEvent extends Event<User> {
+public class ContactOperationEvent extends Event<Contact> {
 
 	private final ElementOperation operationType;
 
@@ -27,7 +27,7 @@ public class ContactOperationEvent extends Event<User> {
 	 * @param operationType the type of operation to perform
 	 * @since Envoy Common v0.2-alpha
 	 */
-	public ContactOperationEvent(User contact, ElementOperation operationType) {
+	public ContactOperationEvent(Contact contact, ElementOperation operationType) {
 		super(contact);
 		this.operationType = operationType;
 	}
diff --git a/src/main/java/envoy/event/contact/ContactSearchResult.java b/src/main/java/envoy/event/contact/ContactSearchResult.java
index 635d5fd..aed8b12 100644
--- a/src/main/java/envoy/event/contact/ContactSearchResult.java
+++ b/src/main/java/envoy/event/contact/ContactSearchResult.java
@@ -2,11 +2,11 @@ package envoy.event.contact;
 
 import java.util.List;
 
-import envoy.data.User;
+import envoy.data.Contact;
 import envoy.event.Event;
 
 /**
- * Contains a list of {@link User}s for which a search was performed.<br>
+ * Contains a list of {@link Contact}s for which a search was performed.<br>
  * <br>
  * Project: <strong>envoy-common</strong><br>
  * File: <strong>ContactSearchResult.java</strong><br>
@@ -15,7 +15,7 @@ import envoy.event.Event;
  * @author Kai S. K. Engelbart
  * @since Envoy Common v0.2-alpha
  */
-public class ContactSearchResult extends Event<List<User>> {
+public class ContactSearchResult extends Event<List<Contact>> {
 
 	private static final long serialVersionUID = 0L;
 
@@ -25,5 +25,5 @@ public class ContactSearchResult extends Event<List<User>> {
 	 * @param users the users found during the search
 	 * @since Envoy Common v0.2-alpha
 	 */
-	public ContactSearchResult(List<User> users) { super(users); }
+	public ContactSearchResult(List<Contact> users) { super(users); }
 }