More renaming and cleanup

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

733 files changed, 4131 insertions, 4131 deletions

diff --git a/src/kvilib/core/KviCString.h b/src/kvilib/core/KviCString.h
index ccc114e5b..f4ad4184c 100644
--- a/src/kvilib/core/KviCString.h
+++ b/src/kvilib/core/KviCString.h
@@ -173,7 +173,7 @@ public:
 	int len() const                 { return m_len; };
 
 	// I hate this operator...but sometimes it is really useful
-	// especially in macros (kvi_options.cpp)
+	// especially in macros (KviOptions.cpp)
 	operator const char * () const  { return m_ptr; };
 
 	bool isEmpty() const            { return (m_len == 0); };
diff --git a/src/kvilib/core/kvi_hstrEqualCIN.cpp b/src/kvilib/core/kvi_hstrEqualCIN.cpp
index db34d3d5b..a746a40fa 100644
--- a/src/kvilib/core/kvi_hstrEqualCIN.cpp
+++ b/src/kvilib/core/kvi_hstrEqualCIN.cpp
@@ -22,7 +22,7 @@
 //
 //===========================================================================
 //
-// This file was originally part of kvi_ircview.cpp
+// This file was originally part of KviIrcView.cpp
 //
 //===========================================================================
 
diff --git a/src/kvilib/core/kvi_hstrEqualCIN.h b/src/kvilib/core/kvi_hstrEqualCIN.h
index 516b3a3a6..1cb803ad3 100644
--- a/src/kvilib/core/kvi_hstrEqualCIN.h
+++ b/src/kvilib/core/kvi_hstrEqualCIN.h
@@ -22,7 +22,7 @@
 //
 //===========================================================================
 //
-// This file was originally part of kvi_ircview.h
+// This file was originally part of KviIrcView.h
 //
 //===========================================================================
 
diff --git a/src/kvilib/irc/KviIrcServerDataBase.h b/src/kvilib/irc/KviIrcServerDataBase.h
index a2c2d04dd..cd2b2e27f 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.h
+++ b/src/kvilib/irc/KviIrcServerDataBase.h
@@ -94,7 +94,7 @@ public:
 	/**
 	* \brief Returns a list of servers to connect on startup
 	* This list is computed when the data are loaded from disk during the startup
-	* and is used by KviApp to start the connections.
+	* and is used by KviApplication to start the connections.
 	* The pointer is zero if there are no autoConnect servers. The list is valid
 	* only during the startup phase because it contains shallow pointers to the
 	* servers really contained in the server/network list and it is never updated
@@ -106,7 +106,7 @@ public:
 	/**
 	* \brief Returns a list of networks to connect on startup
 	* This list is computed when the data are loaded from disk during the startup
-	* and is used by KviApp to start the connections.
+	* and is used by KviApplication to start the connections.
 	* The pointer is zero if there are no autoConnect networks. The list is valid
 	* only during the startup phase because it contains shallow pointers to the
 	* networks really contained in the server/network list and it is never
diff --git a/src/kvilib/system/KviThread.h b/src/kvilib/system/KviThread.h
index cfb13ade0..9b6feaf31 100644
--- a/src/kvilib/system/KviThread.h
+++ b/src/kvilib/system/KviThread.h
@@ -325,7 +325,7 @@ protected:
 };
 
 // =============================================================================================//
-// This is private stuff...only KviThread and KviApp may use it
+// This is private stuff...only KviThread and KviApplication may use it
 // and may call only specific functions...don't touch.
 
 typedef struct _KviThreadPendingEvent
@@ -336,7 +336,7 @@ typedef struct _KviThreadPendingEvent
 
 class KVILIB_API KviThreadManager : public QObject
 {
-	friend class KviApp;
+	friend class KviApplication;
 	friend class KviThread;
 	Q_OBJECT
 protected:
@@ -368,7 +368,7 @@ protected:
 
 	void postSlaveEvent(QObject *o,QEvent *e);
 	void killPendingEventsByReceiver(QObject * receiver);
-	// Public to KviApp only
+	// Public to KviApplication only
 	static void globalInit();
 	static void globalDestroy();
 private slots:
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index bd1858d8d..251327c0c 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -17,308 +17,308 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(kvirc_MOC_HDRS
-	ui/kvi_actiondrawer.h
-	ui/kvi_channel.h
-	ui/kvi_colorwin.h
-	ui/kvi_console.h
-	ui/kvi_cryptcontroller.h
-	ui/kvi_ctcppagedialog.h
-	ui/kvi_customtoolbar.h
-	ui/kvi_debugwindow.h
-	ui/kvi_dynamictooltip.h
-	ui/kvi_filedialog.h
-	ui/kvi_frame.h
-	ui/kvi_historywin.h
-	ui/kvi_htmldialog.h
-	ui/kvi_imagedialog.h
-	ui/kvi_input.h
-	ui/kvi_input_editor.h
-	ui/kvi_ipeditor.h
-	ui/kvi_irctoolbar.h
-	ui/kvi_ircview.h
-	ui/kvi_ircviewtools.h
-	ui/kvi_maskeditor.h
-	ui/kvi_mdichild.h
-	ui/kvi_mdimanager.h
-	ui/kvi_menubar.h
-	ui/kvi_modeeditor.h
-	ui/kvi_modew.h
-	ui/kvi_optionswidget.h
-	ui/kvi_query.h
-	ui/kvi_scriptbutton.h
-	ui/kvi_scripteditor.h
-	ui/kvi_selectors.h
-	ui/kvi_splash.h
-	ui/kvi_statusbar.h
-	ui/kvi_statusbarapplet.h
-	ui/kvi_texticonwin.h
-	ui/kvi_themedcombobox.h
-	ui/kvi_themedlabel.h
-	ui/kvi_themedlineedit.h
-	ui/kvi_themedtreewidget.h
-	ui/kvi_toolbar.h
-	ui/kvi_toolwindows_container.h
-	ui/kvi_topicw.h
-	ui/kvi_userlistview.h
-	ui/kvi_window.h
-	ui/kvi_windowlist.h
-	ui/kvi_windowlist_tree.h
-	sparser/kvi_sparser.h
-	module/kvi_mexlinkfilter.h
-	module/kvi_mexserverimport.h
-	module/kvi_mextoolbar.h
-	module/kvi_modulemanager.h
-	kvs/kvi_kvs_action.h
-	kvs/kvi_kvs_aliasmanager.h
-	kvs/kvi_kvs_asyncdnsoperation.h
-	kvs/kvi_kvs_asyncoperation.h
-	kvs/kvi_kvs_dnsmanager.h
-	kvs/kvi_kvs_eventmanager.h
-	kvs/kvi_kvs_object.h
-	kvs/kvi_kvs_popupmenu.h
-	kvs/kvi_kvs_popupmanager.h
-	kvs/kvi_kvs_processmanager.h
-	kvs/kvi_kvs_timermanager.h
-	kvs/kvi_kvs_useraction.h
-	kernel/kvi_action.h
-	kernel/kvi_actionmanager.h
-	kernel/kvi_app.h
-	kernel/kvi_coreactions.h
-	kernel/kvi_defaultscript.h
-	kernel/kvi_filetransfer.h
-	kernel/kvi_iconmanager.h
-	kernel/kvi_ipc.h
-	kernel/kvi_ircconnection.h
-	kernel/kvi_ircconnectionrequestqueue.h
-	kernel/kvi_ircconnectiontargetresolver.h
-	kernel/kvi_irccontext.h
-	kernel/kvi_irclink.h
-	kernel/kvi_ircsocket.h
-	kernel/kvi_lagmeter.h
-	kernel/kvi_notifylist.h
-	kernel/kvi_texticonmanager.h
+	ui/KviActionDrawer.h
+	ui/KviChannelWindow.h
+	ui/KviColorSelectionWindow.h
+	ui/KviConsoleWindow.h
+	ui/KviCryptController.h
+	ui/KviCtcpPageDialog.h
+	ui/KviCustomToolBar.h
+	ui/KviDebugWindow.h
+	ui/KviDynamicToolTip.h
+	ui/KviFileDialog.h
+	ui/KviMainWindow.h
+	ui/KviHistoryWindow.h
+	ui/KviHtmlDialog.h
+	ui/KviImageDialog.h
+	ui/KviInput.h
+	ui/KviInputEditor.h
+	ui/KviIpEditor.h
+	ui/KviIrcToolBar.h
+	ui/KviIrcView.h
+	ui/KviIrcView_tools.h
+	ui/KviMaskEditor.h
+	ui/KviMdiChild.h
+	ui/KviMdiManager.h
+	ui/KviMenuBar.h
+	ui/KviModeEditor.h
+	ui/KviModeWidget.h
+	ui/KviOptionsWidget.h
+	ui/KviQueryWindow.h
+	ui/KviScriptButton.h
+	ui/KviScriptEditor.h
+	ui/KviSelectors.h
+	ui/KviSplashScreen.h
+	ui/KviStatusBar.h
+	ui/KviStatusBarApplet.h
+	ui/KviTextIconWindow.h
+	ui/KviThemedComboBox.h
+	ui/KviThemedLabel.h
+	ui/KviThemedLineEdit.h
+	ui/KviThemedTreeWidget.h
+	ui/KviToolBar.h
+	ui/KviWindowToolWidget.h
+	ui/KviTopicWidget.h
+	ui/KviUserListView.h
+	ui/KviWindow.h
+	ui/KviWindowListBase.h
+	ui/KviTreeWindowList.h
+	sparser/KviIrcServerParser.h
+	module/KviMexLinkFilter.h
+	module/KviMexServerImport.h
+	module/KviMexToolBar.h
+	module/KviModuleManager.h
+	kvs/KviKvsAction.h
+	kvs/KviKvsAliasManager.h
+	kvs/KviKvsAsyncDnsOperation.h
+	kvs/KviKvsAsyncOperation.h
+	kvs/KviKvsDnsManager.h
+	kvs/KviKvsEventManager.h
+	kvs/KviKvsObject.h
+	kvs/KviKvsPopupMenu.h
+	kvs/KviKvsPopupManager.h
+	kvs/KviKvsProcessManager.h
+	kvs/KviKvsTimerManager.h
+	kvs/KviKvsUserAction.h
+	kernel/KviAction.h
+	kernel/KviActionManager.h
+	kernel/KviApplication.h
+	kernel/KviCoreActions.h
+	kernel/KviDefaultScript.h
+	kernel/KviFileTransfer.h
+	kernel/KviIconManager.h
+	kernel/KviIpcSentinel.h
+	kernel/KviIrcConnection.h
+	kernel/KviIrcConnectionRequestQueue.h
+	kernel/KviIrcConnectionTargetResolver.h
+	kernel/KviIrcContext.h
+	kernel/KviIrcLink.h
+	kernel/KviIrcSocket.h
+	kernel/KviLagMeter.h
+	kernel/KviNotifyList.h
+	kernel/KviTextIconManager.h
 )
 
 SET(kvirc_SRCS
-	ui/kvi_actiondrawer.cpp
-	ui/kvi_channel.cpp
-	ui/kvi_colorwin.cpp
-	ui/kvi_console.cpp
-	ui/kvi_cryptcontroller.cpp
-	ui/kvi_ctcppagedialog.cpp
-	ui/kvi_customtoolbar.cpp
-	ui/kvi_debugwindow.cpp
-	ui/kvi_dynamictooltip.cpp
-	ui/kvi_filedialog.cpp
-	ui/kvi_frame.cpp
-	ui/kvi_historywin.cpp
-	ui/kvi_htmldialog.cpp
-	ui/kvi_imagedialog.cpp
-	ui/kvi_input.cpp
-	ui/kvi_input_editor.cpp
-	ui/kvi_input_history.cpp
-	ui/kvi_ipeditor.cpp
-	ui/kvi_irctoolbar.cpp
-	ui/kvi_ircview.cpp
-	ui/kvi_ircview_events.cpp
-	ui/kvi_ircview_gettextline.cpp
-	ui/kvi_ircview_loghandling.cpp
-	ui/kvi_ircviewtools.cpp
-	ui/kvi_maskeditor.cpp
-	ui/kvi_mdichild.cpp
-	ui/kvi_mdimanager.cpp
-	ui/kvi_menubar.cpp
-	ui/kvi_modeeditor.cpp
-	ui/kvi_modew.cpp
-	ui/kvi_msgbox.cpp
-	ui/kvi_optionswidget.cpp
-	ui/kvi_query.cpp
-	ui/kvi_scriptbutton.cpp
-	ui/kvi_scripteditor.cpp
-	ui/kvi_selectors.cpp
-	ui/kvi_splash.cpp
-	ui/kvi_statusbar.cpp
-	ui/kvi_statusbarapplet.cpp
-	ui/kvi_texticonwin.cpp
-	ui/kvi_themedcombobox.cpp
-	ui/kvi_themedlabel.cpp
-	ui/kvi_themedlineedit.cpp
-	ui/kvi_themedtreewidget.cpp
-	ui/kvi_toolbar.cpp
-	ui/kvi_toolwindows_container.cpp
-	ui/kvi_topicw.cpp
-	ui/kvi_userlistview.cpp
-	ui/kvi_window.cpp
-	ui/kvi_windowlist.cpp
-	ui/kvi_windowlist_tree.cpp
-	sparser/kvi_antispam.cpp
-	sparser/kvi_ircmessage.cpp
-	sparser/kvi_sp_ctcp.cpp
-	sparser/kvi_sp_literal.cpp
-	sparser/kvi_sp_numeric.cpp
-	sparser/kvi_sp_tables.cpp
-	sparser/kvi_sparser.cpp
-	module/kvi_mexlinkfilter.cpp
-	module/kvi_mexserverimport.cpp
-	module/kvi_mextoolbar.cpp
-	module/kvi_module.cpp
-	module/kvi_moduleextension.cpp
-	module/kvi_modulemanager.cpp
-	kvs/kvi_kvs.cpp
-	kvs/kvi_kvs_action.cpp
-	kvs/kvi_kvs_aliasmanager.cpp
-	kvs/kvi_kvs_array.cpp
-	kvs/kvi_kvs_arraycast.cpp
-	kvs/kvi_kvs_asyncdnsoperation.cpp
-	kvs/kvi_kvs_asyncoperation.cpp
-	kvs/kvi_kvs_callbackobject.cpp
-	kvs/kvi_kvs_corecallbackcommands.cpp
-	kvs/kvi_kvs_corefunctions.cpp
-	kvs/kvi_kvs_corefunctions_af.cpp
-	kvs/kvi_kvs_corefunctions_gl.cpp
-	kvs/kvi_kvs_corefunctions_mr.cpp
-	kvs/kvi_kvs_corefunctions_sz.cpp
-	kvs/kvi_kvs_coresimplecommands.cpp
-	kvs/kvi_kvs_coresimplecommands_af.cpp
-	kvs/kvi_kvs_coresimplecommands_gl.cpp
-	kvs/kvi_kvs_coresimplecommands_mr.cpp
-	kvs/kvi_kvs_coresimplecommands_sz.cpp
-	kvs/kvi_kvs_dnsmanager.cpp
-	kvs/kvi_kvs_event.cpp
-	kvs/kvi_kvs_eventhandler.cpp
-	kvs/kvi_kvs_eventmanager.cpp
-	kvs/kvi_kvs_eventtable.cpp
-	kvs/kvi_kvs_hash.cpp
-	kvs/kvi_kvs_kernel.cpp
-	kvs/kvi_kvs_moduleinterface.cpp
-	kvs/kvi_kvs_object.cpp
-	kvs/kvi_kvs_object_class.cpp
-	kvs/kvi_kvs_object_controller.cpp
-	kvs/kvi_kvs_object_functioncall.cpp
-	kvs/kvi_kvs_object_functionhandler.cpp
-	kvs/kvi_kvs_object_functionhandlerimpl.cpp
-	kvs/kvi_kvs_parameterprocessor.cpp
-	kvs/kvi_kvs_parser.cpp
-	kvs/kvi_kvs_parser_command.cpp
-	kvs/kvi_kvs_parser_comment.cpp
-	kvs/kvi_kvs_parser_dollar.cpp
-	kvs/kvi_kvs_parser_expression.cpp
-	kvs/kvi_kvs_parser_lside.cpp
-	kvs/kvi_kvs_parser_specialcommands.cpp
-	kvs/kvi_kvs_popupmanager.cpp
-	kvs/kvi_kvs_popupmenu.cpp
-	kvs/kvi_kvs_processmanager.cpp
-	kvs/kvi_kvs_report.cpp
-	kvs/kvi_kvs_runtimecall.cpp
-	kvs/kvi_kvs_runtimecontext.cpp
-	kvs/kvi_kvs_rwevaluationresult.cpp
-	kvs/kvi_kvs_script.cpp
-	kvs/kvi_kvs_scriptaddonmanager.cpp
-	kvs/kvi_kvs_switchlist.cpp
-	kvs/kvi_kvs_timermanager.cpp
-	kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
-	kvs/kvi_kvs_treenode_aliassimplecommand.cpp
-	kvs/kvi_kvs_treenode_arraycount.cpp
-	kvs/kvi_kvs_treenode_arrayelement.cpp
-	kvs/kvi_kvs_treenode_arrayorhashelement.cpp
-	kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
-	kvs/kvi_kvs_treenode_base.cpp
-	kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
-	kvs/kvi_kvs_treenode_callbackcommand.cpp
-	kvs/kvi_kvs_treenode_command.cpp
-	kvs/kvi_kvs_treenode_commandevaluation.cpp
-	kvs/kvi_kvs_treenode_commandwithparameters.cpp
-	kvs/kvi_kvs_treenode_compositedata.cpp
-	kvs/kvi_kvs_treenode_constantdata.cpp
-	kvs/kvi_kvs_treenode_corecallbackcommand.cpp
-	kvs/kvi_kvs_treenode_corefunctioncall.cpp
-	kvs/kvi_kvs_treenode_coresimplecommand.cpp
-	kvs/kvi_kvs_treenode_data.cpp
-	kvs/kvi_kvs_treenode_datalist.cpp
-	kvs/kvi_kvs_treenode_expression.cpp
-	kvs/kvi_kvs_treenode_expressionreturn.cpp
-	kvs/kvi_kvs_treenode_extendedscopevariable.cpp
-	kvs/kvi_kvs_treenode_functioncall.cpp
-	kvs/kvi_kvs_treenode_globalvariable.cpp
-	kvs/kvi_kvs_treenode_hashcount.cpp
-	kvs/kvi_kvs_treenode_hashelement.cpp
-	kvs/kvi_kvs_treenode_hashreferenceassert.cpp
-	kvs/kvi_kvs_treenode_indirectdata.cpp
-	kvs/kvi_kvs_treenode_instruction.cpp
-	kvs/kvi_kvs_treenode_instructionblock.cpp
-	kvs/kvi_kvs_treenode_localvariable.cpp
-	kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
-	kvs/kvi_kvs_treenode_modulefunctioncall.cpp
-	kvs/kvi_kvs_treenode_modulesimplecommand.cpp
-	kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
-	kvs/kvi_kvs_treenode_objectfield.cpp
-	kvs/kvi_kvs_treenode_objectfunctioncall.cpp
-	kvs/kvi_kvs_treenode_operation.cpp
-	kvs/kvi_kvs_treenode_parameterreturn.cpp
-	kvs/kvi_kvs_treenode_rebindingswitch.cpp
-	kvs/kvi_kvs_treenode_scopeoperator.cpp
-	kvs/kvi_kvs_treenode_simplecommand.cpp
-	kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
-	kvs/kvi_kvs_treenode_specialcommand.cpp
-	kvs/kvi_kvs_treenode_specialcommandbreak.cpp
-	kvs/kvi_kvs_treenode_specialcommandclass.cpp
-	kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
-	kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
-	kvs/kvi_kvs_treenode_specialcommanddo.cpp
-	kvs/kvi_kvs_treenode_specialcommandfor.cpp
-	kvs/kvi_kvs_treenode_specialcommandforeach.cpp
-	kvs/kvi_kvs_treenode_specialcommandif.cpp
-	kvs/kvi_kvs_treenode_specialcommandswitch.cpp
-	kvs/kvi_kvs_treenode_specialcommandunset.cpp
-	kvs/kvi_kvs_treenode_specialcommandwhile.cpp
-	kvs/kvi_kvs_treenode_stringcast.cpp
-	kvs/kvi_kvs_treenode_switchlist.cpp
-	kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
-	kvs/kvi_kvs_treenode_variable.cpp
-	kvs/kvi_kvs_treenode_voidfunctioncall.cpp
-	kvs/kvi_kvs_useraction.cpp
-	kvs/kvi_kvs_variant.cpp
-	kvs/kvi_kvs_variantlist.cpp
-	kernel/kvi_action.cpp
-	kernel/kvi_actionmanager.cpp
-	kernel/kvi_app.cpp
-	kernel/kvi_app_fs.cpp
-	kernel/kvi_app_setup.cpp
-	kernel/kvi_asynchronousconnectiondata.cpp
-	kernel/kvi_coreactions.cpp
-	kernel/kvi_customtoolbardescriptor.cpp
-	kernel/kvi_customtoolbarmanager.cpp
-	kernel/kvi_defaultscript.cpp
-	kernel/kvi_filetransfer.cpp
-	kernel/kvi_htmlgenerator.cpp
-	kernel/kvi_iconmanager.cpp
-	kernel/kvi_internalcmd.cpp
-	kernel/kvi_ipc.cpp
-	kernel/kvi_ircconnection.cpp
-	kernel/kvi_ircconnectionantictcpflooddata.cpp
-	kernel/kvi_ircconnectionasyncwhoisdata.cpp
-	kernel/kvi_ircconnectionnetsplitdetectordata.cpp
-	kernel/kvi_ircconnectionrequestqueue.cpp
-	kernel/kvi_ircconnectionserverinfo.cpp
-	kernel/kvi_ircconnectionstatedata.cpp
-	kernel/kvi_ircconnectionstatistics.cpp
-	kernel/kvi_ircconnectiontarget.cpp
-	kernel/kvi_ircconnectiontargetresolver.cpp
-	kernel/kvi_ircconnectionuserinfo.cpp
-	kernel/kvi_irccontext.cpp
-	kernel/kvi_ircdatastreammonitor.cpp
-	kernel/kvi_irclink.cpp
-	kernel/kvi_ircsocket.cpp
-	kernel/kvi_ircurl.cpp
-	kernel/kvi_lagmeter.cpp
-	kernel/kvi_main.cpp
-	kernel/kvi_notifylist.cpp
-	kernel/kvi_options.cpp
-	kernel/kvi_sslmaster.cpp
-	kernel/kvi_texticonmanager.cpp
-	kernel/kvi_theme.cpp
-	kernel/kvi_useraction.cpp
-	kernel/kvi_userinput.cpp
+	ui/KviActionDrawer.cpp
+	ui/KviChannelWindow.cpp
+	ui/KviColorSelectionWindow.cpp
+	ui/KviConsoleWindow.cpp
+	ui/KviCryptController.cpp
+	ui/KviCtcpPageDialog.cpp
+	ui/KviCustomToolBar.cpp
+	ui/KviDebugWindow.cpp
+	ui/KviDynamicToolTip.cpp
+	ui/KviFileDialog.cpp
+	ui/KviMainWindow.cpp
+	ui/KviHistoryWindow.cpp
+	ui/KviHtmlDialog.cpp
+	ui/KviImageDialog.cpp
+	ui/KviInput.cpp
+	ui/KviInputEditor.cpp
+	ui/KviInputHistory.cpp
+	ui/KviIpEditor.cpp
+	ui/KviIrcToolBar.cpp
+	ui/KviIrcView.cpp
+	ui/KviIrcView_events.cpp
+	ui/KviIrcView_getTextLine.cpp
+	ui/KviIrcView_loghandling.cpp
+	ui/KviIrcView_tools.cpp
+	ui/KviMaskEditor.cpp
+	ui/KviMdiChild.cpp
+	ui/KviMdiManager.cpp
+	ui/KviMenuBar.cpp
+	ui/KviModeEditor.cpp
+	ui/KviModeWidget.cpp
+	ui/KviMessageBox.cpp
+	ui/KviOptionsWidget.cpp
+	ui/KviQueryWindow.cpp
+	ui/KviScriptButton.cpp
+	ui/KviScriptEditor.cpp
+	ui/KviSelectors.cpp
+	ui/KviSplashScreen.cpp
+	ui/KviStatusBar.cpp
+	ui/KviStatusBarApplet.cpp
+	ui/KviTextIconWindow.cpp
+	ui/KviThemedComboBox.cpp
+	ui/KviThemedLabel.cpp
+	ui/KviThemedLineEdit.cpp
+	ui/KviThemedTreeWidget.cpp
+	ui/KviToolBar.cpp
+	ui/KviWindowToolWidget.cpp
+	ui/KviTopicWidget.cpp
+	ui/KviUserListView.cpp
+	ui/KviWindow.cpp
+	ui/KviWindowListBase.cpp
+	ui/KviTreeWindowList.cpp
+	sparser/KviAntiSpam.cpp
+	sparser/KviIrcMessage.cpp
+	sparser/KviIrcServerParser_ctcp.cpp
+	sparser/KviIrcServerParser_literalHandlers.cpp
+	sparser/KviIrcServerParser_numericHandlers.cpp
+	sparser/KviIrcServerParser_tables.cpp
+	sparser/KviIrcServerParser.cpp
+	module/KviMexLinkFilter.cpp
+	module/KviMexServerImport.cpp
+	module/KviMexToolBar.cpp
+	module/KviModule.cpp
+	module/KviModuleExtension.cpp
+	module/KviModuleManager.cpp
+	kvs/KviKvs.cpp
+	kvs/KviKvsAction.cpp
+	kvs/KviKvsAliasManager.cpp
+	kvs/KviKvsArray.cpp
+	kvs/KviKvsArrayCast.cpp
+	kvs/KviKvsAsyncDnsOperation.cpp
+	kvs/KviKvsAsyncOperation.cpp
+	kvs/KviKvsCallbackObject.cpp
+	kvs/KviKvsCoreCallbackCommands.cpp
+	kvs/KviKvsCoreFunctions.cpp
+	kvs/KviKvsCoreFunctions_af.cpp
+	kvs/KviKvsCoreFunctions_gl.cpp
+	kvs/KviKvsCoreFunctions_mr.cpp
+	kvs/KviKvsCoreFunctions_sz.cpp
+	kvs/KviKvsCoreSimpleCommands.cpp
+	kvs/KviKvsCoreSimpleCommands_af.cpp
+	kvs/KviKvsCoreSimpleCommands_gl.cpp
+	kvs/KviKvsCoreSimpleCommands_mr.cpp
+	kvs/KviKvsCoreSimpleCommands_sz.cpp
+	kvs/KviKvsDnsManager.cpp
+	kvs/KviKvsEvent.cpp
+	kvs/KviKvsEventHandler.cpp
+	kvs/KviKvsEventManager.cpp
+	kvs/KviKvsEventTable.cpp
+	kvs/KviKvsHash.cpp
+	kvs/KviKvsKernel.cpp
+	kvs/KviKvsModuleInterface.cpp
+	kvs/KviKvsObject.cpp
+	kvs/KviKvsObjectClass.cpp
+	kvs/KviKvsObjectController.cpp
+	kvs/KviKvsObjectFunctionCall.cpp
+	kvs/KviKvsObjectFunctionHandler.cpp
+	kvs/KviKvsObjectFunctionHandlerImpl.cpp
+	kvs/KviKvsParameterProcessor.cpp
+	kvs/KviKvsParser.cpp
+	kvs/KviKvsParser_command.cpp
+	kvs/KviKvsParser_comment.cpp
+	kvs/KviKvsParser_dollar.cpp
+	kvs/KviKvsParser_expression.cpp
+	kvs/KviKvsParser_lside.cpp
+	kvs/KviKvsParser_specialCommands.cpp
+	kvs/KviKvsPopupManager.cpp
+	kvs/KviKvsPopupMenu.cpp
+	kvs/KviKvsProcessManager.cpp
+	kvs/KviKvsReport.cpp
+	kvs/KviKvsRunTimeCall.cpp
+	kvs/KviKvsRunTimeContext.cpp
+	kvs/KviKvsRWEvaluationResult.cpp
+	kvs/KviKvsScript.cpp
+	kvs/KviKvsScriptAddonManager.cpp
+	kvs/KviKvsSwitchList.cpp
+	kvs/KviKvsTimerManager.cpp
+	kvs/KviKvsTreeNodeAliasFunctionCall.cpp
+	kvs/KviKvsTreeNodeAliasSimpleCommand.cpp
+	kvs/KviKvsTreeNodeArrayCount.cpp
+	kvs/KviKvsTreeNodeArrayElement.cpp
+	kvs/KviKvsTreeNodeArrayOrHashElement.cpp
+	kvs/KviKvsTreeNodeArrayReferenceAssert.cpp
+	kvs/KviKvsTreeNodeBase.cpp
+	kvs/KviKvsTreeNodeBaseObjectFunctionCall.cpp
+	kvs/KviKvsTreeNodeCallbackCommand.cpp
+	kvs/KviKvsTreeNodeCommand.cpp
+	kvs/KviKvsTreeNodeCommandEvaluation.cpp
+	kvs/KviKvsTreeNodeCommandWithParameters.cpp
+	kvs/KviKvsTreeNodeCompositeData.cpp
+	kvs/KviKvsTreeNodeConstantData.cpp
+	kvs/KviKvsTreeNodeCoreCallbackCommand.cpp
+	kvs/KviKvsTreeNodeCoreFunctionCall.cpp
+	kvs/KviKvsTreeNodeCoreSimpleCommand.cpp
+	kvs/KviKvsTreeNodeData.cpp
+	kvs/KviKvsTreeNodeDataList.cpp
+	kvs/KviKvsTreeNodeExpression.cpp
+	kvs/KviKvsTreeNodeExpressionReturn.cpp
+	kvs/KviKvsTreeNodeExtendedScopeVariable.cpp
+	kvs/KviKvsTreeNodeFunctionCall.cpp
+	kvs/KviKvsTreeNodeGlobalVariable.cpp
+	kvs/KviKvsTreeNodeHashCount.cpp
+	kvs/KviKvsTreeNodeHashElement.cpp
+	kvs/KviKvsTreeNodeHashReferenceAssert.cpp
+	kvs/KviKvsTreeNodeIndirectData.cpp
+	kvs/KviKvsTreeNodeInstruction.cpp
+	kvs/KviKvsTreeNodeInstructionBlock.cpp
+	kvs/KviKvsTreeNodeLocalVariable.cpp
+	kvs/KviKvsTreeNodeModuleCallbackCommand.cpp
+	kvs/KviKvsTreeNodeModuleFunctionCall.cpp
+	kvs/KviKvsTreeNodeModuleSimpleCommand.cpp
+	kvs/KviKvsTreeNodeMultipleParameterIdentifier.cpp
+	kvs/KviKvsTreeNodeObjectField.cpp
+	kvs/KviKvsTreeNodeObjectFunctionCall.cpp
+	kvs/KviKvsTreeNodeOperation.cpp
+	kvs/KviKvsTreeNodeParameterReturn.cpp
+	kvs/KviKvsTreeNodeRebindingSwitch.cpp
+	kvs/KviKvsTreeNodeScopeOperator.cpp
+	kvs/KviKvsTreeNodeSimpleCommand.cpp
+	kvs/KviKvsTreeNodeSingleParameterIdentifier.cpp
+	kvs/KviKvsTreeNodeSpecialCommand.cpp
+	kvs/KviKvsTreeNodeSpecialCommandBreak.cpp
+	kvs/KviKvsTreeNodeSpecialCommandClass.cpp
+	kvs/KviKvsTreeNodeSpecialCommandContinue.cpp
+	kvs/KviKvsTreeNodeSpecialCommandDefpopup.cpp
+	kvs/KviKvsTreeNodeSpecialCommandDo.cpp
+	kvs/KviKvsTreeNodeSpecialCommandFor.cpp
+	kvs/KviKvsTreeNodeSpecialCommandForeach.cpp
+	kvs/KviKvsTreeNodeSpecialCommandIf.cpp
+	kvs/KviKvsTreeNodeSpecialCommandSwitch.cpp
+	kvs/KviKvsTreeNodeSpecialCommandUnset.cpp
+	kvs/KviKvsTreeNodeSpecialCommandWhile.cpp
+	kvs/KviKvsTreeNodeStringCase.cpp
+	kvs/KviKvsTreeNodeSwitchList.cpp
+	kvs/KviKvsTreeNodeThisObjectFunctionCall.cpp
+	kvs/KviKvsTreeNodeVariable.cpp
+	kvs/KviKvsTreeNodeVoidFunctionCall.cpp
+	kvs/KviKvsUserAction.cpp
+	kvs/KviKvsVariant.cpp
+	kvs/KviKvsVariantList.cpp
+	kernel/KviAction.cpp
+	kernel/KviActionManager.cpp
+	kernel/KviApplication.cpp
+	kernel/KviApplication_filesystem.cpp
+	kernel/KviApplication_setup.cpp
+	kernel/KviAsynchronousConnectionData.cpp
+	kernel/KviCoreActions.cpp
+	kernel/KviCustomToolBarDescriptor.cpp
+	kernel/KviCustomToolBarManager.cpp
+	kernel/KviDefaultScript.cpp
+	kernel/KviFileTransfer.cpp
+	kernel/KviHtmlGenerator.cpp
+	kernel/KviIconManager.cpp
+	kernel/KviInternalCommand.cpp
+	kernel/KviIpcSentinel.cpp
+	kernel/KviIrcConnection.cpp
+	kernel/KviIrcConnectionAntiCtcpFloodData.cpp
+	kernel/KviIrcConnectionAsyncWhoisData.cpp
+	kernel/KviIrcConnectionNetsplitDetectorData.cpp
+	kernel/KviIrcConnectionRequestQueue.cpp
+	kernel/KviIrcConnectionServerInfo.cpp
+	kernel/KviIrcConnectionStateData.cpp
+	kernel/KviIrcConnectionStatistics.cpp
+	kernel/KviIrcConnectionTarget.cpp
+	kernel/KviIrcConnectionTargetResolver.cpp
+	kernel/KviIrcConnectionUserInfo.cpp
+	kernel/KviIrcContext.cpp
+	kernel/KviIrcDataStreamMonitor.cpp
+	kernel/KviIrcLink.cpp
+	kernel/KviIrcSocket.cpp
+	kernel/KviIrcUrl.cpp
+	kernel/KviLagMeter.cpp
+	kernel/KviMain.cpp
+	kernel/KviNotifyList.cpp
+	kernel/KviOptions.cpp
+	kernel/KviSSLMaster.cpp
+	kernel/KviTextIconManager.cpp
+	kernel/KviTheme.cpp
+	kernel/KviUserAction.cpp
+	kernel/KviUserInput.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/KviAction.cpp
index 37f041290..6f809151f 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/KviAction.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_action.cpp
+//   File : KviAction.cpp
 //   Creation date : Sun 21 Nov 2004 03:36:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_action.h"
-#include "kvi_customtoolbar.h"
-#include "kvi_frame.h"
-#include "kvi_irccontext.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_channel.h"
-#include "kvi_query.h"
+#include "KviAction.h"
+#include "KviCustomToolBar.h"
+#include "KviMainWindow.h"
+#include "KviIrcContext.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviChannelWindow.h"
+#include "KviQueryWindow.h"
 #include "KviTalPopupMenu.h"
 
 #include <QShortcut>
@@ -276,7 +276,7 @@ void KviAction::activeWindowChanged()
 			{
 				if(m_uFlags & WindowOnlyIfUsersSelected)
 				{
-					bool bEnabled = ((KviChannel *)g_pActiveWindow)->selectedCount() > 0;
+					bool bEnabled = ((KviChannelWindow *)g_pActiveWindow)->selectedCount() > 0;
 					if(bEnabled != isEnabled())
 						setEnabled(bEnabled);
 				} else {
@@ -293,7 +293,7 @@ void KviAction::activeWindowChanged()
 			{
 				if(m_uFlags & WindowOnlyIfUsersSelected)
 				{
-					bool bEnabled = ((KviQuery *)g_pActiveWindow)->selectedCount() > 0;
+					bool bEnabled = ((KviQueryWindow *)g_pActiveWindow)->selectedCount() > 0;
 					if(bEnabled != isEnabled())
 						setEnabled(bEnabled);
 				} else {
diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/KviAction.h
index e21af1caa..4ba2057cc 100644
--- a/src/kvirc/kernel/kvi_action.h
+++ b/src/kvirc/kernel/KviAction.h
@@ -2,7 +2,7 @@
 #define _KVI_ACTION_H_
 //=============================================================================
 //
-//   File : kvi_action.h
+//   File : KviAction.h
 //   Creation date : Sun 21 Nov 2004 03:36:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_action.h
+* \file KviAction.h
 * \author Szymon Stefanek
 * \brief Actions handling
 */
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/KviActionManager.cpp
index 4b6803b50..de2f1876d 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/KviActionManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_actionmanager.cpp
+//   File : KviActionManager.cpp
 //   Creation date : Sun 21 Nov 2004 03:37:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,17 +22,17 @@
 //
 //=============================================================================
 
-#include "kvi_actionmanager.h"
-#include "kvi_modulemanager.h"
-#include "kvi_coreactions.h"
-#include "kvi_customtoolbar.h"
-#include "kvi_customtoolbarmanager.h"
-#include "kvi_app.h"
+#include "KviActionManager.h"
+#include "KviModuleManager.h"
+#include "KviCoreActions.h"
+#include "KviCustomToolBar.h"
+#include "KviCustomToolBarManager.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_kvs_useraction.h"
+#include "KviKvsUserAction.h"
 #include "KviConfigurationFile.h"
 #include "KviQString.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 KviActionManager * KviActionManager::m_pInstance = 0;
 KviActionCategory * KviActionManager::m_pCategoryIrc = 0;
@@ -44,7 +44,7 @@ KviActionCategory * KviActionManager::m_pCategoryChannel = 0;
 KviActionCategory * KviActionManager::m_pCategoryTools = 0;
 bool KviActionManager::m_bCustomizingToolBars = false;
 KviCustomToolBar * KviActionManager::m_pCurrentToolBar = 0;
-// kvi_coreactions.cpp
+// KviCoreActions.cpp
 extern void register_core_actions(KviActionManager *);
 
 KviActionManager::KviActionManager()
diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/KviActionManager.h
index ad3dca071..93ca7fd94 100644
--- a/src/kvirc/kernel/kvi_actionmanager.h
+++ b/src/kvirc/kernel/KviActionManager.h
@@ -2,7 +2,7 @@
 #define _KVI_ACTIONMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_actionmanager.h
+//   File : KviActionManager.h
 //   Creation date : Sun 21 Nov 2004 03:37:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_action.h"
+#include "KviAction.h"
 #include "KviPointerHashTable.h"
 
 #include <QObject>
@@ -38,7 +38,7 @@ class KVIRC_API KviActionManager : public QObject
 	friend class KviActionDrawer;
 	friend class KviCustomizeToolBarsDialog;
 	friend class KviCustomToolBar;
-	friend class KviFrame;
+	friend class KviMainWindow;
 	Q_OBJECT
 public:
 	KviActionManager();
@@ -99,7 +99,7 @@ protected:
 	void customizeToolBarsDialogCreated();
 	void customizeToolBarsDialogDestroyed();
 	void tryFindCurrentToolBar();
-	void delayedRegisterAccelerators(); // this is called ONCE by KviFrame, at startup
+	void delayedRegisterAccelerators(); // this is called ONCE by KviMainWindow, at startup
 protected slots:
 	void actionDestroyed();
 signals:
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/KviApplication.cpp
index b1ec41346..8d1612d20 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_app.cpp
+//   File : KviApplication.cpp
 //   Creation date : Sun Jun 18 2000 12:39:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,68 +25,68 @@
 #define _KVI_APP_CPP_
 
 #include "kvi_socket.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_debug.h"
-#include "kvi_frame.h"
-#include "kvi_msgbox.h"
-#include "kvi_iconmanager.h"
-#include "kvi_input.h"
-#include "kvi_input_history.h"
+#include "KviMainWindow.h"
+#include "KviMessageBox.h"
+#include "KviIconManager.h"
+#include "KviInput.h"
+#include "KviInputHistory.h"
 #include "KviConfigurationFile.h"
-#include "kvi_colorwin.h"
-#include "kvi_window.h"
+#include "KviColorSelectionWindow.h"
+#include "KviWindow.h"
 #include "KviIrcServerDataBase.h"
 #include "KviProxyDataBase.h"
-#include "kvi_menubar.h"
-#include "kvi_options.h"
-#include "kvi_sparser.h"
-#include "kvi_modulemanager.h"
+#include "KviMenuBar.h"
+#include "KviOptions.h"
+#include "KviIrcServerParser.h"
+#include "KviModuleManager.h"
 #include "KviMediaType.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviThread.h"
 #include "KviSharedFilesManager.h"
 #include "kvi_confignames.h"
-#include "kvi_windowlist.h"
+#include "KviWindowListBase.h"
 #include "kvi_defaults.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_splash.h"
+#include "KviSplashScreen.h"
 #include "KviNickServRuleSet.h"
 #include "KviIdentityProfile.h"
-#include "kvi_defaultscript.h"
+#include "KviDefaultScript.h"
 #include "KviXlib.h"
-#include "kvi_texticonmanager.h"
-#include "kvi_texticonwin.h"
-#include "kvi_historywin.h"
-#include "kvi_ctcppagedialog.h"
+#include "KviTextIconManager.h"
+#include "KviTextIconWindow.h"
+#include "KviHistoryWindow.h"
+#include "KviCtcpPageDialog.h"
 #include "KviRegisteredChannel.h"
-#include "kvi_moduleextension.h"
-#include "kvi_internalcmd.h"
-#include "kvi_filetransfer.h"
+#include "KviModuleExtension.h"
+#include "KviInternalCommand.h"
+#include "KviFileTransfer.h"
 #include "KviMircCntrl.h"
-#include "kvi_ircurl.h"
+#include "KviIrcUrl.h"
 #include "KviAvatarCache.h"
-#include "kvi_actionmanager.h"
-#include "kvi_customtoolbarmanager.h"
+#include "KviActionManager.h"
+#include "KviCustomToolBarManager.h"
 #include "KviFileUtils.h"
 #include "KviTimeUtils.h"
 #include "KviStringConversion.h"
 #include "KviUserIdentity.h"
-#include "kvi_ircview.h"
+#include "KviIrcView.h"
 #include "KviEnvironment.h"
 #include "KviAnimatedPixmapCache.h"
-#include "kvi_kvs.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvs.h"
+#include "KviKvsScript.h"
+#include "KviKvsPopupManager.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsEventTriggers.h"
 #include "kvi_sourcesdate.h"
 #include "KviPointerHashTable.h"
 #include "KviTalPopupMenu.h"
 
 #ifndef COMPILE_NO_IPC
-	#include "kvi_ipc.h"
+	#include "KviIpcSentinel.h"
 #endif
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -111,8 +111,8 @@
 
 /*
 HACK These 2 hacks are defined because X11 defines Unsorted and None
-which conflicts with QDir and KviApp::KvircSubdir
-DO NOT REMOVE THEM EVEN IF THEY ARE DEFINED ALSO IN kvi_app.h
+which conflicts with QDir and KviApplication::KvircSubdir
+DO NOT REMOVE THEM EVEN IF THEY ARE DEFINED ALSO IN KviApplication.h
 */
 #ifdef Unsorted
 	#undef Unsorted
@@ -128,7 +128,7 @@ DO NOT REMOVE THEM EVEN IF THEY ARE DEFINED ALSO IN kvi_app.h
 #include <time.h> // time() in srand()
 
 // Global application pointer
-KVIRC_API KviApp                        * g_pApp                        = 0;
+KVIRC_API KviApplication                        * g_pApp                        = 0;
 
 KviConfigurationFile                               * g_pWinPropertiesConfig        = 0;
 KVIRC_API KviIrcServerDataBase             * g_pServerDataBase             = 0;
@@ -177,7 +177,7 @@ QPixmap                                 * g_pActivityMeterPixmap        = 0;
 
 #include <QStyleFactory>
 
-KviApp::KviApp(int &argc,char ** argv)
+KviApplication::KviApplication(int &argc,char ** argv)
 : KviTalApplication(argc,argv)
 {
 	setApplicationName("KVIrc");
@@ -222,7 +222,7 @@ KviApp::KviApp(int &argc,char ** argv)
 
 }
 
-void KviApp::setup()
+void KviApplication::setup()
 {
 	// Here we start up all the substystems.
 	// This is a really critical phase since in general subsystems depend
@@ -553,7 +553,7 @@ void KviApp::setup()
 	m_iHeartbeatTimerId = startTimer(1000);
 }
 
-void KviApp::frameDestructorCallback()
+void KviApplication::frameDestructorCallback()
 {
 	// here we should kill anything that depends on g_pFrame, g_pActiveWindow and related being non zero...
 
@@ -567,7 +567,7 @@ void KviApp::frameDestructorCallback()
 	}
 }
 
-KviApp::~KviApp()
+KviApplication::~KviApplication()
 {
 	// Another critical phase.
 	// We shutdown our subsystems in the right order here.
@@ -689,13 +689,13 @@ KviApp::~KviApp()
 
 static int g_iGloballyUniqueId = 0;
 
-int KviApp::getGloballyUniqueId()
+int KviApplication::getGloballyUniqueId()
 {
 	g_iGloballyUniqueId++;
 	return g_iGloballyUniqueId;
 }
 
-void KviApp::notifierMessage(KviWindow * pWnd, int iIconId, const QString & szMsg, unsigned int uMessageLifetime)
+void KviApplication::notifierMessage(KviWindow * pWnd, int iIconId, const QString & szMsg, unsigned int uMessageLifetime)
 {
 #if defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_DBUS_SUPPORT)
 	if(KVI_OPTION_BOOL(KviOption_boolUseDBusNotifier))
@@ -742,7 +742,7 @@ void KviApp::notifierMessage(KviWindow * pWnd, int iIconId, const QString & szMs
 #endif
 }
 
-QTextCodec * KviApp::defaultTextCodec()
+QTextCodec * KviApplication::defaultTextCodec()
 {
 	QTextCodec * pCodec = 0;
 	if(!KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding).isEmpty())
@@ -756,11 +756,11 @@ QTextCodec * KviApp::defaultTextCodec()
 		return pCodec;
 	pCodec = KviLocale::codecForName("UTF-8");
 	if(!pCodec)
-		qDebug("KviApp::defaultTextCodec(): cannot find a suitable text codec for locale :/");
+		qDebug("KviApplication::defaultTextCodec(): cannot find a suitable text codec for locale :/");
 	return pCodec;
 }
 
-QTextCodec * KviApp::defaultSrvCodec()
+QTextCodec * KviApplication::defaultSrvCodec()
 {
 	QTextCodec * pCodec = 0;
 	if(!KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding).isEmpty())
@@ -774,18 +774,18 @@ QTextCodec * KviApp::defaultSrvCodec()
 		return pCodec;
 	pCodec = KviLocale::codecForName("UTF-8");
 	if(!pCodec)
-		qDebug("KviApp::defaultSrcCodec(): cannot find a suitable text codec for locale :/");
+		qDebug("KviApplication::defaultSrcCodec(): cannot find a suitable text codec for locale :/");
 	return pCodec;
 }
 
-void KviApp::loadDefaultScript(QString szItem)
+void KviApplication::loadDefaultScript(QString szItem)
 {
 	QString szCmd;
 
 	if(szItem.isEmpty())
 		szItem = "default";
 
-	getGlobalKvircDirectory(szCmd,KviApp::DefScript,QString("%1.kvs").arg(szItem));
+	getGlobalKvircDirectory(szCmd,KviApplication::DefScript,QString("%1.kvs").arg(szItem));
 	szCmd.prepend("parse \"");
 	szCmd.append("\"");
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -794,7 +794,7 @@ void KviApp::loadDefaultScript(QString szItem)
 	KviKvsScript::run(szCmd,g_pFrame->firstConsole());
 }
 
-void KviApp::checkSuggestRestoreDefaultScript()
+void KviApplication::checkSuggestRestoreDefaultScript()
 {
 	static bool bSuggestedOnce = false;
 	if(KVI_OPTION_BOOL(KviOption_boolDoNotSuggestRestoreDefaultScript))
@@ -903,25 +903,25 @@ void KviApp::checkSuggestRestoreDefaultScript()
 	}
 }
 
-void KviApp::restoreDefaultScript()
+void KviApplication::restoreDefaultScript()
 {
 	KviDefaultScriptManager::instance()->restore();
 }
 
 #ifndef COMPILE_NO_IPC
-void KviApp::createIpcSentinel()
+void KviApplication::createIpcSentinel()
 {
 	m_pIpcSentinel = new KviIpcSentinel();
 }
 
-void KviApp::destroyIpcSentinel()
+void KviApplication::destroyIpcSentinel()
 {
 	if(m_pIpcSentinel)
 		delete m_pIpcSentinel;
 	m_pIpcSentinel = 0;
 }
 
-void KviApp::ipcMessage(char * pcMessage)
+void KviApplication::ipcMessage(char * pcMessage)
 {
 	if(!g_pFrame)
 		return;
@@ -942,19 +942,19 @@ void KviApp::ipcMessage(char * pcMessage)
 }
 #endif // COMPILE_NO_IPC
 
-void KviApp::createSplashScreen()
+void KviApplication::createSplashScreen()
 {
 	g_pSplashScreen = new KviSplashScreen();
 	g_pSplashScreen->show();
 }
 
-void KviApp::destroySplashScreen()
+void KviApplication::destroySplashScreen()
 {
 	if(g_pSplashScreen)
 		g_pSplashScreen->die();
 }
 
-void KviApp::setAvatarFromOptions()
+void KviApplication::setAvatarFromOptions()
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -969,7 +969,7 @@ void KviApp::setAvatarFromOptions()
 
 }
 
-void KviApp::setAvatarOnFileReceived(KviConsole * pConsole, const QString & szRemoteUrl, const QString & szNick, const QString & szUser, const QString & szHost)
+void KviApplication::setAvatarOnFileReceived(KviConsole * pConsole, const QString & szRemoteUrl, const QString & szNick, const QString & szUser, const QString & szHost)
 {
 	if(!m_pPendingAvatarChanges)
 	{
@@ -992,7 +992,7 @@ void KviApp::setAvatarOnFileReceived(KviConsole * pConsole, const QString & szRe
 	m_pPendingAvatarChanges->append(pAvatar);
 }
 
-KviPendingAvatarChange * KviApp::findPendingAvatarChange(KviConsole * pConsole, const QString & szNick, const QString & szRemoteUrl)
+KviPendingAvatarChange * KviApplication::findPendingAvatarChange(KviConsole * pConsole, const QString & szNick, const QString & szRemoteUrl)
 {
 	if(!m_pPendingAvatarChanges)
 		return 0;
@@ -1014,7 +1014,7 @@ KviPendingAvatarChange * KviApp::findPendingAvatarChange(KviConsole * pConsole,
 	return 0;
 }
 
-void KviApp::fileDownloadTerminated(bool bSuccess, const QString & szRemoteUrl, const QString & szLocalFileName, const QString & szNick, const QString & szError, bool bQuiet)
+void KviApplication::fileDownloadTerminated(bool bSuccess, const QString & szRemoteUrl, const QString & szLocalFileName, const QString & szNick, const QString & szError, bool bQuiet)
 {
 	KviPendingAvatarChange * pAvatar;
 
@@ -1087,7 +1087,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess, const QString & szRemoteUrl,
 }
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
-void KviApp::destroyPseudoTransparency()
+void KviApplication::destroyPseudoTransparency()
 {
 	if(g_pShadedParentGlobalDesktopBackground)
 	{
@@ -1101,7 +1101,7 @@ void KviApp::destroyPseudoTransparency()
 	}
 }
 
-void KviApp::triggerUpdatePseudoTransparency()
+void KviApplication::triggerUpdatePseudoTransparency()
 {
 	if(m_bUpdatePseudoTransparencyPending)
 		return;
@@ -1175,7 +1175,7 @@ QImage & kimageeffect_fade(QImage &img,float val,const QColor &color)
 	return img;
 }
 
-void KviApp::createGlobalBackgrounds(QPixmap * pix)
+void KviApplication::createGlobalBackgrounds(QPixmap * pix)
 {
 	// create shaded copies...
 	if(g_pShadedParentGlobalDesktopBackground)
@@ -1208,7 +1208,7 @@ void KviApp::createGlobalBackgrounds(QPixmap * pix)
 #endif //COMPILE_PSEUDO_TRANSPARENCY
 
 
-void KviApp::updatePseudoTransparency()
+void KviApplication::updatePseudoTransparency()
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	m_bUpdatePseudoTransparencyPending = false;
@@ -1274,7 +1274,7 @@ void KviApp::updatePseudoTransparency()
 #endif //COMPILE_PSEUDO_TRANSPARENCY
 }
 
-void KviApp::triggerUpdateGui()
+void KviApplication::triggerUpdateGui()
 {
 	if(m_bUpdateGuiPending)
 		return;
@@ -1282,13 +1282,13 @@ void KviApp::triggerUpdateGui()
 	QTimer::singleShot(0,this,SLOT(updateGui()));
 }
 
-void KviApp::updateGui()
+void KviApplication::updateGui()
 {
 	m_bUpdateGuiPending = false;
 	g_pFrame->applyOptions();
 }
 
-void KviApp::updateApplicationFont()
+void KviApplication::updateApplicationFont()
 {
 	if(KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont))
 	{
@@ -1302,7 +1302,7 @@ void KviApp::updateApplicationFont()
 	}
 }
 
-void KviApp::loadRecentEntries()
+void KviApplication::loadRecentEntries()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_RECENT);
@@ -1311,7 +1311,7 @@ void KviApp::loadRecentEntries()
 	//*g_pBookmarkList = cfg.readStringListEntry("Bookmarks",QStringList());
 }
 
-void KviApp::saveRecentEntries()
+void KviApplication::saveRecentEntries()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_RECENT);
@@ -1320,28 +1320,28 @@ void KviApp::saveRecentEntries()
 	//cfg.writeEntry("Bookmarks",*g_pBookmarkList);
 }
 
-void KviApp::saveAvatarCache()
+void KviApplication::saveAvatarCache()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_AVATARCACHE);
 	KviAvatarCache::instance()->save(szTmp);
 }
 
-void KviApp::saveToolBars()
+void KviApplication::saveToolBars()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_CUSTOMTOOLBARS);
 	KviCustomToolBarManager::instance()->save(szTmp);
 }
 
-void KviApp::savePopups()
+void KviApplication::savePopups()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_POPUPS);
 	KviKvs::savePopups(szTmp);
 }
 
-void KviApp::saveInputHistory()
+void KviApplication::saveInputHistory()
 {
 	if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))
 	{
@@ -1351,40 +1351,40 @@ void KviApp::saveInputHistory()
 	}
 }
 
-void KviApp::saveAliases()
+void KviApplication::saveAliases()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_ALIASES);
 	KviKvs::saveAliases(szTmp);
 }
 
-void KviApp::saveScriptAddons()
+void KviApplication::saveScriptAddons()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_SCRIPTADDONS);
 	KviKvs::saveScriptAddons(szTmp);
 }
 
-void KviApp::saveTextIcons()
+void KviApplication::saveTextIcons()
 {
 	g_pTextIconManager->save();
 }
 
-void KviApp::saveAppEvents()
+void KviApplication::saveAppEvents()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_EVENTS);
 	KviKvs::saveAppEvents(szTmp);
 }
 
-void KviApp::saveRawEvents()
+void KviApplication::saveRawEvents()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_RAWEVENTS);
 	KviKvs::saveRawEvents(szTmp);
 }
 
-void KviApp::saveMediaTypes()
+void KviApplication::saveMediaTypes()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_MEDIATYPES);
@@ -1393,77 +1393,77 @@ void KviApp::saveMediaTypes()
 	g_pMediaManager->unlock();
 }
 
-void KviApp::saveIrcServerDataBase()
+void KviApplication::saveIrcServerDataBase()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_SERVERDB);
 	g_pServerDataBase->save(szTmp);
 }
 
-void KviApp::saveProxyDataBase()
+void KviApplication::saveProxyDataBase()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_PROXYDB);
 	g_pProxyDataBase->save(szTmp);
 }
 
-void KviApp::saveRegisteredUsers()
+void KviApplication::saveRegisteredUsers()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_REGUSERDB);
 	g_pRegisteredUserDataBase->save(szTmp);
 }
 
-void KviApp::saveRegisteredChannels()
+void KviApplication::saveRegisteredChannels()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_REGCHANDB);
 	g_pRegisteredChannelDataBase->save(szTmp);
 }
 
-void KviApp::saveNickServ()
+void KviApplication::saveNickServ()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_NICKSERVDATABASE);
 	g_pNickServRuleSet->save(szTmp);
 }
 
-void KviApp::saveIdentityProfiles()
+void KviApplication::saveIdentityProfiles()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_PROFILESDATABASE);
 	KviIdentityProfileSet::instance()->save(szTmp);
 }
 
-void KviApp::saveDefaultScripts()
+void KviApplication::saveDefaultScripts()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_DEFAULTSCRIPT);
 	KviDefaultScriptManager::instance()->save(szTmp);
 }
 
-void KviApp::saveSharedFiles()
+void KviApplication::saveSharedFiles()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_SHAREDFILES);
 	g_pSharedFilesManager->save(szTmp);
 }
 
-void KviApp::saveActions()
+void KviApplication::saveActions()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_USERACTIONS);
 	KviActionManager::instance()->save(szTmp);
 }
 
-void KviApp::saveIdentities()
+void KviApplication::saveIdentities()
 {
 	QString szTmp;
 	getLocalKvircDirectory(szTmp,Config,KVI_CONFIGFILE_IDENTITIES);
 	KviUserIdentityManager::instance()->save(szTmp);
 }
 
-void KviApp::saveConfiguration()
+void KviApplication::saveConfiguration()
 {
 	// this is NOT called when the application is closing down
 	KviCustomToolBarManager::instance()->storeVisibilityState();
@@ -1493,7 +1493,7 @@ void KviApp::saveConfiguration()
 	g_pWinPropertiesConfig->sync();
 }
 
-void KviApp::autoConnectToServers()
+void KviApplication::autoConnectToServers()
 {
 	KviPointerList<KviIrcServer> * pList = g_pServerDataBase->autoConnectOnStartupServers();
 	if(pList)
@@ -1524,11 +1524,11 @@ void KviApp::autoConnectToServers()
 	}
 }
 
-void KviApp::createFrame()
+void KviApplication::createFrame()
 {
 	if(g_pFrame)
 		qDebug("WARNING: Creating the main frame twice!");
-	g_pFrame = new KviFrame();
+	g_pFrame = new KviMainWindow();
 	g_pFrame->createNewConsole(true);
 
 	if(m_szExecAfterStartup.hasData())
@@ -1553,7 +1553,7 @@ void KviApp::createFrame()
 		g_pFrame->show();
 }
 
-void KviApp::destroyFrame()
+void KviApplication::destroyFrame()
 {
 	m_bClosingDown=true;
 	if(g_pFrame)
@@ -1561,7 +1561,7 @@ void KviApp::destroyFrame()
 	g_pActiveWindow = 0;
 }
 
-bool KviApp::connectionExists(KviIrcConnection * pConn)
+bool KviApplication::connectionExists(KviIrcConnection * pConn)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1574,7 +1574,7 @@ bool KviApp::connectionExists(KviIrcConnection * pConn)
 	return false;
 }
 
-bool KviApp::windowExists(KviWindow * pWnd)
+bool KviApplication::windowExists(KviWindow * pWnd)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1587,12 +1587,12 @@ bool KviApp::windowExists(KviWindow * pWnd)
 	return false;
 }
 
-unsigned int KviApp::windowCount()
+unsigned int KviApplication::windowCount()
 {
 	return g_pGlobalWindowDict->count();
 }
 
-KviConsole * KviApp::findConsole(QString & szServer, QString & szNick)
+KviConsole * KviApplication::findConsole(QString & szServer, QString & szNick)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1629,7 +1629,7 @@ KviConsole * KviApp::findConsole(QString & szServer, QString & szNick)
 	return 0;
 }
 
-void KviApp::restartLagMeters()
+void KviApplication::restartLagMeters()
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1644,7 +1644,7 @@ void KviApp::restartLagMeters()
 	}
 }
 
-void KviApp::restartNotifyLists()
+void KviApplication::restartNotifyLists()
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1659,7 +1659,7 @@ void KviApp::restartNotifyLists()
 	}
 }
 
-void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * pUser)
+void KviApplication::resetAvatarForMatchingUsers(KviRegisteredUser * pUser)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1673,7 +1673,7 @@ void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * pUser)
 	}
 }
 
-KviConsole * KviApp::findConsole(unsigned int uIrcContextId)
+KviConsole * KviApplication::findConsole(unsigned int uIrcContextId)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1689,7 +1689,7 @@ KviConsole * KviApp::findConsole(unsigned int uIrcContextId)
 	return 0;
 }
 
-KviConsole * KviApp::topmostConnectedConsole()
+KviConsole * KviApplication::topmostConnectedConsole()
 {
 	// check the foreground window console
 
@@ -1716,12 +1716,12 @@ KviConsole * KviApp::topmostConnectedConsole()
 	return 0;
 }
 
-KviWindow * KviApp::findWindow(const QString & szWindowId)
+KviWindow * KviApplication::findWindow(const QString & szWindowId)
 {
 	return g_pGlobalWindowDict->find(szWindowId);
 }
 
-KviWindow * KviApp::findWindowByCaption(const QString & szWindowCaption, int iContextId)
+KviWindow * KviApplication::findWindowByCaption(const QString & szWindowCaption, int iContextId)
 {
 	KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
 
@@ -1735,17 +1735,17 @@ KviWindow * KviApp::findWindowByCaption(const QString & szWindowCaption, int iCo
 	return 0;
 }
 
-void KviApp::registerWindow(KviWindow * pWnd)
+void KviApplication::registerWindow(KviWindow * pWnd)
 {
 	g_pGlobalWindowDict->insert(pWnd->id(),pWnd);
 }
 
-void KviApp::unregisterWindow(KviWindow * pWnd)
+void KviApplication::unregisterWindow(KviWindow * pWnd)
 {
 	g_pGlobalWindowDict->remove(pWnd->id());
 }
 
-KviConsole * KviApp::activeConsole()
+KviConsole * KviApplication::activeConsole()
 {
 	if(!g_pFrame)
 		return 0;
@@ -1760,7 +1760,7 @@ KviConsole * KviApp::activeConsole()
 
 /////////////////// RECENT STUFF LISTS & POPUPS HANDLING
 
-// Helper for KviApp::addRecent*()
+// Helper for KviApplication::addRecent*()
 static void merge_to_stringlist_option(const QString & szItem, int iOption, int iMaxEntries)
 {
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(iOption).begin();
@@ -1782,18 +1782,18 @@ static void merge_to_stringlist_option(const QString & szItem, int iOption, int
 	KVI_OPTION_STRINGLIST(iOption).prepend(szItem);
 }
 
-void KviApp::addRecentUrl(const QString & szText)
+void KviApplication::addRecentUrl(const QString & szText)
 {
 	merge_to_stringlist_option(szText,KviOption_stringlistRecentIrcUrls,50);
 	emit(recentUrlsChanged());
 }
 
-void KviApp::addRecentNickname(const QString & szNewNick)
+void KviApplication::addRecentNickname(const QString & szNewNick)
 {
 	merge_to_stringlist_option(szNewNick,KviOption_stringlistRecentNicknames,KVI_MAX_RECENT_NICKNAMES);
 }
 
-void KviApp::addRecentChannel(const QString & szChan, const QString & szNet)
+void KviApplication::addRecentChannel(const QString & szChan, const QString & szNet)
 {
 	if(!m_pRecentChannelDict)
 		buildRecentChannels();
@@ -1809,7 +1809,7 @@ void KviApp::addRecentChannel(const QString & szChan, const QString & szNet)
 		pList->append(szChan);
 }
 
-void KviApp::buildRecentChannels()
+void KviApplication::buildRecentChannels()
 {
 	if(m_pRecentChannelDict)
 		delete m_pRecentChannelDict;
@@ -1846,7 +1846,7 @@ void KviApp::buildRecentChannels()
 	}
 }
 
-void KviApp::saveRecentChannels()
+void KviApplication::saveRecentChannels()
 {
 	if(!m_pRecentChannelDict)
 		return;
@@ -1869,19 +1869,19 @@ void KviApp::saveRecentChannels()
 	}
 }
 
-QStringList * KviApp::recentChannelsForNetwork(const QString & szNet)
+QStringList * KviApplication::recentChannelsForNetwork(const QString & szNet)
 {
 	if(!m_pRecentChannelDict)
 		buildRecentChannels();
 	return m_pRecentChannelDict->find(szNet);
 }
 
-void KviApp::addRecentServer(const QString & szServer)
+void KviApplication::addRecentServer(const QString & szServer)
 {
 	merge_to_stringlist_option(szServer,KviOption_stringlistRecentServers,KVI_MAX_RECENT_SERVERS);
 }
 
-void KviApp::fillRecentServersPopup(KviTalPopupMenu * pMenu)
+void KviApplication::fillRecentServersPopup(KviTalPopupMenu * pMenu)
 {
 	// FIXME: #warning "MAYBE DISABLE THE SERVERS THAT WE ARE ALREADY CONNECTED TO ?"
 	pMenu->clear();
@@ -1893,7 +1893,7 @@ void KviApp::fillRecentServersPopup(KviTalPopupMenu * pMenu)
 	}
 }
 
-void KviApp::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole)
+void KviApplication::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole)
 {
 	pMenu->clear();
 	int iId;
@@ -1917,7 +1917,7 @@ void KviApp::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsole * pCon
 	}
 }
 
-void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole)
+void KviApplication::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole * pConsole)
 {
 	pMenu->clear();
 	QStringList * pList = recentChannelsForNetwork(pConsole->currentNetworkName());
@@ -1938,7 +1938,7 @@ void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole * pCons
 
 
 /*
-void KviApp::fillRecentServersListBox(KviTalListBox * l)
+void KviApplication::fillRecentServersListBox(KviTalListBox * l)
 {
 	l->clear();
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it)
@@ -1948,7 +1948,7 @@ void KviApp::fillRecentServersListBox(KviTalListBox * l)
 
 //#include <QPixmapCache>
 
-void KviApp::heartbeat(kvi_time_t tNow)
+void KviApplication::heartbeat(kvi_time_t tNow)
 {
 	const struct tm * pTm = localtime(&tNow);
 
@@ -1973,7 +1973,7 @@ void KviApp::heartbeat(kvi_time_t tNow)
 	//QPixmapCache::clear();
 }
 
-void KviApp::timerEvent(QTimerEvent * e)
+void KviApplication::timerEvent(QTimerEvent * e)
 {
 	if(e->timerId() != m_iHeartbeatTimerId)
 	{
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/KviApplication.h
index 01f898507..2f1787358 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/KviApplication.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_app.h
+//   File : KviApplication.h
 //   Creation date : Sun Jun 18 2000 12:40:00 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -38,10 +38,10 @@
 
 #ifdef COMPILE_ON_WINDOWS
 	// The brain damaged MSVC compiler can't instantiate templates without this
-	#include "kvi_frame.h"
-	#include "kvi_window.h"
+	#include "KviMainWindow.h"
+	#include "KviWindow.h"
 #else // !COMPILE_ON_WINDOWS
-	class KviFrame;
+	class KviMainWindow;
 	class KviWindow;
 #endif // !COMPILE_ON_WINDOWS
 
@@ -100,15 +100,15 @@ typedef struct _KviDBusNotifierMessageQueue
 	#undef None
 #endif
 
-class KVIRC_API KviApp : public KviTalApplication
+class KVIRC_API KviApplication : public KviTalApplication
 {
-	friend class KviFrame;
+	friend class KviMainWindow;
 	friend class KviWindow;
 	friend class KviSetupWizard; // this resides in a module!
 	Q_OBJECT
 public:
-	KviApp(int &argc,char ** argv);
-	~KviApp();
+	KviApplication(int &argc,char ** argv);
+	~KviApplication();
 
 protected:
 	// directories
@@ -133,7 +133,7 @@ protected:
 #endif
 	QFont                                      m_fntDefaultFont;
 public:
-	// setup stuff (accessed from kvi_main.cpp: consider private othwerise)
+	// setup stuff (accessed from KviMain.cpp: consider private othwerise)
 	QString	                                   m_szConfigFile;        // setup
 	bool                                       m_bCreateConfig;      // setup
 	KviCString                                     m_szExecAfterStartup;
@@ -155,7 +155,7 @@ public:
 
 public:
 	void destroyFrame();
-	void setup();                                  // THIS SHOULD BE PRIVATE! (but is accessed from kvi_main.cpp)
+	void setup();                                  // THIS SHOULD BE PRIVATE! (but is accessed from KviMain.cpp)
 
 #ifndef COMPILE_NO_IPC
 	void ipcMessage(char * message);
@@ -188,7 +188,7 @@ public:
 	inline void emitRecentUrlsChanged() { emit(recentUrlsChanged()); };
 	 */
 
-	// kvi_app.cpp (Saving options)
+	// KviApplication.cpp (Saving options)
 	void saveIrcServerDataBase();
 	void saveProxyDataBase();
 	void saveRecentEntries();
@@ -211,7 +211,7 @@ public:
 	void saveScriptAddons();
 	void saveIdentities();
 
-	// kvi_options.cpp : Options saving and loading (kvi.main.conf))
+	// KviOptions.cpp : Options saving and loading (kvi.main.conf))
 	void loadOptions();
 	void saveOptions();
 
@@ -222,7 +222,7 @@ public:
 
 	void optionResetUpdate(int flags);
 
-	// kvi_app_fs.cpp : Filesystem thingies
+	// KviApplication_filesystem.cpp : Filesystem thingies
 	void getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString());
 	void getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString(),bool bCreateIfNeeded = true);
 
@@ -267,7 +267,7 @@ public:
 	///
 	bool findAudioFile(QString &szRetPath,const QString &szFileName);
 
-	// kvi_app.cpp : Window stuff
+	// KviApplication.cpp : Window stuff
 	KviWindow       * findWindow(const QString &windowId);
 	KviWindow       * findWindowByCaption(const QString &windowCaption,int iContextId=-1);
 	KviConsole      * findConsole(unsigned int ircContextId);
@@ -278,7 +278,7 @@ public:
 	bool              connectionExists(KviIrcConnection *cnn);
 	unsigned int      windowCount();
 
-	// kvi_app.cpp : Utilities
+	// KviApplication.cpp : Utilities
 	void resetAvatarForMatchingUsers(KviRegisteredUser * u);
 	void restartNotifyLists();
 	void restartLagMeters();
@@ -287,7 +287,7 @@ public:
 	void triggerUpdatePseudoTransparency();
 #endif
 
-	// kvi_app.cpp : DCC (and CTCP AVATAR & SOUND) related stuff
+	// KviApplication.cpp : DCC (and CTCP AVATAR & SOUND) related stuff
 	void setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemoteUrl,const QString &szNick,const QString &szUser,const QString &szHost);
 	KviPendingAvatarChange * findPendingAvatarChange(KviConsole * pConsole,const QString &szNick,const QString &szRemoteUrl);
 	void fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,const QString &szLocalFileName,const QString &szNick = QString(),const QString &szError = QString(),bool bQuiet = false);
@@ -322,14 +322,14 @@ public:
 protected:
 	void buildRecentChannels();
 	void saveRecentChannels();
-	// kvi_app.cpp : KviWindow global database
+	// KviApplication.cpp : KviWindow global database
 	void registerWindow(KviWindow *wnd);
 	void unregisterWindow(KviWindow *wnd);
 	void frameDestructorCallback();
 	void heartbeat(kvi_time_t tNow);
 	virtual void timerEvent(QTimerEvent *e);
 public slots:
-	// kvi_app.cpp : Slots
+	// KviApplication.cpp : Slots
 	void saveConfiguration();
 	void updateGui();
 	void updatePseudoTransparency();
@@ -339,7 +339,7 @@ private:
 	void createSplashScreen();
 	void destroySplashScreen();
 
-	// kvi_app_setup.cpp : Setup stuff
+	// KviApplication_setup.cpp : Setup stuff
 	void loadDirectories();
 	void findGlobalKvircDirectory();
 	bool findLocalKvircDirectory();
@@ -354,7 +354,7 @@ private:
 
 	void saveKvircDirectory();
 
-	// kvi_app.cpp : GUI stuff
+	// KviApplication.cpp : GUI stuff
 	void updateApplicationFont();
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -362,7 +362,7 @@ private:
 	void destroyPseudoTransparency();
 #endif //COMPILE_PSEUDO_TRANSPARENCY
 private:
-	// kvi_app.cpp : parts of setup()
+	// KviApplication.cpp : parts of setup()
 	void loadRecentEntries();
 #ifndef COMPILE_NO_IPC
 	void createIpcSentinel();
@@ -376,7 +376,7 @@ signals:
 };
 
 #ifndef _KVI_APP_CPP_
-	extern KVIRC_API KviApp * g_pApp;
+	extern KVIRC_API KviApplication * g_pApp;
 	extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 #endif
 
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp
index c312c0073..3642a033e 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/KviApplication_filesystem.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_app_fs.cpp
+//   File : KviApplication_filesystem.cpp
 //   Creation date : Thu Dec 24 1998 04:05:26 by Szymon Stefanek
 //
 //   This file is part of the Kvirc irc client distribution
@@ -24,15 +24,15 @@
 
 
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
 #include "KviFileUtils.h"
 #include "KviMediaType.h"
 #include "KviEnvironment.h"
 #include "KviTimeUtils.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QDir>
 #include <QFileInfo>
@@ -42,7 +42,7 @@ extern KviMediaManager * g_pMediaManager;
 
 //============ getGlobalKvircDirectory ================//
 
-void KviApp::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile)
+void KviApplication::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile)
 {
 	szData=m_szGlobalKvircDir;
 	KviQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR);
@@ -106,7 +106,7 @@ void KviApp::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QStri
 	KviFileUtils::adjustFilePath(szData);
 }
 
-void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString & appendFile,bool bCreateIfNeeded)
+void KviApplication::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString & appendFile,bool bCreateIfNeeded)
 {
 	szData=m_szLocalKvircDir;
 	KviQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR);
@@ -204,7 +204,7 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin
 	KviFileUtils::adjustFilePath(szData);
 }
 
-void KviApp::getTmpFileName(QString &szBuffer,const QString &szEndingFileName)
+void KviApplication::getTmpFileName(QString &szBuffer,const QString &szEndingFileName)
 {
 	QString tmp;
 	getLocalKvircDirectory(tmp,Tmp);
@@ -221,7 +221,7 @@ void KviApp::getTmpFileName(QString &szBuffer,const QString &szEndingFileName)
 	} while(KviFileUtils::fileExists(szBuffer));
 }
 
-void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * matches)
+void KviApplication::completeDirectory(const QString &word,KviPointerList<QString> * matches)
 {
 	QString szDir = word;
 	QString szFile = word;
@@ -282,7 +282,7 @@ void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * mat
 // Returns a valid filename for the channel dump log
 //
 
-void KviApp::getChannelDumpLogFileName(QString &str)
+void KviApplication::getChannelDumpLogFileName(QString &str)
 {
 	unsigned int logN = 0;
 	QString fPrefix="kick_";
@@ -312,7 +312,7 @@ void KviApp::getChannelDumpLogFileName(QString &str)
 
 // FIXME: #warning "Check WHEN findImage is used and when findUserFile is used...we have a mess here"
 
-bool KviApp::findImageInImageSearchPath(QString &szRetPath,const QString &filename)
+bool KviApplication::findImageInImageSearchPath(QString &szRetPath,const QString &filename)
 {
 	// first lookup the user defined paths
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin();
@@ -328,10 +328,10 @@ bool KviApp::findImageInImageSearchPath(QString &szRetPath,const QString &filena
 	return false;
 }
 
-static KviApp::KvircSubdir pics_localsubdirs[2]={ KviApp::Pics, KviApp::Avatars };
-static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics, KviApp::Avatars };
+static KviApplication::KvircSubdir pics_localsubdirs[2]={ KviApplication::Pics, KviApplication::Avatars };
+static KviApplication::KvircSubdir pics_globalsubdirs[2]={ KviApplication::Pics, KviApplication::Avatars };
 
-/*bool KviApp::mapImageFile(KviCString &szRetPath,const char * filename)
+/*bool KviApplication::mapImageFile(KviCString &szRetPath,const char * filename)
 {
 	QString buff;
 	bool ret=mapImageFile(buff,filename);
@@ -339,7 +339,7 @@ static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics, KviApp::Avatars
 	return ret;
 }*/
 
-bool KviApp::mapImageFile(QString &szRetPath,const QString &filename)
+bool KviApplication::mapImageFile(QString &szRetPath,const QString &filename)
 {
 	szRetPath = filename;
 	// can't map non absolute paths
@@ -419,7 +419,7 @@ bool KviApp::mapImageFile(QString &szRetPath,const QString &filename)
 	return false;
 }
 
-bool KviApp::findImage(QString &szRetPath,const QString &filename)
+bool KviApplication::findImage(QString &szRetPath,const QString &filename)
 {
 	// Find an user file...
 	if(KviFileUtils::isAbsolutePath(filename))
@@ -435,10 +435,10 @@ bool KviApp::findImage(QString &szRetPath,const QString &filename)
 		szTmp.append(KVI_PATH_SEPARATOR_CHAR);
 		szTmp.append(filename);
 
-		getLocalKvircDirectory(szRetPath,KviApp::Themes,szTmp);
+		getLocalKvircDirectory(szRetPath,KviApplication::Themes,szTmp);
 		if(KviFileUtils::fileExists(szRetPath))return true;
 
-		getGlobalKvircDirectory(szRetPath,KviApp::Themes,szTmp);
+		getGlobalKvircDirectory(szRetPath,KviApplication::Themes,szTmp);
 		if(KviFileUtils::fileExists(szRetPath))return true;
 	}
 
@@ -469,7 +469,7 @@ bool KviApp::findImage(QString &szRetPath,const QString &filename)
 	return false;
 }
 
-bool KviApp::findImageThemeOnlyCompat(QString &szRetPath,const QString &filename)
+bool KviApplication::findImageThemeOnlyCompat(QString &szRetPath,const QString &filename)
 {
 	// if we have a theme, look it up as first
 	if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty())
@@ -478,14 +478,14 @@ bool KviApp::findImageThemeOnlyCompat(QString &szRetPath,const QString &filename
 		szTmp.append(KVI_PATH_SEPARATOR_CHAR);
 		szTmp.append(filename);
 
-		getLocalKvircDirectory(szRetPath,KviApp::Themes,szTmp);
+		getLocalKvircDirectory(szRetPath,KviApplication::Themes,szTmp);
 		if(KviFileUtils::fileExists(szRetPath))return true;
 
-		getGlobalKvircDirectory(szRetPath,KviApp::Themes,szTmp);
+		getGlobalKvircDirectory(szRetPath,KviApplication::Themes,szTmp);
 		if(KviFileUtils::fileExists(szRetPath))return true;
 	}
 
-	getLocalKvircDirectory(szRetPath,KviApp::Pics,filename);
+	getLocalKvircDirectory(szRetPath,KviApplication::Pics,filename);
 	if(KviFileUtils::fileExists(szRetPath))return true;
 
 
@@ -496,7 +496,7 @@ bool KviApp::findImageThemeOnlyCompat(QString &szRetPath,const QString &filename
 	return false;
 }
 
-bool KviApp::findSmallIcon(QString &szRetPath,const QString &filename)
+bool KviApplication::findSmallIcon(QString &szRetPath,const QString &filename)
 {
 	// this is a bit optimized for the small builtin icons
 	// looks up less places.
@@ -517,22 +517,22 @@ bool KviApp::findSmallIcon(QString &szRetPath,const QString &filename)
 		szTmp.append(KVI_PATH_SEPARATOR_CHAR);
 		szTmp.append(filename);
 
-		getLocalKvircDirectory(szRetPath,KviApp::Themes,szTmp);
+		getLocalKvircDirectory(szRetPath,KviApplication::Themes,szTmp);
 		if(KviFileUtils::fileExists(szRetPath))return true;
 
-		getGlobalKvircDirectory(szRetPath,KviApp::Themes,szTmp);
+		getGlobalKvircDirectory(szRetPath,KviApplication::Themes,szTmp);
 		if(KviFileUtils::fileExists(szRetPath))return true;
 	}
 
 	// unlikely
-	getLocalKvircDirectory(szRetPath,KviApp::SmallIcons,filename);
+	getLocalKvircDirectory(szRetPath,KviApplication::SmallIcons,filename);
 	if(KviFileUtils::fileExists(szRetPath))return true;
 
-	getLocalKvircDirectory(szRetPath,KviApp::Pics,filename);
+	getLocalKvircDirectory(szRetPath,KviApplication::Pics,filename);
 	if(KviFileUtils::fileExists(szRetPath))return true;
 
 	// likely
-	getGlobalKvircDirectory(szRetPath,KviApp::SmallIcons,filename);
+	getGlobalKvircDirectory(szRetPath,KviApplication::SmallIcons,filename);
 	if(KviFileUtils::fileExists(szRetPath))return true;
 
 	if(findImageInImageSearchPath(szRetPath,filename))return true;
@@ -548,7 +548,7 @@ bool KviApp::findSmallIcon(QString &szRetPath,const QString &filename)
 	return false;
 }
 
-bool KviApp::findAudioFile(QString &szRetPath,const QString &szFileName)
+bool KviApplication::findAudioFile(QString &szRetPath,const QString &szFileName)
 {
 	if(KviFileUtils::isAbsolutePath(szFileName))
 	{
@@ -556,11 +556,11 @@ bool KviApp::findAudioFile(QString &szRetPath,const QString &szFileName)
 		return KviFileUtils::fileExists(szFileName);
 	}
 
-	getLocalKvircDirectory(szRetPath,KviApp::Audio,szFileName);
+	getLocalKvircDirectory(szRetPath,KviApplication::Audio,szFileName);
 	if(KviFileUtils::fileExists(szRetPath))
 		return true;
 
-	getGlobalKvircDirectory(szRetPath,KviApp::Audio,szFileName);
+	getGlobalKvircDirectory(szRetPath,KviApplication::Audio,szFileName);
 	if(KviFileUtils::fileExists(szRetPath))
 		return true;
 
@@ -582,7 +582,7 @@ bool KviApp::findAudioFile(QString &szRetPath,const QString &szFileName)
 // We want to READ a config file...find it
 //
 
-bool KviApp::getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail)
+bool KviApplication::getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail)
 {
 	// Take a look in the local directory....
 	getLocalKvircDirectory(buffer,sbd,config_name);
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp
index d0889f62b..75aa2f89c 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/KviApplication_setup.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_app_setup.cpp
+//   File : KviApplication_setup.cpp
 //   Creation date : Fri Apr 2 1999 02:38:05 by Szymon Stefanek
 //
 //   This file is part of the Kvirc irc client distribution
@@ -29,14 +29,14 @@
 
 #include "kvi_settings.h"
 #include "kvi_defaults.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
-#include "kvi_app.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
-#include "kvi_msgbox.h"
+#include "KviMessageBox.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviConfigurationFile.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -68,7 +68,7 @@ static QLibrary * g_pSetupLibrary = 0;
 //   and if it is not found, ask the user to choose one
 //
 
-bool KviApp::checkGlobalKvircDirectory(const QString szDir)
+bool KviApplication::checkGlobalKvircDirectory(const QString szDir)
 {
 	//First check if the help subdir exists
 	QString szHelpDir = szDir;
@@ -87,7 +87,7 @@ bool KviApp::checkGlobalKvircDirectory(const QString szDir)
 	return KviFileUtils::isReadable(szPicsDir);
 }
 
-bool KviApp::checkLocalKvircDirectory(const QString &szSpecificPath)
+bool KviApplication::checkLocalKvircDirectory(const QString &szSpecificPath)
 {
 	QString szSavedLocalKvircDir = m_szLocalKvircDir;
 	m_szLocalKvircDir = szSpecificPath;
@@ -96,7 +96,7 @@ bool KviApp::checkLocalKvircDirectory(const QString &szSpecificPath)
 	return bRet;
 }
 
-bool KviApp::checkLocalKvircDirectory()
+bool KviApplication::checkLocalKvircDirectory()
 {
 	//First check if the dir exists
 	if(!KviFileUtils::directoryExists(m_szLocalKvircDir))
@@ -112,7 +112,7 @@ bool KviApp::checkLocalKvircDirectory()
 	return true;
 }
 
-bool KviApp::checkFileAssociations()
+bool KviApplication::checkFileAssociations()
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 #define QUERY_BUFFER 2048
@@ -306,7 +306,7 @@ bool KviApp::checkFileAssociations()
 
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-bool KviApp::checkUriAssociations(const char * pcProto)
+bool KviApplication::checkUriAssociations(const char * pcProto)
 {
 #define QUERY_BUFFER 2048
 	char * pcBuffer;
@@ -410,7 +410,7 @@ bool KviApp::checkUriAssociations(const char * pcProto)
 
 	free(pcBuffer);
 #else
-bool KviApp::checkUriAssociations(const char *)
+bool KviApplication::checkUriAssociations(const char *)
 {
 #endif
 	return true;
@@ -418,7 +418,7 @@ bool KviApp::checkUriAssociations(const char *)
 
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-void KviApp::setupUriAssociations(const char * pcProto)
+void KviApplication::setupUriAssociations(const char * pcProto)
 {
 	HKEY hKey;
 	DWORD err;
@@ -451,12 +451,12 @@ void KviApp::setupUriAssociations(const char * pcProto)
 	tmp = QString(szAppPath + " --external \"%1\"").toLocal8Bit();
 	RegSetValueEx(hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length());
 #else
-void KviApp::setupUriAssociations(const char *)
+void KviApplication::setupUriAssociations(const char *)
 {
 #endif
 }
 
-void KviApp::setupFileAssociations()
+void KviApplication::setupFileAssociations()
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	HKEY hKey;
@@ -552,7 +552,7 @@ void KviApp::setupFileAssociations()
 #endif
 }
 
-void KviApp::findGlobalKvircDirectory()
+void KviApplication::findGlobalKvircDirectory()
 {
 	// Look for the installation directory
 	// with the image and help files inside
@@ -621,7 +621,7 @@ void KviApp::findGlobalKvircDirectory()
 }
 
 
-bool KviApp::findLocalKvircDirectory()
+bool KviApplication::findLocalKvircDirectory()
 {
 	// Here we check if we already did the setup
 	// and we have the kvirc local directory saved somewhere
@@ -684,7 +684,7 @@ bool KviApp::findLocalKvircDirectory()
 	return checkLocalKvircDirectory();
 }
 
-void KviApp::loadDirectories()
+void KviApplication::loadDirectories()
 {
 	// First find the global (readable) one...
 	findGlobalKvircDirectory();
@@ -713,7 +713,7 @@ void KviApp::loadDirectories()
 	if(!checkUriAssociations("ircs6")) setupUriAssociations("ircs6");
 }
 
-void KviApp::setupBegin()
+void KviApplication::setupBegin()
 {
 	//We must do the setup...ask the user..
 	QString szSetupLib;
@@ -721,7 +721,7 @@ void KviApp::setupBegin()
 #ifdef KVIRC_MODULES_DIR
 	szSetupLib = KVIRC_MODULES_DIR;
 #else
-	getGlobalKvircDirectory(szSetupLib,KviApp::Modules);
+	getGlobalKvircDirectory(szSetupLib,KviApplication::Modules);
 #endif
 
 	KviQString::ensureLastCharIs(szSetupLib, KVI_PATH_SEPARATOR_CHAR);
@@ -782,7 +782,7 @@ void KviApp::setupBegin()
 //	saveKvircDirectory();
 }
 
-void KviApp::setupFinish()
+void KviApplication::setupFinish()
 {
 	if(!g_pSetupLibrary)
 	{
@@ -805,7 +805,7 @@ void KviApp::setupFinish()
 	g_pSetupLibrary = 0;
 }
 
-void KviApp::saveKvircDirectory()
+void KviApplication::saveKvircDirectory()
 {
 	// Here we save the local directory path
 #ifdef COMPILE_KDE_SUPPORT
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
index 9a208fd23..a02753adf 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_asynchronousconnectiondata.cpp
+//   File : KviAsynchronousConnectionData.cpp
 //   Creation date : Sun 04 Jul 2004 16:22:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_asynchronousconnectiondata.h"
+#include "KviAsynchronousConnectionData.h"
 
 KviAsynchronousConnectionData::KviAsynchronousConnectionData()
 : KviHeapObject()
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/KviAsynchronousConnectionData.h
index a863f2679..03062832d 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.h
@@ -2,7 +2,7 @@
 #define _KVI_ASYNCHRONOUSCONNECTIONDATA_H_
 //=============================================================================
 //
-//   File : kvi_asynchronousconnectiondata.h
+//   File : KviAsynchronousConnectionData.h
 //   Creation date : Sun 04 Jul 2004 16:22:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index 231098808..74c2ae9d9 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_coreactions.cpp
+//   File : KviCoreActions.cpp
 //   Creation date : Mon 22 Nov 2004 02:30:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -24,26 +24,26 @@
 
 
 
-#include "kvi_coreactions.h"
+#include "KviCoreActions.h"
 #include "kvi_shortcuts.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_irccontext.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-#include "kvi_customtoolbar.h"
-#include "kvi_actiondrawer.h"
-#include "kvi_actionmanager.h"
-#include "kvi_kvs_action.h"
-#include "kvi_mdimanager.h"
-#include "kvi_irctoolbar.h"
+#include "KviIrcContext.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
+#include "KviCustomToolBar.h"
+#include "KviActionDrawer.h"
+#include "KviActionManager.h"
+#include "KviKvsAction.h"
+#include "KviMdiManager.h"
+#include "KviIrcToolBar.h"
 #include "KviLocale.h"
-#include "kvi_ircurl.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviIrcUrl.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
 #include "kvi_coreactionnames.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_kvs_script.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
 
 #include <QObject>
diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/KviCoreActions.h
index 9fc78b40d..978d7cb50 100644
--- a/src/kvirc/kernel/kvi_coreactions.h
+++ b/src/kvirc/kernel/KviCoreActions.h
@@ -2,7 +2,7 @@
 #define _KVI_COREACTIONS_H_
 //=============================================================================
 //
-//   File : kvi_coreactions.h
+//   File : KviCoreActions.h
 //   Creation date : Mon 22 Nov 2004 02:30:47 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_action.h"
-#include "kvi_kvs_action.h"
+#include "KviAction.h"
+#include "KviKvsAction.h"
 #include "KviPointerList.h"
 
 class KviConnectAction : public KviAction
@@ -150,7 +150,7 @@ protected slots:
 	void popupActivated(int);
 };
 
-#include "kvi_irctoolbar.h"
+#include "KviIrcToolBar.h"
 
 class KviIrcContextDisplayAction : public KviAction
 {
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
index 0d6245d1b..c84e2b1eb 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
+++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_customtoolbardescriptor.cpp
+//   File : KviCustomToolBarDescriptor.cpp
 //   Creation date : Sun 05 Dec 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,15 +24,15 @@
 
 
 
-#include "kvi_customtoolbardescriptor.h"
-#include "kvi_customtoolbar.h"
+#include "KviCustomToolBarDescriptor.h"
+#include "KviCustomToolBar.h"
 #include "KviConfigurationFile.h"
-#include "kvi_action.h"
-#include "kvi_actionmanager.h"
-#include "kvi_app.h"
+#include "KviAction.h"
+#include "KviActionManager.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_kvs_script.h"
-#include "kvi_window.h"
+#include "KviKvsScript.h"
+#include "KviWindow.h"
 
 KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(const QString &szId,const QString &szLabelCode)
 {
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.h b/src/kvirc/kernel/KviCustomToolBarDescriptor.h
index a10545402..8fb8359b0 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.h
+++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.h
@@ -2,7 +2,7 @@
 #define _KVI_CUSTOMTOOLBARDESCRIPTOR_H_
 //=============================================================================
 //
-//   File : kvi_customtoolbardescriptor.h
+//   File : KviCustomToolBarDescriptor.h
 //   Creation date : Sun 05 Dec 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -55,7 +55,7 @@ public:
 	const QString & label();
 	const QString & labelCode();
 	const QString & id(){ return m_szId; };
-	int internalId(){ return m_iInternalId; }; // useful only for KviFrame
+	int internalId(){ return m_iInternalId; }; // useful only for KviMainWindow
 	KviCustomToolBar * toolBar(){ return m_pToolBar; };
 	KviCustomToolBar * createToolBar();
 	void setIconId(const QString &szIconId){ m_szIconId = szIconId; };
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/KviCustomToolBarManager.cpp
index e827ec9d8..fe52719f8 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
+++ b/src/kvirc/kernel/KviCustomToolBarManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_customtoolbarmanager.cpp
+//   File : KviCustomToolBarManager.cpp
 //   Creation date : Sun 05 Dec 2004 18:20:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,8 +24,8 @@
 
 
 
-#include "kvi_customtoolbarmanager.h"
-#include "kvi_customtoolbardescriptor.h"
+#include "KviCustomToolBarManager.h"
+#include "KviCustomToolBarDescriptor.h"
 #include "KviConfigurationFile.h"
 #include "KviLocale.h"
 
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.h b/src/kvirc/kernel/KviCustomToolBarManager.h
index bc3c76c46..d25b24546 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.h
+++ b/src/kvirc/kernel/KviCustomToolBarManager.h
@@ -2,7 +2,7 @@
 #define _KVI_CUSTOMTOOLBARMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_customtoolbarmanager.h
+//   File : KviCustomToolBarManager.h
 //   Creation date : Sun 05 Dec 2004 18:20:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,7 +28,7 @@
 #include "KviPointerHashTable.h"
 
 #ifdef COMPILE_ON_WINDOWS
-	#include "kvi_customtoolbardescriptor.h"
+	#include "KviCustomToolBarDescriptor.h"
 #else
 	class KviCustomToolBarDescriptor;
 #endif
diff --git a/src/kvirc/kernel/kvi_defaultscript.cpp b/src/kvirc/kernel/KviDefaultScript.cpp
index 38cd1bd1b..4af722e05 100644
--- a/src/kvirc/kernel/kvi_defaultscript.cpp
+++ b/src/kvirc/kernel/KviDefaultScript.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_defaultscript.cpp
+//   File : KviDefaultScript.cpp
 //   Creation date : Fri Oct 01 2010 19:14:48 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,16 +22,16 @@
 //
 //=============================================================================
 
-#include "kvi_defaultscript.h"
+#include "KviDefaultScript.h"
 
-#include "kvi_app.h"
-#include "kvi_kvs.h"
+#include "KviApplication.h"
+#include "KviKvs.h"
 #include "KviConfigurationFile.h"
 #include "KviLocale.h"
 #include "KviMiscUtils.h"
-#include "kvi_actionmanager.h"
-#include "kvi_iconmanager.h"
-#include "kvi_customtoolbarmanager.h"
+#include "KviActionManager.h"
+#include "KviIconManager.h"
+#include "KviCustomToolBarManager.h"
 
 #include <QFile>
 #include <QDate>
@@ -50,12 +50,12 @@ KviDefaultScriptManager::KviDefaultScriptManager()
 
 	// Check if versions' file exists in personal settings
 	QString szLocal;
-	g_pApp->getLocalKvircDirectory(szLocal,KviApp::Config,"default.kvc");
+	g_pApp->getLocalKvircDirectory(szLocal,KviApplication::Config,"default.kvc");
 
 	if(!QFile::exists(szLocal))
 	{
 		QString szGlobal;
-		g_pApp->getGlobalKvircDirectory(szGlobal,KviApp::DefScript,"default.kvc");
+		g_pApp->getGlobalKvircDirectory(szGlobal,KviApplication::DefScript,"default.kvc");
 		QFile::copy(szGlobal,szLocal);
 	}
 }
@@ -83,7 +83,7 @@ void KviDefaultScriptManager::done()
 bool KviDefaultScriptManager::isDefscriptUpToDate()
 {
 	QString szConfig, szTmp;
-	g_pApp->getGlobalKvircDirectory(szConfig,KviApp::DefScript,"default.kvc");
+	g_pApp->getGlobalKvircDirectory(szConfig,KviApplication::DefScript,"default.kvc");
 	KviConfigurationFile * pCfg = new KviConfigurationFile(szConfig,KviConfigurationFile::Read);
 
 	szTmp = pCfg->readEntry("Date");
@@ -96,7 +96,7 @@ bool KviDefaultScriptManager::isDefscriptUpToDate()
 void KviDefaultScriptManager::restore()
 {
 	QString szGlobal, szError, szLocal;
-	g_pApp->getGlobalKvircDirectory(szGlobal,KviApp::DefScript,"default.kvc");
+	g_pApp->getGlobalKvircDirectory(szGlobal,KviApplication::DefScript,"default.kvc");
 
 	m_pDialog = new KviDefaultScriptDialog();
 	if(m_pDialog->exec() == QDialog::Rejected)
@@ -124,7 +124,7 @@ void KviDefaultScriptManager::restore()
 void KviDefaultScriptManager::restoreInternal()
 {
 	QString szConfig, szTmp;
-	g_pApp->getGlobalKvircDirectory(szConfig,KviApp::DefScript,"default.kvc");
+	g_pApp->getGlobalKvircDirectory(szConfig,KviApplication::DefScript,"default.kvc");
 	KviConfigurationFile * pCfg = new KviConfigurationFile(szConfig,KviConfigurationFile::Read);
 
 	m_szDate = pCfg->readEntry("Date");
diff --git a/src/kvirc/kernel/kvi_defaultscript.h b/src/kvirc/kernel/KviDefaultScript.h
index c7c59aaee..585db0084 100644
--- a/src/kvirc/kernel/kvi_defaultscript.h
+++ b/src/kvirc/kernel/KviDefaultScript.h
@@ -2,7 +2,7 @@
 #define _KVI_DEFAULTSCRIPT_H_
 //=============================================================================
 //
-//   File : kvi_defaultscript.h
+//   File : KviDefaultScript.h
 //   Creation date : Fri Oct 01 2010 19:14:48 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_defaultscript.h
+* \file KviDefaultScript.h
 * \author Elvio Basello
 * \brief Default script handling
 */
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/KviFileTransfer.cpp
index b3860b658..4971799dd 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/KviFileTransfer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_filetransfer.cpp
+//   File : KviFileTransfer.cpp
 //   Creation date : Mon Apr 21 22:14:31 2003 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_filetransfer.h"
-#include "kvi_moduleextension.h"
-#include "kvi_window.h"
+#include "KviFileTransfer.h"
+#include "KviModuleExtension.h"
+#include "KviWindow.h"
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 #include "KviTalPopupMenu.h"
 
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/KviFileTransfer.h
index 45f64cddb..5350e2c59 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/KviFileTransfer.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_filetransfer.h
+//   File : KviFileTransfer.h
 //   Creation date : Mon Apr 21 22:14:31 2003 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -42,7 +42,7 @@ class QPainter;
 
 class KVIRC_API KviFileTransferManager : public QObject
 {
-	friend class KviApp;
+	friend class KviApplication;
 	friend class KviFileTransfer;
 	friend class KviFileTransferWindow;
 	Q_OBJECT
diff --git a/src/kvirc/kernel/kvi_htmlgenerator.cpp b/src/kvirc/kernel/KviHtmlGenerator.cpp
index ee66f0a81..cea2d08cb 100644
--- a/src/kvirc/kernel/kvi_htmlgenerator.cpp
+++ b/src/kvirc/kernel/KviHtmlGenerator.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_htmlgenerator.cpp
+//   File : KviHtmlGenerator.cpp
 //   Creation date : Mon 04 Jan 2010 22:09:18 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_htmlgenerator.h"
+#include "KviHtmlGenerator.h"
 
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
-#include "kvi_options.h"
-#include "kvi_texticonmanager.h"
+#include "KviOptions.h"
+#include "KviTextIconManager.h"
 
 #define KVI_LABEL_DEF_BACK 100
 #define KVI_LABEL_DEF_FORE 101
diff --git a/src/kvirc/kernel/kvi_htmlgenerator.h b/src/kvirc/kernel/KviHtmlGenerator.h
index 0d4d47cfe..afdc4ce5b 100644
--- a/src/kvirc/kernel/kvi_htmlgenerator.h
+++ b/src/kvirc/kernel/KviHtmlGenerator.h
@@ -2,7 +2,7 @@
 #define _KVI_HTMLGENERATOR_H_
 //=============================================================================
 //
-//   File : kvi_htmlgenerator.h
+//   File : KviHtmlGenerator.h
 //   Creation date : Mon 04 Jan 2010 22:09:18 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_htmlgenerator.h
+* \file KviHtmlGenerator.h
 * \author Fabio Bas
 * \brief Irc => Html format converter; this should better live in kdelibs, but uses kvirc options
 */
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index 85202719e..7b4d6d6bc 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_iconmanager.cpp
+//   File : KviIconManager.cpp
 //   Creation date : Sat Jun 24 2000 14:50:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,13 +25,13 @@
 
 #define _KVI_ICONMANAGER_CPP_
 
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
+#include "KviIconManager.h"
+#include "KviApplication.h"
 #include "kvi_settings.h"
 #include "kvi_defaults.h"
 #include "KviLocale.h"
 #include "KviFileUtils.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include <QLayout>
 #include <QLabel>
@@ -41,7 +41,7 @@
 #include <QIcon>
 #include <QDir>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern QPixmap * g_pUserChanStatePixmap;
 extern QPixmap * g_pActivityMeterPixmap;
 
@@ -528,16 +528,16 @@ void KviIconManager::initQResourceBackend()
 {
 	QString szPath;
 
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::Pics);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::Pics);
 	QDir::addSearchPath("icons", szPath);
 
-	g_pApp->getGlobalKvircDirectory(szPath,KviApp::Pics);
+	g_pApp->getGlobalKvircDirectory(szPath,KviApplication::Pics);
 	QDir::addSearchPath("icons", szPath);
 
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::SmallIcons);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::SmallIcons);
 	QDir::addSearchPath("smallicons", szPath);
 
-	g_pApp->getGlobalKvircDirectory(szPath,KviApp::SmallIcons);
+	g_pApp->getGlobalKvircDirectory(szPath,KviApplication::SmallIcons);
 	QDir::addSearchPath("smallicons", szPath);
 
 }
@@ -828,12 +828,12 @@ KviAvatar * KviIconManager::getAvatar(const QString &szLocalPath,const QString &
 			// it's an url, cache it locally
 			szN = szName;
 			urlToCachedFileName(szN);
-			g_pApp->getLocalKvircDirectory(szP,KviApp::Avatars,szN);
+			g_pApp->getLocalKvircDirectory(szP,KviApplication::Avatars,szN);
 			szN = szName; // keep the remote url as name
 		} else {
 			//locally cached avatar, called only by its szName
 			szN = KviFileUtils::extractFileName(szName);
-			g_pApp->getLocalKvircDirectory(szP,KviApp::Avatars,szN);
+			g_pApp->getLocalKvircDirectory(szP,KviApplication::Avatars,szN);
 		}
 	} else if(szName.isEmpty())
 	{
diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/KviIconManager.h
index 35d9f5b07..aaaf2b729 100644
--- a/src/kvirc/kernel/kvi_iconmanager.h
+++ b/src/kvirc/kernel/KviIconManager.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_iconmanager.h
+//   File : KviIconManager.h
 //   Creation date : Sat Jun 24 2000 14:49:24 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/KviInternalCommand.cpp
index 548c75bdc..e6769be15 100644
--- a/src/kvirc/kernel/kvi_internalcmd.cpp
+++ b/src/kvirc/kernel/KviInternalCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_internalcmd.cpp
+//   File : KviInternalCommand.cpp
 //   Creation date : Sun Aug 13 2000 19:22:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,7 +24,7 @@
 
 #define _KVI_INTERNALCMD_CPP_
 
-#include "kvi_internalcmd.h"
+#include "KviInternalCommand.h"
 
 // FIXME: #warning "LOCALIZE THIS!"
 
diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/KviInternalCommand.h
index 0fa1639fd..b31ac6d3e 100644
--- a/src/kvirc/kernel/kvi_internalcmd.h
+++ b/src/kvirc/kernel/KviInternalCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_INTERNALCMD_H_
 //=============================================================================
 //
-//   File : kvi_internalcmd.h
+//   File : KviInternalCommand.h
 //   Creation date : Sun Aug 13 2000 19:21:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp
index 01dc8cf87..200ff747e 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/KviIpcSentinel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ipc.hcpp
+//   File : KviIpcSentinel.hcpp
 //   Creation date : Tue Apr 10 2001 15:04:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,13 +25,13 @@
 
 
 #include <qmetatype.h>
-#include "kvi_ipc.h"
+#include "KviIpcSentinel.h"
 
 
 #ifndef COMPILE_NO_IPC
 
 	#include "KviMemory.h"
-	#include "kvi_app.h"
+	#include "KviApplication.h"
 	#include "KviQString.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/KviIpcSentinel.h
index e3d68071e..4f0a1d0b9 100644
--- a/src/kvirc/kernel/kvi_ipc.h
+++ b/src/kvirc/kernel/KviIpcSentinel.h
@@ -2,7 +2,7 @@
 #define _KVI_IPC_H_
 //=============================================================================
 //
-//   File : kvi_ipc.h
+//   File : KviIpcSentinel.h
 //   Creation date : Tue Apr 10 2001 15:04:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index f3e25eecc..8c5862327 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnection.cpp
+//   File : KviIrcConnection.cpp
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,47 +24,47 @@
 
 
 
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionstatedata.h"
-#include "kvi_ircconnectionantictcpflooddata.h"
-#include "kvi_ircconnectionnetsplitdetectordata.h"
-#include "kvi_ircconnectionasyncwhoisdata.h"
-#include "kvi_ircconnectionrequestqueue.h"
-#include "kvi_ircconnectionstatistics.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_irclink.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionStateData.h"
+#include "KviIrcConnectionAntiCtcpFloodData.h"
+#include "KviIrcConnectionNetsplitDetectorData.h"
+#include "KviIrcConnectionAsyncWhoisData.h"
+#include "KviIrcConnectionRequestQueue.h"
+#include "KviIrcConnectionStatistics.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcLink.h"
+#include "KviIrcSocket.h"
 #include "KviLocale.h"
 #include "KviIrcServerDataBase.h"
 #include "KviProxyDataBase.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviConsoleWindow.h"
 #include "KviNetUtils.h"
-#include "kvi_internalcmd.h"
-#include "kvi_frame.h"
-#include "kvi_mexlinkfilter.h"
+#include "KviInternalCommand.h"
+#include "KviMainWindow.h"
+#include "KviMexLinkFilter.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
 #include "kvi_debug.h"
-#include "kvi_channel.h"
-#include "kvi_query.h"
-#include "kvi_app.h"
+#include "KviChannelWindow.h"
+#include "KviQueryWindow.h"
+#include "KviApplication.h"
 #include "KviDataBuffer.h"
-#include "kvi_notifylist.h"
+#include "KviNotifyList.h"
 #include "KviDnsResolver.h"
 #include "kvi_defaults.h"
-#include "kvi_sparser.h"
-#include "kvi_ircdatastreammonitor.h"
+#include "KviIrcServerParser.h"
+#include "KviIrcDataStreamMonitor.h"
 #include "KviDataBuffer.h"
-#include "kvi_lagmeter.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_kvs_script.h"
+#include "KviLagMeter.h"
+#include "KviKvsEventTriggers.h"
+#include "KviKvsScript.h"
 #include "KviMircCntrl.h"
 #include "KviUserIdentity.h"
 #include "KviIdentityProfile.h"
@@ -85,9 +85,9 @@ KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarg
 	m_pConsole = pContext->console();
 	m_pTarget = pTarget;
 	m_pUserIdentity = pIdentity;
-	m_pChannelList = new KviPointerList<KviChannel>;
+	m_pChannelList = new KviPointerList<KviChannelWindow>;
 	m_pChannelList->setAutoDelete(false);
-	m_pQueryList = new KviPointerList<KviQuery>;
+	m_pQueryList = new KviPointerList<KviQueryWindow>;
 	m_pQueryList->setAutoDelete(false);
 	m_pLink = new KviIrcLink(this);
 	m_pUserDataBase = new KviIrcUserDataBase();
@@ -103,7 +103,7 @@ KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarg
 	m_pLocalhostDns = 0;
 	m_pLagMeter = 0;
 	m_eState = Idle;
-	m_pRequestQueue = new KviRequestQueue();
+	m_pRequestQueue = new KviIrcConnectionRequestQueue();
 	setupSrvCodec();
 	setupTextCodec();
 }
@@ -177,7 +177,7 @@ void KviIrcConnection::setEncoding(const QString & szEncoding)
 	}
 
 	QString szTmp = c->name();
-	for(KviChannel * ch = m_pChannelList->first(); ch; ch = m_pChannelList->next())
+	for(KviChannelWindow * ch = m_pChannelList->first(); ch; ch = m_pChannelList->next())
 	{
 		if((ch->textCodec() != c) && (ch->textCodec() != ch->defaultTextCodec())) // actually not using the default!
 		{
@@ -187,7 +187,7 @@ void KviIrcConnection::setEncoding(const QString & szEncoding)
 		}
 	}
 
-	for(KviQuery * q = m_pQueryList->first(); q; q = m_pQueryList->next())
+	for(KviQueryWindow * q = m_pQueryList->first(); q; q = m_pQueryList->next())
 	{
 		if((q->textCodec() != c) && (q->textCodec() != q->defaultTextCodec())) // actually not using the default!
 		{
@@ -224,7 +224,7 @@ void KviIrcConnection::setupSrvCodec()
 
 	if(!m_pSrvCodec)
 	{
-		m_pSrvCodec = KviApp::defaultSrvCodec();
+		m_pSrvCodec = KviApplication::defaultSrvCodec();
 	}
 	m_pConsole->setTextEncoding(QString(m_pSrvCodec->name()));
 }
@@ -251,7 +251,7 @@ void KviIrcConnection::setupTextCodec()
 
 	if(!m_pTextCodec)
 	{
-		m_pTextCodec = KviApp::defaultTextCodec();
+		m_pTextCodec = KviApplication::defaultTextCodec();
 	}
 }
 
@@ -539,9 +539,9 @@ void KviIrcConnection::linkAttemptFailed(int iError)
 	context()->connectionFailed(iError);
 }
 
-KviChannel * KviIrcConnection::findChannel(const QString & szName)
+KviChannelWindow * KviIrcConnection::findChannel(const QString & szName)
 {
-	for(KviChannel * c = m_pChannelList->first(); c; c = m_pChannelList->next())
+	for(KviChannelWindow * c = m_pChannelList->first(); c; c = m_pChannelList->next())
 	{
 		if(KviQString::equalCI(szName,c->windowName()))
 			return c;
@@ -552,7 +552,7 @@ KviChannel * KviIrcConnection::findChannel(const QString & szName)
 int KviIrcConnection::getCommonChannels(const QString & szNick, QString & szChansBuffer, bool bAddEscapeSequences)
 {
 	int iCount = 0;
-	for(KviChannel * c = m_pChannelList->first(); c; c = m_pChannelList->next())
+	for(KviChannelWindow * c = m_pChannelList->first(); c; c = m_pChannelList->next())
 	{
 		if(c->isOn(szNick))
 		{
@@ -576,13 +576,13 @@ int KviIrcConnection::getCommonChannels(const QString & szNick, QString & szChan
 
 void KviIrcConnection::unhighlightAllChannels()
 {
-	for(KviChannel * c = m_pChannelList->first(); c; c = m_pChannelList->next())
+	for(KviChannelWindow * c = m_pChannelList->first(); c; c = m_pChannelList->next())
 		c->unhighlight();
 }
 
 void KviIrcConnection::unhighlightAllQueries()
 {
-	for(KviQuery * c = m_pQueryList->first(); c; c = m_pQueryList->next())
+	for(KviQueryWindow * c = m_pQueryList->first(); c; c = m_pQueryList->next())
 		c->unhighlight();
 }
 
@@ -604,9 +604,9 @@ void KviIrcConnection::closeAllQueries()
 	}
 }
 
-KviChannel * KviIrcConnection::createChannel(const QString & szName)
+KviChannelWindow * KviIrcConnection::createChannel(const QString & szName)
 {
-	KviChannel * c = m_pContext->findDeadChannel(szName);
+	KviChannelWindow * c = m_pContext->findDeadChannel(szName);
 	if(c)
 	{
 		c->setAliveChan();
@@ -616,7 +616,7 @@ KviChannel * KviIrcConnection::createChannel(const QString & szName)
 			c->setFocus();
 		}
 	} else {
-		c = new KviChannel(m_pConsole->frame(),m_pConsole,szName);
+		c = new KviChannelWindow(m_pConsole->frame(),m_pConsole,szName);
 		m_pConsole->frame()->addWindow(c,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels));
 
 		if(KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin))
@@ -625,9 +625,9 @@ KviChannel * KviIrcConnection::createChannel(const QString & szName)
 	return c;
 }
 
-KviQuery * KviIrcConnection::createQuery(const QString & szNick)
+KviQueryWindow * KviIrcConnection::createQuery(const QString & szNick)
 {
-	KviQuery * q = m_pContext->findDeadQuery(szNick);
+	KviQueryWindow * q = m_pContext->findDeadQuery(szNick);
 	if(!q)
 	{
 		q = findQuery(szNick);
@@ -643,15 +643,15 @@ KviQuery * KviIrcConnection::createQuery(const QString & szNick)
 			q->setFocus();
 		}
 	} else {
-		q = new KviQuery(m_pConsole->frame(),m_pConsole,szNick);
+		q = new KviQueryWindow(m_pConsole->frame(),m_pConsole,szNick);
 		m_pConsole->frame()->addWindow(q,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedQuery));
 	}
 	return q;
 }
 
-KviQuery * KviIrcConnection::findQuery(const QString & szName)
+KviQueryWindow * KviIrcConnection::findQuery(const QString & szName)
 {
-	for(KviQuery * c = m_pQueryList->first(); c; c = m_pQueryList->next())
+	for(KviQueryWindow * c = m_pQueryList->first(); c; c = m_pQueryList->next())
 	{
 		if(KviQString::equalCI(szName,c->windowName()))
 			return c;
@@ -659,7 +659,7 @@ KviQuery * KviIrcConnection::findQuery(const QString & szName)
 	return 0;
 }
 
-void KviIrcConnection::registerChannel(KviChannel * c)
+void KviIrcConnection::registerChannel(KviChannelWindow * c)
 {
 	m_pChannelList->append(c);
 	if(KVI_OPTION_BOOL(KviOption_boolLogChannelHistory))
@@ -668,7 +668,7 @@ void KviIrcConnection::registerChannel(KviChannel * c)
 	emit(chanListChanged());
 }
 
-void KviIrcConnection::unregisterChannel(KviChannel * c)
+void KviIrcConnection::unregisterChannel(KviChannelWindow * c)
 {
 	m_pChannelList->removeRef(c);
 	requestQueue()->dequeueChannel(c);
@@ -676,12 +676,12 @@ void KviIrcConnection::unregisterChannel(KviChannel * c)
 	emit(chanListChanged());
 }
 
-void KviIrcConnection::registerQuery(KviQuery * q)
+void KviIrcConnection::registerQuery(KviQueryWindow * q)
 {
 	m_pQueryList->append(q);
 }
 
-void KviIrcConnection::unregisterQuery(KviQuery * q)
+void KviIrcConnection::unregisterQuery(KviQueryWindow * q)
 {
 	if(m_pQueryList->removeRef(q))
 		return;
@@ -689,7 +689,7 @@ void KviIrcConnection::unregisterQuery(KviQuery * q)
 
 void KviIrcConnection::keepChannelsOpenAfterDisconnect()
 {
-	while(KviChannel * c = m_pChannelList->first())
+	while(KviChannelWindow * c = m_pChannelList->first())
 	{
 		c->outputNoFmt(KVI_OUT_SOCKETERROR,__tr2qs("Connection to server lost"));
 		c->setDeadChan();
@@ -698,7 +698,7 @@ void KviIrcConnection::keepChannelsOpenAfterDisconnect()
 
 void KviIrcConnection::keepQueriesOpenAfterDisconnect()
 {
-	while(KviQuery * q = m_pQueryList->first())
+	while(KviQueryWindow * q = m_pQueryList->first())
 	{
 		q->outputNoFmt(KVI_OUT_SOCKETERROR,__tr2qs("Connection to server lost"));
 		q->setDeadQuery();
@@ -707,7 +707,7 @@ void KviIrcConnection::keepQueriesOpenAfterDisconnect()
 
 void KviIrcConnection::resurrectDeadQueries()
 {
-	while(KviQuery * q = m_pContext->firstDeadQuery())
+	while(KviQueryWindow * q = m_pContext->firstDeadQuery())
 	{
 		q->outputNoFmt(KVI_OUT_SOCKETMESSAGE,__tr2qs("Connection to server established"));
 		q->setAliveQuery();
@@ -1539,7 +1539,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName)
 			sendFmtData("JOIN %s",encodeText(target()->server()->m_pReconnectInfo->m_szJoinChannels).data());
 		}
 
-		KviQuery * pQuery;
+		KviQueryWindow * pQuery;
 
 		for(QStringList::Iterator it = target()->server()->m_pReconnectInfo->m_szOpenQueryes.begin();
 			it != target()->server()->m_pReconnectInfo->m_szOpenQueryes.end();it++)
@@ -1697,8 +1697,8 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow)
 				{
 					// find the channel that has the older list now
 					kvi_time_t tOldest = tNow;
-					KviChannel * pOldest = 0;
-					for(KviChannel * pChan = m_pChannelList->first();pChan;pChan = m_pChannelList->next())
+					KviChannelWindow * pOldest = 0;
+					for(KviChannelWindow * pChan = m_pChannelList->first();pChan;pChan = m_pChannelList->next())
 					{
 						if(pChan->lastReceivedWhoReply() < tOldest)
 						{
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/KviIrcConnection.h
index 19f6e3111..e0a03dc2a 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/KviIrcConnection.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTION_H_
 //=============================================================================
 //
-//   File : kvi_ircconnection.h
+//   File : KviIrcConnection.h
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_ircconnection.h
+* \file KviIrcConnection.h
 * \author Szymon Stefanek
 * \brief An abstraction of a connection to an IRC server
 */
@@ -48,9 +48,9 @@ class KviIrcSocket;
 class KviIrcLink;
 class KviDataBuffer;
 class KviIrcContext;
-class KviFrame;
-class KviChannel;
-class KviQuery;
+class KviMainWindow;
+class KviChannelWindow;
+class KviQueryWindow;
 class KviIrcConnectionTarget;
 class KviIrcUserDataBase;
 class KviIrcConnectionUserInfo;
@@ -60,7 +60,7 @@ class KviIrcConnectionAntiCtcpFloodData;
 class KviIrcConnectionNetsplitDetectorData;
 class KviIrcConnectionAsyncWhoisData;
 class KviIrcConnectionStatistics;
-class KviRequestQueue;
+class KviIrcConnectionRequestQueue;
 class KviLagMeter;
 class KviNotifyListManager;
 class KviDnsResolver;
@@ -156,8 +156,8 @@ private:
 
 	KviIrcConnectionStateData            * m_pStateData;            // owned, never null
 
-	KviPointerList<KviChannel>           * m_pChannelList;          // owned, never null, elements shallow
-	KviPointerList<KviQuery>             * m_pQueryList;            // owned, never null, elements shallow
+	KviPointerList<KviChannelWindow>           * m_pChannelList;          // owned, never null, elements shallow
+	KviPointerList<KviQueryWindow>             * m_pQueryList;            // owned, never null, elements shallow
 
 	KviIrcUserDataBase                   * m_pUserDataBase;         // owned, never null
 
@@ -176,7 +176,7 @@ private:
 
 	QTextCodec                           * m_pSrvCodec;             // connection codec: never null
 	QTextCodec                           * m_pTextCodec;            // connection codec: never null
-	KviRequestQueue                      * m_pRequestQueue;         // owned, never null
+	KviIrcConnectionRequestQueue                      * m_pRequestQueue;         // owned, never null
 public:
 	/**
 	* \brief Returns a pointer to the owning console
@@ -234,7 +234,7 @@ public:
 	* current nickname, username, flags and other stuff that KviUserIdentity
 	* actually doesn't contain (or has only "default" values for).
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionuserinfo.h" as the class is only
+	* Include "KviIrcConnectionUserInfo.h" as the class is only
 	* forwarded here.
 	* \return KviIrcConnectionUserInfo *
 	*/
@@ -248,7 +248,7 @@ public:
 	* KviConnectionTarget actually doesn't contain (or has only "default"
 	* values for).
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionserverinfo.h" as the class is only
+	* Include "KviIrcConnectionServerInfo.h" as the class is only
 	* forwarded here.
 	* \return KviIrcConnectionServerInfo *
 	*/
@@ -262,7 +262,7 @@ public:
 	* This data *could* be part of KviIrcConnection itself but we prefer to
 	* keep it in a separate class in order to cleanup the implementation.
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionstatedata.h" as the class is only
+	* Include "KviIrcConnectionStateData.h" as the class is only
 	* forwarded here.
 	* \return KviIrcConnectionStateData *
 	*/
@@ -274,7 +274,7 @@ public:
 	* It contains data private to the Anti CTCP Flood engine. Very similar
 	* to KviIrcConnectionStateData but dedicated to Ctcp flood.
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionantictcpflooddata.h" as the class is
+	* Include "KviIrcConnectionAntiCtcpFloodData.h" as the class is
 	* only forwarded here.
 	* \return KviIrcConnectionAntiCtcpFloodData *
 	*/
@@ -287,7 +287,7 @@ public:
 	* It contains data private to the netsplit detector engine. Very similar
 	* to KviIrcConnectionStateData but dedicated to netsplit detection.
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionnetsplitdetectordata.h" as the class is
+	* Include "KviIrcConnectionNetsplitDetectorData.h" as the class is
 	* only forwarded here.
 	* \return KviIrcConnectionNetsplitDetectorData *
 	*/
@@ -300,7 +300,7 @@ public:
 	* It contains data private to the async whois engine. Very similar to
 	* KviIrcConnectionStateData but dedicated to async whois.
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionasyncwhoisdata.h" as the class is only
+	* Include "KviIrcConnectionAsyncWhoisData.h" as the class is only
 	* forwarded here.
 	* \return KviIrcConnectionAsyncWhoisData *
 	*/
@@ -313,7 +313,7 @@ public:
 	* It contains runtime statistics about the connection. Very similar to
 	* KviIrcConnectionStateData but dedicated to statistics.
 	* The returned pointer is never NULL.
-	* Include "kvi_ircconnectionstatistics.h" as the class is only
+	* Include "KviIrcConnectionStatistics.h" as the class is only
 	* forwarded here.
 	* \return KviIrcConnectionStatistics *
 	*/
@@ -339,18 +339,18 @@ public:
 	inline KviLagMeter * lagMeter(){ return m_pLagMeter; };
 
 	/**
-	* \brief Returns a pointer to the current KviRequestQueue.
-	* \return KviRequestQueue *
+	* \brief Returns a pointer to the current KviIrcConnectionRequestQueue.
+	* \return KviIrcConnectionRequestQueue *
 	*/
-	inline KviRequestQueue * requestQueue(){ return m_pRequestQueue; };
+	inline KviIrcConnectionRequestQueue * requestQueue(){ return m_pRequestQueue; };
 
 	/**
 	* \brief Returns the list of the channels bound to the current connection.
 	*
 	* The pointer itself is never null (though the list may be empty).
-	* \return KviPointerList<KviChannel> *
+	* \return KviPointerList<KviChannelWindow> *
 	*/
-	inline KviPointerList<KviChannel> * channelList(){ return m_pChannelList; };
+	inline KviPointerList<KviChannelWindow> * channelList(){ return m_pChannelList; };
 
 	/**
 	* \brief Helper that provides a shortcut for really common access to serverInfo()->networkName()
@@ -388,9 +388,9 @@ public:
 	* Returns the pointer to the channel found or NULL if there is no such
 	* channel.
 	* \param szName The name of the channel
-	* \return KviChannel *
+	* \return KviChannelWindow *
 	*/
-	KviChannel * findChannel(const QString & szName);
+	KviChannelWindow * findChannel(const QString & szName);
 
 	/**
 	* \brief Returns a list of channels bound to the current connection
@@ -418,29 +418,29 @@ public:
 	* creation never fails: if the returned pointer is NULL then we're screwed
 	* anyway as virtual memory is exausted.
 	* \param szName The name of the channel
-	* \return KviChannel *
+	* \return KviChannelWindow *
 	*/
-	KviChannel * createChannel(const QString & szName);
+	KviChannelWindow * createChannel(const QString & szName);
 
 	///
-	/// This is called by KviChannel upon creation. You shouldn't need to call it.
+	/// This is called by KviChannelWindow upon creation. You shouldn't need to call it.
 	///
 	/// FIXME: Could be made protected.
 	///
-	void registerChannel(KviChannel *c);
+	void registerChannel(KviChannelWindow *c);
 
 	///
-	/// This is called by KviChannel just before destruction. You shouldn't need to call it.
+	/// This is called by KviChannelWindow just before destruction. You shouldn't need to call it.
 	///
 	/// FIXME: Could be made protected.
 	///
-	void unregisterChannel(KviChannel *c);
+	void unregisterChannel(KviChannelWindow *c);
 
 	/**
 	* \brief Marks all the currently existing channels as DEAD
 	*
 	* They are preserved across connections. Marking a channel as dead
-	* actually removes the ownership of KviChannel from KviIrcConnection and
+	* actually removes the ownership of KviChannelWindow from KviIrcConnection and
 	* moves it to KviIrcContext (as the contex is preserved across
 	* connections).
 	* \return void
@@ -471,17 +471,17 @@ public:
 	* Returns the pointer to the query found or NULL if there is no such
 	* query.
 	* \param szNick The nickname of the user
-	* \return KviQuery *
+	* \return KviQueryWindow *
 	*/
-	KviQuery * findQuery(const QString & szNick);
+	KviQueryWindow * findQuery(const QString & szNick);
 
 	/**
 	* \brief Returns the list of the currently open queries.
 	*
 	* The returned pointer is never NULL (the list may be empty though).
-	* \return KviPointerList<KviQuery> *
+	* \return KviPointerList<KviQueryWindow> *
 	*/
-	inline KviPointerList<KviQuery> * queryList(){ return m_pQueryList; };
+	inline KviPointerList<KviQueryWindow> * queryList(){ return m_pQueryList; };
 
 	/**
 	* \brief Creates a query with the specified nick as target.
@@ -489,23 +489,23 @@ public:
 	* This function assumes that such a query doesn't exist yet (or if it
 	* exists it's actually marked as dead and needs to be resurrected).
 	* \param szNick The nickname of the user
-	* \return KviQuery *
+	* \return KviQueryWindow *
 	*/
-	KviQuery * createQuery(const QString & szNick);
+	KviQueryWindow * createQuery(const QString & szNick);
 
 	///
-	/// This is called by KviQuery upon creation, you shouldn't need to use it.
+	/// This is called by KviQueryWindow upon creation, you shouldn't need to use it.
 	///
 	/// FIXME: Could be made protected.
 	///
-	void registerQuery(KviQuery *q);
+	void registerQuery(KviQueryWindow *q);
 
 	///
-	/// This is called by KviQuery just before destruction, you shouldn't need to use it.
+	/// This is called by KviQueryWindow just before destruction, you shouldn't need to use it.
 	///
 	/// FIXME: Could be made protected.
 	///
-	void unregisterQuery(KviQuery *q);
+	void unregisterQuery(KviQueryWindow *q);
 
 	/**
 	* \brief Marks all the currently open queries as DEAD
@@ -925,14 +925,14 @@ signals:
 	* \param pChan The channel :)
 	* \return void
 	*/
-	void channelRegistered(KviChannel * pChan);
+	void channelRegistered(KviChannelWindow * pChan);
 
 	/**
 	* \brief Emitted when we unregister a channel
 	* \param pChan The channel :)
 	* \return void
 	*/
-	void channelUnregistered(KviChannel * pChan);
+	void channelUnregistered(KviChannelWindow * pChan);
 
 	/**
 	* \brief Emitted when the channels list change
diff --git a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
index b71d97b65..aba05539f 100644
--- a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionantictcpflooddata.cpp
+//   File : KviIrcConnectionAntiCtcpFloodData.cpp
 //   Creation date : Sat 26 Jun 2004 18:09:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectionantictcpflooddata.h"
+#include "KviIrcConnectionAntiCtcpFloodData.h"
 
 KviIrcConnectionAntiCtcpFloodData::KviIrcConnectionAntiCtcpFloodData()
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.h b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h
index 7a54e7d7d..10c4ce4cf 100644
--- a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.h
+++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONANTICTCPFLOODDATA_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionantictcpflooddata.h
+//   File : KviIrcConnectionAntiCtcpFloodData.h
 //   Creation date : Sat 26 Jun 2004 18:09:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnectionasynctemplatedata.h b/src/kvirc/kernel/KviIrcConnectionAsyncData.h
index 83985ad98..ef11b8218 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasynctemplatedata.h
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncData.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONASYNCTEMPLATEDATA_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionasyncwhoisdata.h
+//   File : KviIrcConnectionAsyncWhoisData.h
 //   Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -30,15 +30,15 @@
 // It is now also used by KviIrcConnectionAsyncWhoisData
 
 template <class T>
-class KVIRC_API KviIrcConnectionAsyncTemplateData
+class KVIRC_API KviIrcConnectionAsyncData
 {
 public:
-	KviIrcConnectionAsyncTemplateData()
+	KviIrcConnectionAsyncData()
 	{
 		m_pInfoList = 0;
 	}
 
-	~KviIrcConnectionAsyncTemplateData()
+	~KviIrcConnectionAsyncData()
 	{
 		if(m_pInfoList)delete m_pInfoList;
 	}
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
index 7c3a89864..58ef6729a 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionasyncwhoisdata.cpp
+//   File : KviIrcConnectionAsyncWhoisData.cpp
 //   Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,8 +24,8 @@
 
 
 
-#include "kvi_ircconnectionasyncwhoisdata.h"
-#include "kvi_kvs_script.h"
+#include "KviIrcConnectionAsyncWhoisData.h"
+#include "KviKvsScript.h"
 
 KviAsyncWhoisInfo::KviAsyncWhoisInfo()
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
index 91e6b4e01..861e0deae 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONASYNCWHOISDATA_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionasyncwhoisdata.h
+//   File : KviIrcConnectionAsyncWhoisData.h
 //   Creation date : Sat 26 Jun 2004 19:40:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviQString.h"
 #include "KviPointerList.h"
-#include "kvi_ircconnectionasynctemplatedata.h"
+#include "KviIrcConnectionAsyncData.h"
 
 class KviWindow;
 class KviKvsScript;
@@ -60,8 +60,8 @@ public:
 // KviIrcConnectionAsyncWhoisData is now recreated using a template
 // I'm using inheritance as i haven't been able to use a typedef
 // This line didn't build
-// 	typedef KviIrcConnectionAsyncTemplateData<KviAsyncWhoisInfo> KviIrcConnectionAsyncWhoisData
-class KVIRC_API KviIrcConnectionAsyncWhoisData : public KviIrcConnectionAsyncTemplateData<KviAsyncWhoisInfo>
+// 	typedef KviIrcConnectionAsyncData<KviAsyncWhoisInfo> KviIrcConnectionAsyncWhoisData
+class KVIRC_API KviIrcConnectionAsyncWhoisData : public KviIrcConnectionAsyncData<KviAsyncWhoisInfo>
 {
 };
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
index 388b33384..0ab64744c 100644
--- a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionnetsplitdetectordata.cpp
+//   File : KviIrcConnectionNetsplitDetectorData.cpp
 //   Creation date : Sat 26 Jun 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectionnetsplitdetectordata.h"
+#include "KviIrcConnectionNetsplitDetectorData.h"
 
 KviIrcConnectionNetsplitDetectorData::KviIrcConnectionNetsplitDetectorData()
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h
index 8ac238828..98439df8f 100644
--- a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h
+++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONNETSPLITDETECTORDATA_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionnetsplitdetectordata.h
+//   File : KviIrcConnectionNetsplitDetectorData.h
 //   Creation date : Sat 26 Jun 2004 18:20:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp b/src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp
index 365f8d2c4..e5b3b4286 100644
--- a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionrequestqueue.h
+//   File : KviIrcConnectionRequestQueue.h
 //   Creation date : Tue 09 Feb 2010 10:24:32 by Fabio Bas
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,28 +22,28 @@
 //
 //=============================================================================
 
-#include "kvi_ircconnectionrequestqueue.h"
+#include "KviIrcConnectionRequestQueue.h"
 
-#include "kvi_channel.h"
-#include "kvi_options.h"
-#include "kvi_lagmeter.h"
-#include "kvi_ircconnectionstatedata.h"
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviChannelWindow.h"
+#include "KviOptions.h"
+#include "KviLagMeter.h"
+#include "KviIrcConnectionStateData.h"
+#include "KviIrcConnectionServerInfo.h"
 
 #include <QByteArray>
 
-KviRequestQueue::KviRequestQueue()
+KviIrcConnectionRequestQueue::KviIrcConnectionRequestQueue()
 {
 	m_curType = Mode;
 	connect(&m_timer, SIGNAL(timeout()), this, SLOT(timerSlot()));
 }
 
-KviRequestQueue::~KviRequestQueue()
+KviIrcConnectionRequestQueue::~KviIrcConnectionRequestQueue()
 {
 	disconnect(&m_timer, SIGNAL(timeout()), this, SLOT(timerSlot()));
 }
 
-void KviRequestQueue::enqueueChannel(KviChannel * pChan)
+void KviIrcConnectionRequestQueue::enqueueChannel(KviChannelWindow * pChan)
 {
 	if(!m_channels.contains(pChan))
 	{
@@ -55,7 +55,7 @@ void KviRequestQueue::enqueueChannel(KviChannel * pChan)
 	}
 }
 
-void KviRequestQueue::dequeueChannel(KviChannel * pChan)
+void KviIrcConnectionRequestQueue::dequeueChannel(KviChannelWindow * pChan)
 {
 	if(m_channels.contains(pChan))
 	{
@@ -65,20 +65,20 @@ void KviRequestQueue::dequeueChannel(KviChannel * pChan)
 	}
 }
 
-void KviRequestQueue::clearAll()
+void KviIrcConnectionRequestQueue::clearAll()
 {
 	m_timer.stop();
 	m_channels.clear();
 	m_curType = Mode;
 }
 
-void KviRequestQueue::timerSlot()
+void KviIrcConnectionRequestQueue::timerSlot()
 {
 	if(m_channels.isEmpty())
 	{
 		m_timer.stop();
 	} else {
-		KviChannel * pChan = m_channels.head();
+		KviChannelWindow * pChan = m_channels.head();
 		QByteArray encodedChan = pChan->connection()->encodeText(pChan->target()).data();
 		/* The following switch will let the execution flow pass-trought if any request type
 		 * is currently disabled (or not available on the server). Channel's "MODE" request is
diff --git a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.h b/src/kvirc/kernel/KviIrcConnectionRequestQueue.h
index 1e4a06070..53102c3cb 100644
--- a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.h
+++ b/src/kvirc/kernel/KviIrcConnectionRequestQueue.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONREQUESTQUEUE_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionrequestqueue.h
+//   File : KviIrcConnectionRequestQueue.h
 //   Creation date : Tue 09 Feb 2010 10:24:32 by Fabio Bas
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_ircconnectionrequestqueue.h
+* \file KviIrcConnectionRequestQueue.h
 * \author Fabio Bas
 * \brief IRC connection request queue
 */
@@ -35,29 +35,29 @@
 #include <QTimer>
 #include <QQueue>
 
-class KviChannel;
+class KviChannelWindow;
 
 /**
-* \class KviRequestQueue
+* \class KviIrcConnectionRequestQueue
 * \brief Class to enqueue commands to IRC server
 *
 * This class is designed to delay channel requests like MODE and WHO to avoid
 * excess floods on some servers
 */
-class KVIRC_API KviRequestQueue: public QObject
+class KVIRC_API KviIrcConnectionRequestQueue: public QObject
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Constructs the request queue objects
-	* \return KviRequestQueue
+	* \return KviIrcConnectionRequestQueue
 	*/
-	KviRequestQueue();
+	KviIrcConnectionRequestQueue();
 	
 	/**
 	* \brief Destroys the request queue objects
 	*/
-	virtual ~KviRequestQueue();
+	virtual ~KviIrcConnectionRequestQueue();
 protected:
 	/**
 	* \enum RequestTypes
@@ -74,7 +74,7 @@ protected:
 		Ban = 5           /**< Ban request */
 	};
 	
-	QQueue<KviChannel *> m_channels;
+	QQueue<KviChannelWindow *> m_channels;
 	QTimer               m_timer;
 	RequestTypes         m_curType;
 public:
@@ -83,21 +83,21 @@ public:
 	* \param pChan The channel to enqueue
 	* \return void
 	*/
-	void enqueueChannel(KviChannel * pChan);
+	void enqueueChannel(KviChannelWindow * pChan);
 	
 	/**
 	* \brief Removes the channel from the queue stack
 	* \param pChan The channel to dequeue
 	* \return void
 	*/
-	void dequeueChannel(KviChannel * pChan);
+	void dequeueChannel(KviChannelWindow * pChan);
 
 	/**
 	* \brief Checks if a channel is in the queue stack
 	* \param pChan The channel to check
 	* \return bool
 	*/
-	bool isQueued(KviChannel * pChan) { return m_channels.contains(pChan); };
+	bool isQueued(KviChannelWindow * pChan) { return m_channels.contains(pChan); };
 
 	/**
 	* \brief Clears the queue stack
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
index 4b30916b8..5a4369d39 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionserverinfo.cpp
+//   File : KviIrcConnectionServerInfo.cpp
 //   Creation date : Tue 22 Jun 2004 03:57:32 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviIrcConnectionServerInfo.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
 #include "KviIrcUserDataBase.h"
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/KviIrcConnectionServerInfo.h
index e61841155..d51989b90 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONSERVERINFO_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionserverinfo.h
+//   File : KviIrcConnectionServerInfo.h
 //   Creation date : Tue 22 Jun 2004 03:57:32 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp b/src/kvirc/kernel/KviIrcConnectionStateData.cpp
index 23a172298..aa0ae7425 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionStateData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionstatedata.cpp
+//   File : KviIrcConnectionStateData.cpp
 //   Creation date : Sat 26 Jun 2004 09:31:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectionstatedata.h"
+#include "KviIrcConnectionStateData.h"
 
 KviIrcConnectionStateData::KviIrcConnectionStateData()
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.h b/src/kvirc/kernel/KviIrcConnectionStateData.h
index 3a8f6507a..438b24436 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatedata.h
+++ b/src/kvirc/kernel/KviIrcConnectionStateData.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONSTATEDATA_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionstatedata.h
+//   File : KviIrcConnectionStateData.h
 //   Creation date : Sat 26 Jun 2004 09:31:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
index d3d2bc94f..188be6184 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionstatistics.cpp
+//   File : KviIrcConnectionStatistics.cpp
 //   Creation date : Sun 27 Jun 2004 21:13:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectionstatistics.h"
+#include "KviIrcConnectionStatistics.h"
 
 KviIrcConnectionStatistics::KviIrcConnectionStatistics()
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatistics.h b/src/kvirc/kernel/KviIrcConnectionStatistics.h
index dad53abe2..9b211d5ca 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatistics.h
+++ b/src/kvirc/kernel/KviIrcConnectionStatistics.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONSTATISTICS_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionstatistics.h
+//   File : KviIrcConnectionStatistics.h
 //   Creation date : Sun 27 Jun 2004 21:13:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp b/src/kvirc/kernel/KviIrcConnectionTarget.cpp
index 344ba1b37..ccdc7783e 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTarget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectiontarget.cpp
+//   File : KviIrcConnectionTarget.cpp
 //   Creation date : Tue 08 Jun 2004 14:11:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectiontarget.h"
+#include "KviIrcConnectionTarget.h"
 #include "KviIrcServer.h"
 #include "KviIrcNetwork.h"
 #include "KviProxyDataBase.h"
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.h b/src/kvirc/kernel/KviIrcConnectionTarget.h
index bc9b537b0..a07baa91d 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.h
+++ b/src/kvirc/kernel/KviIrcConnectionTarget.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONTARGET_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectiontarget.h
+//   File : KviIrcConnectionTarget.h
 //   Creation date : Tue 08 Jun 2004 14:11:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -82,7 +82,7 @@ public:
 	const QString & networkName();
 
 	// this allows to force the network name: it should be used only by KviConsole
-	// but it's KviIrcServerParser (kvi_sp_numeric.cpp) that first
+	// but it's KviIrcServerParser (KviIrcServerParser_numericHandlers.cpp) that first
 	// gets the new network name... thus we make it public
 	// to remove one level of indirection.
 	void setNetworkName(const QString &szNetName);
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
index 438f6d471..27b36e365 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectiontargetresolver.cpp
+//   File : KviIrcConnectionTargetResolver.cpp
 //   Creation date : Fri May 11 23:24:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,27 +24,27 @@
 
 
 
-#include "kvi_ircconnectiontargetresolver.h"
+#include "KviIrcConnectionTargetResolver.h"
 #include "KviDnsResolver.h"
 #include "KviLocale.h"
 #include "KviIrcServerDataBase.h"
 #include "KviProxyDataBase.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
-#include "kvi_ircsocket.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviIrcSocket.h"
+#include "KviConsoleWindow.h"
 #include "KviNetUtils.h"
-#include "kvi_internalcmd.h"
-#include "kvi_frame.h"
-#include "kvi_mexlinkfilter.h"
+#include "KviInternalCommand.h"
+#include "KviMainWindow.h"
+#include "KviMexLinkFilter.h"
 //#include "kvi_garbage.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
 #include "kvi_debug.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcSocket.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
index ee5021880..ddc6021b0 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONTARGETRESOLVER_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectiontargetresolver.h
+//   File : KviIrcConnectionTargetResolver.h
 //   Creation date : Fri 11 May 2004 23:17:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp b/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
index 1732225f8..64201db59 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircconnectionuserinfo.cpp
+//   File : KviIrcConnectionUserInfo.cpp
 //   Creation date : Sun 20 Jun 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviIrcConnectionUserInfo.h"
 
 KviIrcConnectionUserInfo::KviIrcConnectionUserInfo()
 {
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h b/src/kvirc/kernel/KviIrcConnectionUserInfo.h
index ab4a707f2..233e1a6b2 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
+++ b/src/kvirc/kernel/KviIrcConnectionUserInfo.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONNECTIONUSERINFO_H_
 //=============================================================================
 //
-//   File : kvi_ircconnectionuserinfo.h
+//   File : KviIrcConnectionUserInfo.h
 //   Creation date : Sun 20 Jun 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/KviIrcContext.cpp
index ca69c1c1c..e517ad317 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/KviIrcContext.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_irccontext.cpp
+//   File : KviIrcContext.cpp
 //   Creation date : Sun 09 May 2004 20:37:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,34 +24,34 @@
 
 
 
-#include "kvi_irccontext.h"
-#include "kvi_console.h"
-#include "kvi_channel.h"
-#include "kvi_query.h"
-#include "kvi_frame.h"
+#include "KviIrcContext.h"
+#include "KviConsoleWindow.h"
+#include "KviChannelWindow.h"
+#include "KviQueryWindow.h"
+#include "KviMainWindow.h"
 #include "kvi_debug.h"
-#include "kvi_sparser.h"
-#include "kvi_irclink.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_asynchronousconnectiondata.h"
-#include "kvi_ircconnectionstatedata.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionrequestqueue.h"
-#include "kvi_irctoolbar.h"
+#include "KviIrcServerParser.h"
+#include "KviIrcLink.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviAsynchronousConnectionData.h"
+#include "KviIrcConnectionStateData.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionRequestQueue.h"
+#include "KviIrcToolBar.h"
 #include "kvi_out.h"
 #include "KviIrcServerDataBase.h"
 #include "KviProxyDataBase.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_ircdatastreammonitor.h"
+#include "KviIrcDataStreamMonitor.h"
 #include "KviError.h"
 #include "KviThread.h" // for KviThread::msleep()
-#include "kvi_app.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_kvs_script.h"
+#include "KviApplication.h"
+#include "KviKvsEventTriggers.h"
+#include "KviKvsScript.h"
 #include "KviNetUtils.h"
-#include "kvi_ircurl.h"
+#include "KviIrcUrl.h"
 #include "KviUserIdentity.h"
 
 #define __KVI_DEBUG__
@@ -152,7 +152,7 @@ void KviIrcContext::closeAllDeadChannels()
 {
 	while(m_pDeadChannels)
 	{
-		KviChannel * c = m_pDeadChannels->first();
+		KviChannelWindow * c = m_pDeadChannels->first();
 		if(c)
 		{
 			m_pFrame->closeWindow(c);
@@ -168,7 +168,7 @@ void KviIrcContext::closeAllDeadQueries()
 {
 	while(m_pDeadQueries)
 	{
-		KviQuery * q = m_pDeadQueries->first();
+		KviQueryWindow * q = m_pDeadQueries->first();
 		if(q)
 		{
 			m_pFrame->closeWindow(q);
@@ -196,10 +196,10 @@ void KviIrcContext::closeAllContextWindows()
 	}
 }
 
-KviChannel * KviIrcContext::findDeadChannel(const QString &name)
+KviChannelWindow * KviIrcContext::findDeadChannel(const QString &name)
 {
 	if(!m_pDeadChannels)return 0;
-	for(KviChannel * c = m_pDeadChannels->first();c;c = m_pDeadChannels->next())
+	for(KviChannelWindow * c = m_pDeadChannels->first();c;c = m_pDeadChannels->next())
 	{
 		KVI_ASSERT(c->isDeadChan());
 		if(KviQString::equalCI(name,c->windowName()))return c;
@@ -207,10 +207,10 @@ KviChannel * KviIrcContext::findDeadChannel(const QString &name)
 	return 0;
 }
 
-KviQuery * KviIrcContext::findDeadQuery(const QString &name)
+KviQueryWindow * KviIrcContext::findDeadQuery(const QString &name)
 {
 	if(!m_pDeadQueries)return 0;
-	for(KviQuery * c = m_pDeadQueries->first();c;c = m_pDeadQueries->next())
+	for(KviQueryWindow * c = m_pDeadQueries->first();c;c = m_pDeadQueries->next())
 	{
 		KVI_ASSERT(c->isDeadQuery());
 		if(KviQString::equalCI(name,c->windowName()))return c;
@@ -218,14 +218,14 @@ KviQuery * KviIrcContext::findDeadQuery(const QString &name)
 	return 0;
 }
 
-KviQuery * KviIrcContext::firstDeadQuery()
+KviQueryWindow * KviIrcContext::firstDeadQuery()
 {
 	if(!m_pDeadQueries)
 		return 0;
 	return m_pDeadQueries->first();
 }
 
-KviChannel * KviIrcContext::firstDeadChannel()
+KviChannelWindow * KviIrcContext::firstDeadChannel()
 {
 	if(!m_pDeadChannels)
 		return 0;
@@ -242,27 +242,27 @@ void KviIrcContext::registerContextWindow(KviWindow * pWnd)
 	m_pContextWindows->append(pWnd);
 }
 
-void KviIrcContext::registerDeadChannel(KviChannel * c)
+void KviIrcContext::registerDeadChannel(KviChannelWindow * c)
 {
 	if(!m_pDeadChannels)
 	{
-		m_pDeadChannels = new KviPointerList<KviChannel>;
+		m_pDeadChannels = new KviPointerList<KviChannelWindow>;
 		m_pDeadChannels->setAutoDelete(false);
 	}
 	m_pDeadChannels->append(c);
 }
 
-void KviIrcContext::registerDeadQuery(KviQuery * q)
+void KviIrcContext::registerDeadQuery(KviQueryWindow * q)
 {
 	if(!m_pDeadQueries)
 	{
-		m_pDeadQueries = new KviPointerList<KviQuery>;
+		m_pDeadQueries = new KviPointerList<KviQueryWindow>;
 		m_pDeadQueries->setAutoDelete(false);
 	}
 	m_pDeadQueries->append(q);
 }
 
-bool KviIrcContext::unregisterDeadChannel(KviChannel * c)
+bool KviIrcContext::unregisterDeadChannel(KviChannelWindow * c)
 {
 	// was a dead channel ?
 	if(!m_pDeadChannels)return false;
@@ -293,7 +293,7 @@ bool KviIrcContext::unregisterContextWindow(KviWindow * pWnd)
 	return true;
 }
 
-bool KviIrcContext::unregisterDeadQuery(KviQuery * q)
+bool KviIrcContext::unregisterDeadQuery(KviQueryWindow * q)
 {
 	if(!m_pDeadQueries)return false;
 	if(!m_pDeadQueries->removeRef(q))
@@ -735,7 +735,7 @@ void KviIrcContext::connectionTerminated()
 			if(KVI_OPTION_BOOL(KviOption_boolRejoinChannelsAfterReconnect))
 			{
 				// FIXME: THIS SHOULD BE A KviIrcConnection FUNCTION
-				KviChannel * c;
+				KviChannelWindow * c;
 				QString szChannels, szProtectedChannels, szPasswords, szCurPass, szCurChan;
 				// first only chans without key, in groups of 4
 				for(c = connection()->channelList()->first(); c; c = connection()->channelList()->next())
@@ -770,7 +770,7 @@ void KviIrcContext::connectionTerminated()
 
 			if(KVI_OPTION_BOOL(KviOption_boolReopenQueriesAfterReconnect))
 			{
-				for(KviQuery * q = connection()->queryList()->first(); q; q = connection()->queryList()->next())
+				for(KviQueryWindow * q = connection()->queryList()->first(); q; q = connection()->queryList()->next())
 				{
 					pInfo->m_szOpenQueryes.append(q->target());
 				}
diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/KviIrcContext.h
index 581b02d16..6348cdc55 100644
--- a/src/kvirc/kernel/kvi_irccontext.h
+++ b/src/kvirc/kernel/KviIrcContext.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCCONTEXT_H_
 //=============================================================================
 //
-//   File : kvi_irccontext.h
+//   File : KviIrcContext.h
 //   Creation date : Sun 09 May 2004 20:37:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,10 +28,10 @@
 #include "KviPointerList.h"
 #include <QObject>
 
-class KviChannel;
-class KviQuery;
-class KviQuery;
-class KviFrame;
+class KviChannelWindow;
+class KviQueryWindow;
+class KviQueryWindow;
+class KviMainWindow;
 class KviIrcConnection;
 class KviExternalServerDataParser;
 class KviAsynchronousConnectionData;
@@ -58,8 +58,8 @@ class KviIrcServer;
 class KVIRC_API KviIrcContext : public QObject
 {
 	friend class KviConsole;
-	friend class KviChannel;
-	friend class KviQuery;
+	friend class KviChannelWindow;
+	friend class KviQueryWindow;
 	friend class KviIrcConnection;
 	friend class KviIrcContextToolBar;
 	Q_OBJECT
@@ -84,7 +84,7 @@ protected:
 	State                              m_eState;               // this context state
 
 	// helper pointers
-	KviFrame                         * m_pFrame;               // the owning frame, shallow, never null
+	KviMainWindow                         * m_pFrame;               // the owning frame, shallow, never null
 
 	// permanent links and list window
 	KviExternalServerDataParser      * m_pLinksWindow;
@@ -99,8 +99,8 @@ protected:
 	KviPointerList<KviIrcDataStreamMonitor> * m_pMonitorList; // owned, may be null
 
 	// dead channels and queries
-	KviPointerList<KviChannel>           * m_pDeadChannels;
-	KviPointerList<KviQuery>             * m_pDeadQueries;
+	KviPointerList<KviChannelWindow>           * m_pDeadChannels;
+	KviPointerList<KviQueryWindow>             * m_pDeadQueries;
 	// other context bound windows
 	KviPointerList<KviWindow>            * m_pContextWindows;
 
@@ -110,7 +110,7 @@ public:
 	// never null and always the same!
 	inline KviConsole * console(){ return m_pConsole; };
 	// never null and always the same
-	inline KviFrame * frame(){ return m_pFrame; };
+	inline KviMainWindow * frame(){ return m_pFrame; };
 	// may be null and may change!
 	inline KviIrcConnection * connection(){ return m_pConnection; };
 	// state
@@ -118,14 +118,14 @@ public:
 	inline bool isConnected(){ return m_eState == Connected; };
 	inline bool isLoggingIn(){ return m_eState == LoggingIn; };
 	// dead channels and queries
-	bool unregisterDeadChannel(KviChannel * c);
-	bool unregisterDeadQuery(KviQuery * q);
-	void registerDeadChannel(KviChannel * c);
-	void registerDeadQuery(KviQuery * q);
-	KviChannel * findDeadChannel(const QString &name);
-	KviQuery * findDeadQuery(const QString &nick);
-	KviQuery * firstDeadQuery();
-	KviChannel * firstDeadChannel();
+	bool unregisterDeadChannel(KviChannelWindow * c);
+	bool unregisterDeadQuery(KviQueryWindow * q);
+	void registerDeadChannel(KviChannelWindow * c);
+	void registerDeadQuery(KviQueryWindow * q);
+	KviChannelWindow * findDeadChannel(const QString &name);
+	KviQueryWindow * findDeadQuery(const QString &nick);
+	KviQueryWindow * firstDeadQuery();
+	KviChannelWindow * firstDeadChannel();
 	// other windows bound to the context
 	void closeAllContextWindows();
 	void registerContextWindow(KviWindow * pWnd);
diff --git a/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp b/src/kvirc/kernel/KviIrcDataStreamMonitor.cpp
index 2b126ad84..fca864521 100644
--- a/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
+++ b/src/kvirc/kernel/KviIrcDataStreamMonitor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircdatastreammonitor.cpp
+//   File : KviIrcDataStreamMonitor.cpp
 //   Creation date : Sun 04 Jul 2004 21:27:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,8 +24,8 @@
 
 
 
-#include "kvi_ircdatastreammonitor.h"
-#include "kvi_irccontext.h"
+#include "KviIrcDataStreamMonitor.h"
+#include "KviIrcContext.h"
 
 KviIrcDataStreamMonitor::KviIrcDataStreamMonitor(KviIrcContext * pContext)
 : KviHeapObject()
diff --git a/src/kvirc/kernel/kvi_ircdatastreammonitor.h b/src/kvirc/kernel/KviIrcDataStreamMonitor.h
index ebe0df397..dfc8d1ddf 100644
--- a/src/kvirc/kernel/kvi_ircdatastreammonitor.h
+++ b/src/kvirc/kernel/KviIrcDataStreamMonitor.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCDATASTREAMMONITOR_H_
 //=============================================================================
 //
-//   File : kvi_ircdatastreammonitor.h
+//   File : KviIrcDataStreamMonitor.h
 //   Creation date : Sun 04 Jul 2004 21:27:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/KviIrcLink.cpp
index 4c7b77d63..546710f9b 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/KviIrcLink.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_irclink.cpp
+//   File : KviIrcLink.cpp
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -23,27 +23,27 @@
 //=============================================================================
 
 
-#include "kvi_irclink.h"
+#include "KviIrcLink.h"
 #include "KviDnsResolver.h"
 #include "KviLocale.h"
 #include "KviIrcServerDataBase.h"
 #include "KviProxyDataBase.h"
 #include "KviError.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
-#include "kvi_ircsocket.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviIrcSocket.h"
+#include "KviConsoleWindow.h"
 #include "KviNetUtils.h"
-#include "kvi_internalcmd.h"
-#include "kvi_frame.h"
-#include "kvi_mexlinkfilter.h"
+#include "KviInternalCommand.h"
+#include "KviMainWindow.h"
+#include "KviMexLinkFilter.h"
 //#include "kvi_garbage.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircconnectiontargetresolver.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcConnectionTargetResolver.h"
+#include "KviIrcSocket.h"
 #include "KviDataBuffer.h"
 #include "kvi_debug.h"
 
diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/KviIrcLink.h
index 719006778..5c4f8f55e 100644
--- a/src/kvirc/kernel/kvi_irclink.h
+++ b/src/kvirc/kernel/KviIrcLink.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCLINK_H_
 //=============================================================================
 //
-//   File : kvi_irclink.h
+//   File : KviIrcLink.h
 //   Creation date : Mon 03 May 2004 01:45:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_irclink.h
+* \file KviIrcLink.h
 * \author Szymon Stefanek
 * \brief Middle stack protocol for IRC connection
 */
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/KviIrcSocket.cpp
index 55ab56cf1..d16d6cee2 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/KviIrcSocket.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircsocket.cpp
+//   File : KviIrcSocket.cpp
 //   Creation date : Tue Jul 30 19:25:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "kvi_ircsocket.h"
+#include "KviIrcSocket.h"
 #include "KviIrcServer.h"
 #include "KviProxyDataBase.h"
 #include "KviNetUtils.h"
@@ -33,17 +33,17 @@
 #include "KviMemory.h"
 #include "kvi_debug.h"
 #include "KviCString.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviMemory.h"
 #include "kvi_socket.h"
-#include "kvi_console.h"
+#include "KviConsoleWindow.h"
 #include "kvi_out.h"
-#include "kvi_irclink.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcLink.h"
+#include "KviIrcConnection.h"
 #include "KviDataBuffer.h"
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
+	#include "KviSSLMaster.h"
 #endif
 
 #include <QTimer>
diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/KviIrcSocket.h
index face64d84..e9b3b50ce 100644
--- a/src/kvirc/kernel/kvi_ircsocket.h
+++ b/src/kvirc/kernel/KviIrcSocket.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCSOCKET_H_
 //=============================================================================
 //
-//   File : kvi_ircsocket.h
+//   File : KviIrcSocket.h
 //   Creation date : Tue Jul 30 19:25:17 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_ircsocket.h
+* \file KviIrcSocket.h
 * \author Szymon Stefanek
 * \brief Lower stack protocol for IRC connection
 */
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp
index f227f4b09..4f921b8f2 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/KviIrcUrl.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircurl.cpp
+//   File : KviIrcUrl.cpp
 //   Creation date : Sun Mar 04 2001 14:20:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,19 +26,19 @@
 #include "kvi_inttypes.h"
 #include "KviQString.h"
 #include "KviIrcServer.h"
-#include "kvi_kvs_script.h"
-#include "kvi_msgbox.h"
-#include "kvi_channel.h"
-#include "kvi_app.h"
+#include "KviKvsScript.h"
+#include "KviMessageBox.h"
+#include "KviChannelWindow.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircconnection.h"
-#include "kvi_irccontext.h"
-#include "kvi_console.h"
-#include "kvi_frame.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcConnection.h"
+#include "KviIrcContext.h"
+#include "KviConsoleWindow.h"
+#include "KviMainWindow.h"
 
 #define _KVI_IRCURL_CPP_
-#include "kvi_ircurl.h"
+#include "KviIrcUrl.h"
 
 
 bool KviIrcUrl::parse(const char * url,KviCString &cmdBuffer,int contextSpec)
@@ -327,7 +327,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
 				// the same server, but probably new chanlist
 				QString tmp;
 				QString toPart;
-				for(KviChannel * c = pConsole->connection()->channelList()->first();c;c = pConsole->connection()->channelList()->next())
+				for(KviChannelWindow * c = pConsole->connection()->channelList()->first();c;c = pConsole->connection()->channelList()->next())
 				{
 					tmp=c->target();
 					if(c->hasChannelMode('k'))
diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/KviIrcUrl.h
index ddf281134..8b98bbfc3 100644
--- a/src/kvirc/kernel/kvi_ircurl.h
+++ b/src/kvirc/kernel/KviIrcUrl.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCURL_H_
 //=============================================================================
 //
-//   File : kvi_ircurl.h
+//   File : KviIrcUrl.h
 //   Creation date : Sun Mar 04 2001 14:22:55 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/KviLagMeter.cpp
index 053a77cf6..ad3b12c34 100644
--- a/src/kvirc/kernel/kvi_lagmeter.cpp
+++ b/src/kvirc/kernel/KviLagMeter.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_lagmeter.cpp
+//   File : KviLagMeter.cpp
 //   Creation date : Fri Oct 18 13:31:36 CEST 1999 by Juanjo Álvarez
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,17 +25,17 @@
 
 
 
-#include "kvi_lagmeter.h"
-#include "kvi_options.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviLagMeter.h"
+#include "KviOptions.h"
+#include "KviKvsEventTriggers.h"
 #include "KviParameterList.h"
-#include "kvi_ircconnection.h"
-#include "kvi_irccontext.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviIrcConnection.h"
+#include "KviIrcContext.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviTimeUtils.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
 
diff --git a/src/kvirc/kernel/kvi_lagmeter.h b/src/kvirc/kernel/KviLagMeter.h
index 9bd87de7a..6a8bfd937 100644
--- a/src/kvirc/kernel/kvi_lagmeter.h
+++ b/src/kvirc/kernel/KviLagMeter.h
@@ -2,7 +2,7 @@
 #define _KVI_LAGMETER_H_
 //=============================================================================
 //
-//   File : kvi_lagmeter.h
+//   File : KviLagMeter.h
 //   Creation date : Fri Oct 18 13:30:26 CEST 1999 by Juanjo Álvarez
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/KviMain.cpp
index 03bcc75c1..d717010d7 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/KviMain.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_main.cpp
+//   File : KviMain.cpp
 //   Creation date : Sun Jun 18 2000 12:38:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,13 +24,13 @@
 
 
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviCString.h"
 #include "kvi_settings.h"
-#include "kvi_ircurl.h"
+#include "KviIrcUrl.h"
 #include "kvi_defaults.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_msgbox.h"
+#include "KviMessageBox.h"
 #include "KviBuildInfo.h"
 #ifdef COMPILE_DBUS_SUPPORT
 	#ifndef COMPILE_KDE_SUPPORT // 'cause kde adds an interface itself
@@ -38,7 +38,7 @@
 	#endif
 #endif
 #ifndef COMPILE_NO_IPC
-	extern bool kvi_sendIpcMessage(const char * message); // kvi_ipc.cpp
+	extern bool kvi_sendIpcMessage(const char * message); // KviIpcSentinel.cpp
 #endif
 
 #include <QtGlobal> //for qDebug()
@@ -375,7 +375,7 @@ int main(int argc, char ** argv)
 
 #endif
 
-	KviApp * pTheApp = new KviApp(argc,argv);
+	KviApplication * pTheApp = new KviApplication(argc,argv);
 
 #ifdef COMPILE_DBUS_SUPPORT
 	#ifndef COMPILE_KDE_SUPPORT
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/KviNotifyList.cpp
index 1012f5b60..1f4662e17 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/KviNotifyList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_notifylist.cpp
+//   File : KviNotifyList.cpp
 //   Creation date : Fri Oct 27 2000 23:41:01 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,25 +26,25 @@
 
 
 #include "kvi_debug.h"
-#include "kvi_notifylist.h"
-#include "kvi_console.h"
-#include "kvi_ircsocket.h"
+#include "KviNotifyList.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcSocket.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_userlistview.h"
-#include "kvi_channel.h"
-#include "kvi_options.h"
-#include "kvi_window.h"
+#include "KviUserListView.h"
+#include "KviChannelWindow.h"
+#include "KviOptions.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_sparser.h"
+#include "KviIrcServerParser.h"
 #include "KviIrcMask.h"
-#include "kvi_numeric.h"
+#include "KviIrcNumericCodes.h"
 #include "KviParameterList.h"
-#include "kvi_ircconnection.h"
-#include "kvi_app.h"
+#include "KviIrcConnection.h"
+#include "KviApplication.h"
 #include "KviQString.h"
-#include "kvi_lagmeter.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviLagMeter.h"
+#include "KviKvsEventTriggers.h"
 
 #include <QStringList>
 #include <QByteArray>
@@ -615,8 +615,8 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 					// mmmh...we have more than one ref, so the user is at least in one query or channel
 					// look him up on channels, if we find his entry, we can be sure that he is
 					// still the right user
-					KviPointerList<KviChannel> * chlist = m_pConsole->connection()->channelList();
-					for(KviChannel * ch = chlist->first();ch;ch = chlist->next())
+					KviPointerList<KviChannelWindow> * chlist = m_pConsole->connection()->channelList();
+					for(KviChannelWindow * ch = chlist->first();ch;ch = chlist->next())
 					{
 						if(KviUserListEntry * le = ch->findEntry(*s))
 						{
diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/KviNotifyList.h
index 01ac0963c..a06f99904 100644
--- a/src/kvirc/kernel/kvi_notifylist.h
+++ b/src/kvirc/kernel/KviNotifyList.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_notifylist.h
+//   File : KviNotifyList.h
 //   Creation date : Fri Oct 27 2000 23:39:09 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/KviOptions.cpp
index deea9046c..3e7d76c05 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_options.cpp
+//   File : KviOptions.cpp
 //   Creation date : Tue Jun 20 2000 11:42:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,22 +26,22 @@
 
 #define _KVI_OPTIONS_CPP_
 
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
 #include "KviConfigurationFile.h"
-#include "kvi_app.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
 #include "KviLocale.h"
 #include "kvi_confignames.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviStringConversion.h"
 #include "kvi_settings.h"
-#include "kvi_splash.h"
-#include "kvi_frame.h"
-#include "kvi_internalcmd.h"
-#include "kvi_theme.h"
+#include "KviSplashScreen.h"
+#include "KviMainWindow.h"
+#include "KviInternalCommand.h"
+#include "KviTheme.h"
 #include "KviFileUtils.h"
 //#include "kvi_textencoding.h"
 
@@ -57,7 +57,7 @@
 
 #include <zlib.h>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API int g_iIdentDaemonRunningUsers;
 
 
@@ -891,7 +891,7 @@ static void config_set_section(int flag,KviConfigurationFile * cfg)
 	} else cfg->setGroup(""); // Default group
 }
 
-void KviApp::loadOptions()
+void KviApplication::loadOptions()
 {
 	QString buffer;
 	if(getReadOnlyConfigPath(buffer,KVI_CONFIGFILE_MAIN))
@@ -938,7 +938,7 @@ void KviApp::loadOptions()
 	} // else already have the defaults
 }
 
-void KviApp::saveOptions()
+void KviApplication::saveOptions()
 {
 	QString buffer;
 
@@ -1009,7 +1009,7 @@ void KviApp::saveOptions()
 
 namespace KviTheme
 {
-	// utility functions for the KviTheme namespace (kvi_theme.h)
+	// utility functions for the KviTheme namespace (KviTheme.h)
 	// that are implemented here for convenience (in saving the options)
 	bool save(KviThemeInfo &options)
 	{
@@ -1093,7 +1093,7 @@ namespace KviTheme
 		// find all the "kvi_bigicon" images that we can find in the main pics directory
 		QString szPicsPath;
 
-		g_pApp->getGlobalKvircDirectory(szPicsPath,KviApp::Pics);
+		g_pApp->getGlobalKvircDirectory(szPicsPath,KviApplication::Pics);
 		QDir d(szPicsPath);
 		QStringList sl = d.entryList(QDir::nameFiltersFromString("kvi_bigicon_*.png"),QDir::Files);
 
@@ -1161,7 +1161,7 @@ namespace KviTheme
 
 		// reset the splash screen pointer
 		QString szPointerFile;
-		g_pApp->getLocalKvircDirectory(szPointerFile,KviApp::Themes,"current-splash");
+		g_pApp->getLocalKvircDirectory(szPointerFile,KviApplication::Themes,"current-splash");
 		KviFileUtils::removeFile(szPointerFile);
 
 		QString szD = themeDir;
@@ -1252,7 +1252,7 @@ namespace KviTheme
 	}
 };
 
-void KviApp::listAvailableOptions(KviWindow *wnd)
+void KviApplication::listAvailableOptions(KviWindow *wnd)
 {
 	int i;
 
@@ -1276,7 +1276,7 @@ void KviApp::listAvailableOptions(KviWindow *wnd)
 }
 
 //using namespace KviStringConversion;
-bool KviApp::getOptionString(const QString &optName,QString &buffer)
+bool KviApplication::getOptionString(const QString &optName,QString &buffer)
 {
 
 	#define GET_OPTION_STRING(__numOpt,__table,__prefix,__prefixLen) \
@@ -1311,7 +1311,7 @@ bool KviApp::getOptionString(const QString &optName,QString &buffer)
 	#undef GET_OPTION_STRING
 }
 
-void KviApp::optionResetUpdate(int flags)
+void KviApplication::optionResetUpdate(int flags)
 {
 	if(flags & KviOption_resetReloadImages)
 	{
@@ -1370,7 +1370,7 @@ void KviApp::optionResetUpdate(int flags)
 		emit updateNotifier();
 	}
 }
-bool KviApp::setOptionValue(const QString &optName,const QString &value)
+bool KviApplication::setOptionValue(const QString &optName,const QString &value)
 {
 	if (!setCommonOptionValue(optName,value))
 		return false;
@@ -1410,7 +1410,7 @@ bool KviApp::setOptionValue(const QString &optName,const QString &value)
 	return true;
 }
 
-bool KviApp::setCommonOptionValue(const QString &optName,const QString &value)
+bool KviApplication::setCommonOptionValue(const QString &optName,const QString &value)
 {
 
 	#define SET_OPTION_VALUE(__numOpt,__table,__prefix,__prefixLen) \
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/KviOptions.h
index 3876cd788..4063db4b9 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_options.h
+//   File : KviOptions.h
 //   Creation date : Tue Jun 20 2000 12:42:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_sslmaster.cpp b/src/kvirc/kernel/KviSSLMaster.cpp
index 83fc67519..53c6eef17 100644
--- a/src/kvirc/kernel/kvi_sslmaster.cpp
+++ b/src/kvirc/kernel/KviSSLMaster.cpp
@@ -22,16 +22,16 @@
 //
 //=============================================================================
 
-#include "kvi_sslmaster.h"
+#include "KviSSLMaster.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 
-#include "kvi_window.h"
-#include "kvi_options.h"
+#include "KviWindow.h"
+#include "KviOptions.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
 #include "KviLocale.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	//
diff --git a/src/kvirc/kernel/kvi_sslmaster.h b/src/kvirc/kernel/KviSSLMaster.h
index 6fb4a5cfe..d726dff0d 100644
--- a/src/kvirc/kernel/kvi_sslmaster.h
+++ b/src/kvirc/kernel/KviSSLMaster.h
@@ -2,7 +2,7 @@
 #define _KVI_SSLMASTER_H_
 //=============================================================================
 //
-//   File : kvi_sslmaster.h
+//   File : KviSSLMaster.h
 //   Creation date : Mon Jun 17 2002 20:34:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/KviTextIconManager.cpp
index 058ec1fc3..f31e89769 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/KviTextIconManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_texticonmanager.cpp
+//   File : KviTextIconManager.cpp
 //   Creation date : Thu 15 May 2002 12:04:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,15 +24,15 @@
 
 #define _KVI_TEXTICONMANAGER_CPP_
 
-#include "kvi_iconmanager.h"
-#include "kvi_texticonmanager.h"
+#include "KviIconManager.h"
+#include "KviTextIconManager.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
 #include "KviConfigurationFile.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_confignames.h"
 #include "KviAnimatedPixmap.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include <QPixmap>
 #include <QFile>
@@ -177,7 +177,7 @@ void KviTextIconManager::load()
 		return;
 
 	// do a merge of the texticons if we have a new config version
-	g_pApp->getGlobalKvircDirectory(szTmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS);
+	g_pApp->getGlobalKvircDirectory(szTmp,KviApplication::Config,KVI_CONFIGFILE_TEXTICONS);
 
 	if(QFile::exists(szTmp))
 		load(szTmp,true);
@@ -206,7 +206,7 @@ void KviTextIconManager::applyOptions()
 void KviTextIconManager::save()
 {
 	QString szTmp;
-	g_pApp->getLocalKvircDirectory(szTmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS);
+	g_pApp->getLocalKvircDirectory(szTmp,KviApplication::Config,KVI_CONFIGFILE_TEXTICONS);
 	save(szTmp);
 }
 
diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/KviTextIconManager.h
index eeeca2564..e8c3bbe38 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.h
+++ b/src/kvirc/kernel/KviTextIconManager.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_texticonmanager.h
+//   File : KviTextIconManager.h
 //   Creation date : Thu 15 May 2002 12:04:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 //=============================================================================
 
 /**
-* \file kvi_texticonmanager.h
+* \file KviTextIconManager.h
 * \author Szymon Stefanek
 * \brief
 *
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/KviTheme.cpp
index 56adc7e75..062af7ee2 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/KviTheme.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "kvi_theme.h"
+#include "KviTheme.h"
 #include "KviFileUtils.h"
 #include "KviConfigurationFile.h"
 #include "KviLocale.h"
diff --git a/src/kvirc/kernel/kvi_theme.h b/src/kvirc/kernel/KviTheme.h
index 26119ff4c..9c45df212 100644
--- a/src/kvirc/kernel/kvi_theme.h
+++ b/src/kvirc/kernel/KviTheme.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_theme.h
+//   File : KviTheme.h
 //   Creation date : Mon Jan 08 2007 03:23:00 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -145,7 +145,7 @@ namespace KviTheme
 	/// Will return true on success and false on failure.
 	/// On success this function will return the theme information in the buffer.
 	/// On failure this function will also set buffer.lastError() to a meaningful value
-	/// Note that for convenience this function is implemented in kvi_options.cpp
+	/// Note that for convenience this function is implemented in KviOptions.cpp
 	///
 	bool KVIRC_API load(const QString &szThemeDir,KviThemeInfo &buffer);
 	///
@@ -156,7 +156,7 @@ namespace KviTheme
 	/// set to the right values. In theory this function could save a theme
 	/// in a directory different than $KVIRC_LOCAL_DIR/themes/subdirectory
 	/// but this feature is actually unused.
-	/// Note that for convenience this function is implemented in kvi_options.cpp
+	/// Note that for convenience this function is implemented in KviOptions.cpp
 	///
 	bool KVIRC_API save(KviThemeInfo &options);
 	///
diff --git a/src/kvirc/kernel/kvi_useraction.cpp b/src/kvirc/kernel/KviUserAction.cpp
index 90a96d082..1be5303cf 100644
--- a/src/kvirc/kernel/kvi_useraction.cpp
+++ b/src/kvirc/kernel/KviUserAction.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_userlistview.cpp
+//   File : KviUserListView.cpp
 //   Creation date : Tue Mar 18 2003 13:36:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_useraction.h"
+#include "KviUserAction.h"
 
 static int useraction_table[KVI_NUM_USERACTION_TYPES] =
 {
diff --git a/src/kvirc/kernel/kvi_useraction.h b/src/kvirc/kernel/KviUserAction.h
index a9ebabd5b..c5b39f4e8 100644
--- a/src/kvirc/kernel/kvi_useraction.h
+++ b/src/kvirc/kernel/KviUserAction.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_useraction.h
+//   File : KviUserAction.h
 //   Creation date : Tue Mar 18 2003 13:36:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 //=============================================================================
 
 /**
-* \file kvi_useraction.h
+* \file KviUserAction.h
 * \author Szymon Stefanek
 * \brief This file defines the user action "temperatures"
 *
diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/KviUserInput.cpp
index b6625ec81..c086990bc 100644
--- a/src/kvirc/kernel/kvi_userinput.cpp
+++ b/src/kvirc/kernel/KviUserInput.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_userinput.cpp
+//   File : KviUserInput.cpp
 //   Creation date : Sun 25 Sep 2005 05:27:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,16 +22,16 @@
 //
 //=============================================================================
 
-#include "kvi_userinput.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_console.h"
-#include "kvi_kvs_script.h"
+#include "KviUserInput.h"
+#include "KviKvsVariantList.h"
+#include "KviConsoleWindow.h"
+#include "KviKvsScript.h"
 #include "KviLocale.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
 #include "kvi_out.h"
-#include "kvi_options.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviOptions.h"
+#include "KviKvsEventTriggers.h"
 
 namespace KviUserInput
 {
diff --git a/src/kvirc/kernel/kvi_userinput.h b/src/kvirc/kernel/KviUserInput.h
index 1dc02114f..bd3409a36 100644
--- a/src/kvirc/kernel/kvi_userinput.h
+++ b/src/kvirc/kernel/KviUserInput.h
@@ -2,7 +2,7 @@
 #define _KVI_USERINPUT_H_
 //=============================================================================
 //
-//   File : kvi_userinput.h
+//   File : KviUserInput.h
 //   Creation date : Sun 25 Sep 2005 05:27:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_userinput.h
+* \file KviUserInput.h
 * \author Szymon Stefanek
 * \brief User input parsing
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 /**
 * \namespace KviUserInput
diff --git a/src/kvirc/kernel/kvi_out.h b/src/kvirc/kernel/kvi_out.h
index d702f874e..7b423bebc 100644
--- a/src/kvirc/kernel/kvi_out.h
+++ b/src/kvirc/kernel/kvi_out.h
@@ -168,7 +168,7 @@
 #define KVI_OUT_CAP 141
 
 //#define KVI_NUM_MSGTYPE_OPTIONS 142
-// UPDATE THE TOTAL COUNT IN kvi_options.h !!!!
+// UPDATE THE TOTAL COUNT IN KviOptions.h !!!!
 
 
 #endif //_KVI_OPTIONS_H_
diff --git a/src/kvirc/kvs/kvi_kvs.cpp b/src/kvirc/kvs/KviKvs.cpp
index ef43b12a7..ba2e735a8 100644
--- a/src/kvirc/kvs/kvi_kvs.cpp
+++ b/src/kvirc/kvs/KviKvs.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs.cpp
+//   File : KviKvs.cpp
 //   Creation date : Wed 1 Oct 2003 01.38 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_kvs.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_kvs_dnsmanager.h"
-#include "kvi_kvs_timermanager.h"
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_scriptaddonmanager.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvs.h"
+#include "KviKvsKernel.h"
+#include "KviKvsAliasManager.h"
+#include "KviKvsDnsManager.h"
+#include "KviKvsTimerManager.h"
+#include "KviKvsPopupManager.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsScriptAddonManager.h"
+#include "KviKvsObjectController.h"
 
 namespace KviKvs
 {
diff --git a/src/kvirc/kvs/kvi_kvs.h b/src/kvirc/kvs/KviKvs.h
index 911af71f6..97042d0b0 100644
--- a/src/kvirc/kvs/kvi_kvs.h
+++ b/src/kvirc/kvs/KviKvs.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_H_
 //=============================================================================
 //
-//   File : kvi_kvs.h
+//   File : KviKvs.h
 //   Creation date : Wed 1 Oct 2003 01.37 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 // this header contains ALL the stuff that the user should see
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 
 namespace KviKvs
 {
diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/KviKvsAction.cpp
index e6f288acf..92aedd1df 100644
--- a/src/kvirc/kvs/kvi_kvs_action.cpp
+++ b/src/kvirc/kvs/KviKvsAction.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_action.cpp
+//   File : KviKvsAction.cpp
 //   Creation date : Sat 04 Dec 2004 04:22:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_action.h"
-#include "kvi_kvs_script.h"
-#include "kvi_window.h"
+#include "KviKvsAction.h"
+#include "KviKvsScript.h"
+#include "KviWindow.h"
 
 KviKvsAction::KviKvsAction(QObject * pParent, const QString & szName, const QString & szScriptCode, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory, const QString & szBigIconId, const QString & szSmallIconId, unsigned int uFlags, const QString & szKeySequence)
 : KviAction(pParent,szName,szVisibleName,szDescription,pCategory,szBigIconId,szSmallIconId,uFlags,szKeySequence)
diff --git a/src/kvirc/kvs/kvi_kvs_action.h b/src/kvirc/kvs/KviKvsAction.h
index f79df171e..dbf552724 100644
--- a/src/kvirc/kvs/kvi_kvs_action.h
+++ b/src/kvirc/kvs/KviKvsAction.h
@@ -2,7 +2,7 @@
 #define _KVI_KVSACTION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_action.h
+//   File : KviKvsAction.h
 //   Creation date : Sat 04 Dec 2004 04:22:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,13 +25,13 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_action.h
+* \file KviKvsAction.h
 * \author Szymon Stefanek
 * \brief Actions handling
 */
 
 #include "kvi_settings.h"
-#include "kvi_action.h"
+#include "KviAction.h"
 
 class KviKvsScript;
 
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp
index eacbeceb4..0745ce70a 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
+++ b/src/kvirc/kvs/KviKvsAliasManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_aliasmanager.cpp
+//   File : KviKvsAliasManager.cpp
 //   Creation date : Mon 15 Dec 2003 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_kvs_aliasmanager.h"
+#include "KviKvsAliasManager.h"
 #include "KviConfigurationFile.h"
 
 KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/KviKvsAliasManager.h
index ea9c9314a..39d4174cb 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h
+++ b/src/kvirc/kvs/KviKvsAliasManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_ALIASMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_aliasmanager.h
+//   File : KviKvsAliasManager.h
 //   Creation date : Mon 15 Dec 2003 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -30,7 +30,7 @@
 #include "KviPointerList.h"
 #include "KviQString.h"
 
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 
 class KVIRC_API KviKvsAliasManager : public QObject
 {
diff --git a/src/kvirc/kvs/kvi_kvs_array.cpp b/src/kvirc/kvs/KviKvsArray.cpp
index 9a9c07d01..bd1b268ed 100644
--- a/src/kvirc/kvs/kvi_kvs_array.cpp
+++ b/src/kvirc/kvs/KviKvsArray.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_array.cpp
+//   File : KviKvsArray.cpp
 //   Creation date : Tue 07 Oct 2003 01:07:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_array.h"
+#include "KviKvsArray.h"
 #include "KviMemory.h"
 
 #include <stdlib.h>
diff --git a/src/kvirc/kvs/kvi_kvs_array.h b/src/kvirc/kvs/KviKvsArray.h
index cded9ddea..2172b4e39 100644
--- a/src/kvirc/kvs/kvi_kvs_array.h
+++ b/src/kvirc/kvs/KviKvsArray.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_ARRAY_H_
 //=============================================================================
 //
-//   File : kvi_kvs_array.h
+//   File : KviKvsArray.h
 //   Creation date : Tue 07 Oct 2003 01:07:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,13 +25,13 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_array.h
+* \file KviKvsArray.h
 * \author Szymon Stefanek
 * \brief Handling of array data type in KVS
 */
 
 #include "kvi_settings.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 #include "KviHeapObject.h"
 
 /**
diff --git a/src/kvirc/kvs/kvi_kvs_arraycast.cpp b/src/kvirc/kvs/KviKvsArrayCast.cpp
index 99cbf933e..16d392dd2 100644
--- a/src/kvirc/kvs/kvi_kvs_arraycast.cpp
+++ b/src/kvirc/kvs/KviKvsArrayCast.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_arraycast.cpp
+//   File : KviKvsArrayCast.cpp
 //   Creation date : Tue 10 May 2005 00:05:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_kvs_arraycast.h"
+#include "KviKvsArrayCast.h"
 
 KviKvsArrayCast::~KviKvsArrayCast()
 {
diff --git a/src/kvirc/kvs/kvi_kvs_arraycast.h b/src/kvirc/kvs/KviKvsArrayCast.h
index 806b1f040..65fb139be 100644
--- a/src/kvirc/kvs/kvi_kvs_arraycast.h
+++ b/src/kvirc/kvs/KviKvsArrayCast.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_ARRAYCAST_H_
 //=============================================================================
 //
-//   File : kvi_kvs_arraycast.h
+//   File : KviKvsArrayCast.h
 //   Creation date : Tue 10 May 2005 00:05:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_array.h"
+#include "KviKvsArray.h"
 
 class KVIRC_API KviKvsArrayCast
 {
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
index 98b6afe3c..3d72b2892 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
+++ b/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_asyncdnsoperation.cpp
+//   File : KviKvsAsyncDnsOperation.cpp
 //   Creation date : Sun 10 Jul 2005 04:36:15 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -24,15 +24,15 @@
 
 
 
-#include "kvi_kvs_asyncdnsoperation.h"
+#include "KviKvsAsyncDnsOperation.h"
 #include "KviDnsResolver.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_app.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariant.h"
+#include "KviApplication.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
 #include "KviError.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviKvsVariantList.h"
 
 #include <QTimer>
 
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h b/src/kvirc/kvs/KviKvsAsyncDnsOperation.h
index 001a17cd8..5beb05d28 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h
+++ b/src/kvirc/kvs/KviKvsAsyncDnsOperation.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_ASYNCDNSOPERATION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_asyncdnsoperation.h
+//   File : KviKvsAsyncDnsOperation.h
 //   Creation date : Sun 10 Jul 2005 04:36:15 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_asyncoperation.h"
+#include "KviKvsAsyncOperation.h"
 #include "KviQString.h"
 #include "KviDnsResolver.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/KviKvsAsyncOperation.cpp
index 635ac758a..f82304bc8 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
+++ b/src/kvirc/kvs/KviKvsAsyncOperation.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_asyncoperation.cpp
+//   File : KviKvsAsyncOperation.cpp
 //   Creation date : Sat 09 Jul 2005 04:54:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_kvs_asyncoperation.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_window.h"
+#include "KviKvsAsyncOperation.h"
+#include "KviKvsKernel.h"
+#include "KviWindow.h"
 
 KviKvsAsyncOperation::KviKvsAsyncOperation(KviWindow * pWnd)
 : QObject()
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.h b/src/kvirc/kvs/KviKvsAsyncOperation.h
index b9288332b..4c7d3c0ce 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.h
+++ b/src/kvirc/kvs/KviKvsAsyncOperation.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_ASYNCOPERATION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_asyncoperation.h
+//   File : KviKvsAsyncOperation.h
 //   Creation date : Sat 09 Jul 2005 04:54:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/KviKvsCallbackObject.cpp
index d6c9bdf96..8c94c1197 100644
--- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
+++ b/src/kvirc/kvs/KviKvsCallbackObject.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_callbackobject.cpp
+//   File : KviKvsCallbackObject.cpp
 //   Creation date : Mon 21 Nov 2005 01:46:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_kvs_callbackobject.h"
-#include "kvi_console.h"
-#include "kvi_app.h"
+#include "KviKvsCallbackObject.h"
+#include "KviConsoleWindow.h"
+#include "KviApplication.h"
 
 
 KviKvsCallbackObject::KviKvsCallbackObject(const QString &szCallbackName,KviWindow * pTargetWindow,const QString &szCallbackCode,KviKvsVariantList * pMagicParams,unsigned int uFlags)
diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.h b/src/kvirc/kvs/KviKvsCallbackObject.h
index 11f13d695..fa725d627 100644
--- a/src/kvirc/kvs/kvi_kvs_callbackobject.h
+++ b/src/kvirc/kvs/KviKvsCallbackObject.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_CALLBACKOBJECT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_callbackobject.h
+//   File : KviKvsCallbackObject.h
 //   Creation date : Mon 21 Nov 2005 01:46:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -27,10 +27,10 @@
 #include "kvi_settings.h"
 #include "KviHeapObject.h"
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviQString.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsScript.h"
 
 
 //
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
index cde1e5733..5df6791d4 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_corecallbackcommands.cpp
+//   File : KviKvsCoreCallbackCommands.cpp
 //   Creation date : Fri 31 Oct 2003 04:07:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,22 +24,22 @@
 
 
 
-#include "kvi_kvs_corecallbackcommands.h"
+#include "KviKvsCoreCallbackCommands.h"
 
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_timermanager.h"
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_asyncdnsoperation.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_processmanager.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvsKernel.h"
+#include "KviKvsTimerManager.h"
+#include "KviKvsAliasManager.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsAsyncDnsOperation.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsProcessManager.h"
+#include "KviKvsObjectController.h"
 
 #include "KviCommandFormatter.h"
-#include "kvi_ircconnectionasyncwhoisdata.h"
-#include "kvi_ircconnection.h"
-#include "kvi_scriptbutton.h"
-#include "kvi_iconmanager.h"
+#include "KviIrcConnectionAsyncWhoisData.h"
+#include "KviIrcConnection.h"
+#include "KviScriptButton.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
 
 #include "KviTalToolTip.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h b/src/kvirc/kvs/KviKvsCoreCallbackCommands.h
index bee51ddb2..039786fab 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h
+++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_CORECALLBACKCOMMANDS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_corecallbackcommands.h
+//   File : KviKvsCoreCallbackCommands.h
 //   Creation date : Fri 31 Oct 2003 04:07:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_switchlist.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_parameterprocessor.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsSwitchList.h"
+#include "KviKvsScript.h"
+#include "KviKvsParameterProcessor.h"
 
 
 #define KVSCCC(_name) bool _name(KviKvsRunTimeContext * __pContext,KviKvsVariantList * __pParams,KviKvsSwitchList * __pSwitches,const KviKvsScript * __pCallback)
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/KviKvsCoreFunctions.cpp
index 50d69e548..7b22fcb0b 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_corefunctions.cpp
+//   File : KviKvsCoreFunctions.cpp
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_kvs_corefunctions.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsCoreFunctions.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObject.h"
 #include "KviLocale.h"
 
 namespace KviKvsCoreFunctions
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/KviKvsCoreFunctions.h
index 6026ccb89..e452ed2f2 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.h
+++ b/src/kvirc/kvs/KviKvsCoreFunctions.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_COREFUNCTIONS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_corefunctions.h
+//   File : KviKvsCoreFunctions.h
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_parameterprocessor.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsVariant.h"
+#include "KviKvsParameterProcessor.h"
 
 
 #define KVSCF(_name) bool _name(KviKvsRunTimeContext * __pContext,KviKvsVariantList * __pParams,KviKvsVariant * __pRetBuffer)
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index 1d0900fdb..c36aeb373 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_corefunctions_af.cpp
+//   File : KviKvsCoreFunctions_af.cpp
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,26 +25,26 @@
 
 
 
-#include "kvi_kvs_corefunctions.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvsCoreFunctions.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObjectController.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_channel.h"
-#include "kvi_console.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviApplication.h"
+#include "KviChannelWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
 #include "KviMircCntrl.h"
 #include "KviAvatar.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_frame.h"
-#include "kvi_statusbar.h"
+#include "KviMainWindow.h"
+#include "KviStatusBar.h"
 #include "KviQString.h"
-#include "kvi_sslmaster.h"
-#include "kvi_options.h"
+#include "KviSSLMaster.h"
+#include "KviOptions.h"
 
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsAliasManager.h"
+#include "KviKvsScript.h"
 
 // date includes
 #include <QDateTime>
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index 528b6064f..85cbb4174 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_corefunctions_gl.cpp
+//   File : KviKvsCoreFunctions_gl.cpp
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,22 +24,22 @@
 
 
 
-#include "kvi_kvs_corefunctions.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_timermanager.h"
-#include "kvi_kvs_arraycast.h"
+#include "KviKvsCoreFunctions.h"
+#include "KviKvsKernel.h"
+#include "KviKvsTimerManager.h"
+#include "KviKvsArrayCast.h"
 #include "KviLocale.h"
-#include "kvi_input.h"
-#include "kvi_app.h"
-#include "kvi_channel.h"
-#include "kvi_console.h"
-#include "kvi_iconmanager.h"
+#include "KviInput.h"
+#include "KviApplication.h"
+#include "KviChannelWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviIconManager.h"
 #include "KviMircCntrl.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviTimeUtils.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_eventhandler.h"
-#include "kvi_lagmeter.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsEventHandler.h"
+#include "KviLagMeter.h"
 
 #include <QRegExp>
 
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
index d6ccb050e..71b3f0aec 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_corefunctions_mr.cpp
+//   File : KviKvsCoreFunctions_mr.cpp
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,20 +24,20 @@
 
 
 
-#include "kvi_kvs_corefunctions.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_arraycast.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvsCoreFunctions.h"
+#include "KviKvsKernel.h"
+#include "KviKvsArrayCast.h"
+#include "KviKvsObjectController.h"
 #include "KviLocale.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
 #include "KviMircCntrl.h"
-#include "kvi_options.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviConsoleWindow.h"
 #include "KviIrcUserDataBase.h"
 #include "KviIrcMask.h"
 #include "kvi_socket.h"
-#include "kvi_app.h"
-#include "kvi_query.h"
+#include "KviApplication.h"
+#include "KviQueryWindow.h"
 
 #include <stdlib.h> // rand & srand
 
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index b3b95de72..d01c92dae 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_corefunctions_sz.cpp
+//   File : KviKvsCoreFunctions_sz.cpp
 //   Creation date : Fri 31 Oct 2003 01:52:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,22 +24,22 @@
 
 
 
-#include "kvi_kvs_corefunctions.h"
+#include "KviKvsCoreFunctions.h"
 
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_arraycast.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvsKernel.h"
+#include "KviKvsArrayCast.h"
+#include "KviKvsObjectController.h"
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_channel.h"
-#include "kvi_console.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviChannelWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviTimeUtils.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 #include "KviMircCntrl.h"
 #include "kvi_sourcesdate.h"
 #include "kvi_socket.h"
@@ -667,10 +667,10 @@ namespace KviKvsCoreFunctions
 			} else {
 				// attempt to load it automatically
 				QString szDir;
-				g_pApp->getLocalKvircDirectory(szDir,KviApp::Locale);
+				g_pApp->getLocalKvircDirectory(szDir,KviApplication::Locale);
 				if(!KviLocale::loadCatalogue(szCatalogue,szDir))
 				{
-					g_pApp->getGlobalKvircDirectory(szDir,KviApp::Locale);
+					g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Locale);
 					KviLocale::loadCatalogue(szCatalogue,szDir);
 				}
 				// If the code above fails to load the catalogue
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp
index 483cc893b..6d1b8b716 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_coresimplecommands.cpp
+//   File : KviKvsCoreSimpleCommands.cpp
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_kvs_coresimplecommands.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviKvsCoreSimpleCommands.h"
 
-#include "kvi_kvs_kernel.h"
-#include "kvi_options.h"
-#include "kvi_ircconnection.h"
+#include "KviKvsKernel.h"
+#include "KviOptions.h"
+#include "KviIrcConnection.h"
 #include "KviLocale.h"
-#include "kvi_kvs_treenode_command.h"
+#include "KviKvsTreeNodeCommand.h"
 
 #include <QRegExp>
 #include <QStringList>
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h b/src/kvirc/kvs/KviKvsCoreSimpleCommands.h
index 1987e5e69..813d49337 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_CORESIMPLECOMMANDS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_coresimplecommands.h
+//   File : KviKvsCoreSimpleCommands.h
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,13 +24,13 @@
 //
 //=============================================================================
 
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 #include "kvi_settings.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_switchlist.h"
-#include "kvi_kvs_parameterprocessor.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsSwitchList.h"
+#include "KviKvsParameterProcessor.h"
 
 
 #define KVSCSC(_name) bool _name(KviKvsRunTimeContext * __pContext,KviKvsVariantList * __pParams,KviKvsSwitchList * __pSwitches)
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index c40677a11..95a3fcc17 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_coresimplecommands_af.cpp
+//   File : KviKvsCoreSimpleCommands_af.cpp
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,23 +22,23 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_coresimplecommands.h"
+#include "KviKvsCoreSimpleCommands.h"
 
 
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_ircview.h" // this is only for KviIrcView::NoTimestamp
-#include "kvi_debugwindow.h"
-#include "kvi_console.h"
-#include "kvi_scriptbutton.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviIrcView.h" // this is only for KviIrcView::NoTimestamp
+#include "KviDebugWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviScriptButton.h"
+#include "KviIconManager.h"
 
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObjectController.h"
 
 #ifdef COMPILE_X11_SUPPORT
 	#ifndef COMPILE_NO_X_BELL
@@ -51,7 +51,7 @@
 #endif
 #include "KviTalToolTip.h"
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
 
 namespace KviKvsCoreSimpleCommands
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
index 49a20bd0f..03a39089d 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_coresimplecommands_gl.cpp
+//   File : KviKvsCoreSimpleCommands_gl.cpp
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_coresimplecommands.h"
-#include "kvi_kvs_timermanager.h"
-#include "kvi_kvs_asyncdnsoperation.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsCoreSimpleCommands.h"
+#include "KviKvsTimerManager.h"
+#include "KviKvsAsyncDnsOperation.h"
+#include "KviKvsScript.h"
 #include "KviFileUtils.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionServerInfo.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
index 9be137000..eb8bdb316 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_coresimplecommands_mr.cpp
+//   File : KviKvsCoreSimpleCommands_mr.cpp
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,28 +22,28 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_coresimplecommands.h"
+#include "KviKvsCoreSimpleCommands.h"
 
-#include "kvi_window.h"
-#include "kvi_console.h"
-#include "kvi_query.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviQueryWindow.h"
 #include "KviIrcUserDataBase.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 #include "KviFileUtils.h"
-#include "kvi_filedialog.h"
-#include "kvi_ircconnection.h"
-#include "kvi_channel.h"
-#include "kvi_ircurl.h"
-#include "kvi_frame.h"
-#include "kvi_modulemanager.h"
-#include "kvi_kvs_moduleinterface.h"
+#include "KviFileDialog.h"
+#include "KviIrcConnection.h"
+#include "KviChannelWindow.h"
+#include "KviIrcUrl.h"
+#include "KviMainWindow.h"
+#include "KviModuleManager.h"
+#include "KviKvsModuleInterface.h"
 
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_popupmanager.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsScript.h"
+#include "KviKvsPopupManager.h"
 
 #include <QCursor>
 #include <QProcess>
@@ -736,7 +736,7 @@ namespace KviKvsCoreSimpleCommands
 		if(sl.count() == 1)
 		{
 			// single chan, use channel encoding if possible
-			KviChannel * ch = KVSCSC_pConnection->findChannel(szChans);
+			KviChannelWindow * ch = KVSCSC_pConnection->findChannel(szChans);
 			if(ch)
 				szText = ch->encodeText(szMsg);
 			else
@@ -751,7 +751,7 @@ namespace KviKvsCoreSimpleCommands
 
 		for(QStringList::Iterator it=sl.begin();it != sl.end();it++)
 		{
-			KviChannel * ch = KVSCSC_pConnection->findChannel(*it);
+			KviChannelWindow * ch = KVSCSC_pConnection->findChannel(*it);
 			if(ch)
 			{
 				ch->partMessageSent(!KVSCSC_pSwitches->find('k',"keep"),!KVSCSC_pSwitches->find('s',"silent"));
@@ -973,7 +973,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KVSCSC_REQUIRE_CONNECTION
 
-		KviQuery * query;
+		KviQueryWindow * query;
 
 		QStringList sl = szTargets.split(",",QString::SkipEmptyParts);
 		for(QStringList::Iterator it = sl.begin();it != sl.end();it++)
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
index c28fea954..408bdf51f 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
@@ -1,6 +1,6 @@
 // //=============================================================================
 //
-//   File : kvi_kvs_coresimplecommands_sz.cpp
+//   File : KviKvsCoreSimpleCommands_sz.cpp
 //   Creation date : Fri 31 Oct 2003 00:04:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,23 +22,23 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_coresimplecommands.h"
+#include "KviKvsCoreSimpleCommands.h"
 
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsPopupManager.h"
+#include "KviKvsScript.h"
 
-#include "kvi_ircconnection.h"
-#include "kvi_console.h"
+#include "KviIrcConnection.h"
+#include "KviConsoleWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_asynchronousconnectiondata.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviAsynchronousConnectionData.h"
+#include "KviMainWindow.h"
 #include "KviNetUtils.h"
-#include "kvi_menubar.h"
-#include "kvi_userinput.h"
+#include "KviMenuBar.h"
+#include "KviUserInput.h"
 #include "kvi_out.h"
-#include "kvi_channel.h"
-#include "kvi_query.h"
+#include "KviChannelWindow.h"
+#include "KviQueryWindow.h"
 #include <cstdlib>
 
 namespace KviKvsCoreSimpleCommands
@@ -762,12 +762,12 @@ namespace KviKvsCoreSimpleCommands
 				return true;
 		}
 
-		g_pApp->getLocalKvircDirectory(szDir,KviApp::Locale);
+		g_pApp->getLocalKvircDirectory(szDir,KviApplication::Locale);
 
 		if(KviLocale::loadCatalogue(szCatalogue,szDir))
 			return true;
 
-		g_pApp->getGlobalKvircDirectory(szDir,KviApp::Locale);
+		g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Locale);
 
 		if(KviLocale::loadCatalogue(szCatalogue,szDir))
 			return true;
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/KviKvsDnsManager.cpp
index 6debb72eb..3f93619b0 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/KviKvsDnsManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_dnsmanager.cpp
+//   File : KviKvsDnsManager.cpp
 //   Creation date : Wed 04 Aug 2004 04:38:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_dnsmanager.h"
+#include "KviKvsDnsManager.h"
 #include "KviDnsResolver.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
-#include "kvi_iconmanager.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviIconManager.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariantList.h"
 #include "KviCString.h"
 #include "KviLocale.h"
 #include "KviError.h"
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.h b/src/kvirc/kvs/KviKvsDnsManager.h
index 77b57515c..9a54f0a4d 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.h
+++ b/src/kvirc/kvs/KviKvsDnsManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_DNSMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_dnsmanager.h
+//   File : KviKvsDnsManager.h
 //   Creation date : Wed 04 Aug 2004 04:38:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_event.cpp b/src/kvirc/kvs/KviKvsEvent.cpp
index 28591b9b8..5d170ce89 100644
--- a/src/kvirc/kvs/kvi_kvs_event.cpp
+++ b/src/kvirc/kvs/KviKvsEvent.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_event.cpp
+//   File : KviKvsEvent.cpp
 //   Creation date : Mon 23 Feb 2004 03:00:02 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_event.h"
+#include "KviKvsEvent.h"
 
 
 KviKvsEvent::~KviKvsEvent()
diff --git a/src/kvirc/kvs/kvi_kvs_event.h b/src/kvirc/kvs/KviKvsEvent.h
index 4e0851289..1495a4fea 100644
--- a/src/kvirc/kvs/kvi_kvs_event.h
+++ b/src/kvirc/kvs/KviKvsEvent.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_EVENT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_event.h
+//   File : KviKvsEvent.h
 //   Creation date : Mon 23 Feb 2004 03:00:02 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,7 +28,7 @@
 #include "KviQString.h"
 #include "KviPointerList.h"
 
-#include "kvi_kvs_eventhandler.h"
+#include "KviKvsEventHandler.h"
 
 class KVIRC_API KviKvsEvent
 {
diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp b/src/kvirc/kvs/KviKvsEventHandler.cpp
index 013c9ef49..b29f3ba9a 100644
--- a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
+++ b/src/kvirc/kvs/KviKvsEventHandler.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_eventhandler.cpp
+//   File : KviKvsEventHandler.cpp
 //   Creation date : Mon 23 Feb 2004 03:04:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_eventhandler.h"
+#include "KviKvsEventHandler.h"
 
 KviKvsEventHandler::KviKvsEventHandler(Type t)
 : KviHeapObject(), m_type(t)
diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.h b/src/kvirc/kvs/KviKvsEventHandler.h
index 5fbd2d314..148c8bbee 100644
--- a/src/kvirc/kvs/kvi_kvs_eventhandler.h
+++ b/src/kvirc/kvs/KviKvsEventHandler.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_EVENTHANDLER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_eventhandler.h
+//   File : KviKvsEventHandler.h
 //   Creation date : Mon 23 Feb 2004 03:04:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,9 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "KviQString.h"
-#include "kvi_kvs_moduleinterface.h"
+#include "KviKvsModuleInterface.h"
 #include "KviHeapObject.h"
 
 class KVIRC_API KviKvsEventHandler : public KviHeapObject
@@ -85,7 +85,7 @@ public:
 
 
 /*
-#include "kvi_module.h"
+#include "KviModule.h"
 
 class KVIRC_API KviKvsOldModuleEventHandler : public KviKvsEventHandler
 {
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/KviKvsEventManager.cpp
index d6a48520c..024c2d84b 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
+++ b/src/kvirc/kvs/KviKvsEventManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_eventmanager.cpp
+//   File : KviKvsEventManager.cpp
 //   Creation date : Thu Aug 17 2000 13:59:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,16 +22,16 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_eventmanager.h"
+#include "KviKvsEventManager.h"
 #include "KviConfigurationFile.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_options.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariant.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "kvi_module.h"
-#include "kvi_window.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviModule.h"
+#include "KviWindow.h"
+#include "KviKvsVariantList.h"
 
 /*
 	@doc: events
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.h b/src/kvirc/kvs/KviKvsEventManager.h
index 3df63a14f..a601b4a62 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.h
+++ b/src/kvirc/kvs/KviKvsEventManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_EVENTMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_eventmanager.h
+//   File : KviKvsEventManager.h
 //   Creation date : Thu Aug 17 2000 13:59:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_kvs_event.h"
+#include "KviKvsEvent.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_eventtable.h"
+#include "KviKvsEventTable.h"
 
 class KviWindow;
 class KviKvsModuleInterface;
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/KviKvsEventTable.cpp
index 4e7d444d1..0fe3af6af 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/KviKvsEventTable.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_eventtable.cpp
+//   File : KviKvsEventTable.cpp
 //   Creation date : Mon 23 Feb 2004 03:23:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_event.h"
-#include "kvi_kvs_eventtable.h"
-#include "kvi_kvs_eventmanager.h"
+#include "KviKvsEvent.h"
+#include "KviKvsEventTable.h"
+#include "KviKvsEventManager.h"
 
 #define EVENT(_name,_parm) KviKvsEvent(_name,_parm)
 
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.h b/src/kvirc/kvs/KviKvsEventTable.h
index 1ef45ba53..22dbbfd4b 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.h
+++ b/src/kvirc/kvs/KviKvsEventTable.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_EVENTTABLE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_eventtable.h
+//   File : KviKvsEventTable.h
 //   Creation date : Mon 23 Feb 2004 03:23:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_eventtable.h
+* \file KviKvsEventTable.h
 * \author Szymon Stefanek
 * \brief Events table
 */
diff --git a/src/kvirc/kvs/kvi_kvs_eventtriggers.h b/src/kvirc/kvs/KviKvsEventTriggers.h
index 93d23931d..73898c3c2 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtriggers.h
+++ b/src/kvirc/kvs/KviKvsEventTriggers.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_EVENTTRIGGERS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_eventtriggers.h
+//   File : KviKvsEventTriggers.h
 //   Creation date : Thu Oct 22 2005 04:57:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_kvs_eventtable.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviKvsEventTable.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsVariantList.h"
 
 //
 // KVS Macros for triggering events
diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/KviKvsHash.cpp
index 6ad87fe49..329ea1683 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.cpp
+++ b/src/kvirc/kvs/KviKvsHash.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_hash.cpp
+//   File : KviKvsHash.cpp
 //   Creation date : Tue 07 Oct 2003 01:22:37 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_hash.h"
+#include "KviKvsHash.h"
 
 KviKvsHash::KviKvsHash()
 {
diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/KviKvsHash.h
index acf259089..fdedccb7f 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.h
+++ b/src/kvirc/kvs/KviKvsHash.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_HASH_H_
 //=============================================================================
 //
-//   File : kvi_kvs_hash.h
+//   File : KviKvsHash.h
 //   Creation date : Tue 07 Oct 2003 01:22:37 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_hash.h
+* \file KviKvsHash.h
 * \author Szymon Stefanek
 * \brief Handling of hash data type in KVS
 */
@@ -33,7 +33,7 @@
 #include "kvi_settings.h"
 #include "KviPointerHashTable.h"
 #include "KviQString.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 #include "KviHeapObject.h"
 
 typedef KVIRC_API_TYPEDEF KviPointerHashTableIterator<QString,KviKvsVariant> KviKvsHashIterator;
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/KviKvsKernel.cpp
index 18fac28e8..69b16db4d 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/KviKvsKernel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_kernel.cpp
+//   File : KviKvsKernel.cpp
 //   Creation date : Tue 30 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,19 +22,19 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_aliasmanager.h"
-#include "kvi_kvs_coresimplecommands.h"
-#include "kvi_kvs_corefunctions.h"
-#include "kvi_kvs_corecallbackcommands.h"
-#include "kvi_kvs_switchlist.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_asyncoperation.h"
-#include "kvi_modulemanager.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParser.h"
+#include "KviKvsHash.h"
+#include "KviKvsAliasManager.h"
+#include "KviKvsCoreSimpleCommands.h"
+#include "KviKvsCoreFunctions.h"
+#include "KviKvsCoreCallbackCommands.h"
+#include "KviKvsSwitchList.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsScript.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsAsyncOperation.h"
+#include "KviModuleManager.h"
 
 #include <QDir>
 KviKvsKernel * KviKvsKernel::m_pKvsKernel = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/KviKvsKernel.h
index d84bdd2ee..ffcfd705e 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.h
+++ b/src/kvirc/kvs/KviKvsKernel.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_KERNEL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_kernel.h
+//   File : KviKvsKernel.h
 //   Creation date : Tue 30 Sep 2003 13.46 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_kvs_parser.h"
+#include "KviKvsParser.h"
 #include "KviPointerList.h"
 #include "KviQString.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/KviKvsModuleInterface.cpp
index a554835c0..3cb9e0cd5 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
+++ b/src/kvirc/kvs/KviKvsModuleInterface.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_moduleinterface.cpp
+//   File : KviKvsModuleInterface.cpp
 //   Creation date : Tue 16 Dec 2003 00:27:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_moduleinterface.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_module.h"
-#include "kvi_modulemanager.h"
+#include "KviKvsModuleInterface.h"
+#include "KviKvsEventManager.h"
+#include "KviModule.h"
+#include "KviModuleManager.h"
 #include "KviLocale.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsTreeNodeDataList.h"
 
 bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QString &szParamBuffer)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/KviKvsModuleInterface.h
index c0f799429..109fc5e29 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h
+++ b/src/kvirc/kvs/KviKvsModuleInterface.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_MODULEINTERFACE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_moduleinterface.h
+//   File : KviKvsModuleInterface.h
 //   Creation date : Tue 16 Dec 2003 00:27:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -29,10 +29,10 @@
 
 #include "KviPointerHashTable.h"
 
-#include "kvi_kvs_runtimecall.h"
-#include "kvi_kvs_parameterprocessor.h"
-#include "kvi_kvs_switchlist.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsRunTimeCall.h"
+#include "KviKvsParameterProcessor.h"
+#include "KviKvsSwitchList.h"
+#include "KviKvsScript.h"
 #include "KviPointerList.h"
 #include "KviQString.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/KviKvsObject.cpp
index 356919a49..857e2d139 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/KviKvsObject.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_object.cpp
+//   File : KviKvsObject.cpp
 //   Creation date : Wed 08 Oct 2003 02:31:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,24 +22,24 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
+#include "KviKvsObject.h"
+#include "KviKvsHash.h"
+#include "KviKvsKernel.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
 
-#include "kvi_modulemanager.h"
-#include "kvi_console.h"
+#include "KviModuleManager.h"
+#include "KviConsoleWindow.h"
 #include "KviLocale.h"
 #include "KviError.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviMemory.h"
 
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_object_functioncall.h"
-#include "kvi_kvs_object_functionhandlerimpl.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsObjectFunctionCall.h"
+#include "KviKvsObjectFunctionHandlerImpl.h"
 
 #include <QMetaObject>
 #include <QMetaProperty>
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/KviKvsObject.h
index 82c1917ea..60bc44433 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/KviKvsObject.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_OBJECT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_object.h
+//   File : KviKvsObject.h
 //   Creation date : Wed 08 Oct 2003 02:31:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,10 +27,10 @@
 #include "kvi_settings.h"
 #include "KviQString.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_runtimecall.h"
-#include "kvi_kvs_parameterprocessor.h"
-#include "kvi_kvs_object_functionhandler.h"
-#include "kvi_kvs_types.h"
+#include "KviKvsRunTimeCall.h"
+#include "KviKvsParameterProcessor.h"
+#include "KviKvsObjectFunctionHandler.h"
+#include "KviKvsTypes.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/KviKvsObjectClass.cpp
index ff189ac2b..1240910a6 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.cpp
+++ b/src/kvirc/kvs/KviKvsObjectClass.cpp
@@ -22,17 +22,17 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_object_class.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object_functionhandlerimpl.h"
-#include "kvi_kvs_object_functioncall.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsObjectClass.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsObject.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObjectFunctionHandlerImpl.h"
+#include "KviKvsObjectFunctionCall.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsScript.h"
 #include "KviFileUtils.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCommandFormatter.h"
 #include "KviLocale.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/KviKvsObjectClass.h
index 1a03cd864..0845c1cb6 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.h
+++ b/src/kvirc/kvs/KviKvsObjectClass.h
@@ -30,7 +30,7 @@
 
 #include "KviPointerHashTable.h"
 
-#include "kvi_kvs_object_functionhandler.h"
+#include "KviKvsObjectFunctionHandler.h"
 
 class KviKvsObject;
 class KviKvsObjectClass;
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/KviKvsObjectController.cpp
index 5c10d9f87..4d9105021 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/KviKvsObjectController.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_object_controller.cpp
+//   File : KviKvsObjectController.cpp
 //   Creation date : Sun 24 Apr 2005 05:23:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_object_controller.h"
-#include "kvi_modulemanager.h"
+#include "KviKvsObjectController.h"
+#include "KviModuleManager.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 #include <QPointer>
 
@@ -191,7 +191,7 @@ void KviKvsObjectController::flushUserClasses()
 				QString szFileName = c->name().toLower();
 				szFileName += ".kvs";
 				szFileName.replace("::","--");
-				g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
+				g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes,szFileName);
 				if(c->save(szPath))
 					c->clearDirtyFlag();
 				else
@@ -222,9 +222,9 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b
 			QString szFileName = szClass.toLower();
 			szFileName += ".kvs";
 			szFileName.replace("::","--");
-			g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
+			g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes,szFileName);
 			if(!KviFileUtils::fileExists(szPath))
-				g_pApp->getGlobalKvircDirectory(szPath,KviApp::Classes,szFileName);
+				g_pApp->getGlobalKvircDirectory(szPath,KviApplication::Classes,szFileName);
 			if(!KviFileUtils::fileExists(szPath))return 0;
 			if(!KviKvsObjectClass::load(szPath))return 0;
 			pC = m_pClassDict->find(szClass);
@@ -250,7 +250,7 @@ void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass)
 	QString szFileName = pClass->name().toLower();
 	szFileName += ".kvs";
 	szFileName.replace("::","--");
-	g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
+	g_pApp->getLocalKvircDirectory(szPath,KviApplication::Classes,szFileName);
 	KviFileUtils::removeFile(szPath);
 
 	delete pClass;
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/KviKvsObjectController.h
index 73a44bff5..9e4b5b790 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.h
+++ b/src/kvirc/kvs/KviKvsObjectController.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_OBJECT_CONTROLLER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_object_controller.h
+//   File : KviKvsObjectController.h
 //   Creation date : Sun 24 Apr 2005 05:23:04 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -33,8 +33,8 @@
 #include "KviPointerHashTable.h"
 #include "KviPointerHashTable.h"
 
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_object_class.h"
+#include "KviKvsObject.h"
+#include "KviKvsObjectClass.h"
 
 class KVIRC_API KviKvsObjectController
 {
diff --git a/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp b/src/kvirc/kvs/KviKvsObjectFunctionCall.cpp
index 6efb81257..c873ab645 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
+++ b/src/kvirc/kvs/KviKvsObjectFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_object_functioncall.cpp
+//   File : KviKvsObjectFunctionCall.cpp
 //   Creation date : Sun 24 Apr 2005 04:05:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,5 +22,5 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_object_functioncall.h"
+#include "KviKvsObjectFunctionCall.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_functioncall.h b/src/kvirc/kvs/KviKvsObjectFunctionCall.h
index 48ad38fbf..86cb2a3f5 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functioncall.h
+++ b/src/kvirc/kvs/KviKvsObjectFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_OBJECT_FUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_object_functioncall.h
+//   File : KviKvsObjectFunctionCall.h
 //   Creation date : Sun 24 Apr 2005 04:05:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_kvs_runtimecall.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsRunTimeCall.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsVariant.h"
 
 
 class KVIRC_API KviKvsObjectFunctionCall : public KviKvsRunTimeCall
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp b/src/kvirc/kvs/KviKvsObjectFunctionHandler.cpp
index 97e247b75..032f7aa73 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
+++ b/src/kvirc/kvs/KviKvsObjectFunctionHandler.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_object_functionhandler.cpp
+//   File : KviKvsObjectFunctionHandler.cpp
 //   Creation date : Sat 23 Apr 2005 21:53:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_kvs_object_functionhandler.h"
+#include "KviKvsObjectFunctionHandler.h"
 
 KviKvsObjectFunctionHandler::KviKvsObjectFunctionHandler(unsigned int uFlags)
 : m_uFlags(uFlags)
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h b/src/kvirc/kvs/KviKvsObjectFunctionHandler.h
index fb2405995..05a23173c 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h
+++ b/src/kvirc/kvs/KviKvsObjectFunctionHandler.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_OBJECT_FUNCTIONHANDLER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_object_functionhandler.h
+//   File : KviKvsObjectFunctionHandler.h
 //   Creation date : Sat 23 Apr 2005 21:53:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp b/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.cpp
index 75c696d07..e885cf843 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
+++ b/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_object_functionhandlerimpl.cpp
+//   File : KviKvsObjectFunctionHandlerImpl.cpp
 //   Creation date : Sun 24 Apr 2005 04:01:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_object_functionhandlerimpl.h"
-#include "kvi_kvs_object_functioncall.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsObjectFunctionHandlerImpl.h"
+#include "KviKvsObjectFunctionCall.h"
+#include "KviKvsScript.h"
 
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h b/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.h
index f748179ff..fb4d824ff 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h
+++ b/src/kvirc/kvs/KviKvsObjectFunctionHandlerImpl.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_OBJECT_FUNCTIONHANDLERIMPL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_object_functionhandlerimpl.h
+//   File : KviKvsObjectFunctionHandlerImpl.h
 //   Creation date : Sun 24 Apr 2005 04:01:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 
 #include "kvi_settings.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_object_class.h"
-#include "kvi_kvs_object_functionhandler.h"
+#include "KviKvsObject.h"
+#include "KviKvsObjectClass.h"
+#include "KviKvsObjectFunctionHandler.h"
 #include "KviQString.h"
 
 class KviKvsObjectClass;
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/KviKvsParameterProcessor.cpp
index 383c207d3..426149a1d 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
+++ b/src/kvirc/kvs/KviKvsParameterProcessor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parameterprocessor.cpp
+//   File : KviKvsParameterProcessor.cpp
 //   Creation date : Sun 17 Apr 2005 16:47:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parameterprocessor.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_array.h"
-#include "kvi_kvs_arraycast.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsParameterProcessor.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsArray.h"
+#include "KviKvsArrayCast.h"
+#include "KviKvsHash.h"
+#include "KviKvsObject.h"
 #include "KviQString.h"
 #include "KviLocale.h"
 #include "KviPointerList.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/KviKvsParameterProcessor.h
index 4ed50f354..9b297fe00 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h
+++ b/src/kvirc/kvs/KviKvsParameterProcessor.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_PARAMETERPROCESSOR_H_
 //=============================================================================
 //
-//   File : kvi_kvs_parameterprocessor.h
+//   File : KviKvsParameterProcessor.h
 //   Creation date : Sun 17 Apr 2005 16:47:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_types.h"
+#include "KviKvsTypes.h"
 
 class KviKvsHash;
 class KviKvsArray;
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/KviKvsParser.cpp
index d3a3886ec..30a0777b5 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/KviKvsParser.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser.cpp
+//   File : KviKvsParser.cpp
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_parser_macros.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsScript.h"
+#include "KviKvsParserMacros.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 //FIXME: @ == $$-> == $this->
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/KviKvsParser.h
index 16b2be67e..aa21b5cb0 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.h
+++ b/src/kvirc/kvs/KviKvsParser.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_PARSER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_parser.h
+//   File : KviKvsParser.h
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -84,7 +84,7 @@ private: // parsing helpers
 	void skipToNextLine(); // skips up to a new line
 	// dedicated
 	void skipToEndOfCStyleComment();
-	// dedicated to parseSpecialCommandFor() : in kvi_kvs_parser_specialcommands.cpp
+	// dedicated to parseSpecialCommandFor() : in KviKvsParser_specialCommands.cpp
 	bool skipToEndOfForControlBlock();
 	// error handlers
 	void error(const QChar * pLocation,const QString &szMsgFmt,...);
@@ -171,7 +171,7 @@ private:
 	KviKvsTreeNodeConstantData               * parseHashKeyLiteralParameter();
 
 	//
-	// kvi_kvs_parser_specialcommands.cpp
+	// KviKvsParser_specialCommands.cpp
 	//
 
 	// return 0 only in case of error
@@ -231,7 +231,7 @@ private:
 	KviKvsTreeNodeCommand                    * parseSpecialCommandHelp();
 
 	//
-	// kvi_kvs_parser_command.cpp
+	// KviKvsParser_command.cpp
 	//
 
 	// may return 0 (empty command), check error() for error conditions
@@ -241,7 +241,7 @@ private:
 
 
 	//
-	// kvi_kvs_parser_comment.cpp
+	// KviKvsParser_comment.cpp
 	//
 
 	// always returns 0, and it CAN be an error!
@@ -251,7 +251,7 @@ private:
 
 
 	//
-	// kvi_kvs_parser_dollar.cpp
+	// KviKvsParser_dollar.cpp
 	//
 
 	// returns 0 only in case of error
@@ -265,7 +265,7 @@ private:
 	KviKvsTreeNodeData                       * parseAt(bool bInObjScope = false);
 
 	//
-	// kvi_kvs_parser_lside.cpp
+	// KviKvsParser_lside.cpp
 	//
 
 	// returns 0 only in case of error
@@ -285,7 +285,7 @@ private:
 	KviKvsTreeNodeData                       * parseBindingOperationParameter();
 
 	//
-	// kvi_kvs_parser_expression.cpp
+	// KviKvsParser_expression.cpp
 	//
 
 	// returns 0 only in case of error
diff --git a/src/kvirc/kvs/kvi_kvs_parser_macros.h b/src/kvirc/kvs/KviKvsParserMacros.h
index 1e04c37e1..c9129fb61 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_macros.h
+++ b/src/kvirc/kvs/KviKvsParserMacros.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_PARSER_MACROS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_parser_macros.h
+//   File : KviKvsParserMacros.h
 //   Creation date : Sun 5 Ocr 2003 20.25 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/KviKvsParser_command.cpp
index dd1d2bcd2..284f2cc06 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp
+++ b/src/kvirc/kvs/KviKvsParser_command.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser_command.cpp
+//   File : KviKvsParser_command.cpp
 //   Creation date : Thu 03 Nov 2003 13.23 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser_macros.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParserMacros.h"
 #include "KviLocale.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "KviCommandFormatter.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/KviKvsParser_comment.cpp
index e9956fada..5f5b8df93 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
+++ b/src/kvirc/kvs/KviKvsParser_comment.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser_comment.cpp
+//   File : KviKvsParser_comment.cpp
 //   Creation date : Thu 03 Nov 2003 13.23 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser_macros.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParserMacros.h"
 #include "KviLocale.h"
 
 KviKvsTreeNode * KviKvsParser::parseComment()
diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/KviKvsParser_dollar.cpp
index 2d7420a42..e77e09fe3 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
+++ b/src/kvirc/kvs/KviKvsParser_dollar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser_dollar.cpp
+//   File : KviKvsParser_dollar.cpp
 //   Creation date : Thu 5 Oct 2003 20.20 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser_macros.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParserMacros.h"
 #include "KviLocale.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/KviKvsParser_expression.cpp
index 6a5ab6c03..f535b150c 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
+++ b/src/kvirc/kvs/KviKvsParser_expression.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser_expression.cpp
+//   File : KviKvsParser_expression.cpp
 //   Creation date : Mon 6 Oct 2003 01.31 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser_macros.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParserMacros.h"
 #include "KviLocale.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/KviKvsParser_lside.cpp
index a4674bb51..fb161f0de 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/KviKvsParser_lside.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser_lside.cpp
+//   File : KviKvsParser_lside.cpp
 //   Creation date : Thu 03 Nov 2003 13.11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser_macros.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParserMacros.h"
 #include "KviLocale.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/KviKvsParser_specialCommands.cpp
index 2d07f97c7..3265912a5 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/KviKvsParser_specialCommands.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_parser_specialcommands.cpp
+//   File : KviKvsParser_specialCommands.cpp
 //   Creation date : Thu 06 Now 2003 14.14 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_parser_macros.h"
-#include "kvi_kvs_object_functionhandler.h"
+#include "KviKvsParser.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsReport.h"
+#include "KviKvsKernel.h"
+#include "KviKvsParserMacros.h"
+#include "KviKvsObjectFunctionHandler.h"
 #include "KviLocale.h"
 #include "KviCommandFormatter.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp b/src/kvirc/kvs/KviKvsPopupManager.cpp
index 3b63bebae..6c5e550a0 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
+++ b/src/kvirc/kvs/KviKvsPopupManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_popupmanager.cpp
+//   File : KviKvsPopupManager.cpp
 //   Creation date : Tue 7 Jan 2004 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_popupmanager.h"
+#include "KviKvsPopupManager.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/KviKvsPopupManager.h
index e2d55eefd..2f17e78d8 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.h
+++ b/src/kvirc/kvs/KviKvsPopupManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_POPUPMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_popupmanager.h
+//   File : KviKvsPopupManager.h
 //   Creation date : Tue 7 Jan 2004 02:11:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_popupmenu.h"
+#include "KviKvsPopupMenu.h"
 
 class KVIRC_API KviKvsPopupManager : public QObject
 {
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index 080174412..ced03c86d 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_popupmenu.cpp
+//   File : KviKvsPopupMenu.cpp
 //   Creation date : Wed 07 Jan 2004 05:02:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,16 +22,16 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_popupmenu.h"
+#include "KviKvsPopupMenu.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "kvi_out.h"
-#include "kvi_app.h"
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_console.h"
+#include "KviApplication.h"
+#include "KviKvsPopupManager.h"
+#include "KviConsoleWindow.h"
 #include "KviConfigurationFile.h"
 #include "KviCommandFormatter.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 // popup names
 
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/KviKvsPopupMenu.h
index ed0e89d74..0bd00c5e0 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.h
+++ b/src/kvirc/kvs/KviKvsPopupMenu.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_POPUPMENU_H_
 //=============================================================================
 //
-//   File : kvi_kvs_popupmenu.h
+//   File : KviKvsPopupMenu.h
 //   Creation date : Wed 07 Jan 2004 05:02:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,11 +26,11 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_window.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviWindow.h"
+#include "KviKvsHash.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsScript.h"
+#include "KviKvsRunTimeContext.h"
 
 #include "KviTalPopupMenu.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/KviKvsProcessManager.cpp
index 6e1282cba..23900381c 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/KviKvsProcessManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_processmanager.cpp
+//   File : KviKvsProcessManager.cpp
 //   Creation date : Wed 07 Apr 2004 03:03:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_processmanager.h"
-#include "kvi_window.h"
+#include "KviKvsProcessManager.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
 #include "KviParameterList.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
-#include "kvi_kvs_script.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
+#include "KviKvsScript.h"
 //#include <QSysInfo>
 
 KviKvsProcessAsyncOperation::KviKvsProcessAsyncOperation(KviKvsProcessDescriptorData * d)
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/KviKvsProcessManager.h
index ad279eca8..3b2b380a1 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.h
+++ b/src/kvirc/kvs/KviKvsProcessManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_PROCESSMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_processmanager.h
+//   File : KviKvsProcessManager.h
 //   Creation date : Wed 07 Apr 2004 03:03:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,12 +25,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_asyncoperation.h"
+#include "KviKvsAsyncOperation.h"
 #include "KviQString.h"
-#include "kvi_window.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variant.h"
+#include "KviWindow.h"
+#include "KviKvsVariant.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariant.h"
 
 #include "KviPointerHashTable.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
index bb305f285..995060bf8 100644
--- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
+++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_rwevaluationresult.cpp
+//   File : KviKvsRWEvaluationResult.cpp
 //   Creation date : Thu 11 Dec 2003 22:51:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_kvs_rwevaluationresult.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_array.h"
+#include "KviKvsRWEvaluationResult.h"
+#include "KviKvsHash.h"
+#include "KviKvsArray.h"
 
 KviKvsRWEvaluationResult::KviKvsRWEvaluationResult(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h b/src/kvirc/kvs/KviKvsRWEvaluationResult.h
index 898c6a51c..71c882ab3 100644
--- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
+++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_RWEVALUATIONRESULT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_rwevaluationresult.h
+//   File : KviKvsRWEvaluationResult.h
 //   Creation date : Thu 11 Dec 2003 22:51:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 
 class KVIRC_API KviKvsRWEvaluationResult
 {
diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/KviKvsReport.cpp
index 66c8b1e4e..9476ddcd6 100644
--- a/src/kvirc/kvs/kvi_kvs_report.cpp
+++ b/src/kvirc/kvs/KviKvsReport.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_report.cpp
+//   File : KviKvsReport.cpp
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_report.h"
+#include "KviKvsReport.h"
 #include "KviMircCntrl.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_debugwindow.h"
-#include "kvi_options.h"
+#include "KviDebugWindow.h"
+#include "KviOptions.h"
 
 KviKvsReport::KviKvsReport(Type t,const QString &szContext,const QString &szMessage,const QString &szLocation,KviWindow * pWindow)
 : m_eType(t), m_szContext(szContext), m_szMessage(szMessage), m_szLocation(szLocation), m_pWindow(pWindow)
diff --git a/src/kvirc/kvs/kvi_kvs_report.h b/src/kvirc/kvs/KviKvsReport.h
index 42b394e09..940c63fd2 100644
--- a/src/kvirc/kvs/kvi_kvs_report.h
+++ b/src/kvirc/kvs/KviKvsReport.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_REPORT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_report.h
+//   File : KviKvsReport.h
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp b/src/kvirc/kvs/KviKvsRunTimeCall.cpp
index afecfc4b6..6ab929bf5 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
+++ b/src/kvirc/kvs/KviKvsRunTimeCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_runtimecall.cpp
+//   File : KviKvsRunTimeCall.cpp
 //   Creation date : Sat 23 Apr 2005 18:19:38 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_runtimecall.h"
+#include "KviKvsRunTimeCall.h"
 
 
 void KviKvsRunTimeCall::warning(const QString &szFmt,...)
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.h b/src/kvirc/kvs/KviKvsRunTimeCall.h
index b409b1c87..a0e4909f7 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecall.h
+++ b/src/kvirc/kvs/KviKvsRunTimeCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_RUNTIMECALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_runtimecall.h
+//   File : KviKvsRunTimeCall.h
 //   Creation date : Sat 23 Apr 2005 18:19:38 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,10 +25,10 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_window.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsVariant.h"
+#include "KviWindow.h"
 
 
 class KVIRC_API KviKvsRunTimeCall
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
index aba379e92..4d41e5d3d 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_runtimecontext.cpp
+//   File : KviKvsRunTimeContext.cpp
 //   Creation date : Tue 07 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_report.h"
-#include "kvi_console.h"
-#include "kvi_kvs_treenode_base.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsScript.h"
+#include "KviKvsKernel.h"
+#include "KviKvsReport.h"
+#include "KviConsoleWindow.h"
+#include "KviKvsTreeNodeBase.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_kvs_object.h"
+#include "KviApplication.h"
+#include "KviKvsObject.h"
 
 KviKvsExtendedRunTimeData::~KviKvsExtendedRunTimeData()
 {
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/KviKvsRunTimeContext.h
index 899639cff..c255d6273 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_RUNTIMECONTEXT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_runtimecontext.h
+//   File : KviKvsRunTimeContext.h
 //   Creation date : Tue 07 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,12 +25,12 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_switchlist.h"
+#include "KviKvsVariant.h"
+#include "KviKvsHash.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsSwitchList.h"
 
 class KviKvsScript;
 class KviConsole;
diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/KviKvsScript.cpp
index 50e5d45e0..83ac6dd90 100644
--- a/src/kvirc/kvs/kvi_kvs_script.cpp
+++ b/src/kvirc/kvs/KviKvsScript.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_script.cpp
+//   File : KviKvsScript.cpp
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,19 +22,19 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_parser.h"
-#include "kvi_kvs_report.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_kernel.h"
+#include "KviKvsScript.h"
+#include "KviKvsParser.h"
+#include "KviKvsReport.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsKernel.h"
 
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
 
 //#warning "THERE IS SOME MESS WITH m_szBuffer and m_pBuffer : with some script copying we may get errors with negative char indexes!"
 
diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/KviKvsScript.h
index 59a5b41be..103a44c52 100644
--- a/src/kvirc/kvs/kvi_kvs_script.h
+++ b/src/kvirc/kvs/KviKvsScript.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_SCRIPT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_script.h
+//   File : KviKvsScript.h
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,17 +25,17 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_script.h
+* \file KviKvsScript.h
 * \author Szymon Stefanek
 * \brief KVIrc Script manager
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviKvsVariant.h"
+#include "KviKvsVariantList.h"
 #include "KviHeapObject.h"
 
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
index 4a21fa848..ffafbb4b9 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
+++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_scriptaddonmanager.cpp
+//   File : KviKvsScriptAddonManager.cpp
 //   Creation date : Thu 31 Mar 2005 01:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_scriptaddonmanager.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScriptAddonManager.h"
+#include "KviKvsScript.h"
 #include "KviConfigurationFile.h"
-#include "kvi_window.h"
-#include "kvi_iconmanager.h"
+#include "KviWindow.h"
+#include "KviIconManager.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 
 #include <QFileInfo>
 
@@ -317,7 +317,7 @@ void KviKvsScriptAddonManager::delayedLoad()
 	if(m_bLoaded)return; // already loaded
 	m_bLoaded = true;
 	// ::load() might be never called if we don't have
-	// a scriptaddons.kvc file on disk, KviApp checks that.
+	// a scriptaddons.kvc file on disk, KviApplication checks that.
 	// So finally m_szFileName may be empty here
 	if(m_szFileName.isEmpty())return;
 
@@ -388,7 +388,7 @@ bool KviKvsScriptAddonManager::unregisterAddon(const QString &szName,KviWindow *
 		foreach(QString szFileName,lFiles)
 		{
 			QString szPath;
-			g_pApp->getLocalKvircDirectory(szPath,KviApp::None,szFileName);
+			g_pApp->getLocalKvircDirectory(szPath,KviApplication::None,szFileName);
 	
 			//qDebug("Uninstalling %s",szPath.toUtf8().data());
 	
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h b/src/kvirc/kvs/KviKvsScriptAddonManager.h
index a872f742a..2022bc094 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h
+++ b/src/kvirc/kvs/KviKvsScriptAddonManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_SCRIPTADDONMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_scriptaddonmanager.h
+//   File : KviKvsScriptAddonManager.h
 //   Creation date : Thu 31 Mar 2005 01:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/KviKvsSwitchList.cpp
index 72ce1e199..49b40d2a2 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp
+++ b/src/kvirc/kvs/KviKvsSwitchList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_switchlist.cpp
+//   File : KviKvsSwitchList.cpp
 //   Creation date : Mon 27 Oct 2003 03:47:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_kvs_switchlist.h"
+#include "KviKvsSwitchList.h"
 
 KviKvsSwitchList::KviKvsSwitchList()
 {
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/KviKvsSwitchList.h
index 4f2d1bebb..caa155075 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.h
+++ b/src/kvirc/kvs/KviKvsSwitchList.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_SWITCHLIST_H_
 //=============================================================================
 //
-//   File : kvi_kvs_switchlist.h
+//   File : KviKvsSwitchList.h
 //   Creation date : Mon 27 Oct 2003 03:47:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 
 #include "KviPointerHashTable.h"
 #include "KviPointerHashTable.h"
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/KviKvsTimerManager.cpp
index b4b5bb804..7de626044 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp
+++ b/src/kvirc/kvs/KviKvsTimerManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_timermanager.cpp
+//   File : KviKvsTimerManager.cpp
 //   Creation date : Fri 19 Dec 2003 01:29:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,16 +22,16 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_timermanager.h"
+#include "KviKvsTimerManager.h"
 
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsRunTimeContext.h"
 
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_console.h"
-#include "kvi_options.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/KviKvsTimerManager.h
index e64ee6b25..268e9f9e2 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.h
+++ b/src/kvirc/kvs/KviKvsTimerManager.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TIMERMANAGER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_timermanager.h
+//   File : KviKvsTimerManager.h
 //   Creation date : Fri 19 Dec 2003 01:29:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_treenode.h b/src/kvirc/kvs/KviKvsTreeNode.h
index 38498406d..04d83a871 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode.h
+++ b/src/kvirc/kvs/KviKvsTreeNode.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode.h
+//   File : KviKvsTreeNode.h
 //   Creation date : Thu 25 Sep 2003 05.12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,67 +24,67 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_base.h"
+#include "KviKvsTreeNodeBase.h"
 
-#include "kvi_kvs_treenode_aliasfunctioncall.h"
-#include "kvi_kvs_treenode_aliassimplecommand.h"
-#include "kvi_kvs_treenode_arraycount.h"
-#include "kvi_kvs_treenode_arrayelement.h"
-#include "kvi_kvs_treenode_arrayorhashelement.h"
-#include "kvi_kvs_treenode_arrayreferenceassert.h"
-#include "kvi_kvs_treenode_baseobjectfunctioncall.h"
-#include "kvi_kvs_treenode_callbackcommand.h"
-#include "kvi_kvs_treenode_command.h"
-#include "kvi_kvs_treenode_commandevaluation.h"
-#include "kvi_kvs_treenode_commandwithparameters.h"
-#include "kvi_kvs_treenode_compositedata.h"
-#include "kvi_kvs_treenode_constantdata.h"
-#include "kvi_kvs_treenode_corecallbackcommand.h"
-#include "kvi_kvs_treenode_corefunctioncall.h"
-#include "kvi_kvs_treenode_coresimplecommand.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_expressionreturn.h"
-#include "kvi_kvs_treenode_extendedscopevariable.h"
-#include "kvi_kvs_treenode_functioncall.h"
-#include "kvi_kvs_treenode_globalvariable.h"
-#include "kvi_kvs_treenode_hashcount.h"
-#include "kvi_kvs_treenode_hashelement.h"
-#include "kvi_kvs_treenode_hashreferenceassert.h"
-#include "kvi_kvs_treenode_indirectdata.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_treenode_instructionblock.h"
-#include "kvi_kvs_treenode_localvariable.h"
-#include "kvi_kvs_treenode_modulecallbackcommand.h"
-#include "kvi_kvs_treenode_modulefunctioncall.h"
-#include "kvi_kvs_treenode_modulesimplecommand.h"
-#include "kvi_kvs_treenode_multipleparameteridentifier.h"
-#include "kvi_kvs_treenode_objectfield.h"
-#include "kvi_kvs_treenode_objectfunctioncall.h"
-#include "kvi_kvs_treenode_operation.h"
-#include "kvi_kvs_treenode_parameterreturn.h"
-#include "kvi_kvs_treenode_rebindingswitch.h"
-#include "kvi_kvs_treenode_scopeoperator.h"
-#include "kvi_kvs_treenode_simplecommand.h"
-#include "kvi_kvs_treenode_singleparameteridentifier.h"
-#include "kvi_kvs_treenode_specialcommand.h"
-#include "kvi_kvs_treenode_specialcommandbreak.h"
-#include "kvi_kvs_treenode_specialcommandclass.h"
-#include "kvi_kvs_treenode_specialcommandcontinue.h"
-#include "kvi_kvs_treenode_specialcommanddefpopup.h"
-#include "kvi_kvs_treenode_specialcommanddo.h"
-#include "kvi_kvs_treenode_specialcommandfor.h"
-#include "kvi_kvs_treenode_specialcommandforeach.h"
-#include "kvi_kvs_treenode_specialcommandif.h"
-#include "kvi_kvs_treenode_specialcommandswitch.h"
-#include "kvi_kvs_treenode_specialcommandunset.h"
-#include "kvi_kvs_treenode_specialcommandwhile.h"
-#include "kvi_kvs_treenode_stringcast.h"
-#include "kvi_kvs_treenode_switchlist.h"
-#include "kvi_kvs_treenode_thisobjectfunctioncall.h"
-#include "kvi_kvs_treenode_variable.h"
-#include "kvi_kvs_treenode_voidfunctioncall.h"
+#include "KviKvsTreeNodeAliasFunctionCall.h"
+#include "KviKvsTreeNodeAliasSimpleCommand.h"
+#include "KviKvsTreeNodeArrayCount.h"
+#include "KviKvsTreeNodeArrayElement.h"
+#include "KviKvsTreeNodeArrayOrHashElement.h"
+#include "KviKvsTreeNodeArrayReferenceAssert.h"
+#include "KviKvsTreeNodeBaseObjectFunctionCall.h"
+#include "KviKvsTreeNodeCallbackCommand.h"
+#include "KviKvsTreeNodeCommand.h"
+#include "KviKvsTreeNodeCommandEvaluation.h"
+#include "KviKvsTreeNodeCommandWithParameters.h"
+#include "KviKvsTreeNodeCompositeData.h"
+#include "KviKvsTreeNodeConstantData.h"
+#include "KviKvsTreeNodeCoreCallbackCommand.h"
+#include "KviKvsTreeNodeCoreFunctionCall.h"
+#include "KviKvsTreeNodeCoreSimpleCommand.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeExpressionReturn.h"
+#include "KviKvsTreeNodeExtendedScopeVariable.h"
+#include "KviKvsTreeNodeFunctionCall.h"
+#include "KviKvsTreeNodeGlobalVariable.h"
+#include "KviKvsTreeNodeHashCount.h"
+#include "KviKvsTreeNodeHashElement.h"
+#include "KviKvsTreeNodeHashReferenceAssert.h"
+#include "KviKvsTreeNodeIndirectData.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsTreeNodeInstructionBlock.h"
+#include "KviKvsTreeNodeLocalVariable.h"
+#include "KviKvsTreeNodeModuleCallbackCommand.h"
+#include "KviKvsTreeNodeModuleFunctionCall.h"
+#include "KviKvsTreeNodeModuleSimpleCommand.h"
+#include "KviKvsTreeNodeMultipleParameterIdentifier.h"
+#include "KviKvsTreeNodeObjectField.h"
+#include "KviKvsTreeNodeObjectFunctionCall.h"
+#include "KviKvsTreeNodeOperation.h"
+#include "KviKvsTreeNodeParameterReturn.h"
+#include "KviKvsTreeNodeRebindingSwitch.h"
+#include "KviKvsTreeNodeScopeOperator.h"
+#include "KviKvsTreeNodeSimpleCommand.h"
+#include "KviKvsTreeNodeSingleParameterIdentifier.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
+#include "KviKvsTreeNodeSpecialCommandBreak.h"
+#include "KviKvsTreeNodeSpecialCommandClass.h"
+#include "KviKvsTreeNodeSpecialCommandContinue.h"
+#include "KviKvsTreeNodeSpecialCommandDefpopup.h"
+#include "KviKvsTreeNodeSpecialCommandDo.h"
+#include "KviKvsTreeNodeSpecialCommandFor.h"
+#include "KviKvsTreeNodeSpecialCommandForeach.h"
+#include "KviKvsTreeNodeSpecialCommandIf.h"
+#include "KviKvsTreeNodeSpecialCommandSwitch.h"
+#include "KviKvsTreeNodeSpecialCommandUnset.h"
+#include "KviKvsTreeNodeSpecialCommandWhile.h"
+#include "KviKvsTreeNodeStringCase.h"
+#include "KviKvsTreeNodeSwitchList.h"
+#include "KviKvsTreeNodeThisObjectFunctionCall.h"
+#include "KviKvsTreeNodeVariable.h"
+#include "KviKvsTreeNodeVoidFunctionCall.h"
 
 //
 // Hierarchy (the nodes that have some missing implementation have the leading '?' char)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.cpp
index 9af875aef..0471b3a44 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_aliasfunctioncall.cpp
+//   File : KviKvsTreeNodeAliasFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_aliasfunctioncall.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_aliasmanager.h"
+#include "KviKvsTreeNodeAliasFunctionCall.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsAliasManager.h"
 #include "KviLocale.h"
 #include "KviQString.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.h
index 105ec5701..e2024aa6d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeAliasFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_ALIASFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_aliasfunctioncall.h
+//   File : KviKvsTreeNodeAliasFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:21:23 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,15 +25,15 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode_aliasfunctioncall.h
+* \file KviKvsTreeNodeAliasFunctionCall.h
 * \author Szymon Stefanek
 * \brief Treenode alias function call handling
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_functioncall.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeFunctionCall.h"
+#include "KviKvsTreeNodeDataList.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.cpp
index 38f709a7d..959cc413d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_aliassimplecommand.cpp
+//   File : KviKvsTreeNodeAliasSimpleCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:16:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_aliassimplecommand.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_switchlist.h"
-#include "kvi_kvs_aliasmanager.h"
+#include "KviKvsTreeNodeAliasSimpleCommand.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeSwitchList.h"
+#include "KviKvsAliasManager.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_irccontext.h"
-#include "kvi_window.h"
-#include "kvi_ircconnection.h"
+#include "KviOptions.h"
+#include "KviIrcContext.h"
+#include "KviWindow.h"
+#include "KviIrcConnection.h"
 #include "kvi_out.h"
 
 #include <QByteArray>
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h b/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.h
index b03b40742..e6e15c102 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeAliasSimpleCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_ALIASSIMPLECOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_aliassimplecommand.h
+//   File : KviKvsTreeNodeAliasSimpleCommand.h
 //   Creation date : Thu 09 Oct 2003 02:16:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode_aliassimplecommand.h
+* \file KviKvsTreeNodeAliasSimpleCommand.h
 * \author Szymon Stefanek
 * \brief Treenode alias simple command call handling
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_simplecommand.h"
+#include "KviKvsTreeNodeSimpleCommand.h"
 
 class KviKvsTreeNodeDataList;
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/KviKvsTreeNodeArrayCount.cpp
index c6e26af09..85b65f624 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayCount.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arraycount.cpp
+//   File : KviKvsTreeNodeArrayCount.cpp
 //   Creation date : Tue 07 Oct 2003 03:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_arraycount.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeArrayCount.h"
+#include "KviKvsVariant.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsObject.h"
 
 
 KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const QChar * pLocation, KviKvsTreeNodeData * pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h b/src/kvirc/kvs/KviKvsTreeNodeArrayCount.h
index 61b28fccf..fd590a2e3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayCount.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_ARRAYCOUNT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arraycount.h
+//   File : KviKvsTreeNodeArrayCount.h
 //   Creation date : Tue 07 Oct 2003 03:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode_arraycount.h
+* \file KviKvsTreeNodeArrayCount.h
 * \author Szymon Stefanek
 * \brief Treenode array count handling
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_indirectdata.h"
+#include "KviKvsTreeNodeIndirectData.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/KviKvsTreeNodeArrayElement.cpp
index ff0fc428f..bcfe4c337 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayElement.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arrayelement.cpp
+//   File : KviKvsTreeNodeArrayElement.cpp
 //   Creation date : Tue 07 Oct 2003 02:58:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_arrayelement.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeArrayElement.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
-#include "kvi_kvs_array.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsArray.h"
+#include "KviKvsObject.h"
 
 KviKvsTreeNodeArrayElement::KviKvsTreeNodeArrayElement(const QChar * pLocation, KviKvsTreeNodeData * pSource, KviKvsTreeNodeExpression * pIndex)
 : KviKvsTreeNodeArrayOrHashElement(pLocation,pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h b/src/kvirc/kvs/KviKvsTreeNodeArrayElement.h
index 9acc98c8d..c39658a69 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayElement.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_ARRAYELEMENT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arrayelement.h
+//   File : KviKvsTreeNodeArrayElement.h
 //   Creation date : Tue 07 Oct 2003 02:58:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,16 +25,16 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode_arrayelement.h
+* \file KviKvsTreeNodeArrayElement.h
 * \author Szymon Stefanek
 * \brief Treenode array element handling
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_arrayorhashelement.h"
-#include "kvi_kvs_types.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeArrayOrHashElement.h"
+#include "KviKvsTypes.h"
 
 class KviKvsObject;
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp b/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.cpp
index 30458c6b3..4a8b59436 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arrayorhashelement.cpp
+//   File : KviKvsTreeNodeArrayOrHashElement.cpp
 //   Creation date : Thu 16 Oct 2003 22:56:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_arrayorhashelement.h"
+#include "KviKvsTreeNodeArrayOrHashElement.h"
 
 KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource)
 : KviKvsTreeNodeIndirectData(pLocation,pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h b/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.h
index e47f90e0f..2f5039542 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayOrHashElement.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_ARRAYORHASHELEMENT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arrayorhashelement.h
+//   File : KviKvsTreeNodeArrayOrHashElement.h
 //   Creation date : Thu 16 Oct 2003 22:56:48 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_indirectdata.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsTreeNodeIndirectData.h"
+#include "KviKvsVariant.h"
 
 class KVIRC_API KviKvsTreeNodeArrayOrHashElement : public KviKvsTreeNodeIndirectData
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.cpp
index 688d60014..d802434fb 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arrayreferenceassert.cpp
+//   File : KviKvsTreeNodeArrayReferenceAssert.cpp
 //   Creation date : Thu 16 Oct 2003 23:46:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_arrayreferenceassert.h"
-#include "kvi_kvs_rwevaluationresult.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsTreeNodeArrayReferenceAssert.h"
+#include "KviKvsRWEvaluationResult.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariant.h"
 #include "KviLocale.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsObject.h"
 
 KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const QChar * pLocation, KviKvsTreeNodeData * pSource)
 : KviKvsTreeNodeIndirectData(pLocation,pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h b/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.h
index 8018b1e97..3e91f9835 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeArrayReferenceAssert.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_ARRAYREFERENCEASSERT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_arrayreferenceassert.h
+//   File : KviKvsTreeNodeArrayReferenceAssert.h
 //   Creation date : Thu 16 Oct 2003 23:46:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode_arrayreferenceassert.h
+* \file KviKvsTreeNodeArrayReferenceAssert.h
 * \author Szymon Stefanek
 * \brief Treenode array reference assert handling
 */
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_indirectdata.h"
+#include "KviKvsTreeNodeIndirectData.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp b/src/kvirc/kvs/KviKvsTreeNodeBase.cpp
index 763d22959..af34fa7e0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeBase.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_base.cpp
+//   File : KviKvsTreeNodeBase.cpp
 //   Creation date : Tue 07 Oct 2003 02:00:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "kvi_kvs_treenode_base.h"
+#include "KviKvsTreeNodeBase.h"
 
 KviKvsTreeNode::KviKvsTreeNode(const QChar * pLocation)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/KviKvsTreeNodeBase.h
index 399d0c872..f87b034df 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_base.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeBase.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_BASE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_base.h
+//   File : KviKvsTreeNodeBase.h
 //   Creation date : Tue 07 Oct 2003 02:00:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode_base.h
+* \file KviKvsTreeNodeBase.h
 * \author Szymon Stefanek
 * \brief Treenode handling
 */
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.cpp
index 7dff55ba5..019f39650 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_baseobjectfunctioncall.cpp
+//   File : KviKvsTreeNodeBaseObjectFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:30:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_baseobjectfunctioncall.h"
+#include "KviKvsTreeNodeBaseObjectFunctionCall.h"
 #include "KviQString.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsObject.h"
+#include "KviKvsVariant.h"
 
 KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const QChar * pLocation,const QString &szBaseClass,const QString &szFncName,KviKvsTreeNodeDataList * pParams)
 : KviKvsTreeNodeObjectFunctionCall(pLocation,szFncName,pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.h
index 73097a47b..f9580b49e 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeBaseObjectFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_BASEOBJECTFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_baseobjectfunctioncall.h
+//   File : KviKvsTreeNodeBaseObjectFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:30:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_objectfunctioncall.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeObjectFunctionCall.h"
 
 class KviKvsObject;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.cpp
index d0e29b634..d46fb980d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_callbackcommand.cpp
+//   File : KviKvsTreeNodeCallbackCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:02:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_callbackcommand.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsTreeNodeCallbackCommand.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsScript.h"
 
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h b/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.h
index 090a9a06a..89fc230da 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCallbackCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_CALLBACKCOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_callbackcommand.h
+//   File : KviKvsTreeNodeCallbackCommand.h
 //   Creation date : Thu 09 Oct 2003 02:02:42 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_commandwithparameters.h"
+#include "KviKvsTreeNodeCommandWithParameters.h"
 
 class KviKvsTreeNodeDataList;
 class KviKvsScript;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/KviKvsTreeNodeCommand.cpp
index ef3c4a6ab..264149e28 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_command.cpp
+//   File : KviKvsTreeNodeCommand.cpp
 //   Creation date : Thu 09 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_command.h"
-#include "kvi_kvs_treenode_switchlist.h"
+#include "KviKvsTreeNodeCommand.h"
+#include "KviKvsTreeNodeSwitchList.h"
 
 KviKvsTreeNodeCommand::KviKvsTreeNodeCommand(const QChar * pLocation,const QString &szCmdName)
 : KviKvsTreeNodeInstruction(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.h b/src/kvirc/kvs/KviKvsTreeNodeCommand.h
index 84c92cba8..403700f07 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_command.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_COMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_command.h
+//   File : KviKvsTreeNodeCommand.h
 //   Creation date : Thu 09 Oct 2003 01:49:40 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 class KviKvsParser;
 class KviKvsTreeNodeSwitchList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp b/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.cpp
index 16bb379c0..cc97bac04 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_commandevaluation.cpp
+//   File : KviKvsTreeNodeCommandEvaluation.cpp
 //   Creation date : Wed 05 Nov 2003 04:18:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_commandevaluation.h"
+#include "KviKvsTreeNodeCommandEvaluation.h"
 
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariant.h"
 
 KviKvsTreeNodeCommandEvaluation::KviKvsTreeNodeCommandEvaluation(const QChar * pLocation,KviKvsTreeNodeInstruction * pInstruction)
 : KviKvsTreeNodeData(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h b/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.h
index c71133134..18899af74 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCommandEvaluation.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_COMMANDEVALUATION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_commandevaluation.h
+//   File : KviKvsTreeNodeCommandEvaluation.h
 //   Creation date : Wed 05 Nov 2003 04:18:58 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.cpp
index 04c611077..3096294f3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_commandwithparameters.cpp
+//   File : KviKvsTreeNodeCommandWithParameters.cpp
 //   Creation date : Thu 09 Oct 2003 01:57:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_commandwithparameters.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeCommandWithParameters.h"
+#include "KviKvsTreeNodeDataList.h"
 
 KviKvsTreeNodeCommandWithParameters::KviKvsTreeNodeCommandWithParameters(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params)
 : KviKvsTreeNodeCommand(pLocation,szCmdName)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h b/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.h
index a4cf8def4..94825965d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCommandWithParameters.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_COMMANDWITHPARAMETERS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_commandwithparameters.h
+//   File : KviKvsTreeNodeCommandWithParameters.h
 //   Creation date : Thu 09 Oct 2003 01:57:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_command.h"
+#include "KviKvsTreeNodeCommand.h"
 
 class KviKvsTreeNodeDataList;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/KviKvsTreeNodeCompositeData.cpp
index 388cac53d..a3d1df66a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCompositeData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_compositedata.cpp
+//   File : KviKvsTreeNodeCompositeData.cpp
 //   Creation date : Tue 07 Oct 2003 02:24:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_compositedata.h"
+#include "KviKvsTreeNodeCompositeData.h"
 #include "KviQString.h"
 
 #define DEBUGME
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/KviKvsTreeNodeCompositeData.h
index 8ad483220..64a738fc2 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCompositeData.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_COMPOSITEDATA_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_compositedata.h
+//   File : KviKvsTreeNodeCompositeData.h
 //   Creation date : Tue 07 Oct 2003 02:24:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 class KVIRC_API KviKvsTreeNodeCompositeData : public KviKvsTreeNodeData
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/KviKvsTreeNodeConstantData.cpp
index ed8d91276..80c573b37 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeConstantData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_constantdata.cpp
+//   File : KviKvsTreeNodeConstantData.cpp
 //   Creation date : Tue 07 Oct 2003 02:21:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_constantdata.h"
+#include "KviKvsTreeNodeConstantData.h"
 
 
 KviKvsTreeNodeConstantData::KviKvsTreeNodeConstantData(const QChar * pLocation,KviKvsVariant * v)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/KviKvsTreeNodeConstantData.h
index 694d6b184..58d0ccc68 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeConstantData.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_CONSTANTDATA_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_constantdata.h
+//   File : KviKvsTreeNodeConstantData.h
 //   Creation date : Tue 07 Oct 2003 02:21:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 class KVIRC_API KviKvsTreeNodeConstantData : public KviKvsTreeNodeData
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.cpp
index 19ff7d447..e7c0bce05 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_corecallbackcommand.cpp
+//   File : KviKvsTreeNodeCoreCallbackCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:06:26 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_corecallbackcommand.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_switchlist.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeCoreCallbackCommand.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeSwitchList.h"
+#include "KviKvsScript.h"
+#include "KviKvsRunTimeContext.h"
 
 
 KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h b/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.h
index 97816c7fc..2af5dc293 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCoreCallbackCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_CORECALLBACKCOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_corecallbackcommand.h
+//   File : KviKvsTreeNodeCoreCallbackCommand.h
 //   Creation date : Thu 09 Oct 2003 02:06:26 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_callbackcommand.h"
+#include "KviKvsTreeNodeCallbackCommand.h"
 
-#include "kvi_kvs_kernel.h"
+#include "KviKvsKernel.h"
 
 class KviKvsTreeNodeDataList;
 class KviKvsScript;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.cpp
index 5bf7e3d57..456c3f2b7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_corefunctioncall.cpp
+//   File : KviKvsTreeNodeCoreFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:23:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_corefunctioncall.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeCoreFunctionCall.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams)
 : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.h
index 961541469..ef7e4d813 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCoreFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_COREFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_corefunctioncall.h
+//   File : KviKvsTreeNodeCoreFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:23:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_functioncall.h"
+#include "KviKvsKernel.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeFunctionCall.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.cpp
index 3fa2732ee..f90dd27d6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_coresimplecommand.cpp
+//   File : KviKvsTreeNodeCoreSimpleCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:14:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_coresimplecommand.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_switchlist.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeCoreSimpleCommand.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeSwitchList.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r)
 : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h b/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.h
index 116147981..973622656 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeCoreSimpleCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_CORESIMPLECOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_coresimplecommand.h
+//   File : KviKvsTreeNodeCoreSimpleCommand.h
 //   Creation date : Thu 09 Oct 2003 02:14:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_simplecommand.h"
-#include "kvi_kvs_kernel.h"
+#include "KviKvsTreeNodeSimpleCommand.h"
+#include "KviKvsKernel.h"
 
 class KviKvsTreeNodeDataList;
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/KviKvsTreeNodeData.cpp
index 4fd235b19..a9843f057 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_data.cpp
+//   File : KviKvsTreeNodeData.cpp
 //   Creation date : Sun 05 Oct 2003 21.52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 #include "KviLocale.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/KviKvsTreeNodeData.h
index c55353a3f..2b55a6406 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_data.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeData.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_DATA_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_data.h
+//   File : KviKvsTreeNodeData.h
 //   Creation date : Sun 05 Oct 2003 21.42 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_base.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_rwevaluationresult.h"
+#include "KviKvsTreeNodeBase.h"
+#include "KviKvsVariant.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsRWEvaluationResult.h"
 
 class KviKvsObject;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/KviKvsTreeNodeDataList.cpp
index 63b200ca0..6ccb92ee7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeDataList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_datalist.cpp
+//   File : KviKvsTreeNodeDataList.cpp
 //   Creation date : Tue 07 Oct 2003 02:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsRunTimeContext.h"
 
 #include "KviQString.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/KviKvsTreeNodeDataList.h
index 586b00b0b..88b197a34 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeDataList.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_DATALIST_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_datalist.h
+//   File : KviKvsTreeNodeDataList.h
 //   Creation date : Tue 07 Oct 2003 02:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_treenode_base.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsTreeNodeBase.h"
+#include "KviKvsTreeNodeData.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/KviKvsTreeNodeExpression.cpp
index a5802c7e2..fdf9c7df9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeExpression.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_expression.cpp
+//   File : KviKvsTreeNodeExpression.cpp
 //   Creation date : Mon 06 Oct 2003 01.35 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_expression.h"
+#include "KviKvsTreeNodeExpression.h"
 #include "KviLocale.h"
 
 #include <math.h>
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/KviKvsTreeNodeExpression.h
index b3877bc78..f7bafde21 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeExpression.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_EXPRESSION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_expression.h
+//   File : KviKvsTreeNodeExpression.h
 //   Creation date : Mon 06 Oct 2003 01.33 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "KviQString.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsVariant.h"
+#include "KviKvsTreeNodeData.h"
 
 
 // absolute precedence (~operand part)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.cpp
index 051249a1e..152ee766a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_expressionreturn.cpp
+//   File : KviKvsTreeNodeExpressionReturn.cpp
 //   Creation date : Fri 30 Jan 2004 01:27:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_expressionreturn.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeExpressionReturn.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeExpressionReturn::KviKvsTreeNodeExpressionReturn(const QChar * pLocation,KviKvsTreeNodeExpression * pExpression)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h b/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.h
index c00ba9b56..671322276 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeExpressionReturn.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_EXPRESSIONRETURN_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_expressionreturn.h
+//   File : KviKvsTreeNodeExpressionReturn.h
 //   Creation date : Fri 30 Jan 2004 01:27:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 class KviKvsTreeNodeExpression;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.cpp
index a33c513b9..2f9bad7c5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_extendedscopevariable.cpp
+//   File : KviKvsTreeNodeExtendedScopeVariable.cpp
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_extendedscopevariable.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeExtendedScopeVariable.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const QChar * pLocation,const QString &szIdentifier)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h b/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.h
index f794770e0..a100144a5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeExtendedScopeVariable.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_EXTENDEDSCOPEVARIABLE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_extendedscopevariable.h
+//   File : KviKvsTreeNodeExtendedScopeVariable.h
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_variable.h"
+#include "KviKvsTreeNodeVariable.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.cpp
index fa687ba25..94634a09f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_functioncall.cpp
+//   File : KviKvsTreeNodeFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:14:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_functioncall.h"
+#include "KviKvsTreeNodeFunctionCall.h"
 
 
 KviKvsTreeNodeFunctionCall::KviKvsTreeNodeFunctionCall(const QChar * pLocation,const QString &szFunctionName,KviKvsTreeNodeDataList * pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h b/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.h
index 1574065e7..f04a655f7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_FUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_functioncall.h
+//   File : KviKvsTreeNodeFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:14:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsTreeNodeDataList.h"
 
 class KVIRC_API KviKvsTreeNodeFunctionCall : public KviKvsTreeNodeData
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.cpp
index e613d59f9..b34ec2992 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_globalvariable.cpp
+//   File : KviKvsTreeNodeGlobalVariable.cpp
 //   Creation date : Thu 16 Oct 2003 22:45:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_globalvariable.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeGlobalVariable.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const QChar * pLocation,const QString &szIdentifier)
 : KviKvsTreeNodeVariable(pLocation,szIdentifier)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h b/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.h
index 36fef2aab..54311b7b3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeGlobalVariable.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_GLOBALVARIABLE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_globalvariable.h
+//   File : KviKvsTreeNodeGlobalVariable.h
 //   Creation date : Thu 16 Oct 2003 22:45:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_variable.h"
+#include "KviKvsTreeNodeVariable.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/KviKvsTreeNodeHashCount.cpp
index f33e0a7ae..42b076b1d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeHashCount.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_hashcount.cpp
+//   File : KviKvsTreeNodeHashCount.cpp
 //   Creation date : Tue 07 Oct 2003 03:05:30 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_hashcount.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsTreeNodeHashCount.h"
+#include "KviKvsVariant.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsObject.h"
 #include "KviLocale.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h b/src/kvirc/kvs/KviKvsTreeNodeHashCount.h
index e2906f62d..42a3d35a8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeHashCount.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_HASHCOUNT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_hashcount.h
+//   File : KviKvsTreeNodeHashCount.h
 //   Creation date : Tue 07 Oct 2003 03:05:30 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_indirectdata.h"
+#include "KviKvsTreeNodeIndirectData.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/KviKvsTreeNodeHashElement.cpp
index ac90b014d..4124837d5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeHashElement.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_hashelement.cpp
+//   File : KviKvsTreeNodeHashElement.cpp
 //   Creation date : Tue 07 Oct 2003 03:04:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_hashelement.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeHashElement.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsHash.h"
+#include "KviKvsObject.h"
 
 KviKvsTreeNodeHashElement::KviKvsTreeNodeHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pKey)
 : KviKvsTreeNodeArrayOrHashElement(pLocation,pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h b/src/kvirc/kvs/KviKvsTreeNodeHashElement.h
index 98ddcd04a..8b414c914 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeHashElement.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_HASHELEMENT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_hashelement.h
+//   File : KviKvsTreeNodeHashElement.h
 //   Creation date : Tue 07 Oct 2003 03:04:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_treenode_arrayorhashelement.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsTreeNodeArrayOrHashElement.h"
 
 class KviKvsRunTimeContext;
 class KviKvsObject;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.cpp
index cc78049c5..92308056f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_hashreferenceassert.cpp
+//   File : KviKvsTreeNodeHashReferenceAssert.cpp
 //   Creation date : Thu 16 Oct 2003 23:43:06 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_hashreferenceassert.h"
-#include "kvi_kvs_rwevaluationresult.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsTreeNodeHashReferenceAssert.h"
+#include "KviKvsRWEvaluationResult.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariant.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h b/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.h
index e69125fc3..d76aee621 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeHashReferenceAssert.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_HASHREFERENCEASSERT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_hashreferenceassert.h
+//   File : KviKvsTreeNodeHashReferenceAssert.h
 //   Creation date : Thu 16 Oct 2003 23:43:06 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_indirectdata.h"
+#include "KviKvsTreeNodeIndirectData.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp b/src/kvirc/kvs/KviKvsTreeNodeIndirectData.cpp
index 44ee0640f..b616b6d79 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeIndirectData.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_indirectdata.cpp
+//   File : KviKvsTreeNodeIndirectData.cpp
 //   Creation date : Thu 16 Oct 2003 22:49:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_indirectdata.h"
+#include "KviKvsTreeNodeIndirectData.h"
 
 KviKvsTreeNodeIndirectData::KviKvsTreeNodeIndirectData(const QChar * pLocation,KviKvsTreeNodeData * pSource)
 : KviKvsTreeNodeData(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h b/src/kvirc/kvs/KviKvsTreeNodeIndirectData.h
index 1b3c49f03..e46a06c0d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeIndirectData.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_INDIRECTDATA_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_indirectdata.h
+//   File : KviKvsTreeNodeIndirectData.h
 //   Creation date : Thu 16 Oct 2003 22:49:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 class KVIRC_API KviKvsTreeNodeIndirectData : public KviKvsTreeNodeData
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/KviKvsTreeNodeInstruction.cpp
index 19cb80bd6..3621dc7e5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeInstruction.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_instruction.cpp
+//   File : KviKvsTreeNodeInstruction.cpp
 //   Creation date : Mon 06 Sep 2003 03.47 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 void KviKvsTreeNodeInstruction::contextDescription(QString & szBuffer)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/KviKvsTreeNodeInstruction.h
index b337d830c..af6fbb37f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeInstruction.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_INSTRUCTION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_instruction.h
+//   File : KviKvsTreeNodeInstruction.h
 //   Creation date : Mon 06 Oct 2003 03.46 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,13 +25,13 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_treenode.h
+* \file KviKvsTreeNode.h
 * \author Szymon Stefanek
 * \brief Treenode instruction handling
 */
 
 #include "KviQString.h"
-#include "kvi_kvs_treenode_base.h"
+#include "KviKvsTreeNodeBase.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.cpp
index 24e8b50d2..40646686a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_instructionblock.cpp
+//   File : KviKvsTreeNodeInstructionBlock.cpp
 //   Creation date : Thu 09 Oct 2003 01:44:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_instructionblock.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeInstructionBlock.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeInstructionBlock::KviKvsTreeNodeInstructionBlock(const QChar * pLocation)
 : KviKvsTreeNodeInstruction(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.h
index 1bf1f58e3..637023f23 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeInstructionBlock.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_INSTRUCTIONBLOCK_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_instructionblock.h
+//   File : KviKvsTreeNodeInstructionBlock.h
 //   Creation date : Thu 09 Oct 2003 01:44:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,7 +28,7 @@
 #include "KviQString.h"
 #include "KviPointerList.h"
 
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.cpp
index 4bab1abfd..61ecc9cba 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_localvariable.cpp
+//   File : KviKvsTreeNodeLocalVariable.cpp
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_localvariable.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeLocalVariable.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const QChar * pLocation,const QString &szIdentifier)
 : KviKvsTreeNodeVariable(pLocation,szIdentifier)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h b/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.h
index a3e352b2f..8f6814e45 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeLocalVariable.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_LOCALVARIABLE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_localvariable.h
+//   File : KviKvsTreeNodeLocalVariable.h
 //   Creation date : Thu 16 Oct 2003 22:41:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_variable.h"
+#include "KviKvsTreeNodeVariable.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.cpp
index 0c1bb8b40..aeacb7e69 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_modulecallbackcommand.cpp
+//   File : KviKvsTreeNodeModuleCallbackCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:09:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_modulecallbackcommand.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_switchlist.h"
+#include "KviKvsTreeNodeModuleCallbackCommand.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeSwitchList.h"
 
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 #include "KviLocale.h"
-#include "kvi_kvs_moduleinterface.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsModuleInterface.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback)
 : KviKvsTreeNodeCallbackCommand(pLocation,szCmdName,params,pCallback)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h b/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.h
index 2068fca9e..15e5e10df 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeModuleCallbackCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_MODULECALLBACKCOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_modulecallbackcommand.h
+//   File : KviKvsTreeNodeModuleCallbackCommand.h
 //   Creation date : Thu 09 Oct 2003 02:09:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_callbackcommand.h"
+#include "KviKvsTreeNodeCallbackCommand.h"
 
 class KviKvsTreeNodeDataList;
 class KviKvsScript;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.cpp
index a4da2952c..1c81bf004 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_modulefunctioncall.cpp
+//   File : KviKvsTreeNodeModuleFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:19:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_modulefunctioncall.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeModuleFunctionCall.h"
+#include "KviKvsTreeNodeDataList.h"
 
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 #include "KviLocale.h"
-#include "kvi_kvs_moduleinterface.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsModuleInterface.h"
+#include "KviKvsRunTimeContext.h"
 
 
 KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const QChar * pLocation,const QString &szModuleName,const QString &szFncName,KviKvsTreeNodeDataList * pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.h
index 438ea0020..9867c4981 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeModuleFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_MODULEFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_modulefunctioncall.h
+//   File : KviKvsTreeNodeModuleFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:19:28 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_functioncall.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeFunctionCall.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.cpp
index f13fcdccd..54a3a63af 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_modulesimplecommand.cpp
+//   File : KviKvsTreeNodeModuleSimpleCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:18:27 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_modulesimplecommand.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_switchlist.h"
+#include "KviKvsTreeNodeModuleSimpleCommand.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeSwitchList.h"
 
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 #include "KviLocale.h"
-#include "kvi_kvs_moduleinterface.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsModuleInterface.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params)
 : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h b/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.h
index ac0d0c735..5896bf4e5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeModuleSimpleCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_MODULESIMPLECOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_modulesimplecommand.h
+//   File : KviKvsTreeNodeModuleSimpleCommand.h
 //   Creation date : Thu 09 Oct 2003 02:18:27 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_simplecommand.h"
+#include "KviKvsTreeNodeSimpleCommand.h"
 
 class KviKvsTreeNodeDataList;
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.cpp
index 1403cb33f..197db1888 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_multipleparameteridentifier.cpp
+//   File : KviKvsTreeNodeMultipleParameterIdentifier.cpp
 //   Creation date : Tue 07 Oct 2003 03:49:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_multipleparameteridentifier.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsTreeNodeMultipleParameterIdentifier.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariant.h"
 
 
 KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdentifier(const QChar * pLocation,int iStart,int iEnd)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h b/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.h
index 86127138b..60840f86f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeMultipleParameterIdentifier.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_MULTIPLEPARAMETERIDENTIFIER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_multipleparameteridentifier.h
+//   File : KviKvsTreeNodeMultipleParameterIdentifier.h
 //   Creation date : Tue 07 Oct 2003 03:49:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 class KviKvsRunTimeContext;
 class KviKvsVariant;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/KviKvsTreeNodeObjectField.cpp
index 99f26435d..d9e59d408 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeObjectField.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_objectfield.cpp
+//   File : KviKvsTreeNodeObjectField.cpp
 //   Creation date : Thu 28 Apr 2005 17:12:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_objectfield.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_hash.h"
+#include "KviKvsTreeNodeObjectField.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsObject.h"
+#include "KviKvsHash.h"
 
 KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const QChar * pLocation,const QString &szIdentifier)
 : KviKvsTreeNodeVariable(pLocation,szIdentifier)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h b/src/kvirc/kvs/KviKvsTreeNodeObjectField.h
index f58952fa8..6adbf7bf0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeObjectField.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_OBJECTFIELD_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_objectfield.h
+//   File : KviKvsTreeNodeObjectField.h
 //   Creation date : Thu 28 Apr 2005 17:12:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_variable.h"
+#include "KviKvsTreeNodeVariable.h"
 
 class KviKvsRunTimeContext;
 class KviKvsObject;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.cpp
index 5175387db..ef4047507 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_objectfunctioncall.cpp
+//   File : KviKvsTreeNodeObjectFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:26:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_objectfunctioncall.h"
+#include "KviKvsTreeNodeObjectFunctionCall.h"
 
 KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams)
 : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.h
index 636a5e6ec..b16bac392 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeObjectFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_OBJECTFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_objectfunctioncall.h
+//   File : KviKvsTreeNodeObjectFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:26:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_functioncall.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeFunctionCall.h"
 
 
 class KVIRC_API KviKvsTreeNodeObjectFunctionCall : public KviKvsTreeNodeFunctionCall
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/KviKvsTreeNodeOperation.cpp
index 4bf827879..d614596a6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeOperation.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_operation.cpp
+//   File : KviKvsTreeNodeOperation.cpp
 //   Creation date : Thu 18 Dec 2003 22:36:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_operation.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeOperation.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 #include <QRegExp>
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.h b/src/kvirc/kvs/KviKvsTreeNodeOperation.h
index 5cb6aeac0..a8269c353 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeOperation.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_OPERATION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_operation.h
+//   File : KviKvsTreeNodeOperation.h
 //   Creation date : Thu 18 Dec 2003 22:36:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 class KviKvsTreeNodeData;
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.cpp
index 53ae7fcc9..2e64e5f07 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_parameterreturn.cpp
+//   File : KviKvsTreeNodeParameterReturn.cpp
 //   Creation date : Fri 30 Jan 2004 01:31:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_parameterreturn.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviKvsTreeNodeParameterReturn.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariantList.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeParameterReturn::KviKvsTreeNodeParameterReturn(const QChar * pLocation,KviKvsTreeNodeDataList * pDataList)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h b/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.h
index 6dc4071cd..fe35361e6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeParameterReturn.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_PARAMETERRETURN_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_parameterreturn.h
+//   File : KviKvsTreeNodeParameterReturn.h
 //   Creation date : Fri 30 Jan 2004 01:31:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_instruction.h"
+#include "KviKvsTreeNodeInstruction.h"
 
 class KviKvsTreeNodeDataList;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.cpp
index 733eb9a71..17e7e2861 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_rebindingswitch.cpp
+//   File : KviKvsTreeNodeRebindingSwitch.cpp
 //   Creation date : Mon 15 Aug 2005 13:32:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_rebindingswitch.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_window.h"
-#include "kvi_app.h"
+#include "KviKvsTreeNodeRebindingSwitch.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviWindow.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeRebindingSwitch::KviKvsTreeNodeRebindingSwitch(const QChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand)
 : KviKvsTreeNodeCommand(pLocation,pChildCommand->commandName())
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h b/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.h
index b7792aa3e..152968d33 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeRebindingSwitch.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_REBINDINGSWITCH_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_rebindingswitch.h
+//   File : KviKvsTreeNodeRebindingSwitch.h
 //   Creation date : Mon 15 Aug 2005 13:32:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_command.h"
+#include "KviKvsTreeNodeCommand.h"
 #include "KviQString.h"
 
 class KviKvsTreeNodeData;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.cpp
index ba97293b5..83d30c62a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_scopeoperator.cpp
+//   File : KviKvsTreeNodeScopeOperator.cpp
 //   Creation date : Tue 07 Oct 2003 02:33:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_scopeoperator.h"
+#include "KviKvsTreeNodeScopeOperator.h"
 
 #include "KviQString.h"
 
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object.h"
-#include "kvi_kvs_object_controller.h"
+#include "KviKvsVariant.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObject.h"
+#include "KviKvsObjectController.h"
 
 #include "KviLocale.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.h
index d842861bb..600d41203 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeScopeOperator.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SCOPEOPERATOR_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_scopeoperator.h
+//   File : KviKvsTreeNodeScopeOperator.h
 //   Creation date : Tue 07 Oct 2003 02:33:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 class KviKvsObject;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.cpp
index 97550e37c..1c2ccb994 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_simplecommand.cpp
+//   File : KviKvsTreeNodeSimpleCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:12:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_simplecommand.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeSimpleCommand.h"
+#include "KviKvsTreeNodeDataList.h"
 
 KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params)
 : KviKvsTreeNodeCommandWithParameters(pLocation,szCmdName,params)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h b/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.h
index 2c19a60b6..7e728e4e5 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSimpleCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SIMPLECOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_simplecommand.h
+//   File : KviKvsTreeNodeSimpleCommand.h
 //   Creation date : Thu 09 Oct 2003 02:12:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_commandwithparameters.h"
+#include "KviKvsTreeNodeCommandWithParameters.h"
 
 class KviKvsTreeNodeDataList;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.cpp
index 60b52dc5f..2bdc48828 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_singleparameteridentifier.cpp
+//   File : KviKvsTreeNodeSingleParameterIdentifier.cpp
 //   Creation date : Tue 07 Oct 2003 03:47:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_singleparameteridentifier.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsTreeNodeSingleParameterIdentifier.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsVariant.h"
 
 KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier(const QChar * pLocation,int iStart)
 : KviKvsTreeNodeData(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.h
index 9ee53e8fd..c85474419 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSingleParameterIdentifier.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SINGLEPARAMETERIDENTIFIER_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_singleparameteridentifier.h
+//   File : KviKvsTreeNodeSingleParameterIdentifier.h
 //   Creation date : Tue 07 Oct 2003 03:47:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 
 class KviKvsRunTimeContext;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.cpp
index 3e4d262b1..f466f8595 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommand.cpp
+//   File : KviKvsTreeNodeSpecialCommand.cpp
 //   Creation date : Thu 09 Oct 2003 02:20:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 
 
 
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const QChar * pLocation,const QString &szCmdName)
 : KviKvsTreeNodeCommand(pLocation,szCmdName)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.h
index 4d62c30b8..adab44972 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommand.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMAND_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommand.h
+//   File : KviKvsTreeNodeSpecialCommand.h
 //   Creation date : Thu 09 Oct 2003 02:20:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_command.h"
+#include "KviKvsTreeNodeCommand.h"
 
 class KVIRC_API KviKvsTreeNodeSpecialCommand : public KviKvsTreeNodeCommand
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.cpp
index 59b4395ec..8ee4858a7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandbreak.cpp
+//   File : KviKvsTreeNodeSpecialCommandBreak.cpp
 //   Creation date : Thu 06 Nov 2003 12:15:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandbreak.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandBreak.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const QChar * pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.h
index 6bf36b994..5236722fa 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandBreak.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDBREAK_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandbreak.h
+//   File : KviKvsTreeNodeSpecialCommandBreak.h
 //   Creation date : Thu 06 Nov 2003 12:15:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.cpp
index 79161df7d..0373dddc4 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandclass.cpp
+//   File : KviKvsTreeNodeSpecialCommandClass.cpp
 //   Creation date : Fri 12 Aug 2005 03:23:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 #include "KviLocale.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_treenode_specialcommandclass.h"
-#include "kvi_kvs_kernel.h"
-#include "kvi_kvs_object_controller.h"
-#include "kvi_kvs_object_class.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsVariant.h"
+#include "KviKvsTreeNodeSpecialCommandClass.h"
+#include "KviKvsKernel.h"
+#include "KviKvsObjectController.h"
+#include "KviKvsObjectClass.h"
 
 KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const QChar * pLocation,const QString &szName,const QString &szBuffer,const QString &szReminder,unsigned int uHandlerFlags)
 : KviKvsTreeNode(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.h
index 852b84ea2..4aee82c70 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandClass.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDCLASS_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandclass.h
+//   File : KviKvsTreeNodeSpecialCommandClass.h
 //   Creation date : Fri 12 Aug 2005 03:23:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -26,9 +26,9 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
-#include "kvi_kvs_treenode_base.h"
-#include "kvi_kvs_treenode_datalist.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
+#include "KviKvsTreeNodeBase.h"
+#include "KviKvsTreeNodeDataList.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.cpp
index 8b5001f04..ee98e5ca4 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandcontinue.cpp
+//   File : KviKvsTreeNodeSpecialCommandContinue.cpp
 //   Creation date : Fri 13 Jun 2008 01:25:00 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandcontinue.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandContinue.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandContinue::KviKvsTreeNodeSpecialCommandContinue(const QChar * pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.h
index 316068137..761fd7a6d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandContinue.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDCONTINUE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandcontinue.h
+//   File : KviKvsTreeNodeSpecialCommandContinue.h
 //   Creation date : Fri 13 Jun 2008 01:25:00 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.cpp
index 6244b1035..c793ace80 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommanddefpopup.cpp
+//   File : KviKvsTreeNodeSpecialCommandDefpopup.cpp
 //   Creation date : Fri 02 Jan 2004 14:09:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommanddefpopup.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandDefpopup.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
-#include "kvi_kvs_popupmanager.h"
-#include "kvi_kvs_popupmenu.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsPopupManager.h"
+#include "KviKvsPopupMenu.h"
+#include "KviKvsScript.h"
 
 void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(QString &szBuffer)
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.h
index 2224c0e87..b8821594f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDefpopup.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDDEFPOPUP_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommanddefpopup.h
+//   File : KviKvsTreeNodeSpecialCommandDefpopup.h
 //   Creation date : Fri 02 Jan 2004 13:54:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeExpression;
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.cpp
index 38e9b2d17..0d6787bae 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommanddo.cpp
+//   File : KviKvsTreeNodeSpecialCommandDo.cpp
 //   Creation date : Thu 06 Nov 2003 14:09:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -23,10 +23,10 @@
 //=============================================================================
 
 
-#include "kvi_kvs_treenode_specialcommanddo.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandDo.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandDo::KviKvsTreeNodeSpecialCommandDo(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.h
index 937801967..3c3220b31 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandDo.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDDO_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommanddo.h
+//   File : KviKvsTreeNodeSpecialCommandDo.h
 //   Creation date : Thu 06 Nov 2003 14:09:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeExpression;
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.cpp
index 23887ad44..7bf6f9b26 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandfor.cpp
+//   File : KviKvsTreeNodeSpecialCommandFor.cpp
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandfor.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandFor.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandFor::KviKvsTreeNodeSpecialCommandFor(const QChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.h
index 5ac63e2b2..135c7ad61 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandFor.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDFOR_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandfor.h
+//   File : KviKvsTreeNodeSpecialCommandFor.h
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeExpression;
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.cpp
index 772062299..6fbd644ac 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandforeach.cpp
+//   File : KviKvsTreeNodeSpecialCommandForeach.cpp
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandforeach.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_treenode_switchlist.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandForeach.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsTreeNodeSwitchList.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandForeach::KviKvsTreeNodeSpecialCommandForeach(const QChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.h
index 253aa834f..45e4d3e49 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandForeach.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDFOREACH_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandforeach.h
+//   File : KviKvsTreeNodeSpecialCommandForeach.h
 //   Creation date : Fri 07 Nov 2003 11:48:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeData;
 class KviKvsTreeNodeDataList;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.cpp
index ae2489bc4..8aa6318e8 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandif.cpp
+//   File : KviKvsTreeNodeSpecialCommandIf.cpp
 //   Creation date : Thu 09 Oct 2003 02:40:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandif.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandIf.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandIf::KviKvsTreeNodeSpecialCommandIf(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.h
index 2bb8df0a4..f9d893b11 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandIf.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDIF_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandif.h
+//   File : KviKvsTreeNodeSpecialCommandIf.h
 //   Creation date : Thu 09 Oct 2003 02:40:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeExpression;
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.cpp
index 48019de0a..a0c246347 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandswitch.cpp
+//   File : KviKvsTreeNodeSpecialCommandSwitch.cpp
 //   Creation date : Fri 02 Jan 2004 14:09:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandswitch.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandSwitch.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 #include <QRegExp>
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.h
index 2e2c6fdbe..45dd2a09f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandSwitch.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDSWITCH_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandswitch.h
+//   File : KviKvsTreeNodeSpecialCommandSwitch.h
 //   Creation date : Fri 02 Jan 2004 13:54:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNode.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeExpression;
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.cpp
index 499ecdc57..8899c597f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandunset.cpp
+//   File : KviKvsTreeNodeSpecialCommandUnset.cpp
 //   Creation date : Thu 14 Apr 2005 02:44:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandunset.h"
-#include "kvi_kvs_runtimecontext.h"
-#include "kvi_kvs_rwevaluationresult.h"
+#include "KviKvsTreeNodeSpecialCommandUnset.h"
+#include "KviKvsRunTimeContext.h"
+#include "KviKvsRWEvaluationResult.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.h
index 827d4bd99..050893819 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandUnset.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDUNSET_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandunset.h
+//   File : KviKvsTreeNodeSpecialCommandUnset.h
 //   Creation date : Thu 14 Apr 2005 02:44:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
-#include "kvi_kvs_treenode_variable.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
+#include "KviKvsTreeNodeVariable.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.cpp
index 299918cbc..1cf83f581 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandwhile.cpp
+//   File : KviKvsTreeNodeSpecialCommandWhile.cpp
 //   Creation date : Thu 06 Nov 2003 11:58:43 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_specialcommandwhile.h"
-#include "kvi_kvs_treenode_expression.h"
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSpecialCommandWhile.h"
+#include "KviKvsTreeNodeExpression.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsRunTimeContext.h"
 #include "KviLocale.h"
 
 KviKvsTreeNodeSpecialCommandWhile::KviKvsTreeNodeSpecialCommandWhile(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.h
index 3e9045b8d..ac616a801 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSpecialCommandWhile.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SPECIALCOMMANDWHILE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_specialcommandwhile.h
+//   File : KviKvsTreeNodeSpecialCommandWhile.h
 //   Creation date : Thu 06 Nov 2003 11:58:43 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_specialcommand.h"
+#include "KviKvsTreeNodeSpecialCommand.h"
 
 class KviKvsTreeNodeExpression;
 class KviKvsTreeNodeInstruction;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/KviKvsTreeNodeStringCase.cpp
index 6093dfab1..e2f0fead7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeStringCase.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_stringcast.cpp
+//   File : KviKvsTreeNodeStringCase.cpp
 //   Creation date : Mon 26 Jun 2006 15:17:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_stringcast.h"
+#include "KviKvsTreeNodeStringCase.h"
 #include "KviQString.h"
 
 KviKvsTreeNodeStringCast::KviKvsTreeNodeStringCast(const QChar * pLocation,KviKvsTreeNodeData * pChildData)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h b/src/kvirc/kvs/KviKvsTreeNodeStringCase.h
index 2b8b483ec..52f19bb69 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeStringCase.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_STRINGCAST_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_stringcast.h
+//   File : KviKvsTreeNodeStringCase.h
 //   Creation date : Mon 26 Jun 2006 15:17:33 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_treenode_data.h"
+#include "KviKvsTreeNodeData.h"
 
 class KVIRC_API KviKvsTreeNodeStringCast : public KviKvsTreeNodeData
 {
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/KviKvsTreeNodeSwitchList.cpp
index 2e4fb1934..94d898336 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeSwitchList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_switchlist.cpp
+//   File : KviKvsTreeNodeSwitchList.cpp
 //   Creation date : Tue 07 Oct 2003 02:06:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_switchlist.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeSwitchList.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeSwitchList::KviKvsTreeNodeSwitchList(const QChar * pLocation)
 : KviKvsTreeNode(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/KviKvsTreeNodeSwitchList.h
index 1cf8283b1..b37ae5f0e 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeSwitchList.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_SWITCHLIST_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_switchlist.h
+//   File : KviKvsTreeNodeSwitchList.h
 //   Creation date : Tue 07 Oct 2003 02:06:53 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -30,9 +30,9 @@
 #include "KviPointerHashTable.h"
 #include "KviPointerHashTable.h"
 
-#include "kvi_kvs_treenode_base.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_switchlist.h"
+#include "KviKvsTreeNodeBase.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsSwitchList.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.cpp
index ba50b1797..c0f122c0c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_thisobjectfunctioncall.cpp
+//   File : KviKvsTreeNodeThisObjectFunctionCall.cpp
 //   Creation date : Tue 07 Oct 2003 03:28:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_thisobjectfunctioncall.h"
-#include "kvi_kvs_object.h"
+#include "KviKvsTreeNodeThisObjectFunctionCall.h"
+#include "KviKvsObject.h"
 
 
 KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.h
index 146e49705..149492db9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeThisObjectFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_THISOBJECTFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_thisobjectfunctioncall.h
+//   File : KviKvsTreeNodeThisObjectFunctionCall.h
 //   Creation date : Tue 07 Oct 2003 03:28:10 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_datalist.h"
-#include "kvi_kvs_treenode_objectfunctioncall.h"
+#include "KviKvsTreeNodeDataList.h"
+#include "KviKvsTreeNodeObjectFunctionCall.h"
 
 
 class KviKvsObject;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp b/src/kvirc/kvs/KviKvsTreeNodeVariable.cpp
index 9786d2717..f5fffdd79 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeVariable.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_variable.cpp
+//   File : KviKvsTreeNodeVariable.cpp
 //   Creation date : Thu 16 Oct 2003 22:34:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_variable.h"
+#include "KviKvsTreeNodeVariable.h"
 
 KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const QChar * pLocation,const QString &szIdentifier)
 : KviKvsTreeNodeData(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.h b/src/kvirc/kvs/KviKvsTreeNodeVariable.h
index ae78be502..3eee3ad43 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_variable.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeVariable.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_VARIABLE_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_variable.h
+//   File : KviKvsTreeNodeVariable.h
 //   Creation date : Thu 16 Oct 2003 22:34:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviQString.h"
-#include "kvi_kvs_treenode_data.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsTreeNodeData.h"
+#include "KviKvsVariant.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.cpp
index 3327d86f6..cfc20a123 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
+++ b/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_voidfunctioncall.cpp
+//   File : KviKvsTreeNodeVoidFunctionCall.cpp
 //   Creation date : Thu 09 Oct 2003 01:47:16 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_treenode_voidfunctioncall.h"
-#include "kvi_kvs_runtimecontext.h"
+#include "KviKvsTreeNodeVoidFunctionCall.h"
+#include "KviKvsRunTimeContext.h"
 
 KviKvsTreeNodeVoidFunctionCall::KviKvsTreeNodeVoidFunctionCall(const QChar * pLocation,KviKvsTreeNodeFunctionCall * r)
 : KviKvsTreeNodeInstruction(pLocation)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h b/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.h
index 8e6fc9230..2f38978ad 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h
+++ b/src/kvirc/kvs/KviKvsTreeNodeVoidFunctionCall.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TREENODE_VOIDFUNCTIONCALL_H_
 //=============================================================================
 //
-//   File : kvi_kvs_treenode_voidfunctioncall.h
+//   File : KviKvsTreeNodeVoidFunctionCall.h
 //   Creation date : Thu 09 Oct 2003 01:47:16 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 
-#include "kvi_kvs_treenode_instruction.h"
-#include "kvi_kvs_treenode_functioncall.h"
+#include "KviKvsTreeNodeInstruction.h"
+#include "KviKvsTreeNodeFunctionCall.h"
 
 class KviKvsRunTimeContext;
 
diff --git a/src/kvirc/kvs/kvi_kvs_types.h b/src/kvirc/kvs/KviKvsTypes.h
index bc6f65dbe..933e929a3 100644
--- a/src/kvirc/kvs/kvi_kvs_types.h
+++ b/src/kvirc/kvs/KviKvsTypes.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_TYPES_H_
 //=============================================================================
 //
-//   File : kvi_kvs_types.h
+//   File : KviKvsTypes.h
 //   Creation date : : Sun 29 May 2005 05.25 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/KviKvsUserAction.cpp
index 341c50a81..cdb2c12b4 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.cpp
+++ b/src/kvirc/kvs/KviKvsUserAction.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_useraction.cpp
+//   File : KviKvsUserAction.cpp
 //   Creation date : Tue 07 Dec 2004 02:00:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_useraction.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsUserAction.h"
+#include "KviKvsScript.h"
 #include "KviConfigurationFile.h"
-#include "kvi_iconmanager.h"
-#include "kvi_actionmanager.h"
-#include "kvi_kvs_script.h"
-#include "kvi_window.h"
+#include "KviIconManager.h"
+#include "KviActionManager.h"
+#include "KviKvsScript.h"
+#include "KviWindow.h"
 #include "KviCommandFormatter.h"
 
 KviKvsUserAction::KviKvsUserAction(QObject * pParent,
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.h b/src/kvirc/kvs/KviKvsUserAction.h
index a33b0ed5c..d6beabfa7 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.h
+++ b/src/kvirc/kvs/KviKvsUserAction.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_USERACTION_H_
 //=============================================================================
 //
-//   File : kvi_kvs_useraction.h
+//   File : KviKvsUserAction.h
 //   Creation date : Tue 07 Dec 2004 02:00:24 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_kvs_action.h"
+#include "KviKvsAction.h"
 
 class KviConfigurationFile;
 class KviKvsScript;
diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/KviKvsVariant.cpp
index 1e7bad192..0e595433c 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.cpp
+++ b/src/kvirc/kvs/KviKvsVariant.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_variant.cpp
+//   File : KviKvsVariant.cpp
 //   Creation date : Tue 07 Oct 2003 04:01:19 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_variant.h"
-#include "kvi_kvs_arraycast.h"
-#include "kvi_kvs_hash.h"
-#include "kvi_kvs_array.h"
+#include "KviKvsVariant.h"
+#include "KviKvsArrayCast.h"
+#include "KviKvsHash.h"
+#include "KviKvsArray.h"
 
 #include <math.h>
 
diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/KviKvsVariant.h
index 94b373150..15ac31b08 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.h
+++ b/src/kvirc/kvs/KviKvsVariant.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_VARIANT_H_
 //=============================================================================
 //
-//   File : kvi_kvs_variant.h
+//   File : KviKvsVariant.h
 //   Creation date : Tue 07 Oct 2003 04:01:19 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_variant.h
+* \file KviKvsVariant.h
 * \author Szymon Stefanek
 * \brief Handling of variant data type in KVS
 */
@@ -33,7 +33,7 @@
 #include "kvi_settings.h"
 #include "KviQString.h"
 #include "KviHeapObject.h"
-#include "kvi_kvs_types.h"
+#include "KviKvsTypes.h"
 
 class KviKvsVariant;
 class KviKvsArrayCast;
@@ -868,7 +868,7 @@ private:
 	static KviKvsVariant * unserializeInteger(const QChar ** ppAux, QString & szData);
 };
 
-#include "kvi_kvs_array.h"
-#include "kvi_kvs_hash.h"
+#include "KviKvsArray.h"
+#include "KviKvsHash.h"
 
 #endif // _KVI_KVS_VARIANT_H_
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/KviKvsVariantList.cpp
index 4602f2f6d..0074fc11d 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp
+++ b/src/kvirc/kvs/KviKvsVariantList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_kvs_variantlist.cpp
+//   File : KviKvsVariantList.cpp
 //   Creation date : Sat 11 Oct 2003 02:20:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_kvs_variantlist.h"
+#include "KviKvsVariantList.h"
 
 KviKvsVariantList::KviKvsVariantList()
 {
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/KviKvsVariantList.h
index ba64cd537..e3557fad9 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.h
+++ b/src/kvirc/kvs/KviKvsVariantList.h
@@ -2,7 +2,7 @@
 #define _KVI_KVS_VARIANTLIST_H_
 //=============================================================================
 //
-//   File : kvi_kvs_variantlist.h
+//   File : KviKvsVariantList.h
 //   Creation date : Sat 11 Oct 2003 02:20:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,14 +25,14 @@
 //=============================================================================
 
 /**
-* \file kvi_kvs_variantlist.h
+* \file KviKvsVariantList.h
 * \author Szymon Stefanek
 * \brief Parser class to handle variant variables lists
 */
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_kvs_variant.h"
+#include "KviKvsVariant.h"
 
 /**
 * \class KviKvsVariantList
diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/KviMexLinkFilter.cpp
index ea95f592f..82aad2ae8 100644
--- a/src/kvirc/module/kvi_mexlinkfilter.cpp
+++ b/src/kvirc/module/KviMexLinkFilter.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_mexlinkfilter.cpp
+//   File : KviMexLinkFilter.cpp
 //   Creation date : Wed Apr 11 2003 03:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "kvi_mexlinkfilter.h"
+#include "KviMexLinkFilter.h"
 
 KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d)
 : QObject(), KviModuleExtension(d)
diff --git a/src/kvirc/module/kvi_mexlinkfilter.h b/src/kvirc/module/KviMexLinkFilter.h
index be31ff356..1ab965003 100644
--- a/src/kvirc/module/kvi_mexlinkfilter.h
+++ b/src/kvirc/module/KviMexLinkFilter.h
@@ -2,7 +2,7 @@
 #define _KVI_MEXLINKFILTER_H_
 //=============================================================================
 //
-//   File : kvi_mexlinkfilter.h
+//   File : KviMexLinkFilter.h
 //   Creation date : Wed Apr 11 2003 03:07 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_moduleextension.h"
+#include "KviModuleExtension.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/module/kvi_mexserverimport.cpp b/src/kvirc/module/KviMexServerImport.cpp
index 138219b73..11e9d3833 100644
--- a/src/kvirc/module/kvi_mexserverimport.cpp
+++ b/src/kvirc/module/KviMexServerImport.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_mexserverimport.cpp
+//   File : KviMexServerImport.cpp
 //   Creation date : Wed Apr 9 2003 04:53 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_mexserverimport.h"
+#include "KviMexServerImport.h"
 
 KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d)
 : QObject(), KviModuleExtension(d)
diff --git a/src/kvirc/module/kvi_mexserverimport.h b/src/kvirc/module/KviMexServerImport.h
index d096ed5fc..1f49ecc80 100644
--- a/src/kvirc/module/kvi_mexserverimport.h
+++ b/src/kvirc/module/KviMexServerImport.h
@@ -2,7 +2,7 @@
 #define _KVI_MEXSERVERIMPORT_H_
 //=============================================================================
 //
-//   File : kvi_mexserverimport.h
+//   File : KviMexServerImport.h
 //   Creation date : Wed Apr 9 2003 04:53 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "KviIrcServerDataBase.h"
-#include "kvi_moduleextension.h"
+#include "KviModuleExtension.h"
 
 #include <QObject>
 
diff --git a/src/kvirc/module/kvi_mextoolbar.cpp b/src/kvirc/module/KviMexToolBar.cpp
index 4be546352..1f6437ded 100644
--- a/src/kvirc/module/kvi_mextoolbar.cpp
+++ b/src/kvirc/module/KviMexToolBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_mextoolbar.cpp
+//   File : KviMexToolBar.cpp
 //   Creation date : Thu Sep 12 22:11:47 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,8 +23,8 @@
 //=============================================================================
 
 
-#include "kvi_mextoolbar.h"
-#include "kvi_frame.h"
+#include "KviMexToolBar.h"
+#include "KviMainWindow.h"
 
 KviMexToolBar::KviMexToolBar(KviModuleExtensionDescriptor * pDesc, const QString & szName)
 : KviToolBar(szName,Qt::TopToolBarArea), KviModuleExtension(pDesc)
diff --git a/src/kvirc/module/kvi_mextoolbar.h b/src/kvirc/module/KviMexToolBar.h
index 7f6564a84..d4e2f13ad 100644
--- a/src/kvirc/module/kvi_mextoolbar.h
+++ b/src/kvirc/module/KviMexToolBar.h
@@ -2,7 +2,7 @@
 #define _KVI_MEXTOOLBAR_H_
 //=============================================================================
 //
-//   File : kvi_mextoolbar.h
+//   File : KviMexToolBar.h
 //   Creation date : Thu Sep 12 22:11:45 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "kvi_moduleextension.h"
-#include "kvi_toolbar.h"
+#include "KviModuleExtension.h"
+#include "KviToolBar.h"
 
-class KviFrame;
+class KviMainWindow;
 
 class KVIRC_API KviMexToolBar : public KviToolBar, public KviModuleExtension
 {
diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/KviModule.cpp
index 02994b5f8..f0dc34a89 100644
--- a/src/kvirc/module/kvi_module.cpp
+++ b/src/kvirc/module/KviModule.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_module.cpp
+//   File : KviModule.cpp
 //   Creation date : Sat Aug 12 2000 20:30:29 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,12 +24,12 @@
 
 
 
-#include "kvi_module.h"
-#include "kvi_app.h"
+#include "KviModule.h"
+#include "KviApplication.h"
 #include "kvi_settings.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_eventhandler.h"
-#include "kvi_modulemanager.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsEventHandler.h"
+#include "KviModuleManager.h"
 
 #include <time.h>
 
@@ -213,7 +213,7 @@ void KviModule::getDefaultConfigFileName(QString &szBuffer)
 	QString tmp = "libkvi";
 	tmp += m_szName;
 	tmp += ".kvc";
-	g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,tmp);
+	g_pApp->getLocalKvircDirectory(szBuffer,KviApplication::ConfigPlugins,tmp);
 }
 
 bool KviModule::ctrl(const char * operation,void * param)
diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/KviModule.h
index 005fd1bc6..49d534dd9 100644
--- a/src/kvirc/module/kvi_module.h
+++ b/src/kvirc/module/KviModule.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_module.h
+//   File : KviModule.h
 //   Creation date : Sat Aug 12 2000 18:34:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -30,8 +30,8 @@
 #include "KviParameterList.h"
 #include <QLibrary>
 #include "KviPointerList.h"
-#include "kvi_moduleextension.h"
-#include "kvi_kvs_moduleinterface.h"
+#include "KviModuleExtension.h"
+#include "KviKvsModuleInterface.h"
 
 #include "KviPointerHashTable.h"
 
diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/KviModuleExtension.cpp
index 8820d6a23..ded5b237a 100644
--- a/src/kvirc/module/kvi_moduleextension.cpp
+++ b/src/kvirc/module/KviModuleExtension.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_moduleextension.cpp
+//   File : KviModuleExtension.cpp
 //   Creation date : Tue Sep 10 01:16:25 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,18 +24,18 @@
 
 #define _KVI_MODULEEXTENSION_CPP_
 
-#include "kvi_moduleextension.h"
-#include "kvi_module.h"
-#include "kvi_modulemanager.h"
-#include "kvi_app.h"
+#include "KviModuleExtension.h"
+#include "KviModule.h"
+#include "KviModuleManager.h"
+#include "KviApplication.h"
 
-// created and destroyed in kvi_app.cpp
+// created and destroyed in KviApplication.cpp
 KVIRC_API KviModuleExtensionManager    * g_pModuleExtensionManager    = 0;
 
 
 KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviCString &szType,const KviCString &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix)
 {
-	m_iId = KviApp::getGloballyUniqueId();
+	m_iId = KviApplication::getGloballyUniqueId();
 
 	m_pModule = m;
 	m_szType = szType;
diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/KviModuleExtension.h
index 085baaa4d..5e7f2ad1b 100644
--- a/src/kvirc/module/kvi_moduleextension.h
+++ b/src/kvirc/module/KviModuleExtension.h
@@ -2,7 +2,7 @@
 #define _KVI_MODULEEXTENSION_H_
 //=============================================================================
 //
-//   File : kvi_moduleextension.h
+//   File : KviModuleExtension.h
 //   Creation date : Tue Sep 10 01:16:24 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -104,9 +104,9 @@ extern KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager;
 class KVIRC_API KviModuleExtensionManager
 {
 	friend class KviModule;
-	friend class KviApp;
+	friend class KviApplication;
 protected:
-	KviModuleExtensionManager(); // KviApp calls this
+	KviModuleExtensionManager(); // KviApplication calls this
 	~KviModuleExtensionManager(); // and this
 protected:
 	KviPointerHashTable<const char *,KviModuleExtensionDescriptorList> * m_pExtensionDict;
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/KviModuleManager.cpp
index d26a89bf0..10c1ef8f7 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/KviModuleManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_modulemanager.cpp
+//   File : KviModuleManager.cpp
 //   Creation date : Sat Aug 12 2000 20:32:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,12 +25,12 @@
 
 #define _KVI_MODULEMANAGER_CPP_
 
-#include "kvi_modulemanager.h"
+#include "KviModuleManager.h"
 #include "KviFileUtils.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
-#include "kvi_console.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviMainWindow.h"
+#include "KviConsoleWindow.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 
@@ -81,9 +81,9 @@ void KviModuleManager::loadModulesByCaps(const QString &caps,const QString &dir)
 void KviModuleManager::loadModulesByCaps(const QString &caps)
 {
 	QString szDir;
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Plugins);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Plugins);
 	loadModulesByCaps(caps,szDir);
-	g_pApp->getGlobalKvircDirectory(szDir,KviApp::Plugins);
+	g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Plugins);
 	loadModulesByCaps(caps,szDir);
 }
 
@@ -125,9 +125,9 @@ void KviModuleManager::completeModuleNames(const QString &word,KviPointerList<QS
 {
 	QString szDir;
 	// FIXME: Should check for duplicate names here!
-	g_pApp->getLocalKvircDirectory(szDir,KviApp::Modules);
+	g_pApp->getLocalKvircDirectory(szDir,KviApplication::Modules);
 	completeModuleNames(szDir,word,matches);
-	g_pApp->getGlobalKvircDirectory(szDir,KviApp::Modules);
+	g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Modules);
 	completeModuleNames(szDir,word,matches);
 }
 
@@ -168,10 +168,10 @@ bool KviModuleManager::loadModule(const QString &modName)
 #endif
 	szName=szName.toLower();
 
-	g_pApp->getLocalKvircDirectory(tmp,KviApp::Modules,szName);
+	g_pApp->getLocalKvircDirectory(tmp,KviApplication::Modules,szName);
 	if(!KviFileUtils::fileExists(tmp))
 	{
-		g_pApp->getGlobalKvircDirectory(tmp,KviApp::Modules,szName);
+		g_pApp->getGlobalKvircDirectory(tmp,KviApplication::Modules,szName);
 	}
 
 	QLibrary* pLibrary = new QLibrary(tmp);
@@ -219,12 +219,12 @@ bool KviModuleManager::loadModule(const QString &modName)
 		QString szDir;
 		// it's more probable to have the translations in the global directory
 		// try it as first... (yes, catalogue overriding is impossible this way.. but, anybody cares ?)
-		g_pApp->getGlobalKvircDirectory(szDir,KviApp::Locale);
+		g_pApp->getGlobalKvircDirectory(szDir,KviApplication::Locale);
 
 		if(!KviLocale::loadCatalogue(info->szModuleContext,szDir))
 		{
 			// try the local directory then
-			g_pApp->getLocalKvircDirectory(szDir,KviApp::Locale);
+			g_pApp->getLocalKvircDirectory(szDir,KviApplication::Locale);
 			KviLocale::loadCatalogue(info->szModuleContext,szDir);
 		}
 	}
diff --git a/src/kvirc/module/kvi_modulemanager.h b/src/kvirc/module/KviModuleManager.h
index ae5227621..7ff4b7352 100644
--- a/src/kvirc/module/kvi_modulemanager.h
+++ b/src/kvirc/module/KviModuleManager.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_modulemanager.h
+//   File : KviModuleManager.h
 //   Creation date : Sat Aug 12 2000 20:31:17 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviPointerList.h"
-#include "kvi_module.h"
+#include "KviModule.h"
 #include "KviPointerHashTable.h"
 
 #include <QTimer>
diff --git a/src/kvirc/sparser/kvi_antispam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp
index 6179d4366..b32f94bd3 100644
--- a/src/kvirc/sparser/kvi_antispam.cpp
+++ b/src/kvirc/sparser/KviAntiSpam.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_antispam.cpp
+//   File : KviAntiSpam.cpp
 //   Creation date : Sun Apr 18 1999 05:36:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,8 +24,8 @@
 
 #define _KVI_ANTISPAM_CPP_
 
-#include "kvi_antispam.h"
-#include "kvi_options.h"
+#include "KviAntiSpam.h"
+#include "KviOptions.h"
 
 //[05:10:48] <Nataly19> :2http://www.extrababes.com5Go ahead punk, make my day !
 //[05:11:04] <treeman>  :-ææ¸`ææ¸`ææ¸ -= for mp3's go to http://members.xoom.com/treemansmp3/start.htm 
diff --git a/src/kvirc/sparser/kvi_antispam.h b/src/kvirc/sparser/KviAntiSpam.h
index 6de93846e..30afdd818 100644
--- a/src/kvirc/sparser/kvi_antispam.h
+++ b/src/kvirc/sparser/KviAntiSpam.h
@@ -2,7 +2,7 @@
 #define _KVI_ANTISPAM_H_
 //=============================================================================
 //
-//   File : kvi_antispam.h
+//   File : KviAntiSpam.h
 //   Creation date : Sun Apr 18 1999 05:36:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/sparser/kvi_ircmessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp
index 29c3674a5..246d5f889 100644
--- a/src/kvirc/sparser/kvi_ircmessage.cpp
+++ b/src/kvirc/sparser/KviIrcMessage.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircmessage.cpp
+//   File : KviIrcMessage.cpp
 //   Creation date : Fri Aug  2 23:08:57 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,9 +24,9 @@
 
 
 
-#include "kvi_ircmessage.h"
-#include "kvi_ircconnection.h"
-#include "kvi_console.h"
+#include "KviIrcMessage.h"
+#include "KviIrcConnection.h"
+#include "KviConsoleWindow.h"
 
 KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection)
 {
diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/KviIrcMessage.h
index 50a772015..f67c4f49b 100644
--- a/src/kvirc/sparser/kvi_ircmessage.h
+++ b/src/kvirc/sparser/KviIrcMessage.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCMESSAGE_H_
 //=============================================================================
 //
-//   File : kvi_ircmessage.h
+//   File : KviIrcMessage.h
 //   Creation date : Fri Aug  2 23:08:55 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -28,7 +28,7 @@
 #include "KviPointerList.h"
 #include "KviCString.h"
 #include "KviQString.h"
-#include "kvi_console.h"
+#include "KviConsoleWindow.h"
 
 class KviIrcConnection;
 class KviIrcContext;
diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/KviIrcNumericCodes.h
index a09ecd5e2..6a2a2b18a 100644
--- a/src/kvirc/sparser/kvi_numeric.h
+++ b/src/kvirc/sparser/KviIrcNumericCodes.h
@@ -27,7 +27,7 @@
 // and then leave 50-100 numbers between logical groups...
 
 // In kvirc 3.0.0 this file is newer included (at least for now: 31.07.2000)
-// Today I have included it in kvi_sp_numeric.cpp (23.03.2001)
+// Today I have included it in KviIrcServerParser_numericHandlers.cpp (23.03.2001)
 
 // ===============================================================================//
 //
diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/KviIrcServerParser.cpp
index c4950c041..26ecf61fa 100644
--- a/src/kvirc/sparser/kvi_sparser.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_sparser.cpp
+//   File : KviIrcServerParser.cpp
 //   Creation date : Sun Jun 30 2000 03:25:17 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,15 +24,15 @@
 
 #define _KVI_SPARSER_CPP_
 
-#include "kvi_sparser.h"
-#include "kvi_window.h"
+#include "KviIrcServerParser.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_ircsocket.h"
-#include "kvi_options.h"
-#include "kvi_kvs_eventmanager.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_ircconnectionstatedata.h"
+#include "KviIrcSocket.h"
+#include "KviOptions.h"
+#include "KviKvsEventManager.h"
+#include "KviKvsEventTriggers.h"
+#include "KviIrcConnectionStateData.h"
 
 KviIrcServerParser * g_pServerParser = 0;
 
diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/KviIrcServerParser.h
index b56e3ed40..739cd6b8d 100644
--- a/src/kvirc/sparser/kvi_sparser.h
+++ b/src/kvirc/sparser/KviIrcServerParser.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_sparser.h
+//   File : KviIrcServerParser.h
 //   Creation date : Sat Jun 29 2000 14:23:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -29,8 +29,8 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "KviQString.h"
-#include "kvi_console.h"
-#include "kvi_ircmessage.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcMessage.h"
 
 #include <QObject>
 #include <QByteArray>
@@ -38,9 +38,9 @@
 #include <time.h>
 
 class KviWindow;
-class KviChannel;
+class KviChannelWindow;
 class KviIrcServerParser;
-class KviFrame;
+class KviMainWindow;
 class KviIrcConnection;
 
 
@@ -128,7 +128,7 @@ private:
 	static KviCtcpMessageParseStruct    m_ctcpReplyParseProcTable[];
 	KviCString                              m_szLastParserError;
 
-//	KviCString                              m_szNoAwayNick; //<-- moved to kvi_console.h in KviConnectionInfo
+//	KviCString                              m_szNoAwayNick; //<-- moved to KviConsoleWindow.h in KviConnectionInfo
 public:
 	void parseMessage(const char * message,KviIrcConnection *pConnection);
 private:
@@ -226,7 +226,7 @@ private:
 	void parseLiteralWallops(KviIrcMessage *msg);
 	void parseLiteralPong(KviIrcMessage *msg);
 	void parseLiteralError(KviIrcMessage *msg);
-	void parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviCString &modefl,KviIrcMessage *msg,int curParam);
+	void parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannelWindow * chan,KviCString &modefl,KviIrcMessage *msg,int curParam);
 	void parseUserMode(KviIrcMessage *msg,const char * modeflptr);
 	void parseLiteralCap(KviIrcMessage * msg);
 	void parseLiteralAuthenticate(KviIrcMessage * msg);
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index 62eae4f44..1f6308185 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_sp_ctcp.cpp
+//   File : KviIrcServerParser_ctcp.cpp
 //   Creation date : Thu Aug 16 2000 13:34:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -28,31 +28,31 @@
 
 #include "KviMircCntrl.h"
 #include "KviOsInfo.h"
-#include "kvi_app.h"
-#include "kvi_sparser.h"
-#include "kvi_window.h"
+#include "KviApplication.h"
+#include "KviIrcServerParser.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_ircsocket.h"
-#include "kvi_channel.h"
+#include "KviIrcSocket.h"
+#include "KviChannelWindow.h"
 #include "kvi_defaults.h"
-#include "kvi_channel.h"
-#include "kvi_query.h"
+#include "KviChannelWindow.h"
+#include "KviQueryWindow.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_iconmanager.h"
-#include "kvi_modulemanager.h"
+#include "KviIconManager.h"
+#include "KviModuleManager.h"
 #include "KviSharedFilesManager.h"
 #include "KviTimeUtils.h"
 #include "KviFileUtils.h"
-#include "kvi_ctcppagedialog.h"
-#include "kvi_useraction.h"
-#include "kvi_options.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionantictcpflooddata.h"
-#include "kvi_lagmeter.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_kvs_script.h"
+#include "KviCtcpPageDialog.h"
+#include "KviUserAction.h"
+#include "KviOptions.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionAntiCtcpFloodData.h"
+#include "KviLagMeter.h"
+#include "KviKvsEventTriggers.h"
+#include "KviKvsScript.h"
 #include "kvi_sourcesdate.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviBuildInfo.h"
@@ -1401,7 +1401,7 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 		if(pOut)szData = pOut->decodeText(szData8.ptr());
 		else szData = msg->msg->connection()->decodeText(szData8.ptr());
 	} else {
-		KviQuery * query = msg->msg->connection()->findQuery(msg->pSource->nick());
+		KviQueryWindow * query = msg->msg->connection()->findQuery(msg->pSource->nick());
 		if(!query)
 		{
 			szData = msg->msg->connection()->decodeText(szData8.ptr());
@@ -1470,7 +1470,7 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 				szMsg += msg->pSource->nick();
 				szMsg += "</b> ";
 				szMsg += Qt::escape(szData);
-				//qDebug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data());
+				//qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data());
 				g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 			}
 		}
@@ -1482,7 +1482,7 @@ void KviIrcServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 		szMsg += szData;
 		if(bIsChannel)
 		{
-			((KviChannel *)pOut)->outputMessage(type,szMsg);
+			((KviChannelWindow *)pOut)->outputMessage(type,szMsg);
 		} else {
 			pOut->outputNoFmt(type,szMsg);
 		}
@@ -1641,7 +1641,7 @@ void KviIrcServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg)
 					QString szLocalFilePath;
 					QString szLocalFile = szRemoteFile;
 					g_pIconManager->urlToCachedFileName(szLocalFile);
-					g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApp::Avatars,szLocalFile);
+					g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApplication::Avatars,szLocalFile);
 					KviQString::escapeKvs(&szLocalFilePath, KviQString::EscapeSpace);
 					QString szCommand = "http.get -w=nm ";
 					unsigned int uMaxSize = KVI_OPTION_UINT(KviOption_uintMaximumRequestedAvatarSize);
@@ -1840,9 +1840,9 @@ void KviIrcServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg)
 
 	if(bNeedToUpdateUserlist)
 	{
-		if(KviQString::equalCS(g_pActiveWindow->metaObject()->className(),QString("KviChannel")))
+		if(KviQString::equalCS(g_pActiveWindow->metaObject()->className(),QString("KviChannelWindow")))
 		{
-			((KviChannel*)g_pActiveWindow)->userListView()->updateArea();
+			((KviChannelWindow*)g_pActiveWindow)->userListView()->updateArea();
 		}
 
 	}
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index 54fda159c..bf4ec67a7 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -1,6 +1,6 @@
 //===============================================================================
 //
-//   File : kvi_sp_literal.cpp
+//   File : KviIrcServerParser_literalHandlers.cpp
 //   Creation date : Thu Aug 3 2000 01:29:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,52 +25,52 @@
 
 
 
-#include "kvi_sparser.h"
-#include "kvi_window.h"
-#include "kvi_console.h"
+#include "KviIrcServerParser.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_ircsocket.h"
-#include "kvi_options.h"
+#include "KviIrcSocket.h"
+#include "KviOptions.h"
 #include "KviIrcMask.h"
-#include "kvi_channel.h"
-#include "kvi_topicw.h"
-#include "kvi_frame.h"
+#include "KviChannelWindow.h"
+#include "KviTopicWidget.h"
+#include "KviMainWindow.h"
 #include "KviMircCntrl.h"
-#include "kvi_query.h"
-#include "kvi_userlistview.h"
-#include "kvi_antispam.h"
+#include "KviQueryWindow.h"
+#include "KviUserListView.h"
+#include "KviAntiSpam.h"
 #include "KviNickServRuleSet.h"
 #include "KviParameterList.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviRegisteredUserDataBase.h"
 #include "kvi_debug.h"
 #include "KviTimeUtils.h"
-#include "kvi_useraction.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircconnectionrequestqueue.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionstatedata.h"
-#include "kvi_ircconnectionnetsplitdetectordata.h"
-#include "kvi_iconmanager.h"
-#include "kvi_lagmeter.h"
+#include "KviUserAction.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcConnectionRequestQueue.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionStateData.h"
+#include "KviIrcConnectionNetsplitDetectorData.h"
+#include "KviIconManager.h"
+#include "KviLagMeter.h"
 #include "KviIrcServer.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvsEventTriggers.h"
 #include "KviIrcNetwork.h"
 #include "kvi_settings.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptController.h"
 #endif
 
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 
 //#include "KviRegisteredUserDataBase.h"
-//#include "kvi_iconmanager.h"
+//#include "KviIconManager.h"
 #include <QDateTime>
 #include <QTextDocument>
 #include <QByteArray>
@@ -196,7 +196,7 @@ void KviIrcServerParser::parseLiteralJoin(KviIrcMessage *msg)
 
 	// Now lookup the channel
 	KviConsole * console = msg->console();
-	KviChannel * chan = msg->connection()->findChannel(channel);
+	KviChannelWindow * chan = msg->connection()->findChannel(channel);
 
 	bool bIsMe = IS_ME(msg,szNick);
 
@@ -281,7 +281,7 @@ void KviIrcServerParser::parseLiteralJoin(KviIrcMessage *msg)
 
 	QString szChans;
 	int iChans = msg->connection()->getCommonChannels(szNick,szChans);
-	KviQuery * q = console->connection()->findQuery(szNick);
+	KviQueryWindow * q = console->connection()->findQuery(szNick);
 	if(q)
 	{
 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
@@ -313,7 +313,7 @@ void KviIrcServerParser::parseLiteralPart(KviIrcMessage *msg)
 
 	// Now lookup the channel
 	KviConsole * console = msg->console();
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 
 	if(!chan)
 	{
@@ -378,7 +378,7 @@ void KviIrcServerParser::parseLiteralPart(KviIrcMessage *msg)
 		{
 			QString szChans;
 			int iChans = console->connection()->getCommonChannels(szNick,szChans);
-			KviQuery * q = console->connection()->findQuery(szNick);
+			KviQueryWindow * q = console->connection()->findQuery(szNick);
 			if(q)
 			{
 				if(!partMsg.isEmpty())
@@ -474,7 +474,7 @@ void KviIrcServerParser::parseLiteralQuit(KviIrcMessage *msg)
 		if(console->connection())
 		{
 			for(
-					KviChannel *daChan=console->connection()->channelList()->first();
+					KviChannelWindow *daChan=console->connection()->channelList()->first();
 					daChan;
 					daChan=console->connection()->channelList()->next())
 			{
@@ -501,7 +501,7 @@ void KviIrcServerParser::parseLiteralQuit(KviIrcMessage *msg)
 	}
 
 
-	for(KviChannel *c=console->connection()->channelList()->first();c;c=console->connection()->channelList()->next())
+	for(KviChannelWindow *c=console->connection()->channelList()->first();c;c=console->connection()->channelList()->next())
 	{
 		if(c->part(szNick))
 		{
@@ -523,7 +523,7 @@ void KviIrcServerParser::parseLiteralQuit(KviIrcMessage *msg)
 
 	if(!msg->haltOutput())
 	{
-		KviQuery * q = msg->connection()->findQuery(szNick);
+		KviQueryWindow * q = msg->connection()->findQuery(szNick);
 		if(q)
 		{
 			QString quitMsg = q->decodeText(msg->safeTrailing());
@@ -554,7 +554,7 @@ void KviIrcServerParser::parseLiteralKick(KviIrcMessage *msg)
 	QString victim = msg->connection()->decodeText(msg->safeParam(1));
 
 	KviConsole * console = msg->console();
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 
 	if(!chan){
 		// Ooops, desync with the server.
@@ -646,7 +646,7 @@ void KviIrcServerParser::parseLiteralKick(KviIrcMessage *msg)
 
 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
 		{
-			KviQuery * q = console->connection()->findQuery(victim);
+			KviQueryWindow * q = console->connection()->findQuery(victim);
 			if(q)
 			{
 				QString szChans;
@@ -816,7 +816,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 
 		// A query request
 		// do we have a matching window ?
-		KviQuery * query = msg->connection()->findQuery(szNick);
+		KviQueryWindow * query = msg->connection()->findQuery(szNick);
 
 		if(!query)
 		{
@@ -925,7 +925,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 						// don't send the message to the notifier twice
 						iFlags |= KviConsole::NoNotifier;
 						QString szMsg = Qt::escape(szMsgText);
-						//qDebug("kvi_sp_literal.cpp:908 debug: %s",szMsgText.data());
+						//qDebug("KviIrcServerParser_literalHandlers.cpp:908 debug: %s",szMsgText.data());
 						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 					}
 				}
@@ -965,10 +965,10 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 				if(KviIrcConnection * pConnection = console->connection())
 				{
 					KviWindow * aWin = console->activeWindow();
-					if((aWin->type() == KVI_WINDOW_TYPE_CHANNEL) && ((KviChannel *)aWin)->isOn(szNick))
+					if((aWin->type() == KVI_WINDOW_TYPE_CHANNEL) && ((KviChannelWindow *)aWin)->isOn(szNick))
 						pOut = aWin;
 					else {
-						for(KviChannel * c = pConnection->channelList()->first();c;c = pConnection->channelList()->next())
+						for(KviChannelWindow * c = pConnection->channelList()->first();c;c = pConnection->channelList()->next())
 							if(c->isOn(szNick))
 							{
 								pOut = (KviWindow *) c;
@@ -983,7 +983,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 	} else {
 		// Channel PRIVMSG
 
-		KviChannel * chan = msg->connection()->findChannel(szTarget);
+		KviChannelWindow * chan = msg->connection()->findChannel(szTarget);
 
 		QString szOriginalTarget = szTarget;
 		QString szPrefixes;
@@ -1194,7 +1194,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 
 		// A query request
 		// do we have a matching window ?
-		KviQuery * query = msg->connection()->findQuery(szNick);
+		KviQueryWindow * query = msg->connection()->findQuery(szNick);
 
 		if(!query)
 		{
@@ -1290,7 +1290,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 						// don't send the message twice to the notifier
 						iFlags |= KviConsole::NoNotifier;
 						QString szMsg = Qt::escape(szMsgText);
-						//qDebug("kvi_sp_literal.cpp:1262 debug: %s",szMsgText.data());
+						//qDebug("KviIrcServerParser_literalHandlers.cpp:1262 debug: %s",szMsgText.data());
 						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 					}
 				}
@@ -1312,10 +1312,10 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 				if(KviIrcConnection * pConnection = console->connection())
 				{
 					KviWindow * aWin = console->activeWindow();
-					if((aWin->type() == KVI_WINDOW_TYPE_CHANNEL) && ((KviChannel *)aWin)->isOn(szNick))
+					if((aWin->type() == KVI_WINDOW_TYPE_CHANNEL) && ((KviChannelWindow *)aWin)->isOn(szNick))
 						pOut = aWin;
 					else {
-						for(KviChannel * c = pConnection->channelList()->first();c;c = pConnection->channelList()->next())
+						for(KviChannelWindow * c = pConnection->channelList()->first();c;c = pConnection->channelList()->next())
 							if(c->isOn(szNick))
 							{
 								pOut = (KviWindow *) c;
@@ -1331,7 +1331,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg)
 	}
 
 	// Channel NOTICE
-	KviChannel * chan = msg->connection()->findChannel(szTarget);
+	KviChannelWindow * chan = msg->connection()->findChannel(szTarget);
 
 	QString szOriginalTarget = szTarget;
 	QString szPrefixes;
@@ -1416,7 +1416,7 @@ void KviIrcServerParser::parseLiteralTopic(KviIrcMessage *msg)
 	QString szTarget = msg->connection()->decodeText(msg->safeParam(0));
 
 	// Now lookup the channel
-	KviChannel * chan = msg->connection()->findChannel(szTarget);
+	KviChannelWindow * chan = msg->connection()->findChannel(szTarget);
 
 	if(!chan)
 	{
@@ -1486,7 +1486,7 @@ void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg)
 	if(pUserEntry)
 		pUserEntry->setSmartNickColor(-1);
 
-	for(KviChannel * c = console->connection()->channelList()->first();c;c = console->connection()->channelList()->next())
+	for(KviChannelWindow * c = console->connection()->channelList()->first();c;c = console->connection()->channelList()->next())
 	{
 		if(c->nickChange(szNick,szNewNick))
 		{
@@ -1508,7 +1508,7 @@ void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg)
 		{
 			// just update all the captions : we have changed OUR nick
 			for(
-					KviQuery * q = console->connection()->queryList()->first();
+					KviQueryWindow * q = console->connection()->queryList()->first();
 					q;
 					q = console->connection()->queryList()->next()
 				)
@@ -1520,14 +1520,14 @@ void KviIrcServerParser::parseLiteralNick(KviIrcMessage *msg)
 		}
 	}
 
-	KviQuery * q = console->connection()->findQuery(szNick);
+	KviQueryWindow * q = console->connection()->findQuery(szNick);
 
 	// It CAN happen that szNewNick first queries us without being
 	// on any channel then he QUITS, he reconnects, he joins
 	// a channel with szNick, queries us and changes nick to szNewNick : gotcha!
 	// should merge the queries!
 
-	KviQuery * old = console->connection()->findQuery(szNewNick);
+	KviQueryWindow * old = console->connection()->findQuery(szNewNick);
 	if(old && (old != q))
 	{
 		if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing) && (!_OUTPUT_QUIET))
@@ -1708,7 +1708,7 @@ void KviIrcServerParser::parseLiteralMode(KviIrcMessage *msg)
 			msg->console()->output(KVI_OUT_MODE,__tr2qs("You have set user mode %s"),modefl.ptr());
 	} else {
 		// a channel mode
-		KviChannel * chan = msg->connection()->findChannel(szTarget);
+		KviChannelWindow * chan = msg->connection()->findChannel(szTarget);
 
 		if(!chan){
 			// Ooops, desync with the server.
@@ -1721,7 +1721,7 @@ void KviIrcServerParser::parseLiteralMode(KviIrcMessage *msg)
 	}
 }
 
-void KviIrcServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviCString &modefl,KviIrcMessage *msg,int curParam)
+void KviIrcServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannelWindow * chan,KviCString &modefl,KviIrcMessage *msg,int curParam)
 {
 	bool bSet = true;
 	// bIsMultiMode: +snt
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index d09294576..89f76c4c9 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -1,6 +1,6 @@
 //===========================================================================
 //
-//   File : kvi_sp_numeric.cpp
+//   File : KviIrcServerParser_numericHandlers.cpp
 //   Creation date : Thu Aug 3 2000 01:30:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,35 +25,35 @@
 
 
 
-#include "kvi_sparser.h"
+#include "KviIrcServerParser.h"
 
-#include "kvi_window.h"
-#include "kvi_query.h"
+#include "KviWindow.h"
+#include "KviQueryWindow.h"
 #include "kvi_out.h"
 #include "KviLocale.h"
-#include "kvi_ircsocket.h"
-#include "kvi_options.h"
-#include "kvi_channel.h"
-#include "kvi_topicw.h"
+#include "KviIrcSocket.h"
+#include "KviOptions.h"
+#include "KviChannelWindow.h"
+#include "KviTopicWidget.h"
 #include "KviIrcUserDataBase.h"
 #include "kvi_defaults.h"
 #include "KviMircCntrl.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviParameterList.h"
-#include "kvi_app.h"
-#include "kvi_notifylist.h"
-#include "kvi_numeric.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionstatedata.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionasyncwhoisdata.h"
-#include "kvi_ircconnectiontarget.h"
+#include "KviApplication.h"
+#include "KviNotifyList.h"
+#include "KviIrcNumericCodes.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionStateData.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionAsyncWhoisData.h"
+#include "KviIrcConnectionTarget.h"
 #include "KviTimeUtils.h"
-#include "kvi_lagmeter.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_variantlist.h"
+#include "KviLagMeter.h"
+#include "KviKvsEventTriggers.h"
+#include "KviKvsScript.h"
+#include "KviKvsVariantList.h"
 #include "KviIdentityProfile.h"
 
 #include <QPixmap>
@@ -401,7 +401,7 @@ void KviIrcServerParser::parseNumericEndOfNames(KviIrcMessage *msg)
 	// 366: RPL_ENDOFNAMES [I,E,U,D]
 	// :prefix 366 target <channel> :End of /NAMES list.
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		if(!chan->hasAllNames())
@@ -444,7 +444,7 @@ void KviIrcServerParser::parseNumericNames(KviIrcMessage *msg)
 	// ...but we ignore it
 	//QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- QByteArray::data() is implicitly unsafe: it CAN return 0
 	QString szChan = msg->connection()->decodeText(msg->safeParam(2));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	// and run to the first nickname
 	char * aux = msg->safeTrailingString().ptr();
 	while((*aux) && (*aux == ' '))aux++;
@@ -520,7 +520,7 @@ void KviIrcServerParser::parseNumericTopic(KviIrcMessage *msg)
 	// 332: RPL_TOPIC [I,E,U,D]
 	// :prefix 332 target <channel> :<topic>
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		QString szTopic = chan->decodeText(msg->safeTrailing());
@@ -548,7 +548,7 @@ void KviIrcServerParser::parseNumericNoTopic(KviIrcMessage *msg)
 	// 331: RPL_NOTOPIC [I,E,U,D]
 	// :prefix 331 target <channel> :No topic is set
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		chan->topicWidget()->setTopic("");
@@ -571,7 +571,7 @@ void KviIrcServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg)
 	// :prefix 333 target <channel> <whoset> <time>
 
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 
 	KviCString tmp = msg->safeParam(3);
 	bool bOk = false;
@@ -636,7 +636,7 @@ void KviIrcServerParser::parseNumericChannelModeIs(KviIrcMessage *msg)
 	// :prefix 324 target <channel> +<chanmode>
 	QString szSource = msg->connection()->decodeText(msg->safePrefix());
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	KviCString modefl = msg->safeParam(2);
 	if(chan)parseChannelMode(szSource,"*","*",chan,modefl,msg,3);
 	else {
@@ -689,7 +689,7 @@ void KviIrcServerParser::parseNumeric367(KviIrcMessage *msg)
 	QString bansetat;
 	getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4));
 	if(bansetby.isEmpty())bansetby = __tr2qs("(Unknown)");
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		if(msg->connection()->serverInfo()->supportedListModes().contains('q') && chan->sentListRequest('q'))
@@ -715,7 +715,7 @@ void KviIrcServerParser::parseNumeric367(KviIrcMessage *msg)
 void KviIrcServerParser::parseNumeric368(KviIrcMessage *msg)
 {
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		if(msg->connection()->serverInfo()->supportedListModes().contains('q') && chan->sentListRequest('q'))
@@ -741,7 +741,7 @@ void KviIrcServerParser::parseNumeric368(KviIrcMessage *msg)
 	void KviIrcServerParser::__funcname(KviIrcMessage *msg) \
 	{ \
 		QString szChan = msg->connection()->decodeText(msg->safeParam(1)); \
-		KviChannel * chan = msg->connection()->findChannel(szChan); \
+		KviChannelWindow * chan = msg->connection()->findChannel(szChan); \
 		if(chan) \
 		{ \
 			if(chan->sentListRequest(__modechar)) \
@@ -774,7 +774,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfReopList,'R',KVI_OUT_BAN,__tr2qs("reop
 		QString bansetat; \
 		getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \
 		if(bansetby.isEmpty())bansetby = __tr2qs("(Unknown)"); \
-		KviChannel * chan = msg->connection()->findChannel(szChan); \
+		KviChannelWindow * chan = msg->connection()->findChannel(szChan); \
 		if(chan) \
 		{ \
 			chan->setMask(__modechar,banmask,true,bansetby,QString(msg->safeParam(4)).toUInt()); \
@@ -832,7 +832,7 @@ void KviIrcServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 		e->setIrcOp(bIrcOp);
 		e->setUserFlags(szFlag);
 
-		KviQuery * q = msg->connection()->findQuery(szNick);
+		KviQueryWindow * q = msg->connection()->findQuery(szNick);
 		if(q)
 			q->updateLabelText();
 
@@ -866,7 +866,7 @@ void KviIrcServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 		e->setRealName(szReal);
 	}
 
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		if(!chan->hasWhoList())
@@ -910,7 +910,7 @@ void KviIrcServerParser::parseNumericEndOfWho(KviIrcMessage *msg)
 	// 315: RPL_ENDOFWHO [I,E,U,D]
 	// :prefix 315 target <channel/nick> :End of /WHO List.
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
 		chan->userListView()->updateArea();
@@ -1192,7 +1192,7 @@ void KviIrcServerParser::parseNumericWhoisAway(KviIrcMessage * msg)
 	KviIrcUserDataBase * db = msg->connection()->userDataBase();
 	KviIrcUserEntry * e = db->find(szNk);
 	if(e)e->setAway(true);
-	KviQuery * q = msg->connection()->findQuery(szNk);
+	KviQueryWindow * q = msg->connection()->findQuery(szNk);
 	if(q) q->updateLabelText();
 	QString szWText = msg->connection()->decodeText(msg->safeTrailing());
 
@@ -1236,11 +1236,11 @@ void KviIrcServerParser::parseNumericWhoisUser(KviIrcMessage *msg)
 		if(e->gender() != KviIrcUserEntry::Unknown)
 		{
 			// hum... this is ugly
-			if(KviQString::equalCS(g_pActiveWindow->metaObject()->className(),QString("KviChannel")))
-				((KviChannel*)g_pActiveWindow)->userListView()->updateArea();
+			if(KviQString::equalCS(g_pActiveWindow->metaObject()->className(),QString("KviChannelWindow")))
+				((KviChannelWindow*)g_pActiveWindow)->userListView()->updateArea();
 		}
 
-		KviQuery * q = msg->connection()->findQuery(szNick);
+		KviQueryWindow * q = msg->connection()->findQuery(szNick);
 		if(q)
 			q->updateLabelText();
 
@@ -1454,7 +1454,7 @@ void KviIrcServerParser::parseNumericWhoisServer(KviIrcMessage *msg)
 	KviIrcUserDataBase * db = msg->connection()->userDataBase();
 	KviIrcUserEntry * e = db->find(szNick);
 	if(e)e->setServer(szServ);
-	KviQuery * q = msg->connection()->findQuery(szNick);
+	KviQueryWindow * q = msg->connection()->findQuery(szNick);
 	if(q) q->updateLabelText();
 	KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(msg->safeParam(1));
 	if(i)
@@ -1692,7 +1692,7 @@ void KviIrcServerParser::parseNumericNoSuchNick(KviIrcMessage *msg)
 			pOut = (KviWindow *)(msg->console()->activeWindow());
 		}
 		//} else {
-		//	((KviQuery *)pOut)->removeTarget(msg->safeParam(1));
+		//	((KviQueryWindow *)pOut)->removeTarget(msg->safeParam(1));
 		//}
 		QString szWText = pOut->decodeText(msg->safeTrailing());
 		pOut->output(KVI_OUT_NICKNAMEPROBLEM,"\r!n\r%Q\r: %Q",
@@ -1705,7 +1705,7 @@ void KviIrcServerParser::parseNumericCreationTime(KviIrcMessage *msg)
 	// 329: RPL_CREATIONTIME
 	// :prefix 329 <target> <channel> <creation_time>
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
-	KviChannel * chan = msg->connection()->findChannel(szChan);
+	KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 	KviCString tmstr = msg->safeParam(2);
 	QDateTime date;
 	date.setTime_t((time_t)tmstr.toUInt());
@@ -2075,7 +2075,7 @@ void KviIrcServerParser::parseNumericInviting(KviIrcMessage * msg)
 		QString szWho = msg->connection()->decodeText(msg->safeParam(0));
 		QString szTarget = msg->connection()->decodeText(msg->safeParam(1));
 		QString szChan = msg->connection()->decodeText(msg->safeParam(2));
-		KviChannel * chan = msg->connection()->findChannel(szChan);
+		KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 		if(chan)
 		{
 			chan->output(KVI_OUT_INVITE,__tr2qs("\r!n\r%Q\r invited %Q into channel %Q"),&szWho,&szTarget,&szChan);
@@ -2184,7 +2184,7 @@ void KviIrcServerParser::parseNumericCannotSendColor(KviIrcMessage * msg)
 	{
 		QString szChan = msg->connection()->decodeText(msg->safeParam(1));
 		QString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-		KviChannel * chan = msg->connection()->findChannel(szChan);
+		KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 		if(chan)
 		{
 			chan->output(KVI_OUT_GENERICERROR,__tr2qs("Cannot send to channel: %Q"),&szInfo);
@@ -2202,7 +2202,7 @@ void KviIrcServerParser::parseNumericCannotSend(KviIrcMessage * msg)
 	{
 		QString szChan = msg->connection()->decodeText(msg->safeParam(1));
 		QString szInfo = msg->connection()->decodeText(msg->safeTrailing());
-		KviChannel * chan = msg->connection()->findChannel(szChan);
+		KviChannelWindow * chan = msg->connection()->findChannel(szChan);
 		if(chan)
 		{
 			chan->output(KVI_OUT_GENERICERROR,__tr2qs("Cannot send to channel"));
diff --git a/src/kvirc/sparser/kvi_sp_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
index c73c58bfb..0c59b1da4 100644
--- a/src/kvirc/sparser/kvi_sp_tables.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_sp_tables.cpp
+//   File : KviIrcServerParser_tables.cpp
 //   Creation date : Sun Jun 30 2000 18:10:19 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "kvi_sparser.h"
+#include "KviIrcServerParser.h"
 
 #define PTM(__m) KVI_PTR2MEMBER(KviIrcServerParser::__m)
 
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/KviActionDrawer.cpp
index f35d82f65..8745cc1d5 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/KviActionDrawer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_actiondrawer.cpp
+//   File : KviActionDrawer.cpp
 //   Creation date : Sun 21 Nov 2004 05:44:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -24,11 +24,11 @@
 
 
 
-#include "kvi_app.h"
-#include "kvi_actiondrawer.h"
-#include "kvi_action.h"
-#include "kvi_actionmanager.h"
-#include "kvi_iconmanager.h"
+#include "KviApplication.h"
+#include "KviActionDrawer.h"
+#include "KviAction.h"
+#include "KviActionManager.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
 #include "KviTalListWidget.h"
 
diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/KviActionDrawer.h
index bfa96443c..8df7fbc55 100644
--- a/src/kvirc/ui/kvi_actiondrawer.h
+++ b/src/kvirc/ui/KviActionDrawer.h
@@ -2,7 +2,7 @@
 #define _KVI_ACTIONDRAWER_H_
 //=============================================================================
 //
-//   File : kvi_actiondrawer.h
+//   File : KviActionDrawer.h
 //   Creation date : Sun 21 Nov 2004 05:44:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_actiondrawer.h
+* \file KviActionDrawer.h
 * \author Szymon Stefanek
 * \brief Handling of actions drawer
 */
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 7d95efdd4..6026f7347 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_channel.cpp
+//   File : KviChannelWindow.cpp
 //   Creation date : Tue Aug  1 2000 02:20:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,44 +22,44 @@
 //
 //=============================================================================
 
-#include "kvi_channel.h"
-#include "kvi_console.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
-#include "kvi_input.h"
-#include "kvi_options.h"
+#include "KviChannelWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
+#include "KviInput.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_topicw.h"
-#include "kvi_ircsocket.h"
+#include "KviTopicWidget.h"
+#include "KviIrcSocket.h"
 #include "kvi_out.h"
 #include "KviMemory.h"
-#include "kvi_windowlist.h"
-#include "kvi_frame.h"
+#include "KviWindowListBase.h"
+#include "KviMainWindow.h"
 #include "KviConfigurationFile.h"
-#include "kvi_maskeditor.h"
+#include "KviMaskEditor.h"
 #include "KviMircCntrl.h"
 #include "kvi_settings.h"
 #include "KviParameterList.h"
-#include "kvi_modeeditor.h"
-#include "kvi_app.h"
-#include "kvi_useraction.h"
-#include "kvi_toolwindows_container.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionrequestqueue.h"
+#include "KviModeEditor.h"
+#include "KviApplication.h"
+#include "KviUserAction.h"
+#include "KviWindowToolWidget.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionRequestQueue.h"
 #include "kvi_defaults.h"
-#include "kvi_sparser.h"
-#include "kvi_modew.h"
+#include "KviIrcServerParser.h"
+#include "KviModeWidget.h"
 #include "KviMircCntrl.h"
 #include "KviPointerHashTable.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvsScript.h"
+#include "KviKvsEventTriggers.h"
 #include "KviTalPopupMenu.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptController.h"
 #endif
 
 #ifdef COMPILE_ZLIB_SUPPORT
@@ -83,7 +83,7 @@
 // FIXME: #warning "OnChannelFlood event...."
 
 
-KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szName)
+KviChannelWindow::KviChannelWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szName)
 : KviWindow(KVI_WINDOW_TYPE_CHANNEL,lpFrm,szName,lpConsole)
 {
 	// Init some member variables
@@ -247,7 +247,7 @@ KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString &
 	m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t();
 }
 
-KviChannel::~KviChannel()
+KviChannelWindow::~KviChannelWindow()
 {
 	// Unregister ourself
 	if(type() == KVI_WINDOW_TYPE_DEADCHANNEL)
@@ -274,7 +274,7 @@ KviChannel::~KviChannel()
 	m_pModeLists.clear();
 }
 
-void KviChannel::toggleToolButtons()
+void KviChannelWindow::toggleToolButtons()
 {
 	if(!buttonContainer())
 		return;
@@ -287,17 +287,17 @@ void KviChannel::toggleToolButtons()
 		m_pHideToolsButton->setIcon(QIcon(*pix));
 }
 
-void KviChannel::triggerCreationEvents()
+void KviChannelWindow::triggerCreationEvents()
 {
 	KVS_TRIGGER_EVENT_0(KviEvent_OnChannelWindowCreated,this);
 }
 
-void KviChannel::textViewRightClicked()
+void KviChannelWindow::textViewRightClicked()
 {
 	KVS_TRIGGER_EVENT_0(KviEvent_OnChannelPopupRequest,this);
 }
 
-void KviChannel::getBaseLogFileName(QString & szBuffer)
+void KviChannelWindow::getBaseLogFileName(QString & szBuffer)
 {
 	QString szChan(windowName());
 	szChan.replace(".","%2e");
@@ -315,7 +315,7 @@ void KviChannel::getBaseLogFileName(QString & szBuffer)
 	}
 }
 
-void KviChannel::applyOptions()
+void KviChannelWindow::applyOptions()
 {
 	m_pUserListView->applyOptions();
 	m_pTopicWidget->applyOptions();
@@ -329,7 +329,7 @@ void KviChannel::applyOptions()
 	KviWindow::applyOptions();
 }
 
-void KviChannel::getConfigGroupName(QString & szBuffer)
+void KviChannelWindow::getConfigGroupName(QString & szBuffer)
 {
 	szBuffer = windowName();
 
@@ -342,7 +342,7 @@ void KviChannel::getConfigGroupName(QString & szBuffer)
 // 	}
 }
 
-void KviChannel::saveProperties(KviConfigurationFile * cfg)
+void KviChannelWindow::saveProperties(KviConfigurationFile * cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes());
@@ -358,7 +358,7 @@ void KviChannel::saveProperties(KviConfigurationFile * cfg)
 	cfg->writeEntry("ToolButtonsHidden",buttonContainer()->isHidden());
 }
 
-void KviChannel::loadProperties(KviConfigurationFile * cfg)
+void KviChannelWindow::loadProperties(KviConfigurationFile * cfg)
 {
 	int iWidth = width();
 	QList<int> def;
@@ -403,7 +403,7 @@ void KviChannel::loadProperties(KviConfigurationFile * cfg)
 		toggleToolButtons();
 }
 
-void KviChannel::showDoubleView(bool bShow)
+void KviChannelWindow::showDoubleView(bool bShow)
 {
 	if(m_pMessageView)
 	{
@@ -439,7 +439,7 @@ void KviChannel::showDoubleView(bool bShow)
 	}
 }
 
-void KviChannel::toggleDoubleView()
+void KviChannelWindow::toggleDoubleView()
 {
 	if(m_pMessageView)
 	{
@@ -451,7 +451,7 @@ void KviChannel::toggleDoubleView()
 	}
 }
 
-void KviChannel::toggleListView()
+void KviChannelWindow::toggleListView()
 {
 	if(m_pUserListView->isVisible())
 	{
@@ -463,7 +463,7 @@ void KviChannel::toggleListView()
 	}
 }
 
-void KviChannel::toggleModeEditor()
+void KviChannelWindow::toggleModeEditor()
 {
 	if(m_pModeEditor)
 	{
@@ -485,13 +485,13 @@ void KviChannel::toggleModeEditor()
 	}
 }
 
-void KviChannel::modeSelectorDone()
+void KviChannelWindow::modeSelectorDone()
 {
 	if(m_pModeEditor)
 		toggleModeEditor();
 }
 
-void KviChannel::setMode(QString & szMode)
+void KviChannelWindow::setMode(QString & szMode)
 {
 	if(!connection())
 		return;
@@ -502,7 +502,7 @@ void KviChannel::setMode(QString & szMode)
 	connection()->sendFmtData("MODE %s %s",channelName.data(),modes.data());
 }
 
-void KviChannel::toggleListModeEditor()
+void KviChannelWindow::toggleListModeEditor()
 {
 	KviWindowToolPageButton* pButton = (KviWindowToolPageButton*)sender();
 	if(!pButton)
@@ -556,7 +556,7 @@ void KviChannel::toggleListModeEditor()
 	}
 }
 
-void KviChannel::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEntry> * l)
+void KviChannelWindow::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEntry> * l)
 {
 	QString szMasks;
 	QString szFlags;
@@ -602,12 +602,12 @@ void KviChannel::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEntry> *
 	}
 }
 
-QPixmap * KviChannel::myIconPtr()
+QPixmap * KviChannelWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon((m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) ? KVI_SMALLICON_DEADCHANNEL : KVI_SMALLICON_CHANNEL);
 }
 
-void KviChannel::resizeEvent(QResizeEvent *)
+void KviChannelWindow::resizeEvent(QResizeEvent *)
 {
 	int iHeight = m_pInput->heightHint();
 	int iHeight2 = m_pTopicWidget->sizeHint().height();
@@ -616,14 +616,14 @@ void KviChannel::resizeEvent(QResizeEvent *)
 	m_pInput->setGeometry(0,height() - iHeight, width(),iHeight);
 }
 
-QSize KviChannel::sizeHint() const
+QSize KviChannelWindow::sizeHint() const
 {
 	QSize ret(m_pSplitter->sizeHint().width(),
 		m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height());
 	return ret;
 }
 
-void KviChannel::setChannelMode(char mode, bool bAdd)
+void KviChannelWindow::setChannelMode(char mode, bool bAdd)
 {
 	// skip modes that ends up in a list (bans are hardcoded)
 	KviIrcConnectionServerInfo * pServerInfo = serverInfo();
@@ -645,7 +645,7 @@ void KviChannel::setChannelMode(char mode, bool bAdd)
 	updateCaption();
 }
 
-void KviChannel::setChannelModeWithParam(char cMode, QString & szParam)
+void KviChannelWindow::setChannelModeWithParam(char cMode, QString & szParam)
 {
 	if(szParam.isEmpty())
 		m_szChannelParameterModes.remove(cMode);
@@ -655,7 +655,7 @@ void KviChannel::setChannelModeWithParam(char cMode, QString & szParam)
 	updateCaption();
 }
 
-void KviChannel::addHighlightedUser(const QString & szNick)
+void KviChannelWindow::addHighlightedUser(const QString & szNick)
 {
 	if(!m_pUserListView->findEntry(szNick) || m_pTmpHighLighted->contains(szNick,Qt::CaseInsensitive))
 		return;
@@ -663,12 +663,12 @@ void KviChannel::addHighlightedUser(const QString & szNick)
 	m_pTmpHighLighted->append(szNick);
 }
 
-void KviChannel::removeHighlightedUser(const QString & szNick)
+void KviChannelWindow::removeHighlightedUser(const QString & szNick)
 {
 	m_pTmpHighLighted->removeOne(szNick);
 }
 
-void KviChannel::getChannelModeString(QString & szBuffer)
+void KviChannelWindow::getChannelModeString(QString & szBuffer)
 {
 	szBuffer = m_szChannelMode;
 	//add modes that use a parameter
@@ -680,7 +680,7 @@ void KviChannel::getChannelModeString(QString & szBuffer)
 	}
 }
 
-void KviChannel::getChannelModeStringWithEmbeddedParams(QString & szBuffer)
+void KviChannelWindow::getChannelModeStringWithEmbeddedParams(QString & szBuffer)
 {
 	szBuffer = m_szChannelMode;
 	//add modes that use a parameter
@@ -692,7 +692,7 @@ void KviChannel::getChannelModeStringWithEmbeddedParams(QString & szBuffer)
 	}
 }
 
-bool KviChannel::setOp(const QString & szNick, bool bOp, bool bIsMe)
+bool KviChannelWindow::setOp(const QString & szNick, bool bOp, bool bIsMe)
 {
 	bool bRet = m_pUserListView->setOp(szNick,bOp);
 	if(bIsMe)
@@ -700,7 +700,7 @@ bool KviChannel::setOp(const QString & szNick, bool bOp, bool bIsMe)
 	return bRet;
 }
 
-void KviChannel::setDeadChan()
+void KviChannelWindow::setDeadChan()
 {
 	m_iStateFlags |= KVI_CHANNEL_STATE_DEADCHAN;
 	m_iStateFlags &= ~(KVI_CHANNEL_STATE_NOCLOSEONPART | KVI_CHANNEL_STATE_SENTSYNCWHOREQUEST);
@@ -749,7 +749,7 @@ void KviChannel::setDeadChan()
 	updateCaption();
 }
 
-void KviChannel::setAliveChan()
+void KviChannelWindow::setAliveChan()
 {
 	// Rise like phoenix!
 	m_iStateFlags = 0;
@@ -784,7 +784,7 @@ void KviChannel::setAliveChan()
 	}
 }
 
-void KviChannel::getTalkingUsersStats(QString & szBuffer, QStringList & list, bool bPast)
+void KviChannelWindow::getTalkingUsersStats(QString & szBuffer, QStringList & list, bool bPast)
 {
 	if(list.count() < 1)
 		return;
@@ -831,7 +831,7 @@ void KviChannel::getTalkingUsersStats(QString & szBuffer, QStringList & list, bo
 	}
 }
 
-void KviChannel::getWindowListTipText(QString & szBuffer)
+void KviChannelWindow::getWindowListTipText(QString & szBuffer)
 {
 	static QString szHtmlBold("<b>");
 	static QString szHtmlTab("&nbsp;&nbsp;");
@@ -1093,7 +1093,7 @@ void KviChannel::getWindowListTipText(QString & szBuffer)
 	szBuffer += szEndOfDoc;
 }
 
-void KviChannel::fillCaptionBuffers()
+void KviChannelWindow::fillCaptionBuffers()
 {
 	if(!connection())
 	{
@@ -1140,7 +1140,7 @@ void KviChannel::fillCaptionBuffers()
 	m_szPlainTextCaption += szNickOnServer;
 }
 
-void KviChannel::ownMessage(const QString & szBuffer, bool bUserFeedback)
+void KviChannelWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 {
 	if(!connection())
 		return;
@@ -1313,7 +1313,7 @@ void KviChannel::ownMessage(const QString & szBuffer, bool bUserFeedback)
 	}
 }
 
-void KviChannel::ownAction(const QString & szBuffer)
+void KviChannelWindow::ownAction(const QString & szBuffer)
 {
 	if(!connection())
 		return;
@@ -1346,7 +1346,7 @@ void KviChannel::ownAction(const QString & szBuffer)
 	userAction(connection()->currentNickName(),KVI_USERACTION_ACTION);
 }
 
-bool KviChannel::nickChange(const QString & szOldNick, const QString & szNewNick)
+bool KviChannelWindow::nickChange(const QString & szOldNick, const QString & szNewNick)
 {
 	bool bWasHere = m_pUserListView->nickChange(szOldNick,szNewNick);
 	if(bWasHere)
@@ -1361,7 +1361,7 @@ bool KviChannel::nickChange(const QString & szOldNick, const QString & szNewNick
 	return bWasHere;
 }
 
-bool KviChannel::part(const QString & szNick)
+bool KviChannelWindow::part(const QString & szNick)
 {
 	bool bWasHere = m_pUserListView->part(szNick);
 	if(bWasHere)
@@ -1376,7 +1376,7 @@ bool KviChannel::part(const QString & szNick)
 	return bWasHere;
 }
 
-bool KviChannel::activityMeter(unsigned int * puActivityValue, unsigned int * puActivityTemperature)
+bool KviChannelWindow::activityMeter(unsigned int * puActivityValue, unsigned int * puActivityTemperature)
 {
 	fixActionHistory();
 
@@ -1447,7 +1447,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue, unsigned int * pu
 	return true;
 }
 
-void KviChannel::channelAction(const QString & szNick, unsigned int uActionType, int iTemperature)
+void KviChannelWindow::channelAction(const QString & szNick, unsigned int uActionType, int iTemperature)
 {
 	KviChannelAction * a = new KviChannelAction;
 	a->tTime = kvi_unixTime();
@@ -1462,7 +1462,7 @@ void KviChannel::channelAction(const QString & szNick, unsigned int uActionType,
 	fixActionHistory();
 }
 
-void KviChannel::fixActionHistory()
+void KviChannelWindow::fixActionHistory()
 {
 	while(m_pActionHistory->count() > KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT)
 		m_pActionHistory->removeFirst();
@@ -1482,7 +1482,7 @@ void KviChannel::fixActionHistory()
 	}
 }
 
-void KviChannel::lostUserFocus()
+void KviChannelWindow::lostUserFocus()
 {
 	KviWindow::lostUserFocus();
 	if(!m_pMessageView)
@@ -1491,7 +1491,7 @@ void KviChannel::lostUserFocus()
 		m_pMessageView->clearLineMark(true);
 }
 
-void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
+void KviChannelWindow::getChannelActivityStats(KviChannelActivityStats * s)
 {
 	fixActionHistory();
 
@@ -1585,28 +1585,28 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
 	s->uHotActionPercent = (s->uHotActionCount * 100) / s->uActionCount;
 }
 
-void KviChannel::userAction(const QString & szNick, const QString & szUser, const QString & szHost, unsigned int uActionType)
+void KviChannelWindow::userAction(const QString & szNick, const QString & szUser, const QString & szHost, unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	channelAction(szNick,uActionType,iTemperature);
 	m_pUserListView->userAction(szNick,szUser,szHost,iTemperature);
 }
 
-void KviChannel::userAction(const QString & szNick, unsigned int uActionType)
+void KviChannelWindow::userAction(const QString & szNick, unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	channelAction(szNick,uActionType,iTemperature);
 	m_pUserListView->userAction(szNick,iTemperature);
 }
 
-void KviChannel::userAction(KviIrcMask * user, unsigned int uActionType)
+void KviChannelWindow::userAction(KviIrcMask * user, unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	channelAction(user->nick(),uActionType,iTemperature);
 	m_pUserListView->userAction(user,iTemperature);
 }
 
-void KviChannel::topicSelected(const QString & szTopic)
+void KviChannelWindow::topicSelected(const QString & szTopic)
 {
 	if(!connection())
 		return;
@@ -1616,7 +1616,7 @@ void KviChannel::topicSelected(const QString & szTopic)
 	connection()->sendFmtData("TOPIC %s :%s",szName.data(),szEncoded.length() ? szEncoded.data() : "");
 }
 
-void KviChannel::closeEvent(QCloseEvent * e)
+void KviChannelWindow::closeEvent(QCloseEvent * e)
 {
 	if((m_iStateFlags & KVI_CHANNEL_STATE_SENTPART) || (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) || !(m_pConsole->isConnected()))
 	{
@@ -1645,7 +1645,7 @@ void KviChannel::closeEvent(QCloseEvent * e)
 	}
 }
 
-void KviChannel::partMessageSent(bool bCloseOnPart, bool bShowMessage)
+void KviChannelWindow::partMessageSent(bool bCloseOnPart, bool bShowMessage)
 {
 	m_iStateFlags |= KVI_CHANNEL_STATE_SENTPART;
 	if(!bCloseOnPart)
@@ -1655,7 +1655,7 @@ void KviChannel::partMessageSent(bool bCloseOnPart, bool bShowMessage)
 }
 
 #define IS_FNC(__name,__ulvname) \
-bool KviChannel::__name(bool bAtLeast) \
+bool KviChannelWindow::__name(bool bAtLeast) \
 { \
 	if(!connection()) \
 		return false; \
@@ -1669,7 +1669,7 @@ IS_FNC(isMeVoice,isVoice)
 IS_FNC(isMeHalfOp,isHalfOp)
 IS_FNC(isMeUserOp,isUserOp)
 
-int KviChannel::myFlags()
+int KviChannelWindow::myFlags()
 {
 	if(!connection())
 		return 0;
@@ -1677,7 +1677,7 @@ int KviChannel::myFlags()
 	return m_pUserListView->flags(connection()->currentNickName());
 }
 
-void KviChannel::setMask(char cMode, const QString & szMask, bool bAdd, const QString & szSetBy, unsigned int uSetAt, QString szChangeMask)
+void KviChannelWindow::setMask(char cMode, const QString & szMask, bool bAdd, const QString & szSetBy, unsigned int uSetAt, QString szChangeMask)
 {
 	if(!connection())
 		return;
@@ -1702,7 +1702,7 @@ void KviChannel::setMask(char cMode, const QString & szMask, bool bAdd, const QS
 	m_pUserListView->setMaskEntries(cMode,(int)list->count());
 }
 
-void KviChannel::internalMask(const QString & szMask, bool bAdd, const QString & szSetBy, unsigned int uSetAt, KviPointerList<KviMaskEntry> * l, KviMaskEditor ** ppEd, QString & szChangeMask)
+void KviChannelWindow::internalMask(const QString & szMask, bool bAdd, const QString & szSetBy, unsigned int uSetAt, KviPointerList<KviMaskEntry> * l, KviMaskEditor ** ppEd, QString & szChangeMask)
 {
 	KviMaskEntry * e = 0;
 	if(bAdd)
@@ -1746,7 +1746,7 @@ void KviChannel::internalMask(const QString & szMask, bool bAdd, const QString &
 	}
 }
 
-void KviChannel::updateModeLabel()
+void KviChannelWindow::updateModeLabel()
 {
 	QString szTip = __tr2qs("<b>Channel mode:</b>");
 	KviCString szMod = m_szChannelMode;
@@ -1771,7 +1771,7 @@ void KviChannel::updateModeLabel()
 	KviTalToolTip::add(m_pModeWidget,szTip);
 }
 
-void KviChannel::outputMessage(int iMsgType, const QString & szMsg)
+void KviChannelWindow::outputMessage(int iMsgType, const QString & szMsg)
 {
 	QString szBuf(szMsg);
 	preprocessMessage(szBuf);
@@ -1783,7 +1783,7 @@ void KviChannel::outputMessage(int iMsgType, const QString & szMsg)
 	internalOutput(m_pMessageView ? m_pMessageView : m_pIrcView,iMsgType,(const kvi_wchar_t *)pC);
 }
 
-void KviChannel::checkChannelSync()
+void KviChannelWindow::checkChannelSync()
 {
 	if(m_iStateFlags & KVI_CHANNEL_STATE_SYNCHRONIZED)
 		return;
@@ -1818,7 +1818,7 @@ void KviChannel::checkChannelSync()
 	}
 }
 
-bool KviChannel::eventFilter(QObject * o, QEvent * e)
+bool KviChannelWindow::eventFilter(QObject * o, QEvent * e)
 {
 	if(e->type() == QEvent::FocusOut && o == m_pTopicWidget && \
 		m_pTopicWidget->isVisible())
@@ -1827,7 +1827,7 @@ bool KviChannel::eventFilter(QObject * o, QEvent * e)
 	return KviWindow::eventFilter(o, e);
 }
 
-void KviChannel::preprocessMessage(QString & szMessage)
+void KviChannelWindow::preprocessMessage(QString & szMessage)
 {
 	// FIXME: slow
 
@@ -1865,20 +1865,20 @@ void KviChannel::preprocessMessage(QString & szMessage)
 	szMessage = strings.join(" ");
 }
 
-void KviChannel::unhighlight()
+void KviChannelWindow::unhighlight()
 {
 	if(!m_pWindowListItem)
 		return;
 	m_pWindowListItem->unhighlight();
 }
 
-KviIrcConnectionServerInfo * KviChannel::serverInfo()
+KviIrcConnectionServerInfo * KviChannelWindow::serverInfo()
 {
 	if(!connection()) return 0;
 	return connection()->serverInfo();
 }
 
-void KviChannel::pasteLastLog()
+void KviChannelWindow::pasteLastLog()
 {
 	QString szChannel = target().toLower();
 	QString szNetwork = console()->currentNetworkName().toLower();
@@ -1894,7 +1894,7 @@ void KviChannel::pasteLastLog()
 
 	// Get the logs
 	QString szLogPath;
-	g_pApp->getLocalKvircDirectory(szLogPath,KviApp::Log);
+	g_pApp->getLocalKvircDirectory(szLogPath,KviApplication::Log);
 	QDir logDir(szLogPath);
 	QStringList filter = QStringList(szLogFilter);
 	QStringList logList = logDir.entryList(filter,QDir::Files,QDir::Name | QDir::Reversed);
@@ -1981,7 +1981,7 @@ void KviChannel::pasteLastLog()
 	}
 }
 
-QByteArray KviChannel::loadLogFile(const QString & szFileName, bool bGzip)
+QByteArray KviChannelWindow::loadLogFile(const QString & szFileName, bool bGzip)
 {
 	QByteArray data;
 
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/KviChannelWindow.h
index 7a8d738fa..4d9173371 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/KviChannelWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_CHANNEL_H_
 //=============================================================================
 //
-//   File : kvi_channel.h
+//   File : KviChannelWindow.h
 //   Creation date : Tue Aug  1 2000 01:42:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,20 +25,20 @@
 //=============================================================================
 
 /**
-* \file kvi_channel.h
+* \file KviChannelWindow.h
 * \author Szymon Stefanek
 * \brief Channel widget: abstraction of an IRC channel
 */
 
 #include "kvi_settings.h"
-#include "kvi_console.h"
-#include "kvi_window.h"
+#include "KviConsoleWindow.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviIrcUserDataBase.h"
 #include "KviPixmap.h"
-#include "kvi_userlistview.h"
+#include "KviUserListView.h"
 #include "KviTimeUtils.h"
-#include "kvi_modew.h"
+#include "KviModeWidget.h"
 #include "KviPointerHashTable.h"
 
 #include <QList>
@@ -57,9 +57,9 @@ class KviModeEditor;
 
 #ifdef COMPILE_ON_WINDOWS
 	// windows compiler wants this instead of the forward decl
-	#include "kvi_maskeditor.h"
+	#include "KviMaskEditor.h"
 #else
-	typedef struct _KviMaskEntry KviMaskEntry; // kvi_maskeditor.h
+	typedef struct _KviMaskEntry KviMaskEntry; // KviMaskEditor.h
 #endif
 
 /**
@@ -148,10 +148,10 @@ typedef struct _KviChannelActivityStats
 } KviChannelActivityStats;
 
 /**
-* \class KviChannel
+* \class KviChannelWindow
 * \brief The class which manages a channel
 */
-class KVIRC_API KviChannel : public KviWindow
+class KVIRC_API KviChannelWindow : public KviWindow
 {
 	Q_OBJECT
 public:
@@ -160,14 +160,14 @@ public:
 	* \param lpFrm The parent frame object
 	* \param lpConsole The console of the context
 	* \param szName The name of the channel
-	* \return KviChannel
+	* \return KviChannelWindow
 	*/
-	KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szName);
+	KviChannelWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szName);
 
 	/**
 	* \brief Destroys the channel object
 	*/
-	~KviChannel();
+	~KviChannelWindow();
 protected:
 	KviTalSplitter                       * m_pTopSplitter;
 	KviTalSplitter                       * m_pVertSplitter;
diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/KviColorSelectionWindow.cpp
index 349bdf0d0..75c1d636c 100644
--- a/src/kvirc/ui/kvi_colorwin.cpp
+++ b/src/kvirc/ui/KviColorSelectionWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_colorwin.cpp
+//   File : KviColorSelectionWindow.cpp
 //   Creation date : Wed Jan  6 1999 04:30:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_colorwin.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
+#include "KviColorSelectionWindow.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
 
 #include <QPainter>
 #include <QString>
diff --git a/src/kvirc/ui/kvi_colorwin.h b/src/kvirc/ui/KviColorSelectionWindow.h
index e503ee08c..65aa99c01 100644
--- a/src/kvirc/ui/kvi_colorwin.h
+++ b/src/kvirc/ui/KviColorSelectionWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_COLORWIN_H_
 //=============================================================================
 //
-//   File : kvi_colorwin.h
+//   File : KviColorSelectionWindow.h
 //   Creation date : Wed Jan  6 1999 04:27:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_colorwin.h
+* \file KviColorSelectionWindow.h
 * \author Szymon Stefanek
 * \brief Mirc color window
 */
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 8c8d266e1..8e25cc4fe 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_console.cpp
+//   File : KviConsoleWindow.cpp
 //   Creation date : Sun Jun 25 2000 15:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,16 +24,16 @@
 
 
 
-#include "kvi_ircurl.h"
-#include "kvi_app.h"
-#include "kvi_console.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIrcUrl.h"
+#include "KviApplication.h"
+#include "KviConsoleWindow.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
-#include "kvi_ircview.h"
+#include "KviIrcView.h"
 #include "KviMircCntrl.h"
-#include "kvi_input.h"
+#include "KviInput.h"
 #include "KviError.h"
 #include "KviProxyDataBase.h"
 #include "KviNetUtils.h"
@@ -42,39 +42,39 @@
 #include "KviDnsResolver.h"
 #include "kvi_defaults.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_channel.h"
-#include "kvi_query.h"
+#include "KviChannelWindow.h"
+#include "KviQueryWindow.h"
 #include "KviParameterList.h"
 #include "KviRegisteredUserDataBase.h"
-#include "kvi_userlistview.h"
+#include "KviUserListView.h"
 #include "kvi_out.h"
 #include "KviConfigurationFile.h"
-#include "kvi_irctoolbar.h"
-#include "kvi_internalcmd.h"
-#include "kvi_sparser.h"
-#include "kvi_modulemanager.h"
+#include "KviIrcToolBar.h"
+#include "KviInternalCommand.h"
+#include "KviIrcServerParser.h"
+#include "KviModuleManager.h"
 #include "KviFileUtils.h"
 #include "KviTimeUtils.h"
-#include "kvi_mexlinkfilter.h"
+#include "KviMexLinkFilter.h"
 #include "KviAvatarCache.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionstatedata.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircconnectionstatistics.h"
-#include "kvi_asynchronousconnectiondata.h"
-#include "kvi_ircdatastreammonitor.h"
-#include "kvi_toolwindows_container.h"
-#include "kvi_msgbox.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionStateData.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcConnectionStatistics.h"
+#include "KviAsynchronousConnectionData.h"
+#include "KviIrcDataStreamMonitor.h"
+#include "KviWindowToolWidget.h"
+#include "KviMessageBox.h"
+#include "KviKvsScript.h"
+#include "KviKvsEventTriggers.h"
 #include "KviTalHBox.h"
 #include "KviTalPopupMenu.h"
 #include "KviNickColors.h"
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
+	#include "KviSSLMaster.h"
 #endif
 
 #include <QToolBar>
@@ -92,7 +92,7 @@
 extern KVIRC_API KviIrcServerDataBase           * g_pServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 
-KviConsole::KviConsole(KviFrame * lpFrm,int iFlags)
+KviConsole::KviConsole(KviMainWindow * lpFrm,int iFlags)
 #ifdef COMPILE_ON_WINDOWS
 : KviWindow(KVI_WINDOW_TYPE_CONSOLE,lpFrm,__tr2qs("CONSOLE"),0)
 #else
@@ -221,7 +221,7 @@ void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * m
 	// FIXME: first look in our context ?
 	/*
 	if(!connection())return;
-	for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
+	for(KviChannelWindow * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
 	{
 		if(kvi_strEqualCIN(c->windowName(),word.ptr(),word.len()))matches->append(new KviCString((*it)
 	}
@@ -435,8 +435,8 @@ void KviConsole::updateUri()
 		if(server)
 		{
 			KviIrcUrl::join(uri,server);
-			KviChannel * last =connection()->channelList()->last();
-			for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
+			KviChannelWindow * last =connection()->channelList()->last();
+			for(KviChannelWindow * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
 			{
 				uri.append(c->target());
 				if(c->hasChannelMode('k'))
@@ -639,7 +639,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co
 
 	if(wnd->type() == KVI_WINDOW_TYPE_CHANNEL)
 	{
-		if(((KviChannel *)wnd)->isHighlightedUser(nick) || isHighlightedChannel(wnd->windowName()) )
+		if(((KviChannelWindow *)wnd)->isHighlightedUser(nick) || isHighlightedChannel(wnd->windowName()) )
 			return triggerOnHighlight(wnd,type,nick,user,host,szMsg,nick);
 
 		// FIXME: this is for userhighlighing
@@ -716,7 +716,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
 					szMsg += nick;
 					szMsg += "&gt;</b> ";
 					szMsg += Qt::escape(szDecodedMessage);
-					//qDebug("kvi_console.cpp:629 debug: %s",szMsg.data());
+					//qDebug("KviConsoleWindow.cpp:629 debug: %s",szMsg.data());
 					g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 				}
 			}
@@ -732,7 +732,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
 		KviQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host);
 
 	if(bIsChan && KVI_OPTION_BOOL(KviOption_boolShowChannelUserFlagInPrivmsgView))
-		((KviChannel *)wnd)->prependUserFlag(nick,szNick);
+		((KviChannelWindow *)wnd)->prependUserFlag(nick,szNick);
 
 	if(KVI_OPTION_BOOL(KviOption_boolColorNicks) && connection())
 	{
@@ -783,9 +783,9 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
 	}
 /*	if(KVI_OPTION_BOOL(KviOption_boolUseUserListColorsAsNickColors) && bIsChan)
 	{
-		if(((KviChannel*)wnd)->userListView())
+		if(((KviChannelWindow*)wnd)->userListView())
 		{
-			KviUserListEntry *e = ((KviChannel*)wnd)->userListView()->findEntry(nick);
+			KviUserListEntry *e = ((KviChannelWindow*)wnd)->userListView()->findEntry(nick);
 			if(e)
 			{
 				int sum = 0;
@@ -848,7 +848,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
 
 	szMessage += szDecodedMessage;
 
-	if(bIsChan)((KviChannel *)wnd)->outputMessage(type,szMessage);
+	if(bIsChan)((KviChannelWindow *)wnd)->outputMessage(type,szMessage);
 	else wnd->outputNoFmt(type,szMessage);
 }
 
@@ -859,14 +859,14 @@ void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &t
 	// in quiet mode avoid bugging the user about avatar changes
 	bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_QUIET)));
 
-	for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
+	for(KviChannelWindow * c = connection()->channelList()->first();c;c = connection()->channelList()->next())
 	{
 		if(c->avatarChanged(nick))
 		{
 			if(bOut)c->outputNoFmt(KVI_OUT_AVATAR,textLine);
 		}
 	}
-	for(KviQuery * q = connection()->queryList()->first();q;q = connection()->queryList()->next())
+	for(KviQueryWindow * q = connection()->queryList()->first();q;q = connection()->queryList()->next())
 	{
 		if(q->avatarChanged(nick))
 		{
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/KviConsoleWindow.h
index ff7def250..553927a67 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/KviConsoleWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_CONSOLE_H_
 //=============================================================================
 //
-//   File : kvi_console.h
+//   File : KviConsoleWindow.h
 //   Creation date : Sun Jun 25 2000 15:00:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,16 +25,16 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_window.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviWindow.h"
+#include "KviIrcSocket.h"
 #include "KviIrcServer.h"
 #include "KviCString.h"
-#include "kvi_irccontext.h"
+#include "KviIrcContext.h"
 #include "KviPointerList.h"
-#include "kvi_userlistview.h"
-#include "kvi_themedcombobox.h"
+#include "KviUserListView.h"
+#include "KviThemedComboBox.h"
 
 #include <time.h>
 
@@ -55,12 +55,12 @@ class KviRegisteredUser;
 class KviWindowToolPageButton;
 
 #ifdef COMPILE_ON_WINDOWS
-	// windoze wants it to compile QList<KviChannel> and QList<KviQuery>
-	#include "kvi_channel.h"
-	#include "kvi_query.h"
+	// windoze wants it to compile QList<KviChannelWindow> and QList<KviQueryWindow>
+	#include "KviChannelWindow.h"
+	#include "KviQueryWindow.h"
 #else
-	class KviChannel;
-	class KviQuery;
+	class KviChannelWindow;
+	class KviQueryWindow;
 #endif
 
 
@@ -76,14 +76,14 @@ class KviWindowToolPageButton;
 
 class KVIRC_API KviConsole : public KviWindow
 {
-	friend class KviFrame;
+	friend class KviMainWindow;
 	friend class KviIrcSocket;
-	friend class KviChannel;
-	friend class KviQuery;
+	friend class KviChannelWindow;
+	friend class KviQueryWindow;
 	friend class KviIrcContext;
 	Q_OBJECT
 protected:
-	KviConsole(KviFrame * lpFrm,int iFlags);
+	KviConsole(KviMainWindow * lpFrm,int iFlags);
 public:
 	~KviConsole();
 protected:
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/KviCryptController.cpp
index 617a5b965..ea9bd32e4 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/KviCryptController.cpp
@@ -27,21 +27,21 @@
 
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	#include "kvi_cryptcontroller.h"
-	#include "kvi_window.h"
+	#include "KviCryptController.h"
+	#include "KviWindow.h"
 	#include "KviLocale.h"
 	#include "kvi_out.h"
-	#include "kvi_iconmanager.h"
-	#include "kvi_modulemanager.h"
-	#include "kvi_module.h"
+	#include "KviIconManager.h"
+	#include "KviModuleManager.h"
+	#include "KviModule.h"
 	#include "KviMemory.h"
 	#include "KviMemory.h"
-	#include "kvi_toolwindows_container.h"
+	#include "KviWindowToolWidget.h"
 	#include "KviPointerHashTable.h"
 
 	#include <QLayout>
 
-	// kvi_app.cpp
+	// KviApplication.cpp
 	extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
 	extern KVIRC_API KviModuleManager      * g_pModuleManager;
 
diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/KviCryptController.h
index f63f75735..dca666048 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.h
+++ b/src/kvirc/ui/KviCryptController.h
@@ -29,7 +29,7 @@
 #if defined(COMPILE_CRYPT_SUPPORT)
 	#include "KviCryptEngine.h"
 	#include "KviHeapObject.h"
-	#include "kvi_toolwindows_container.h"
+	#include "KviWindowToolWidget.h"
 	#include "KviTalListWidget.h"
 
 	#include <QWidget>
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/KviCtcpPageDialog.cpp
index e03abc366..f5e242270 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/KviCtcpPageDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ctcppagedialog.cpp
+//   File : KviCtcpPageDialog.cpp
 //   Creation date : Tue May 21 2002 22:09:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,11 +23,11 @@
 //=============================================================================
 
 
-#include "kvi_ctcppagedialog.h"
+#include "KviCtcpPageDialog.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 <QDateTime>
 #include <QLayout>
@@ -39,7 +39,7 @@
 #include <QPushButton>
 #include <QTabWidget>
 
-// kvi_app.cpp
+// KviApplication.cpp
 extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
 
 KviCtcpPageDialog::KviCtcpPageDialog()
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.h b/src/kvirc/ui/KviCtcpPageDialog.h
index b569cce34..59f488db4 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.h
+++ b/src/kvirc/ui/KviCtcpPageDialog.h
@@ -2,7 +2,7 @@
 #define _KVI_CTCPPAGEDIALOG_H_
 //=============================================================================
 //
-//   File : kvi_ctcppagedialog.h
+//   File : KviCtcpPageDialog.h
 //   Creation date : Tue May 21 2002 22:09:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp
index 5bb10534b..322086300 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/KviCustomToolBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_customtoolbar.cpp
+//   File : KviCustomToolBar.cpp
 //   Creation date : Sun 21 Nov 2004 05:28:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -24,12 +24,12 @@
 
 
 
-#include "kvi_customtoolbar.h"
-#include "kvi_frame.h"
+#include "KviCustomToolBar.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
-#include "kvi_actionmanager.h"
-#include "kvi_customtoolbardescriptor.h"
+#include "KviApplication.h"
+#include "KviActionManager.h"
+#include "KviCustomToolBarDescriptor.h"
 #include "KviTalPopupMenu.h"
 
 #include <QCursor>
diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/KviCustomToolBar.h
index 8e60cb208..acf8343fb 100644
--- a/src/kvirc/ui/kvi_customtoolbar.h
+++ b/src/kvirc/ui/KviCustomToolBar.h
@@ -2,7 +2,7 @@
 #define _KVI_CUSTOMTOOLBAR_H_
 //=============================================================================
 //
-//   File : kvi_customtoolbar.h
+//   File : KviCustomToolBar.h
 //   Creation date : Sun 21 Nov 2004 05:28:57 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,11 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_toolbar.h"
+#include "KviToolBar.h"
 #include "KviPointerHashTable.h"
 
 #ifdef COMPILE_ON_WINDOWS
-	#include "kvi_customtoolbardescriptor.h"
+	#include "KviCustomToolBarDescriptor.h"
 #else
 	class KviCustomToolBarDescriptor;
 #endif
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/KviDebugWindow.cpp
index 50b5c3b7c..a5f4a9c40 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/KviDebugWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_debugwindow.cpp
+//   File : KviDebugWindow.cpp
 //   Creation date : Sun Jul 18 2005 14:12:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,17 +23,17 @@
 //=============================================================================
 
 
-#include "kvi_debugwindow.h"
-#include "kvi_console.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
-#include "kvi_input.h"
-#include "kvi_options.h"
+#include "KviDebugWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
+#include "KviInput.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviConfigurationFile.h"
 
 #include "KviParameterList.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 
 #include <QList>
 #include <QPixmap>
diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/KviDebugWindow.h
index f68d4485f..88a4553a8 100644
--- a/src/kvirc/ui/kvi_debugwindow.h
+++ b/src/kvirc/ui/KviDebugWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_DEBUGWINDOW_H_
 //=============================================================================
 //
-//   File : kvi_debugwindow.h
+//   File : KviDebugWindow.h
 //   Creation date : Sun Jul 18 2005 14:14:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 
 class QSplitter;
diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/KviDynamicToolTip.cpp
index d9472ada5..309e54fbd 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.cpp
+++ b/src/kvirc/ui/KviDynamicToolTip.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_dynamictooltip.cpp
+//   File : KviDynamicToolTip.cpp
 //   Creation date : Wed Nov 01 2000 15:25:11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_dynamictooltip.h"
+#include "KviDynamicToolTip.h"
 
 KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip)
 : KviTalToolTip(parent)
diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/KviDynamicToolTip.h
index 3a3e1e4dd..f2911e1d3 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.h
+++ b/src/kvirc/ui/KviDynamicToolTip.h
@@ -2,7 +2,7 @@
 #define _KVI_DYNAMICTOOLTIP_H_
 //=============================================================================
 //
-//   File : kvi_dynamictooltip.h
+//   File : KviDynamicToolTip.h
 //   Creation date : Wed Nov 01 2000 15:23:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/KviFileDialog.cpp
index 9cda81d10..6c04dc6c0 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/KviFileDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_filedialog.cpp
+//   File : KviFileDialog.cpp
 //   Creation date : Mon Nov 20 2000 12:20:42 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "kvi_filedialog.h"
+#include "KviFileDialog.h"
 #include "KviMediaType.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviFileUtils.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviQString.h"
 #include "KviTalToolTip.h"
 
@@ -54,7 +54,7 @@ KviFileDialog::~KviFileDialog()
 void KviFileDialog::goKvirc()
 {
 	KviCString tmp;
-	g_pApp->getLocalKvircDirectory(tmp,KviApp::None);
+	g_pApp->getLocalKvircDirectory(tmp,KviApplication::None);
 	setDir(QDir(tmp.ptr()));
 }
 
diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/KviFileDialog.h
index 9b0ef465a..382da9a47 100644
--- a/src/kvirc/ui/kvi_filedialog.h
+++ b/src/kvirc/ui/KviFileDialog.h
@@ -2,7 +2,7 @@
 #define _KVI_FILEDIALOG_H_
 //=============================================================================
 //
-//   File : kvi_filedialog.h
+//   File : KviFileDialog.h
 //   Creation date : Mon Nov 20 2000 03:52:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_filedialog.h
+* \file KviFileDialog.h
 * \author Szymon Stefanek
 * \brief File dialog helpers
 */
diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/KviHistoryWindow.cpp
index ace1b5687..980ebf9a9 100644
--- a/src/kvirc/ui/kvi_historywin.cpp
+++ b/src/kvirc/ui/KviHistoryWindow.cpp
@@ -2,7 +2,7 @@
 #define _KVI_HISTORYWIN_CPP_
 //=============================================================================
 //
-//   File : kvi_historywin.cpp
+//   File : KviHistoryWindow.cpp
 //   Creation date : Mon Aug 19 01:34:48 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,11 +24,11 @@
 //
 //=============================================================================
 
-#include "kvi_historywin.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_input.h"
-#include "kvi_input_history.h"
+#include "KviHistoryWindow.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviInput.h"
+#include "KviInputHistory.h"
 #include "KviMircCntrl.h"
 
 #include <QEvent>
diff --git a/src/kvirc/ui/kvi_historywin.h b/src/kvirc/ui/KviHistoryWindow.h
index 7a611e7d0..128460be1 100644
--- a/src/kvirc/ui/kvi_historywin.h
+++ b/src/kvirc/ui/KviHistoryWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_HISTORYWIN_H_
 //=============================================================================
 //
-//   File : kvi_historywin.h
+//   File : KviHistoryWindow.h
 //   Creation date : Mon Aug 19 01:34:46 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_historywin.h
+* \file KviHistoryWindow.h
 * \author Szymon Stefanek
 * \brief History window management
 *
diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/KviHtmlDialog.cpp
index 83d8f347c..bb0c7bd57 100644
--- a/src/kvirc/ui/kvi_htmldialog.cpp
+++ b/src/kvirc/ui/KviHtmlDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_htmldialog.cpp
+//   File : KviHtmlDialog.cpp
 //   Creation date : Wed 03 Jan 2007 03:36:36 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "kvi_htmldialog.h"
+#include "KviHtmlDialog.h"
 #include "KviLocale.h"
 
 #include <QLabel>
diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/KviHtmlDialog.h
index e5cfda2ac..406ff83d3 100644
--- a/src/kvirc/ui/kvi_htmldialog.h
+++ b/src/kvirc/ui/KviHtmlDialog.h
@@ -2,7 +2,7 @@
 #define _KVI_HTMLDIALOG_H_
 //=============================================================================
 //
-//   File : kvi_htmldialog.h
+//   File : KviHtmlDialog.h
 //   Creation date : Wed 03 Jan 2007 03:36:36 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/KviImageDialog.cpp
index 9a49a2464..8c08cafa6 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/KviImageDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_imagedialog.cpp
+//   File : KviImageDialog.cpp
 //   Creation date : Sun Dec 22 2002 19:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_imagedialog.h"
+#include "KviImageDialog.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
-#include "kvi_app.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
+#include "KviApplication.h"
 
 #include <QLayout>
 #include <QPushButton>
diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/KviImageDialog.h
index 0b0c78ebb..91ece7cb4 100644
--- a/src/kvirc/ui/kvi_imagedialog.h
+++ b/src/kvirc/ui/KviImageDialog.h
@@ -2,7 +2,7 @@
 #define _KVI_IMAGEDIALOG_H_
 //=============================================================================
 //
-//   File : kvi_imagedialog.h
+//   File : KviImageDialog.h
 //   Creation date : Sun Dec 22 2002 19:42 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_dynamictooltip.h"
+#include "KviDynamicToolTip.h"
 #include "KviTalListWidget.h"
 
 #include <QDialog>
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/KviInput.cpp
index 5566813b1..9037b8ede 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_input.cpp
+//   File : KviInput.cpp
 //   Creation date : Sun Jan 3 1999 23:11:50 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -29,17 +29,17 @@
 
 #define _KVI_INPUT_CPP_
 
-#include "kvi_input.h"
-#include "kvi_input_editor.h"
-#include "kvi_options.h"
-#include "kvi_app.h"
-#include "kvi_colorwin.h"
-#include "kvi_texticonwin.h"
-#include "kvi_window.h"
+#include "KviInput.h"
+#include "KviInputEditor.h"
+#include "KviOptions.h"
+#include "KviApplication.h"
+#include "KviColorSelectionWindow.h"
+#include "KviTextIconWindow.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_scripteditor.h"
-#include "kvi_historywin.h"
-#include "kvi_userinput.h"
+#include "KviScriptEditor.h"
+#include "KviHistoryWindow.h"
+#include "KviUserInput.h"
 #include "kvi_shortcuts.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalHBox.h"
@@ -63,7 +63,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-//This comes from kvi_app.cpp
+//This comes from KviApplication.cpp
 extern KviColorWindow          * g_pColorWindow;
 extern KviTextIconWindow       * g_pTextIconWindow;
 extern KviHistoryWindowWidget  * g_pHistoryWindow;
diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/KviInput.h
index 99ef0bde1..def789e32 100644
--- a/src/kvirc/ui/kvi_input.h
+++ b/src/kvirc/ui/KviInput.h
@@ -2,7 +2,7 @@
 #define _KVI_INPUT_H_
 //============================================================================
 //
-//   File : kvi_input.h
+//   File : KviInput.h
 //   Creation date : Sun Jan 3 1999 23:04:10 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,13 +26,13 @@
 //============================================================================
 
 /**
-* \file kvi_input.h
+* \file KviInput.h
 * \author Szymon Stefanek
 * \brief Input handling
 */
 
 #include "kvi_settings.h"
-#include "kvi_input_history.h"
+#include "KviInputHistory.h"
 
 #include <QWidget>
 #include <QToolButton>
diff --git a/src/kvirc/ui/kvi_input_editor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index a341e9530..b33b9746e 100644
--- a/src/kvirc/ui/kvi_input_editor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-//   File : kvi_input_editor.cpp
+//   File : KviInputEditor.cpp
 //   Creation date : Fri Sep 5 2008 17:26:34 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -21,33 +21,33 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //============================================================================
-//   This file was originally part of kvi_input.h
+//   This file was originally part of KviInput.h
 //============================================================================
 
-#include "kvi_app.h"
-#include "kvi_colorwin.h"
-#include "kvi_console.h"
+#include "KviApplication.h"
+#include "KviColorSelectionWindow.h"
+#include "KviConsoleWindow.h"
 #include "kvi_fileextensions.h"
-#include "kvi_frame.h"
-#include "kvi_input.h"
-#include "kvi_input_editor.h"
-#include "kvi_input_history.h"
-#include "kvi_ircview.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_kernel.h"
+#include "KviMainWindow.h"
+#include "KviInput.h"
+#include "KviInputEditor.h"
+#include "KviInputHistory.h"
+#include "KviIrcView.h"
+#include "KviKvsScript.h"
+#include "KviKvsKernel.h"
 #include "KviLocale.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiManager.h"
 #include "KviMircCntrl.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviQString.h"
 #include "kvi_out.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_texticonwin.h"
-#include "kvi_texticonmanager.h"
-#include "kvi_userinput.h"
-#include "kvi_userlistview.h"
+#include "KviTextIconWindow.h"
+#include "KviTextIconManager.h"
+#include "KviUserInput.h"
+#include "KviUserListView.h"
 #include "kvi_shortcuts.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvsEventTriggers.h"
 
 #include <QClipboard>
 #include <QLabel>
@@ -63,7 +63,7 @@
 #include <QInputContext>
 #include <QShortcut>
 
-// from kvi_app.cpp
+// from KviApplication.cpp
 extern KviTalPopupMenu         * g_pInputPopup;
 extern KviTextIconWindow       * g_pTextIconWindow;
 extern KviColorWindow          * g_pColorWindow;
diff --git a/src/kvirc/ui/kvi_input_editor.h b/src/kvirc/ui/KviInputEditor.h
index 99ebd2597..7ea21749d 100644
--- a/src/kvirc/ui/kvi_input_editor.h
+++ b/src/kvirc/ui/KviInputEditor.h
@@ -2,7 +2,7 @@
 #define _KVI_INPUT_EDITOR_H_
 //============================================================================
 //
-//   File : kvi_input_editor.h
+//   File : KviInputEditor.h
 //   Creation date : Fri Sep 5 2008 17:26:34 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,11 +23,11 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //============================================================================
-//   This file was originally part of kvi_input.h
+//   This file was originally part of KviInput.h
 //============================================================================
 
 /**
-* \file kvi_input_editor.h
+* \file KviInputEditor.h
 * \author Elvio Basello
 * \brief Input editor
 *
@@ -44,7 +44,7 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "KviCString.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 #include <QString>
 #include <QWidget>
diff --git a/src/kvirc/ui/kvi_input_history.cpp b/src/kvirc/ui/KviInputHistory.cpp
index f23c6cf44..40eb379f3 100644
--- a/src/kvirc/ui/kvi_input_history.cpp
+++ b/src/kvirc/ui/KviInputHistory.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-//   File : kvi_input_history.cpp
+//   File : KviInputHistory.cpp
 //   Creation date : Fri Sep 5 2008 17:26:34 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -21,10 +21,10 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //============================================================================
-//   This file was originally part of kvi_input.h
+//   This file was originally part of KviInput.h
 //============================================================================
 
-#include "kvi_input_history.h"
+#include "KviInputHistory.h"
 #include "KviConfigurationFile.h"
 #include "KviCString.h"
 
diff --git a/src/kvirc/ui/kvi_input_history.h b/src/kvirc/ui/KviInputHistory.h
index 9b2e786a8..0f3b5c989 100644
--- a/src/kvirc/ui/kvi_input_history.h
+++ b/src/kvirc/ui/KviInputHistory.h
@@ -2,7 +2,7 @@
 #define _KVI_INPUT_HISTORY_H_
 //============================================================================
 //
-//   File : kvi_input_history.h
+//   File : KviInputHistory.h
 //   Creation date : Fri Sep 5 2008 17:26:34 by Elvio Basello
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,11 +23,11 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //============================================================================
-//   This file was originally part of kvi_input.h
+//   This file was originally part of KviInput.h
 //============================================================================
 
 /**
-* \file kvi_input_history.h
+* \file KviInputHistory.h
 * \author Elvio Basello
 * \brief Input history management
 *
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/KviIpEditor.cpp
index f62528cf5..456277ae8 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/KviIpEditor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ipeditor.cpp
+//   File : KviIpEditor.cpp
 //   Creation date : Wed Jun 12 2000 14:16:49 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "kvi_ipeditor.h"
+#include "KviIpEditor.h"
 
 #include <QApplication>
 #include <QLineEdit>
diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/KviIpEditor.h
index a713f55d1..bc4c0bcfb 100644
--- a/src/kvirc/ui/kvi_ipeditor.h
+++ b/src/kvirc/ui/KviIpEditor.h
@@ -2,7 +2,7 @@
 #define _KVI_IPEDITOR_H_
 //=============================================================================
 //
-//   File : kvi_ipeditor.h
+//   File : KviIpEditor.h
 //   Creation date : Wed Jun 12 2000 14:16:02 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index 797981c68..9b2a1963b 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_irctoolbar.cpp
+//   File : KviIrcToolBar.cpp
 //   Creation date : Thu Oct 29 2000 14:13:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,25 +23,25 @@
 //=============================================================================
 
 
-#include "kvi_irctoolbar.h"
-#include "kvi_console.h"
-#include "kvi_frame.h"
+#include "KviIrcToolBar.h"
+#include "KviConsoleWindow.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "kvi_settings.h"
-#include "kvi_options.h"
-#include "kvi_frame.h"
-#include "kvi_app.h"
-#include "kvi_dynamictooltip.h"
-#include "kvi_ircurl.h"
-#include "kvi_internalcmd.h"
+#include "KviOptions.h"
+#include "KviMainWindow.h"
+#include "KviApplication.h"
+#include "KviDynamicToolTip.h"
+#include "KviIrcUrl.h"
+#include "KviInternalCommand.h"
 #include "KviPointerList.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_irccontext.h"
-#include "kvi_lagmeter.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcContext.h"
+#include "KviLagMeter.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiManager.h"
 
 #include <QStyle>
 #include <QPainter>
diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/KviIrcToolBar.h
index 8c62941e9..49fca8bab 100644
--- a/src/kvirc/ui/kvi_irctoolbar.h
+++ b/src/kvirc/ui/KviIrcToolBar.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCTOOLBAR_H_
 //=============================================================================
 //
-//   File : kvi_irctoolbar.h
+//   File : KviIrcToolBar.h
 //   Creation date : Thu Oct 29 2000 14:09:11 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -27,8 +27,8 @@
 #include "kvi_settings.h"
 
 #include "KviCString.h"
-#include "kvi_toolbar.h"
-#include "kvi_console.h"
+#include "KviToolBar.h"
+#include "KviConsoleWindow.h"
 #include "KviPointerList.h"
 
 #include <QWidget>
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/KviIrcView.cpp
index 8f16bc801..fe6b9e429 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -1,6 +1,6 @@
 //===========================================================================
 //
-//   File : kvi_ircview.cpp
+//   File : KviIrcView.cpp
 //   Creation date : Tue Jul 6 1999 14:45:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -71,31 +71,31 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "kvi_ircview.h"
-#include "kvi_ircviewtools.h"
-#include "kvi_ircviewprivate.h"
+#include "KviIrcView.h"
+#include "KviIrcView_tools.h"
+#include "KviIrcView_private.h"
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_settings.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviMircCntrl.h"
 #include "kvi_defaults.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
+#include "KviMainWindow.h"
 #include "KviMemory.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "kvi_out.h"
 #include "KviParameterList.h"
-#include "kvi_console.h"
+#include "KviConsoleWindow.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_channel.h"
-#include "kvi_filedialog.h"
-#include "kvi_msgbox.h"
-#include "kvi_texticonmanager.h"
-#include "kvi_ircconnection.h"
-#include "kvi_mdimanager.h"
-#include "kvi_userinput.h"
+#include "KviChannelWindow.h"
+#include "KviFileDialog.h"
+#include "KviMessageBox.h"
+#include "KviTextIconManager.h"
+#include "KviIrcConnection.h"
+#include "KviMdiManager.h"
+#include "KviUserInput.h"
 #include "KviTalPopupMenu.h"
 #include "KviAnimatedPixmap.h"
 
@@ -135,7 +135,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// Stuff declared in kvi_app.cpp and managed by KviApp class
+// Stuff declared in KviApplication.cpp and managed by KviApplication class
 
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -209,7 +209,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
+KviIrcView::KviIrcView(QWidget *parent,KviMainWindow *pFrm,KviWindow *pWnd)
 : QWidget(parent)
 {
 	setObjectName("irc_view");
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/KviIrcView.h
index 78f187a42..46d8eae7c 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/KviIrcView.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCVIEW_H_
 //=============================================================================
 //
-//   File : kvi_ircview.h
+//   File : KviIrcView.h
 //   Creation date : Fri Mar 19 1999 05:39:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -40,7 +40,7 @@ class QFontMetrics;
 class KviTalPopupMenu;
 
 class KviWindow;
-class KviFrame;
+class KviMainWindow;
 class KviConsole;
 class KviIrcViewToolWidget;
 class KviIrcViewToolTip;
@@ -65,7 +65,7 @@ public:
 	friend class KviIrcViewToolTip;
 	friend class KviIrcViewToolWidget;
 public:
-	KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd);
+	KviIrcView(QWidget *parent,KviMainWindow *pFrm,KviWindow *pWnd);
 	~KviIrcView();
 public:
 	int dummyRead() const { return 0; };
@@ -130,7 +130,7 @@ private:
 	KviWindow                 * m_pKviWindow;
 	KviIrcViewWrappedBlockSelectionInfo * m_pWrappedBlockSelectionInfo;
 	QFile                     * m_pLogFile;
-	KviFrame                  * m_pFrm;
+	KviMainWindow                  * m_pFrm;
 	bool                        m_bAcceptDrops;
 	int                         m_iUnprocessedPaintEventRequests;
 	bool                        m_bPostedPaintEventPending;
diff --git a/src/kvirc/ui/kvi_ircview_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index 17b14e69b..223e2ae54 100644
--- a/src/kvirc/ui/kvi_ircview_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -1,6 +1,6 @@
 //===========================================================================
 //
-//   File : kvi_ircview_events.cpp
+//   File : KviIrcView_events.cpp
 //   Creation date : Wed Oct 1 2008 17:18:20 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,25 +22,25 @@
 //
 //===========================================================================
 //
-// This file was originally part of kvi_ircview.cpp
+// This file was originally part of KviIrcView.cpp
 //
 //===========================================================================
 
-#include "kvi_channel.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_ircurl.h"
-#include "kvi_ircview.h"
-#include "kvi_ircviewprivate.h"
-#include "kvi_ircviewtools.h"
+#include "KviChannelWindow.h"
+#include "KviKvsEventTriggers.h"
+#include "KviIconManager.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcUrl.h"
+#include "KviIrcView.h"
+#include "KviIrcView_private.h"
+#include "KviIrcView_tools.h"
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_out.h"
-#include "kvi_topicw.h"
-#include "kvi_query.h"
-#include "kvi_window.h"
+#include "KviTopicWidget.h"
+#include "KviQueryWindow.h"
+#include "KviWindow.h"
 
 #include <QClipboard>
 #include <QEvent>
@@ -135,14 +135,14 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e)
 			switch(m_pKviWindow->type())
 			{
 				case KVI_WINDOW_TYPE_CHANNEL:
-					if(((KviChannel *)m_pKviWindow)->isOn(szLinkTextPart))
+					if(((KviChannelWindow *)m_pKviWindow)->isOn(szLinkTextPart))
 					{
 						KVS_TRIGGER_EVENT(KviEvent_OnChannelNickDefaultActionRequest,m_pKviWindow,&lParams);
 						return;
 					}
 				break;
 				case KVI_WINDOW_TYPE_QUERY:
-					if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),szLinkTextPart))
+					if(KviQString::equalCI(((KviQueryWindow *)m_pKviWindow)->windowName(),szLinkTextPart))
 					{
 						KVS_TRIGGER_EVENT(KviEvent_OnQueryNickDefaultActionRequest,m_pKviWindow,&lParams);
 						return;
@@ -163,7 +163,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e)
 				return; // malformed
 			if(m_pKviWindow->type() != KVI_WINDOW_TYPE_CHANNEL)
 				return; // must be on a channel to apply it
-			if(!(((KviChannel *)m_pKviWindow)->isMeOp()))
+			if(!(((KviChannelWindow *)m_pKviWindow)->isMeOp()))
 				return; // i'm not op, can't do mode changes
 
 			QChar cPlusOrMinus = szLinkCommandPart[1];
@@ -210,7 +210,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e)
 			if(!console()->connection())
 				return;
 
-			if(KviChannel * c = console()->connection()->findChannel(szLinkTextPart))
+			if(KviChannelWindow * c = console()->connection()->findChannel(szLinkTextPart))
 			{
 				// already there
 				c->raise();
@@ -329,7 +329,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e)
 						switch(m_pKviWindow->type())
 						{
 							case KVI_WINDOW_TYPE_CHANNEL:
-								if(((KviChannel *)m_pKviWindow)->isOn(linkText))
+								if(((KviChannelWindow *)m_pKviWindow)->isOn(linkText))
 								{
 									if(e->button() & Qt::RightButton)
 										KVS_TRIGGER_EVENT(KviEvent_OnChannelNickPopupRequest,m_pKviWindow,pParams);
@@ -339,7 +339,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e)
 								} else bTrigger = true;
 							break;
 							case KVI_WINDOW_TYPE_QUERY:
-								if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText))
+								if(KviQString::equalCI(((KviQueryWindow *)m_pKviWindow)->windowName(),linkText))
 								{
 									if(e->button() & Qt::RightButton)
 										KVS_TRIGGER_EVENT(KviEvent_OnQueryNickPopupRequest,m_pKviWindow,pParams);
@@ -901,7 +901,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 				return;
 			if((linkCmd.length() > 2) && (m_pKviWindow->type() == KVI_WINDOW_TYPE_CHANNEL))
 			{
-				if(((KviChannel *)m_pKviWindow)->isMeOp())
+				if(((KviChannelWindow *)m_pKviWindow)->isMeOp())
 				{
 					QChar plmn = linkCmd[1];
 					if((plmn.unicode() == '+') || (plmn.unicode() == '-'))
@@ -965,7 +965,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 				tip = "<img src=\"" + g_pIconManager->getSmallIconResourceName(KVI_SMALLICON_CHANNEL) + "\"> ";
 
 				if(szCmd.length()>0) szChan=szCmd;
-				KviChannel * c = console()->connection()->findChannel(szChan);
+				KviChannelWindow * c = console()->connection()->findChannel(szChan);
 				QString szUrl;
 				if(c)
 				{
diff --git a/src/kvirc/ui/kvi_ircview_gettextline.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index 820fe891f..36f4a0152 100644
--- a/src/kvirc/ui/kvi_ircview_gettextline.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -1,6 +1,6 @@
 //===========================================================================
 //
-//   File : kvi_ircview_gettextline.cpp
+//   File : KviIrcView_getTextLine.cpp
 //   Creation date : Wed Oct 1 2008 17:18:20 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,22 +22,22 @@
 //
 //===========================================================================
 //
-// This file was originally part of kvi_ircview.cpp
+// This file was originally part of KviIrcView.cpp
 //
 //===========================================================================
 
-#include "kvi_channel.h"
-#include "kvi_ircview.h"
+#include "KviChannelWindow.h"
+#include "KviIrcView.h"
 #include "kvi_hstrEqualCIN.h"
-#include "kvi_ircviewprivate.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviIrcView_private.h"
+#include "KviKvsEventTriggers.h"
 #include "KviMemory.h"
 #include "KviMemory.h"
 #include "KviMircCntrl.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_out.h"
-#include "kvi_texticonmanager.h"
-#include "kvi_window.h"
+#include "KviTextIconManager.h"
+#include "KviWindow.h"
 
 #include <QDateTime>
 
@@ -576,9 +576,9 @@ found_command_escape:
 						{
 							if(m_pKviWindow->type()==KVI_WINDOW_TYPE_CHANNEL && m_pKviWindow)
 							{
-								if(line_ptr->pChunks[iCurChunk].szPayload[1]=='c' && ((KviChannel*)m_pKviWindow)->userListView())
+								if(line_ptr->pChunks[iCurChunk].szPayload[1]=='c' && ((KviChannelWindow*)m_pKviWindow)->userListView())
 								{
-									KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(QString((QChar*)next_cr,term_cr-next_cr));
+									KviUserListEntry *e = ((KviChannelWindow*)m_pKviWindow)->userListView()->findEntry(QString((QChar*)next_cr,term_cr-next_cr));
 									if(e)
 									{
 										line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_CUSTOM; e->color(line_ptr->pChunks[iCurChunk].customFore);
diff --git a/src/kvirc/ui/kvi_ircview_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp
index e04a137d6..667fbc48b 100644
--- a/src/kvirc/ui/kvi_ircview_loghandling.cpp
+++ b/src/kvirc/ui/KviIrcView_loghandling.cpp
@@ -1,6 +1,6 @@
 //===========================================================================
 //
-//   File : kvi_ircview_loghandling.cpp
+//   File : KviIrcView_loghandling.cpp
 //   Creation date : Wed Oct 1 2008 17:18:20 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,17 +22,17 @@
 //
 //===========================================================================
 //
-// This file was originally part of kvi_ircview.cpp
+// This file was originally part of KviIrcView.cpp
 //
 //===========================================================================
 
-#include "kvi_ircview.h"
-#include "kvi_ircviewprivate.h"
+#include "KviIrcView.h"
+#include "KviIrcView_private.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_out.h"
 #include "KviQString.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 #ifdef COMPILE_ZLIB_SUPPORT
 	#include <zlib.h>
@@ -99,7 +99,7 @@ void KviIrcView::getLogFileName(QString &buffer)
 
 void KviIrcView::getTextBuffer(QString &buffer)
 {
-	// FIXME: #warning "This does not merge the KviChannel::m_pMessageView buffer!"
+	// FIXME: #warning "This does not merge the KviChannelWindow::m_pMessageView buffer!"
 	buffer = "";
 	if(!m_pLastLine)return;
 	for(KviIrcViewLine *l=m_pFirstLine;l;l=l->pNext)
diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/KviIrcView_private.h
index fb32190dd..091aa663e 100644
--- a/src/kvirc/ui/kvi_ircviewprivate.h
+++ b/src/kvirc/ui/KviIrcView_private.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCVIEWPRIVATE_H_
 //=============================================================================
 //
-//   File : kvi_ircviewprivate.h
+//   File : KviIrcView_private.h
 //   Creation date : Sat Oct 9 2004 16:29:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp
index 95980d413..94ebc7a1f 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/KviIrcView_tools.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_ircviewtools.cpp
+//   File : KviIrcView_tools.cpp
 //   Creation date : Sat Oct 9 2004 16:03:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,18 +24,18 @@
 
 
 
-#include "kvi_ircviewtools.h"
-#include "kvi_ircview.h"
-#include "kvi_iconmanager.h"
-#include "kvi_options.h"
+#include "KviIrcView_tools.h"
+#include "KviIrcView.h"
+#include "KviIconManager.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
-#include "kvi_msgbox.h"
-#include "kvi_filedialog.h"
-#include "kvi_app.h"
+#include "KviMessageBox.h"
+#include "KviFileDialog.h"
+#include "KviApplication.h"
 #include "KviMemory.h"
 #include "kvi_shortcuts.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 
 #include <QTabWidget>
 #include <QLayout>
@@ -241,7 +241,7 @@ void KviIrcViewToolWidget::filterLoad()
 {
 	QString szFile;
 	QString szInit;
-	g_pApp->getLocalKvircDirectory(szInit,KviApp::Filters);
+	g_pApp->getLocalKvircDirectory(szInit,KviApplication::Filters);
 
 	if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Select a Filter File"),szInit))
 	{
@@ -267,7 +267,7 @@ void KviIrcViewToolWidget::filterSave()
 {
 	QString szFile;
 	QString szInit;
-	g_pApp->getLocalKvircDirectory(szInit,KviApp::Filters,"filter.kvf");
+	g_pApp->getLocalKvircDirectory(szInit,KviApplication::Filters,"filter.kvf");
 	if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Select a Name for the Filter File"),szInit,0,false,true))
 	{
 		QFile f(szFile);
diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/KviIrcView_tools.h
index d38d32f2d..db331afdf 100644
--- a/src/kvirc/ui/kvi_ircviewtools.h
+++ b/src/kvirc/ui/KviIrcView_tools.h
@@ -2,7 +2,7 @@
 #define _KVI_IRCVIEWTOOLS_H_
 //=============================================================================
 //
-//   File : kvi_ircviewtools.h
+//   File : KviIrcView_tools.h
 //   Creation date : Sat Oct 9 2004 16:03:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/KviMainWindow.cpp
index 778d1bcf1..44c61777e 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_frame.cpp
+//   File : KviMainWindow.cpp
 //   Creation date : Sun Jun 18 2000 17:59:02 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,40 +26,40 @@
 #define _KVI_FRAME_CPP_
 
 #include "kvi_debug.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_settings.h"
-#include "kvi_frame.h"
-#include "kvi_options.h"
-#include "kvi_menubar.h"
-#include "kvi_mdimanager.h"
-#include "kvi_mdichild.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
-#include "kvi_windowlist.h"
-#include "kvi_windowlist_tree.h"
-#include "kvi_console.h"
+#include "KviMainWindow.h"
+#include "KviOptions.h"
+#include "KviMenuBar.h"
+#include "KviMdiManager.h"
+#include "KviMdiChild.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
+#include "KviWindowListBase.h"
+#include "KviTreeWindowList.h"
+#include "KviConsoleWindow.h"
 #include "KviConfigurationFile.h"
-#include "kvi_internalcmd.h"
-#include "kvi_console.h"
+#include "KviInternalCommand.h"
+#include "KviConsoleWindow.h"
 #include "kvi_debug.h"
-#include "kvi_irctoolbar.h"
+#include "KviIrcToolBar.h"
 #include "kvi_confignames.h"
 #include "KviParameterList.h"
-#include "kvi_module.h"
-#include "kvi_mextoolbar.h"
+#include "KviModule.h"
+#include "KviMexToolBar.h"
 #include "KviLocale.h"
-#include "kvi_irccontext.h"
-#include "kvi_statusbar.h"
-#include "kvi_customtoolbar.h"
-#include "kvi_customtoolbarmanager.h"
-#include "kvi_customtoolbardescriptor.h"
-#include "kvi_actionmanager.h"
+#include "KviIrcContext.h"
+#include "KviStatusBar.h"
+#include "KviCustomToolBar.h"
+#include "KviCustomToolBarManager.h"
+#include "KviCustomToolBarDescriptor.h"
+#include "KviActionManager.h"
 #include "kvi_defaults.h"
-#include "kvi_ircview.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviIrcView.h"
+#include "KviKvsScript.h"
+#include "KviKvsEventTriggers.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_texticonmanager.h"
+#include "KviTextIconManager.h"
 #include "kvi_shortcuts.h"
 
 #include <QSplitter>
@@ -78,18 +78,18 @@
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	#include <QPixmap>
-	// kvi_app.h
+	// KviApplication.h
 	extern QPixmap * g_pShadedParentGlobalDesktopBackground;
 	extern QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
 #define KVI_DEFAULT_FRAME_CAPTION "KVIrc " KVI_VERSION " " KVI_RELEASE_NAME
 
-// Declared and managed by KviApp (kvi_app.cpp)
+// Declared and managed by KviApplication (KviApplication.cpp)
 extern KviConfigurationFile * g_pWinPropertiesConfig;
-KVIRC_API KviFrame * g_pFrame = 0; // the one and only frame object
+KVIRC_API KviMainWindow * g_pFrame = 0; // the one and only frame object
 
-KviFrame::KviFrame()
+KviMainWindow::KviMainWindow()
 : KviTalMainWindow(0,"kvirc_frame")
 {
 	g_pFrame = this;
@@ -168,7 +168,7 @@ KviFrame::KviFrame()
 	installAccelerators();
 }
 
-KviFrame::~KviFrame()
+KviMainWindow::~KviMainWindow()
 {
 	KVI_OPTION_BOOL(KviOption_boolFrameIsMaximized) = isMaximized();
 	KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(),
@@ -240,17 +240,17 @@ KviFrame::~KviFrame()
 	g_pApp->quit();
 }
 
-void KviFrame::registerModuleExtensionToolBar(KviMexToolBar * t)
+void KviMainWindow::registerModuleExtensionToolBar(KviMexToolBar * t)
 {
 	m_pModuleExtensionToolBarList->append(t);
 }
 
-void KviFrame::unregisterModuleExtensionToolBar(KviMexToolBar * t)
+void KviMainWindow::unregisterModuleExtensionToolBar(KviMexToolBar * t)
 {
 	m_pModuleExtensionToolBarList->removeRef(t);
 }
 
-void KviFrame::restoreModuleExtensionToolBars()
+void KviMainWindow::restoreModuleExtensionToolBars()
 {
 	for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it)
 	{
@@ -265,7 +265,7 @@ void KviFrame::restoreModuleExtensionToolBars()
 	}
 }
 
-void KviFrame::saveModuleExtensionToolBars()
+void KviMainWindow::saveModuleExtensionToolBars()
 {
 	KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).clear();
 
@@ -281,7 +281,7 @@ void KviFrame::saveModuleExtensionToolBars()
 	}
 }
 
-KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId)
+KviMexToolBar * KviMainWindow::moduleExtensionToolBar(int extensionId)
 {
 	for(KviMexToolBar * t = m_pModuleExtensionToolBarList->first();t;t = m_pModuleExtensionToolBarList->next())
 	{
@@ -290,7 +290,7 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId)
 	return 0;
 }
 
-void KviFrame::installAccelerators()
+void KviMainWindow::installAccelerators()
 {
 	new QShortcut(QKeySequence(KVI_SHORTCUTS_WIN_PREV),this,SLOT(switchToPrevWindow()),0,Qt::ApplicationShortcut);
 	new QShortcut(QKeySequence(KVI_SHORTCUTS_WIN_NEXT),this,SLOT(switchToNextWindow()),0,Qt::ApplicationShortcut);
@@ -334,18 +334,18 @@ void KviFrame::installAccelerators()
 	}
 }
 
-void KviFrame::accelActivated()
+void KviMainWindow::accelActivated()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(((QShortcut *)sender())->key()));
 }
 
-void KviFrame::executeInternalCommand(int index)
+void KviMainWindow::executeInternalCommand(int index)
 {
 	KviKvsScript::run(kvi_getInternalCommandBuffer(index),firstConsole());
 }
 
 
-void KviFrame::saveWindowProperties(KviWindow * wnd,const QString &szSection)
+void KviMainWindow::saveWindowProperties(KviWindow * wnd,const QString &szSection)
 {
 	g_pWinPropertiesConfig->setGroup(szSection);
 	g_pWinPropertiesConfig->writeEntry("EntryTimestamp",(unsigned int)time(0));
@@ -403,7 +403,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const QString &szSection)
 	wnd->saveProperties(g_pWinPropertiesConfig);
 }
 
-void KviFrame::closeWindow(KviWindow *wnd)
+void KviMainWindow::closeWindow(KviWindow *wnd)
 {
 	if (wnd->inherits("KviConsole"))
 	{
@@ -452,7 +452,7 @@ void KviFrame::closeWindow(KviWindow *wnd)
 	}
 }
 
-void KviFrame::addWindow(KviWindow *wnd,bool bShow)
+void KviMainWindow::addWindow(KviWindow *wnd,bool bShow)
 {
 	m_pWinList->append(wnd);
 	wnd->createWindowListItem(); // create the window WindowList item AFTER it has been constructed
@@ -550,7 +550,7 @@ docking_done:
 	}
 }
 
-KviMdiChild * KviFrame::dockWindow(KviWindow * wnd, bool bCascade, QRect * setGeom)
+KviMdiChild * KviMainWindow::dockWindow(KviWindow * wnd, bool bCascade, QRect * setGeom)
 {
 	if(wnd->mdiParent())return wnd->mdiParent();
         KviMdiChild * lpC = new KviMdiChild(m_pMdi,"");
@@ -563,7 +563,7 @@ KviMdiChild * KviFrame::dockWindow(KviWindow * wnd, bool bCascade, QRect * setGe
 	return lpC;
 }
 
-void KviFrame::undockWindow(KviWindow *wnd)
+void KviMainWindow::undockWindow(KviWindow *wnd)
 {
 	if(!(wnd->mdiParent()))return;
 	KviMdiChild * lpC = wnd->mdiParent();
@@ -576,12 +576,12 @@ void KviFrame::undockWindow(KviWindow *wnd)
 }
 
 
-void KviFrame::newConsole()
+void KviMainWindow::newConsole()
 {
 	createNewConsole();
 }
 
-KviConsole * KviFrame::createNewConsole(bool bFirstInFrame)
+KviConsole * KviMainWindow::createNewConsole(bool bFirstInFrame)
 {
 	// the first console must be created BEFORE the toolbars visible
 	// at startup otherwise we cannot execute script code
@@ -601,7 +601,7 @@ KviConsole * KviFrame::createNewConsole(bool bFirstInFrame)
 	return c;
 }
 
-unsigned int KviFrame::consoleCount()
+unsigned int KviMainWindow::consoleCount()
 {
 	unsigned int count = 0;
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())
@@ -611,7 +611,7 @@ unsigned int KviFrame::consoleCount()
 	return count;
 }
 
-KviConsole * KviFrame::firstConsole()
+KviConsole * KviMainWindow::firstConsole()
 {
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())
 	{
@@ -621,7 +621,7 @@ KviConsole * KviFrame::firstConsole()
 	return 0; //should newer be here!.. but sometimes we are ?
 }
 
-KviConsole * KviFrame::firstNotConnectedConsole()
+KviConsole * KviMainWindow::firstNotConnectedConsole()
 {
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())
 	{
@@ -634,12 +634,12 @@ KviConsole * KviFrame::firstNotConnectedConsole()
 	return 0;
 }
 
-void KviFrame::childWindowCloseRequest(KviWindow *wnd)
+void KviMainWindow::childWindowCloseRequest(KviWindow *wnd)
 {
 	closeWindow(wnd);
 }
 
-void KviFrame::setActiveWindow(KviWindow *wnd)
+void KviMainWindow::setActiveWindow(KviWindow *wnd)
 {
 	// ASSERT(m_pWinList->findRef(wnd))
 	if(wnd->isMinimized())
@@ -649,60 +649,60 @@ void KviFrame::setActiveWindow(KviWindow *wnd)
 	else wnd->delayedAutoRaise();
 }
 
-KviIrcConnection * KviFrame::activeConnection()
+KviIrcConnection * KviMainWindow::activeConnection()
 {
 	return m_pActiveContext ? m_pActiveContext->connection() : 0;
 }
 
-void KviFrame::childWindowSelectionStateChange(KviWindow * pWnd,bool bGotSelectionNow)
+void KviMainWindow::childWindowSelectionStateChange(KviWindow * pWnd,bool bGotSelectionNow)
 {
 	if(pWnd != g_pActiveWindow)return;
 	emit activeWindowSelectionStateChanged(bGotSelectionNow);
 
 }
 
-void KviFrame::childContextStateChange(KviIrcContext * c)
+void KviMainWindow::childContextStateChange(KviIrcContext * c)
 {
 	if(c != m_pActiveContext)return;
 	emit activeContextStateChanged();
 }
 
-void KviFrame::childConnectionLagChange(KviIrcConnection * c)
+void KviMainWindow::childConnectionLagChange(KviIrcConnection * c)
 {
 	KviIrcContext * ctx = c->context();
 	if(ctx != m_pActiveContext)return;
 	emit activeConnectionLagChanged();
 }
 
-void KviFrame::childConnectionServerInfoChange(KviIrcConnection * c)
+void KviMainWindow::childConnectionServerInfoChange(KviIrcConnection * c)
 {
 	KviIrcContext * ctx = c->context();
 	if(ctx != m_pActiveContext)return;
 	emit activeConnectionServerInfoChanged();
 }
 
-void KviFrame::childConnectionNickNameChange(KviIrcConnection * c)
+void KviMainWindow::childConnectionNickNameChange(KviIrcConnection * c)
 {
 	KviIrcContext * ctx = c->context();
 	if(ctx != m_pActiveContext)return;
 	emit activeConnectionNickNameChanged();
 }
 
-void KviFrame::childConnectionAwayStateChange(KviIrcConnection * c)
+void KviMainWindow::childConnectionAwayStateChange(KviIrcConnection * c)
 {
 	KviIrcContext * ctx = c->context();
 	if(ctx != m_pActiveContext)return;
 	emit activeConnectionAwayStateChanged();
 }
 
-void KviFrame::childConnectionUserModeChange(KviIrcConnection * c)
+void KviMainWindow::childConnectionUserModeChange(KviIrcConnection * c)
 {
 	KviIrcContext * ctx = c->context();
 	if(ctx != m_pActiveContext)return;
 	emit activeConnectionUserModeChanged();
 }
 
-void KviFrame::childWindowActivated(KviWindow *wnd, bool bForce)
+void KviMainWindow::childWindowActivated(KviWindow *wnd, bool bForce)
 {
 	// ASSERT(m_pWinList->findRef(wnd))
 	// unless we want to bForce the active window to be re-activated
@@ -729,7 +729,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd, bool bForce)
 	KVS_TRIGGER_EVENT_0(KviEvent_OnWindowActivated,wnd);
 }
 
-void KviFrame::changeEvent(QEvent * e)
+void KviMainWindow::changeEvent(QEvent * e)
 {
 	if (e->type() == QEvent::ActivationChange)
 	{
@@ -752,7 +752,7 @@ void KviFrame::changeEvent(QEvent * e)
 	KviTalMainWindow::changeEvent(e);
 }
 
-void KviFrame::closeEvent(QCloseEvent *e)
+void KviMainWindow::closeEvent(QCloseEvent *e)
 {
 	//check if the user just want us to minimize in tray; if we're not the sender
 	//of this signal (sender!=0), it has been generated by a "quit" action in a menu
@@ -818,7 +818,7 @@ void KviFrame::closeEvent(QCloseEvent *e)
 		g_pApp->destroyFrame();
 }
 
-void KviFrame::resizeEvent(QResizeEvent *e)
+void KviMainWindow::resizeEvent(QResizeEvent *e)
 {
 	KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(),
 			size().width(),size().height());
@@ -826,12 +826,12 @@ void KviFrame::resizeEvent(QResizeEvent *e)
 }
 
 
-void KviFrame::contextMenuEvent(QContextMenuEvent *)
+void KviMainWindow::contextMenuEvent(QContextMenuEvent *)
 {
 	// do nothing! avoids builtin popup from qmainwindow
 }
 
-void KviFrame::updatePseudoTransparency()
+void KviMainWindow::updatePseudoTransparency()
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	uint uOpacity = KVI_OPTION_UINT(KviOption_uintGlobalWindowOpacityPercent) < 50 ? 50 : KVI_OPTION_UINT(KviOption_uintGlobalWindowOpacityPercent);
@@ -846,7 +846,7 @@ void KviFrame::updatePseudoTransparency()
 #endif
 }
 
-void KviFrame::moveEvent(QMoveEvent *e)
+void KviMainWindow::moveEvent(QMoveEvent *e)
 {
 	KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(),
 			size().width(),size().height());
@@ -856,7 +856,7 @@ void KviFrame::moveEvent(QMoveEvent *e)
 	KviTalMainWindow::moveEvent(e);
 }
 
-void KviFrame::applyOptions()
+void KviMainWindow::applyOptions()
 {
 	m_pMdi->update();
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())wnd->applyOptions();
@@ -865,7 +865,7 @@ void KviFrame::applyOptions()
 	g_pTextIconManager->applyOptions();
 }
 
-void KviFrame::toggleStatusBar()
+void KviMainWindow::toggleStatusBar()
 {
 	if(m_pStatusBar)
 	{
@@ -879,7 +879,7 @@ void KviFrame::toggleStatusBar()
 	}
 }
 
-void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p)
+void KviMainWindow::fillToolBarsPopup(KviTalPopupMenu * p)
 {
 	p->clear();
 
@@ -944,12 +944,12 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p)
 		);
 }
 
-void KviFrame::customizeToolBars()
+void KviMainWindow::customizeToolBars()
 {
 	KviKvsScript::run("toolbareditor.open",g_pActiveWindow);
 }
 
-void KviFrame::toolbarsPopupSelected(int id)
+void KviMainWindow::toolbarsPopupSelected(int id)
 {
 	const QObject * o = sender();
 	if(!o)return;
@@ -974,7 +974,7 @@ void KviFrame::toolbarsPopupSelected(int id)
 
 
 
-bool KviFrame::focusNextPrevChild(bool next)
+bool KviMainWindow::focusNextPrevChild(bool next)
 {
 	QWidget * w = focusWidget();
 	if(w)
@@ -994,10 +994,10 @@ bool KviFrame::focusNextPrevChild(bool next)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-void KviFrame::saveToolBarPositions()
+void KviMainWindow::saveToolBarPositions()
 {
 	QString szTemp;
-	g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS);
+	g_pApp->getLocalKvircDirectory(szTemp,KviApplication::Config,KVI_CONFIGFILE_TOOLBARS);
 
 	QFile f(szTemp);
 	if(f.open(QIODevice::WriteOnly | QIODevice::Truncate))
@@ -1006,10 +1006,10 @@ void KviFrame::saveToolBarPositions()
 	}
 }
 
-void KviFrame::restoreToolBarPositions()
+void KviMainWindow::restoreToolBarPositions()
 {
 	QString szTemp;
-	g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS);
+	g_pApp->getLocalKvircDirectory(szTemp,KviApplication::Config,KVI_CONFIGFILE_TOOLBARS);
 
 	QFile f(szTemp);
 
@@ -1028,7 +1028,7 @@ void KviFrame::restoreToolBarPositions()
 	}
 }
 
-void KviFrame::createWindowList()
+void KviMainWindow::createWindowList()
 {
 	Qt::DockWidgetArea ePreviousArea = Qt::NoDockWidgetArea;
 
@@ -1053,7 +1053,7 @@ void KviFrame::createWindowList()
 	addDockWidget(ePreviousArea,m_pWindowList);
 }
 
-void KviFrame::recreateWindowList()
+void KviMainWindow::recreateWindowList()
 {
 	KviWindow * w;
 	for(w = m_pWinList->first();w;w = m_pWinList->next())
@@ -1076,49 +1076,49 @@ void KviFrame::recreateWindowList()
 // Some accelerators
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void KviFrame::maximizeWindow(void)
+void KviMainWindow::maximizeWindow(void)
 {
 	if(!g_pActiveWindow)return;
 	if(g_pActiveWindow->isMaximized())g_pActiveWindow->restore();
 	else g_pActiveWindow->maximize();
 }
 
-void KviFrame::minimizeWindow(void)
+void KviMainWindow::minimizeWindow(void)
 {
 	if(g_pActiveWindow)g_pActiveWindow->minimize();
 }
 
-void KviFrame::switchToPrevWindow(void)
+void KviMainWindow::switchToPrevWindow(void)
 {
 	m_pWindowList->switchWindow(false,false);
 }
 
-void KviFrame::switchToNextWindow(void)
+void KviMainWindow::switchToNextWindow(void)
 {
 	m_pWindowList->switchWindow(true,false);
 }
 
-void KviFrame::switchToPrevHighlightedWindow(void)
+void KviMainWindow::switchToPrevHighlightedWindow(void)
 {
 	m_pWindowList->switchWindow(false,false,true);
 }
 
-void KviFrame::switchToNextHighlightedWindow(void)
+void KviMainWindow::switchToNextHighlightedWindow(void)
 {
 	m_pWindowList->switchWindow(true,false,true);
 }
 
-void KviFrame::switchToPrevWindowInContext(void)
+void KviMainWindow::switchToPrevWindowInContext(void)
 {
 	m_pWindowList->switchWindow(false,true);
 }
 
-void KviFrame::switchToNextWindowInContext(void)
+void KviMainWindow::switchToNextWindowInContext(void)
 {
 	m_pWindowList->switchWindow(true,true);
 }
 
-void KviFrame::setUsesBigPixmaps(bool bUse)
+void KviMainWindow::setUsesBigPixmaps(bool bUse)
 {
 	KviTalMainWindow::setUsesBigPixmaps(bUse);
 
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/KviMainWindow.h
index 3cc55bd3e..b341daa6a 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/KviMainWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_FRAME_H_
 //=============================================================================
 //
-//   File : kvi_frame.h
+//   File : KviMainWindow.h
 //   Creation date : Sun Jun 18 2000 17:59:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 
 //=============================================================================
 //
-// KviFrame:
+// KviMainWindow:
 //     The main window for the KVIrc application
 //
 //=============================================================================
@@ -53,7 +53,7 @@ class KviTalPopupMenu;
 
 #ifdef COMPILE_ON_WINDOWS
 	// MSCV has problems with KviPointerList<KviWindow> otherwise
-	#include "kvi_window.h"
+	#include "KviWindow.h"
 #endif
 
 // base class for the dock extension applets..
@@ -75,11 +75,11 @@ public:
 
 
 
-class KVIRC_API KviFrame : public KviTalMainWindow //, public KviIrcContextManager
+class KVIRC_API KviMainWindow : public KviTalMainWindow //, public KviIrcContextManager
 {
 	friend class KviWindow;
 	friend class KviConsole;
-	friend class KviApp;
+	friend class KviApplication;
 	friend class KviIrcServerParser;
 	friend class KviMexToolBar;
 	friend class KviMdiManager;
@@ -90,8 +90,8 @@ class KVIRC_API KviFrame : public KviTalMainWindow //, public KviIrcContextManag
 	friend class KviUserListViewArea;
 	Q_OBJECT
 public:
-	KviFrame();
-	~KviFrame();
+	KviMainWindow();
+	~KviMainWindow();
 protected:
 	// subwindows
 	QSplitter                             * m_pSplitter;                     // the frame is splitted vertically and thus can host widgets
@@ -156,7 +156,7 @@ public:
 	// helper for saving the window properties
 	void saveWindowProperties(KviWindow * wnd,const QString &szSection);
 	// finds the module extension toolbar with the specified identifier
-	// see kvi_moduleextension.h and kvi_mextoolbar.h
+	// see KviModuleExtension.h and KviMexToolBar.h
 	KviMexToolBar * moduleExtensionToolBar(int extensionId);
 	// Helper to fill the toolbars popup
 	// it is used by KviToolBar and KviMenuBar
@@ -238,7 +238,7 @@ private:
 };
 
 #ifndef _KVI_FRAME_CPP_
-	extern KVIRC_API KviFrame * g_pFrame;
+	extern KVIRC_API KviMainWindow * g_pFrame;
 #endif
 
 #endif //_KVI_FRAME_H_
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp
index 6159e49a7..2d70fb483 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/KviMaskEditor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_maskeditor.cpp
+//   File : KviMaskEditor.cpp
 //   Creation date : Tue Aug 30 2000 12:24:59 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,16 +23,16 @@
 //=============================================================================
 
 
-#include "kvi_maskeditor.h"
+#include "KviMaskEditor.h"
 #include "KviLocale.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviQString.h"
-#include "kvi_channel.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_toolwindows_container.h"
-#include "kvi_channel.h"
-#include "kvi_options.h"
+#include "KviChannelWindow.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviWindowToolWidget.h"
+#include "KviChannelWindow.h"
+#include "KviOptions.h"
 
 #include <QLayout>
 #include <QLabel>
@@ -65,7 +65,7 @@ KviMaskItem::~KviMaskItem()
 {
 }
 
-KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel)
+KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannelWindow * pChannel)
 :QDialog(pEditor)
 {
 	m_pChannel=pChannel;
@@ -119,7 +119,7 @@ void KviMaskInputDialog::accept()
 	QDialog::accept();
 }
 
-KviMaskEditor::KviMaskEditor(QWidget * par,KviChannel * pChannel,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char cMode,const char *name)
+KviMaskEditor::KviMaskEditor(QWidget * par,KviChannelWindow * pChannel,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char cMode,const char *name)
 : KviWindowToolWidget(par,button)
 {
 	setObjectName(name);
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/KviMaskEditor.h
index 89a0e4c66..aa05424d4 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/KviMaskEditor.h
@@ -2,7 +2,7 @@
 #define _KVI_MASKEDITOR_H_
 //=============================================================================
 //
-//   File : kvi_maskeditor.h
+//   File : KviMaskEditor.h
 //   Creation date : Tue Aug 30 2000 12:20:10 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "KviCString.h"
-#include "kvi_toolwindows_container.h"
+#include "KviWindowToolWidget.h"
 #include <QTreeWidget>
 
 #include <QPushButton>
@@ -36,7 +36,7 @@
 #include <QWidget>
 
 class KviMaskEditor;
-class KviChannel;
+class KviChannelWindow;
 
 typedef struct _KviMaskEntry
 {
@@ -78,14 +78,14 @@ class KviMaskInputDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel);
+	KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannelWindow * pChannel);
 	~KviMaskInputDialog();
 protected:
 	QLineEdit     * m_pEdit;
 	QPushButton   * m_pOkButton;
 	QPushButton   * m_pChancelButton;
 	QString 	m_szOldMask;
-	KviChannel    * m_pChannel;
+	KviChannelWindow    * m_pChannel;
 	KviMaskEditor * m_pEditor;
 protected slots:
 	virtual void accept();
@@ -95,11 +95,11 @@ class KVIRC_API KviMaskEditor : public KviWindowToolWidget
 {
 	Q_OBJECT
 public:
-	KviMaskEditor(QWidget * par,KviChannel * pChannel, KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,
+	KviMaskEditor(QWidget * par,KviChannelWindow * pChannel, KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,
 		char cMode,const char * name);
 	~KviMaskEditor();
 protected:
-	KviChannel            * m_pChannel;
+	KviChannelWindow            * m_pChannel;
 	QTreeWidget           * m_pMaskBox;
 	QPushButton           * m_pRemoveMask;
 	QPushButton           * m_pAddButton;
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/KviMdiChild.cpp
index b84bc75b6..bec0d4173 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/KviMdiChild.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_mdichild.cpp
+//   File : KviMdiChild.cpp
 //   Creation date : Wed Jun 21 2000 17:35:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,29 +24,29 @@
 //=============================================================================
 
 /**
-* \file kvi_mdichild.cpp
+* \file KviMdiChild.cpp
 * \brief MDI subwindow stuff
 */
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
-#include "kvi_mdichild.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiChild.h"
+#include "KviMdiManager.h"
 #include "KviCString.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_settings.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectiontarget.h"
-#include "kvi_irccontext.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionTarget.h"
+#include "KviIrcContext.h"
 #include "KviIrcNetwork.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvsEventTriggers.h"
 
 #ifdef COMPILE_ON_MAC
-	#include "kvi_app.h"  //Needed for g_pApp
+	#include "KviApplication.h"  //Needed for g_pApp
 #endif
 
 #include <QTimer>
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/KviMdiChild.h
index aa88f241a..4c80e5431 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/KviMdiChild.h
@@ -2,7 +2,7 @@
 #define _KVI_MDICHILD_H_
 //=============================================================================
 //
-//   File : kvi_mdichild.h
+//   File : KviMdiChild.h
 //   Creation date : Wed Jun 21 2000 17:35:04 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 //=============================================================================
 
 /**
-* \file kvi_mdichild.h
+* \file KviMdiChild.h
 * \brief MDI subwindow stuff
 * \author Szymon Stefanek
 */
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/KviMdiManager.cpp
index 74e79dd51..b300a5d2e 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/KviMdiManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_mdimanager.cpp
+//   File : KviMdiManager.cpp
 //   Creation date : Wed Jun 21 2000 17:28:04 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,21 +24,21 @@
 //=============================================================================
 
 /**
-* \file kvi_mdimanager.cpp
+* \file KviMdiManager.cpp
 * \brief The MDI-manager
 */
 
 
 #include "kvi_debug.h"
 #include "kvi_settings.h"
-#include "kvi_mdimanager.h"
-#include "kvi_mdichild.h"
+#include "KviMdiManager.h"
+#include "KviMdiChild.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_iconmanager.h"
-#include "kvi_frame.h"
-#include "kvi_menubar.h"
-#include "kvi_app.h"
+#include "KviOptions.h"
+#include "KviIconManager.h"
+#include "KviMainWindow.h"
+#include "KviMenuBar.h"
+#include "KviApplication.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalHBox.h"
 
@@ -66,7 +66,7 @@
 #define KVI_MDICHILD_MIN_WIDTH 100
 #define KVI_MDICHILD_MIN_HEIGHT 40
 
-KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char *)
+KviMdiManager::KviMdiManager(QWidget * parent,KviMainWindow * pFrm,const char *)
 : QMdiArea(parent)
 {
 	setFrameShape(NoFrame);
@@ -664,7 +664,7 @@ bool KviMdiManager::eventFilter(QObject *obj, QEvent *event)
 	} else {
 		/*
 		 * Filter out some (de)activation events from the QMdiArea handling
-	         * this fixed #425 and #519 (unwanted mdichild activation when KviFrame is not the active window)
+	         * this fixed #425 and #519 (unwanted mdichild activation when KviMainWindow is not the active window)
 		 */
 		if(	event->type() == QEvent::ApplicationActivate ||
 			event->type() == QEvent::ApplicationDeactivate
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/KviMdiManager.h
index 4978ddac5..e29d1600c 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/KviMdiManager.h
@@ -26,18 +26,18 @@
 //=============================================================================
 
 /**
-* \file kvi_mdimanager.h
+* \file KviMdiManager.h
 * \brief The MDI-manager
 * \author Szymon Stefanek
 */
 
 #include "kvi_settings.h"
-#include "kvi_mdichild.h"
+#include "KviMdiChild.h"
 
 #include <QMdiArea>
 #include <QScrollBar>
 
-class KviFrame;
+class KviMainWindow;
 class KviTalPopupMenu;
 
 /**
@@ -45,7 +45,7 @@ class KviTalPopupMenu;
 * \brief Handles all MDI windows
 *
 * This MDI-manager is based on QMdiArea of Qt 4. It handles all docked windows and does their tiling.
-* Basicly all windows are managed by the KviFrame, which also gives the order to the MDI-manager to dock or undock a window.
+* Basicly all windows are managed by the KviMainWindow, which also gives the order to the MDI-manager to dock or undock a window.
 * What does that mean?
 * All windows in KVIrc are of the type QWidget which can be standalone windows. These are packed into a QMdiSubWindow and added to the MDI-manager.
 * So the KviMdiManager gets a KviMdiChild which will be set as main widget of our QMdiSubWindow. When it'll be undocked QMdiSubWindow will be removed and our KviWindow is "free" again.
@@ -62,7 +62,7 @@ public:
 	* \param pcName The name of the manager
 	* \return KviMdiManager
 	*/
-	KviMdiManager(QWidget * pParent, KviFrame * pFrm, const char * pcName);
+	KviMdiManager(QWidget * pParent, KviMainWindow * pFrm, const char * pcName);
 
 	/**
 	* \brief Destroys the Mdi manager object
@@ -82,7 +82,7 @@ protected:
 	/// Holds the tiling popup
 	KviTalPopupMenu * m_pTileMethodPopup;
 	/// The frame where this KviMdiManager belongs to
-	KviFrame        * m_pFrm;
+	KviMainWindow        * m_pFrm;
 public:
 	/**
 	* \brief Get the currently active window
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/KviMenuBar.cpp
index 20d9b50e0..79d555dc5 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/KviMenuBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_menubar.cpp
+//   File : KviMenuBar.cpp
 //   Creation date : Wen Jun 21 2000 13:12:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,25 +23,25 @@
 //=============================================================================
 
 
-#include "kvi_menubar.h"
-#include "kvi_app.h"
+#include "KviMenuBar.h"
+#include "KviApplication.h"
 #include "KviLocale.h"
-#include "kvi_frame.h"
-#include "kvi_mdimanager.h"
-#include "kvi_iconmanager.h"
-#include "kvi_internalcmd.h"
+#include "KviMainWindow.h"
+#include "KviMdiManager.h"
+#include "KviIconManager.h"
+#include "KviInternalCommand.h"
 #include "kvi_settings.h"
-#include "kvi_ircurl.h"
-#include "kvi_console.h"
-#include "kvi_kvs_popupmenu.h"
+#include "KviIrcUrl.h"
+#include "KviConsoleWindow.h"
+#include "KviKvsPopupMenu.h"
 #include "KviMemory.h"
-#include "kvi_moduleextension.h"
-#include "kvi_actionmanager.h"
+#include "KviModuleExtension.h"
+#include "KviActionManager.h"
 #include "kvi_coreactionnames.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
 
-KviMenuBar::KviMenuBar(KviFrame * par,const char * name)
+KviMenuBar::KviMenuBar(KviMainWindow * par,const char * name)
       : KviTalMenuBar(par,name)
 {
 	setAutoFillBackground(false);
diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/KviMenuBar.h
index 7f2e17669..fe6b5f3a9 100644
--- a/src/kvirc/ui/kvi_menubar.h
+++ b/src/kvirc/ui/KviMenuBar.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_menubar.h
+//   File : KviMenuBar.h
 //   Creation date : Wen Jun 21 2000 13:11:24 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -30,7 +30,7 @@
 #include "KviCString.h"
 #include "KviTalMenuBar.h"
 
-class KviFrame;
+class KviMainWindow;
 class KviTalPopupMenu;
 class KviKvsPopupMenu;
 
@@ -46,12 +46,12 @@ class KVIRC_API KviMenuBar : public KviTalMenuBar
 {
 	Q_OBJECT
 public:
-	KviMenuBar(KviFrame * par,const char * name);
+	KviMenuBar(KviMainWindow * par,const char * name);
 	~KviMenuBar();
 protected:
 	KviTalPopupMenu                       * m_pToolbarsPopup;
 	KviTalPopupMenu                       * m_pRecentServersPopup;
-	KviFrame                         * m_pFrm;
+	KviMainWindow                         * m_pFrm;
 	KviPointerList<KviScriptMenuBarItem> * m_pScriptItemList;
 protected:
 	KviScriptMenuBarItem * findMenu(const QString &text);
diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/KviMessageBox.cpp
index d69a99353..005c40810 100644
--- a/src/kvirc/ui/kvi_msgbox.cpp
+++ b/src/kvirc/ui/KviMessageBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_msgbox.cpp
+//   File : KviMessageBox.cpp
 //   Creation date : Tue Jun 20 2000 12:49:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,19 +22,19 @@
 //
 //=============================================================================
 
-#include "kvi_msgbox.h"
+#include "KviMessageBox.h"
 #include "KviMemory.h"
 #include "KviCString.h"
 #include "KviLocale.h"
 
-// FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApp!"
+// FIXME: #warning "This should go into TAL as layer ...then maybe a wrapper in KviApplication!"
 #ifdef COMPILE_KDE_SUPPORT
 	#include <kmessagebox.h>
 #else
 	#include <QMessageBox>
 #endif //!COMPILE_WITH_KDE
 
-// FIXME: #warning "This could go into KviApp"
+// FIXME: #warning "This could go into KviApplication"
 
 namespace KviMessageBox
 {
diff --git a/src/kvirc/ui/kvi_msgbox.h b/src/kvirc/ui/KviMessageBox.h
index c561f555a..b96603d61 100644
--- a/src/kvirc/ui/kvi_msgbox.h
+++ b/src/kvirc/ui/KviMessageBox.h
@@ -2,7 +2,7 @@
 #define _KVI_MSGBOX_H_
 //=============================================================================
 //
-//   File : kvi_msgbox.h
+//   File : KviMessageBox.h
 //   Creation date : Sun Jan 17 1999 13:55:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/KviModeEditor.cpp
index 13ecfaf46..b475ec00e 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/KviModeEditor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_modeeditor.cpp
+//   File : KviModeEditor.cpp
 //   Creation date : Sat Apr 14 2001 13:52:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,15 +22,15 @@
 //
 //=============================================================================
 
-#include "kvi_modeeditor.h"
-#include "kvi_iconmanager.h"
+#include "KviModeEditor.h"
+#include "KviIconManager.h"
 #include "KviLocale.h"
 #include "KviQString.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_channel.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_toolwindows_container.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviChannelWindow.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviWindowToolWidget.h"
 
 #include <QScrollArea>
 #include <QLayout>
@@ -40,7 +40,7 @@
 #include <QPushButton>
 
 
-KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * name,KviChannel * pChan)
+KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * name,KviChannelWindow * pChan)
 : KviWindowToolWidget(par,button)
 {
 	setObjectName(name);
diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/KviModeEditor.h
index 0865d2594..a2bb9524a 100644
--- a/src/kvirc/ui/kvi_modeeditor.h
+++ b/src/kvirc/ui/KviModeEditor.h
@@ -2,7 +2,7 @@
 #define _KVI_MODEEDITOR_H_
 //=============================================================================
 //
-//   File : kvi_modeeditor.h
+//   File : KviModeEditor.h
 //   Creation date : Sat Apr 14 2001 13:50:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
-#include "kvi_toolwindows_container.h"
+#include "KviWindowToolWidget.h"
 
 #include <QMap>
 
@@ -35,7 +35,7 @@ class QCheckBox;
 class QLineEdit;
 class QPushButton;
 class KviIrcConnectionServerInfo;
-class KviChannel;
+class KviChannelWindow;
 
 //////////////////////////////////////////////////////////////////////
 // class KviModeEditor
@@ -46,10 +46,10 @@ class KVIRC_API KviModeEditor : public KviWindowToolWidget
 {
 	Q_OBJECT
 public:
-	KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * name,KviChannel * pChan);
+	KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * name,KviChannelWindow * pChan);
 	~KviModeEditor();
 protected: // fields
-	KviChannel                * m_pChannel;
+	KviChannelWindow                * m_pChannel;
 	QPushButton               * m_pButton;
 	QMap<char, QCheckBox *>     m_pCheckBoxes;
 	QMap<char, QLineEdit *>     m_pLineEdits;
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/KviModeWidget.cpp
index a6ac2c992..8ae6f2dc8 100644
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/KviModeWidget.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-//   File : kvi_modew.cpp
+//   File : KviModeWidget.cpp
 //   Creation date : Sat Nov 12 2005 23:50:12 by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,17 +22,17 @@
 //
 //============================================================================
 
-#include "kvi_channel.h"
-#include "kvi_options.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviChannelWindow.h"
+#include "KviOptions.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionUserInfo.h"
 #include "KviTalHBox.h"
 
 #include <QEvent>
 #include <QResizeEvent>
 #include <QByteArray>
 
-KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name)
+KviModeWidget::KviModeWidget(QWidget * par,KviChannelWindow* chan,const char * name)
 :KviThemedLineEdit(par, chan, name)
 {
 	m_pChannel=chan;
diff --git a/src/kvirc/ui/kvi_modew.h b/src/kvirc/ui/KviModeWidget.h
index d7dcf97a8..aede354cd 100644
--- a/src/kvirc/ui/kvi_modew.h
+++ b/src/kvirc/ui/KviModeWidget.h
@@ -3,7 +3,7 @@
 
 //============================================================================
 //
-//   File : kvi_modew.h
+//   File : KviModeWidget.h
 //   Creation date : Sat Nov 12 2005 23:50:12 by Alexey Uzhva
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,9 +25,9 @@
 //
 //============================================================================
 
-#include "kvi_themedlineedit.h"
+#include "KviThemedLineEdit.h"
 
-class KviChannel;
+class KviChannelWindow;
 class KviIrcConnectionServerInfo;
 
 class KVIRC_API KviModeWidget : public KviThemedLineEdit
@@ -35,12 +35,12 @@ class KVIRC_API KviModeWidget : public KviThemedLineEdit
 	Q_OBJECT
 
 public:
-	KviModeWidget(QWidget * par,KviChannel* chan,const char * name=0);
+	KviModeWidget(QWidget * par,KviChannelWindow* chan,const char * name=0);
 	~KviModeWidget();
 	void reset();
 	void refreshModes();
 private:
-	KviChannel            *  m_pChannel;
+	KviChannelWindow            *  m_pChannel;
 protected:
 	void mouseDoubleClickEvent(QMouseEvent * e);
 	void keyReleaseEvent (QKeyEvent * e);
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp
index ccadb5163..00db1c26f 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/KviOptionsWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_optionswidget.h
+//   File : KviOptionsWidget.h
 //   Creation date : Mon Jun 10 2000 17:47:33 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,13 +24,13 @@
 
 
 
-#include "kvi_optionswidget.h"
+#include "KviOptionsWidget.h"
 
 #define _WANT_OPTION_FLAGS_
-#include "kvi_options.h"
+#include "KviOptions.h"
 
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviTalToolTip.h"
 
 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER 4
diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/KviOptionsWidget.h
index 18fc9ba69..d397de8fd 100644
--- a/src/kvirc/ui/kvi_optionswidget.h
+++ b/src/kvirc/ui/KviOptionsWidget.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_optionswidget.h
+//   File : KviOptionsWidget.h
 //   Creation date : Mon Jun 10 2000 17:47:33 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,7 +26,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviPointerList.h"
 #include "KviTalGroupBox.h"
 
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index 2b6577116..04a51989c 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_query.cpp
+//   File : KviQueryWindow.cpp
 //   Creation date : Tue Aug 7 2000 14:23:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,34 +23,34 @@
 //=============================================================================
 
 
-#include "kvi_query.h"
-#include "kvi_console.h"
-#include "kvi_iconmanager.h"
-#include "kvi_ircview.h"
-#include "kvi_input.h"
-#include "kvi_options.h"
+#include "KviQueryWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviIconManager.h"
+#include "KviIrcView.h"
+#include "KviInput.h"
+#include "KviOptions.h"
 #include "KviLocale.h"
 #include "kvi_settings.h"
-#include "kvi_ircsocket.h"
+#include "KviIrcSocket.h"
 #include "kvi_out.h"
 #include "KviConfigurationFile.h"
 #include "KviMircCntrl.h"
 #include "kvi_settings.h"
-#include "kvi_themedlabel.h"
-#include "kvi_useraction.h"
+#include "KviThemedLabel.h"
+#include "KviUserAction.h"
 #include "KviParameterList.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_sparser.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcServerParser.h"
 #include "KviIrcUserDataBase.h"
 #include "KviMircCntrl.h"
-#include "kvi_toolwindows_container.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviWindowToolWidget.h"
+#include "KviKvsEventTriggers.h"
 #include "KviTalHBox.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptController.h"
 #endif
 
 #ifdef COMPILE_ZLIB_SUPPORT
@@ -65,7 +65,7 @@
 #include <QList>
 #include <QByteArray>
 
-KviQuery::KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szNick)
+KviQueryWindow::KviQueryWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szNick)
 : KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,szNick,lpConsole)
 {
 	m_iFlags = 0;
@@ -111,7 +111,7 @@ KviQuery::KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szN
 	updateCaption();
 }
 
-KviQuery::~KviQuery()
+KviQueryWindow::~KviQueryWindow()
 {
 	m_pUserListView->partAll();
 	if(type() == KVI_WINDOW_TYPE_DEADQUERY)
@@ -124,7 +124,7 @@ KviQuery::~KviQuery()
 	}
 }
 
-void KviQuery::updateLabelText()
+void KviQueryWindow::updateLabelText()
 {
 	QString szText=getInfoLabelText();
 	if(szText != m_pLabel->text())
@@ -134,7 +134,7 @@ void KviQuery::updateLabelText()
 	}
 }
 
-QString KviQuery::getInfoLabelTipText()
+QString KviQueryWindow::getInfoLabelTipText()
 {
 	QString szText;
 	if(!connection())
@@ -224,7 +224,7 @@ QString KviQuery::getInfoLabelTipText()
 	return szText;
 }
 
-QString KviQuery::getInfoLabelText()
+QString KviQueryWindow::getInfoLabelText()
 {
 	QString szTmp;
 	if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel) && connection())
@@ -273,17 +273,17 @@ QString KviQuery::getInfoLabelText()
 	return szTmp;
 }
 
-void KviQuery::slotDndEvents(const QString &pcFile)
+void KviQueryWindow::slotDndEvents(const QString &pcFile)
 {
         KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,pcFile);
 }
 
-void KviQuery::triggerCreationEvents()
+void KviQueryWindow::triggerCreationEvents()
 {
 	KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this);
 }
 
-void KviQuery::getBaseLogFileName(QString & szBuffer)
+void KviQueryWindow::getBaseLogFileName(QString & szBuffer)
 {
 	if(connection())
 	{
@@ -300,18 +300,18 @@ void KviQuery::getBaseLogFileName(QString & szBuffer)
 	}
 }
 
-void KviQuery::mergeQuery(KviQuery * q)
+void KviQueryWindow::mergeQuery(KviQueryWindow * q)
 {
 	m_pIrcView->appendMessagesFrom(q->m_pIrcView);
 	updateLabelText();
 }
 
-void KviQuery::textViewRightClicked()
+void KviQueryWindow::textViewRightClicked()
 {
 	KVS_TRIGGER_EVENT_0(KviEvent_OnQueryPopupRequest,this);
 }
 
-void KviQuery::saveProperties(KviConfigurationFile * cfg)
+void KviQueryWindow::saveProperties(KviConfigurationFile * cfg)
 {
 	KviWindow::saveProperties(cfg);
 	QList<int> sizes;
@@ -320,7 +320,7 @@ void KviQuery::saveProperties(KviConfigurationFile * cfg)
 	cfg->writeEntry("UserListViewVisible",m_pUserListView->isVisible());
 }
 
-void KviQuery::loadProperties(KviConfigurationFile * cfg)
+void KviQueryWindow::loadProperties(KviConfigurationFile * cfg)
 {
 	int iWidth = width();
 	KviWindow::loadProperties(cfg);
@@ -337,7 +337,7 @@ void KviQuery::loadProperties(KviConfigurationFile * cfg)
 	showListView(cfg->readBoolEntry("UserListViewVisible",false));
 }
 
-void KviQuery::notifyTargetChange(const QString & szOldNick, const QString & szOldUser, const QString & szOldHost, const QString & szNick, const QString & szUser, const QString & szHost)
+void KviQueryWindow::notifyTargetChange(const QString & szOldNick, const QString & szOldUser, const QString & szOldHost, const QString & szNick, const QString & szUser, const QString & szHost)
 {
 	QString szOldN = szOldNick.isEmpty() ? QString("*") : szOldNick;
 	QString szOldU = szOldUser.isEmpty() ? QString("*") : szOldUser;
@@ -351,7 +351,7 @@ void KviQuery::notifyTargetChange(const QString & szOldNick, const QString & szO
 }
 
 
-void KviQuery::userAction(const QString & szNick, const QString & szUser, const QString & szHost, unsigned int uActionType)
+void KviQueryWindow::userAction(const QString & szNick, const QString & szUser, const QString & szHost, unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
@@ -366,14 +366,14 @@ void KviQuery::userAction(const QString & szNick, const QString & szUser, const
 	updateLabelText();
 }
 
-void KviQuery::userAction(const QString & szNick, unsigned int uActionType)
+void KviQueryWindow::userAction(const QString & szNick, unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	m_pUserListView->userAction(szNick,iTemperature);
 	updateLabelText();
 }
 
-void KviQuery::userAction(KviIrcMask * user, unsigned int uActionType)
+void KviQueryWindow::userAction(KviIrcMask * user, unsigned int uActionType)
 {
 	int iTemperature = kvi_getUserActionTemperature(uActionType);
 	if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing))
@@ -387,7 +387,7 @@ void KviQuery::userAction(KviIrcMask * user, unsigned int uActionType)
 	updateLabelText();
 }
 
-KviUserListEntry * KviQuery::setTarget(const QString & szNick, const QString & szUser, const QString & szHost)
+KviUserListEntry * KviQueryWindow::setTarget(const QString & szNick, const QString & szUser, const QString & szHost)
 {
 	KviUserListEntry * e = m_pUserListView->join(szNick,szUser,szHost);
 	if((!e->globalData()->avatar()) && (!szUser.isEmpty()) && (szUser != "*"))
@@ -409,7 +409,7 @@ KviUserListEntry * KviQuery::setTarget(const QString & szNick, const QString & s
 	return e;
 }
 
-void KviQuery::notifyCommonChannels(const QString & szNick, const QString & szUser, const QString & szHost, int iChans, const QString & szChans)
+void KviQueryWindow::notifyCommonChannels(const QString & szNick, const QString & szUser, const QString & szHost, int iChans, const QString & szChans)
 {
 	static QString szStar("*");
 	if(iChans > 0)
@@ -424,7 +424,7 @@ void KviQuery::notifyCommonChannels(const QString & szNick, const QString & szUs
 	updateLabelText();
 }
 
-void KviQuery::fillCaptionBuffers()
+void KviQueryWindow::fillCaptionBuffers()
 {
 	if(!connection())
 	{
@@ -448,7 +448,7 @@ void KviQuery::fillCaptionBuffers()
 	m_szPlainTextCaption += szNickOnServer;
 }
 
-bool KviQuery::nickChange(const QString & szOldNick, const QString & szNewNick)
+bool KviQueryWindow::nickChange(const QString & szOldNick, const QString & szNewNick)
 {
 	bool bRet = m_pUserListView->nickChange(szOldNick,szNewNick);
 	if(!bRet)
@@ -460,7 +460,7 @@ bool KviQuery::nickChange(const QString & szOldNick, const QString & szNewNick)
 	return true;
 }
 
-void KviQuery::showListView(bool bShow)
+void KviQueryWindow::showListView(bool bShow)
 {
 	if(!bShow)
 	{
@@ -472,12 +472,12 @@ void KviQuery::showListView(bool bShow)
 	}
 }
 
-void KviQuery::toggleListView()
+void KviQueryWindow::toggleListView()
 {
 	showListView(!m_pUserListView->isVisible());
 }
 
-void KviQuery::setDeadQuery()
+void KviQueryWindow::setDeadQuery()
 {
 	m_iFlags |= KVI_QUERY_FLAG_DEAD;
 
@@ -496,7 +496,7 @@ void KviQuery::setDeadQuery()
 	updateLabelText();
 };
 
-void KviQuery::setAliveQuery()
+void KviQueryWindow::setAliveQuery()
 {
 	m_iFlags &= ~KVI_QUERY_FLAG_DEAD;
 	m_pUserListView->setUserDataBase(connection()->userDataBase());
@@ -515,7 +515,7 @@ void KviQuery::setAliveQuery()
 	updateLabelText();
 }
 
-void KviQuery::applyOptions()
+void KviQueryWindow::applyOptions()
 {
 	m_pUserListView->applyOptions();
 	updateLabelText();
@@ -523,12 +523,12 @@ void KviQuery::applyOptions()
 	KviWindow::applyOptions();
 }
 
-QPixmap * KviQuery::myIconPtr()
+QPixmap * KviQueryWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY);
 }
 
-void KviQuery::resizeEvent(QResizeEvent *)
+void KviQueryWindow::resizeEvent(QResizeEvent *)
 {
 	int iHeight = m_pInput->heightHint();
 	int iHeight2 = m_pButtonBox->sizeHint().height();
@@ -537,13 +537,13 @@ void KviQuery::resizeEvent(QResizeEvent *)
 	m_pInput->setGeometry(0,height() - iHeight,width(),iHeight);
 }
 
-QSize KviQuery::sizeHint() const
+QSize KviQueryWindow::sizeHint() const
 {
 	QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
-void KviQuery::ownMessage(const QString & szBuffer, bool bUserFeedback)
+void KviQueryWindow::ownMessage(const QString & szBuffer, bool bUserFeedback)
 {
 	if(!connection())
 	{
@@ -721,7 +721,7 @@ void KviQuery::ownMessage(const QString & szBuffer, bool bUserFeedback)
 	}
 }
 
-void KviQuery::ownAction(const QString & szBuffer)
+void KviQueryWindow::ownAction(const QString & szBuffer)
 {
 	if(!connection())
 	{
@@ -758,7 +758,7 @@ void KviQuery::ownAction(const QString & szBuffer)
 	}
 }
 
-void KviQuery::pasteLastLog()
+void KviQueryWindow::pasteLastLog()
 {
 	QString szQuery = target().toLower();
 	QString szNetwork = console()->currentNetworkName().toLower();
@@ -774,7 +774,7 @@ void KviQuery::pasteLastLog()
 
 	// Get the logs
 	QString szLogPath;
-	g_pApp->getLocalKvircDirectory(szLogPath,KviApp::Log);
+	g_pApp->getLocalKvircDirectory(szLogPath,KviApplication::Log);
 	QDir logDir(szLogPath);
 	QStringList filter = QStringList(szLogFilter);
 	QStringList logList = logDir.entryList(filter,QDir::Files,QDir::Name | QDir::Reversed);
@@ -860,7 +860,7 @@ void KviQuery::pasteLastLog()
 	}
 }
 
-QByteArray KviQuery::loadLogFile(const QString & szFileName, bool bGzip)
+QByteArray KviQueryWindow::loadLogFile(const QString & szFileName, bool bGzip)
 {
 	QByteArray data;
 
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/KviQueryWindow.h
index e2ba64e64..3820b4091 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/KviQueryWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_QUERY_H_
 //=============================================================================
 //
-//   File : kvi_query.h
+//   File : KviQueryWindow.h
 //   Creation date : Mon Aug 7 2000 14:19:00 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,17 +25,17 @@
 //=============================================================================
 
 /**
-* \file kvi_query.h
+* \file KviQueryWindow.h
 * \author Szymon Stefanek
 * \brief Query widget: abstraction of an IRC query
 */
 
 #include "kvi_settings.h"
-#include "kvi_window.h"
+#include "KviWindow.h"
 #include "KviCString.h"
 #include "KviIrcUserDataBase.h"
-#include "kvi_userlistview.h"
-#include "kvi_themedlabel.h"
+#include "KviUserListView.h"
+#include "KviThemedLabel.h"
 #include "KviPointerHashTable.h"
 
 class KviConsole;
@@ -48,10 +48,10 @@ class KviWindowToolPageButton;
 #define KVI_QUERY_FLAG_DEAD 1
 
 /**
-* \class KviQuery
+* \class KviQueryWindow
 * \brief The class which manages a query
 */
-class KVIRC_API KviQuery : public KviWindow
+class KVIRC_API KviQueryWindow : public KviWindow
 {
 	Q_OBJECT
 public:
@@ -60,14 +60,14 @@ public:
 	* \param lpFrm The parent frame
 	* \param lpConsole The associated console
 	* \param szNick The nickname with who we open a query
-	* \return KviQuery
+	* \return KviQueryWindow
 	*/
-	KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szNick);
+	KviQueryWindow(KviMainWindow * lpFrm, KviConsole * lpConsole, const QString & szNick);
 
 	/**
 	* \brief Destroys the query object
 	*/
-	~KviQuery();
+	~KviQueryWindow();
 protected:
 	KviUserListView                     * m_pUserListView;
 	KviWindowToolPageButton             * m_pListViewButton;
@@ -211,7 +211,7 @@ public:
 	* \param q The source query
 	* \return void
 	*/
-	void mergeQuery(KviQuery * q);
+	void mergeQuery(KviQueryWindow * q);
 
 	/**
 	* \brief Updates the text of the tooltip
diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/KviScriptButton.cpp
index 34eb1bd48..f338a86d0 100644
--- a/src/kvirc/ui/kvi_scriptbutton.cpp
+++ b/src/kvirc/ui/KviScriptButton.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_scriptbutton.cpp
+//   File : KviScriptButton.cpp
 //   Creation date : Wed Nov 14 15:43:41 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_scriptbutton.h"
-#include "kvi_irctoolbar.h"
-#include "kvi_window.h"
-#include "kvi_console.h"
-#include "kvi_app.h"
+#include "KviScriptButton.h"
+#include "KviIrcToolBar.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviApplication.h"
 #include "KviParameterList.h"
-#include "kvi_kvs_variantlist.h"
-#include "kvi_kvs_script.h"
+#include "KviKvsVariantList.h"
+#include "KviKvsScript.h"
 
 
 KviScriptUserButton::KviScriptUserButton(QWidget * par,const char * name)
diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/KviScriptButton.h
index 50d19caf8..bfd0c88c8 100644
--- a/src/kvirc/ui/kvi_scriptbutton.h
+++ b/src/kvirc/ui/KviScriptButton.h
@@ -2,7 +2,7 @@
 #define _KVI_SCRIPTBUTTON_H_
 //=============================================================================
 //
-//   File : kvi_scriptbutton.h
+//   File : KviScriptButton.h
 //   Creation date : Wed Nov 14 15:43:39 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/KviScriptEditor.cpp
index 8c90930b6..a36fae036 100644
--- a/src/kvirc/ui/kvi_scripteditor.cpp
+++ b/src/kvirc/ui/KviScriptEditor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_scripteditor.cpp
+//   File : KviScriptEditor.cpp
 //   Creation date : Sun Mar 28 1999 16:12:41 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,8 +26,8 @@
 #define _KVI_DEBUG_CHECK_RANGE_
 
 #include "kvi_debug.h"
-#include "kvi_scripteditor.h"
-#include "kvi_modulemanager.h"
+#include "KviScriptEditor.h"
+#include "KviModuleManager.h"
 
 
 KviScriptEditor::KviScriptEditor(QWidget * par)
diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/KviScriptEditor.h
index 25656c3eb..38c9ad7a4 100644
--- a/src/kvirc/ui/kvi_scripteditor.h
+++ b/src/kvirc/ui/KviScriptEditor.h
@@ -2,7 +2,7 @@
 #define _KVI_SCRIPTEDITOR_H_
 //=============================================================================
 //
-//   File : kvi_scripteditor.h
+//   File : KviScriptEditor.h
 //   Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index c822813d6..2deefa57b 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_selectors.cpp
+//   File : KviSelectors.cpp
 //   Creation date : Mon Nov 13 2000 15:22:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,12 +25,12 @@
 
 #define _KVI_SELECTORS_CPP_
 
-#include "kvi_selectors.h"
+#include "KviSelectors.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviMircCntrl.h"
-#include "kvi_filedialog.h"
-#include "kvi_kvs_script.h"
+#include "KviFileDialog.h"
+#include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
 
 #include <QLabel>
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/KviSelectors.h
index ee4a7de01..3c02f3cfd 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/KviSelectors.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_selectors.h
+//   File : KviSelectors.h
 //   Creation date : Mon Now 13 2000 15:21:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/KviSplashScreen.cpp
index 6697cc7b3..353339c13 100644
--- a/src/kvirc/ui/kvi_splash.cpp
+++ b/src/kvirc/ui/KviSplashScreen.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_splash.cpp
+//   File : KviSplashScreen.cpp
 //   Creation date : Wed Aug 8 2001 17:46:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,9 +24,9 @@
 
 
 #include "KviCString.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "kvi_defaults.h"
-#include "kvi_splash.h"
+#include "KviSplashScreen.h"
 #include "KviLocale.h"
 #include "KviFileUtils.h"
 
@@ -47,14 +47,14 @@ KviSplashScreen::KviSplashScreen()
 
 	// check for the current theme splash screen pointer
 	QString szPointerFile;
-	g_pApp->getLocalKvircDirectory(szPointerFile,KviApp::Themes,"current-splash");
+	g_pApp->getLocalKvircDirectory(szPointerFile,KviApplication::Themes,"current-splash");
 	if(KviFileUtils::fileExists(szPointerFile))
 	{
 		QString szBuf;
 		KviFileUtils::readFile(szPointerFile,szBuf);
 		if(!szBuf.isEmpty())
 		{
-			g_pApp->getLocalKvircDirectory(szPix,KviApp::Themes,szBuf);
+			g_pApp->getLocalKvircDirectory(szPix,KviApplication::Themes,szBuf);
 			KviQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR);
 			szPix.append("kvi_splash.png");
 			pix = new QPixmap(szPix);
@@ -65,7 +65,7 @@ KviSplashScreen::KviSplashScreen()
 				pix = 0;
 			} else {
 				// else we might have a themed splash screen
-// 				g_pApp->getLocalKvircDirectory(szPix,KviApp::Themes,szBuf);
+// 				g_pApp->getLocalKvircDirectory(szPix,KviApplication::Themes,szBuf);
 				KviQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR);
 				szPix.append("kvi_splash_overlay.png");
 				m_pOverlay = new QPixmap(szPix);
diff --git a/src/kvirc/ui/kvi_splash.h b/src/kvirc/ui/KviSplashScreen.h
index ed8ab6356..be17e795b 100644
--- a/src/kvirc/ui/kvi_splash.h
+++ b/src/kvirc/ui/KviSplashScreen.h
@@ -2,7 +2,7 @@
 #define _KVI_SPLASH_H_
 //=============================================================================
 //
-//   File : kvi_splash.h
+//   File : KviSplashScreen.h
 //   Creation date : Wed Aug 8 2001 17:45:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_splash.h
+* \file KviSplashScreen.h
 * \author Szymon Stefanek
 * \brief Splash screen
 *
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/KviStatusBar.cpp
index 32c1449b5..c418f1ad9 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/KviStatusBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_statusbar.cpp
+//   File : KviStatusBar.cpp
 //   Creation date : Tue 07 Sep 2004 03:56:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,21 +22,21 @@
 //
 //=============================================================================
 
-#include "kvi_statusbar.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
-#include "kvi_irccontext.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
+#include "KviStatusBar.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
+#include "KviIrcContext.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviConfigurationFile.h"
 #include "KviTimeUtils.h"
 #include "KviQString.h"
-#include "kvi_modulemanager.h"
-#include "kvi_statusbarapplet.h"
-#include "kvi_dynamictooltip.h"
+#include "KviModuleManager.h"
+#include "KviStatusBarApplet.h"
+#include "KviDynamicToolTip.h"
 #include "KviTalPopupMenu.h"
 
 #include <QPainter>
@@ -51,7 +51,7 @@
 #include <QMouseEvent>
 #include <QMessageBox>
 
-KviStatusBar::KviStatusBar(KviFrame * pFrame)
+KviStatusBar::KviStatusBar(KviMainWindow * pFrame)
 : QStatusBar(pFrame)
 {
 	setAutoFillBackground(false);
@@ -208,7 +208,7 @@ void KviStatusBar::load()
 void KviStatusBar::save()
 {
 	QString szBuf;
-	g_pApp->getLocalKvircDirectory(szBuf,KviApp::Config,"statusbar.kvc");
+	g_pApp->getLocalKvircDirectory(szBuf,KviApplication::Config,"statusbar.kvc");
 
 	KviConfigurationFile cfg(szBuf,KviConfigurationFile::Write);
 	cfg.setGroup("Applets");
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/KviStatusBar.h
index 6bf056122..1ae14c4a4 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/KviStatusBar.h
@@ -2,7 +2,7 @@
 #define _KVI_STATUSBAR_H_
 //=============================================================================
 //
-//   File : kvi_statusbar.h
+//   File : KviStatusBar.h
 //   Creation date : Tue 07 Sep 2004 03:56:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_statusbar.h
+* \file KviStatusBar.h
 * \author Szymon Stefanek
 * \brief KVIrc Status Bar management
 *
@@ -47,7 +47,7 @@
 
 class QTimer;
 class QLabel;
-class KviFrame;
+class KviMainWindow;
 class KviTalPopupMenu;
 class KviStatusBarApplet;
 class KviStatusBarAppletDescriptor;
@@ -112,7 +112,7 @@ public:
 class KVIRC_API KviStatusBar : public QStatusBar
 {
 	friend class KviStatusBarApplet;
-	friend class KviFrame;
+	friend class KviMainWindow;
 	Q_OBJECT
 public:
 	/**
@@ -120,7 +120,7 @@ public:
 	* \param pFrame The parent frame class
 	* \return KviStatusBar
 	*/
-	KviStatusBar(KviFrame * pFrame);
+	KviStatusBar(KviMainWindow * pFrame);
 
 	/**
 	* \brief Destroys the statusbar object
@@ -128,7 +128,7 @@ public:
 	~KviStatusBar();
 protected:
 	KviTalHBox                                     * m_pBox;
-	KviFrame                                       * m_pFrame;
+	KviMainWindow                                       * m_pFrame;
 	KviPointerList<KviStatusBarMessage>            * m_pMessageQueue;
 	QTimer                                         * m_pMessageTimer;
 	QLabel                                         * m_pMessageLabel;
@@ -143,9 +143,9 @@ protected:
 public:
 	/**
 	* \brief Returns the frame pointer
-	* \return KviFrame *
+	* \return KviMainWindow *
 	*/
-	KviFrame * frame(){ return m_pFrame; };
+	KviMainWindow * frame(){ return m_pFrame; };
 
 	/**
 	* \brief Returns true if the applet exists, false otherwise
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp
index 50d0cd4fa..aec1290c9 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/KviStatusBarApplet.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_statusbarapplet.cpp
+//   File : KviStatusBarApplet.cpp
 //   Creation date : Tue 07 Sep 2004 03:56:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,22 +25,22 @@
 
 
 
-#include "kvi_statusbarapplet.h"
-#include "kvi_frame.h"
-#include "kvi_iconmanager.h"
-#include "kvi_window.h"
-#include "kvi_irccontext.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_ircconnectionstatistics.h"
+#include "KviStatusBarApplet.h"
+#include "KviMainWindow.h"
+#include "KviIconManager.h"
+#include "KviWindow.h"
+#include "KviIrcContext.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviIrcConnectionStatistics.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviConfigurationFile.h"
-#include "kvi_modulemanager.h"
-#include "kvi_console.h"
-#include "kvi_lagmeter.h"
-#include "kvi_options.h"
-#include "kvi_kvs_script.h"
+#include "KviModuleManager.h"
+#include "KviConsoleWindow.h"
+#include "KviLagMeter.h"
+#include "KviOptions.h"
+#include "KviKvsScript.h"
 #include "KviTimeUtils.h"
 #include "KviQString.h"
 #include "KviBuildInfo.h"
diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/KviStatusBarApplet.h
index 82b3f4d06..01212abef 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.h
+++ b/src/kvirc/ui/KviStatusBarApplet.h
@@ -2,7 +2,7 @@
 #define _KVI_STATUSBARAPPLET_H_
 //=============================================================================
 //
-//   File : kvi_statusbarapplet.h
+//   File : KviStatusBarApplet.h
 //   Creation date : Tue 07 Sep 2004 03:56:46 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "KviHeapObject.h"
-#include "kvi_statusbar.h"
+#include "KviStatusBar.h"
 #include "KviPointerHashTable.h"
 #include "KviHttpRequest.h"
 
@@ -41,7 +41,7 @@ class QTimer;
 class QLabel;
 class KviTalPopupMenu;
 class KviConfigurationFile;
-class KviFrame;
+class KviMainWindow;
 class KviIrcContext;
 class KviIrcConnection;
 class KviStatusBarApplet;
@@ -93,7 +93,7 @@ public:
 	virtual ~KviStatusBarApplet();
 public:
 	KviStatusBar * statusBar(){ return m_pStatusBar; };
-	KviFrame * frame(){ return m_pStatusBar->frame(); };
+	KviMainWindow * frame(){ return m_pStatusBar->frame(); };
 	KviStatusBarAppletDescriptor * descriptor(){ return m_pDescriptor; };
 	inline void setIndex(int i){ mIndex=i; };
 	inline int index() const { return mIndex; };
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/KviTextIconWindow.cpp
index cc4d20f82..8739528ac 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/KviTextIconWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_texticonwin.cpp
+//   File : KviTextIconWindow.cpp
 //   Creation date : Fri May 17 2002 02:35:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_texticonwin.h"
-#include "kvi_texticonmanager.h"
-#include "kvi_app.h"
-#include "kvi_options.h"
-#include "kvi_input.h"
-#include "kvi_topicw.h"
+#include "KviTextIconWindow.h"
+#include "KviTextIconManager.h"
+#include "KviApplication.h"
+#include "KviOptions.h"
+#include "KviInput.h"
+#include "KviTopicWidget.h"
 #include "KviMircCntrl.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QPainter>
 #include <QLineEdit>
diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/KviTextIconWindow.h
index 9670dd3e3..9e7f6d6a0 100644
--- a/src/kvirc/ui/kvi_texticonwin.h
+++ b/src/kvirc/ui/KviTextIconWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_TEXTICONWIN_H_
 //=============================================================================
 //
-//   File : kvi_texticonwin.h
+//   File : KviTextIconWindow.h
 //   Creation date : Fri May 17 2002 02:33:45 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_texticonwin.h
+* \file KviTextIconWindow.h
 * \author Szymon Stefanek
 * \brief Text icon window
 *
@@ -35,7 +35,7 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 
 #include <QPainter>
 #include <QTableWidget>
diff --git a/src/kvirc/ui/kvi_themedcombobox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp
index bd403281e..e430c22fe 100644
--- a/src/kvirc/ui/kvi_themedcombobox.cpp
+++ b/src/kvirc/ui/KviThemedComboBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_themedlineedit.cpp
+//   File : KviThemedLineEdit.cpp
 //   Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_themedcombobox.h"
-#include "kvi_options.h"
+#include "KviThemedComboBox.h"
+#include "KviOptions.h"
 #include "kvi_settings.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiManager.h"
 
 #include <QPainter>
 #include <QLineEdit>
diff --git a/src/kvirc/ui/kvi_themedcombobox.h b/src/kvirc/ui/KviThemedComboBox.h
index e5f510f0d..3d50c333b 100644
--- a/src/kvirc/ui/kvi_themedcombobox.h
+++ b/src/kvirc/ui/KviThemedComboBox.h
@@ -2,7 +2,7 @@
 #define _KVI_THEMEDCOMBOBOX_H_
 //=============================================================================
 //
-//   File : kvi_themedcombobox.h
+//   File : KviThemedComboBox.h
 //   Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp
index 9f88feef9..c12c78a5d 100644
--- a/src/kvirc/ui/kvi_themedlabel.cpp
+++ b/src/kvirc/ui/KviThemedLabel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_themedlabel.cpp
+//   File : KviThemedLabel.cpp
 //   Creation date : Tue Aug 29 2000 21:17:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_themedlabel.h"
-#include "kvi_options.h"
+#include "KviThemedLabel.h"
+#include "KviOptions.h"
 #include "kvi_settings.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiManager.h"
 
 #include <QPainter>
 
diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/KviThemedLabel.h
index 60da2c9bb..a7c2f7c30 100644
--- a/src/kvirc/ui/kvi_themedlabel.h
+++ b/src/kvirc/ui/KviThemedLabel.h
@@ -2,7 +2,7 @@
 #define _KVI_THEMEDLABEL_H_
 //=============================================================================
 //
-//   File : kvi_themedlabel.h
+//   File : KviThemedLabel.h
 //   Creation date : Tue Aug 29 2000 21:12:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_themedlineedit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp
index 14e18e5e7..4bb92a824 100644
--- a/src/kvirc/ui/kvi_themedlineedit.cpp
+++ b/src/kvirc/ui/KviThemedLineEdit.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_themedlineedit.cpp
+//   File : KviThemedLineEdit.cpp
 //   Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_themedlineedit.h"
-#include "kvi_options.h"
+#include "KviThemedLineEdit.h"
+#include "KviOptions.h"
 #include "kvi_settings.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiManager.h"
 
 #include <QPainter>
 #include <QStyleOptionFrameV2>
diff --git a/src/kvirc/ui/kvi_themedlineedit.h b/src/kvirc/ui/KviThemedLineEdit.h
index 37a79b714..cb95bc140 100644
--- a/src/kvirc/ui/kvi_themedlineedit.h
+++ b/src/kvirc/ui/KviThemedLineEdit.h
@@ -2,7 +2,7 @@
 #define _KVI_THEMEDLINEEDIT_H_
 //=============================================================================
 //
-//   File : kvi_themedlineedit.h
+//   File : KviThemedLineEdit.h
 //   Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_themedtreewidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp
index 975725f7d..1ff94b400 100644
--- a/src/kvirc/ui/kvi_themedtreewidget.cpp
+++ b/src/kvirc/ui/KviThemedTreeWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_themedlabel.cpp
+//   File : KviThemedLabel.cpp
 //   Creation date : Tue Aug 29 2000 21:17:01 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "kvi_themedtreewidget.h"
-#include "kvi_options.h"
+#include "KviThemedTreeWidget.h"
+#include "KviOptions.h"
 #include "kvi_settings.h"
-#include "kvi_app.h"
-#include "kvi_frame.h"
-#include "kvi_window.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
+#include "KviWindow.h"
 #include "kvi_out.h"
-#include "kvi_mdimanager.h"
+#include "KviMdiManager.h"
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	extern QPixmap * g_pShadedChildGlobalDesktopBackground;
diff --git a/src/kvirc/ui/kvi_themedtreewidget.h b/src/kvirc/ui/KviThemedTreeWidget.h
index 8fc05e13b..c3e2f0dba 100644
--- a/src/kvirc/ui/kvi_themedtreewidget.h
+++ b/src/kvirc/ui/KviThemedTreeWidget.h
@@ -2,7 +2,7 @@
 #define _KVI_THEMEDTREEWIDGET_H_
 //=============================================================================
 //
-//   File : kvi_themedlineedit.h
+//   File : KviThemedLineEdit.h
 //   Creation date : Sun Jan 10 2010 12:17:00 by Fabio Bas
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/KviToolBar.cpp
index f8361c3ee..7891f0ed2 100644
--- a/src/kvirc/ui/kvi_toolbar.cpp
+++ b/src/kvirc/ui/KviToolBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_toolbar.cpp
+//   File : KviToolBar.cpp
 //   Creation date : Tue Sep 17 02:00:17 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -22,10 +22,10 @@
 //
 //=============================================================================
 
-#include "kvi_toolbar.h"
-#include "kvi_frame.h"
+#include "KviToolBar.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviTalPopupMenu.h"
 
 #include <QCursor>
diff --git a/src/kvirc/ui/kvi_toolbar.h b/src/kvirc/ui/KviToolBar.h
index 0fdcff460..2d04f5ef9 100644
--- a/src/kvirc/ui/kvi_toolbar.h
+++ b/src/kvirc/ui/KviToolBar.h
@@ -2,7 +2,7 @@
 #define _KVI_TOOLBAR_H_
 //=============================================================================
 //
-//   File : kvi_toolbar.h
+//   File : KviToolBar.h
 //   Creation date : Tue Sep 17 02:00:16 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/KviTopicWidget.cpp
index e003fe84b..9b4ee3669 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_topicw.cpp
+//   File : KviTopicWidget.cpp
 //   Creation date : Fri Aug 4 2000 12:09:21 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,27 +24,27 @@
 
 
 
-#include "kvi_topicw.h"
-#include "kvi_options.h"
+#include "KviTopicWidget.h"
+#include "KviOptions.h"
 #include "KviMircCntrl.h"
 #include "KviLocale.h"
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
-#include "kvi_iconmanager.h"
-#include "kvi_texticonmanager.h"
-#include "kvi_app.h"
-#include "kvi_colorwin.h"
-#include "kvi_texticonwin.h"
-#include "kvi_window.h"
-#include "kvi_channel.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionserverinfo.h"
-#include "kvi_ircconnectionuserinfo.h"
-#include "kvi_htmlgenerator.h"
+#include "KviIconManager.h"
+#include "KviTextIconManager.h"
+#include "KviApplication.h"
+#include "KviColorSelectionWindow.h"
+#include "KviTextIconWindow.h"
+#include "KviWindow.h"
+#include "KviChannelWindow.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionServerInfo.h"
+#include "KviIrcConnectionUserInfo.h"
+#include "KviHtmlGenerator.h"
 #include "KviMircCntrl.h"
 #include "KviTalToolTip.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_themedlabel.h"
+#include "KviThemedLabel.h"
 
 #include <QLineEdit>
 #include <QPainter>
@@ -103,11 +103,11 @@ int KviTopicListBoxItem::width ( const KviTalListWidget * lb ) const
 }
 
 
-KviTopicWidget::KviTopicWidget(QWidget * par, KviChannel * pChannel, const char * name)
+KviTopicWidget::KviTopicWidget(QWidget * par, KviChannelWindow * pChannel, const char * name)
 : QWidget(par)
 {
 	setObjectName(name);
-	m_pKviChannel = pChannel;
+	m_pKviChannelWindow = pChannel;
 	m_pHistory = 0;
 	m_pAccept = 0;
 	m_pDiscard = 0;
@@ -425,9 +425,9 @@ void KviTopicWidget::switchMode()
 	bool bCanEdit = TRUE;
 	while(w)
 	{
-		if(w->inherits("KviChannel"))
+		if(w->inherits("KviChannelWindow"))
 		{
-			KviChannel *chan = ((KviChannel *)w);
+			KviChannelWindow *chan = ((KviChannelWindow *)w);
 			iMaxLen = chan->connection()->serverInfo()->maxTopicLen();
 			chan->getChannelModeString(szModes);
 			if(chan->plainChannelMode().contains('t') &&
@@ -448,7 +448,7 @@ void KviTopicWidget::switchMode()
 	}
 	if(m_pInput == 0)
 	{
-		m_pInput=new KviInputEditor(this,m_pKviChannel);
+		m_pInput=new KviInputEditor(this,m_pKviChannelWindow);
 		m_pInput->setObjectName("topicw_inputeditor");
 		m_pInput->setReadOnly(!bCanEdit);
 		m_pInput->setMaxBufferSize(iMaxLen);
@@ -610,7 +610,7 @@ void KviTopicWidget::deactivate()
 	resizeEvent(0);
 	// try to find a KviWindow parent and give it the focus
 
-	m_pKviChannel->setFocus();
+	m_pKviChannelWindow->setFocus();
 }
 
 void KviTopicWidget::discardClicked()
diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/KviTopicWidget.h
index 228b18347..6fdcb5847 100644
--- a/src/kvirc/ui/kvi_topicw.h
+++ b/src/kvirc/ui/KviTopicWidget.h
@@ -2,7 +2,7 @@
 #define _KVI_TOPICW_H_
 //============================================================================
 //
-//   File : kvi_topicw.h
+//   File : KviTopicWidget.h
 //   Creation date : Fri Aug 4 2000 12:03:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,8 +26,8 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_app.h"
-#include "kvi_input_editor.h"
+#include "KviApplication.h"
+#include "KviInputEditor.h"
 #include "KviTalListWidget.h"
 #include "KviTalIconAndRichTextItemDelegate.h"
 
@@ -35,7 +35,7 @@
 #include <QPushButton>
 
 class QComboBox;
-class KviChannel;
+class KviChannelWindow;
 class KviTalPopupMenu;
 class KviIrcConnection;
 class KviThemedLabel;
@@ -64,10 +64,10 @@ class KVIRC_API KviTopicWidget : public QWidget
 {
 	Q_OBJECT
 	Q_PROPERTY(int TransparencyCapable READ dummyRead)
-	friend class KviChannel;
+	friend class KviChannelWindow;
 	friend class KviTalListWidget;
 public:
-	KviTopicWidget(QWidget * pParent, KviChannel* pChannel, const char * name);
+	KviTopicWidget(QWidget * pParent, KviChannelWindow* pChannel, const char * name);
 	~KviTopicWidget();
 private:
 	QString                 m_szTopic;
@@ -81,7 +81,7 @@ private:
 	KviThemedLabel        * m_pLabel;
 	KviInputEditor        * m_pInput;
 	KviTalListWidget      * m_pCompletionBox;
-	KviChannel            * m_pKviChannel;
+	KviChannelWindow            * m_pKviChannelWindow;
 protected:
 	int m_iCursorPosition;
 private:
diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/KviTreeWindowList.cpp
index 3e5dc2f61..502f2b6dd 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.cpp
+++ b/src/kvirc/ui/KviTreeWindowList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_windowlist_tree.cpp
+//   File : KviTreeWindowList.cpp
 //   Creation date : Thu Jan 7 1999 03:56:50 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,15 +23,15 @@
 //
 //=============================================================================
 
-#include "kvi_channel.h"
-#include "kvi_console.h"
-#include "kvi_dynamictooltip.h"
-#include "kvi_frame.h"
+#include "KviChannelWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviDynamicToolTip.h"
+#include "KviMainWindow.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviTalPopupMenu.h"
-#include "kvi_window.h"
-#include "kvi_windowlist_tree.h"
+#include "KviWindow.h"
+#include "KviTreeWindowList.h"
 
 #include <QHeaderView>
 #include <QMouseEvent>
@@ -83,7 +83,7 @@ void KviTreeWindowListItem::captionChanged()
 		break;
 		case KVI_WINDOW_TYPE_CHANNEL:
 		case KVI_WINDOW_TYPE_DEADCHANNEL:
-			szText = ((KviChannel *)m_pWindow)->nameWithUserFlag();
+			szText = ((KviChannelWindow *)m_pWindow)->nameWithUserFlag();
 		break;
 		case KVI_WINDOW_TYPE_QUERY:
 		case KVI_WINDOW_TYPE_DEADQUERY:
diff --git a/src/kvirc/ui/kvi_windowlist_tree.h b/src/kvirc/ui/KviTreeWindowList.h
index 5a5c4e726..b93430728 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.h
+++ b/src/kvirc/ui/KviTreeWindowList.h
@@ -2,7 +2,7 @@
 #define _KVI_WINDOWLIST_TREE_H_
 //=============================================================================
 //
-//   File : kvi_windowlist_tree.h
+//   File : KviTreeWindowList.h
 //   Creation date : Thu Jan 7 1999 03:56:50 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_windowlist.h"
+#include "KviWindowListBase.h"
 #include <QTreeWidget>
 #include <QStyledItemDelegate>
 #include <QAbstractItemView>
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/KviUserListView.cpp
index 4ce8d446c..89518a53f 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_userlistview.cpp
+//   File : KviUserListView.cpp
 //   Creation date : Tue Aug 1 2000 21:05:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -26,26 +26,26 @@
 #define _KVI_USERLISTVIEW_CPP_
 
 #include "kvi_debug.h"
-#include "kvi_userlistview.h"
+#include "KviUserListView.h"
 #include "kvi_settings.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_defaults.h"
-#include "kvi_iconmanager.h"
+#include "KviIconManager.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviParameterList.h"
-#include "kvi_window.h"
-#include "kvi_console.h"
-#include "kvi_app.h"
-#include "kvi_useraction.h"
+#include "KviWindow.h"
+#include "KviConsoleWindow.h"
+#include "KviApplication.h"
+#include "KviUserAction.h"
 #include "KviQString.h"
-#include "kvi_frame.h"
-#include "kvi_mdimanager.h"
-#include "kvi_kvs_eventtriggers.h"
-#include "kvi_toolwindows_container.h"
+#include "KviMainWindow.h"
+#include "KviMdiManager.h"
+#include "KviKvsEventTriggers.h"
+#include "KviWindowToolWidget.h"
 #include "KviStringConversion.h"
-#include "kvi_ircconnection.h"
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviIrcConnection.h"
+#include "KviIrcConnectionServerInfo.h"
 
 #include <QLabel>
 #include <QScrollBar>
@@ -62,7 +62,7 @@
 #endif
 
 
-// kvi_app.cpp (loaded and destroyed by KviIconManager)
+// KviApplication.cpp (loaded and destroyed by KviIconManager)
 extern QPixmap * g_pUserChanStatePixmap;
 
 // Yet another really complex widget :)
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/KviUserListView.h
index 5b51ac21f..a89b61d3c 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/KviUserListView.h
@@ -2,7 +2,7 @@
 #define _KVI_USERLISTVIEW_H_
 //=============================================================================
 //
-//   File : kvi_userlistview.h
+//   File : KviUserListView.h
 //   Creation date : Tue Aug 1 2000 21:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file kvi_userlistview.h
+* \file KviUserListView.h
 * \author Szymon Stefanek
 * \brief User list view management
 *
@@ -40,7 +40,7 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "KviPointerHashTable.h"
-#include "kvi_toolwindows_container.h"
+#include "KviWindowToolWidget.h"
 #include "KviCString.h"
 #include "KviIrcUserDataBase.h"
 #include "KviIrcMask.h"
@@ -224,8 +224,8 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget
 	friend class KviUserListViewArea;
 	friend class KviUserListToolTip;
 	friend class KviConsole;
-	friend class KviChannel;
-	friend class KviQuery;
+	friend class KviChannelWindow;
+	friend class KviQueryWindow;
 	Q_OBJECT
 public:
 	/**
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/KviWindow.cpp
index f71f67eb5..73de67f8c 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_window.cpp
+//   File : KviWindow.cpp
 //   Creation date : Tue Jul 6 1999 14:52:11 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 /**
-* \file kvi_window.cpp
+* \file KviWindow.cpp
 * \brief Contains the KviWindow class
 */
 
@@ -35,30 +35,30 @@
 #define _KVI_DEBUG_CHECK_RANGE_
 
 #include "kvi_debug.h"
-#include "kvi_app.h"
-#include "kvi_window.h"
-#include "kvi_frame.h"
-#include "kvi_windowlist.h"
-#include "kvi_iconmanager.h"
-#include "kvi_mdichild.h"
+#include "KviApplication.h"
+#include "KviWindow.h"
+#include "KviMainWindow.h"
+#include "KviWindowListBase.h"
+#include "KviIconManager.h"
+#include "KviMdiChild.h"
 #include "KviLocale.h"
-#include "kvi_ircview.h"
+#include "KviIrcView.h"
 #include "kvi_out.h"
 #include "KviMemory.h"
-#include "kvi_input.h"
+#include "KviInput.h"
 #include "KviFileUtils.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "KviConfigurationFile.h"
-#include "kvi_irccontext.h"
-#include "kvi_console.h"
-#include "kvi_ircconnectionserverinfo.h"
+#include "KviIrcContext.h"
+#include "KviConsoleWindow.h"
+#include "KviIrcConnectionServerInfo.h"
 #include "KviMircCntrl.h"
-#include "kvi_toolwindows_container.h"
-#include "kvi_kvs_script.h"
+#include "KviWindowToolWidget.h"
+#include "KviKvsScript.h"
 #include "KviTalPopupMenu.h"
 #include "KviTalToolTip.h"
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_eventtriggers.h"
+#include "KviKvsScript.h"
+#include "KviKvsEventTriggers.h"
 
 #include <QPixmap>
 #include <QCursor>
@@ -78,7 +78,7 @@
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
-	#include "kvi_cryptcontroller.h"
+	#include "KviCryptController.h"
 #endif
 
 #ifdef COMPILE_KDE_SUPPORT
@@ -102,7 +102,7 @@ static QAction         * g_pMdiWindowSystemTextEncodingDefaultAction = 0;
 
 unsigned long int g_uUniqueWindowId = 1;
 
-KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * lpConsole)
+KviWindow::KviWindow(int type,KviMainWindow * lpFrm,const QString &name,KviConsole * lpConsole)
 		: QWidget(0)
 {
 	m_uId = g_uUniqueWindowId;
@@ -563,7 +563,7 @@ void KviWindow::getDefaultLogFileName(QString &buffer)
 	} else {
 		KviQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.toUtf8().data(),szDate.toUtf8().data());
 	}
-	g_pApp->getLocalKvircDirectory(buffer,KviApp::Log,tmp);
+	g_pApp->getLocalKvircDirectory(buffer,KviApplication::Log,tmp);
 }
 
 void KviWindow::getBaseLogFileName(QString &buffer)
@@ -1370,7 +1370,7 @@ QTextCodec * KviWindow::defaultTextCodec()
 		QTextCodec * c = connection()->textCodec();
 		if(c)return c;
 	}
-	return KviApp::defaultTextCodec();
+	return KviApplication::defaultTextCodec();
 }
 
 KviIrcConnection * KviWindow::connection()
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/KviWindow.h
index 03a92e412..9c741c39e 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/KviWindow.h
@@ -2,7 +2,7 @@
 #define _KVI_WINDOW_H_
 //=============================================================================
 //
-//   File : kvi_window.h
+//   File : KviWindow.h
 //   Creation date : Tue Jul 6 1999 14:52:20 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -25,24 +25,24 @@
 //=============================================================================
 
 /**
-* \file kvi_window.h
+* \file KviWindow.h
 * \brief Contains the KviWindow class
 */
 
 
-#include "kvi_app.h"
+#include "KviApplication.h"
 #include "KviCString.h"
 #include "KviQString.h"
 #include "kvi_settings.h"
-#include "kvi_irccontext.h"
-#include "kvi_ircconnection.h"
-#include "kvi_input.h"
+#include "KviIrcContext.h"
+#include "KviIrcConnection.h"
+#include "KviInput.h"
 #include "KviTalHBox.h"
 #include "KviTalSplitter.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	// The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition
-	#include "kvi_mdichild.h"
+	#include "KviMdiChild.h"
 #else
 	class KviMdiChild;
 #endif
@@ -56,7 +56,7 @@
 class QPushButton;
 class QPixmap;
 class QTextCodec;
-class KviFrame;
+class KviMainWindow;
 class KviWindowListItem;
 class KviConfigurationFile;
 class KviIrcView;
@@ -132,7 +132,7 @@ class KviTalHBox;
 class KVIRC_API KviWindow : public QWidget
 {
 	friend class KviInput;
-	friend class KviFrame;
+	friend class KviMainWindow;
 	friend class KviWindowListItem;
 	friend class KviWindowListButton;
 	friend class KviTreeWindowListItem;
@@ -141,11 +141,11 @@ class KVIRC_API KviWindow : public QWidget
 	Q_PROPERTY(int KviProperty_ChildFocusOwner READ type)
 	Q_OBJECT
 public:
-	KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * pConsole = 0);
+	KviWindow(int type,KviMainWindow * lpFrm,const QString &name,KviConsole * pConsole = 0);
 	virtual ~KviWindow();
 protected: // almost private: don't touch :D
 	QString                               m_szName;                  // the current window name (usually also the target)
-	KviFrame                            * m_pFrm;
+	KviMainWindow                            * m_pFrm;
 	KviConsole                          * m_pConsole;
 
 	int                                   m_iType;
@@ -196,7 +196,7 @@ public:
 
 	// The frame that this window belongs to
 	// It is always non-null and never changes
-	inline KviFrame * frame() const { return m_pFrm; };
+	inline KviMainWindow * frame() const { return m_pFrm; };
 	// The KviIrcView of this window: may be NULL if the window has no KviIrcView (and thus supports no direct output)
 	inline KviIrcView * view() const { return m_pIrcView; };
 	// The mdiParent widget: may be nulll if the window is undocked
@@ -318,16 +318,16 @@ signals:
 	void windowNameChanged();
 protected:
 	// Loading and saving of properties
-	// Protected: only KviFrame can call these
+	// Protected: only KviMainWindow can call these
 	virtual void saveProperties(KviConfigurationFile *cfg);
 	virtual void loadProperties(KviConfigurationFile *cfg);
 	// Creation and destruction events: overridden in windows that have script events bound to creation and destruction
 	virtual void triggerCreationEvents(){};
 	virtual void triggerDestructionEvents(){};
-	// Internal: do not touch :D (KviFrame)
+	// Internal: do not touch :D (KviMainWindow)
 	virtual void createWindowListItem();
 	virtual void destroyWindowListItem();
-	// called by KviFrame
+	// called by KviMainWindow
 	// either lost the active window status or the frame is no longer active (but we're still the active kvirc's subwindow)
 	virtual void lostUserFocus();
 	// this by default calls fillSingleColorCaptionBuffer(plainTextCaption());
diff --git a/src/kvirc/ui/kvi_windowlist.cpp b/src/kvirc/ui/KviWindowListBase.cpp
index b493ba0ea..92486c9d8 100644
--- a/src/kvirc/ui/kvi_windowlist.cpp
+++ b/src/kvirc/ui/KviWindowListBase.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_windowlist.cpp
+//   File : KviWindowListBase.cpp
 //   Creation date : Thu Jan 7 1999 03:59:43 CEST by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -33,18 +33,18 @@
 #define KVI_WINDOWLIST_MIN_WIDTH 120
 
 #define _KVI_DEBUG_CHECK_RANGE_
-#include "kvi_channel.h"
-#include "kvi_console.h"
+#include "KviChannelWindow.h"
+#include "KviConsoleWindow.h"
 #include "kvi_debug.h"
-#include "kvi_dynamictooltip.h"
-#include "kvi_frame.h"
-#include "kvi_ircconnection.h"
+#include "KviDynamicToolTip.h"
+#include "KviMainWindow.h"
+#include "KviIrcConnection.h"
 #include "KviLocale.h"
-#include "kvi_options.h"
+#include "KviOptions.h"
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_window.h"
-#include "kvi_windowlist.h"
+#include "KviWindow.h"
+#include "KviWindowListBase.h"
 
 
 // FIXME: #warning "The tree WindowList min width should be configurable"
@@ -395,7 +395,7 @@ void KviWindowListButton::drawButtonLabel(QPainter * pPainter)
 		break;
 		case KVI_WINDOW_TYPE_CHANNEL:
 		case KVI_WINDOW_TYPE_DEADCHANNEL:
-			szText = ((KviChannel *)m_pWindow)->nameWithUserFlag();
+			szText = ((KviChannelWindow *)m_pWindow)->nameWithUserFlag();
 		break;
 		case KVI_WINDOW_TYPE_QUERY:
 		case KVI_WINDOW_TYPE_DEADQUERY:
diff --git a/src/kvirc/ui/kvi_windowlist.h b/src/kvirc/ui/KviWindowListBase.h
index 7f6615c10..793a4e787 100644
--- a/src/kvirc/ui/kvi_windowlist.h
+++ b/src/kvirc/ui/KviWindowListBase.h
@@ -2,7 +2,7 @@
 #define _KVI_WINDOWLIST_H_
 //=============================================================================
 //
-//   File : kvi_windowlist.h
+//   File : KviWindowListBase.h
 //   Creation date : Thu Jan 7 1999 03:56:50 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -35,7 +35,7 @@
 
 class QPixmap;
 class KviWindow;
-class KviFrame;
+class KviMainWindow;
 class KviDynamicToolTip;
 class KviConsole;
 
@@ -89,7 +89,7 @@ public:
 	KviWindowListBase();
 	virtual ~KviWindowListBase();
 protected:
-	KviFrame * m_pFrm;
+	KviMainWindow * m_pFrm;
 	QTimer   * m_pActivityMeterTimer;
 	KviWindowListTitleWidget  * m_pTitleWidget;
 	Qt::DockWidgetArea currentArea;
@@ -116,7 +116,7 @@ protected slots:
 
 //
 // Implementation details: the following classes should be
-// never used directly (with just the exception of KviFrame
+// never used directly (with just the exception of KviMainWindow
 // that creates the WindowList)
 //
 
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/KviWindowToolWidget.cpp
index 7cd32703c..9f62b744c 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/KviWindowToolWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_toolwindows_container.cpp
+//   File : KviWindowToolWidget.cpp
 //   Creation date : Tue Aug 1 2000 21:05:22 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -24,8 +24,8 @@
 
 
 
-#include "kvi_toolwindows_container.h"
-#include "kvi_iconmanager.h"
+#include "KviWindowToolWidget.h"
+#include "KviIconManager.h"
 #include "KviTalVBox.h"
 
 #include <QPainter>
diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/KviWindowToolWidget.h
index d4c1fe61e..fbba3ce79 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.h
+++ b/src/kvirc/ui/KviWindowToolWidget.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_toolwindows_container.h
+//   File : KviWindowToolWidget.h
 //   Creation date : Tue Aug 1 2000 21:03:41 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
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;