diff --git a/DevTools/IPCCompiler/main.cpp b/DevTools/IPCCompiler/main.cpp
index 02d7699ad2..00b12ba048 100644
--- a/DevTools/IPCCompiler/main.cpp
+++ b/DevTools/IPCCompiler/main.cpp
@@ -227,9 +227,9 @@ int main(int argc, char** argv)
     dbg() << "#include <AK/OwnPtr.h>";
     dbg() << "#include <LibGfx/Color.h>";
     dbg() << "#include <LibGfx/Rect.h>";
-    dbg() << "#include <LibIPC/IEncoder.h>";
-    dbg() << "#include <LibIPC/IEndpoint.h>";
-    dbg() << "#include <LibIPC/IMessage.h>";
+    dbg() << "#include <LibIPC/Encoder.h>";
+    dbg() << "#include <LibIPC/Endpoint.h>";
+    dbg() << "#include <LibIPC/Message.h>";
     dbg();
 
     for (auto& endpoint : endpoints) {
diff --git a/Libraries/LibAudio/AClientConnection.h b/Libraries/LibAudio/AClientConnection.h
index a3feb61774..d60a6a020e 100644
--- a/Libraries/LibAudio/AClientConnection.h
+++ b/Libraries/LibAudio/AClientConnection.h
@@ -28,7 +28,7 @@
 
 #include <AudioServer/AudioClientEndpoint.h>
 #include <AudioServer/AudioServerEndpoint.h>
-#include <LibIPC/IServerConnection.h>
+#include <LibIPC/ServerConnection.h>
 
 namespace Audio {
 
diff --git a/Libraries/LibGUI/GWindowServerConnection.h b/Libraries/LibGUI/GWindowServerConnection.h
index 7ae007626d..d33c953877 100644
--- a/Libraries/LibGUI/GWindowServerConnection.h
+++ b/Libraries/LibGUI/GWindowServerConnection.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibIPC/IServerConnection.h>
+#include <LibIPC/ServerConnection.h>
 #include <WindowServer/WindowClientEndpoint.h>
 #include <WindowServer/WindowServerEndpoint.h>
 
diff --git a/Libraries/LibIPC/IClientConnection.h b/Libraries/LibIPC/ClientConnection.h
similarity index 99%
rename from Libraries/LibIPC/IClientConnection.h
rename to Libraries/LibIPC/ClientConnection.h
index 85e1722b91..3573d85200 100644
--- a/Libraries/LibIPC/IClientConnection.h
+++ b/Libraries/LibIPC/ClientConnection.h
@@ -32,8 +32,8 @@
 #include <LibCore/CLocalSocket.h>
 #include <LibCore/CNotifier.h>
 #include <LibCore/CObject.h>
-#include <LibIPC/IEndpoint.h>
-#include <LibIPC/IMessage.h>
+#include <LibIPC/Endpoint.h>
+#include <LibIPC/Message.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/socket.h>
diff --git a/Libraries/LibIPC/IEncoder.h b/Libraries/LibIPC/Encoder.h
similarity index 99%
rename from Libraries/LibIPC/IEncoder.h
rename to Libraries/LibIPC/Encoder.h
index 2057931294..d4d1b2f4b6 100644
--- a/Libraries/LibIPC/IEncoder.h
+++ b/Libraries/LibIPC/Encoder.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibIPC/IMessage.h>
+#include <LibIPC/Message.h>
 
 namespace IPC {
 
diff --git a/Libraries/LibIPC/IEndpoint.cpp b/Libraries/LibIPC/Endpoint.cpp
similarity index 98%
rename from Libraries/LibIPC/IEndpoint.cpp
rename to Libraries/LibIPC/Endpoint.cpp
index f42721f3f4..8468419fe9 100644
--- a/Libraries/LibIPC/IEndpoint.cpp
+++ b/Libraries/LibIPC/Endpoint.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibIPC/IEndpoint.h>
+#include <LibIPC/Endpoint.h>
 
 namespace IPC {
 
diff --git a/Libraries/LibIPC/IEndpoint.h b/Libraries/LibIPC/Endpoint.h
similarity index 100%
rename from Libraries/LibIPC/IEndpoint.h
rename to Libraries/LibIPC/Endpoint.h
diff --git a/Libraries/LibIPC/Makefile b/Libraries/LibIPC/Makefile
index 2f1de2f795..1354dcca1c 100644
--- a/Libraries/LibIPC/Makefile
+++ b/Libraries/LibIPC/Makefile
@@ -1,6 +1,6 @@
 OBJS = \
-    IEndpoint.o \
-    IMessage.o
+    Endpoint.o \
+    Message.o
 
 LIBRARY = libipc.a
 
diff --git a/Libraries/LibIPC/IMessage.cpp b/Libraries/LibIPC/Message.cpp
similarity index 98%
rename from Libraries/LibIPC/IMessage.cpp
rename to Libraries/LibIPC/Message.cpp
index d535515829..10919b70de 100644
--- a/Libraries/LibIPC/IMessage.cpp
+++ b/Libraries/LibIPC/Message.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibIPC/IMessage.h>
+#include <LibIPC/Message.h>
 
 namespace IPC {
 
diff --git a/Libraries/LibIPC/IMessage.h b/Libraries/LibIPC/Message.h
similarity index 100%
rename from Libraries/LibIPC/IMessage.h
rename to Libraries/LibIPC/Message.h
diff --git a/Libraries/LibIPC/IServerConnection.h b/Libraries/LibIPC/ServerConnection.h
similarity index 99%
rename from Libraries/LibIPC/IServerConnection.h
rename to Libraries/LibIPC/ServerConnection.h
index dfa9a3cea8..a3e0b1c1f1 100644
--- a/Libraries/LibIPC/IServerConnection.h
+++ b/Libraries/LibIPC/ServerConnection.h
@@ -32,7 +32,7 @@
 #include <LibCore/CLocalSocket.h>
 #include <LibCore/CNotifier.h>
 #include <LibCore/CSyscallUtils.h>
-#include <LibIPC/IMessage.h>
+#include <LibIPC/Message.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/select.h>
diff --git a/Libraries/LibProtocol/Client.h b/Libraries/LibProtocol/Client.h
index f92e9d0cd1..753c5986a5 100644
--- a/Libraries/LibProtocol/Client.h
+++ b/Libraries/LibProtocol/Client.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibIPC/IServerConnection.h>
+#include <LibIPC/ServerConnection.h>
 #include <ProtocolServer/ProtocolClientEndpoint.h>
 #include <ProtocolServer/ProtocolServerEndpoint.h>
 
diff --git a/Servers/AudioServer/ASClientConnection.h b/Servers/AudioServer/ASClientConnection.h
index 608e360853..105e1eb01a 100644
--- a/Servers/AudioServer/ASClientConnection.h
+++ b/Servers/AudioServer/ASClientConnection.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AudioServer/AudioServerEndpoint.h>
-#include <LibIPC/IClientConnection.h>
+#include <LibIPC/ClientConnection.h>
 
 namespace Audio {
 class Buffer;
diff --git a/Servers/ProtocolServer/PSClientConnection.h b/Servers/ProtocolServer/PSClientConnection.h
index aa4c8a909c..2623a188e6 100644
--- a/Servers/ProtocolServer/PSClientConnection.h
+++ b/Servers/ProtocolServer/PSClientConnection.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <LibIPC/IClientConnection.h>
+#include <LibIPC/ClientConnection.h>
 #include <ProtocolServer/ProtocolServerEndpoint.h>
 
 namespace AK {
diff --git a/Servers/ProtocolServer/main.cpp b/Servers/ProtocolServer/main.cpp
index e1001a3462..6f5dc73495 100644
--- a/Servers/ProtocolServer/main.cpp
+++ b/Servers/ProtocolServer/main.cpp
@@ -26,7 +26,7 @@
 
 #include <LibCore/CEventLoop.h>
 #include <LibCore/CLocalServer.h>
-#include <LibIPC/IClientConnection.h>
+#include <LibIPC/ClientConnection.h>
 #include <ProtocolServer/HttpProtocol.h>
 #include <ProtocolServer/PSClientConnection.h>
 
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 7d8a809228..23f0235456 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/Servers/WindowServer/WSClientConnection.h
@@ -32,7 +32,7 @@
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
 #include <LibGfx/Bitmap.h>
-#include <LibIPC/IClientConnection.h>
+#include <LibIPC/ClientConnection.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WindowServerEndpoint.h>