diff --git a/chatterino.pro b/chatterino.pro
index 63deeff0c..43c5d6c66 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -175,8 +175,8 @@ SOURCES += \
     src/widgets/tooltipwidget.cpp \
     src/widgets/window.cpp \
     src/providers/irc/ircaccount.cpp \
-    src/providers/irc/ircchannel.cpp \
-    src/providers/irc/ircserver.cpp
+    src/providers/irc/ircserver.cpp \
+    src/providers/irc/ircchannel2.cpp
 
 HEADERS  += \
     src/precompiled_header.hpp \
@@ -289,8 +289,8 @@ HEADERS  += \
     src/common.hpp \
     src/providers/irc/abstractircserver.hpp \
     src/providers/irc/ircaccount.hpp \
-    src/providers/irc/ircchannel.hpp \
-    src/providers/irc/ircserver.hpp
+    src/providers/irc/ircserver.hpp \
+    src/providers/irc/ircchannel2.hpp
 
 RESOURCES += \
     resources/resources.qrc
diff --git a/src/providers/irc/ircchannel.cpp b/src/providers/irc/ircchannel2.cpp
similarity index 81%
rename from src/providers/irc/ircchannel.cpp
rename to src/providers/irc/ircchannel2.cpp
index d9d012251..ffafc6ab7 100644
--- a/src/providers/irc/ircchannel.cpp
+++ b/src/providers/irc/ircchannel2.cpp
@@ -1,4 +1,4 @@
-#include "ircchannel.hpp"
+#include "ircchannel2.hpp"
 
 namespace chatterino {
 namespace providers {
diff --git a/src/providers/irc/ircchannel.hpp b/src/providers/irc/ircchannel2.hpp
similarity index 100%
rename from src/providers/irc/ircchannel.hpp
rename to src/providers/irc/ircchannel2.hpp