More renaming and cleanup

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

305 files changed, 1097 insertions, 1097 deletions

diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
index b7ba364b6..a25c022c7 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/aboutdialog.cpp
@@ -27,7 +27,7 @@
 
 #include "kvi_defaults.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 #include "kvi_sourcesdate.h"
 #include "KviBuildInfo.h"
@@ -207,7 +207,7 @@ KviAboutDialog::KviAboutDialog()
 	QString szLicense;
 
 	QString szLicensePath;
-	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING");
+	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApplication::License,"COPYING");
 
 	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
 	{
diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp
index 2e3dce8a5..f52504643 100644
--- a/src/modules/about/libkviabout.cpp
+++ b/src/modules/about/libkviabout.cpp
@@ -27,7 +27,7 @@
 
 #include "aboutdialog.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 
 KviAboutDialog * g_pAboutDialog = 0;
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 860775b2e..8b9e8bcc7 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-#include "kvi_action.h"
-#include "kvi_actionmanager.h"
+#include "KviModule.h"
+#include "KviAction.h"
+#include "KviActionManager.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 #include "KviParameterList.h"
@@ -32,10 +32,10 @@
 #include "KviQString.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
-#include "kvi_kvs_useraction.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsUserAction.h"
+#include "KviKvsScript.h"
 
 /*
 	@doc: action.list
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 44cc175bb..1a91fc044 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -23,22 +23,22 @@
 //=============================================================================
 #include "actioneditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviQString.h"
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_filedialog.h"
-#include "kvi_actionmanager.h"
-#include "kvi_action.h"
-#include "kvi_kvs_useraction.h"
-#include "kvi_customtoolbarmanager.h"
+#include "KviKvsAliasManager.h"
+#include "KviFileDialog.h"
+#include "KviActionManager.h"
+#include "KviAction.h"
+#include "KviKvsUserAction.h"
+#include "KviCustomToolBarManager.h"
 #include "KviTalVBox.h"
 #include <KviTalGroupBox.h>
 #include "KviTalIconAndRichTextItemDelegate.h"
@@ -860,7 +860,7 @@ void KviActionEditor::commit()
 }
 
 
-KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm)
+KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"actioneditor",0)
 {
 	g_pActionEditorWindow = this;
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h
index ca9c0e8a1..a8e3e2b88 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/actioneditor.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include <QTreeWidget>
 
 #include <QWidget>
@@ -186,7 +186,7 @@ class KviActionEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviActionEditorWindow(KviFrame * lpFrm);
+	KviActionEditorWindow(KviMainWindow * lpFrm);
 	~KviActionEditorWindow();
 protected:
 	KviActionEditor * m_pEditor;
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 10ee5d2d4..720ed2599 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -24,9 +24,9 @@
 
 #include "actioneditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 KviActionEditorWindow * g_pActionEditorWindow = 0;
 
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/addonfunctions.cpp
index d8406fa24..e1d10d40e 100644
--- a/src/modules/addon/addonfunctions.cpp
+++ b/src/modules/addon/addonfunctions.cpp
@@ -26,15 +26,15 @@
 
 #include "KviPackageFile.h"
 #include "KviLocale.h"
-#include "kvi_msgbox.h"
-#include "kvi_app.h"
-#include "kvi_htmldialog.h"
-#include "kvi_iconmanager.h"
+#include "KviMessageBox.h"
+#include "KviApplication.h"
+#include "KviHtmlDialog.h"
+#include "KviIconManager.h"
 #include "KviFileUtils.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_frame.h"
-#include "kvi_kvs_script.h"
+#include "KviMainWindow.h"
+#include "KviKvsScript.h"
 
 #include <QDir>
 
@@ -207,7 +207,7 @@ namespace KviAddonFunctions
 		QString szTmpPath, szUnpackPath;
 		QString szRandomDir = createRandomDir();
 
-		g_pApp->getLocalKvircDirectory(szTmpPath,KviApp::Tmp);
+		g_pApp->getLocalKvircDirectory(szTmpPath,KviApplication::Tmp);
 		KviQString::ensureLastCharIs(szTmpPath,QChar(KVI_PATH_SEPARATOR_CHAR));
 		szUnpackPath = szTmpPath + szRandomDir;
 		QDir szTmpDir(szUnpackPath);
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index c9edaa3a1..31e2d5599 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -25,21 +25,21 @@
 #include "managementdialog.h"
 #include "addonfunctions.h"
 
-#include "kvi_module.h"
-#include "kvi_kvs_scriptaddonmanager.h"
+#include "KviModule.h"
+#include "KviKvsScriptAddonManager.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 #include "KviParameterList.h"
 #include "KviCommandFormatter.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 #include "KviMiscUtils.h"
 #include "KviFileUtils.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 
 #include <QFileInfo>
 
@@ -730,7 +730,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 
 	// create target path
 	QString szTargetPath;
-	g_pApp->getLocalKvircDirectory(szTargetPath,KviApp::None,szTarget);
+	g_pApp->getLocalKvircDirectory(szTargetPath,KviApplication::None,szTarget);
 
 	KviFileUtils::makeDir(szTargetPath);
 
@@ -744,7 +744,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 		}
 
 		QString szEntry = QString("%1%2%3").arg(szTarget).arg(QString(KVI_PATH_SEPARATOR_CHAR)).arg(inf.fileName());
-		g_pApp->getLocalKvircDirectory(szTargetPath,KviApp::None,szEntry);
+		g_pApp->getLocalKvircDirectory(szTargetPath,KviApplication::None,szEntry);
 
 		if(!bQuiet)
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Installing file '%1' into '%2'","addon").arg(*it).arg(szTargetPath));
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 107d115c3..846c5e112 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -26,16 +26,16 @@
 #include "packaddondialog.h"
 #include "addonfunctions.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_kvs_scriptaddonmanager.h"
-#include "kvi_window.h"
-#include "kvi_filedialog.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviKvsScriptAddonManager.h"
+#include "KviWindow.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "kvi_sourcesdate.h"
 #include "KviTalListWidget.h"
 #include "KviTalToolTip.h"
diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp
index bb86c9029..45dabc6cb 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/packaddondialog.cpp
@@ -27,12 +27,12 @@
 
 #include "KviLocale.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviIconManager.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include <QTextEdit>
 #include <QLineEdit>
diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/packaddondialog.h
index da2ebef3b..bf5dbf1ba 100644
--- a/src/modules/addon/packaddondialog.h
+++ b/src/modules/addon/packaddondialog.h
@@ -35,7 +35,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 
 #include <QWizard>
 #include <QWizardPage>
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index a4757f1fd..6cd42094a 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -25,22 +25,22 @@
 
 #include "aliaseditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
 #include "KviQString.h"
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_filedialog.h"
+#include "KviKvsAliasManager.h"
+#include "KviFileDialog.h"
 #include "KviCommandFormatter.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
 
@@ -1173,7 +1173,7 @@ void KviAliasEditor::commit()
 }
 
 
-KviAliasEditorWindow::KviAliasEditorWindow(KviFrame * lpFrm)
+KviAliasEditorWindow::KviAliasEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"aliaseditor",0)
 {
 	g_pAliasEditorWindow = this;
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index ed4d6a4ff..4623e4325 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
 #include "KviTalPopupMenu.h"
@@ -172,7 +172,7 @@ class KviAliasEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviAliasEditorWindow(KviFrame * lpFrm);
+	KviAliasEditorWindow(KviMainWindow * lpFrm);
 	~KviAliasEditorWindow();
 protected:
 	KviAliasEditor * m_pEditor;
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index e929e3bf2..5de7cd2cd 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -24,9 +24,9 @@
 
 #include "aliaseditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 
 KviAliasEditorWindow * g_pAliasEditorWindow = 0;
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index ff6f38952..37322545d 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -24,24 +24,24 @@
 
 #include "libkviavatar.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviHttpRequest.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviAvatar.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_console.h"
-#include "kvi_filedialog.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviConsoleWindow.h"
+#include "KviFileDialog.h"
 #include "KviPointerList.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviSharedFilesManager.h"
-#include "kvi_sparser.h"
+#include "KviIrcServerParser.h"
 #include "kvi_out.h"
 #include "KviIrcMask.h"
 #include "KviTalHBox.h"
@@ -235,7 +235,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 			QString szLocalFilePath;
 			QString szLocalFile = szAvatar;
 			g_pIconManager->urlToCachedFileName(szLocalFile);
-			g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApp::Avatars,szLocalFile);
+			g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApplication::Avatars,szLocalFile);
 
 			KviQString::escapeKvs(&szAvatar);
 			KviQString::escapeKvs(&szLocalFilePath);
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 3f60c3226..ba680b5bb 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -24,24 +24,24 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
-#include "kvi_app.h"
-#include "kvi_channel.h"
+#include "KviApplication.h"
+#include "KviChannelWindow.h"
 #include "KviLocale.h"
-#include "kvi_topicw.h"
+#include "KviTopicWidget.h"
 #include "KviIrcMask.h"
-#include "kvi_maskeditor.h"
-#include "kvi_ircurl.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircconnection.h"
+#include "KviMaskEditor.h"
+#include "KviIrcUrl.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcConnection.h"
 
-static KviChannel * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QString & szChan, bool bNoWarnings = false)
+static KviChannelWindow * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QString & szChan, bool bNoWarnings = false)
 {
 	if(szChan.isEmpty())
 	{
-		if(c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)return (KviChannel *)(c->window());
-		if(c->window()->type() == KVI_WINDOW_TYPE_DEADCHANNEL)return (KviChannel *)(c->window());
+		if(c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)return (KviChannelWindow *)(c->window());
+		if(c->window()->type() == KVI_WINDOW_TYPE_DEADCHANNEL)return (KviChannelWindow *)(c->window());
 		if(!bNoWarnings) c->warning(__tr2qs("The current window is not a channel"));
 	} else {
 		KviWindow * w = g_pApp->findWindow(szChan);
@@ -50,7 +50,7 @@ static KviChannel * chan_kvs_find_channel(KviKvsModuleFunctionCall * c, QString
 			if(!bNoWarnings) c->warning(__tr2qs("Can't find the window with id '%Q'"),&szChan);
 			return 0;
 		}
-		if(w->type() == KVI_WINDOW_TYPE_CHANNEL)return (KviChannel *)w;
+		if(w->type() == KVI_WINDOW_TYPE_CHANNEL)return (KviChannelWindow *)w;
 		if(!bNoWarnings) c->warning(__tr2qs("The specified window (%Q) is not a channel"),&szChan);
 	}
 	return 0;
@@ -80,7 +80,7 @@ static bool chan_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) {
 		c->returnValue()->setString(ch->windowName());
 	}
@@ -108,7 +108,7 @@ static bool chan_kvs_fnc_getUrl(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId,true);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId,true);
 	if (ch) {
 		KviIrcUrl::join(url,ch->connection()->target()->server());
 		url.append(ch->windowName());
@@ -150,7 +150,7 @@ static bool chan_kvs_fnc_isdead(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setBoolean((ch->type() == KVI_WINDOW_TYPE_DEADCHANNEL));
 	return true;
 }
@@ -183,7 +183,7 @@ static bool chan_kvs_fnc_topic(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setString(ch->topicWidget()->topic());
 	return true;
 }
@@ -216,7 +216,7 @@ static bool chan_kvs_fnc_topicsetby(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setString(ch->topicWidget()->topicSetBy());
 	return true;
 }
@@ -249,7 +249,7 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setString(ch->topicWidget()->topicSetAt());
 	return true;
 }
@@ -280,7 +280,7 @@ static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->count());
 	return true;
 }
@@ -311,7 +311,7 @@ static bool chan_kvs_fnc_ownercount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->chanOwnerCount());
 	return true;
 }
@@ -342,7 +342,7 @@ static bool chan_kvs_fnc_admincount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->chanAdminCount());
 	return true;
 }
@@ -373,7 +373,7 @@ static bool chan_kvs_fnc_opcount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->opCount());
 	return true;
 }
@@ -404,7 +404,7 @@ static bool chan_kvs_fnc_voicecount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->voiceCount());
 	return true;
 }
@@ -435,7 +435,7 @@ static bool chan_kvs_fnc_halfopcount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->halfOpCount());
 	return true;
 }
@@ -466,7 +466,7 @@ static bool chan_kvs_fnc_useropcount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->userOpCount());
 	return true;
 }
@@ -497,7 +497,7 @@ static bool chan_kvs_fnc_bancount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->maskCount('b'));
 	return true;
 }
@@ -528,7 +528,7 @@ static bool chan_kvs_fnc_banexceptioncount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->maskCount('e'));
 	return true;
 }
@@ -559,7 +559,7 @@ static bool chan_kvs_fnc_invitecount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->maskCount('I'));
 	return true;
 }
@@ -594,7 +594,7 @@ static bool chan_kvs_fnc_maskcount(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	char cMode = szMode.at(0).unicode();
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setInteger(ch->maskCount(cMode));
 	return true;
 }
@@ -621,7 +621,7 @@ static bool chan_kvs_fnc_ison(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setBoolean(ch->isOn(szNick));
 	return true;
 }
@@ -657,7 +657,7 @@ static bool chan_kvs_fnc_getflag(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if(ch)
 	{
 		QChar cFlag = ch->userListView()->getUserFlag(szNick);
@@ -680,7 +680,7 @@ static bool __clbkname(KviKvsModuleFunctionCall * c) \
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)\
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)\
 	KVSM_PARAMETERS_END(c)\
-	KviChannel * ch = chan_kvs_find_channel(c,szId); \
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId); \
 	if(ch) c->returnValue()->setBoolean(ch->__chanfunc(szNick,true)); \
 	return true; \
 }
@@ -800,7 +800,7 @@ static bool __clbkname(KviKvsModuleFunctionCall * c) \
 	KVSM_PARAMETERS_BEGIN(c)\
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)\
 	KVSM_PARAMETERS_END(c)\
-	KviChannel * ch = chan_kvs_find_channel(c,szId); \
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId); \
 	if(ch) c->returnValue()->setBoolean(ch->__chanfunc(true)); \
 	return true; \
 }
@@ -942,7 +942,7 @@ static bool chan_kvs_fnc_mode(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if(ch)
 	{
 		QString chMode;
@@ -980,7 +980,7 @@ static bool chan_kvs_fnc_key(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch) c->returnValue()->setString(ch->hasChannelMode('k') ? ch->channelModeParam('k') : "");
 	return true;
 }
@@ -1013,7 +1013,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	if (ch)
 	{
 		kvs_int_t limit=0;
@@ -1054,7 +1054,7 @@ static bool chan_kvs_fnc_modeParam(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("mode",KVS_PT_NONEMPTYSTRING,0,szMode)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szId);
 	char cMode = szMode.at(0).unicode();
 	if (ch) c->returnValue()->setString(ch->hasChannelMode(cMode) ? ch->channelModeParam(cMode) : "");
 	return true;
@@ -1127,7 +1127,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	KviKvsArray * pArray = new KviKvsArray();
 	c->returnValue()->setArray(pArray);
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 	if(!ch)return true;
 
 	KviUserListEntry * e = ch->userListView()->firstItem(); // Thnx Julien :)
@@ -1243,7 +1243,7 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 	KviKvsArray * pArray = new KviKvsArray();
 	c->returnValue()->setArray(pArray);
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)return true;
 
@@ -1290,7 +1290,7 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 	KviKvsArray * pArray = new KviKvsArray();
 	c->returnValue()->setArray(pArray);
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)return true;
 
@@ -1337,7 +1337,7 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 	KviKvsArray * pArray = new KviKvsArray();
 	c->returnValue()->setArray(pArray);
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)return true;
 
@@ -1387,7 +1387,7 @@ static bool chan_kvs_fnc_masklist(KviKvsModuleFunctionCall * c)
 	KviKvsArray * pArray = new KviKvsArray();
 	c->returnValue()->setArray(pArray);
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)return true;
 
@@ -1430,7 +1430,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)
 	{
@@ -1483,7 +1483,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)
 	{
@@ -1536,7 +1536,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)
 	{
@@ -1595,7 +1595,7 @@ static bool chan_kvs_fnc_matchqban(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 	szMask.prepend('%');
 
 	if(!ch)
@@ -1653,7 +1653,7 @@ static bool chan_kvs_fnc_matchmask(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	char cMode = szMode.at(0).unicode();
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	if(!ch)
 	{
@@ -1713,7 +1713,7 @@ static bool chan_kvs_fnc_usermodelevel(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	kvs_int_t mode=0;
 	if(ch) mode=ch->userListView()->getUserModeLevel(szNick);
@@ -1748,7 +1748,7 @@ static bool chan_kvs_fnc_userjointime(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	kvs_int_t time=0;
 	if(ch) time=ch->userListView()->getUserJoinTime(szNick);
@@ -1784,7 +1784,7 @@ static bool chan_kvs_fnc_userlastactiontime(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
-	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
+	KviChannelWindow * ch = chan_kvs_find_channel(c,szWinId);
 
 	kvs_int_t time=0;
 	if(ch) time=ch->userListView()->getUserLastActionTime(szNick);
@@ -1816,7 +1816,7 @@ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("context id",KVS_PT_STRING,KVS_PF_OPTIONAL,szContext)
 	KVSM_PARAMETERS_END(c)
 	
-	KviChannel * pChannel = chan_kvs_find_channel(c,szContext);
+	KviChannelWindow * pChannel = chan_kvs_find_channel(c,szContext);
 	if(pChannel)
 	{
 		pChannel->connection()->getCommonChannels(szNick,szChans,false);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index da9026a69..82eec83b7 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -25,15 +25,15 @@
 #include "channelsjoinwindow.h"
 
 #include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_selectors.h"
-#include "kvi_app.h"
+#include "KviOptions.h"
+#include "KviSelectors.h"
+#include "KviApplication.h"
 #include "KviCString.h"
 #include "KviQString.h"
-#include "kvi_iconmanager.h"
-#include "kvi_console.h"
+#include "KviIconManager.h"
+#include "KviConsoleWindow.h"
 #include "KviRegisteredChannel.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "KviTalGroupBox.h"
 
 #include <QTreeWidget>
@@ -49,7 +49,7 @@
 
 extern KviChannelsJoinWindow * g_pChannelsWindow;
 extern QRect                   g_rectChannelsJoinGeometry;
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 
 
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h
index 76af3d144..591a175b5 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/channelsjoinwindow.h
@@ -30,7 +30,7 @@
 * \brief Channels join window
 */
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include <QTreeWidget>
 
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index 9e8aec1bf..0b2daa238 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -24,9 +24,9 @@
 //=============================================================================
 #include "channelsjoinwindow.h"
 
-#include "kvi_module.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
+#include "KviModule.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index eada4b4ed..1e57b9ed8 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -25,27 +25,27 @@
 
 #include "classeditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
 #include "KviQString.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object_class.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_filedialog.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObjectClass.h"
+#include "KviKvsObjectController.h"
+#include "KviFileDialog.h"
 #include "KviCommandFormatter.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 
 #include <QList>
 #include <QSplitter>
@@ -383,7 +383,7 @@ void KviClassEditor::oneTimeSetup()
 	QStringList sl;
 	QString szClassName;
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes);
 	QDir d(szPath);
 	
 	QString szExtension = QString("*%1").arg(KVI_FILEEXTENSION_SCRIPT); // *.kvs
