diff --git a/src/calcwidget.cpp b/src/CalcWidget.cpp
similarity index 98%
rename from src/calcwidget.cpp
rename to src/CalcWidget.cpp
index 626dac05..f7737167 100644
--- a/src/calcwidget.cpp
+++ b/src/CalcWidget.cpp
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "CalcWidget.h"
+#include "ui_CalcWidget.h"
+
 #include <QList>
 
-#include "calcwidget.h"
-#include "ui_calcwidget.h"
-#include "utils/ColorScheme.h"
-#include "utils/AppData.h"
-#include "utils/config.h"
 #include "dialog/CalcConfigDialog.h"
+#include "utils/AppData.h"
+#include "utils/ColorScheme.h"
+#include "utils/config.h"
 
 CalcWidget::CalcWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/src/calcwidget.h b/src/CalcWidget.h
similarity index 100%
rename from src/calcwidget.h
rename to src/CalcWidget.h
diff --git a/src/calcwidget.ui b/src/CalcWidget.ui
similarity index 100%
rename from src/calcwidget.ui
rename to src/CalcWidget.ui
diff --git a/src/calcwindow.cpp b/src/CalcWindow.cpp
similarity index 87%
rename from src/calcwindow.cpp
rename to src/CalcWindow.cpp
index 77a92605..1b55c1de 100644
--- a/src/calcwindow.cpp
+++ b/src/CalcWindow.cpp
@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "calcwindow.h"
-#include "mainwindow.h"
-#include "utils/Icons.h"
-#include "utils/AppData.h"
+#include "CalcWindow.h"
+#include "ui_CalcWindow.h"
 
-#include "ui_calcwindow.h"
+#include "utils/AppData.h"
+#include "utils/Icons.h"
 
 CalcWindow::CalcWindow(QWidget *parent)
     : QMainWindow(parent)
diff --git a/src/calcwindow.h b/src/CalcWindow.h
similarity index 100%
rename from src/calcwindow.h
rename to src/CalcWindow.h
diff --git a/src/calcwindow.ui b/src/CalcWindow.ui
similarity index 97%
rename from src/calcwindow.ui
rename to src/CalcWindow.ui
index 1d490cfe..2447bbab 100644
--- a/src/calcwindow.ui
+++ b/src/CalcWindow.ui
@@ -37,7 +37,7 @@
   <customwidget>
    <class>CalcWidget</class>
    <extends>QWidget</extends>
-   <header>calcwidget.h</header>
+   <header>CalcWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/coinswidget.cpp b/src/CoinsWidget.cpp
similarity index 97%
rename from src/coinswidget.cpp
rename to src/CoinsWidget.cpp
index e7026de3..46207374 100644
--- a/src/coinswidget.cpp
+++ b/src/CoinsWidget.cpp
@@ -1,22 +1,21 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "coinswidget.h"
-#include "ui_coinswidget.h"
-#include "dialog/OutputInfoDialog.h"
-#include "dialog/OutputSweepDialog.h"
-#include "mainwindow.h"
-#include "utils/Icons.h"
+#include "CoinsWidget.h"
+#include "ui_CoinsWidget.h"
 
-#include <QClipboard>
 #include <QMessageBox>
 
+#include "dialog/OutputInfoDialog.h"
+#include "dialog/OutputSweepDialog.h"
+#include "utils/Icons.h"
+
 CoinsWidget::CoinsWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::CoinsWidget)
