diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs
index f89e049f..d11d8b74 100644
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
@@ -7,7 +7,7 @@ use std::{
 use ::{
     project::Project,
     web::Server,
-    serve_session::ServeSession,
+    session::Session,
     roblox_studio,
 };
 
@@ -25,7 +25,7 @@ pub fn serve(fuzzy_project_location: &Path) {
 
     roblox_studio::install_bundled_plugin().unwrap();
 
-    let session = Arc::new(ServeSession::new(project));
+    let session = Arc::new(Session::new(project));
     let server = Server::new(Arc::from(session));
 
     println!("Server listening on port 8000.");
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 8026c919..eba116c5 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -17,6 +17,6 @@ pub mod pathext;
 pub mod project;
 pub mod rbx;
 pub mod roblox_studio;
-pub mod serve_session;
+pub mod session;
 pub mod web;
 pub mod web_util;
\ No newline at end of file
diff --git a/server/src/serve_session.rs b/server/src/session.rs
similarity index 82%
rename from server/src/serve_session.rs
rename to server/src/session.rs
index dfd90216..d48ff08a 100644
--- a/server/src/serve_session.rs
+++ b/server/src/session.rs
@@ -8,15 +8,15 @@ use ::{
     project::Project,
 };
 
-pub struct ServeSession {
+pub struct Session {
     project: Project,
     message_queue: Arc<MessageQueue>,
     tree: Arc<RbxTree>,
 }
 
-impl ServeSession {
-    pub fn new(project: Project) -> ServeSession {
-        ServeSession {
+impl Session {
+    pub fn new(project: Project) -> Session {
+        Session {
             project,
             message_queue: Arc::new(MessageQueue::new()),
             tree: Arc::new(RbxTree::new()),
diff --git a/server/src/web.rs b/server/src/web.rs
index d53c53f3..d52c5d45 100644
--- a/server/src/web.rs
+++ b/server/src/web.rs
@@ -10,7 +10,7 @@ use ::{
     message_queue::Message,
     project::Project,
     rbx::RbxInstance,
-    serve_session::ServeSession,
+    session::Session,
 };
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -39,13 +39,13 @@ pub struct SubscribeResponse<'a> {
 }
 
 pub struct Server {
-    session: Arc<ServeSession>,
+    session: Arc<Session>,
     server_version: &'static str,
     server_id: String,
 }
 
 impl Server {
-    pub fn new(session: Arc<ServeSession>) -> Server {
+    pub fn new(session: Arc<Session>) -> Server {
         let server_id = rand::random::<u64>().to_string();
 
         Server {