@@ -531,7 +531,7 @@ void KviClassEditor::renameFunction()
 					QString szFileName = szClassName.toLower();
 					szFileName += ".kvs";
 					szFileName.replace("::","--");
-					g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
+					g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes,szFileName);
 					pClass->save(szPath);
 				}
 			}
@@ -1381,7 +1381,7 @@ bool KviClassEditor::removeItem(KviClassEditorTreeWidgetItem * pItem, KviPointer
 			szFileName.replace("::","--");
 			szFileName.append(KVI_FILEEXTENSION_SCRIPT);
 			QString szPath;
-			g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes);
+			g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes);
 			QDir d(szPath);
 			if(d.exists(szFileName))
 			{
@@ -1703,7 +1703,7 @@ void KviClassEditor::build()
 	else {
 		QString szFileName = "libkviclasseditortmp.kvc";
 		QString szBuffer;
-		g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
+		g_pApp->getLocalKvircDirectory(szBuffer,KviApplication::ConfigPlugins,szFileName);
 		KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Write);
 		cfg.clear();
 		cfg.sync();
@@ -1715,7 +1715,7 @@ void KviClassEditor::loadNotBuiltClasses()
 {
 	QString szFileName = "libkviclasseditortmp.kvc";
 	QString szBuffer;
-	g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
+	g_pApp->getLocalKvircDirectory(szBuffer,KviApplication::ConfigPlugins,szFileName);
 	KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Read);
 	KviConfigurationFileIterator it(*(cfg.dict()));
 
@@ -1774,7 +1774,7 @@ void KviClassEditor::saveNotBuiltClasses()
 	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
 	QString szFileName = "libkviclasseditortmp.kvc";
 	QString szBuffer;
-	g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szFileName);
+	g_pApp->getLocalKvircDirectory(szBuffer,KviApplication::ConfigPlugins,szFileName);
 	KviConfigurationFile cfg(szBuffer,KviConfigurationFile::Write);
 	cfg.clear();
 
@@ -1815,7 +1815,7 @@ void KviClassEditor::searchInheritedClasses(const QString szClass, KviPointerLis
 	}
 }
 
