diff --git a/DevTools/IPCCompiler/main.cpp b/DevTools/IPCCompiler/main.cpp
index af09ff831b..1a622d4c40 100644
--- a/DevTools/IPCCompiler/main.cpp
+++ b/DevTools/IPCCompiler/main.cpp
@@ -265,10 +265,10 @@ int main(int argc, char** argv)
             dbg() << "    virtual ~" << name << "() override {}";
             dbg() << "    virtual i32 endpoint_magic() const override { return " << endpoint.magic << "; }";
             dbg() << "    static i32 static_endpoint_magic() { return " << endpoint.magic << "; }";
-            dbg() << "    virtual i32 id() const override { return (int)MessageID::" << name << "; }";
+            dbg() << "    virtual i32 message_id() const override { return (int)MessageID::" << name << "; }";
             dbg() << "    static i32 static_message_id() { return (int)MessageID::" << name << "; }";
-            dbg() << "    virtual String name() const override { return \"" << endpoint.name << "::" << name << "\"; }";
-            dbg() << "    static String static_name() { return \"" << endpoint.name << "::" << name << "\"; }";
+            dbg() << "    virtual String message_name() const override { return \"" << endpoint.name << "::" << name << "\"; }";
+            dbg() << "    static String static_message_name() { return \"" << endpoint.name << "::" << name << "\"; }";
             dbg() << "    static OwnPtr<" << name << "> decode(BufferStream& stream, size_t& size_in_bytes)";
             dbg() << "    {";
 
@@ -463,7 +463,7 @@ int main(int argc, char** argv)
         dbg();
         dbg() << "    virtual OwnPtr<IMessage> handle(const IMessage& message) override";
         dbg() << "    {";
-        dbg() << "        switch (message.id()) {";
+        dbg() << "        switch (message.message_id()) {";
         for (auto& message : endpoint.messages) {
             auto do_decode_message = [&](const String& name, bool returns_something) {
                 dbg() << "        case (int)" << endpoint.name << "::MessageID::" << name << ":";
diff --git a/Libraries/LibIPC/IMessage.h b/Libraries/LibIPC/IMessage.h
index 813b4f528e..a6e37bdd90 100644
--- a/Libraries/LibIPC/IMessage.h
+++ b/Libraries/LibIPC/IMessage.h
@@ -8,8 +8,8 @@ public:
     virtual ~IMessage();
 
     virtual int endpoint_magic() const = 0;
-    virtual int id() const = 0;
-    virtual String name() const = 0;
+    virtual int message_id() const = 0;
+    virtual String message_name() const = 0;
     virtual ByteBuffer encode() const = 0;
 
 protected:
diff --git a/Libraries/LibIPC/IServerConnection.h b/Libraries/LibIPC/IServerConnection.h
index 71e31894a9..70133ee9e9 100644
--- a/Libraries/LibIPC/IServerConnection.h
+++ b/Libraries/LibIPC/IServerConnection.h
@@ -55,7 +55,7 @@ public:
         // Double check we don't already have the event waiting for us.
         // Otherwise we might end up blocked for a while for no reason.
         for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
-            if (m_unprocessed_messages[i]->id() == MessageType::static_message_id()) {
+            if (m_unprocessed_messages[i]->message_id() == MessageType::static_message_id()) {
                 auto message = move(m_unprocessed_messages[i]);
                 m_unprocessed_messages.remove(i);
                 return message;
@@ -74,7 +74,7 @@ public:
             if (!drain_messages_from_server())
                 return nullptr;
             for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
-                if (m_unprocessed_messages[i]->id() == MessageType::static_message_id()) {
+                if (m_unprocessed_messages[i]->message_id() == MessageType::static_message_id()) {
                     auto message = move(m_unprocessed_messages[i]);
                     m_unprocessed_messages.remove(i);
                     return message;