diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index cd7f3e116..2ed5ef62b 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -129,10 +129,10 @@ namespace {
 
 #ifdef Q_OS_MAC
             // On macOS, programs are bundled into ".app" Application bundles,
-            // when restarting chatterino that bundle should be opened with the "open"
+            // when restarting Chatterino that bundle should be opened with the "open"
             // terminal command instead of directly starting the underlying executable,
             // as those are 2 different things for the OS and i.e. do not use
-            // the same dock icon (resulting in a second chatterino icon on restarting)
+            // the same dock icon (resulting in a second Chatterino icon on restarting)
             CFURLRef appUrlRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
             CFStringRef macPath =
                 CFURLCopyFileSystemPath(appUrlRef, kCFURLPOSIXPathStyle);
@@ -155,7 +155,7 @@ namespace {
         _exit(signum);
     }
 
-    // We want to restart chatterino when it crashes and the setting is set to
+    // We want to restart Chatterino when it crashes and the setting is set to
     // true.
     void initSignalHandler()
     {
diff --git a/src/common/Args.cpp b/src/common/Args.cpp
index f43ad6c21..4b552cc9f 100644
--- a/src/common/Args.cpp
+++ b/src/common/Args.cpp
@@ -48,7 +48,7 @@ Args::Args(const QApplication &app)
     parser.addOption(QCommandLineOption(
         {"c", "channels"},
         "Joins only supplied channels on startup. Use letters with colons to "
-        "specify platform. Only twitch channels are supported at the moment.\n"
+        "specify platform. Only Twitch channels are supported at the moment.\n"
         "If platform isn't specified, default is Twitch.",
         "t:channel1;t:channel2;..."));
 
diff --git a/src/common/WindowDescriptors.hpp b/src/common/WindowDescriptors.hpp
index 4740bc919..49d00aabd 100644
--- a/src/common/WindowDescriptors.hpp
+++ b/src/common/WindowDescriptors.hpp
@@ -29,7 +29,7 @@ namespace chatterino {
 enum class WindowType;
 
 struct SplitDescriptor {
-    // twitch or mentions or watching or whispers or irc
+    // Twitch or mentions or watching or whispers or IRC
     QString type_;
 
     // Twitch Channel name or IRC channel name
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 4ed22a4b4..769c9efbb 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -127,7 +127,7 @@ bool appendWhisperMessageWordsLocally(const QStringList &words)
     auto emote = boost::optional<EmotePtr>{};
     for (int i = 2; i < words.length(); i++)
     {
-        {  // twitch emote
+        {  // Twitch emote
             auto it = accemotes.emotes.find({words[i]});
             if (it != accemotes.emotes.end())
             {
@@ -135,7 +135,7 @@ bool appendWhisperMessageWordsLocally(const QStringList &words)
                                         MessageElementFlag::TwitchEmote);
                 continue;
             }
-        }  // twitch emote
+        }  // Twitch emote
 
         {  // bttv/ffz emote
             if ((emote = bttvemotes.emote({words[i]})))
@@ -899,7 +899,7 @@ QString CommandController::execCommand(const QString &textNoEmoji,
 
     QString commandName = words[0];
 
-    // works in a valid twitch channel and /whispers, etc...
+    // works in a valid Twitch channel and /whispers, etc...
     if (!dryRun && channel->isTwitchChannel())
     {
         if (whisperCommands.contains(commandName, Qt::CaseInsensitive))
@@ -935,7 +935,7 @@ QString CommandController::execCommand(const QString &textNoEmoji,
         }
     }
 
-    // works only in a valid twitch channel
+    // works only in a valid Twitch channel
     if (!dryRun && channel->isTwitchChannel())
     {
         // check if command exists
diff --git a/src/controllers/notifications/NotificationController.cpp b/src/controllers/notifications/NotificationController.cpp
index a8f870394..ffd61fce7 100644
--- a/src/controllers/notifications/NotificationController.cpp
+++ b/src/controllers/notifications/NotificationController.cpp
@@ -165,7 +165,7 @@ void NotificationController::getFakeTwitchChannelLiveStatus(
             if (i != fakeTwitchChannels.end())
             {
                 // We have already pushed the live state of this stream
-                // Could not find stream in fake twitch channels!
+                // Could not find stream in fake Twitch channels!
                 return;
             }
 
diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp
index bb0b60488..fb06b924f 100644
--- a/src/messages/MessageElement.hpp
+++ b/src/messages/MessageElement.hpp
@@ -332,7 +332,7 @@ public:
                         MessageElementFlags flags) override;
 };
 
-// contains a full message string that's split into words on space and parses irc colors that are then put into segments
+// contains a full message string that's split into words on space and parses IRC colors that are then put into segments
 // these segments are later passed to "MultiColorTextLayoutElement" elements to be rendered :)
 class IrcTextElement : public MessageElement
 {
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index 352af378d..fadd79c88 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -231,7 +231,7 @@ ChannelPtr AbstractIrcServer::getOrAddChannel(const QString &dirtyChannelName)
             }
         }));
 
-    // join irc channel
+    // join IRC channel
     {
         std::lock_guard<std::mutex> lock2(this->connectionMutex_);
 
diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp
index 40da3ba20..796bfa809 100644
--- a/src/providers/irc/AbstractIrcServer.hpp
+++ b/src/providers/irc/AbstractIrcServer.hpp
@@ -23,7 +23,7 @@ public:
     virtual ~AbstractIrcServer() = default;
 
     // initializeIrc must be called from the derived class
-    // this allows us to initialize the abstract irc server based on the derived class's parameters
+    // this allows us to initialize the abstract IRC server based on the derived class's parameters
     void initializeIrc();
 
     // connection
@@ -57,7 +57,7 @@ protected:
     virtual void initializeConnectionSignals(IrcConnection *connection,
                                              ConnectionType type){};
 
-    // initializeConnection is called every time before we try to connect to the irc server
+    // initializeConnection is called every time before we try to connect to the IRC server
     virtual void initializeConnection(IrcConnection *connection,
                                       ConnectionType type) = 0;
 
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index e15362a5e..636bc7f7d 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -330,7 +330,7 @@ void IrcMessageHandler::handleRoomStateMessage(Communi::IrcMessage *message)
 {
     const auto &tags = message->tags();
 
-    // get twitch channel
+    // get Twitch channel
     QString chanName;
     if (!trimChannelName(message->parameter(0), chanName))
     {
diff --git a/src/providers/twitch/IrcMessageHandler.hpp b/src/providers/twitch/IrcMessageHandler.hpp
index 603b2e4bf..caa8740b9 100644
--- a/src/providers/twitch/IrcMessageHandler.hpp
+++ b/src/providers/twitch/IrcMessageHandler.hpp
@@ -34,7 +34,7 @@ public:
     void handleWhisperMessage(Communi::IrcMessage *message);
 
     // parseUserNoticeMessage parses a single IRC USERNOTICE message into 0+
-    // chatterino messages
+    // Chatterino messages
     std::vector<MessagePtr> parseUserNoticeMessage(
         Channel *channel, Communi::IrcMessage *message);
     void handleUserNoticeMessage(Communi::IrcMessage *message,
diff --git a/src/providers/twitch/PubsubClient.cpp b/src/providers/twitch/PubsubClient.cpp
index af131bbce..e27529cc9 100644
--- a/src/providers/twitch/PubsubClient.cpp
+++ b/src/providers/twitch/PubsubClient.cpp
@@ -1488,7 +1488,7 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData)
 
                 // this message also contains per-word automod data, which could be implemented
 
-                // extract sender data manually because twitch loves not being consistent
+                // extract sender data manually because Twitch loves not being consistent
                 rapidjson::Value senderData;
                 if (!rj::getSafeObject(messageData, "sender", senderData))
                 {
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index db35de7b2..3080a61e1 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -81,7 +81,7 @@ namespace {
             noticeMessage = "Chat has been cleared by a moderator.";
         }
 
-        // rebuild the raw irc message so we can convert it back to an ircmessage again!
+        // rebuild the raw IRC message so we can convert it back to an ircmessage again!
         // this could probably be done in a smarter way
 
         auto s = QString(":tmi.twitch.tv NOTICE %1 :%2")
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 1c594ceb0..e50feb9ff 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -211,7 +211,7 @@ MessagePtr TwitchMessageBuilder::build()
         this->bits = iterator.value().toString();
     }
 
-    // twitch emotes
+    // Twitch emotes
     std::vector<TwitchEmoteOccurence> twitchEmotes;
 
     iterator = this->tags.find("emotes");
@@ -1365,7 +1365,7 @@ void TwitchMessageBuilder::hostingSystemMessage(const QString &channelName,
     builder->message().searchText = text;
 }
 
-// irc variant
+// IRC variant
 void TwitchMessageBuilder::deletionMessage(const MessagePtr originalMessage,
                                            MessageBuilder *builder)
 {
diff --git a/src/singletons/Paths.cpp b/src/singletons/Paths.cpp
index ae6d55d19..6844af029 100644
--- a/src/singletons/Paths.cpp
+++ b/src/singletons/Paths.cpp
@@ -104,8 +104,8 @@ void Paths::initRootDirectory()
                                      path.toStdString() + "\"");
         }
 
-// create directory Chatterino2 instead of chatterino on windows because the
-// ladder one is takes by chatterino 1 already
+// create directory Chatterino2 instead of Chatterino on windows because the
+// ladder one is takes by Chatterino 1 already
 #ifdef Q_OS_WIN
         path.replace("chatterino", "Chatterino");
 
diff --git a/src/singletons/Paths.hpp b/src/singletons/Paths.hpp
index ea4cb6c2d..62b1f2c2a 100644
--- a/src/singletons/Paths.hpp
+++ b/src/singletons/Paths.hpp
@@ -28,7 +28,7 @@ public:
     // Hash of QCoreApplication::applicationFilePath()
     QString applicationFilePathHash;
 
-    // Profile avatars for twitch <appDataDirectory>/cache/twitch
+    // Profile avatars for Twitch <appDataDirectory>/cache/twitch
     QString twitchProfileAvatars;
 
     bool createFolder(const QString &folderPath);
diff --git a/src/widgets/dialogs/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp
index 03376f16a..41dcf1435 100644
--- a/src/widgets/dialogs/SelectChannelDialog.cpp
+++ b/src/widgets/dialogs/SelectChannelDialog.cpp
@@ -51,7 +51,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
         auto channel_btn = vbox.emplace<QRadioButton>("Channel").assign(
             &this->ui_.twitch.channel);
         auto channel_lbl =
-            vbox.emplace<QLabel>("Join a twitch channel by its name.").hidden();
+            vbox.emplace<QLabel>("Join a Twitch channel by its name.").hidden();
         channel_lbl->setWordWrap(true);
         auto channel_edit = vbox.emplace<QLineEdit>().hidden().assign(
             &this->ui_.twitch.channelName);
@@ -77,7 +77,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
                                 .assign(&this->ui_.twitch.whispers);
         auto whispers_lbl =
             vbox.emplace<QLabel>("Shows the whispers that you receive while "
-                                 "chatterino is running.")
+                                 "Chatterino is running.")
                 .hidden();
 
         whispers_lbl->setWordWrap(true);
@@ -108,7 +108,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
         auto watching_btn = vbox.emplace<QRadioButton>("Watching")
                                 .assign(&this->ui_.twitch.watching);
         auto watching_lbl =
-            vbox.emplace<QLabel>("Requires the chatterino browser extension.")
+            vbox.emplace<QLabel>("Requires the Chatterino browser extension.")
                 .hidden();
 
         watching_lbl->setWordWrap(true);
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 35606508c..64aca0e63 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1927,7 +1927,7 @@ void ChannelView::addContextMenuItems(
         crossPlatformCopy(copyString);
     });
 
-    // If is a link to a twitch user/stream
+    // If is a link to a Twitch user/stream
     if (hoveredElement->getLink().type == Link::Url)
     {
         static QRegularExpression twitchChannelRegex(
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index 24780ed41..549645d0d 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -434,14 +434,14 @@ void GeneralPage::initLayout(GeneralPageView &layout)
     {
         layout.addDescription(
             "Your operating system is not officially supplied with builds. For "
-            "updates, please rebuild chatterino from sources. Report "
+            "updates, please rebuild Chatterino from sources. Report "
             "issues <a href='https://chatterino.com/link/issues'>here</a>.");
     }
 
 #ifdef Q_OS_WIN
     layout.addTitle("Browser Integration");
     layout.addDescription("The browser extension replaces the default "
-                          "Twitch.tv chat with chatterino.");
+                          "Twitch.tv chat with Chatterino.");
 
     {
         if (auto err = nmIpcError().get())
@@ -651,7 +651,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
     layout.addCheckbox("Only search for username autocompletion with an @",
                        s.userCompletionOnlyWithAt);
 
-    layout.addCheckbox("Show twitch whispers inline", s.inlineWhispers);
+    layout.addCheckbox("Show Twitch whispers inline", s.inlineWhispers);
     layout.addCheckbox("Highlight received inline whispers",
                        s.highlightInlineWhispers);
     layout.addCheckbox("Load message history on connect",
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index 29c627dba..13f0948c1 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -276,7 +276,7 @@ HighlightingPage::HighlightingPage()
         layout.append(createCheckBox(ALWAYS_PLAY,
                                      getSettings()->highlightAlwaysPlaySound));
         layout.append(createCheckBox(
-            "Flash taskbar only stops highlighting when chatterino is focused",
+            "Flash taskbar only stops highlighting when Chatterino is focused",
             getSettings()->longAlerts));
     }
 
diff --git a/src/widgets/settingspages/IgnoresPage.cpp b/src/widgets/settingspages/IgnoresPage.cpp
index 77b27d372..661fbd6fc 100644
--- a/src/widgets/settingspages/IgnoresPage.cpp
+++ b/src/widgets/settingspages/IgnoresPage.cpp
@@ -73,7 +73,7 @@ void addUsersTab(IgnoresPage &page, LayoutCreator<QVBoxLayout> users,
 {
     auto label = users.emplace<QLabel>(INFO);
     label->setWordWrap(true);
-    users.append(page.createCheckBox("Enable twitch blocked users",
+    users.append(page.createCheckBox("Enable Twitch blocked users",
                                      getSettings()->enableTwitchBlockedUsers));
 
     auto anyways = users.emplace<QHBoxLayout>().withoutMargin();
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index 4ca2f4446..c38616994 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -116,15 +116,15 @@ private:
     void updateInputPlaceholder();
 
     /**
-     * @brief Opens twitch channel stream in a browser player (opens a formatted link)
+     * @brief Opens Twitch channel stream in a browser player (opens a formatted link)
      */
     void openChannelInBrowserPlayer(ChannelPtr channel);
     /**
-     * @brief Opens twitch channel stream in streamlink app (if stream is live and streamlink is installed)
+     * @brief Opens Twitch channel stream in streamlink app (if stream is live and streamlink is installed)
      */
     void openChannelInStreamlink(QString channelName);
     /**
-     * @brief Opens twitch channel chat in a new chatterino tab
+     * @brief Opens Twitch channel chat in a new Chatterino tab
      */
     void joinChannelInNewTab(ChannelPtr channel);