-    , m_ctx(std::move(ctx))
-    , m_headerMenu(new QMenu(this))
-    , m_copyMenu(new QMenu("Copy",this))
+        : QWidget(parent)
+        , ui(new Ui::CoinsWidget)
+        , m_ctx(std::move(ctx))
+        , m_headerMenu(new QMenu(this))
+        , m_copyMenu(new QMenu("Copy",this))
 {
     ui->setupUi(this);
 
diff --git a/src/coinswidget.h b/src/CoinsWidget.h
similarity index 100%
rename from src/coinswidget.h
rename to src/CoinsWidget.h
index a9c418ef..87515d65 100644
--- a/src/coinswidget.h
+++ b/src/CoinsWidget.h
@@ -4,15 +4,15 @@
 #ifndef FEATHER_COINSWIDGET_H
 #define FEATHER_COINSWIDGET_H
 
+#include <QMenu>
+#include <QWidget>
+#include <QtSvg/QSvgWidget>
+
 #include "appcontext.h"
 #include "model/CoinsModel.h"
 #include "model/CoinsProxyModel.h"
 #include "libwalletqt/Coins.h"
 
-#include <QMenu>
-#include <QWidget>
-#include <QtSvg/QSvgWidget>
-
 namespace Ui {
     class CoinsWidget;
 }
diff --git a/src/coinswidget.ui b/src/CoinsWidget.ui
similarity index 100%
rename from src/coinswidget.ui
rename to src/CoinsWidget.ui
diff --git a/src/contactswidget.cpp b/src/ContactsWidget.cpp
similarity index 96%
rename from src/contactswidget.cpp
rename to src/ContactsWidget.cpp
index 6075bb44..a4616e07 100644
--- a/src/contactswidget.cpp
+++ b/src/ContactsWidget.cpp
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "contactswidget.h"
-#include "ui_contactswidget.h"
-#include "dialog/ContactsDialog.h"
-#include "model/ModelUtils.h"
-#include "mainwindow.h"
-#include "libwalletqt/AddressBook.h"
-#include "utils/Icons.h"
+#include "ContactsWidget.h"
+#include "ui_ContactsWidget.h"
 
 #include <QMessageBox>
 
+#include "dialog/ContactsDialog.h"
+#include "libwalletqt/AddressBook.h"
+#include "model/ModelUtils.h"
+#include "utils/Icons.h"
+
 ContactsWidget::ContactsWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::ContactsWidget)
-    , m_ctx(std::move(ctx))
+        : QWidget(parent)
+        , ui(new Ui::ContactsWidget)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 
diff --git a/src/contactswidget.h b/src/ContactsWidget.h
similarity index 100%
rename from src/contactswidget.h
rename to src/ContactsWidget.h
index fb513632..e800a0ea 100644
--- a/src/contactswidget.h
+++ b/src/ContactsWidget.h
@@ -4,13 +4,13 @@
 #ifndef FEATHER_CONTACTSWIDGET_H
 #define FEATHER_CONTACTSWIDGET_H
 
-#include "model/AddressBookModel.h"
-#include "model/AddressBookProxyModel.h"
-#include "appcontext.h"
-
 #include <QWidget>
 #include <QMenu>
 
+#include "appcontext.h"
+#include "model/AddressBookModel.h"
+#include "model/AddressBookProxyModel.h"
+
 namespace Ui {
 class ContactsWidget;
 }
diff --git a/src/contactswidget.ui b/src/ContactsWidget.ui
similarity index 100%
rename from src/contactswidget.ui
rename to src/ContactsWidget.ui
diff --git a/src/historywidget.cpp b/src/HistoryWidget.cpp
similarity index 95%
rename from src/historywidget.cpp
rename to src/HistoryWidget.cpp
index e2c9c3ec..41191b5b 100644
--- a/src/historywidget.cpp
+++ b/src/HistoryWidget.cpp
@@ -1,23 +1,24 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "historywidget.h"
-#include "ui_historywidget.h"
-#include "dialog/TxInfoDialog.h"
-#include "dialog/TxProofDialog.h"
-#include "utils/Icons.h"
-#include "utils/config.h"
-#include "appcontext.h"
+#include "HistoryWidget.h"
+#include "ui_HistoryWidget.h"
 
 #include <QMessageBox>
 
+#include "appcontext.h"
+#include "dialog/TxInfoDialog.h"
+#include "dialog/TxProofDialog.h"
+#include "utils/config.h"
+#include "utils/Icons.h"
+
 HistoryWidget::HistoryWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::HistoryWidget)
