diff --git a/chatterino.pro b/chatterino.pro
index b1acd2b09..f67d44b14 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -198,13 +198,13 @@ SOURCES += \
     src/widgets/settingspages/AccountsPage.cpp \
     src/widgets/settingspages/AppearancePage.cpp \
     src/widgets/settingspages/BehaviourPage.cpp \
-    src/widgets/settingspages/BrowserextensionPage.cpp \
+    src/widgets/settingspages/BrowserExtensionPage.cpp \
     src/widgets/settingspages/CommandPage.cpp \
     src/widgets/settingspages/EmotesPage.cpp \
-    src/widgets/settingspages/ExternaltoolsPage.cpp \
+    src/widgets/settingspages/ExternalToolsPage.cpp \
     src/widgets/settingspages/HighlightingPage.cpp \
     src/widgets/settingspages/IgnoreusersPage.cpp \
-    src/widgets/settingspages/KeyboardsettingsPage.cpp \
+    src/widgets/settingspages/KeyboardSettingsPage.cpp \
     src/widgets/settingspages/LogsPage.cpp \
     src/widgets/settingspages/ModerationPage.cpp \
     src/widgets/settingspages/SettingsPage.cpp \
@@ -364,13 +364,13 @@ HEADERS  += \
     src/widgets/settingspages/AccountsPage.hpp \
     src/widgets/settingspages/AppearancePage.hpp \
     src/widgets/settingspages/BehaviourPage.hpp \
-    src/widgets/settingspages/BrowserextensionPage.hpp \
+    src/widgets/settingspages/BrowserExtensionPage.hpp \
     src/widgets/settingspages/CommandPage.hpp \
     src/widgets/settingspages/EmotesPage.hpp \
-    src/widgets/settingspages/ExternaltoolsPage.hpp \
+    src/widgets/settingspages/ExternalToolsPage.hpp \
     src/widgets/settingspages/HighlightingPage.hpp \
     src/widgets/settingspages/IgnoreusersPage.hpp \
-    src/widgets/settingspages/KeyboardsettingsPage.hpp \
+    src/widgets/settingspages/KeyboardSettingsPage.hpp \
     src/widgets/settingspages/LogsPage.hpp \
     src/widgets/settingspages/ModerationPage.hpp \
     src/widgets/settingspages/SettingsPage.hpp \
diff --git a/src/Application.cpp b/src/Application.cpp
index 1e32fc01b..8ab5a878e 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -118,15 +118,15 @@ void Application::initialize()
 #endif
 #endif
 
