More renaming and cleanup

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5237 17fca916-40b9-46aa-a4ea-0a15b648b75c

85 files changed, 151 insertions, 151 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index 5c4ea7e0d..6060e4229 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -26,8 +26,8 @@
 #include "instances.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
 #include "KviTalToolTip.h"
 
 #include <QLayout>
diff --git a/src/modules/options/container.h b/src/modules/options/container.h
index d6888053d..0464213d3 100644
--- a/src/modules/options/container.h
+++ b/src/modules/options/container.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QWidget>
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index a83a2d66e..9e323587a 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -25,11 +25,11 @@
 
 #include "dialog.h"
 
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_module.h"
+#include "KviIconManager.h"
+#include "KviModule.h"
 #include "KviPointerHashTable.h"
 #include "KviTalVBox.h"
 #include "KviTalToolTip.h"
@@ -55,7 +55,7 @@
 //extern KviModule * g_pOptionsModule;
 extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
 
-extern KVIRC_API KviApp * g_pApp;
+extern KVIRC_API KviApplication * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
 KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 78bc42e08..a867182b8 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -27,7 +27,7 @@
 
 #include "instances.h"
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include <QTreeWidget>
 
 #include <QWidget>
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index f311d07d6..3999ff5ae 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -71,7 +71,7 @@
 #include "optw_windowlist.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "instances.h"
 
 int g_iOptionWidgetInstances = 0;
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index 877dbf13c..b201622a6 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -33,8 +33,8 @@
 // so any change should go in that script
 //
 
-#include "kvi_optionswidget.h"
-#include "kvi_module.h"
+#include "KviOptionsWidget.h"
+#include "KviModule.h"
 #include "KviPointerList.h"
 #include "KviQString.h"
 
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 51020570e..5f9a8b3e3 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -26,15 +26,15 @@
 #include "instances.h"
 #include "dialog.h"
 
-#include "kvi_module.h"
-#include "kvi_options.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviOptions.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
 #include "kvi_out.h"
-#include "kvi_splash.h"
+#include "KviSplashScreen.h"
 #include "KviPointerHashTable.h"
 
 #include <QSplitter>
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 8ddf37546..4b562a5d4 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_antispam.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/optw_antispam.h
index f37202163..40b50b82f 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/optw_antispam.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAntispamOptionsWidget KVI_SMALLICON_SPAM
 #define KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget __tr2qs_no_lookup("Anti-spam")
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 7e2bc9d46..e7d656027 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -25,8 +25,8 @@
 #include "optw_avatar.h"
 
 #include "KviLocale.h"
-#include "kvi_selectors.h"
-#include "kvi_options.h"
+#include "KviSelectors.h"
+#include "KviOptions.h"
 #include "KviTalToolTip.h"
 
 KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_avatar.h b/src/modules/options/optw_avatar.h
index da41023dd..698e3b69b 100644
--- a/src/modules/options/optw_avatar.h
+++ b/src/modules/options/optw_avatar.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAvatarAdvancedOptionsWidget KVI_SMALLICON_AVATAR
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index eb8b6366f..5f36a8948 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_away.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h
index 8b1c1a99a..239ee6a64 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/optw_away.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAwayOptionsWidget KVI_SMALLICON_AWAY
 #define KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget __tr2qs_no_lookup("Away")
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/optw_channel.cpp
index 85216923c..a7a0541c2 100644
--- a/src/modules/options/optw_channel.cpp
+++ b/src/modules/options/optw_channel.cpp
@@ -29,7 +29,7 @@
 
 #include "optw_channel.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_settings.h"
 #include "KviIrcMask.h"
diff --git a/src/modules/options/optw_channel.h b/src/modules/options/optw_channel.h
index 14e6710d6..5d4761f3a 100644
--- a/src/modules/options/optw_channel.h
+++ b/src/modules/options/optw_channel.h
@@ -28,7 +28,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 class QComboBox;
 
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 55f27a9e5..1bfee55ba 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -27,8 +27,8 @@
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_iconmanager.h"
+#include "KviOptions.h"
+#include "KviIconManager.h"
 
 #include <QRadioButton>
 
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/optw_connection.h
index d77ad67ce..ed8472151 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/optw_connection.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 class QRadioButton;
 
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 581e995a9..b64dd698b 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 
 KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/optw_ctcp.h