-    , m_ctx(std::move(ctx))
-    , m_contextMenu(new QMenu(this))
-    , m_copyMenu(new QMenu("Copy", this))
-    , m_model(m_ctx->wallet->historyModel())
+        : QWidget(parent)
+        , ui(new Ui::HistoryWidget)
+        , m_ctx(std::move(ctx))
+        , m_contextMenu(new QMenu(this))
+        , m_copyMenu(new QMenu("Copy", this))
+        , m_model(m_ctx->wallet->historyModel())
 {
     ui->setupUi(this);
     m_contextMenu->addMenu(m_copyMenu);
diff --git a/src/historywidget.h b/src/HistoryWidget.h
similarity index 100%
rename from src/historywidget.h
rename to src/HistoryWidget.h
index 05434c6f..3a414dd8 100644
--- a/src/historywidget.h
+++ b/src/HistoryWidget.h
@@ -4,15 +4,15 @@
 #ifndef FEATHER_HISTORYWIDGET_H
 #define FEATHER_HISTORYWIDGET_H
 
-#include "model/TransactionHistoryModel.h"
-#include "model/TransactionHistoryProxyModel.h"
-#include "libwalletqt/Coins.h"
-#include "libwalletqt/Wallet.h"
-#include "appcontext.h"
-
 #include <QWidget>
 #include <QMenu>
 
+#include "appcontext.h"
+#include "libwalletqt/Coins.h"
+#include "libwalletqt/Wallet.h"
+#include "model/TransactionHistoryModel.h"
+#include "model/TransactionHistoryProxyModel.h"
+
 namespace Ui {
     class HistoryWidget;
 }
diff --git a/src/historywidget.ui b/src/HistoryWidget.ui
similarity index 100%
rename from src/historywidget.ui
rename to src/HistoryWidget.ui
diff --git a/src/mainwindow.cpp b/src/MainWindow.cpp
similarity index 99%
rename from src/mainwindow.cpp
rename to src/MainWindow.cpp
index 353407f8..50d13c0c 100644
--- a/src/mainwindow.cpp
+++ b/src/MainWindow.cpp
@@ -1,38 +1,38 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include "MainWindow.h"
+#include "ui_MainWindow.h"
 
-#include <QMessageBox>
 #include <QFileDialog>
+#include <QMessageBox>
 
 #include "config-feather.h"
-#include "dialog/TxConfDialog.h"
-#include "dialog/TxConfAdvDialog.h"
-#include "dialog/DebugInfoDialog.h"
-#include "dialog/WalletInfoDialog.h"
-#include "dialog/TorInfoDialog.h"
-#include "dialog/ViewOnlyDialog.h"
-#include "dialog/TxBroadcastDialog.h"
-#include "dialog/TxImportDialog.h"
-#include "dialog/PasswordDialog.h"
+#include "constants.h"
+#include "dialog/AccountSwitcherDialog.h"
 #include "dialog/BalanceDialog.h"
+#include "dialog/DebugInfoDialog.h"
+#include "dialog/PasswordDialog.h"
+#include "dialog/TorInfoDialog.h"
+#include "dialog/TxBroadcastDialog.h"
+#include "dialog/TxConfAdvDialog.h"
+#include "dialog/TxConfDialog.h"
+#include "dialog/TxImportDialog.h"
+#include "dialog/ViewOnlyDialog.h"
+#include "dialog/WalletInfoDialog.h"
 #include "dialog/WalletCacheDebugDialog.h"
 #include "dialog/UpdateDialog.h"
-#include "dialog/AccountSwitcherDialog.h"
-#include "constants.h"
 #include "libwalletqt/AddressBook.h"
-#include "utils/AsyncTask.h"
 #include "utils/AppData.h"
+#include "utils/AsyncTask.h"
 #include "utils/ColorScheme.h"
-#include "utils/SemanticVersion.h"
-#include "utils/NetworkManager.h"
 #include "utils/Icons.h"
-#include "utils/WebsocketNotifier.h"
-#include "utils/Updater.h"
+#include "utils/NetworkManager.h"
 #include "utils/os/tails.h"
+#include "utils/SemanticVersion.h"
 #include "utils/TorManager.h"
+#include "utils/Updater.h"
+#include "utils/WebsocketNotifier.h"
 
 MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *parent)
     : QMainWindow(parent)
