diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp
index 751c110598..e8306763d5 100644
--- a/Applications/IRCClient/IRCAppWindow.cpp
+++ b/Applications/IRCClient/IRCAppWindow.cpp
@@ -1,6 +1,6 @@
 #include "IRCAppWindow.h"
-#include "IRCClientWindow.h"
-#include "IRCClientWindowListModel.h"
+#include "IRCWindow.h"
+#include "IRCWindowListModel.h"
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GStackWidget.h>
 #include <LibGUI/GTableView.h>
@@ -34,15 +34,15 @@ void IRCAppWindow::setup_client()
     };
 
     m_client.on_channel_message = [this] (const String& channel_name) {
-        ensure_window(IRCClientWindow::Channel, channel_name);
+        ensure_window(IRCWindow::Channel, channel_name);
     };
 
     m_client.on_join = [this] (const String& channel_name) {
-        ensure_window(IRCClientWindow::Channel, channel_name);
+        ensure_window(IRCWindow::Channel, channel_name);
     };
 
     m_client.on_query_message = [this] (const String& name) {
-        ensure_window(IRCClientWindow::Query, name);
+        ensure_window(IRCWindow::Query, name);
     };
 
     m_client.connect();
@@ -120,24 +120,24 @@ void IRCAppWindow::setup_widgets()
     auto* window_list = new GTableView(horizontal_container);
     window_list->set_headers_visible(false);
     window_list->set_alternating_row_colors(false);
-    window_list->set_model(OwnPtr<IRCClientWindowListModel>(m_client.client_window_list_model()));
+    window_list->set_model(OwnPtr<IRCWindowListModel>(m_client.client_window_list_model()));
     window_list->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
     window_list->set_preferred_size({ 120, 0 });
-    m_client.client_window_list_model()->on_activation = [this] (IRCClientWindow& window) {
+    m_client.client_window_list_model()->on_activation = [this] (IRCWindow& window) {
         m_container->set_active_widget(&window);
     };
 
     m_container = new GStackWidget(horizontal_container);
 
-    create_subwindow(IRCClientWindow::Server, "Server");
+    create_subwindow(IRCWindow::Server, "Server");
 }
 
-IRCClientWindow& IRCAppWindow::create_subwindow(IRCClientWindow::Type type, const String& name)
+IRCWindow& IRCAppWindow::create_subwindow(IRCWindow::Type type, const String& name)
 {
-    return *new IRCClientWindow(m_client, type, name, m_container);
+    return *new IRCWindow(m_client, type, name, m_container);
 }
 
