diff --git a/Userland/Services/SpiceAgent/CMakeLists.txt b/Userland/Services/SpiceAgent/CMakeLists.txt
index d7eac78e65..7131356e84 100644
--- a/Userland/Services/SpiceAgent/CMakeLists.txt
+++ b/Userland/Services/SpiceAgent/CMakeLists.txt
@@ -6,7 +6,7 @@ serenity_component(
 set(SOURCES
     main.cpp
     SpiceAgent.cpp
-    ClipboardServerConnection.cpp
+    ConnectionToClipboardServer.cpp
 )
 
 serenity_bin(SpiceAgent)
diff --git a/Userland/Services/SpiceAgent/ClipboardServerConnection.cpp b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp
similarity index 94%
rename from Userland/Services/SpiceAgent/ClipboardServerConnection.cpp
rename to Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp
index 93dfc83ed9..a0f4d73581 100644
--- a/Userland/Services/SpiceAgent/ClipboardServerConnection.cpp
+++ b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.cpp
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "ClipboardServerConnection.h"
+#include "ConnectionToClipboardServer.h"
 #include <AK/ByteBuffer.h>
 #include <AK/Function.h>
 #include <LibGfx/Bitmap.h>
 
 // Copied from LibGUI/Clipboard.cpp
-RefPtr<Gfx::Bitmap> ClipboardServerConnection::get_bitmap()
+RefPtr<Gfx::Bitmap> ConnectionToClipboardServer::get_bitmap()
 {
     auto clipping = get_clipboard_data();
 
@@ -58,7 +58,7 @@ RefPtr<Gfx::Bitmap> ClipboardServerConnection::get_bitmap()
 }
 
 // Copied from LibGUI/Clipboard.cpp
-void ClipboardServerConnection::set_bitmap(Gfx::Bitmap const& bitmap)
+void ConnectionToClipboardServer::set_bitmap(Gfx::Bitmap const& bitmap)
 {
     HashMap<String, String> metadata;
     metadata.set("width", String::number(bitmap.width()));
diff --git a/Userland/Services/SpiceAgent/ClipboardServerConnection.h b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.h
similarity index 79%
rename from Userland/Services/SpiceAgent/ClipboardServerConnection.h
rename to Userland/Services/SpiceAgent/ConnectionToClipboardServer.h
index c580bb429c..fc2e0c8ab9 100644
--- a/Userland/Services/SpiceAgent/ClipboardServerConnection.h
+++ b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.h
@@ -12,10 +12,10 @@
 
 #pragma once
 
-class ClipboardServerConnection final
+class ConnectionToClipboardServer final
     : public IPC::ConnectionToServer<ClipboardClientEndpoint, ClipboardServerEndpoint>
     , public ClipboardClientEndpoint {
-    IPC_CLIENT_CONNECTION(ClipboardServerConnection, "/tmp/portal/clipboard")
+    IPC_CLIENT_CONNECTION(ConnectionToClipboardServer, "/tmp/portal/clipboard")
 
 public:
     Function<void()> on_data_changed;
@@ -23,7 +23,7 @@ public:
     void set_bitmap(Gfx::Bitmap const& bitmap);
 
 private:
-    ClipboardServerConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
+    ConnectionToClipboardServer(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
         : IPC::ConnectionToServer<ClipboardClientEndpoint, ClipboardServerEndpoint>(*this, move(socket))
     {
     }
diff --git a/Userland/Services/SpiceAgent/SpiceAgent.cpp b/Userland/Services/SpiceAgent/SpiceAgent.cpp
index 428d74b039..38919ed138 100644
--- a/Userland/Services/SpiceAgent/SpiceAgent.cpp
+++ b/Userland/Services/SpiceAgent/SpiceAgent.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "SpiceAgent.h"
-#include "ClipboardServerConnection.h"
+#include "ConnectionToClipboardServer.h"
 #include <AK/String.h>
 #include <LibC/memory.h>
 #include <LibC/unistd.h>
@@ -16,7 +16,7 @@
 #include <LibGfx/PNGLoader.h>
 #include <LibGfx/PNGWriter.h>
 
-SpiceAgent::SpiceAgent(int fd, ClipboardServerConnection& connection)
+SpiceAgent::SpiceAgent(int fd, ConnectionToClipboardServer& connection)
     : m_fd(fd)
     , m_clipboard_connection(connection)
 {
diff --git a/Userland/Services/SpiceAgent/SpiceAgent.h b/Userland/Services/SpiceAgent/SpiceAgent.h
index 8fe64cb31f..44c5474395 100644
--- a/Userland/Services/SpiceAgent/SpiceAgent.h
+++ b/Userland/Services/SpiceAgent/SpiceAgent.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "ClipboardServerConnection.h"
+#include "ConnectionToClipboardServer.h"
 #include <AK/ByteBuffer.h>
 #include <AK/Vector.h>
 #include <LibCore/Notifier.h>
@@ -13,7 +13,7 @@
 
 class SpiceAgent {
 public:
-    SpiceAgent(int fd, ClipboardServerConnection&);
+    SpiceAgent(int fd, ConnectionToClipboardServer&);
 
     static constexpr u32 AGENT_PROTOCOL = 1;
     enum class Port {
@@ -117,7 +117,7 @@ public:
 private:
     int m_fd { -1 };
     RefPtr<Core::Notifier> m_notifier;
-    ClipboardServerConnection& m_clipboard_connection;
+    ConnectionToClipboardServer& m_clipboard_connection;
 
     void on_message_received();
     void send_message(const ByteBuffer& buffer);
diff --git a/Userland/Services/SpiceAgent/main.cpp b/Userland/Services/SpiceAgent/main.cpp
index c77803ece4..8299db6014 100644
--- a/Userland/Services/SpiceAgent/main.cpp
+++ b/Userland/Services/SpiceAgent/main.cpp
@@ -23,7 +23,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
 
     int serial_port_fd = TRY(Core::System::open(SPICE_DEVICE, O_RDWR));
 
-    auto conn = TRY(ClipboardServerConnection::try_create());
+    auto conn = TRY(ConnectionToClipboardServer::try_create());
     auto agent = SpiceAgent(serial_port_fd, conn);
 
     return loop.exec();