diff --git a/server/src/main/java/envoy/server/Startup.java b/server/src/main/java/envoy/server/Startup.java
index 5128d15..489a060 100755
--- a/server/src/main/java/envoy/server/Startup.java
+++ b/server/src/main/java/envoy/server/Startup.java
@@ -68,7 +68,7 @@ public class Startup {
 						new GroupMessageStatusChangeProcessor(),
 						new UserStatusChangeProcessor(),
 						new IDGeneratorRequestProcessor(),
-						new ContactSearchProcessor(),
+						new UserSearchProcessor(),
 						new ContactOperationProcessor())));
 
 		// Initialize the current message ID
diff --git a/server/src/main/java/envoy/server/processors/ContactSearchProcessor.java b/server/src/main/java/envoy/server/processors/UserSearchProcessor.java
similarity index 90%
rename from server/src/main/java/envoy/server/processors/ContactSearchProcessor.java
rename to server/src/main/java/envoy/server/processors/UserSearchProcessor.java
index a00d72b..73d9558 100755
--- a/server/src/main/java/envoy/server/processors/ContactSearchProcessor.java
+++ b/server/src/main/java/envoy/server/processors/UserSearchProcessor.java
@@ -13,14 +13,14 @@ import envoy.server.net.ObjectWriteProxy;
 
 /**
  * Project: <strong>envoy-server-standalone</strong><br>
- * File: <strong>ContactSearchProcessor.java</strong><br>
+ * File: <strong>UserSearchProcessor.java</strong><br>
  * Created: <strong>08.02.2020</strong><br>
  *
  * @author Kai S. K. Engelbart
  * @author Maximilian K&auml;fer
  * @since Envoy Server Standalone v0.1-alpha
  */
-public class ContactSearchProcessor implements ObjectProcessor<UserSearchRequest> {
+public class UserSearchProcessor implements ObjectProcessor<UserSearchRequest> {
 
 	/**
 	 * Writes a list of contacts to the client containing all {@link Contact}s