diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 6d7050ef6661c..7fdd5aa7729f1 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -54,17 +54,17 @@ QT_FORMS_UI = \
   qt/pivx/forms/createproposaldialog.ui \
   qt/pivx/forms/proposalinfodialog.ui \
   qt/pivx/forms/governancewidget.ui \
-  qt/pivx/settings/forms/settingsbackupwallet.ui \
-  qt/pivx/settings/forms/settingsexportcsv.ui \
-  qt/pivx/settings/forms/settingsbittoolwidget.ui \
-  qt/pivx/settings/forms/settingsconsolewidget.ui \
-  qt/pivx/settings/forms/settingsdisplayoptionswidget.ui \
-  qt/pivx/settings/forms/settingsfaqwidget.ui \
-  qt/pivx/settings/forms/settingsinformationwidget.ui \
-  qt/pivx/settings/forms/settingsmainoptionswidget.ui \
-  qt/pivx/settings/forms/settingssignmessagewidgets.ui \
-  qt/pivx/settings/forms/settingswalletoptionswidget.ui \
-  qt/pivx/settings/forms/settingswalletrepairwidget.ui \
+  qt/pivx/settings/forms/backupwallet.ui \
+  qt/pivx/settings/forms/exportcsv.ui \
+  qt/pivx/settings/forms/bittoolwidget.ui \
+  qt/pivx/settings/forms/consolewidget.ui \
+  qt/pivx/settings/forms/displayoptionswidget.ui \
+  qt/pivx/settings/forms/faqwidget.ui \
+  qt/pivx/settings/forms/informationwidget.ui \
+  qt/pivx/settings/forms/mainoptionswidget.ui \
+  qt/pivx/settings/forms/signmessagewidgets.ui \
+  qt/pivx/settings/forms/walletoptionswidget.ui \
+  qt/pivx/settings/forms/walletrepairwidget.ui \
   qt/pivx/settings/forms/settingswidget.ui \
   qt/pivx/forms/welcomecontentwidget.ui \
   qt/pivx/forms/splash.ui
@@ -143,17 +143,17 @@ QT_MOC_CPP = \
   qt/pivx/moc_createproposaldialog.cpp \
   qt/pivx/moc_proposalinfodialog.cpp \
   qt/pivx/moc_governancewidget.cpp \
-  qt/pivx/settings/moc_settingsbackupwallet.cpp \
-  qt/pivx/settings/moc_settingsexportcsv.cpp \
-  qt/pivx/settings/moc_settingsbittoolwidget.cpp \
-  qt/pivx/settings/moc_settingsconsolewidget.cpp \
-  qt/pivx/settings/moc_settingsdisplayoptionswidget.cpp \
-  qt/pivx/settings/moc_settingsfaqwidget.cpp \
-  qt/pivx/settings/moc_settingsinformationwidget.cpp \
-  qt/pivx/settings/moc_settingsmainoptionswidget.cpp \
-  qt/pivx/settings/moc_settingssignmessagewidgets.cpp \
-  qt/pivx/settings/moc_settingswalletoptionswidget.cpp \
-  qt/pivx/settings/moc_settingswalletrepairwidget.cpp \
+  qt/pivx/settings/moc_backupwallet.cpp \
+  qt/pivx/settings/moc_exportcsv.cpp \
+  qt/pivx/settings/moc_bittoolwidget.cpp \
+  qt/pivx/settings/moc_consolewidget.cpp \
+  qt/pivx/settings/moc_displayoptionswidget.cpp \
+  qt/pivx/settings/moc_faqwidget.cpp \
+  qt/pivx/settings/moc_informationwidget.cpp \
+  qt/pivx/settings/moc_mainoptionswidget.cpp \
+  qt/pivx/settings/moc_signmessagewidgets.cpp \
+  qt/pivx/settings/moc_walletoptionswidget.cpp \
+  qt/pivx/settings/moc_walletrepairwidget.cpp \
   qt/pivx/settings/moc_settingswidget.cpp \
   qt/pivx/moc_welcomecontentwidget.cpp \
   qt/pivx/moc_splash.cpp
@@ -259,17 +259,17 @@ BITCOIN_QT_H = \
   qt/pivx/createproposaldialog.h \
   qt/pivx/proposalinfodialog.h \
   qt/pivx/governancewidget.h \