-IRCClientWindow& IRCAppWindow::ensure_window(IRCClientWindow::Type type, const String& name)
+IRCWindow& IRCAppWindow::ensure_window(IRCWindow::Type type, const String& name)
 {
     for (int i = 0; i < m_client.window_count(); ++i) {
         auto& window = m_client.window_at(i);
diff --git a/Applications/IRCClient/IRCAppWindow.h b/Applications/IRCClient/IRCAppWindow.h
index 2a7068c5d1..e882203203 100644
--- a/Applications/IRCClient/IRCAppWindow.h
+++ b/Applications/IRCClient/IRCAppWindow.h
@@ -3,7 +3,7 @@
 #include <LibGUI/GWindow.h>
 #include <LibGUI/GWidget.h>
 #include "IRCClient.h"
-#include "IRCClientWindow.h"
+#include "IRCWindow.h"
 
 class GAction;
 class GStackWidget;
@@ -19,8 +19,8 @@ private:
     void setup_menus();
     void setup_widgets();
 
-    IRCClientWindow& create_subwindow(IRCClientWindow::Type, const String& name);
-    IRCClientWindow& ensure_window(IRCClientWindow::Type, const String& name);
+    IRCWindow& create_subwindow(IRCWindow::Type, const String& name);
+    IRCWindow& ensure_window(IRCWindow::Type, const String& name);
 
     IRCClient m_client;
 
diff --git a/Applications/IRCClient/IRCClient.cpp b/Applications/IRCClient/IRCClient.cpp
index fd4ea8fe22..03d152efaf 100644
--- a/Applications/IRCClient/IRCClient.cpp
+++ b/Applications/IRCClient/IRCClient.cpp
@@ -2,8 +2,8 @@
 #include "IRCChannel.h"
 #include "IRCQuery.h"
 #include "IRCLogBuffer.h"
-#include "IRCClientWindow.h"
-#include "IRCClientWindowListModel.h"
+#include "IRCWindow.h"
+#include "IRCWindowListModel.h"
 #include <LibGUI/GNotifier.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -24,7 +24,7 @@ IRCClient::IRCClient(const String& address, int port)
     , m_nickname("anon")
     , m_log(IRCLogBuffer::create())
 {
-    m_client_window_list_model = new IRCClientWindowListModel(*this);
+    m_client_window_list_model = new IRCWindowListModel(*this);
 }
 
 IRCClient::~IRCClient()
@@ -384,26 +384,26 @@ void IRCClient::handle_namreply(const Message& msg)
     channel.dump();
 }
 
-void IRCClient::register_subwindow(IRCClientWindow& subwindow)
+void IRCClient::register_subwindow(IRCWindow& subwindow)
 {
-    if (subwindow.type() == IRCClientWindow::Server) {
+    if (subwindow.type() == IRCWindow::Server) {
         m_server_subwindow = &subwindow;
         subwindow.set_log_buffer(*m_log);
-    } else if (subwindow.type() == IRCClientWindow::Channel) {
+    } else if (subwindow.type() == IRCWindow::Channel) {
         auto it = m_channels.find(subwindow.name());
         ASSERT(it != m_channels.end());
         auto& channel = *(*it).value;
         subwindow.set_log_buffer(channel.log());
-    } else if (subwindow.type() == IRCClientWindow::Query) {
+    } else if (subwindow.type() == IRCWindow::Query) {
         subwindow.set_log_buffer(ensure_query(subwindow.name()).log());
     }
     m_windows.append(&subwindow);
     m_client_window_list_model->update();
 }
 
-void IRCClient::unregister_subwindow(IRCClientWindow& subwindow)
+void IRCClient::unregister_subwindow(IRCWindow& subwindow)
 {
-    if (subwindow.type() == IRCClientWindow::Server) {
+    if (subwindow.type() == IRCWindow::Server) {
         m_server_subwindow = &subwindow;
     }
     for (int i = 0; i < m_windows.size(); ++i) {
diff --git a/Applications/IRCClient/IRCClient.h b/Applications/IRCClient/IRCClient.h
index e391ecb7bc..44f4c85bcd 100644
--- a/Applications/IRCClient/IRCClient.h
+++ b/Applications/IRCClient/IRCClient.h
@@ -8,8 +8,8 @@
 
 class IRCChannel;
 class IRCQuery;
-class IRCClientWindow;
-class IRCClientWindowListModel;
+class IRCWindow;
+class IRCWindowListModel;
 class GNotifier;
 
 class IRCClient {
@@ -37,15 +37,15 @@ public:
     Function<void(const String& channel)> on_join;
     Function<void()> on_server_message;
 
-    void register_subwindow(IRCClientWindow&);
-    void unregister_subwindow(IRCClientWindow&);
+    void register_subwindow(IRCWindow&);
+    void unregister_subwindow(IRCWindow&);
 
-    IRCClientWindowListModel* client_window_list_model() { return m_client_window_list_model; }
-    const IRCClientWindowListModel* client_window_list_model() const { return m_client_window_list_model; }
+    IRCWindowListModel* client_window_list_model() { return m_client_window_list_model; }
+    const IRCWindowListModel* client_window_list_model() const { return m_client_window_list_model; }
 
     int window_count() const { return m_windows.size(); }
-    const IRCClientWindow& window_at(int index) const { return *m_windows.at(index); }
-    IRCClientWindow& window_at(int index) { return *m_windows.at(index); }
+    const IRCWindow& window_at(int index) const { return *m_windows.at(index); }
+    IRCWindow& window_at(int index) { return *m_windows.at(index); }
 
     void handle_user_input_in_channel(const String& channel_name, const String&);
     void handle_user_input_in_query(const String& query_name, const String&);
@@ -84,11 +84,11 @@ private:
     HashMap<String, RetainPtr<IRCChannel>> m_channels;
     HashMap<String, RetainPtr<IRCQuery>> m_queries;
 
-    Vector<IRCClientWindow*> m_windows;
+    Vector<IRCWindow*> m_windows;
 
-    IRCClientWindow* m_server_subwindow { nullptr };
+    IRCWindow* m_server_subwindow { nullptr };
 
-    IRCClientWindowListModel* m_client_window_list_model { nullptr };
+    IRCWindowListModel* m_client_window_list_model { nullptr };
 
     Retained<IRCLogBuffer> m_log;
 };
diff --git a/Applications/IRCClient/IRCClientWindow.cpp b/Applications/IRCClient/IRCWindow.cpp
similarity index 89%
rename from Applications/IRCClient/IRCClientWindow.cpp
rename to Applications/IRCClient/IRCWindow.cpp
index 32dfb2c2bb..f1e3c843a2 100644
--- a/Applications/IRCClient/IRCClientWindow.cpp
+++ b/Applications/IRCClient/IRCWindow.cpp
@@ -1,4 +1,4 @@
-#include "IRCClientWindow.h"
+#include "IRCWindow.h"
 #include "IRCClient.h"
 #include "IRCChannel.h"
 #include "IRCChannelMemberListModel.h"
@@ -8,7 +8,7 @@
 #include <LibGUI/GTextEditor.h>
 #include <LibGUI/GTextBox.h>
 
-IRCClientWindow::IRCClientWindow(IRCClient& client, Type type, const String& name, GWidget* parent)
+IRCWindow::IRCWindow(IRCClient& client, Type type, const String& name, GWidget* parent)
     : GWidget(parent)
     , m_client(client)
     , m_type(type)
@@ -50,12 +50,12 @@ IRCClientWindow::IRCClientWindow(IRCClient& client, Type type, const String& nam
     m_client.register_subwindow(*this);
 }
 
-IRCClientWindow::~IRCClientWindow()
+IRCWindow::~IRCWindow()
 {
     m_client.unregister_subwindow(*this);
 }
 
-void IRCClientWindow::set_log_buffer(const IRCLogBuffer& log_buffer)
+void IRCWindow::set_log_buffer(const IRCLogBuffer& log_buffer)
 {
     m_log_buffer = &log_buffer;
     m_table_view->set_model(OwnPtr<IRCLogBufferModel>((IRCLogBufferModel*)log_buffer.model()));
diff --git a/Applications/IRCClient/IRCClientWindow.h b/Applications/IRCClient/IRCWindow.h
similarity index 77%
rename from Applications/IRCClient/IRCClientWindow.h
rename to Applications/IRCClient/IRCWindow.h
index 4a31316e47..79e98ae756 100644
--- a/Applications/IRCClient/IRCClientWindow.h
+++ b/Applications/IRCClient/IRCWindow.h
@@ -7,7 +7,7 @@ class IRCLogBuffer;
 class GTableView;
 class GTextEditor;
 
-class IRCClientWindow : public GWidget {
+class IRCWindow : public GWidget {
 public:
     enum Type {
         Server,
@@ -15,8 +15,8 @@ public:
         Query,
     };
 
-    explicit IRCClientWindow(IRCClient&, Type, const String& name, GWidget* parent);
-    virtual ~IRCClientWindow() override;
+    explicit IRCWindow(IRCClient&, Type, const String& name, GWidget* parent);
+    virtual ~IRCWindow() override;
 
     String name() const { return m_name; }
     void set_name(const String& name) { m_name = name; }
diff --git a/Applications/IRCClient/IRCClientWindowListModel.cpp b/Applications/IRCClient/IRCWindowListModel.cpp
similarity index 51%
rename from Applications/IRCClient/IRCClientWindowListModel.cpp
rename to Applications/IRCClient/IRCWindowListModel.cpp
index f4d58e263c..b6cf241ba5 100644
--- a/Applications/IRCClient/IRCClientWindowListModel.cpp
+++ b/Applications/IRCClient/IRCWindowListModel.cpp
@@ -1,30 +1,30 @@
-#include "IRCClientWindowListModel.h"
-#include "IRCClientWindow.h"
+#include "IRCWindowListModel.h"
+#include "IRCWindow.h"
 #include "IRCClient.h"
 #include <stdio.h>
 #include <time.h>
 
-IRCClientWindowListModel::IRCClientWindowListModel(IRCClient& client)
+IRCWindowListModel::IRCWindowListModel(IRCClient& client)
     : m_client(client)
 {
     set_activates_on_selection(true);
 }
 
-IRCClientWindowListModel::~IRCClientWindowListModel()
+IRCWindowListModel::~IRCWindowListModel()
 {
 }
 
-int IRCClientWindowListModel::row_count() const
+int IRCWindowListModel::row_count() const
 {
     return m_client.window_count();
 }
 
-int IRCClientWindowListModel::column_count() const
+int IRCWindowListModel::column_count() const
 {
     return 1;
 }
 
-String IRCClientWindowListModel::column_name(int column) const
+String IRCWindowListModel::column_name(int column) const
 {
     switch (column) {
     case Column::Name: return "Name";
@@ -32,7 +32,7 @@ String IRCClientWindowListModel::column_name(int column) const
     ASSERT_NOT_REACHED();
 }
 
-GTableModel::ColumnMetadata IRCClientWindowListModel::column_metadata(int column) const
+GTableModel::ColumnMetadata IRCWindowListModel::column_metadata(int column) const
 {
     switch (column) {
     case Column::Name: return { 70, TextAlignment::CenterLeft };
@@ -40,7 +40,7 @@ GTableModel::ColumnMetadata IRCClientWindowListModel::column_metadata(int column
     ASSERT_NOT_REACHED();
 }
 
-GVariant IRCClientWindowListModel::data(const GModelIndex& index, Role) const
+GVariant IRCWindowListModel::data(const GModelIndex& index, Role) const
 {
     switch (index.column()) {
     case Column::Name: return m_client.window_at(index.row()).name();
@@ -48,12 +48,12 @@ GVariant IRCClientWindowListModel::data(const GModelIndex& index, Role) const
     ASSERT_NOT_REACHED();
 }
 
-void IRCClientWindowListModel::update()
+void IRCWindowListModel::update()
 {
     did_update();
 }
 
-void IRCClientWindowListModel::activate(const GModelIndex& index)
+void IRCWindowListModel::activate(const GModelIndex& index)
 {
     if (on_activation)
         on_activation(m_client.window_at(index.row()));
diff --git a/Applications/IRCClient/IRCClientWindowListModel.h b/Applications/IRCClient/IRCWindowListModel.h
similarity index 70%
rename from Applications/IRCClient/IRCClientWindowListModel.h
rename to Applications/IRCClient/IRCWindowListModel.h
index 3a549747e9..d50f293c34 100644
--- a/Applications/IRCClient/IRCClientWindowListModel.h
+++ b/Applications/IRCClient/IRCWindowListModel.h
@@ -4,16 +4,16 @@
 #include <AK/Function.h>
 
 class IRCClient;
-class IRCClientWindow;
+class IRCWindow;
 
-class IRCClientWindowListModel final : public GTableModel {
+class IRCWindowListModel final : public GTableModel {
 public:
     enum Column {
         Name,
     };
 
-    explicit IRCClientWindowListModel(IRCClient&);
-    virtual ~IRCClientWindowListModel() override;
+    explicit IRCWindowListModel(IRCClient&);
+    virtual ~IRCWindowListModel() override;
 
     virtual int row_count() const override;
     virtual int column_count() const override;
@@ -23,7 +23,7 @@ public:
     virtual void update() override;
     virtual void activate(const GModelIndex&) override;
 
-    Function<void(IRCClientWindow&)> on_activation;
+    Function<void(IRCWindow&)> on_activation;
 
 private:
     IRCClient& m_client;
diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile
index d627be9e5c..e5e34c15b4 100644
--- a/Applications/IRCClient/Makefile
+++ b/Applications/IRCClient/Makefile
@@ -5,8 +5,8 @@ OBJS = \
     IRCLogBuffer.o \
     IRCLogBufferModel.o \
     IRCAppWindow.o \
-    IRCClientWindow.o \
-    IRCClientWindowListModel.o \
+    IRCWindow.o \
+    IRCWindowListModel.o \
     IRCChannelMemberListModel.o \
     main.o