index 5799b0617..8d23d497f 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/optw_ctcp.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviCtcpOptionsWidget KVI_SMALLICON_CTCPREQUESTREPLIED
 #define KVI_OPTIONS_WIDGET_NAME_KviCtcpOptionsWidget __tr2qs_no_lookup("CTCP")
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index c5216a0d2..7b653493e 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_ctcpfloodprotection.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/optw_ctcpfloodprotection.h
index 9b9715ed3..f1782f371 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/optw_ctcpfloodprotection.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviCtcpFloodProtectionOptionsWidget KVI_SMALLICON_CTCPREQUESTFLOOD
 #define KVI_OPTIONS_WIDGET_NAME_KviCtcpFloodProtectionOptionsWidget __tr2qs_no_lookup("Flood Protection")
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 02e17ce6a..bec73426b 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_dcc.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_dcc.h b/src/modules/options/optw_dcc.h
index 6291628a9..352fc9b7b 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/optw_dcc.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccOptionsWidget KVI_SMALLICON_DCCERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviDccOptionsWidget __tr2qs_no_lookup("DCC")
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index 3be9c4bb3..d4b955624 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 
 KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_generalopt.h b/src/modules/options/optw_generalopt.h
index 25394583f..d08f9643b 100644
--- a/src/modules/options/optw_generalopt.h
+++ b/src/modules/options/optw_generalopt.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviGeneralOptOptionsWidget KVI_SMALLICON_OPTIONS
 #define KVI_OPTIONS_WIDGET_NAME_KviGeneralOptOptionsWidget __tr2qs_no_lookup("General options")
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index af86ea88d..433f518eb 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "optw_highlighting.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/optw_highlighting.h
index bb3ed64ca..6c18a1d96 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/optw_highlighting.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 class QRadioButton;
 class QLineEdit;
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 120c7d545..66d4c9c37 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -26,15 +26,15 @@
 
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_console.h"
-#include "kvi_optionswidget.h"
-#include "kvi_filedialog.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviOptionsWidget.h"
+#include "KviFileDialog.h"
 #include "kvi_fileextensions.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviHttpRequest.h"
 #include "KviIdentityProfile.h"
 #include "KviTalToolTip.h"
@@ -153,7 +153,7 @@ void KviAvatarDownloadDialog::startDownload()
 
 	QString tmp = m_szUrl;
 	g_pIconManager->urlToCachedFileName(tmp);
-	g_pApp->getLocalKvircDirectory(m_szLocalFileName,KviApp::Avatars,tmp);
+	g_pApp->getLocalKvircDirectory(m_szLocalFileName,KviApplication::Avatars,tmp);
 
 	m_pRequest->setExistingFileAction(KviHttpRequest::RenameExisting);
 	if(!m_pRequest->get(KviUrl(m_szUrl),KviHttpRequest::StoreToFile,m_szLocalFileName.toUtf8().data()))
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 6075b5984..f0363d1d6 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -27,9 +27,9 @@
 //=============================================================================
 
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include "kvi_settings.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPixmap.h"
 
 #include <QDialog>
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 6e17f24b2..32b406746 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -25,7 +25,7 @@
 
 #include "optw_ignore.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_ignore.h b/src/modules/options/optw_ignore.h
index 9a52f04d9..a5fb2923f 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/optw_ignore.h
@@ -25,8 +25,8 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
-#include "kvi_selectors.h"
+#include "KviOptionsWidget.h"
+#include "KviSelectors.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIgnoreOptionsWidget KVI_SMALLICON_IGNORE
 #define KVI_OPTIONS_WIDGET_NAME_KviIgnoreOptionsWidget __tr2qs_no_lookup("Ignore")
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index d72909668..ad20571c5 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_input.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h
index 81a9fbcbb..37ec00a84 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/optw_input.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index fbf256131..82cec309b 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -24,9 +24,9 @@
 
 #include "optw_interfacefeatures.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 
 #include <QLayout>
@@ -46,7 +46,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Remember window properties","options"),KviOption_boolWindowsRememberProperties);
 
 	QString szSplashDisableFile;
-	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApp::Pics,"disable-splash." KVI_VERSION);
+	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApplication::Pics,"disable-splash." KVI_VERSION);
 	bool bDisableSplash = KviFileUtils::fileExists(szSplashDisableFile);
 	m_pDisableSplash = new QCheckBox(__tr2qs_ctx("Disable splash screen","options"),this);
 	addWidgetToLayout(m_pDisableSplash,0,3,0,3);
@@ -73,7 +73,7 @@ void KviInterfaceFeaturesOptionsWidget::commit()
 	KviOptionsWidget::commit();
 
 	QString szSplashDisableFile;