-    this->twitch.pubsub->sig.whisper.sent.connect([](const auto &msg) {
+    this->twitch.pubsub->signals_.whisper.sent.connect([](const auto &msg) {
         Log("WHISPER SENT LOL");  //
     });
 
-    this->twitch.pubsub->sig.whisper.received.connect([](const auto &msg) {
+    this->twitch.pubsub->signals_.whisper.received.connect([](const auto &msg) {
         Log("WHISPER RECEIVED LOL");  //
     });
 
-    this->twitch.pubsub->sig.moderation.chatCleared.connect([this](const auto &action) {
+    this->twitch.pubsub->signals_.moderation.chatCleared.connect([this](const auto &action) {
         auto chan = this->twitch.server->getChannelOrEmptyByID(action.roomID);
         if (chan->isEmpty()) {
             return;
@@ -138,7 +138,7 @@ void Application::initialize()
         postToThread([chan, msg] { chan->addMessage(msg); });
     });
 
-    this->twitch.pubsub->sig.moderation.modeChanged.connect([this](const auto &action) {
+    this->twitch.pubsub->signals_.moderation.modeChanged.connect([this](const auto &action) {
         auto chan = this->twitch.server->getChannelOrEmptyByID(action.roomID);
         if (chan->isEmpty()) {
             return;
@@ -157,25 +157,26 @@ void Application::initialize()
         postToThread([chan, msg] { chan->addMessage(msg); });
     });
 
-    this->twitch.pubsub->sig.moderation.moderationStateChanged.connect([this](const auto &action) {
-        auto chan = this->twitch.server->getChannelOrEmptyByID(action.roomID);
-        if (chan->isEmpty()) {
-            return;
-        }
+    this->twitch.pubsub->signals_.moderation.moderationStateChanged.connect(
+        [this](const auto &action) {
+            auto chan = this->twitch.server->getChannelOrEmptyByID(action.roomID);
+            if (chan->isEmpty()) {
+                return;
+            }
 
-        QString text;
+            QString text;
 
-        if (action.modded) {
-            text = QString("%1 modded %2").arg(action.source.name, action.target.name);
-        } else {
-            text = QString("%1 unmodded %2").arg(action.source.name, action.target.name);
-        }
+            if (action.modded) {
+                text = QString("%1 modded %2").arg(action.source.name, action.target.name);
+            } else {
+                text = QString("%1 unmodded %2").arg(action.source.name, action.target.name);
+            }
 
-        auto msg = chatterino::Message::createSystemMessage(text);
-        postToThread([chan, msg] { chan->addMessage(msg); });
-    });
+            auto msg = chatterino::Message::createSystemMessage(text);
+            postToThread([chan, msg] { chan->addMessage(msg); });
+        });
 
-    this->twitch.pubsub->sig.moderation.userBanned.connect([&](const auto &action) {
+    this->twitch.pubsub->signals_.moderation.userBanned.connect([&](const auto &action) {
         auto chan = this->twitch.server->getChannelOrEmptyByID(action.roomID);
 
         if (chan->isEmpty()) {
@@ -188,7 +189,7 @@ void Application::initialize()
         postToThread([chan, msg] { chan->addOrReplaceTimeout(msg); });
     });
 
-    this->twitch.pubsub->sig.moderation.userUnbanned.connect([&](const auto &action) {
+    this->twitch.pubsub->signals_.moderation.userUnbanned.connect([&](const auto &action) {
         auto chan = this->twitch.server->getChannelOrEmptyByID(action.roomID);
 
         if (chan->isEmpty()) {
diff --git a/src/providers/twitch/Pubsub.hpp b/src/providers/twitch/Pubsub.hpp
index 5737737c9..82fd50fa9 100644
--- a/src/providers/twitch/Pubsub.hpp
+++ b/src/providers/twitch/Pubsub.hpp
@@ -115,7 +115,7 @@ public:
             Signal<const rapidjson::Value &> received;
             Signal<const rapidjson::Value &> sent;
         } whisper;
-    } sig;
+    } signals_;
 
     void listenToWhispers(std::shared_ptr<TwitchAccount> account);
 
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 0b8a4ac3b..4a1f9fb4b 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -7,13 +7,13 @@
 #include "widgets/settingspages/AccountsPage.hpp"
 #include "widgets/settingspages/AppearancePage.hpp"
 #include "widgets/settingspages/BehaviourPage.hpp"
-#include "widgets/settingspages/BrowserextensionPage.hpp"
+#include "widgets/settingspages/BrowserExtensionPage.hpp"
 #include "widgets/settingspages/CommandPage.hpp"
 #include "widgets/settingspages/EmotesPage.hpp"
-#include "widgets/settingspages/ExternaltoolsPage.hpp"
+#include "widgets/settingspages/ExternalToolsPage.hpp"
 #include "widgets/settingspages/HighlightingPage.hpp"
 #include "widgets/settingspages/IgnoreusersPage.hpp"
-#include "widgets/settingspages/KeyboardsettingsPage.hpp"
+#include "widgets/settingspages/KeyboardSettingsPage.hpp"
 #include "widgets/settingspages/LogsPage.hpp"
 #include "widgets/settingspages/ModerationPage.hpp"
 #include "widgets/settingspages/SpecialChannelsPage.hpp"
diff --git a/src/widgets/settingspages/BrowserextensionPage.cpp b/src/widgets/settingspages/BrowserExtensionPage.cpp
similarity index 94%
rename from src/widgets/settingspages/BrowserextensionPage.cpp
rename to src/widgets/settingspages/BrowserExtensionPage.cpp
index 988a34172..6e8655b64 100644
--- a/src/widgets/settingspages/BrowserextensionPage.cpp
+++ b/src/widgets/settingspages/BrowserExtensionPage.cpp
@@ -1,4 +1,4 @@
-#include "BrowserextensionPage.hpp"
+#include "BrowserExtensionPage.hpp"
 
 #include "util/LayoutCreator.hpp"
 
diff --git a/src/widgets/settingspages/BrowserextensionPage.hpp b/src/widgets/settingspages/BrowserExtensionPage.hpp
similarity index 100%
rename from src/widgets/settingspages/BrowserextensionPage.hpp
rename to src/widgets/settingspages/BrowserExtensionPage.hpp
diff --git a/src/widgets/settingspages/ExternaltoolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp
similarity index 96%
rename from src/widgets/settingspages/ExternaltoolsPage.cpp
rename to src/widgets/settingspages/ExternalToolsPage.cpp
index 354b8cbc1..7f355af60 100644
--- a/src/widgets/settingspages/ExternaltoolsPage.cpp
+++ b/src/widgets/settingspages/ExternalToolsPage.cpp
@@ -1,4 +1,4 @@
-#include "ExternaltoolsPage.hpp"
+#include "ExternalToolsPage.hpp"
 
 #include "Application.hpp"
 #include "util/LayoutCreator.hpp"
diff --git a/src/widgets/settingspages/ExternaltoolsPage.hpp b/src/widgets/settingspages/ExternalToolsPage.hpp
similarity index 100%
rename from src/widgets/settingspages/ExternaltoolsPage.hpp
rename to src/widgets/settingspages/ExternalToolsPage.hpp
diff --git a/src/widgets/settingspages/KeyboardsettingsPage.cpp b/src/widgets/settingspages/KeyboardSettingsPage.cpp
similarity index 95%
rename from src/widgets/settingspages/KeyboardsettingsPage.cpp
rename to src/widgets/settingspages/KeyboardSettingsPage.cpp
index fbf611f5e..0b3d31229 100644
--- a/src/widgets/settingspages/KeyboardsettingsPage.cpp
+++ b/src/widgets/settingspages/KeyboardSettingsPage.cpp
@@ -1,4 +1,4 @@
-#include "KeyboardsettingsPage.hpp"
+#include "KeyboardSettingsPage.hpp"
 
 #include "util/LayoutCreator.hpp"
 
diff --git a/src/widgets/settingspages/KeyboardsettingsPage.hpp b/src/widgets/settingspages/KeyboardSettingsPage.hpp
similarity index 100%
rename from src/widgets/settingspages/KeyboardsettingsPage.hpp
rename to src/widgets/settingspages/KeyboardSettingsPage.hpp