-  qt/pivx/settings/settingsbackupwallet.h \
-  qt/pivx/settings/settingsexportcsv.h \
-  qt/pivx/settings/settingsbittoolwidget.h \
-  qt/pivx/settings/settingsconsolewidget.h \
-  qt/pivx/settings/settingsdisplayoptionswidget.h \
-  qt/pivx/settings/settingsfaqwidget.h \
-  qt/pivx/settings/settingsinformationwidget.h \
-  qt/pivx/settings/settingsmainoptionswidget.h \
-  qt/pivx/settings/settingssignmessagewidgets.h \
-  qt/pivx/settings/settingswalletoptionswidget.h \
-  qt/pivx/settings/settingswalletrepairwidget.h \
+  qt/pivx/settings/backupwallet.h \
+  qt/pivx/settings/exportcsv.h \
+  qt/pivx/settings/bittoolwidget.h \
+  qt/pivx/settings/consolewidget.h \
+  qt/pivx/settings/displayoptionswidget.h \
+  qt/pivx/settings/faqwidget.h \
+  qt/pivx/settings/informationwidget.h \
+  qt/pivx/settings/mainoptionswidget.h \
+  qt/pivx/settings/signmessagewidgets.h \
+  qt/pivx/settings/walletoptionswidget.h \
+  qt/pivx/settings/walletrepairwidget.h \
   qt/pivx/settings/settingswidget.h \
   qt/pivx/welcomecontentwidget.h \
   qt/pivx/splash.h
@@ -598,17 +598,17 @@ BITCOIN_QT_WALLET_CPP = \
   qt/pivx/createproposaldialog.cpp \
   qt/pivx/proposalinfodialog.cpp \
   qt/pivx/governancewidget.cpp \