-	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApp::Pics,"disable-splash." KVI_VERSION);
+	g_pApp->getLocalKvircDirectory(szSplashDisableFile,KviApplication::Pics,"disable-splash." KVI_VERSION);
 
 	if(m_pDisableSplash->isChecked())
 	{
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h
index cdcc483f6..0c7a6879b 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/optw_interfacefeatures.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include <QCheckBox>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviInterfaceFeaturesOptionsWidget KVI_SMALLICON_IDEA
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 1265a5bb7..b55beaa8b 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -25,9 +25,9 @@
 #include "optw_interfacelookglobal.h"
 
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviTalToolTip.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index f60bcf2f1..fd4105d65 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_optionswidget.h"
-#include "kvi_selectors.h"
+#include "KviOptionsWidget.h"
+#include "KviSelectors.h"
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviThemeGeneralOptionsWidget KVI_SMALLICON_GUI
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 904c679e4..7bd1d326b 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviIrcMask.h"
 
 
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/optw_irc.h
index 9d91f9310..3948111f8 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/optw_irc.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcOptionsWidget __tr2qs_no_lookup("IRC")
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 5fcdbfd2b..00e37a4b3 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -25,7 +25,7 @@
 #include "optw_ircoutput.h"
 
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviTalToolTip.h"
 
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index 20aafd883..a3993751a 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 
 class QComboBox;
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index ad5fdbe2b..200c89fa2 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -25,7 +25,7 @@
 
 #include "optw_ircview.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_ircview.h b/src/modules/options/optw_ircview.h
index 66ac618e4..4a4df0bf3 100644
--- a/src/modules/options/optw_ircview.h
+++ b/src/modules/options/optw_ircview.h
@@ -27,7 +27,7 @@
 //=============================================================================
 
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 8aaa893e3..b998cf2ac 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -25,7 +25,7 @@
 
 #include "optw_lag.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviTalToolTip.h"
 
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/optw_lag.h
index f34b9075e..c6e24abfc 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/optw_lag.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviLagOptionsWidget KVI_SMALLICON_STATS
 #define KVI_OPTIONS_WIDGET_NAME_KviLagOptionsWidget __tr2qs_no_lookup("Lag")
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index e85853d46..aacaee36a 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_logging.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/optw_logging.h
index a0cadfbf2..0fcbe9919 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/optw_logging.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviLoggingOptionsWidget KVI_SMALLICON_LOG
 #define KVI_OPTIONS_WIDGET_NAME_KviLoggingOptionsWidget __tr2qs_no_lookup("Logging")
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 114be5bf5..e3c97a6c7 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -24,14 +24,14 @@
 
 #include "optw_mediatypes.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviTalToolTip.h"
 
 #include <QLayout>
 #include <QLabel>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviMediaManager * g_pMediaManager;
 
 static void copyMediaType(KviMediaType * dst,const KviMediaType * src)
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index aea1704af..aec8a6f2d 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include "KviMediaType.h"
 #include <QTreeWidget>
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 8a4e794ea..b3583b950 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -27,13 +27,13 @@
 #include "optw_messages.h"
 
 #include "kvi_settings.h"
-#include "kvi_options.h"
-#include "kvi_app.h"
+#include "KviOptions.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviTalVBox.h"
 
 #include <QLayout>
@@ -551,7 +551,7 @@ void KviMessageColorsOptionsWidget::save()
 {
 	QString szName;
 	QString szInit;
-	g_pApp->getLocalKvircDirectory(szInit,KviApp::MsgColors);
+	g_pApp->getLocalKvircDirectory(szInit,KviApplication::MsgColors);
 
 	if(KviFileDialog::askForSaveFileName(szName,__tr2qs_ctx("Choose a Filename - KVIrc","options"),szInit))
 	{
@@ -591,14 +591,14 @@ void KviMessageColorsOptionsWidget::load()
 
 	QString szName;
 	QString szInit;
-	g_pApp->getLocalKvircDirectory(szInit,KviApp::MsgColors);
+	g_pApp->getLocalKvircDirectory(szInit,KviApplication::MsgColors);
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	// symlink local to global
 	QString szGlobal;
-	g_pApp->getGlobalKvircDirectory(szGlobal,KviApp::MsgColors);
+	g_pApp->getGlobalKvircDirectory(szGlobal,KviApplication::MsgColors);
 	QString szLocal;
-	g_pApp->getLocalKvircDirectory(szLocal,KviApp::MsgColors,"presets");
+	g_pApp->getLocalKvircDirectory(szLocal,KviApplication::MsgColors,"presets");
 	//qDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr());
 	//qDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr()));
 	//qDebug("ERRNO (%d)",errno);
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index 90093a8d2..2bfd7e4ed 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include "KviMessageTypeSettings.h"
 #include "KviTalPopupMenu.h"
 
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index cd3e49a86..4e76a6593 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -25,7 +25,7 @@
 #include "optw_nickserv.h"
 
 #include "KviQString.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviNickServRuleSet.h"
 #include "KviIrcMask.h"
@@ -38,7 +38,7 @@
 #include <QMessageBox>
 
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviNickServRuleSet * g_pNickServRuleSet;
 
 
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 3a4eee01e..78100b959 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -27,7 +27,7 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QDialog>
 #include <QCheckBox>
diff --git a/src/modules/options/optw_notifier.cpp b/src/modules/options/optw_notifier.cpp
index 43216daa3..df0ae0591 100644
--- a/src/modules/options/optw_notifier.cpp
+++ b/src/modules/options/optw_notifier.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_notifier.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_notifier.h b/src/modules/options/optw_notifier.h
index 398815e81..31f498660 100644
--- a/src/modules/options/optw_notifier.h
+++ b/src/modules/options/optw_notifier.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 3c61ae3ff..590825b3b 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -25,7 +25,7 @@
 #include "optw_notify.h"
 
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/optw_notify.h
index 1557326a7..0222c759e 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/optw_notify.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNotifyOptionsWidget KVI_SMALLICON_REGUSERS
 #define KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget __tr2qs_no_lookup("Contacts")
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index eb86511f3..53a0384b6 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -25,7 +25,7 @@
 #include "optw_protection.h"
 
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_protection.h b/src/modules/options/optw_protection.h
index 5538f0684..bb9534cbf 100644
--- a/src/modules/options/optw_protection.h
+++ b/src/modules/options/optw_protection.h
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_optionswidget.h"
-#include "kvi_selectors.h"
+#include "KviOptionsWidget.h"
+#include "KviSelectors.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProtectionOptionsWidget KVI_SMALLICON_SPY
 #define KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget __tr2qs_no_lookup("Protection")
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 79c9e1dfe..f5b49d89d 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -25,12 +25,12 @@
 #include "optw_proxy.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviProxyDataBase.h"
-#include "kvi_ipeditor.h"
+#include "KviIpEditor.h"
 #include "KviNetUtils.h"
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviTalGroupBox.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalToolTip.h"
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index b067fc805..bee4e0d8c 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include <QTreeWidget>
 
 #include <QCheckBox>
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index e460b7516..21248506d 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -25,7 +25,7 @@
 
 #include "optw_query.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_settings.h"
 
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index 0dc45428e..f6212558f 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_QUERY
 #define KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget __tr2qs_no_lookup("Query")
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 7439c5bf4..6a5f7e0f0 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -28,29 +28,29 @@
 
 #include "container.h"
 
-#include "kvi_query.h"
-#include "kvi_channel.h"
+#include "KviQueryWindow.h"
+#include "KviChannelWindow.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviIrcServerDataBase.h"
-#include "kvi_ipeditor.h"
+#include "KviIpEditor.h"
 #include "KviNetUtils.h"
 #include "kvi_settings.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviConfigurationFile.h"
-#include "kvi_scripteditor.h"
-#include "kvi_options.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
-#include "kvi_ircurl.h"
-#include "kvi_module.h"
-#include "kvi_modulemanager.h"
-#include "kvi_moduleextension.h"
-#include "kvi_msgbox.h"
-#include "kvi_mexserverimport.h"
+#include "KviScriptEditor.h"
+#include "KviOptions.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcUrl.h"
+#include "KviModule.h"
+#include "KviModuleManager.h"
+#include "KviModuleExtension.h"
+#include "KviMessageBox.h"
+#include "KviMexServerImport.h"
 #include "KviNickServRuleSet.h"
 #include "KviProxyDataBase.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "KviPointerHashTable.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalToolTip.h"
@@ -1171,7 +1171,7 @@ void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 	m_pSMode->setEnabled(!b);
 }
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 
 KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n)
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 1ee0a1fac..87d2e27d4 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include <QTreeWidget>
 
 #include <QDialog>
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 04632afcd..c4c19c45b 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -26,13 +26,13 @@
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_modulemanager.h"
+#include "KviOptions.h"
+#include "KviModuleManager.h"
 #include "KviPointerList.h"
 #include "KviCString.h"
 #include "KviTalHBox.h"
 #include "KviTalToolTip.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index d892924f3..b17cf7a0f 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 #include <QPushButton>
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index ca3d6fd36..fa7386984 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -24,10 +24,10 @@
 
 #include "optw_textencoding.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviQString.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 
 #include <QDir>
@@ -99,7 +99,7 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	}
 
 	QString szLocaleDir;
