diff --git a/src/client.rs b/src/client.rs
index 8f53f33..efbcb18 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1,7 +1,7 @@
 use crate::{
     peer::{DefaultPeer, Peer},
     server::{PeerAddress, Server},
-    types::FileSearch,
+    types::FileSearchResult,
     utils::{md5, thread_pool::ThreadPool},
 };
 use std::{
@@ -20,12 +20,12 @@ use std::{
 const MAX_THREADS: usize = 100;
 pub enum ClientOperation {
     ConnectToPeer(Peer),
-    SearchResult(FileSearch),
+    SearchResult(FileSearchResult),
 }
 struct ClientContext {
     peers: HashMap<String, DefaultPeer>,
     sender: Option<Sender<ClientOperation>>,
-    search_results: Vec<FileSearch>,
+    search_results: Vec<FileSearchResult>,
     thread_pool: ThreadPool,
 }
 impl ClientContext {
@@ -103,7 +103,7 @@ impl Client {
         }
     }
 
-    pub fn search(&self, query: &str, timeout: Duration) -> Vec<FileSearch> {
+    pub fn search(&self, query: &str, timeout: Duration) -> Vec<FileSearchResult> {
         println!("Searching for {}", query);
         if let Some(server) = &self.server {
             let hash = md5::md5(query);
diff --git a/src/message/peer/file_search_response.rs b/src/message/peer/file_search_response.rs
index 05fb0fc..577249d 100644
--- a/src/message/peer/file_search_response.rs
+++ b/src/message/peer/file_search_response.rs
@@ -1,15 +1,14 @@
 use crate::message::{Message, MessageHandler};
 use crate::peer::PeerOperation;
-use crate::types::{File, FileSearch};
+use crate::types::{File, FileSearchResult};
 use crate::utils::zlib::deflate;
 use std::collections::HashMap;
 use std::sync::mpsc::Sender;
 
-
 fn decompress_buffer(buffer: &[u8]) -> Result<Vec<u8>, String> {
     deflate(buffer)
 }
-impl FileSearch {
+impl FileSearchResult {
     pub fn new_from_message(message: &mut Message) -> Self {
         let pointer = message.get_pointer();
         let size = message.get_size();
@@ -57,7 +56,7 @@ impl MessageHandler<PeerOperation> for FileSearchResponse {
         9
     }
     fn handle(&self, message: &mut Message, sender: Sender<PeerOperation>) {
-        let file_search = FileSearch::new_from_message(message);
+        let file_search = FileSearchResult::new_from_message(message);
 
         sender
             .send(PeerOperation::FileSearchResult(file_search))
@@ -85,7 +84,7 @@ fn test_new_from_message() {
     let mut message = Message::new_with_data(data);
     message.set_pointer(8);
 
-    let file_search = FileSearch::new_from_message(&mut message);
+    let file_search = FileSearchResult::new_from_message(&mut message);
     assert_eq!(file_search.token, "6d2b9434");
     assert_eq!(file_search.files.len(), 2);
     let file = &file_search.files[0];
diff --git a/src/peer/default_peer.rs b/src/peer/default_peer.rs
index 2b2e9b0..79599c8 100644
--- a/src/peer/default_peer.rs
+++ b/src/peer/default_peer.rs
@@ -2,7 +2,7 @@ use crate::dispatcher::MessageDispatcher;
 use crate::message::peer::FileSearchResponse;
 use crate::message::server::MessageFactory;
 use crate::message::{Handlers, Message, MessageReader};
-use crate::types::FileSearch;
+use crate::types::FileSearchResult;
 
 use std::sync::mpsc;
 use std::sync::mpsc::{Receiver, Sender};
@@ -28,7 +28,7 @@ pub struct DefaultPeer {
 #[allow(dead_code)]
 pub enum PeerOperation {
     SendMessage(Message),
-    FileSearchResult(FileSearch),
+    FileSearchResult(FileSearchResult),
 }
 impl DefaultPeer {
     pub fn new(peer: Peer, client_channel: Sender<ClientOperation>) -> Self {
diff --git a/src/types.rs b/src/types.rs
index 590ae74..888d7f8 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -11,7 +11,7 @@ pub struct File {
 
 #[derive(Debug, Clone)]
 #[allow(dead_code)]
-pub struct FileSearch {
+pub struct FileSearchResult {
     pub token: String,
     pub files: Vec<File>,
     pub slots: i8,