-  qt/pivx/settings/settingsbackupwallet.cpp \
-  qt/pivx/settings/settingsexportcsv.cpp \
-  qt/pivx/settings/settingsbittoolwidget.cpp \
-  qt/pivx/settings/settingsconsolewidget.cpp \
-  qt/pivx/settings/settingsdisplayoptionswidget.cpp \
-  qt/pivx/settings/settingsfaqwidget.cpp \
-  qt/pivx/settings/settingsinformationwidget.cpp \
-  qt/pivx/settings/settingsmainoptionswidget.cpp \
-  qt/pivx/settings/settingssignmessagewidgets.cpp \
-  qt/pivx/settings/settingswalletoptionswidget.cpp \
-  qt/pivx/settings/settingswalletrepairwidget.cpp \
+  qt/pivx/settings/backupwallet.cpp \
+  qt/pivx/settings/exportcsv.cpp \
+  qt/pivx/settings/bittoolwidget.cpp \
+  qt/pivx/settings/consolewidget.cpp \
+  qt/pivx/settings/displayoptionswidget.cpp \
+  qt/pivx/settings/faqwidget.cpp \
+  qt/pivx/settings/informationwidget.cpp \
+  qt/pivx/settings/mainoptionswidget.cpp \
+  qt/pivx/settings/signmessagewidgets.cpp \
+  qt/pivx/settings/walletoptionswidget.cpp \
+  qt/pivx/settings/walletrepairwidget.cpp \
   qt/pivx/settings/settingswidget.cpp \
   qt/pivx/welcomecontentwidget.cpp \
   qt/pivx/splash.cpp
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index 264d6d5b4111c..ce1020191b6f7 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -139,17 +139,17 @@ SET(QT_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/createproposaldialog.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/proposalinfodialog.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/governancewidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbackupwallet.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbittoolwidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsconsolewidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsdisplayoptionswidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsfaqwidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsinformationwidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsmainoptionswidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingssignmessagewidgets.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswalletoptionswidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswalletrepairwidget.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsexportcsv.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/backupwallet.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/bittoolwidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/consolewidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/displayoptionswidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/faqwidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/informationwidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/mainoptionswidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/signmessagewidgets.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/walletoptionswidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/walletrepairwidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/exportcsv.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/welcomecontentwidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/splash.cpp
diff --git a/src/qt/pivx/pivxgui.h b/src/qt/pivx/pivxgui.h
index a0b64b84c122e..a442b1da9ff76 100644
--- a/src/qt/pivx/pivxgui.h
+++ b/src/qt/pivx/pivxgui.h
@@ -14,18 +14,18 @@
 #include <QSystemTrayIcon>
 #include <QLabel>
 
-#include "qt/pivx/navmenuwidget.h"
-#include "qt/pivx/topbar.h"
-#include "qt/pivx/dashboardwidget.h"
-#include "qt/pivx/send.h"
-#include "qt/pivx/receivewidget.h"
 #include "qt/pivx/addresseswidget.h"
 #include "qt/pivx/coldstakingwidget.h"
+#include "qt/pivx/dashboardwidget.h"
 #include "qt/pivx/governancewidget.h"
 #include "qt/pivx/masternodeswidget.h"
-#include "qt/pivx/snackbar.h"
+#include "qt/pivx/navmenuwidget.h"
+#include "qt/pivx/receivewidget.h"
+#include "qt/pivx/send.h"
+#include "qt/pivx/settings/faqwidget.h"
 #include "qt/pivx/settings/settingswidget.h"
-#include "qt/pivx/settings/settingsfaqwidget.h"
+#include "qt/pivx/snackbar.h"
+#include "qt/pivx/topbar.h"
 #include "qt/rpcconsole.h"
 
 namespace interfaces {
diff --git a/src/qt/pivx/settings/settingsbackupwallet.cpp b/src/qt/pivx/settings/backupwallet.cpp
similarity index 96%
rename from src/qt/pivx/settings/settingsbackupwallet.cpp
rename to src/qt/pivx/settings/backupwallet.cpp
index 73a7d49da79d8..b160f055b9015 100644
--- a/src/qt/pivx/settings/settingsbackupwallet.cpp
+++ b/src/qt/pivx/settings/backupwallet.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsbackupwallet.h"
+#include "qt/pivx/settings/backupwallet.h"
 
-#include "qt/pivx/settings/forms/ui_settingsbackupwallet.h"
+#include "qt/pivx/settings/forms/ui_backupwallet.h"
 
 #include "guiinterface.h"
 #include "guiutil.h"
diff --git a/src/qt/pivx/settings/settingsbackupwallet.h b/src/qt/pivx/settings/backupwallet.h
similarity index 78%
rename from src/qt/pivx/settings/settingsbackupwallet.h
rename to src/qt/pivx/settings/backupwallet.h
index 41baaeb9cb9b4..4225e43eedfec 100644
--- a/src/qt/pivx/settings/settingsbackupwallet.h
+++ b/src/qt/pivx/settings/backupwallet.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSBACKUPWALLET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSBACKUPWALLET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H
+#define PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -28,4 +28,4 @@ private Q_SLOTS:
     Ui::SettingsBackupWallet *ui;
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSBACKUPWALLET_H
+#endif // PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H
diff --git a/src/qt/pivx/settings/settingsbittoolwidget.cpp b/src/qt/pivx/settings/bittoolwidget.cpp
similarity index 99%
rename from src/qt/pivx/settings/settingsbittoolwidget.cpp
rename to src/qt/pivx/settings/bittoolwidget.cpp
index 261ac5292717c..f90fc030fbe5e 100644
--- a/src/qt/pivx/settings/settingsbittoolwidget.cpp
+++ b/src/qt/pivx/settings/bittoolwidget.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsbittoolwidget.h"
-#include "qt/pivx/settings/forms/ui_settingsbittoolwidget.h"
+#include "qt/pivx/settings/bittoolwidget.h"
+#include "qt/pivx/settings/forms/ui_bittoolwidget.h"
+
 #include "qt/pivx/qtutils.h"
 
 #include "guiutil.h"
diff --git a/src/qt/pivx/settings/settingsbittoolwidget.h b/src/qt/pivx/settings/bittoolwidget.h
similarity index 86%
rename from src/qt/pivx/settings/settingsbittoolwidget.h
rename to src/qt/pivx/settings/bittoolwidget.h
index 085ec1483f421..e7f9e09e6fc10 100644
--- a/src/qt/pivx/settings/settingsbittoolwidget.h
+++ b/src/qt/pivx/settings/bittoolwidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSBITTOOLWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSBITTOOLWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -44,4 +44,4 @@ public Q_SLOTS:
     void resizeMenu();
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSBITTOOLWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H
diff --git a/src/qt/pivx/settings/settingsconsolewidget.cpp b/src/qt/pivx/settings/consolewidget.cpp
similarity index 99%
rename from src/qt/pivx/settings/settingsconsolewidget.cpp
rename to src/qt/pivx/settings/consolewidget.cpp
index 3e15497710d5e..fdabe2fe58c5b 100644
--- a/src/qt/pivx/settings/settingsconsolewidget.cpp
+++ b/src/qt/pivx/settings/consolewidget.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsconsolewidget.h"
-#include "qt/pivx/settings/forms/ui_settingsconsolewidget.h"
+#include "qt/pivx/settings/consolewidget.h"
+#include "qt/pivx/settings/forms/ui_consolewidget.h"
 
 #include "qt/pivx/qtutils.h"
 #include "qt/rpcexecutor.h"
diff --git a/src/qt/pivx/settings/settingsconsolewidget.h b/src/qt/pivx/settings/consolewidget.h
similarity index 91%
rename from src/qt/pivx/settings/settingsconsolewidget.h
rename to src/qt/pivx/settings/consolewidget.h
index 21aee2141387d..26137bd80cfaf 100644
--- a/src/qt/pivx/settings/settingsconsolewidget.h
+++ b/src/qt/pivx/settings/consolewidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSCONSOLEWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSCONSOLEWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -71,4 +71,4 @@ private Q_SLOTS:
 
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSCONSOLEWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H
diff --git a/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp b/src/qt/pivx/settings/displayoptionswidget.cpp
similarity index 97%
rename from src/qt/pivx/settings/settingsdisplayoptionswidget.cpp
rename to src/qt/pivx/settings/displayoptionswidget.cpp
index e8d2b09b953af..c9c36cf6ec5cb 100644
--- a/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp
+++ b/src/qt/pivx/settings/displayoptionswidget.cpp
@@ -2,17 +2,19 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsdisplayoptionswidget.h"
-#include "qt/pivx/settings/forms/ui_settingsdisplayoptionswidget.h"
-#include <QListView>
-#include <QSettings>
-#include <QDir>
-#include "guiutil.h"
+#include "qt/pivx/settings/displayoptionswidget.h"
+#include "qt/pivx/settings/forms/ui_displayoptionswidget.h"
+
+#include "bitcoinunits.h"
 #include "clientmodel.h"
+#include "guiutil.h"
 #include "optionsmodel.h"
-#include "bitcoinunits.h"
 #include "qt/pivx/qtutils.h"
 
+#include <QDir>
+#include <QListView>
+#include <QSettings>
+
 SettingsDisplayOptionsWidget::SettingsDisplayOptionsWidget(PIVXGUI* _window, QWidget *parent) :
     PWidget(_window,parent),
     ui(new Ui::SettingsDisplayOptionsWidget)
diff --git a/src/qt/pivx/settings/settingsdisplayoptionswidget.h b/src/qt/pivx/settings/displayoptionswidget.h
similarity index 81%
rename from src/qt/pivx/settings/settingsdisplayoptionswidget.h
rename to src/qt/pivx/settings/displayoptionswidget.h
index deb73e3837466..67d9cb9ead16c 100644
--- a/src/qt/pivx/settings/settingsdisplayoptionswidget.h
+++ b/src/qt/pivx/settings/displayoptionswidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSDISPLAYOPTIONSWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSDISPLAYOPTIONSWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H
 
 #include <QWidget>
 #include <QDataWidgetMapper>
@@ -36,4 +36,4 @@ public Q_SLOTS:
     Ui::SettingsDisplayOptionsWidget *ui;
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSDISPLAYOPTIONSWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H
diff --git a/src/qt/pivx/settings/settingsexportcsv.cpp b/src/qt/pivx/settings/exportcsv.cpp
similarity index 98%
rename from src/qt/pivx/settings/settingsexportcsv.cpp
rename to src/qt/pivx/settings/exportcsv.cpp
index 7c3844ad34056..3b5098222022f 100644
--- a/src/qt/pivx/settings/settingsexportcsv.cpp
+++ b/src/qt/pivx/settings/exportcsv.cpp
@@ -2,14 +2,16 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsexportcsv.h"
-#include "qt/pivx/settings/forms/ui_settingsexportcsv.h"
-#include <QFile>
+#include "qt/pivx/settings/exportcsv.h"
+#include "qt/pivx/settings/forms/ui_exportcsv.h"
+
 #include "csvmodelwriter.h"
+#include "guiinterface.h"
 #include "guiutil.h"
 #include "optionsmodel.h"
 #include "qt/pivx/qtutils.h"
-#include "guiinterface.h"
+
+#include <QFile>
 
 SettingsExportCSV::SettingsExportCSV(PIVXGUI* _window, QWidget *parent) :
     PWidget(_window, parent),
diff --git a/src/qt/pivx/settings/settingsexportcsv.h b/src/qt/pivx/settings/exportcsv.h
similarity index 84%
rename from src/qt/pivx/settings/settingsexportcsv.h
rename to src/qt/pivx/settings/exportcsv.h
index a42bcf421ae4a..ede07c900102b 100644
--- a/src/qt/pivx/settings/settingsexportcsv.h
+++ b/src/qt/pivx/settings/exportcsv.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSEXPORTCSV_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSEXPORTCSV_H
+#ifndef PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H
+#define PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -33,4 +33,4 @@ private Q_SLOTS:
     QSortFilterProxyModel* addressFilter{nullptr};
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSEXPORTCSV_H
+#endif // PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H
diff --git a/src/qt/pivx/settings/settingsfaqwidget.cpp b/src/qt/pivx/settings/faqwidget.cpp
similarity index 98%
rename from src/qt/pivx/settings/settingsfaqwidget.cpp
rename to src/qt/pivx/settings/faqwidget.cpp
index 351ad52e27be7..48989ea7d9cbf 100644
--- a/src/qt/pivx/settings/settingsfaqwidget.cpp
+++ b/src/qt/pivx/settings/faqwidget.cpp
@@ -6,8 +6,9 @@
 #include "config/pivx-config.h"
 #endif
 
-#include "qt/pivx/settings/settingsfaqwidget.h"
-#include "qt/pivx/settings/forms/ui_settingsfaqwidget.h"
+#include "qt/pivx/settings/faqwidget.h"
+#include "qt/pivx/settings/forms/ui_faqwidget.h"
+
 #include "qt/pivx/mnmodel.h"
 #include "qt/pivx/qtutils.h"
 
diff --git a/src/qt/pivx/settings/settingsfaqwidget.h b/src/qt/pivx/settings/faqwidget.h
similarity index 92%
rename from src/qt/pivx/settings/settingsfaqwidget.h
rename to src/qt/pivx/settings/faqwidget.h
index 06c397abe3a80..6cb69eed438bc 100644
--- a/src/qt/pivx/settings/settingsfaqwidget.h
+++ b/src/qt/pivx/settings/faqwidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSFAQWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSFAQWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H
 
 #include <QDialog>
 
@@ -70,4 +70,4 @@ private Q_SLOTS:
     }
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSFAQWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H
diff --git a/src/qt/pivx/settings/forms/settingsbackupwallet.ui b/src/qt/pivx/settings/forms/backupwallet.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsbackupwallet.ui
rename to src/qt/pivx/settings/forms/backupwallet.ui
diff --git a/src/qt/pivx/settings/forms/settingsbittoolwidget.ui b/src/qt/pivx/settings/forms/bittoolwidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsbittoolwidget.ui
rename to src/qt/pivx/settings/forms/bittoolwidget.ui
diff --git a/src/qt/pivx/settings/forms/settingsconsolewidget.ui b/src/qt/pivx/settings/forms/consolewidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsconsolewidget.ui
rename to src/qt/pivx/settings/forms/consolewidget.ui
diff --git a/src/qt/pivx/settings/forms/settingsdisplayoptionswidget.ui b/src/qt/pivx/settings/forms/displayoptionswidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsdisplayoptionswidget.ui
rename to src/qt/pivx/settings/forms/displayoptionswidget.ui
diff --git a/src/qt/pivx/settings/forms/settingsexportcsv.ui b/src/qt/pivx/settings/forms/exportcsv.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsexportcsv.ui
rename to src/qt/pivx/settings/forms/exportcsv.ui
diff --git a/src/qt/pivx/settings/forms/settingsfaqwidget.ui b/src/qt/pivx/settings/forms/faqwidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsfaqwidget.ui
rename to src/qt/pivx/settings/forms/faqwidget.ui
diff --git a/src/qt/pivx/settings/forms/settingsinformationwidget.ui b/src/qt/pivx/settings/forms/informationwidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsinformationwidget.ui
rename to src/qt/pivx/settings/forms/informationwidget.ui
diff --git a/src/qt/pivx/settings/forms/settingsmainoptionswidget.ui b/src/qt/pivx/settings/forms/mainoptionswidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingsmainoptionswidget.ui
rename to src/qt/pivx/settings/forms/mainoptionswidget.ui
diff --git a/src/qt/pivx/settings/forms/settingssignmessagewidgets.ui b/src/qt/pivx/settings/forms/signmessagewidgets.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingssignmessagewidgets.ui
rename to src/qt/pivx/settings/forms/signmessagewidgets.ui
diff --git a/src/qt/pivx/settings/forms/settingswalletoptionswidget.ui b/src/qt/pivx/settings/forms/walletoptionswidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingswalletoptionswidget.ui
rename to src/qt/pivx/settings/forms/walletoptionswidget.ui
diff --git a/src/qt/pivx/settings/forms/settingswalletrepairwidget.ui b/src/qt/pivx/settings/forms/walletrepairwidget.ui
similarity index 100%
rename from src/qt/pivx/settings/forms/settingswalletrepairwidget.ui
rename to src/qt/pivx/settings/forms/walletrepairwidget.ui
diff --git a/src/qt/pivx/settings/settingsinformationwidget.cpp b/src/qt/pivx/settings/informationwidget.cpp
similarity index 98%
rename from src/qt/pivx/settings/settingsinformationwidget.cpp
rename to src/qt/pivx/settings/informationwidget.cpp
index 730a94c461093..021b535bd3646 100644
--- a/src/qt/pivx/settings/settingsinformationwidget.cpp
+++ b/src/qt/pivx/settings/informationwidget.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsinformationwidget.h"
-#include "qt/pivx/settings/forms/ui_settingsinformationwidget.h"
+#include "qt/pivx/settings/informationwidget.h"
+#include "qt/pivx/settings/forms/ui_informationwidget.h"
 
 #include "clientmodel.h"
 #include "chainparams.h"
diff --git a/src/qt/pivx/settings/settingsinformationwidget.h b/src/qt/pivx/settings/informationwidget.h
similarity index 86%
rename from src/qt/pivx/settings/settingsinformationwidget.h
rename to src/qt/pivx/settings/informationwidget.h
index 566dc761fa633..e1fb76950d373 100644
--- a/src/qt/pivx/settings/settingsinformationwidget.h
+++ b/src/qt/pivx/settings/informationwidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSINFORMATIONWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSINFORMATIONWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -45,4 +45,4 @@ public Q_SLOTS:
     void updateNetworkState(int numConnections);
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSINFORMATIONWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H
diff --git a/src/qt/pivx/settings/settingsmainoptionswidget.cpp b/src/qt/pivx/settings/mainoptionswidget.cpp
similarity index 96%
rename from src/qt/pivx/settings/settingsmainoptionswidget.cpp
rename to src/qt/pivx/settings/mainoptionswidget.cpp
index 9551c86e6b2af..dd2e562bb93fe 100644
--- a/src/qt/pivx/settings/settingsmainoptionswidget.cpp
+++ b/src/qt/pivx/settings/mainoptionswidget.cpp
@@ -2,9 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsmainoptionswidget.h"
-#include "qt/pivx/settings/forms/ui_settingsmainoptionswidget.h"
-#include "QListView"
+#include "qt/pivx/settings/mainoptionswidget.h"
+#include "qt/pivx/settings/forms/ui_mainoptionswidget.h"
 
 #if defined(HAVE_CONFIG_H)
 #include "config/pivx-config.h"
diff --git a/src/qt/pivx/settings/settingsmainoptionswidget.h b/src/qt/pivx/settings/mainoptionswidget.h
similarity index 81%
rename from src/qt/pivx/settings/settingsmainoptionswidget.h
rename to src/qt/pivx/settings/mainoptionswidget.h
index 570612e22e2ce..de3ee6bb05832 100644
--- a/src/qt/pivx/settings/settingsmainoptionswidget.h
+++ b/src/qt/pivx/settings/mainoptionswidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSMAINOPTIONSWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSMAINOPTIONSWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_MAINOPTIONSWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_MAINOPTIONSWIDGET_H
 
 #include "qt/pivx/pwidget.h"
 
@@ -38,4 +38,4 @@ public Q_SLOTS:
     Ui::SettingsMainOptionsWidget *ui;
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSMAINOPTIONSWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_MAINOPTIONSWIDGET_H
diff --git a/src/qt/pivx/settings/settingsnetworkwidget.cpp b/src/qt/pivx/settings/networkwidget.cpp
similarity index 90%
rename from src/qt/pivx/settings/settingsnetworkwidget.cpp
rename to src/qt/pivx/settings/networkwidget.cpp
index 08094774e010b..c724c3f6a34e3 100644
--- a/src/qt/pivx/settings/settingsnetworkwidget.cpp
+++ b/src/qt/pivx/settings/networkwidget.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingsnetworkwidget.h"
-#include "qt/pivx/settings/forms/ui_settingsnetworkwidget.h"
+#include "qt/pivx/settings/networkwidget.h"
+#include "qt/pivx/settings/forms/ui_networkwidget.h"
+
 #include "optionsmodel.h"
 #include "qt/pivx/qtutils.h"
 
diff --git a/src/qt/pivx/settings/settingsnetworkwidget.h b/src/qt/pivx/settings/networkwidget.h
similarity index 79%
rename from src/qt/pivx/settings/settingsnetworkwidget.h
rename to src/qt/pivx/settings/networkwidget.h
index d54105917da9f..167bb6e14cd65 100644
--- a/src/qt/pivx/settings/settingsnetworkwidget.h
+++ b/src/qt/pivx/settings/networkwidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSNETWORKWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSNETWORKWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_NETWORKWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_NETWORKWIDGET_H
 
 #include <QWidget>
 #include <QDataWidgetMapper>
@@ -30,4 +30,4 @@ class SettingsNetworkWidget : public PWidget
     void saveSettings() {};
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSNETWORKWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_NETWORKWIDGET_H
diff --git a/src/qt/pivx/settings/settingswidget.h b/src/qt/pivx/settings/settingswidget.h
index 917ca3de58fee..912a64f24f659 100644
--- a/src/qt/pivx/settings/settingswidget.h
+++ b/src/qt/pivx/settings/settingswidget.h
@@ -6,17 +6,18 @@
 #define PIVX_QT_PIVX_SETTINGS_SETTINGSWIDGET_H
 
 #include <QWidget>
+
 #include "qt/pivx/pwidget.h"
-#include "qt/pivx/settings/settingsbackupwallet.h"
-#include "qt/pivx/settings/settingsexportcsv.h"
-#include "qt/pivx/settings/settingsbittoolwidget.h"
-#include "qt/pivx/settings/settingssignmessagewidgets.h"
-#include "qt/pivx/settings/settingswalletrepairwidget.h"
-#include "qt/pivx/settings/settingswalletoptionswidget.h"
-#include "qt/pivx/settings/settingsmainoptionswidget.h"
-#include "qt/pivx/settings/settingsdisplayoptionswidget.h"
-#include "qt/pivx/settings/settingsinformationwidget.h"
-#include "qt/pivx/settings/settingsconsolewidget.h"
+#include "qt/pivx/settings/backupwallet.h"
+#include "qt/pivx/settings/bittoolwidget.h"
+#include "qt/pivx/settings/consolewidget.h"
+#include "qt/pivx/settings/displayoptionswidget.h"
+#include "qt/pivx/settings/exportcsv.h"
+#include "qt/pivx/settings/informationwidget.h"
+#include "qt/pivx/settings/mainoptionswidget.h"
+#include "qt/pivx/settings/signmessagewidgets.h"
+#include "qt/pivx/settings/walletoptionswidget.h"
+#include "qt/pivx/settings/walletrepairwidget.h"
 
 class PIVXGUI;
 
diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.cpp b/src/qt/pivx/settings/signmessagewidgets.cpp
similarity index 98%
rename from src/qt/pivx/settings/settingssignmessagewidgets.cpp
rename to src/qt/pivx/settings/signmessagewidgets.cpp
index dcb1c2a0a6617..bf69fd9594e7e 100644
--- a/src/qt/pivx/settings/settingssignmessagewidgets.cpp
+++ b/src/qt/pivx/settings/signmessagewidgets.cpp
@@ -2,12 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingssignmessagewidgets.h"
+#include "qt/pivx/settings/signmessagewidgets.h"
+#include "qt/pivx/settings/forms/ui_signmessagewidgets.h"
 
 #include "key_io.h"
 #include "messagesigner.h"
 #include "qt/askpassphrasedialog.h"
-#include "qt/pivx/settings/forms/ui_settingssignmessagewidgets.h"
 #include "qt/pivx/qtutils.h"
 #include "qt/walletmodel.h"
 #include "util/validation.h"
diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.h b/src/qt/pivx/settings/signmessagewidgets.h
similarity index 85%
rename from src/qt/pivx/settings/settingssignmessagewidgets.h
rename to src/qt/pivx/settings/signmessagewidgets.h
index fc5194509ae40..4276e40c44c9b 100644
--- a/src/qt/pivx/settings/settingssignmessagewidgets.h
+++ b/src/qt/pivx/settings/signmessagewidgets.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSSIGNMESSAGEWIDGETS_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSSIGNMESSAGEWIDGETS_H
+#ifndef PIVX_QT_PIVX_SETTINGS_SIGNMESSAGEWIDGETS_H
+#define PIVX_QT_PIVX_SETTINGS_SIGNMESSAGEWIDGETS_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -41,4 +41,4 @@ public Q_SLOTS:
     void resizeMenu();
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSSIGNMESSAGEWIDGETS_H
+#endif // PIVX_QT_PIVX_SETTINGS_SIGNMESSAGEWIDGETS_H
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.cpp b/src/qt/pivx/settings/walletoptionswidget.cpp
similarity index 97%
rename from src/qt/pivx/settings/settingswalletoptionswidget.cpp
rename to src/qt/pivx/settings/walletoptionswidget.cpp
index 85b7f836e7df4..0d78fea2325f8 100644
--- a/src/qt/pivx/settings/settingswalletoptionswidget.cpp
+++ b/src/qt/pivx/settings/walletoptionswidget.cpp
@@ -2,13 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingswalletoptionswidget.h"
-#include "qt/pivx/settings/forms/ui_settingswalletoptionswidget.h"
-#include <QListView>
-#include "optionsmodel.h"
+#include "qt/pivx/settings/walletoptionswidget.h"
+#include "qt/pivx/settings/forms/ui_walletoptionswidget.h"
+
 #include "clientmodel.h"
+#include "optionsmodel.h"
 #include "qt/pivx/qtutils.h"
 
+#include <QListView>
+
 SettingsWalletOptionsWidget::SettingsWalletOptionsWidget(PIVXGUI* _window, QWidget *parent) :
     PWidget(_window, parent),
     ui(new Ui::SettingsWalletOptionsWidget)
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.h b/src/qt/pivx/settings/walletoptionswidget.h
similarity index 86%
rename from src/qt/pivx/settings/settingswalletoptionswidget.h
rename to src/qt/pivx/settings/walletoptionswidget.h
index 75d9957d7e2bb..2c225c1606eda 100644
--- a/src/qt/pivx/settings/settingswalletoptionswidget.h
+++ b/src/qt/pivx/settings/walletoptionswidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSWALLETOPTIONSWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSWALLETOPTIONSWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_WALLETOPTIONSWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_WALLETOPTIONSWIDGET_H
 
 #include <QWidget>
 #include <QDataWidgetMapper>
@@ -48,4 +48,4 @@ public Q_SLOTS:
     void setNetworkActivity(bool active);
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSWALLETOPTIONSWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_WALLETOPTIONSWIDGET_H
diff --git a/src/qt/pivx/settings/settingswalletrepairwidget.cpp b/src/qt/pivx/settings/walletrepairwidget.cpp
similarity index 97%
rename from src/qt/pivx/settings/settingswalletrepairwidget.cpp
rename to src/qt/pivx/settings/walletrepairwidget.cpp
index 0ca0db2442575..1faccd5004bd9 100644
--- a/src/qt/pivx/settings/settingswalletrepairwidget.cpp
+++ b/src/qt/pivx/settings/walletrepairwidget.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "qt/pivx/settings/settingswalletrepairwidget.h"
-#include "qt/pivx/settings/forms/ui_settingswalletrepairwidget.h"
+#include "qt/pivx/settings/walletrepairwidget.h"
+#include "qt/pivx/settings/forms/ui_walletrepairwidget.h"
+
 #include "qt/pivx/qtutils.h"
 
 SettingsWalletRepairWidget::SettingsWalletRepairWidget(PIVXGUI* _window, QWidget *parent) :
diff --git a/src/qt/pivx/settings/settingswalletrepairwidget.h b/src/qt/pivx/settings/walletrepairwidget.h
similarity index 84%
rename from src/qt/pivx/settings/settingswalletrepairwidget.h
rename to src/qt/pivx/settings/walletrepairwidget.h
index a5763a98a4dc0..8da3ccda71a0d 100644
--- a/src/qt/pivx/settings/settingswalletrepairwidget.h
+++ b/src/qt/pivx/settings/walletrepairwidget.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSWALLETREPAIRWIDGET_H
-#define PIVX_QT_PIVX_SETTINGS_SETTINGSWALLETREPAIRWIDGET_H
+#ifndef PIVX_QT_PIVX_SETTINGS_WALLETREPAIRWIDGET_H
+#define PIVX_QT_PIVX_SETTINGS_WALLETREPAIRWIDGET_H
 
 #include <QWidget>
 #include "qt/pivx/pwidget.h"
@@ -40,4 +40,4 @@ public Q_SLOTS:
     Ui::SettingsWalletRepairWidget *ui;
 };
 
-#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSWALLETREPAIRWIDGET_H
+#endif // PIVX_QT_PIVX_SETTINGS_WALLETREPAIRWIDGET_H