-	g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale);
+	g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApplication::Locale);
 
 	QStringList list=QDir(szLocaleDir).entryList(QStringList("kvirc_*.mo"),QDir::Files);
 
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/optw_textencoding.h
index 7949c45a1..8a6087b6d 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/optw_textencoding.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index d38e19ed4..6756d07c8 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -24,10 +24,10 @@
 
 #include "optw_texticons.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_texticonmanager.h"
+#include "KviIconManager.h"
+#include "KviTextIconManager.h"
 #include "KviLocale.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "kvi_fileextensions.h"
 #include "KviTalHBox.h"
 
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 167975d7c..e3d274ed1 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -24,8 +24,8 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
-#include "kvi_texticonmanager.h"
+#include "KviOptionsWidget.h"
+#include "KviTextIconManager.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalHBox.h"
 
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index a5f99eb38..00c1feb94 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -25,7 +25,7 @@
 #include "optw_tools.h"
 
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_tools.h b/src/modules/options/optw_tools.h
index 8fc8b38bd..befffc28b 100644
--- a/src/modules/options/optw_tools.h
+++ b/src/modules/options/optw_tools.h
@@ -26,8 +26,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_optionswidget.h"
-#include "kvi_selectors.h"
+#include "KviOptionsWidget.h"
+#include "KviSelectors.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviToolsOptionsWidget KVI_SMALLICON_ADDONS
 #define KVI_OPTIONS_WIDGET_NAME_KviToolsOptionsWidget __tr2qs_no_lookup("Tools")
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index ef6f301cc..5707065dc 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -25,7 +25,7 @@
 
 #include "optw_topiclabel.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 
