diff --git a/usermanager.cpp b/accountmanager.cpp
similarity index 96%
rename from usermanager.cpp
rename to accountmanager.cpp
index 964f15d6d..534e40131 100644
--- a/usermanager.cpp
+++ b/accountmanager.cpp
@@ -1,4 +1,4 @@
-#include "usermanager.h"
+#include "accountmanager.h"
 
 namespace chatterino {
 
diff --git a/usermanager.h b/accountmanager.h
similarity index 95%
rename from usermanager.h
rename to accountmanager.h
index cb3dab6d5..66cf8c2a9 100644
--- a/usermanager.h
+++ b/accountmanager.h
@@ -1,7 +1,7 @@
 #ifndef ACCOUNTMANAGER_H
 #define ACCOUNTMANAGER_H
 
-#include "twitch/twitchuser.h"
+#include "twitch/twitchaccount.h"
 
 #include <mutex>
 #include <vector>
diff --git a/chatterino.pro b/chatterino.pro
index f6ba4c88c..8a5fc4893 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -61,16 +61,16 @@ SOURCES += main.cpp\
     fontmanager.cpp \
     settingsmanager.cpp \
     emotemanager.cpp \
-    usermanager.cpp \
-    twitch/twitchuser.cpp \
     messages/messagebuilder.cpp \
     twitch/twitchmessagebuilder.cpp \
-    ircuser2.cpp \
     twitch/twitchparsemessage.cpp \
     widgets/fancybutton.cpp \
     widgets/titlebar.cpp \
-    widgets/userpopupwidget.cpp \
-    appdatapath.cpp
+    appdatapath.cpp \
+    accountmanager.cpp \
+    twitch/twitchaccount.cpp \
+    ircaccount.cpp \
+    widgets/accountpopup.cpp
 
 HEADERS  += \
     asyncexec.h \
@@ -118,17 +118,17 @@ HEADERS  += \
     fontmanager.h \
     emotemanager.h \
     util/urlfetch.h \
-    usermanager.h \
-    twitch/twitchuser.h \
     messages/messageparseargs.h \
     messages/messagebuilder.h \
     twitch/twitchmessagebuilder.h \
-    ircuser2.h \
     twitch/twitchparsemessage.h \
     widgets/fancybutton.h \
     widgets/titlebar.h \
-    widgets/userpopupwidget.h \
-    appdatapath.h
+    appdatapath.h \
+    accountmanager.h \
+    twitch/twitchaccount.h \
+    ircaccount.h \
+    widgets/accountpopup.h
 
 PRECOMPILED_HEADER =
 
@@ -164,4 +164,4 @@ macx {
 }
 
 FORMS += \
-    forms/userpopup.ui
+    forms/accountpopupform.ui
diff --git a/forms/userpopup.ui b/forms/accountpopupform.ui
similarity index 100%
rename from forms/userpopup.ui
rename to forms/accountpopupform.ui
diff --git a/ircuser2.cpp b/ircaccount.cpp
similarity index 95%
rename from ircuser2.cpp
rename to ircaccount.cpp
index 4c221719e..02a781cbc 100644
--- a/ircuser2.cpp
+++ b/ircaccount.cpp
@@ -1,4 +1,4 @@
-#include "ircuser2.h"
+#include "ircaccount.h"
 
 namespace chatterino {
 
diff --git a/ircuser2.h b/ircaccount.h
similarity index 100%
rename from ircuser2.h
rename to ircaccount.h
diff --git a/ircmanager.cpp b/ircmanager.cpp
index 9c37279f2..2e5ab963a 100644
--- a/ircmanager.cpp
+++ b/ircmanager.cpp
@@ -5,8 +5,8 @@
 #include "messages/messageparseargs.h"
 #include "twitch/twitchmessagebuilder.h"
 #include "twitch/twitchparsemessage.h"
-#include "twitch/twitchuser.h"
-#include "usermanager.h"
+#include "twitch/twitchaccount.h"
+#include "accountmanager.h"
 
 #include <irccommand.h>
 #include <ircconnection.h>
diff --git a/ircmanager.h b/ircmanager.h
index e3706d9f2..49195d4ca 100644
--- a/ircmanager.h
+++ b/ircmanager.h
@@ -4,7 +4,7 @@
 #define TWITCH_MAX_MESSAGELENGTH 500
 
 #include "messages/message.h"
-#include "twitch/twitchuser.h"
+#include "twitch/twitchaccount.h"
 
 #include <IrcMessage>
 #include <QMap>
diff --git a/qt.conf b/qt.conf
deleted file mode 100644
index 6ff699f3f..000000000
--- a/qt.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Platforms]
-# 1 - for System DPI Aware
-# 2 - for Per Monitor DPI Aware
-WindowsArguments = dpiawareness=2
\ No newline at end of file
diff --git a/twitch/twitchuser.cpp b/twitch/twitchaccount.cpp
similarity index 95%
rename from twitch/twitchuser.cpp
rename to twitch/twitchaccount.cpp
index 4bf9c1873..484fa25e4 100644
--- a/twitch/twitchuser.cpp
+++ b/twitch/twitchaccount.cpp
@@ -1,4 +1,4 @@
-#include "twitchuser.h"
+#include "twitchaccount.h"
 
 namespace chatterino {
 namespace twitch {
diff --git a/twitch/twitchuser.h b/twitch/twitchaccount.h
similarity index 94%
rename from twitch/twitchuser.h
rename to twitch/twitchaccount.h
index ca1f6ab4b..f9920d9cc 100644
--- a/twitch/twitchuser.h
+++ b/twitch/twitchaccount.h
@@ -1,7 +1,7 @@
 #ifndef ACCOUNT_H
 #define ACCOUNT_H
 
-#include "ircuser2.h"
+#include "ircaccount.h"
 
 #include <QString>
 
diff --git a/widgets/userpopupwidget.cpp b/widgets/accountpopup.cpp
similarity index 95%
rename from widgets/userpopupwidget.cpp
rename to widgets/accountpopup.cpp
index 4cea7877f..c63ab36bf 100644
--- a/widgets/userpopupwidget.cpp
+++ b/widgets/accountpopup.cpp
@@ -1,4 +1,4 @@
-#include "widgets/userpopupwidget.h"
+#include "widgets/accountpopup.h"
 #include "channel.h"
 #include "ui_userpopup.h"
 
diff --git a/widgets/userpopupwidget.h b/widgets/accountpopup.h
similarity index 100%
rename from widgets/userpopupwidget.h
rename to widgets/accountpopup.h
diff --git a/widgets/chatwidgetview.h b/widgets/chatwidgetview.h
index 9d67d5ab9..ff047e765 100644
--- a/widgets/chatwidgetview.h
+++ b/widgets/chatwidgetview.h
@@ -6,7 +6,7 @@
 #include "messages/messageref.h"
 #include "messages/word.h"
 #include "widgets/scrollbar.h"
-#include "widgets/userpopupwidget.h"
+#include "widgets/accountpopup.h"
 
 #include <QPaintEvent>
 #include <QScroller>
diff --git a/widgets/settingsdialog.cpp b/widgets/settingsdialog.cpp
index 7ccb75ef6..21c175d40 100644
--- a/widgets/settingsdialog.cpp
+++ b/widgets/settingsdialog.cpp
@@ -1,6 +1,6 @@
 #include "widgets/settingsdialog.h"
-#include "twitch/twitchuser.h"
-#include "usermanager.h"
+#include "twitch/twitchaccount.h"
+#include "accountmanager.h"
 #include "widgets/settingsdialogtab.h"
 #include "windowmanager.h"