diff --git a/src/mainwindow.h b/src/MainWindow.h
similarity index 97%
rename from src/mainwindow.h
rename to src/MainWindow.h
index efbf13af..6d33806d 100644
--- a/src/mainwindow.h
+++ b/src/MainWindow.h
@@ -10,8 +10,8 @@
 
 #include "appcontext.h"
 #include "components.h"
-#include "calcwindow.h"
-#include "settings.h"
+#include "CalcWindow.h"
+#include "SettingsDialog.h"
 
 #include "dialog/AboutDialog.h"
 #include "dialog/SignVerifyDialog.h"
@@ -35,11 +35,11 @@
 #include "widgets/TickerWidget.h"
 #include "wizard/WalletWizard.h"
 
-#include "contactswidget.h"
-#include "historywidget.h"
-#include "sendwidget.h"
-#include "receivewidget.h"
-#include "coinswidget.h"
+#include "ContactsWidget.h"
+#include "HistoryWidget.h"
+#include "SendWidget.h"
+#include "ReceiveWidget.h"
+#include "CoinsWidget.h"
 
 #include "WindowManager.h"
 
diff --git a/src/mainwindow.ui b/src/MainWindow.ui
similarity index 99%
rename from src/mainwindow.ui
rename to src/MainWindow.ui
index 8748ebf5..4386c2e4 100644
--- a/src/mainwindow.ui
+++ b/src/MainWindow.ui
@@ -803,7 +803,7 @@
   <customwidget>
    <class>CalcWidget</class>
    <extends>QWidget</extends>
-   <header>calcwidget.h</header>
+   <header>CalcWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/src/receivewidget.cpp b/src/ReceiveWidget.cpp
similarity index 98%
rename from src/receivewidget.cpp
rename to src/ReceiveWidget.cpp
index 373bc54c..2dbeba52 100644
--- a/src/receivewidget.cpp
+++ b/src/ReceiveWidget.cpp
@@ -1,19 +1,20 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "ui_receivewidget.h"
-#include "receivewidget.h"
-#include "model/ModelUtils.h"
-#include "dialog/QrCodeDialog.h"
-#include "utils/Icons.h"
+#include "ReceiveWidget.h"
+#include "ui_ReceiveWidget.h"
 
 #include <QMenu>
 #include <QMessageBox>
 
+#include "dialog/QrCodeDialog.h"
+#include "model/ModelUtils.h"
+#include "utils/Icons.h"
+
 ReceiveWidget::ReceiveWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::ReceiveWidget)
-    , m_ctx(std::move(ctx))
+        : QWidget(parent)
+        , ui(new Ui::ReceiveWidget)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 
diff --git a/src/receivewidget.h b/src/ReceiveWidget.h
similarity index 99%
rename from src/receivewidget.h
rename to src/ReceiveWidget.h
index 5957b874..23ee78b1 100644
--- a/src/receivewidget.h
+++ b/src/ReceiveWidget.h
@@ -4,14 +4,15 @@
 #ifndef FEATHER_RECEIVEWIDGET_H
 #define FEATHER_RECEIVEWIDGET_H
 
+#include <QMenu>
+#include <QWidget>
+#include <QtSvg/QSvgWidget>
+
 #include "appcontext.h"
-#include "qrcode/QrCode.h"
 #include "libwalletqt/Subaddress.h"
 #include "model/SubaddressProxyModel.h"
 #include "model/SubaddressModel.h"