diff --git a/src/modules/options/optw_topiclabel.h b/src/modules/options/optw_topiclabel.h
index 808b024b4..e16c10af5 100644
--- a/src/modules/options/optw_topiclabel.h
+++ b/src/modules/options/optw_topiclabel.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTopicLabelLookOptionsWidget KVI_SMALLICON_TOPIC
 #define KVI_OPTIONS_WIDGET_NAME_KviTopicLabelLookOptionsWidget __tr2qs_no_lookup("Labels")
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 40dc73a47..07a42fd34 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -24,9 +24,9 @@
 
 #include "optw_tray.h"
 
-#include "kvi_frame.h"
-#include "kvi_internalcmd.h"
-#include "kvi_options.h"
+#include "KviMainWindow.h"
+#include "KviInternalCommand.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviTalToolTip.h"
 
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h
index 5c6dfb031..58426f769 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index afb151415..4dee6acba 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_uparser.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/optw_uparser.h
index efd3acbd8..8c8526a82 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/optw_uparser.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUParserOptionsWidget KVI_SMALLICON_PARSERWARNING
 #define KVI_OPTIONS_WIDGET_NAME_KviUParserOptionsWidget __tr2qs_no_lookup("Scripting Engine")
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index ad2bb4eb8..5126b39ad 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -26,7 +26,7 @@
 
 #include "optw_urlhandlers.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/optw_urlhandlers.h
index 2ac737723..9cc52c6b8 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/optw_urlhandlers.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 class QRadioButton;
 
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 283549159..999d7dba1 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -24,9 +24,9 @@
 
 #include "optw_userlist.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_userlistview.h"
+#include "KviUserListView.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/optw_userlist.h
index 51a01c040..c73a24ac9 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/optw_userlist.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>
 
diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/optw_windowlist.cpp
index 3e0eab9e1..3d3f6aa08 100644
--- a/src/modules/options/optw_windowlist.cpp
+++ b/src/modules/options/optw_windowlist.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 
 KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/optw_windowlist.h
index df32837e3..9c9fe1576 100644
--- a/src/modules/options/optw_windowlist.h
+++ b/src/modules/options/optw_windowlist.h
@@ -26,7 +26,7 @@
 //===============================================================================
 
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #include <QComboBox>