-KviClassEditorWindow::KviClassEditorWindow(KviFrame * pFrm)
+KviClassEditorWindow::KviClassEditorWindow(KviMainWindow * pFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,pFrm,"classeditor",0)
 {
 	g_pClassEditorWindow = this;
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index 6b98f5e3f..88a9f4616 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -30,12 +30,12 @@
 * \brief Class Editor window
 */
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
 #include "KviTalPopupMenu.h"
 #include "KviHeapObject.h"
-#include "kvi_kvs_object_class.h"
+#include "KviKvsObjectClass.h"
 
 #include <QWidget>
 #include <QComboBox>
@@ -478,7 +478,7 @@ public:
 	* \param pFrm The parent frame
 	* \return KviClassEditorWindow
 	*/
-	KviClassEditorWindow(KviFrame * pFrm);
+	KviClassEditorWindow(KviMainWindow * pFrm);
 	
 	/**
 	* \brief Destroys the class editor window
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index d80c3b64d..3761148d7 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -24,9 +24,9 @@
 
 #include "classeditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 
 KviClassEditorWindow * g_pClassEditorWindow = 0;
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index bdc856812..087db8043 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -24,18 +24,18 @@
 
 #include "codetester.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
+#include "KviScriptEditor.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
 #include "KviParameterList.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariantList.h"
 #include "KviTalPopupMenu.h"
 
 #include <QPushButton>
@@ -81,7 +81,7 @@ void KviCodeTester::execute()
 	KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms)));
 }
 
-KviCodeTesterWindow::KviCodeTesterWindow(KviFrame * lpFrm)
+KviCodeTesterWindow::KviCodeTesterWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"codetester",0)
 {
 	g_pCodeTesterWindowList->append(this);
diff --git a/src/modules/codetester/codetester.h b/src/modules/codetester/codetester.h
index 04481de28..19022f665 100644
--- a/src/modules/codetester/codetester.h
+++ b/src/modules/codetester/codetester.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 
 #include <QLineEdit>
@@ -53,7 +53,7 @@ class KviCodeTesterWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviCodeTesterWindow(KviFrame * lpFrm);
+	KviCodeTesterWindow(KviMainWindow * lpFrm);
 	~KviCodeTesterWindow();
 protected:
 	KviCodeTester * m_pTester;
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index 5e641bee6..9d8c93a85 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -24,9 +24,9 @@
 
 #include "codetester.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviPointerList.h"
 
 
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index 685d2db51..134d5f83e 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviPointerHashTable.h"
 
@@ -104,7 +104,7 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	QString szAbsFile;
 
 	if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile;
-	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true);
+	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApplication::ConfigScripts,szFile,true);
 
 	KviPointerHashTableIterator<QString,KviConfigurationFile> it(*g_pConfigDict);
 	while(it.current())
@@ -160,7 +160,7 @@ static bool config_kvs_fnc_id(KviKvsModuleFunctionCall * c)
 	QString szAbsFile;
 
 	if(KviFileUtils::isAbsolutePath(szFile))szAbsFile = szFile;
-	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApp::ConfigScripts,szFile,true);
+	else g_pApp->getLocalKvircDirectory(szAbsFile,KviApplication::ConfigScripts,szFile,true);
 
 	KviPointerHashTableIterator<QString,KviConfigurationFile> it(*g_pConfigDict);
 	while(it.current())
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index 3338be28f..b35b88205 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -24,20 +24,20 @@
 
 //#warning: FIXME: Incomplete documentation ('example', etc)
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 #include "KviQString.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
-#include "kvi_app.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviApplication.h"
 #include "KviIrcServer.h"
 #include "KviIrcNetwork.h"
-#include "kvi_irccontext.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectiontarget.h"
+#include "KviIrcContext.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionTarget.h"
 
 #define GET_CONSOLE_FROM_STANDARD_PARAMS \
 	kvs_uint_t iContextId; \
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index d0934cc0f..5474729f0 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -38,21 +38,21 @@
 	#include "canvas.h"
 #endif
 
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviConsoleWindow.h"
 #include "KviFileUtils.h"
 #include "kvi_out.h"
 #include "KviMediaType.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
 #include "KviSharedFilesManager.h"
 
 #include <QFileInfo>
 #include <QString>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviMediaManager * g_pMediaManager;
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
@@ -655,7 +655,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
 
 	dcc->szLocalFileName = "";
 
-	if(dcc->bIsIncomingAvatar)g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApp::Avatars);
+	if(dcc->bIsIncomingAvatar)g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApplication::Avatars);
 	else {
 
 		if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath))
@@ -685,7 +685,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
 
 		if(dcc->szLocalFileName.isEmpty())
 		{
-			g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApp::Incoming);
+			g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApplication::Incoming);
 			if(KVI_OPTION_BOOL(KviOption_boolSortReceivedByDccFilesByNicks))
 			{
 				KviQString::ensureLastCharIs(dcc->szLocalFileName,KVI_PATH_SEPARATOR_CHAR);
diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h
index 8bd2535ff..a7d958aea 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/broker.h
@@ -29,7 +29,7 @@
 #include "kvi_settings.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
-#include "kvi_sparser.h"
+#include "KviIrcServerParser.h"
 #include "KviPointerHashTable.h"
 
 #include <QDateTime>
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index c7524883d..2634fde05 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -34,29 +34,29 @@
 
 	#define _KVI_DEBUG_CHECK_RANGE_
 	#include "kvi_debug.h"
-	#include "kvi_options.h"
-	#include "kvi_input.h"
-	#include "kvi_ircview.h"
-	#include "kvi_iconmanager.h"
+	#include "KviOptions.h"
+	#include "KviInput.h"
+	#include "KviIrcView.h"
+	#include "KviIconManager.h"
 	#include "KviLocale.h"
 	#include "KviError.h"
 	#include "kvi_out.h"
 	#include "KviNetUtils.h"
-	#include "kvi_console.h"
-	#include "kvi_frame.h"
+	#include "KviConsoleWindow.h"
+	#include "KviMainWindow.h"
 	#include "KviMemory.h"
 	#include "KviMemory.h"
 	#include "KviThread.h"
-	#include "kvi_ircsocket.h"
+	#include "KviIrcSocket.h"
 	#include "kvi_settings.h"
-	#include "kvi_ircconnection.h"
+	#include "KviIrcConnection.h"
 
 	#include <QSplitter>
 
 	extern KviDccBroker * g_pDccBroker;
 
 
-	KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
+	KviDccCanvas::KviDccCanvas(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
 	: KviDccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc)
 	{
 		m_pSplitter = new QSplitter(QSplitter::Vertical,this,"splitter");
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index e27a7ca59..36f01e14d 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -31,7 +31,7 @@
 	#include "window.h"
 	#include "thread.h"
 
-	#include "kvi_window.h"
+	#include "KviWindow.h"
 	#include "KviCString.h"
 	#include "KviPointerList.h"
 
@@ -43,7 +43,7 @@
 	{
 		Q_OBJECT
 	public:
-		KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
+		KviDccCanvas(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
 		~KviDccCanvas();
 	protected:
 	//	KviDccCanvasThread     * m_pSlaveThread;
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 5e8f6bcf1..3a47d9075 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -32,27 +32,27 @@
 #endif
 
 #include "kvi_debug.h"
-#include "kvi_options.h"
-#include "kvi_input.h"
-#include "kvi_ircview.h"
-#include "kvi_iconmanager.h"
+#include "KviOptions.h"
+#include "KviInput.h"
+#include "KviIrcView.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
 #include "KviError.h"
 #include "kvi_out.h"
 #include "KviNetUtils.h"
-#include "kvi_console.h"
-#include "kvi_frame.h"
+#include "KviConsoleWindow.h"
+#include "KviMainWindow.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
 #include "KviThread.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcSocket.h"
 #include "kvi_settings.h"
 #include "kvi_socket.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviParameterList.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviKvsEventTriggers.h"
 #include "KviMircCntrl.h"
 #include "KviTalVBox.h"
 
@@ -63,11 +63,11 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptController.h"
 #endif
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
+	#include "KviSSLMaster.h"
 #endif
 
 extern KviDccBroker * g_pDccBroker;
@@ -82,7 +82,7 @@ extern KviDccBroker * g_pDccBroker;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
+KviDccChat::KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
 : KviDccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc)
 {
 	m_pButtonBox = new KviTalHBox(this);
@@ -441,7 +441,7 @@ bool KviDccChat::event(QEvent *e)
 							szMsg += m_pDescriptor->szNick;
 							szMsg += "</b> ";
 							szMsg += Qt::escape(QString(d.ptr()));
-							//qDebug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data());
+							//qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data());
 							g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 						}
 					}
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index cd7745782..5509b4934 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -30,9 +30,9 @@
 
 #include "KviDataBuffer.h"
 #include "KviPointerList.h"
-#include "kvi_themedlabel.h"
+#include "KviThemedLabel.h"
 #include "KviCString.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 	class KviSSL;
@@ -68,7 +68,7 @@ class KviDccChat : public KviDccWindow
 {
 	Q_OBJECT
 public:
-	KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
+	KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
 	~KviDccChat();
 	QFrame * buttonContainer() { return (QFrame*)m_pButtonContainer; };
 protected:
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index e3d841c37..a669d1f30 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -27,9 +27,9 @@
 #include "window.h"
 
 #include "KviLocale.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
+#include "KviKvsEventTriggers.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
 
 static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id
 static KviPointerHashTable<int,KviDccDescriptor> * g_pDescriptorDict = 0;
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index 944e063af..e150f80d7 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "KviCString.h"
-#include "kvi_console.h"
+#include "KviConsoleWindow.h"
 #include "KviPointerHashTable.h"
 
 class KviDccWindow;
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index da3715274..73f9cfe85 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -25,8 +25,8 @@
 #include "dialogs.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
 
 #include <QLayout>
 #include <QPushButton>
diff --git a/src/modules/dcc/dialogs.h b/src/modules/dcc/dialogs.h
index 6b2115787..1b12ffe9f 100644
--- a/src/modules/dcc/dialogs.h
+++ b/src/modules/dcc/dialogs.h
@@ -26,7 +26,7 @@
 
 #include "broker.h"
 
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 
 #include <QWidget>
 
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index a2437ba2d..87118cfb7 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -33,21 +33,21 @@
 #include "kvi_debug.h"
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_module.h"
-#include "kvi_sparser.h"
+#include "KviModule.h"
+#include "KviIrcServerParser.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_console.h"
+#include "KviConsoleWindow.h"
 #include "KviNetUtils.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviError.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
 #include "KviMircCntrl.h"
-#include "kvi_app.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviApplication.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
 
 #include <QFileInfo>
 
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 0c3c28a00..3ca458e84 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviNetUtils.h"
 #include "KviError.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
 #include "kvi_socket.h"
diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/marshal.h
index 4c1259daf..383ec87f2 100644
--- a/src/modules/dcc/marshal.h
+++ b/src/modules/dcc/marshal.h
@@ -36,7 +36,7 @@ class KviWindow;
 class KviDccMarshal;
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
+	#include "KviSSLMaster.h"
 #endif
 
 
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 60dd742f1..27b457dae 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -38,22 +38,22 @@
 #include "kvi_debug.h"
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_module.h"
-#include "kvi_sparser.h"
+#include "KviModule.h"
+#include "KviIrcServerParser.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_console.h"
+#include "KviConsoleWindow.h"
 #include "KviNetUtils.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviError.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
 #include "KviSharedFilesManager.h"
 #include "KviMircCntrl.h"
-#include "kvi_app.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviApplication.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
 
 #include <QFileInfo>
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 9ea1dd74e..a66ad1eab 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -31,28 +31,28 @@
 #include "window.h"
 
 #include "kvi_debug.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_ircview.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviIrcView.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
 #include "KviError.h"
 #include "kvi_out.h"
 #include "KviNetUtils.h"
-#include "kvi_console.h"
-#include "kvi_frame.h"
+#include "KviConsoleWindow.h"
+#include "KviMainWindow.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
 #include "KviThread.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcSocket.h"
 #include "KviMediaType.h"
 #include "kvi_socket.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvsEventTriggers.h"
 #include "KviParameterList.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_sparser.h"
-#include "kvi_kvs_script.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcServerParser.h"
+#include "KviKvsScript.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	// Ugly Windoze compiler...
@@ -81,7 +81,7 @@
 
 extern KviDccBroker * g_pDccBroker;
 
-extern KVIRC_API KviMediaManager * g_pMediaManager; // kvi_app.cpp
+extern KVIRC_API KviMediaManager * g_pMediaManager; // KviApplication.cpp
 
 
 static KviPointerList<KviDccFileTransfer> * g_pDccFileTransfers = 0;
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 3c6cd2abc..2bc806210 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -28,11 +28,11 @@
 #include "window.h"
 #include "thread.h"
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "kvi_sockettype.h"
 #include "KviPointerList.h"
-#include "kvi_filetransfer.h"
+#include "KviFileTransfer.h"
 #include "KviTimeUtils.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalHBox.h"
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index e10113d8a..8108aac7d 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -25,7 +25,7 @@
 #include "thread.h"
 
 #include "kvi_debug.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviError.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
@@ -33,7 +33,7 @@
 #include "kvi_socket.h"
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
+	#include "KviSSLMaster.h"
 #endif
 
 KviDccThread::KviDccThread(QObject * par,kvi_socket_t fd)
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index e9c1864e4..174a004b4 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -26,11 +26,11 @@
 
 #include "utils.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviNetUtils.h"
-#include "kvi_ircsocket.h"
-#include "kvi_irclink.h"
+#include "KviIrcSocket.h"
+#include "KviIrcLink.h"
 #include "KviQString.h"
 
 /*
diff --git a/src/modules/dcc/utils.h b/src/modules/dcc/utils.h
index 50087c538..ee939b2a5 100644
--- a/src/modules/dcc/utils.h
+++ b/src/modules/dcc/utils.h
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_console.h"
-#include "kvi_kvs_moduleinterface.h"
+#include "KviConsoleWindow.h"
+#include "KviKvsModuleInterface.h"
 
 #ifndef _UTILS_CPP_
 	extern bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pConsole,QString &szListenIp);
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index d5f02b2ee..234643b52 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -28,21 +28,21 @@
 #include "marshal.h"
 #include "broker.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
+#include "KviKvsEventTriggers.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviError.h"
 #include "KviNetUtils.h"
-#include "kvi_options.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviConsoleWindow.h"
 #include "KviMemory.h"
 #include "kvi_socket.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
 #include "KviTalVBox.h"
 #include "KviMircCntrl.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 #include <QToolTip>
 #include <QByteArray>
@@ -50,11 +50,11 @@
 #include <QTextDocument> //for Qt::escape
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptController.h"
 #endif
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
+	#include "KviSSLMaster.h"
 #endif
 
 #include <sys/ioctl.h>
@@ -416,7 +416,7 @@ exit_dcc:
 	m_fd = KVI_INVALID_SOCKET;
 }
 
-KviDccVideo::KviDccVideo(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
+KviDccVideo::KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
 : KviDccWindow(KVI_WINDOW_TYPE_DCCVIDEO,pFrm,name,dcc)
 {
 	m_pDescriptor = dcc;
@@ -806,7 +806,7 @@ bool KviDccVideo::event(QEvent *e)
 							szMsg += m_pDescriptor->szNick;
 							szMsg += "</b> ";
 							szMsg += Qt::escape(QString(d.ptr()));
-							//qDebug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data());
+							//qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data());
 							g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 						}
 					}
diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h
index 31588ab7e..bef5376e9 100644
--- a/src/modules/dcc/video.h
+++ b/src/modules/dcc/video.h
@@ -29,11 +29,11 @@
 #include "thread.h"
 #include "window.h"
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
 #include "KviTalHBox.h"
-#include "kvi_themedlabel.h"
+#include "KviThemedLabel.h"
 
 #include <QLabel>
 #include <QToolButton>
@@ -108,7 +108,7 @@ class KviDccVideo : public KviDccWindow
 	Q_OBJECT
 	friend class KviDccVideoThread;
 public:
-	KviDccVideo(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
+	KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
 	~KviDccVideo();
 protected:
 	KviThemedLabel         * m_pLabel;
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 315ae0f05..549125be3 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -29,17 +29,17 @@
 #include "gsmcodec.h"
 
 #include "kvi_settings.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviError.h"
 #include "KviNetUtils.h"
-#include "kvi_options.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviConsoleWindow.h"
 #include "KviMemory.h"
 #include "kvi_socket.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
 #include "KviTalVBox.h"
 
 #include <QFrame>
@@ -638,7 +638,7 @@ exit_dcc:
 }
 
 
-KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
+KviDccVoice::KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
 : KviDccWindow(KVI_WINDOW_TYPE_DCCVOICE,pFrm,name,dcc)
 {
 	m_pDescriptor = dcc;
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index 11e5cb31a..28b606c08 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -29,7 +29,7 @@
 #include "thread.h"
 #include "window.h"
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
 #include "KviTalHBox.h"
@@ -106,7 +106,7 @@ class KviDccVoice : public KviDccWindow
 {
 	Q_OBJECT
 public:
-	KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
+	KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
 	~KviDccVoice();
 protected:
 	KviTalHBox                  * m_pHBox;
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index 9b86b483c..180c20e83 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -26,7 +26,7 @@
 
 #include "KviTalHBox.h"
 
-KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d)
+KviDccWindow::KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviDccDescriptor * d)
 : KviWindow(type,lpFrm,name, d->console())
 {
 	m_pDescriptor = d;
diff --git a/src/modules/dcc/window.h b/src/modules/dcc/window.h
index bdcc8c088..5fd13506f 100644
--- a/src/modules/dcc/window.h
+++ b/src/modules/dcc/window.h
@@ -27,14 +27,14 @@
 #include "descriptor.h"
 #include "marshal.h"
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 class KviDccThread;
 
 class KviDccWindow : public KviWindow, public KviDccMarshalOutputContext
 {
 	Q_OBJECT
 public:
-	KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d);
+	KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviDccDescriptor * d);
 	~KviDccWindow();
 protected:
 	KviDccDescriptor       * m_pDescriptor;
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 2f7c69589..81313daf1 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -26,15 +26,15 @@
 #include "libkvidialog.h"
 
 #include "KviLocale.h"
-#include "kvi_module.h"
-#include "kvi_modulemanager.h"
+#include "KviModule.h"
+#include "KviModuleManager.h"
 #include "KviError.h"
-#include "kvi_app.h"
-#include "kvi_iconmanager.h"
-#include "kvi_console.h"
-#include "kvi_iconmanager.h"
-#include "kvi_kvs_script.h"
-#include "kvi_msgbox.h"
+#include "KviApplication.h"
+#include "KviIconManager.h"
+#include "KviConsoleWindow.h"
+#include "KviIconManager.h"
+#include "KviKvsScript.h"
+#include "KviMessageBox.h"
 #include "KviTalHBox.h"
 
 #include <QMessageBox>
diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h
index 7eb71525e..7089f7820 100644
--- a/src/modules/dialog/libkvidialog.h
+++ b/src/modules/dialog/libkvidialog.h
@@ -24,12 +24,12 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviParameterList.h"
-#include "kvi_filedialog.h"
-#include "kvi_imagedialog.h"
-#include "kvi_kvs_callbackobject.h"
+#include "KviFileDialog.h"
+#include "KviImageDialog.h"
+#include "KviKvsCallbackObject.h"
 
 #include <QMessageBox>
 #include <QDialog>
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 35b1459fb..099600c66 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -24,8 +24,8 @@
 
 #include "scripteditor.h"
 
-#include "kvi_module.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviWindow.h"
 
 
 KviModule * g_pEditorModulePointer = 0;
@@ -45,7 +45,7 @@ static bool editor_module_init(KviModule * m)
 static bool editor_module_cleanup(KviModule *)
 {
 	/*
-	 * This causes 2 crashes: one in KviApp destructor (closing windows needs
+	 * This causes 2 crashes: one in KviApplication destructor (closing windows needs
 	 * g_pFrame, that is deleted before this unloading routine) and the second in
 	 * the codetester window (it deletes us in its denstructor, and we tries to back-delete it)
 	 * So it's commented out by now..
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 6a81bbda2..f38f9d33c 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -29,17 +29,17 @@
 #include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
 #include "KviLocale.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviQString.h"
 #include "KviConfigurationFile.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviPointerList.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
-#include "kvi_window.h"
-#include "kvi_iconmanager.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_modulemanager.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
+#include "KviWindow.h"
+#include "KviIconManager.h"
+#include "KviKvsKernel.h"
+#include "KviModuleManager.h"
 #include "KviConfigurationFile.h"
 #include "KviTalVBox.h"
 #include "KviTalHBox.h"
@@ -100,7 +100,7 @@ KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent)
 	iModulesCount=0;
 	iIndex=0;
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::ConfigPlugins,tmp);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,tmp);
 
 	if(!KviFileUtils::fileExists(szPath))
 	{
@@ -147,7 +147,7 @@ void KviScriptEditorWidget::asyncCompleterCreation()
 		m_pListCompletition = new QStringList();
 		QString szPath;
 
-		g_pApp->getGlobalKvircDirectory(szPath,KviApp::Modules);
+		g_pApp->getGlobalKvircDirectory(szPath,KviApplication::Modules);
 
 		QDir d(szPath);
 
@@ -188,7 +188,7 @@ void KviScriptEditorWidget::asyncCompleterCreation()
 		m_pStartTimer = 0;
 		QString szTmp("kvscompleter.idx");
 		QString szPath;
-		g_pApp->getLocalKvircDirectory(szPath,KviApp::ConfigPlugins,szTmp);
+		g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,szTmp);
 		KviKvsKernel::instance()->getAllFunctionsCommandsCore(m_pListCompletition);
 		QString szBuffer = m_pListCompletition->join(",");
 		QFile f(szPath);
@@ -209,7 +209,7 @@ void KviScriptEditorWidget::loadCompleterFromFile()
 	QStringList szListFunctionsCommand;
 	QString szTmp("kvscompleter.idx");
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::ConfigPlugins,szTmp);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::ConfigPlugins,szTmp);
 	QString szBuffer;
 	QFile f(szPath);
 	f.open(QIODevice::ReadOnly);
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 1398b6469..b8611c944 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -25,9 +25,9 @@
 //
 //=============================================================================
 
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "KviPointerList.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviTalPopupMenu.h"
 
 #include <QCompleter>
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index c31d444a3..8aee9eb3b 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -24,21 +24,21 @@
 
 #include "eventeditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviCommandFormatter.h"
 #include "kvi_fileextensions.h"
 #include "KviQString.h"
-#include "kvi_filedialog.h"
-#include "kvi_kvs_eventmanager.h"
+#include "KviFileDialog.h"
+#include "KviKvsEventManager.h"
 #include "KviTalVBox.h"
 #include "KviTalPopupMenu.h"
 
@@ -513,7 +513,7 @@ void KviEventEditor::exportAllEvents()
 }
 
 
-KviEventEditorWindow::KviEventEditorWindow(KviFrame * lpFrm)
+KviEventEditorWindow::KviEventEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"eventeditor",0)
 {
 	g_pEventEditorWindow = this;
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h
index ee9118903..70df2caac 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/eventeditor.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviTalPopupMenu.h"
 
@@ -117,7 +117,7 @@ class KviEventEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviEventEditorWindow(KviFrame * lpFrm);
+	KviEventEditorWindow(KviMainWindow * lpFrm);
 	~KviEventEditorWindow();
 protected:
 	KviEventEditor * m_pEditor;
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index a51c5420e..5ac5e6d7b 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -24,9 +24,9 @@
 
 #include "eventeditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 KviEventEditorWindow * g_pEventEditorWindow = 0;
 
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 3a0f752b5..e40b0ae08 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_kvs_arraycast.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviKvsArrayCast.h"
 #include "KviFile.h"
 
 #include <QFileInfo>
@@ -1172,7 +1172,7 @@ static bool file_kvs_fnc_localdir(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 	if(szName.isEmpty())szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::None,szName);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::None,szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
@@ -1313,7 +1313,7 @@ static bool file_kvs_fnc_globaldir(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 	if(szName.isEmpty())szName.append(KVI_PATH_SEPARATOR_CHAR);
 	QString szPath;
-	g_pApp->getGlobalKvircDirectory(szPath,KviApp::None,szName);
+	g_pApp->getGlobalKvircDirectory(szPath,KviApplication::None,szName);
 	KviFileUtils::adjustFilePath(szPath);
 	c->returnValue()->setString(szPath);
 	return true;
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 239f23cc8..2e273ad3e 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -25,19 +25,19 @@
 #include "filetransferwindow.h"
 
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_themedlabel.h"
-#include "kvi_input.h"
+#include "KviThemedLabel.h"
+#include "KviInput.h"
 #include "KviQString.h"
 #include "KviTalHBox.h"
-#include "kvi_frame.h"
-#include "kvi_mdimanager.h"
+#include "KviMainWindow.h"
+#include "KviMdiManager.h"
 
 #include <QToolTip>
 #include <QPainter>
@@ -237,7 +237,7 @@ QSize KviFileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const
 	return QSize(((KviFileTransferWidget*)parent())->viewport()->size().width(), 68);
 }
 
-KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)
+KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"file transfer window",0), KviModuleExtension(d)
 {
 	g_pFileTransferWindow = this;
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index fb6108bc0..b4eba7053 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -24,14 +24,14 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
-#include "kvi_ircsocket.h"
-#include "kvi_sparser.h"
-#include "kvi_console.h"
-#include "kvi_moduleextension.h"
-#include "kvi_filetransfer.h"
-#include "kvi_dynamictooltip.h"
+#include "KviIrcSocket.h"
+#include "KviIrcServerParser.h"
+#include "KviConsoleWindow.h"
+#include "KviModuleExtension.h"
+#include "KviFileTransfer.h"
+#include "KviDynamicToolTip.h"
 #include "KviTalTableWidget.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalIconAndRichTextItemDelegate.h"
@@ -91,7 +91,7 @@ class KviFileTransferWindow : public KviWindow, public KviModuleExtension
 	friend class KviFileTransferItemDelegate;
 	Q_OBJECT
 public:
-	KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm);
+	KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
 	~KviFileTransferWindow();
 protected:
 	QSplitter		* m_pVertSplitter;
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 396fb8765..35040e431 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -23,12 +23,12 @@
 
 #include "filetransferwindow.h"
 
-#include "kvi_module.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QSplitter>
 
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 02b73f6ed..218644498 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -25,12 +25,12 @@
 #include "helpwidget.h"
 #include "helpwindow.h"
 
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_msgbox.h"
-#include "kvi_module.h"
+#include "KviApplication.h"
+#include "KviMessageBox.h"
+#include "KviModule.h"
 #include "KviFileUtils.h"
 
 #include <QToolButton>
@@ -44,7 +44,7 @@ extern Index        * g_pDocIndex;
 extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
 extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
 
-KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame *,bool bIsStandalone)
+KviHelpWidget::KviHelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 : QWidget(par)
 {
 	setObjectName("help_widget");
@@ -96,7 +96,7 @@ void KviHelpWidget::showIndex()
 	QString szHelpDir;
         QDir dirHelp;
 
-	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);
+	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help);
         dirHelp = QDir(szHelpDir);
 
 	m_pTextBrowser->setSource(QUrl::fromLocalFile(dirHelp.absoluteFilePath("index.html")));
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h
index 567d25348..bec03d087 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/helpwidget.h
@@ -33,14 +33,14 @@
 
 class QToolButton;
 class QLineEdit;
-class KviFrame;
+class KviMainWindow;
 //class QProcess;
 
 class KviHelpWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviHelpWidget(QWidget *par,KviFrame * lpFrm,bool bIsStandalone = false);
+	KviHelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false);
 	~KviHelpWidget();
 private:
 	QToolButton  * m_pBtnIndex;
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 03cb7fc64..fddd70d33 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -25,11 +25,11 @@
 #include "helpwindow.h"
 #include "helpwidget.h"
 
-#include "kvi_app.h"
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 
@@ -47,7 +47,7 @@ extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
 extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
 
 bool g_bIndexingDone = FALSE;
-KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
+KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 : KviWindow(KVI_WINDOW_TYPE_HELP,lpFrm,name)
 {
 	g_pHelpWindowList->append(this);
@@ -122,8 +122,8 @@ void KviHelpWindow::initialSetup()
 		g_bIndexingDone=TRUE;
 		QString szDoclist,szDict;
 
-		g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist." KVI_SOURCES_DATE);
-		g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict." KVI_SOURCES_DATE);
+		g_pApp->getLocalKvircDirectory(szDoclist,KviApplication::Help,"help.doclist." KVI_SOURCES_DATE);
+		g_pApp->getLocalKvircDirectory(szDict,KviApplication::Help,"help.dict." KVI_SOURCES_DATE);
 
 		if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) {
 			g_pDocIndex->readDict();
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h
index 31b526531..b278b38fc 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/helpwindow.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviTalVBox.h"
 #include "KviTalListWidget.h"
@@ -41,7 +41,7 @@ class KviHelpWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviHelpWindow(KviFrame * lpFrm,const char * name);
+	KviHelpWindow(KviMainWindow * lpFrm,const char * name);
 	~KviHelpWindow();
 protected:
 	KviHelpWidget * m_pHelpWidget;
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 67a9cc1cc..f89b835e8 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -26,11 +26,11 @@
 #include "helpwindow.h"
 #include "index.h"
 #include "KviLocale.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviFileUtils.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
 
 #include <QDir>
 #include <QFileInfo>
@@ -109,7 +109,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	if(!f.exists() || !f.isAbsolute())
 	{
 		// try relative path (to local help)
-		g_pApp->getLocalKvircDirectory(szHelpDir,KviApp::Help);
+		g_pApp->getLocalKvircDirectory(szHelpDir,KviApplication::Help);
 		dirHelp = QDir(szHelpDir);
 		szDoc = dirHelp.absoluteFilePath(szParam);
 		qDebug("No abs path, trying local relative path: %s",szDoc.toUtf8().data());
@@ -118,7 +118,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 		if(!f.exists())
 		{
 			//try relative path (to global help)
-			g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);
+			g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help);
 			dirHelp = QDir(szHelpDir);
 
 			szDoc = dirHelp.absoluteFilePath(szParam);
@@ -136,8 +136,8 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 			if (!g_pDocIndex->documentList().count())
 			{
 				QString szDoclist,szDict;
-				g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist." KVI_SOURCES_DATE);
-				g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict." KVI_SOURCES_DATE);
+				g_pApp->getLocalKvircDirectory(szDoclist,KviApplication::Help,"help.doclist." KVI_SOURCES_DATE);
+				g_pApp->getLocalKvircDirectory(szDict,KviApplication::Help,"help.dict." KVI_SOURCES_DATE);
 				if ( KviFileUtils::fileExists(szDoclist) && KviFileUtils::fileExists( szDict ))
 				{
 					g_pDocIndex->readDict();
@@ -204,13 +204,13 @@ static bool help_module_init(KviModule * m)
 {
 	QString szHelpDir,szDocList;
 
-	g_pApp->getLocalKvircDirectory(szDocList,KviApp::Help,"help.doclist." KVI_SOURCES_DATE);
-	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);
+	g_pApp->getLocalKvircDirectory(szDocList,KviApplication::Help,"help.doclist." KVI_SOURCES_DATE);
+	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help);
 
 	g_pDocIndex = new Index(szHelpDir,szDocList);
 	g_pDocIndex->setDocListFile(szDocList);
 
-	g_pApp->getLocalKvircDirectory(szHelpDir,KviApp::Help,"help.dict." KVI_SOURCES_DATE);
+	g_pApp->getLocalKvircDirectory(szHelpDir,KviApplication::Help,"help.dict." KVI_SOURCES_DATE);
 	g_pDocIndex->setDictionaryFile(szHelpDir);
 
 	g_pHelpWidgetList = new KviPointerList<KviHelpWidget>;
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index feda63127..0890feffa 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -24,15 +24,15 @@
 
 #include "httpfiletransfer.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_window.h"
-#include "kvi_iconmanager.h"
+#include "KviWindow.h"
+#include "KviIconManager.h"
 #include "KviNetUtils.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_console.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsEventTriggers.h"
+#include "KviConsoleWindow.h"
+#include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
 
 #include <QPainter>
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index f1449ee60..1be60eb20 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "kvi_filetransfer.h"
+#include "KviFileTransfer.h"
 #include "KviHttpRequest.h"
 #include "KviTimeUtils.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 
 #include <QStringList>
 #include <QTimer>
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index 8b58da69d..2ad7a84a4 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -24,12 +24,12 @@
 
 #include "httpfiletransfer.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_filedialog.h"
-#include "kvi_window.h"
+#include "KviFileDialog.h"
+#include "KviWindow.h"
 #include "KviError.h"
 #include "KviCommandFormatter.h"
 
@@ -55,7 +55,7 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 			tmp.replace('@',"_");
 			tmp.replace('?',"_");
 			// http____path_path2_path3_filename.ext
-			g_pApp->getLocalKvircDirectory(szFileName,KviApp::Incoming,tmp);
+			g_pApp->getLocalKvircDirectory(szFileName,KviApplication::Incoming,tmp);
 		} else {
 			if(!KviFileDialog::askForSaveFileName(szFileName,__tr2qs_ctx("Choose a save file name","http")))
 				return true;
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index f071a0cf6..ebfd9a2dd 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -24,14 +24,14 @@
 
 #include "libkviident.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_socket.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_out.h"
 #include "KviNetUtils.h"
 #include "KviLocale.h"
-#include "kvi_window.h"
-#include "kvi_options.h"
+#include "KviWindow.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
 
 #define KVI_IDENT_THREAD_EVENT_EXITING KVI_THREAD_USER_EVENT_BASE + 111
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index a4a91a499..888bfa7f7 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -25,12 +25,12 @@
 #include <math.h>
 
 #include "libkviiograph.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_mdimanager.h"
-#include "kvi_module.h"
-#include "kvi_options.h"
+#include "KviMdiManager.h"
+#include "KviModule.h"
+#include "KviOptions.h"
 #include "kvi_socket.h"
 
 #include <QPainter>
@@ -42,7 +42,7 @@
 
 KviIOGraphWindow* g_pIOGraphWindow = 0;
 
-KviIOGraphWindow::KviIOGraphWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm,const char * name)
+KviIOGraphWindow::KviIOGraphWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm,const char * name)
 : KviWindow(KVI_WINDOW_TYPE_IOGRAPH,lpFrm,name), KviModuleExtension(d)
 {
 	m_pIOGraph = new KviIOGraphWidget(this);
diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
index 30ea6a6e0..2dc3497a1 100644
--- a/src/modules/iograph/libkviiograph.h
+++ b/src/modules/iograph/libkviiograph.h
@@ -26,10 +26,10 @@
 
 #include <QQueue>
 
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "kvi_inttypes.h"
-#include "kvi_moduleextension.h"
-#include "kvi_window.h"
+#include "KviModuleExtension.h"
+#include "KviWindow.h"
 
 #define KVI_IOGRAPH_NUMBER_POINTS 60
 #define KVI_IOGRAPH_HORIZ_SEGMENTS 10
@@ -57,7 +57,7 @@ class KviIOGraphWindow : public KviWindow, public KviModuleExtension
 {
 	Q_OBJECT
 public:
-	KviIOGraphWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm,const char * name);
+	KviIOGraphWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm,const char * name);
 	~KviIOGraphWindow();
 private:
 	KviIOGraphWidget * m_pIOGraph;
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 53ad9bda2..f7f274fa3 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -24,7 +24,7 @@
 
 #include "libkvilamerizer.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
 
diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp
index 37de24685..2cccb51de 100644
--- a/src/modules/language/libkvilanguage.cpp
+++ b/src/modules/language/libkvilanguage.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-#include "kvi_app.h"
+#include "KviModule.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 
 #include <QFileInfo>
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 1729b9d29..5529e0528 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -23,9 +23,9 @@
 
 #include "linkswindow.h"
 
-#include "kvi_module.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
 
 #include <QSplitter>
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index f733ed099..6dfd00725 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -25,17 +25,17 @@
 #include "linkswindow.h"
 
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_themedlabel.h"
-#include "kvi_irccontext.h"
-#include "kvi_ircconnection.h"
+#include "KviThemedLabel.h"
+#include "KviIrcContext.h"
+#include "KviIrcConnection.h"
 #include "KviTalHBox.h"
 
 #include <QToolTip>
@@ -45,7 +45,7 @@
 
 extern KviPointerList<KviLinksWindow> * g_pLinksWindowList;
 
-KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
+KviLinksWindow::KviLinksWindow(KviMainWindow * lpFrm,KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LINKS,lpFrm,"links",lpConsole), KviExternalServerDataParser()
 {
 	g_pLinksWindowList->append(this);
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 5c92ffaf7..4b64bf6b2 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -24,14 +24,14 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
-#include "kvi_ircsocket.h"
-#include "kvi_sparser.h"
-#include "kvi_console.h"
-#include "kvi_irccontext.h"
+#include "KviIrcSocket.h"
+#include "KviIrcServerParser.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcContext.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_themedtreewidget.h"
+#include "KviThemedTreeWidget.h"
 
 #include <QToolButton>
 
@@ -61,7 +61,7 @@ class KviLinksWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole);
+	KviLinksWindow(KviMainWindow * lpFrm,KviConsole * lpConsole);
 	~KviLinksWindow();
 protected:
 	QSplitter               * m_pVertSplitter;
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index 9444ea902..1ea7a0d1a 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -23,9 +23,9 @@
 
 #include "listwindow.h"
 
-#include "kvi_module.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
 
 #include <QSplitter>
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 9b8a5748a..f3c451984 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -25,26 +25,26 @@
 #include "listwindow.h"
 
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_themedlabel.h"
-#include "kvi_options.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnection.h"
+#include "KviThemedLabel.h"
+#include "KviOptions.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnection.h"
 #include "KviQString.h"
-#include "kvi_topicw.h"
+#include "KviTopicWidget.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
 #include "kvi_fileextensions.h"
 #include "KviTalHBox.h"
-#include "kvi_htmlgenerator.h"
-#include "kvi_themedlineedit.h"
+#include "KviHtmlGenerator.h"
+#include "KviThemedLineEdit.h"
 
 #include <QTimer>
 #include <QPainter>
@@ -157,7 +157,7 @@ void KviChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 	}
 }
 
-KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole)
+KviListWindow::KviListWindow(KviMainWindow * lpFrm, KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole), KviExternalServerDataParser()
 {
 	g_pListWindowList->append(this);
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 5725d59ff..9274382ab 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -24,15 +24,15 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcSocket.h"
 #include "KviPointerList.h"
-#include "kvi_sparser.h"
-#include "kvi_console.h"
-#include "kvi_irccontext.h"
+#include "KviIrcServerParser.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcContext.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_themedtreewidget.h"
+#include "KviThemedTreeWidget.h"
 
 #include <QToolButton>
 #include <QLineEdit>
@@ -81,7 +81,7 @@ class KviListWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole);
+	KviListWindow(KviMainWindow * lpFrm, KviConsole * lpConsole);
 	~KviListWindow();
 protected:
 	QSplitter                                    * m_pVertSplitter;
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index 7055101ca..c3342461a 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -22,11 +22,11 @@
 //
 //==============================================================================
 
-#include "kvi_module.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
+#include "KviModule.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_ircview.h"
+#include "KviIrcView.h"
 
 
 //#warning "log.stats"
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index b4b9f4d85..8db879281 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -26,11 +26,11 @@
 #include "logviewmdiwindow.h"
 
 #include "KviConfigurationFile.h"
-#include "kvi_module.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviModule.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 static QRect                 g_rectLogViewGeometry;
 KviLogViewMDIWindow        * g_pLogViewWindow = 0;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 62ca73513..b69581b30 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -26,14 +26,14 @@
 #include "logviewmdiwindow.h"
 #include "logviewwidget.h"
 
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_module.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
-#include "kvi_ircview.h"
+#include "KviModule.h"
+#include "KviOptions.h"
+#include "KviMainWindow.h"
+#include "KviIrcView.h"
 #include "KviQString.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 #include "KviTalPopupMenu.h"
 
@@ -65,7 +65,7 @@
 
 extern KviLogViewMDIWindow * g_pLogViewWindow;
 
-KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)
+KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)
 {
 	g_pLogViewWindow = this;
@@ -168,7 +168,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	li.append(width()-110);
 	m_pSplitter->setSizes(li);
 
-	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);
+	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApplication::Log);
 	KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
 
 	m_pTimer = new QTimer(this);
@@ -373,7 +373,7 @@ void KviLogViewMDIWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
 QStringList KviLogViewMDIWindow::getFileNames()
 {
 	QString logPath;
-	g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);
+	g_pApp->getLocalKvircDirectory(logPath,KviApplication::Log);
 	QString qPath(logPath);
 	QDir logDir(qPath);
 	return logDir.entryList();
@@ -430,7 +430,7 @@ void KviLogViewMDIWindow::deleteCurrent()
 				if(!pCurItem->fileName().isNull())
 				{
 					QString szFname;
-					g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pCurItem->fileName());
+					g_pApp->getLocalKvircDirectory(szFname,KviApplication::Log,pCurItem->fileName());
 					KviFileUtils::removeFile(szFname);
 				}
 			}
@@ -440,7 +440,7 @@ void KviLogViewMDIWindow::deleteCurrent()
 			if(!pItem->fileName().isNull())
 		{
 			QString szFname;
-			g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->fileName());
+			g_pApp->getLocalKvircDirectory(szFname,KviApplication::Log,pItem->fileName());
 			KviFileUtils::removeFile(szFname);
 			delete pItem;
 			m_pIrcView->clearBuffer();
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index a9e03799b..4c201edd7 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -26,8 +26,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
-#include "kvi_moduleextension.h"
+#include "KviWindow.h"
+#include "KviModuleExtension.h"
 #include "KviTalVBox.h"
 #include <QTreeWidget>
 #include "KviPointerList.h"
@@ -91,7 +91,7 @@ class KviLogViewMDIWindow : public KviWindow, public KviModuleExtension
 {
     Q_OBJECT
 public:
-	KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm);
+	KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
 	~KviLogViewMDIWindow();
 protected:
 	KviPointerList<KviLogFile> m_logList;
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index ef70b0c7a..5af476622 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -27,8 +27,8 @@
 
 //#include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
 #include "KviQString.h"
 
 #include <QLayout>
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h
index b3e6929a4..cff1c2868 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/logviewwidget.h
@@ -27,8 +27,8 @@
 
 #include "logviewmdiwindow.h"
 
-#include "kvi_window.h"
-#include "kvi_scripteditor.h"
+#include "KviWindow.h"
+#include "KviScriptEditor.h"
 #include <QTreeWidget>
 
 class KviScriptEditor;
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index c2bce77e0..eb35c0c6e 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 #include "KviCString.h"
 #include "KviIrcMask.h"
diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index bcea026fd..3cac5d635 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
 
 #include <math.h>
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 1f5832eb2..5e7f6bf08 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -30,8 +30,8 @@
 #include "mp_winampinterface.h"
 #include "mp_xmmsinterface.h"
 
-#include "kvi_module.h"
-#include "kvi_options.h"
+#include "KviModule.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include <QUrl>
diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp
index 6d111db66..df4e309cd 100644
--- a/src/modules/mediaplayer/mp_amipinterface.cpp
+++ b/src/modules/mediaplayer/mp_amipinterface.cpp
@@ -23,14 +23,14 @@
 //=============================================================================
 
 #include "mp_amipinterface.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
 #include <QTextCodec>
 
 #include "KviLocale.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 
 #include <windows.h>
 
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
index 61201c0d6..b27e380da 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/mp_interface.cpp
@@ -25,7 +25,7 @@
 #include "mp_interface.h"
 #include "mp_mp3.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QTextCodec>
diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h
index 9b2755dbe..af8235eda 100644
--- a/src/modules/mediaplayer/mp_interface.h
+++ b/src/modules/mediaplayer/mp_interface.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_types.h"
+#include "KviKvsTypes.h"
 
 class KviMediaPlayerInterface
 {
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp
index 2ac758d32..2b52e39d5 100644
--- a/src/modules/mediaplayer/mp_mp3.cpp
+++ b/src/modules/mediaplayer/mp_mp3.cpp
@@ -38,7 +38,7 @@
 //=============================================================================
 
 #include "mp_mp3.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include <QFileInfo>
 #include <QTextCodec>
diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp
index 5b5938915..b52f37550 100644
--- a/src/modules/mediaplayer/mp_winampinterface.cpp
+++ b/src/modules/mediaplayer/mp_winampinterface.cpp
@@ -23,14 +23,14 @@
 //=============================================================================
 
 #include "mp_winampinterface.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
 #include <QTextCodec>
 
 #include "KviLocale.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 
 #include <windows.h>
 
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 00444cf42..39c9c6fdc 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -24,13 +24,13 @@
 
 #include "libkvimircimport.h"
 
-#include "kvi_module.h"
-#include "kvi_filedialog.h"
+#include "KviModule.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviQString.h"
 #include "KviTalVBox.h"
 
diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h
index 091273830..53092450f 100644
--- a/src/modules/mircimport/libkvimircimport.h
+++ b/src/modules/mircimport/libkvimircimport.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_mexserverimport.h"
+#include "KviMexServerImport.h"
 #include "KviCString.h"
 #include "KviHttpRequest.h"
 #include <KviTalWizard.h>
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 9cc9ad92a..fd1f6913a 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-#include "kvi_console.h"
-#include "kvi_app.h"
+#include "KviModule.h"
+#include "KviConsoleWindow.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_irclink.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviIrcLink.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
 #include "KviIrcServer.h"
 
 #include "idle.h"
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index a0d934e08..ff1ff46e2 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -26,15 +26,15 @@
 #include "notifierwindow.h"
 #include "notifiermessage.h"
 
-#include "kvi_module.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviKvsVariant.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviTimeUtils.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include <QSplitter>
 
diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp
index d46a38956..1e26d3dba 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/notifiermessage.cpp
@@ -26,8 +26,8 @@
 #include "notifiermessage.h"
 #include "notifiersettings.h"
 
-#include "kvi_htmlgenerator.h"
-#include "kvi_options.h"
+#include "KviHtmlGenerator.h"
+#include "KviOptions.h"
 
 #include <QRect>
 #include <QResizeEvent>
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 1b312151e..f99b1de18 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -28,15 +28,15 @@
 #include "notifierwindowborder.h"
 #include "notifierwindowtab.h"
 
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviConfigurationFile.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviMircCntrl.h"
-#include "kvi_options.h"
-#include "kvi_userinput.h"
-#include "kvi_themedlineedit.h"
+#include "KviOptions.h"
+#include "KviUserInput.h"
+#include "KviThemedLineEdit.h"
 
 #include <QApplication>
 #include <QImage>
diff --git a/src/modules/notifier/notifierwindowborder.cpp b/src/modules/notifier/notifierwindowborder.cpp
index 8dd2fb99e..c8c94c3f5 100644
--- a/src/modules/notifier/notifierwindowborder.cpp
+++ b/src/modules/notifier/notifierwindowborder.cpp
@@ -25,7 +25,7 @@
 #include "notifierwindowborder.h"
 #include "notifierwindowtab.h"
 
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QPainter>
 
diff --git a/src/modules/notifier/notifierwindowtab.cpp b/src/modules/notifier/notifierwindowtab.cpp
index f2543359c..67f1c931a 100644
--- a/src/modules/notifier/notifierwindowtab.cpp
+++ b/src/modules/notifier/notifierwindowtab.cpp
@@ -28,12 +28,12 @@
 #include "notifierwindow.h"
 #include "notifiersettings.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviConfigurationFile.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_options.h"
-#include "kvi_window.h"
+#include "KviMainWindow.h"
+#include "KviOptions.h"
+#include "KviWindow.h"
 
 #include <QScrollBar>
 #include <QResizeEvent>
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 539217a34..6b276641f 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -26,7 +26,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviFile.h"
 
 #include "class_button.h"
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 3c2aadf14..cc4d2b28c 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -28,7 +28,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QButtonGroup>
 #include <QRadioButton>
diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp
index 41a2f6e26..4ae6e7563 100644
--- a/src/modules/objects/class_datetimeedit.cpp
+++ b/src/modules/objects/class_datetimeedit.cpp
@@ -25,7 +25,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviFile.h"
 
 #include "class_datetimeedit.h"
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index bf9834a03..554d882bb 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -26,8 +26,8 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_app.h"
+#include "KviMainWindow.h"
+#include "KviApplication.h"
 
 #include <QDialog>
 
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index d4cd121e6..bce939af9 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -24,7 +24,7 @@
 
 #include "class_dockwindow.h"
 
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index c7e684de1..5f3cfdaa6 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -29,7 +29,7 @@
 #include "kvi_debug.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 
 // Tables used in $setAlignment, $alignment and in $setOrientation & $orientation
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 821afc6b2..f47510509 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -27,7 +27,7 @@
 #include "kvi_debug.h"
 #include "class_label.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QFont>
 #include <QPixmap>
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index 36f675dce..ab7295c6e 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -27,7 +27,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QLCDNumber>
 
diff --git a/src/modules/objects/class_list.h b/src/modules/objects/class_list.h
index 6354f74fe..b0508160b 100644
--- a/src/modules/objects/class_list.h
+++ b/src/modules/objects/class_list.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 #include "object_macros.h"
 
 
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp
index 19e698a28..986a976de 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/class_listwidget.cpp
@@ -28,7 +28,7 @@
 #include "class_list.h"
 #include "class_listwidget.h"
 #include "class_pixmap.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include <QListWidget>
 
 const int item_flags[] = {
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 76d278c6d..992121bfb 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -28,7 +28,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 
 /*
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index e2a392b08..acaaf15a9 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -31,7 +31,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMemory.h"
  #include <QPrintDialog>
 #include <QTextDocument>
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index f9c87722c..42d6bf0af 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -29,7 +29,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviTalPopupMenu.h"
 
 #include <QCursor>
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index 31588f0ae..7fa0a149a 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -28,7 +28,7 @@
 #include "kvi_debug.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include <QProgressBar>
 
 
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index 442e32558..53ec38286 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -27,7 +27,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QRadioButton>
 /*
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 07dc6f82e..45e8e6c25 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -27,7 +27,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QSlider>
 
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 16d27b85e..6c269c338 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -27,7 +27,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QSpinBox>
 /*
diff --git a/src/modules/objects/class_sql.h b/src/modules/objects/class_sql.h
index 2b848ca97..bf79e615e 100644
--- a/src/modules/objects/class_sql.h
+++ b/src/modules/objects/class_sql.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 #include "object_macros.h"
 #include <QtSql>
 #include <QHash>
diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp
index b74825c49..a12c323de 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/class_tablewidget.cpp
@@ -27,12 +27,12 @@
 #include "class_pixmap.h"
 
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviError.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviFile.h"
-#include "kvi_kvs_arraycast.h"
+#include "KviKvsArrayCast.h"
 
 #include <QTableWidget>
 #include <QHeaderView>
diff --git a/src/modules/objects/class_tablewidget.h b/src/modules/objects/class_tablewidget.h
index 9b76fbdcb..12fdabb6e 100644
--- a/src/modules/objects/class_tablewidget.h
+++ b/src/modules/objects/class_tablewidget.h
@@ -28,7 +28,7 @@
 #include "class_widget.h"
 #include "object_macros.h"
 
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsRunTimeContext.h"
 
 #include <QtSql>
 #include <QTableWidgetItem>
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 000f22b03..befb18c92 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -27,7 +27,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QTabWidget>
 
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index b0fc19ab0..d7dc686cc 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -28,7 +28,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QTextBrowser>
 #include <QFile>
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index e3927da9d..774cbd749 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -29,7 +29,7 @@
 #include "KviTalToolBar.h"
 #include "KviTalMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "class_mainwindow.h"
 
 /*
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 3d1eb5fda..e09dc1186 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -28,7 +28,7 @@
 #include "kvi_debug.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviTalPopupMenu.h"
 /*
 	@doc:	toolbutton
diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/class_trayicon.cpp
index 9463230ba..5aced0d64 100644
--- a/src/modules/objects/class_trayicon.cpp
+++ b/src/modules/objects/class_trayicon.cpp
@@ -24,7 +24,7 @@
 
 #include "class_trayicon.h"
 #include "class_popupmenu.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "kvi_debug.h"
 #include "KviError.h"
 #include "KviLocale.h"
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 34e7bb837..027f5fe62 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -28,7 +28,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include <QTreeWidget>
 
  #include <QSqlDatabase>
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index 63922f1f5..51249b2ca 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -29,7 +29,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include <QIcon>
 
 const int item_flags[] = {
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 32006fefe..c98fd9540 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -30,11 +30,11 @@
 #include "kvi_debug.h"
 #include "KviError.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_statusbar.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviStatusBar.h"
 #include "class_painter.h"
 
 #include <QKeyEvent>
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 2988ff28a..999235b5d 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -29,11 +29,11 @@
 #include "kvi_debug.h"
 
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 
 
-KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviFrame * pParent,const QString &szName)
+KviKvsScriptWindowWindow::KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTOBJECT,pParent,szName)
 {
 	m_pCentralWidget = 0;
diff --git a/src/modules/objects/class_window.h b/src/modules/objects/class_window.h
index 479f5d01a..8b130a9ad 100644
--- a/src/modules/objects/class_window.h
+++ b/src/modules/objects/class_window.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "class_widget.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "object_macros.h"
 
 class KviKvsObject_window : public KviKvsObject_widget
@@ -48,7 +48,7 @@ class KviKvsScriptWindowWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviKvsScriptWindowWindow(KviFrame * pParent,const QString &szName);
+	KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName);
 	~KviKvsScriptWindowWindow();
 protected:
 	KviKvsObject_widget * m_pCentralWidgetObject;
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index d6f6b7262..a541d4e71 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -28,7 +28,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QMdiArea>
 #include <QMdiSubWindow>
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index d943621b6..9332ec828 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -28,12 +28,12 @@
 #include "kvi_debug.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include "class_widget.h"
 #include <qwidget.h>
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
 
 
 /*
@@ -61,37 +61,37 @@
                 The difference is that there are more toplevel widgets (and so more than one tree).[br]
                 You can use [fnc]$objects.dump()[/fnc] to take a look at the KVIrc Qt objects tree.[br]
                 Here is a part of the tree:[br][br]
-                Ptr 14332520: top level object: kvirc_frame, class KviFrame, visible, rect = -4, -4, 1024, 708
+                Ptr 14332520: top level object: kvirc_frame, class KviMainWindow, visible, rect = -4, -4, 1024, 708
                    Ptr 17296024: object: qt_top_dock, class QDockArea
                 Ptr 14882136: object: qt_custom_toolbar, class KviCustomToolBar
              Ptr 18143368: object: qt_dockwidget_internal, class QDockWindowTitleBar
                 [br][br]
                 Every listed widget has a "name", a "class" and a set of properties.[br]
-                The first entry in this example is a KVIrc server window, class "KviFrame" and name "kvirc_frame":
+                The first entry in this example is a KVIrc server window, class "KviMainWindow" and name "kvirc_frame":
                 it is a toplevel widget.[br]
                 The "qt_top_dock", "qt_custom_toolbar" and the "qt_dockwidget_internal" are
                 direct children of that widget.[br]
                 To indicate a specific widget we will use the "class::name" form.[br]
-                So to indicate the main KVIrc frame you will use "KviFrame::kvirc_main_frame".
+                So to indicate the main KVIrc frame you will use "KviMainWindow::kvirc_main_frame".
                 Look at this example:[br]
-                %A=$new(wrapper,0,test,KviFrame::kvirc_frame,KviStatusBar::unnamed)[br]
+                %A=$new(wrapper,0,test,KviMainWindow::kvirc_frame,KviStatusBar::unnamed)[br]
                 %A->$setBackGroundColor(FFFFFF)[br]
                 For first thing we create an object type wrapper,then we flow the tree that there from the command /object.dump and we will have:[br]
                 .  [br]
                 .  [br]
-                Ptr 14196288: top level object: kvirc_frame, class KviFrame, visible, rect = -4, -4, 1024, 712  [br]
+                Ptr 14196288: top level object: kvirc_frame, class KviMainWindow, visible, rect = -4, -4, 1024, 712  [br]
 .                  [br]
                         Ptr 17197360: object: unnamed, class KviStatusBar  [br]
                 .  [br]
                 .  [br]
-                in this way we can follow the order, father->child from the top-level widget(KviFrame::kvirc_frame)[br]
+                in this way we can follow the order, father->child from the top-level widget(KviMainWindow::kvirc_frame)[br]
                 to reach the child that interests us (KviStatusBar::unnamed)[br]
                 Then, following the syntax we will have:
-                %A=$new(wrapper,0,test,KviFrame::kvirc_frame,KviStatusBar::unnamed)
+                %A=$new(wrapper,0,test,KviMainWindow::kvirc_frame,KviStatusBar::unnamed)
                 Now %A. will be point to the wrapped object, therefore we could modify its property or to consider it as if it were an object created by us in scripting. [br]
                 Obviously, deleting the created object (for example %A) you don't will delete the object of Kvirc (in this case the statusbar). [br]
                 Another example could be this:[br]
-                %A=$new(wrapper,0,test,KviFrame::kvirc_frame,QToolButton::kvirc.identityoptions)[br]
+                %A=$new(wrapper,0,test,KviMainWindow::kvirc_frame,QToolButton::kvirc.identityoptions)[br]
                 %A->$setProperty(usesBigPixmap,0)[br]
                 In this fool example with the function $setProperty, we has setted the property usesBigPixmap to False, making to become the small icons of the ToolBar.[br]
                 [br]
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index f8eb6a5bb..07219359d 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -26,8 +26,8 @@
 #include "class_memorybuffer.h"
 #include "KviLocale.h"
 
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_hash.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsHash.h"
 
 #include "KviQString.h"
 
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 87ebcba25..f0be91446 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -71,17 +71,17 @@
 #include "class_datetimeedit.h"
 
 
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_app.h"
-#include "kvi_module.h"
+#include "KviApplication.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 #include "KviError.h"
 #include "KviCommandFormatter.h"
 #include "kvi_out.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 
 #include <QDir>
@@ -506,7 +506,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 		++it;
 	}
 	QString szPath;
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes);
 	QDir d(szPath);
 	QStringList sl;
 	sl = d.entryList(QDir::Files);
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 66bd57374..2f28aab2f 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -24,11 +24,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_object_class.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_object_functioncall.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObject.h"
+#include "KviKvsObjectClass.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsObjectFunctionCall.h"
 
 #define KVSO_DECLARE_OBJECT(__className) \
 	__className(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName); \
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>
 
diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp
index 0f0b457bf..c25720c8a 100644
--- a/src/modules/perl/libkviperl.cpp
+++ b/src/modules/perl/libkviperl.cpp
@@ -23,12 +23,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_modulemanager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviModuleManager.h"
 #include "kvi_out.h"
 
 #ifdef COMPILE_PERL_SUPPORT
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index fccc2b64f..1640f6846 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_userinput.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariant.h"
+#include "KviUserInput.h"
 #include "KviPointerHashTable.h"
 
 #include <QByteArray>
@@ -70,7 +70,7 @@
 
 	#include "ppport.h"
 
-	#include "kvi_kvs_runtimecontext.h"
+	#include "KviKvsRunTimeContext.h"
 
 	static KviKvsRunTimeContext * g_pCurrentKvsContext = 0;
 	static bool g_bExecuteQuiet = false;
diff --git a/src/modules/perlcore/perlcoreinterface.h b/src/modules/perlcore/perlcoreinterface.h
index a4b039182..b305bcbfd 100644
--- a/src/modules/perlcore/perlcoreinterface.h
+++ b/src/modules/perlcore/perlcoreinterface.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsRunTimeContext.h"
 
 #include <QStringList>
 
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index bf432b1a0..e28d1bd08 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_kvs_popupmanager.h"
+#include "KviKvsPopupManager.h"
 
 #define GET_KVS_POPUP \
 	int iIdx = szPopupName.indexOf(QChar('.')); \
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 9205866f8..ca0f7247c 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -24,9 +24,9 @@
 
 #include "popupeditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 
 KviPopupEditorWindow * g_pPopupEditorWindow = 0;
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 31ff44e4c..14aeb3999 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -24,20 +24,20 @@
 
 #include "popupeditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_kvs_popupmenu.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviApplication.h"
+#include "KviKvsPopupManager.h"
+#include "KviKvsPopupMenu.h"
+#include "KviKvsVariantList.h"
 #include "KviPointerHashTable.h"
 #include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
@@ -1368,7 +1368,7 @@ void KviPopupEditor::getUniquePopupName(KviMenuTreeWidgetItem *item,QString &buf
 }
 
 
-KviPopupEditorWindow::KviPopupEditorWindow(KviFrame * lpFrm)
+KviPopupEditorWindow::KviPopupEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"popupeditor",0)
 {
 	g_pPopupEditorWindow = this;
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 37f29817e..6e41986b2 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include <QTreeWidget>
 #include "KviTalPopupMenu.h"
@@ -186,7 +186,7 @@ class KviPopupEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviPopupEditorWindow(KviFrame * lpFrm);
+	KviPopupEditorWindow(KviMainWindow * lpFrm);
 	~KviPopupEditorWindow();
 protected:
 	KviPopupEditor * m_pEditor;
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index ae3c2c3e7..344bf37d9 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-#include "kvi_app.h"
+#include "KviModule.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviProxyDataBase.h"
 
diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp
index 81006e93c..327d10fd2 100644
--- a/src/modules/python/libkvipython.cpp
+++ b/src/modules/python/libkvipython.cpp
@@ -23,12 +23,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
-#include "kvi_modulemanager.h"
+#include "KviModule.h"
+#include "KviModuleManager.h"
 //#include "KviFileUtils.h"
 #include "KviLocale.h"
-//#include "kvi_app.h"
-//#include "kvi_options.h"
+//#include "KviApplication.h"
+//#include "KviOptions.h"
 //#include "kvi_out.h"
 
 #ifdef COMPILE_PYTHON_SUPPORT
diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp
index 8aea2c4b5..c1a3e493a 100644
--- a/src/modules/pythoncore/kvircmodule.cpp
+++ b/src/modules/pythoncore/kvircmodule.cpp
@@ -31,11 +31,11 @@
 #define KVIRC_MODULE
 
 #include "kvircmodule.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_userinput.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_script.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviUserInput.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsScript.h"
 
 #include <QThread>
 
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index 825a47260..207102fb7 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -24,12 +24,12 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-//#include "kvi_modulemanager.h"
+//#include "KviModuleManager.h"
 //#include "KviFileUtils.h"
-//#include "kvi_app.h"
-//#include "kvi_options.h"
+//#include "KviApplication.h"
+//#include "KviOptions.h"
 //#include "kvi_out.h"
 
 #ifdef COMPILE_PYTHON_SUPPORT
diff --git a/src/modules/pythoncore/pythoncoreinterface.h b/src/modules/pythoncore/pythoncoreinterface.h
index bb6d533e9..5a66f65e8 100644
--- a/src/modules/pythoncore/pythoncoreinterface.h
+++ b/src/modules/pythoncore/pythoncoreinterface.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsRunTimeContext.h"
 
 #include <QStringList>
 
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 4f7f0f88b..852c1b9ed 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -24,9 +24,9 @@
 
 #include "raweditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 
 KviRawEditorWindow * g_pRawEditorWindow = 0;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 0b56d4ef9..26592ccff 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -24,21 +24,21 @@
 
 #include "raweditor.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviConfigurationFile.h"
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_scripteditor.h"
+#include "KviScriptEditor.h"
 #include "kvi_debug.h"
 #include "kvi_fileextensions.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviCommandFormatter.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_eventhandler.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsEventHandler.h"
 #include "KviTalVBox.h"
 #include "KviTalPopupMenu.h"
 
@@ -465,7 +465,7 @@ void KviRawEditor::exportAllEvents()
 }
 
 
-KviRawEditorWindow::KviRawEditorWindow(KviFrame * lpFrm)
+KviRawEditorWindow::KviRawEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"raweditor",0)
 {
 	g_pRawEditorWindow = this;
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index 646e22811..50146d231 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviQString.h"
 #include <QTreeWidget>
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QWidget>
 #include <QLineEdit>
@@ -122,7 +122,7 @@ class KviRawEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviRawEditorWindow(KviFrame * lpFrm);
+	KviRawEditorWindow(KviMainWindow * lpFrm);
 	~KviRawEditorWindow();
 protected:
 	KviRawEditor * m_pEditor;
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 5bf20468f..b4384a536 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -23,15 +23,15 @@
 //=============================================================================
 
 // incomplete
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviRegisteredChannel.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "kvi_debug.h"
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 
 /*
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 6df0a77fb..e08181b0b 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -32,16 +32,16 @@
 #include "KviLocale.h"
 #include "KviIrcMask.h"
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviFile.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
 #include "KviFileUtils.h"
 #include "kvi_settings.h"
 #include "KviStringConversion.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviPointerHashTable.h"
 #include "KviTalHBox.h"
 #include "KviTalVBox.h"
@@ -896,7 +896,7 @@ void KviRegisteredUsersDialog::importClicked()
 			int rnm = 0 ;
 			do
 			{
-				g_pApp->getLocalKvircDirectory(fPath,KviApp::Avatars,fName);
+				g_pApp->getLocalKvircDirectory(fPath,KviApplication::Avatars,fName);
 				fPath.append(QString("%1.png").arg(rnm));
 				rnm++;
 			} while(KviFileUtils::fileExists(fPath));
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index e3eff6420..1d41209d3 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -26,7 +26,7 @@
 
 #include "KviCString.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPointerHashTable.h"
 #include <QTreeWidget>
 #include "KviTalListWidget.h"
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index d49c2404f..711a52637 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -32,16 +32,16 @@
 #include "KviLocale.h"
 #include "KviIrcMask.h"
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviFile.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
 #include "KviFileUtils.h"
 #include "kvi_settings.h"
 #include "KviStringConversion.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviPointerHashTable.h"
 #include "KviTalHBox.h"
 #include "KviTalVBox.h"
@@ -62,7 +62,7 @@
 #include <QEvent>
 #include <QCloseEvent>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy!
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index aa5d6fece..43855cc89 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -26,7 +26,7 @@
 
 #include "KviCString.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPointerHashTable.h"
 #include <QTreeWidget>
 #include "KviTalPopupMenu.h"
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 34bc5115f..e514cae9d 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -24,19 +24,19 @@
 
 #include "edituser.h"
 #include "wizard.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
 #include "dialog.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviIrcUserDataBase.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
 #include "KviPointerList.h"
 
 #include <QSplitter> // FIXME: REmove this!
@@ -46,7 +46,7 @@
 
 //#warning "THIS MODULE HAS TO BE REVISED (notify list consistency!!!)"
 
-// kvi_app.cpp
+// KviApplication.cpp
 
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 86b888ead..bb14d71aa 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -27,12 +27,12 @@
 
 #include "KviLocale.h"
 #include "KviPointerList.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviIrcMask.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPixmap.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QDesktopWidget>
 #include <QLabel>
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 14fa267a2..b7879a3f1 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -26,7 +26,7 @@
 #include "libkvirijndael.h"
 #include "rijndael.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
diff --git a/src/modules/rijndael/libkvirijndael_cryptopp.cpp b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
index 51a8ae4ec..51efbac75 100644
--- a/src/modules/rijndael/libkvirijndael_cryptopp.cpp
+++ b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
@@ -25,7 +25,7 @@
 
 #include "libkvirijndael_cryptopp.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index 6929223eb..a1cbc3d3c 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -25,7 +25,7 @@
 
 #include "libkvirot13.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
 
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index 196c300a0..a72b29927 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-#include "kvi_app.h"
+#include "KviModule.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviIrcServer.h"
 #include "KviIrcServerDataBase.h"
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 19df1bc3f..5f8160f71 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -24,14 +24,14 @@
 
 #include "setupwizard.h"
 
-#include "kvi_module.h"
-#include "kvi_options.h"
+#include "KviModule.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
-#include "kvi_app.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_window.h"
-#include "kvi_theme.h"
+#include "KviApplication.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariantList.h"
+#include "KviWindow.h"
+#include "KviTheme.h"
 #include "KviIrcServerDataBase.h"
 
 #include <QString>
@@ -51,7 +51,7 @@ QString szMircIni;
 
 
 
-// this is called by KviApp when no local kvirc directory has been found
+// this is called by KviApplication when no local kvirc directory has been found
 // we have nothing to rely on yet... (settings have not been loaded yet)
 KVIMODULEEXPORTFUNC bool setup_begin()
 {
@@ -91,11 +91,11 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		switch(g_iThemeToApply)
 		{
 			case THEME_APPLY_HIRES:
-				g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"YellowIRC-1.0.0");
+				g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Themes,"YellowIRC-1.0.0");
 				KviTheme::load(szDir,out);
 			break;
 			case THEME_APPLY_LORES:
-				g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes,"MinimalDark-1.0.0");
+				g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Themes,"MinimalDark-1.0.0");
 				KviTheme::load(szDir,out);
 			break;
 			// default: no theme
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index df291feee..6938718b2 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -26,15 +26,15 @@ bool g_bFoundMirc;
 
 #include "setupwizard.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviFileUtils.h"
 #include "kvi_defaults.h"
-#include "kvi_msgbox.h"
+#include "KviMessageBox.h"
 #include "KviTalFileDialog.h"
 #include "KviQString.h"
 #include "KviEnvironment.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviConfigurationFile.h"
 #include "KviTalHBox.h"
 
@@ -142,7 +142,7 @@ KviSetupWizard::KviSetupWizard()
 	QString szLabelText;
 
 	QString szImagePath;
-	g_pApp->getGlobalKvircDirectory(szImagePath,KviApp::Pics,"kvi_setup_label.png");
+	g_pApp->getGlobalKvircDirectory(szImagePath,KviApplication::Pics,"kvi_setup_label.png");
 
 	m_pLabelPixmap = new QPixmap(szImagePath);
 	if(m_pLabelPixmap->isNull())
@@ -193,7 +193,7 @@ KviSetupWizard::KviSetupWizard()
 	ed->setWordWrapMode(QTextOption::NoWrap);
 	QString szLicense;
 	QString szLicensePath;
-	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING");
+	g_pApp->getGlobalKvircDirectory(szLicensePath,KviApplication::License,"COPYING");
 	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
 	{
 		szLicense = __tr("Oops... can't find the license file.\n" \
@@ -436,7 +436,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pThemeButtonGroup->setLayout(pThemeGrid);
 
 	QString szThemeImagePath;
-	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_hires.png");
+	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApplication::Pics,"kvi_setup_theme_hires.png");
 
 	QPixmap* pHiResPixmap = new QPixmap(szThemeImagePath);
 	if(pHiResPixmap->isNull())
@@ -456,7 +456,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),m_pThemeButtonGroup);
 	pThemeGrid->addWidget(m_pThemeHiRes, 2,1);
 
-	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_lowres.png");
+	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApplication::Pics,"kvi_setup_theme_lowres.png");
 	QPixmap* pLowResPixmap = new QPixmap(szThemeImagePath);
 	if(pLowResPixmap->isNull())
 	{
@@ -559,7 +559,7 @@ KviSetupWizard::KviSetupWizard()
 	// Preconfigured values
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	QString szTmp;
-	g_pApp->getGlobalKvircDirectory(szTmp,KviApp::Config,"preinstalled.kvc");
+	g_pApp->getGlobalKvircDirectory(szTmp,KviApplication::Config,"preinstalled.kvc");
 	if(KviFileUtils::fileExists(szTmp))
 	{
 		KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index f7085cfc4..6ecc56939 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviTalWizard.h"
 #include "KviTalVBox.h"
 #include "KviTalHBox.h"
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index cac76532c..2c99510af 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviSharedFilesManager.h"
 #include "KviIrcMask.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
 #include "KviPointerHashTable.h"
 
 #include <time.h>
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 7a86a79b3..888cdbb1f 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -23,12 +23,12 @@
 
 #include "sharedfileswindow.h"
 
-#include "kvi_module.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QSplitter>
 
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 3ee9b76f8..0280d9ee2 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -25,16 +25,16 @@
 #include "sharedfileswindow.h"
 
 #include "kvi_debug.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_themedlabel.h"
-#include "kvi_input.h"
-#include "kvi_filedialog.h"
+#include "KviThemedLabel.h"
+#include "KviInput.h"
+#include "KviFileDialog.h"
 #include "KviTalHBox.h"
 #include "KviTalVBox.h"
 
@@ -207,7 +207,7 @@ KviSharedFilesTreeWidgetItem::~KviSharedFilesTreeWidgetItem()
 }
 
 
-KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm)
+KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0), KviModuleExtension(d)
 {
 	g_pSharedFilesWindow = this;
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h
index 2693d54b2..ebba8a0ad 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.h
+++ b/src/modules/sharedfileswindow/sharedfileswindow.h
@@ -24,11 +24,11 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
-#include "kvi_sparser.h"
-#include "kvi_console.h"
-#include "kvi_moduleextension.h"
+#include "KviIrcServerParser.h"
+#include "KviConsoleWindow.h"
+#include "KviModuleExtension.h"
 #include "KviSharedFilesManager.h"
 #include <QTreeWidget>
 
@@ -79,7 +79,7 @@ class KviSharedFilesWindow : public KviWindow, public KviModuleExtension
 	friend class KviSharedFilesItem;
 	Q_OBJECT
 public:
-	KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviFrame * lpFrm);
+	KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
 	~KviSharedFilesWindow();
 protected:
 	QSplitter           * m_pVertSplitter;
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index f8ca68195..03468b212 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -25,11 +25,11 @@
 
 #include "libkvisnd.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "kvi_debug.h"
 #include "KviFileUtils.h"
 #include "KviMemory.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
 #include "KviQString.h"
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 7e5778abf..6c8f17940 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "KviPointerHashTable.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviThread.h"
 #include "KviCString.h"
 
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index d11f31c70..f877746ef 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -23,9 +23,9 @@
 
 #include "socketspywindow.h"
 
-#include "kvi_module.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviModule.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
 
 #include <QSplitter>
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 113ac3a06..1b56e8e54 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -24,17 +24,17 @@
 
 #include "socketspywindow.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_console.h"
-//#include "kvi_module.h"
+#include "KviConsoleWindow.h"
+//#include "KviModule.h"
 
 extern KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList;
 
-KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole)
+KviSocketSpyWindow::KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole), KviIrcDataStreamMonitor(lpConsole->context())
 {
 	g_pSocketSpyWindowList->append(this);
diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
index 38e32374c..3fd4ece13 100644
--- a/src/modules/socketspy/socketspywindow.h
+++ b/src/modules/socketspy/socketspywindow.h
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
-#include "kvi_ircdatastreammonitor.h"
+#include "KviIrcDataStreamMonitor.h"
 
 class KviConsole;
 
@@ -34,7 +34,7 @@ class KviSocketSpyWindow : public KviWindow, public KviIrcDataStreamMonitor
 {
 	Q_OBJECT
 public:
-	KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole);
+	KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsole * lpConsole);
 	~KviSocketSpyWindow();
 protected:
 	virtual QPixmap * myIconPtr();
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp
index 760efe227..03798ea78 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/controller.cpp
@@ -25,11 +25,11 @@
 
 #include "controller.h"
 
-#include "kvi_window.h"
-#include "kvi_console.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviMircCntrl.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 
 #include <QTimer>
 #include <QString>
diff --git a/src/modules/spaste/controller.h b/src/modules/spaste/controller.h
index 7d8925633..4471a382e 100644
--- a/src/modules/spaste/controller.h
+++ b/src/modules/spaste/controller.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 
 #include <QObject>
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 01a8a9260..b46a27fa2 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -26,13 +26,13 @@
 #include "libkvispaste.h"
 #include "controller.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviFileUtils.h"
 #include "KviQString.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_console.h"
-#include "kvi_options.h"
+#include "KviConsoleWindow.h"
+#include "KviOptions.h"
 #include "kvi_out.h"
 
 #include <QFile>
diff --git a/src/modules/spaste/libkvispaste.h b/src/modules/spaste/libkvispaste.h
index 1d5a07236..354b842ee 100644
--- a/src/modules/spaste/libkvispaste.h
+++ b/src/modules/spaste/libkvispaste.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 typedef struct _SPasteThreadData {
 	QString   * strData;
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 6f908dc68..78f9703c5 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -25,15 +25,15 @@
 
 //#warning: FIXME: Incomplete documentation ('seealso', 'example', etc)
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
 #include "KviQString.h"
 #include "kvi_debug.h"
 #include "kvi_settings.h"
 #include "KviMemory.h"
-#include "kvi_kvs_arraycast.h"
-#include "kvi_options.h"
+#include "KviKvsArrayCast.h"
+#include "KviOptions.h"
 
 #include <QRegExp>
 #include <QClipboard>
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 3dfcb9f9e..638e5c083 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -26,14 +26,14 @@
 #include "plugin.h"
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
 #include "KviThread.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviEnvironment.h"
 #include "KviOsInfo.h"
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 
 #include <QClipboard>
 #include <QByteArray>
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp
index b06c1c163..4c2ad89d7 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/plugin.cpp
@@ -24,11 +24,11 @@
 
 #include "plugin.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
 #include "KviThread.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 
 #include <QDir>
@@ -372,12 +372,12 @@ bool KviPluginManager::findPlugin(QString& szPath)
 		return true;
 	} else {
 		//Plugin not found in direct way. Looking in kvirc local dir
-		g_pApp->getGlobalKvircDirectory(szPath,KviApp::EasyPlugins,szFileName);
+		g_pApp->getGlobalKvircDirectory(szPath,KviApplication::EasyPlugins,szFileName);
 
 		if(!KviFileUtils::fileExists(szPath))
 		{
 			//Plugin not found in kvirc local dir. Looking in kvirc global dir
-			g_pApp->getLocalKvircDirectory(szPath,KviApp::EasyPlugins,szFileName);
+			g_pApp->getLocalKvircDirectory(szPath,KviApplication::EasyPlugins,szFileName);
 
 			if(!KviFileUtils::fileExists(szPath))
 			{
diff --git a/src/modules/system/plugin.h b/src/modules/system/plugin.h
index 8f435353e..fb2af9b07 100644
--- a/src/modules/system/plugin.h
+++ b/src/modules/system/plugin.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviPointerHashTable.h"
 #include <QLibrary>
 
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 851715b5f..4001d8e7c 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -23,9 +23,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
+#include "KviModule.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
 #include "KviPointerList.h"
 
 #include <QSplitter>
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index efa4e099b..ad153f02d 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -25,9 +25,9 @@
 #include "termwidget.h"
 #include "termwindow.h"
 
-#include "kvi_module.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviModule.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
 #include "KviPointerList.h"
 
@@ -46,7 +46,7 @@
 	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
 	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
 
-	KviTermWidget::KviTermWidget(QWidget * par,KviFrame *,bool bIsStandalone)
+	KviTermWidget::KviTermWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 	: QFrame(par)
 	{
 		setObjectName("term_widget");
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index d8ec94900..a0ad9cdbb 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -34,14 +34,14 @@
 
 	#include "kparts/part.h"
 
-	class KviFrame;
+	class KviMainWindow;
 
 	class KviTermWidget : public QFrame
 	{
 		Q_OBJECT
 		Q_PROPERTY( int KviProperty_ChildFocusOwner READ dummy )
 	public:
-		KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone = false);
+		KviTermWidget(QWidget * par,KviMainWindow * lpFrm,bool bIsStandalone = false);
 		~KviTermWidget();
 	private:
 		KviTalHBox   * m_pHBox;
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index 5b3ff0cb7..e586cbb4e 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -26,17 +26,17 @@
 #include "termwidget.h"
 
 #ifdef COMPILE_KDE_SUPPORT
-	#include "kvi_iconmanager.h"
-	#include "kvi_options.h"
+	#include "KviIconManager.h"
+	#include "KviOptions.h"
 	#include "KviLocale.h"
-	#include "kvi_module.h"
+	#include "KviModule.h"
 
 	extern KviModule * g_pTermModule;
 	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
 	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
 	extern KviIconManager * g_pIconManager;
 
-	KviTermWindow::KviTermWindow(KviFrame * lpFrm,const char * name)
+	KviTermWindow::KviTermWindow(KviMainWindow * lpFrm,const char * name)
 	: KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
 	{
 		g_pTermWindowList->append(this);
diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h
index 466520b64..556469ea2 100644
--- a/src/modules/term/termwindow.h
+++ b/src/modules/term/termwindow.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 
 #ifdef COMPILE_KDE_SUPPORT
-	#include "kvi_window.h"
+	#include "KviWindow.h"
 	#include "KviCString.h"
 
 	class KviTermWidget;
@@ -36,7 +36,7 @@
 	{
 		Q_OBJECT
 	public:
-		KviTermWindow(KviFrame * lpFrm,const char * name);
+		KviTermWindow(KviMainWindow * lpFrm,const char * name);
 		~KviTermWindow();
 	protected:
 		KviTermWidget * m_pTermWidget;
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index dbb3e2877..9c9066ee0 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-#include "kvi_texticonmanager.h"
+#include "KviModule.h"
+#include "KviTextIconManager.h"
 
 /*
 	@doc: texticons.get
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 200338068..dafae2115 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -25,21 +25,21 @@
 #include "managementdialog.h"
 #include "themefunctions.h"
 
-#include "kvi_msgbox.h"
-#include "kvi_module.h"
+#include "KviMessageBox.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 #include "KviParameterList.h"
 #include "KviCommandFormatter.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
 #include "KviConfigurationFile.h"
 #include "kvi_sourcesdate.h"
 #include "KviFileUtils.h"
-#include "kvi_filedialog.h"
-#include "kvi_theme.h"
+#include "KviFileDialog.h"
+#include "KviTheme.h"
 
 #include <QFileInfo>
 #include <QMessageBox>
@@ -99,7 +99,7 @@ static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("package_name",KVS_PT_STRING,0,szThemePackFile)
 	KVSM_PARAMETERS_END(c)
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	szDir += KVI_PATH_SEPARATOR_CHAR;
 	szDir += szThemePackFile;
 	KviThemeInfo * themeInfo = new KviThemeInfo();
@@ -150,7 +150,7 @@ static bool theme_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("package_name",KVS_PT_STRING,0,szThemePackFile)
 	KVSM_PARAMETERS_END(c)
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	szDir += KVI_PATH_SEPARATOR_CHAR;
 	szDir += szThemePackFile;
 	KviThemeInfo * themeInfo = new KviThemeInfo();
@@ -188,7 +188,7 @@ static bool theme_kvs_fnc_info(KviKvsModuleFunctionCall * c)
 static bool theme_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 {
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	QDir d(szDir);
 	QStringList sl = d.entryList(QDir::Dirs);
 	QStringList szThemes;
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 4d92276d6..3a76d82f4 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -27,20 +27,20 @@
 #include "savethemedialog.h"
 #include "themefunctions.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_internalcmd.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviInternalCommand.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
-#include "kvi_filedialog.h"
-#include "kvi_dynamictooltip.h"
-#include "kvi_iconmanager.h"
-#include "kvi_msgbox.h"
+#include "KviFileDialog.h"
+#include "KviDynamicToolTip.h"
+#include "KviIconManager.h"
+#include "KviMessageBox.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalListWidget.h"
 
@@ -392,9 +392,9 @@ void KviThemeManagementDialog::fillThemeBox()
 	m_pListWidget->clear();
 
 	QString szDir;
-	g_pApp->getGlobalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Themes);
 	fillThemeBox(szDir);
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Themes);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Themes);
 	fillThemeBox(szDir);
 
 	enableDisableButtons();
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 0b69960c0..be5995c3c 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 #include "KviPointerList.h"
-#include "kvi_theme.h"
+#include "KviTheme.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalWizard.h"
 #include "KviTalListWidget.h"
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 4a4c83440..bfaec19ca 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -26,18 +26,18 @@
 #include "packthemedialog.h"
 #include "themefunctions.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
-#include "kvi_filedialog.h"
-//#include "kvi_msgbox.h"
-#include "kvi_selectors.h"
+#include "KviFileDialog.h"
+//#include "KviMessageBox.h"
+#include "KviSelectors.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h
index ecbeb4c0a..d99862dfe 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/packthemedialog.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_theme.h"
+#include "KviTheme.h"
 
 #include <QWizard>
 #include <QWizardPage>
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 578e19b6d..072eceb38 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -25,18 +25,18 @@
 #include "savethemedialog.h"
 #include "themefunctions.h"
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
 #include "KviPackageFile.h"
 #include "kvi_fileextensions.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
-#include "kvi_selectors.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
+#include "KviSelectors.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
 
@@ -264,7 +264,7 @@ bool KviSaveThemeDialog::saveTheme()
 	sto.setSubdirectory(szSubdir);
 
 	QString szAbsDir;
-	g_pApp->getLocalKvircDirectory(szAbsDir,KviApp::Themes,sto.subdirectory(),true);
+	g_pApp->getLocalKvircDirectory(szAbsDir,KviApplication::Themes,sto.subdirectory(),true);
 	if(!KviFileUtils::makeDir(szAbsDir))
 	{
 		QMessageBox::critical(this,__tr2qs_ctx("Save Current Theme - KVIrc","theme"),__tr2qs_ctx("Unable to create theme directory.","theme"),
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 9d2140727..0eceffe9a 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_theme.h"
+#include "KviTheme.h"
 #include "KviTalWizard.h"
 
 #include <QDialog>
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index b14d5b5c8..677c31e8c 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -26,14 +26,14 @@
 
 #include "KviPackageFile.h"
 #include "KviLocale.h"
-#include "kvi_msgbox.h"
-#include "kvi_app.h"
-#include "kvi_htmldialog.h"
-#include "kvi_iconmanager.h"
+#include "KviMessageBox.h"
+#include "KviApplication.h"
+#include "KviHtmlDialog.h"
+#include "KviIconManager.h"
 #include "KviMiscUtils.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_theme.h"
-#include "kvi_frame.h"
+#include "KviTheme.h"
+#include "KviMainWindow.h"
 
 
 //#include <qmime.h>
@@ -291,7 +291,7 @@ namespace KviThemeFunctions
 		if(bInstall)
 		{
 			QString szUnpackPath;
-			g_pApp->getLocalKvircDirectory(szUnpackPath,KviApp::Themes);
+			g_pApp->getLocalKvircDirectory(szUnpackPath,KviApplication::Themes);
 			if(!r.unpack(szThemePackageFileName,szUnpackPath))
 			{
 				QString szErr2 = r.lastError();
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h
index 0aabab805..639e66107 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/themefunctions.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_htmldialog.h"
+#include "KviHtmlDialog.h"
 
 #include <QWidget>
 #include <QPixmap>
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 2bc2977d7..17fc24093 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -24,11 +24,11 @@
 
 #include "libkvitip.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviFileUtils.h"
 
 #include <QPushButton>
@@ -128,7 +128,7 @@ bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
 //	m_szConfigFileName.cutToLast('/');
 
 	QString buffer;
-	g_pApp->getReadOnlyConfigPath(buffer,m_szConfigFileName.toUtf8().data(),KviApp::ConfigPlugins,true);
+	g_pApp->getReadOnlyConfigPath(buffer,m_szConfigFileName.toUtf8().data(),KviApplication::ConfigPlugins,true);
 	qDebug("Check path %s and file %s",buffer.toUtf8().data(),m_szConfigFileName.toUtf8().data());
 	if(bEnsureExists)
 	{
@@ -143,7 +143,7 @@ bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
 void KviTipWindow::closeConfig()
 {
 	QString buffer;
-	g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,m_szConfigFileName);
+	g_pApp->getLocalKvircDirectory(buffer,KviApplication::ConfigPlugins,m_szConfigFileName);
 	m_pConfig->setSavePath(buffer);
 	delete m_pConfig;
 	m_pConfig = 0;
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index 2d5707b1e..bbacd6d30 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -24,9 +24,9 @@
 //=============================================================================
 
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_channel.h"
+#include "KviChannelWindow.h"
 
 /*
 	@doc: tmphighlight.addNick
@@ -63,7 +63,7 @@ static bool tmphighlight_kvs_cmd_addnick(KviKvsModuleCommandCall * c)
 		return false;
 	}
 
-	((KviChannel *)c->window())->addHighlightedUser(szNick);
+	((KviChannelWindow *)c->window())->addHighlightedUser(szNick);
 
 	return true;
 }
@@ -101,7 +101,7 @@ static bool tmphighlight_kvs_cmd_removenick(KviKvsModuleCommandCall * c)
 		return false;
 	}
 
-	((KviChannel *)c->window())->removeHighlightedUser(szNick);
+	((KviChannelWindow *)c->window())->removeHighlightedUser(szNick);
 	return true;
 }
 
@@ -243,7 +243,7 @@ static bool tmphighlight_kvs_fnc_isnickhighlighted(KviKvsModuleFunctionCall * c)
 		c->warning(__tr2qs("Current window is not a channel"));
 		return false;
 	}
-	c->returnValue()->setBoolean(((KviChannel *)c->window())->isHighlightedUser(szNick));
+	c->returnValue()->setBoolean(((KviChannelWindow *)c->window())->isHighlightedUser(szNick));
 	return true;
 }
 
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index ac8266cfe..755f92111 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -22,17 +22,17 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
 #include "KviError.h"
 #include "KviCommandFormatter.h"
-#include "kvi_customtoolbar.h"
-#include "kvi_customtoolbardescriptor.h"
-#include "kvi_customtoolbarmanager.h"
-#include "kvi_actionmanager.h"
-#include "kvi_kvs_useraction.h"
+#include "KviCustomToolBar.h"
+#include "KviCustomToolBarDescriptor.h"
+#include "KviCustomToolBarManager.h"
+#include "KviActionManager.h"
+#include "KviKvsUserAction.h"
 
 /*
 	@doc: toolbar.create
diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp
index edec5a67a..ecfe8936b 100644
--- a/src/modules/toolbareditor/libkvitoolbareditor.cpp
+++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp
@@ -24,12 +24,12 @@
 
 #include "toolbareditor.h"
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_actionmanager.h"
+#include "KviMainWindow.h"
+#include "KviActionManager.h"
 #include "KviConfigurationFile.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 QRect g_rectToolBarEditorDialogGeometry(0,0,0,0);
 
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 08a3c19dd..4307dbd53 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -24,19 +24,19 @@
 
 #include "toolbareditor.h"
 
-#include "kvi_app.h"
-#include "kvi_actiondrawer.h"
+#include "KviApplication.h"
+#include "KviActionDrawer.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_actionmanager.h"
-#include "kvi_customtoolbar.h"
-#include "kvi_customtoolbarmanager.h"
-#include "kvi_customtoolbardescriptor.h"
-#include "kvi_imagedialog.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviActionManager.h"
+#include "KviCustomToolBar.h"
+#include "KviCustomToolBarManager.h"
+#include "KviCustomToolBarDescriptor.h"
+#include "KviImageDialog.h"
 #include "KviFileUtils.h"
-#include "kvi_filedialog.h"
-#include "kvi_kvs_useraction.h"
+#include "KviFileDialog.h"
+#include "KviKvsUserAction.h"
 #include "KviTalToolTip.h"
 #include "kvi_fileextensions.h"
 
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index b5c283cc2..94f3c4d51 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -27,9 +27,9 @@
 #include "tc_ktorrentdbusinterface.h"
 #include "tc_statusbarapplet.h"
 
-#include "kvi_module.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
+#include "KviModule.h"
+#include "KviOptions.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 
diff --git a/src/modules/torrent/tc_ktorrentdbusinterface.cpp b/src/modules/torrent/tc_ktorrentdbusinterface.cpp
index 62059e634..2d91f4155 100644
--- a/src/modules/torrent/tc_ktorrentdbusinterface.cpp
+++ b/src/modules/torrent/tc_ktorrentdbusinterface.cpp
@@ -28,7 +28,7 @@
 
 #ifdef COMPILE_KDE_SUPPORT
 
-	#include "kvi_app.h"
+	#include "KviApplication.h"
 	#include "KviLocale.h"
 
 	#include <QTimer>
diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp
index bf1b701cb..897b6abac 100644
--- a/src/modules/torrent/tc_statusbarapplet.cpp
+++ b/src/modules/torrent/tc_statusbarapplet.cpp
@@ -28,7 +28,7 @@
 #include "tc_statusbarapplet.h"
 
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include "QTimer"
 
diff --git a/src/modules/torrent/tc_statusbarapplet.h b/src/modules/torrent/tc_statusbarapplet.h
index f8e8be6b5..69fbf6ae4 100644
--- a/src/modules/torrent/tc_statusbarapplet.h
+++ b/src/modules/torrent/tc_statusbarapplet.h
@@ -26,8 +26,8 @@
 //
 //=============================================================================
 
-#include "kvi_statusbar.h"
-#include "kvi_statusbarapplet.h"
+#include "KviStatusBar.h"
+#include "KviStatusBarApplet.h"
 
 // TODO: check if it gets destroyed
 // TODO: proper icon!
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index aa2e68b5c..fc7896411 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -27,20 +27,20 @@
 #include "libkvitrayicon.h"
 
 #include "kvi_settings.h"
-#include "kvi_app.h"
-#include "kvi_module.h"
+#include "KviApplication.h"
+#include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
-#include "kvi_windowlist.h"
-#include "kvi_window.h"
-#include "kvi_dynamictooltip.h"
-#include "kvi_iconmanager.h"
-#include "kvi_internalcmd.h"
-#include "kvi_console.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_options.h"
-#include "kvi_ircview.h"
+#include "KviWindowListBase.h"
+#include "KviWindow.h"
+#include "KviDynamicToolTip.h"
+#include "KviIconManager.h"
+#include "KviInternalCommand.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviOptions.h"
+#include "KviIrcView.h"
 #include "KviTalPopupMenu.h"
 
 #include <QPixmap>
@@ -65,7 +65,7 @@ static QPixmap * g_pDock1 = 0;
 static QPixmap * g_pDock2 = 0;
 static QPixmap * g_pDock3 = 0;
 
-KviTrayIcon::KviTrayIcon(KviFrame * frm)
+KviTrayIcon::KviTrayIcon(KviMainWindow * frm)
 : QSystemTrayIcon(frm), m_CurrentPixmap(ICON_SIZE,ICON_SIZE)
 {
 	m_pContextPopup = new KviTalPopupMenu(0);
@@ -545,7 +545,7 @@ void KviTrayIcon::updateIcon()
 	setIcon(QIcon(m_CurrentPixmap));
 }
 
-static KviTrayIcon * trayicon_find(KviFrame *f)
+static KviTrayIcon * trayicon_find(KviMainWindow *f)
 {
 	if(!g_pTrayIconList)return 0;
 	for(KviTrayIcon * w = g_pTrayIconList->first();w;w = g_pTrayIconList->next())
diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h
index 00d3b94ba..f26dd9d43 100644
--- a/src/modules/trayicon/libkvitrayicon.h
+++ b/src/modules/trayicon/libkvitrayicon.h
@@ -27,7 +27,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 #include <QSystemTrayIcon>
 #include <QLabel>
@@ -36,16 +36,16 @@ class QPixmap;
 class QTimer;
 class KviTalPopupMenu;
 class KviDynamicToolTip;
-//class KviFrame;
+//class KviMainWindow;
 
 class KviTrayIcon : public QSystemTrayIcon, public KviDockExtension
 {
 	Q_OBJECT
 public:
-	KviTrayIcon(KviFrame * win);
+	KviTrayIcon(KviMainWindow * win);
 	~KviTrayIcon();
 protected:
-	KviFrame               * m_pFrm;
+	KviMainWindow               * m_pFrm;
 	KviDynamicToolTip      * m_pTip;
 	KviTalPopupMenu        * m_pContextPopup;
 	KviTalPopupMenu        * m_pAwayPopup;
@@ -63,7 +63,7 @@ protected:
 	unsigned int m_iQueries;
 	unsigned int m_iOther;
 public:
-	KviFrame * frame(){ return m_pFrm; };
+	KviMainWindow * frame(){ return m_pFrm; };
 public:
 	virtual void refresh();
 	virtual void die();
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index c3eacb17c..c4abe4754 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviCString.h"
 #include "KviNetUtils.h"
 
diff --git a/src/modules/upnp/rootservice.cpp b/src/modules/upnp/rootservice.cpp
index 7405c2594..164c47c90 100644
--- a/src/modules/upnp/rootservice.cpp
+++ b/src/modules/upnp/rootservice.cpp
@@ -35,8 +35,8 @@
 #include "xmlfunctions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
 
 #include <QDebug>
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 3ad3d2ef6..ba01b6e31 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -24,21 +24,21 @@
 
 #include "libkviurl.h"
 
-#include "kvi_module.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_menubar.h"
-#include "kvi_mdimanager.h"
-#include "kvi_internalcmd.h"
-#include "kvi_iconmanager.h"
-#include "kvi_action.h"
-#include "kvi_actionmanager.h"
-#include "kvi_windowlist.h"
+#include "KviModule.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviMenuBar.h"
+#include "KviMdiManager.h"
+#include "KviInternalCommand.h"
+#include "KviIconManager.h"
+#include "KviAction.h"
+#include "KviActionManager.h"
+#include "KviWindowListBase.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_eventmanager.h"
+#include "KviKvsEventManager.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_window.h"
-#include "kvi_options.h"
+#include "KviWindow.h"
+#include "KviOptions.h"
 #include "KviQString.h"
 #include "kvi_out.h"
 
@@ -587,7 +587,7 @@ BanFrame::~BanFrame()
 void saveUrlList()
 {
 	QString urllist;
-	g_pApp->getLocalKvircDirectory(urllist,KviApp::ConfigPlugins);
+	g_pApp->getLocalKvircDirectory(urllist,KviApplication::ConfigPlugins);
 	urllist += g_pUrlListFilename;
 	QFile file;
 	file.setFileName(urllist);
@@ -611,7 +611,7 @@ void saveUrlList()
 void loadUrlList()
 {
 	QString urllist;
-	g_pApp->getLocalKvircDirectory(urllist,KviApp::ConfigPlugins);
+	g_pApp->getLocalKvircDirectory(urllist,KviApplication::ConfigPlugins);
 	urllist += g_pUrlListFilename;
 	QFile file;
 	file.setFileName(urllist);
@@ -651,7 +651,7 @@ void loadUrlList()
 void saveBanList()
 {
 	QString banlist;
-	g_pApp->getLocalKvircDirectory(banlist,KviApp::ConfigPlugins);
+	g_pApp->getLocalKvircDirectory(banlist,KviApplication::ConfigPlugins);
 	banlist += g_pBanListFilename;
 	QFile file;
 	file.setFileName(banlist);
@@ -671,7 +671,7 @@ void saveBanList()
 void loadBanList()
 {
 	QString banlist;
-	g_pApp->getLocalKvircDirectory(banlist,KviApp::ConfigPlugins);
+	g_pApp->getLocalKvircDirectory(banlist,KviApplication::ConfigPlugins);
 	banlist += g_pBanListFilename;
 	QFile file;
 	file.setFileName(banlist);
@@ -894,7 +894,7 @@ static bool url_module_init(KviModule *m)
 
 	m->kvsRegisterAppEventHandler(KviEvent_OnURL,urllist_module_event_onUrl);
 
-	g_pApp->getLocalKvircDirectory(szConfigPath,KviApp::ConfigPlugins,"url.conf");
+	g_pApp->getLocalKvircDirectory(szConfigPath,KviApplication::ConfigPlugins,"url.conf");
 
 	loadUrlList();
 	loadBanList();
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index a5b1fbc53..3e9c2e00b 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -26,11 +26,11 @@
 
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
-#include "kvi_irctoolbar.h"
-#include "kvi_window.h"
+#include "KviIrcToolBar.h"
+#include "KviWindow.h"
 #include "KviTalMenuBar.h"
-#include "kvi_mextoolbar.h"
-#include "kvi_kvs_action.h"
+#include "KviMexToolBar.h"
+#include "KviKvsAction.h"
 #include <QTreeWidget>
 
 #include <QDialog>
diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp
index 12f508631..4bbe53330 100644
--- a/src/modules/userlist/libkviuserlist.cpp
+++ b/src/modules/userlist/libkviuserlist.cpp
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviLocale.h"
-#include "kvi_channel.h"
-#include "kvi_userlistview.h"
+#include "KviChannelWindow.h"
+#include "KviUserListView.h"
 
 #define GET_KVS_WINDOW_ID_AND_NICK \
 	QString szWnd, szNick; \
@@ -113,7 +113,7 @@ static bool userlist_kvs_fnc_selected(KviKvsModuleFunctionCall * c)
 	KviKvsArray * a = new KviKvsArray();
 
 	kvs_int_t i = 0;
-	for(QString * s = ((KviChannel *)pWnd)->firstSelectedNickname();s;s = ((KviChannel *)pWnd)->nextSelectedNickname())
+	for(QString * s = ((KviChannelWindow *)pWnd)->firstSelectedNickname();s;s = ((KviChannelWindow *)pWnd)->nextSelectedNickname())
 	{
 		a->set(i,new KviKvsVariant(*s));
 		i++;
@@ -133,7 +133,7 @@ static bool userlist_kvs_cmd_select(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	((KviUserListView*)((KviChannel *)pWnd)->userListView())->select(szNick);
+	((KviUserListView*)((KviChannelWindow *)pWnd)->userListView())->select(szNick);
 	return true;
 }
 
@@ -147,7 +147,7 @@ static bool userlist_kvs_cmd_ensureVisible(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	((KviUserListView*)((KviChannel *)pWnd)->userListView())->ensureVisible(szNick);
+	((KviUserListView*)((KviChannelWindow *)pWnd)->userListView())->ensureVisible(szNick);
 	return true;
 }
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index e5f622110..66ecad7d2 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -24,22 +24,22 @@
 
 #include "userwindow.h"
 
-#include "kvi_module.h"
-#include "kvi_console.h"
-#include "kvi_options.h"
-#include "kvi_ircsocket.h"
-#include "kvi_frame.h"
+#include "KviModule.h"
+#include "KviConsoleWindow.h"
+#include "KviOptions.h"
+#include "KviIrcSocket.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviError.h"
-#include "kvi_ircview.h"
-#include "kvi_input.h"
-#include "kvi_iconmanager.h"
-#include "kvi_modulemanager.h"
+#include "KviIrcView.h"
+#include "KviInput.h"
+#include "KviIconManager.h"
+#include "KviModuleManager.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
-#include "kvi_mdichild.h"
-#include "kvi_channel.h"
+#include "KviMdiChild.h"
+#include "KviChannelWindow.h"
 #include "KviPointerHashTable.h"
 
 #include <QTimer>
@@ -47,13 +47,13 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
-	// kvi_app.cpp
+	#include "KviCryptController.h"
+	// KviApplication.cpp
 	extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
 #endif
 
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
 KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
 
@@ -125,7 +125,7 @@ static bool window_kvs_cmd_clearOutput(KviKvsModuleCommandCall * c)
 		if(pWnd->view())pWnd->view()->clearBuffer();
 		if(pWnd->type() == KVI_WINDOW_TYPE_CHANNEL)
 		{
-			KviChannel *chan = (KviChannel *)pWnd;
+			KviChannelWindow *chan = (KviChannelWindow *)pWnd;
 			if(chan->messageView()) chan->messageView()->clearBuffer();
 		}
 	}
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 6007e85fa..58c3c8f10 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -24,16 +24,16 @@
 
 #include "userwindow.h"
 
-#include "kvi_iconmanager.h"
-#include "kvi_input.h"
-#include "kvi_ircview.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviIconManager.h"
+#include "KviInput.h"
+#include "KviIrcView.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 
 extern KviPointerList<KviUserWindow> * g_pUserWindowList;
 
 
-KviUserWindow::KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags)
+KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags)
 : KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole)
 {
 	g_pUserWindowList->append(this);
diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h
index fe4e372e7..7ba63d954 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/userwindow.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 class KviUserWindow : public KviWindow
 {
@@ -33,7 +33,7 @@ class KviUserWindow : public KviWindow
 public:
 	enum CreationFlags { HasInput = 1 };
 public:
-	KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviConsole * pConsole = 0,int iCreationFlags = 0);
+	KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsole * pConsole = 0,int iCreationFlags = 0);
 	~KviUserWindow();
 protected:
 	int m_iIcon;