-
-#include <QWidget>
-#include <QtSvg/QSvgWidget>
+#include "qrcode/QrCode.h"
 
 namespace Ui {
     class ReceiveWidget;
diff --git a/src/receivewidget.ui b/src/ReceiveWidget.ui
similarity index 100%
rename from src/receivewidget.ui
rename to src/ReceiveWidget.ui
diff --git a/src/sendwidget.cpp b/src/SendWidget.cpp
similarity index 99%
rename from src/sendwidget.cpp
rename to src/SendWidget.cpp
index 7e6a0d44..32dbda01 100644
--- a/src/sendwidget.cpp
+++ b/src/SendWidget.cpp
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
+#include "SendWidget.h"
+#include "ui_SendWidget.h"
+
 #include <QMessageBox>
-#include "sendwidget.h"
-#include "mainwindow.h"
-#include "ui_sendwidget.h"
+
+#include "ColorScheme.h"
 #include "constants.h"
 #include "utils/AppData.h"
 #include "Icons.h"
-#include "ColorScheme.h"
 
 #ifdef WITH_SCANNER
 #include "qrcode_scanner/QrCodeScanDialog.h"
diff --git a/src/sendwidget.h b/src/SendWidget.h
similarity index 100%
rename from src/sendwidget.h
rename to src/SendWidget.h
diff --git a/src/sendwidget.ui b/src/SendWidget.ui
similarity index 100%
rename from src/sendwidget.ui
rename to src/SendWidget.ui
diff --git a/src/settings.cpp b/src/SettingsDialog.cpp
similarity index 98%
rename from src/settings.cpp
rename to src/SettingsDialog.cpp
index e29c4e9f..d948f96e 100644
--- a/src/settings.cpp
+++ b/src/SettingsDialog.cpp
@@ -1,16 +1,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright (c) 2020-2021, The Monero Project.
 
-#include "settings.h"
-#include "ui_settings.h"
-#include "mainwindow.h"
+#include "SettingsDialog.h"
+#include "ui_SettingsDialog.h"
 
 #include <QFileDialog>
 
 Settings::Settings(QSharedPointer<AppContext> ctx, QWidget *parent)
-    : QDialog(parent)
-    , ui(new Ui::Settings)
-    , m_ctx(std::move(ctx))
+        : QDialog(parent)
+        , ui(new Ui::Settings)
+        , m_ctx(std::move(ctx))
 {
     ui->setupUi(this);
 
diff --git a/src/settings.h b/src/SettingsDialog.h
similarity index 100%
rename from src/settings.h
rename to src/SettingsDialog.h
diff --git a/src/settings.ui b/src/SettingsDialog.ui
similarity index 100%
rename from src/settings.ui
rename to src/SettingsDialog.ui
diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp
index df0bf123..82d19baa 100644
--- a/src/WindowManager.cpp
+++ b/src/WindowManager.cpp
@@ -2,16 +2,17 @@
 // Copyright (c) 2020-2021, The Monero Project.
 
 #include "WindowManager.h"
+
+#include <QMessageBox>
+
 #include "constants.h"
 #include "dialog/PasswordDialog.h"
 #include "dialog/SplashDialog.h"
-#include "utils/WebsocketNotifier.h"
-#include "utils/os/tails.h"
 #include "utils/Icons.h"
 #include "utils/NetworkManager.h"
+#include "utils/os/tails.h"
 #include "utils/TorManager.h"
-
-#include <QMessageBox>
+#include "utils/WebsocketNotifier.h"
 
 WindowManager::WindowManager() {
     m_walletManager = WalletManager::instance();
diff --git a/src/WindowManager.h b/src/WindowManager.h
index ffcd636e..4a1acb22 100644
--- a/src/WindowManager.h
+++ b/src/WindowManager.h
@@ -5,11 +5,12 @@
 #define FEATHER_WINDOWMANAGER_H
 
 #include <QObject>
+
+#include "dialog/TorInfoDialog.h"
 #include "libwalletqt/WalletManager.h"
 #include "libwalletqt/Wallet.h"
+#include "MainWindow.h"
 #include "wizard/WalletWizard.h"
-#include "dialog/TorInfoDialog.h"
-#include "mainwindow.h"
 
 class MainWindow;
 class WindowManager : public QObject {
diff --git a/src/main.cpp b/src/main.cpp
index 62fdb9fd..46fef960 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,10 +6,10 @@
 #include <QtCore>
 #include <QtGui>
 
+#include "cli.h"
 #include "config-feather.h"
 #include "constants.h"
-#include "mainwindow.h"
-#include "cli.h"
+#include "MainWindow.h"
 #include "WindowManager.h"
 
 #if defined(Q_OS_WIN)