More renaming & cleanup.

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

100 files changed, 152 insertions, 152 deletions

diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/aboutdialog.h
index 9fd444907..198a193e6 100644
--- a/src/modules/about/aboutdialog.h
+++ b/src/modules/about/aboutdialog.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "kvi_tal_tabdialog.h"
+#include "KviTalTabDialog.h"
 
 class KviAboutDialog : public KviTalTabDialog
 {
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 17948b033..44cc175bb 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -39,9 +39,9 @@
 #include "kvi_action.h"
 #include "kvi_kvs_useraction.h"
 #include "kvi_customtoolbarmanager.h"
-#include "kvi_tal_vbox.h"
-#include <kvi_tal_groupbox.h>
-#include "kvi_tal_itemdelegates.h"
+#include "KviTalVBox.h"
+#include <KviTalGroupBox.h>
+#include "KviTalIconAndRichTextItemDelegate.h"
 #include "kvi_fileextensions.h"
 
 #include <QList>
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index fc8542714..107d115c3 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -37,8 +37,8 @@
 #include "kvi_fileextensions.h"
 #include "kvi_kvs_script.h"
 #include "kvi_sourcesdate.h"
-#include "kvi_tal_listwidget.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalListWidget.h"
+#include "KviTalToolTip.h"
 
 #include <QPainter>
 #include <QPixmap>
diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h
index 8288363e5..45a6b8656 100644
--- a/src/modules/addon/managementdialog.h
+++ b/src/modules/addon/managementdialog.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "kvi_tal_listwidget.h"
+#include "KviTalListWidget.h"
 
 #include <QWidget>
 #include <QLabel>
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index a701bcdd0..a4757f1fd 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -41,7 +41,7 @@
 #include "kvi_filedialog.h"
 #include "KviCommandFormatter.h"
 #include "kvi_module.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
 
 #include <QList>
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index 95309481c..ed4d6a4ff 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -27,7 +27,7 @@
 #include "kvi_window.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 #include "KviHeapObject.h"
 
 #include <QWidget>
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 5a576c9f8..6b9fef501 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -30,7 +30,7 @@
 #include "KviMemory.h"
 #include "kvi_app.h"
 #include "kvi_options.h"
-#include "kvi_http.h"
+#include "KviHttpRequest.h"
 #include "kvi_iconmanager.h"
 #include "KviAvatar.h"
 #include "KviIrcUserDataBase.h"
@@ -44,7 +44,7 @@
 #include "kvi_sparser.h"
 #include "kvi_out.h"
 #include "KviIrcMask.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QLineEdit>
 #include <QPushButton>
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index b5a75e1d4..da9026a69 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -34,7 +34,7 @@
 #include "kvi_console.h"
 #include "KviRegisteredChannel.h"
 #include "kvi_kvs_script.h"
-#include "kvi_tal_groupbox.h"
+#include "KviTalGroupBox.h"
 
 #include <QTreeWidget>
 #include <QLabel>
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 6c0e59ea2..eada4b4ed 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -43,7 +43,7 @@
 #include "kvi_filedialog.h"
 #include "KviCommandFormatter.h"
 #include "kvi_module.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
 #include "kvi_modulemanager.h"
 
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h
index b1418cdcc..6b98f5e3f 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/classeditor.h
@@ -33,7 +33,7 @@
 #include "kvi_window.h"
 #include "KviCString.h"
 #include "KviPointerList.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 #include "KviHeapObject.h"
 #include "kvi_kvs_object_class.h"
 
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index 13ad8ab21..bdc856812 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -36,7 +36,7 @@
 #include "KviParameterList.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variantlist.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QPushButton>
 #include <QLayout>
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index ee9fb4b62..01bbf8e3b 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -41,7 +41,7 @@
 	#include "KviLocale.h"
 	#include "kvi_error.h"
 	#include "kvi_out.h"
-	#include "kvi_netutils.h"
+	#include "KviNetUtils.h"
 	#include "kvi_console.h"
 	#include "kvi_frame.h"
 	#include "KviMemory.h"
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index aa1095b34..79012192b 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -27,7 +27,7 @@
 #ifdef COMPILE_DCC_CANVAS
 	#include "KviCString.h"
 	#include "KviLocale.h"
-	#include "kvi_tal_popupmenu.h"
+	#include "KviTalPopupMenu.h"
 
 	#include <QCursor>
 	#include <QPainter>
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 3ce235aaf..6ac90a686 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -39,7 +39,7 @@
 #include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_console.h"
 #include "kvi_frame.h"
 #include "KviMemory.h"
@@ -54,7 +54,7 @@
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "KviMircCntrl.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 
 #include <QEvent>
 #include <QResizeEvent>
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 61d8b27cc..b3ca78111 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -38,7 +38,7 @@
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_console.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
 #include "kvi_error.h"
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index b97d0ee55..8464c94a7 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -25,7 +25,7 @@
 #include "marshal.h"
 
 #include "kvi_settings.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_error.h"
 #include "kvi_options.h"
 #include "KviLocale.h"
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index dbb8ebb93..d550c114c 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -43,7 +43,7 @@
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_console.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_frame.h"
 #include "kvi_console.h"
 #include "kvi_error.h"
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 437890d3c..bbad7d198 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -38,7 +38,7 @@
 #include "KviLocale.h"
 #include "kvi_error.h"
 #include "kvi_out.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_console.h"
 #include "kvi_frame.h"
 #include "KviMemory.h"
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 260a28948..3c6cd2abc 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -34,9 +34,9 @@
 #include "KviPointerList.h"
 #include "kvi_filetransfer.h"
 #include "KviTimeUtils.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalHBox.h"
+#include "KviTalVBox.h"
 
 #include <QLabel>
 #include <QProgressBar>
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index dc712791d..09f0b49dc 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -29,7 +29,7 @@
 #include "kvi_error.h"
 #include "kvi_memmove.h"
 #include "KviMemory.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_socket.h"
 
 #ifdef COMPILE_SSL_SUPPORT
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h
index 877ea56bb..109ec3a9c 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/thread.h
@@ -32,7 +32,7 @@
 #include <QObject>
 
 #ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_ssl.h"
+	#include "KviSSL.h"
 #endif
 
 // KviThreadDataEvent<int>
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index 9c90fe151..e9c1864e4 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -28,7 +28,7 @@
 
 #include "kvi_options.h"
 #include "KviLocale.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_ircsocket.h"
 #include "kvi_irclink.h"
 #include "KviQString.h"
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 91e875c15..896d7b98b 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -34,13 +34,13 @@
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_error.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
 #include "KviMemory.h"
 #include "kvi_socket.h"
 #include "kvi_ircconnection.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 #include "KviMircCntrl.h"
 #include "kvi_frame.h"
 
diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h
index 1213bc369..31588ab7e 100644
--- a/src/modules/dcc/video.h
+++ b/src/modules/dcc/video.h
@@ -32,7 +32,7 @@
 #include "kvi_window.h"
 #include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 #include "kvi_themedlabel.h"
 
 #include <QLabel>
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index e59ad40fd..df84c9127 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -34,13 +34,13 @@
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "kvi_error.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_options.h"
 #include "kvi_console.h"
 #include "KviMemory.h"
 #include "kvi_socket.h"
 #include "kvi_ircconnection.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 
 #include <QFrame>
 #include <QSlider>
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index 35c726d3f..11e5cb31a 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -32,7 +32,7 @@
 #include "kvi_window.h"
 #include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QLabel>
 #include <QToolButton>
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index b08cbf2c4..9b86b483c 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -24,7 +24,7 @@
 
 #include "window.h"
 
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d)
 : KviWindow(type,lpFrm,name, d->console())
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 7bc51493a..7e85774b5 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -35,7 +35,7 @@
 #include "kvi_iconmanager.h"
 #include "kvi_kvs_script.h"
 #include "kvi_msgbox.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QMessageBox>
 #include <QLayout>
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 2d2247ff5..6a81bbda2 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -41,9 +41,9 @@
 #include "kvi_kvs_kernel.h"
 #include "kvi_modulemanager.h"
 #include "KviConfigurationFile.h"
-#include "kvi_tal_vbox.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_groupbox.h"
+#include "KviTalVBox.h"
+#include "KviTalHBox.h"
+#include "KviTalGroupBox.h"
 
 #include <QScrollBar>
 #include <QLayout>
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 58db627b5..1398b6469 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -28,7 +28,7 @@
 #include "kvi_scripteditor.h"
 #include "KviPointerList.h"
 #include "kvi_selectors.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QCompleter>
 #include <QLabel>
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 00f15aefa..c31d444a3 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -39,8 +39,8 @@
 #include "KviQString.h"
 #include "kvi_filedialog.h"
 #include "kvi_kvs_eventmanager.h"
-#include "kvi_tal_vbox.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalVBox.h"
+#include "KviTalPopupMenu.h"
 
 #include <QMessageBox>
 #include <QSplitter>
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h
index eadd127ba..ee9118903 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/eventeditor.h
@@ -26,7 +26,7 @@
 
 #include "kvi_window.h"
 #include "KviCString.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QWidget>
 #include <QLineEdit>
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 720c5a43c..239f23cc8 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -35,7 +35,7 @@
 #include "kvi_themedlabel.h"
 #include "kvi_input.h"
 #include "KviQString.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 #include "kvi_frame.h"
 #include "kvi_mdimanager.h"
 
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index df96484fb..fb6108bc0 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -32,9 +32,9 @@
 #include "kvi_moduleextension.h"
 #include "kvi_filetransfer.h"
 #include "kvi_dynamictooltip.h"
-#include "kvi_tal_tablewidget.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_itemdelegates.h"
+#include "KviTalTableWidget.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalIconAndRichTextItemDelegate.h"
 
 #include <QTimer>
 #include <QPixmap>
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h
index 956aed4ae..567d25348 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/helpwidget.h
@@ -26,7 +26,7 @@
 
 #include "index.h"
 
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QTextBrowser>
 #include <QProgressBar>
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h
index 7852e99d0..31b526531 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/helpwindow.h
@@ -26,8 +26,8 @@
 
 #include "kvi_window.h"
 #include "KviCString.h"
-#include "kvi_tal_vbox.h"
-#include "kvi_tal_listwidget.h"
+#include "KviTalVBox.h"
+#include "KviTalListWidget.h"
 
 #include <QTabWidget>
 #include <QLineEdit>
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 7c53191b8..feda63127 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -29,11 +29,11 @@
 #include "KviLocale.h"
 #include "kvi_window.h"
 #include "kvi_iconmanager.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_console.h"
 #include "kvi_kvs_script.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QPainter>
 
@@ -335,7 +335,7 @@ void KviHttpFileTransfer::init()
 	g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>;
 	g_pHttpFileTransfers->setAutoDelete(false);
 
-	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false);
+	QPixmap * pix = g_pIconManager->getImage("KviHttpRequesticons.png", false);
 	if(pix)g_pHttpIcon = new QPixmap(*pix);
 	else g_pHttpIcon = 0;
 }
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index af904a47a..f1449ee60 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "kvi_filetransfer.h"
-#include "kvi_http.h"
+#include "KviHttpRequest.h"
 #include "KviTimeUtils.h"
 #include "kvi_kvs_variant.h"
 
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index f9c12a4c1..f071a0cf6 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -28,7 +28,7 @@
 #include "kvi_socket.h"
 #include "kvi_app.h"
 #include "kvi_out.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "KviLocale.h"
 #include "kvi_window.h"
 #include "kvi_options.h"
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 215e0674d..f733ed099 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -36,7 +36,7 @@
 #include "kvi_themedlabel.h"
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QToolTip>
 #include <QLabel>
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 3b9dcc62a..5c92ffaf7 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -30,7 +30,7 @@
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 #include "kvi_themedtreewidget.h"
 
 #include <QToolButton>
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 0ec8ab125..9b8a5748a 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -42,7 +42,7 @@
 #include "kvi_filedialog.h"
 #include "kvi_msgbox.h"
 #include "kvi_fileextensions.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 #include "kvi_htmlgenerator.h"
 #include "kvi_themedlineedit.h"
 
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index a5ab7e9ed..5725d59ff 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -31,7 +31,7 @@
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 #include "kvi_themedtreewidget.h"
 
 #include <QToolButton>
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index b56523cac..62ca73513 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -35,7 +35,7 @@
 #include "KviQString.h"
 #include "kvi_app.h"
 #include "KviFileUtils.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QList>
 #include <QPixmap>
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 7e8ec68f5..a9e03799b 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 #include "kvi_window.h"
 #include "kvi_moduleextension.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 #include <QTreeWidget>
 #include "KviPointerList.h"
 
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index fb761d535..3b30d6a62 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -32,7 +32,7 @@
 #include "KviConfigurationFile.h"
 #include "kvi_app.h"
 #include "KviQString.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 
 #include <QMessageBox>
 #include <QDir>
diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h
index 5f37eebe0..091273830 100644
--- a/src/modules/mircimport/libkvimircimport.h
+++ b/src/modules/mircimport/libkvimircimport.h
@@ -26,8 +26,8 @@
 
 #include "kvi_mexserverimport.h"
 #include "KviCString.h"
-#include "kvi_http.h"
-#include <kvi_tal_wizard.h>
+#include "KviHttpRequest.h"
+#include <KviTalWizard.h>
 
 #include <QLineEdit>
 #include <QLabel>
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index 5b41b0fec..e659784c2 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -30,7 +30,7 @@
 #include "kvi_settings.h"
 #include "KviQString.h"
 #include "KviPointerList.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 #include "KviTimeUtils.h"
 
 #include <QBitmap>
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 89c714025..6633bbad6 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include <kvi_tal_groupbox.h>
+#include <KviTalGroupBox.h>
 #include "class_groupbox.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h
index b1447e749..07320df56 100644
--- a/src/modules/objects/class_groupbox.h
+++ b/src/modules/objects/class_groupbox.h
@@ -27,7 +27,7 @@
 
 
 
-#include <kvi_tal_groupbox.h>
+#include <KviTalGroupBox.h>
 #include "class_widget.h"
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index e224b95ec..b38310c65 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -26,7 +26,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "class_hbox.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 const char * const align_tbl[] = {
 	"Left",
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 5621b87c1..c1a58580d 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "kvi_tal_mainwindow.h"
+#include "KviTalMainWindow.h"
 #include "class_mainwindow.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 013fa945e..6c1b78fa7 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -30,7 +30,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QCursor>
 #include <QMenu>
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index e35c62654..a22082902 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -36,8 +36,8 @@
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "kvi_error.h"
-#include "kvi_netutils.h"
-#include "kvi_dns.h"
+#include "KviNetUtils.h"
+#include "KviDnsResolver.h"
 #include "kvi_error.h"
 #include "kvi_socket.h"
 #include "KviMemory.h"
@@ -1000,9 +1000,9 @@ void KviKvsObject_socket::lookupRemoteIp()
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	m_pDelayTimer = 0;
 	if(m_pDns)delete m_pDns;
-	m_pDns = new KviDns();
-	connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(lookupDone(KviDns *)));
-	if(!m_pDns->lookup(m_szRemoteIp,KviDns::Any))
+	m_pDns = new KviDnsResolver();
+	connect(m_pDns,SIGNAL(lookupDone(KviDnsResolver *)),this,SLOT(lookupDone(KviDnsResolver *)));
+	if(!m_pDns->lookup(m_szRemoteIp,KviDnsResolver::Any))
 	{
 		unsigned int uOldConnectionId = m_uConnectionId;
 		KviKvsVariantList lParams;
@@ -1013,10 +1013,10 @@ void KviKvsObject_socket::lookupRemoteIp()
 	}
 }
 
-void KviKvsObject_socket::lookupDone(KviDns *pDns)
+void KviKvsObject_socket::lookupDone(KviDnsResolver *pDns)
 {
 
-	if(pDns->state() != KviDns::Success)
+	if(pDns->state() != KviDnsResolver::Success)
 	{
 		unsigned int uOldConnectionId = m_uConnectionId;
 		KviKvsVariantList lParams;
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index a4e252693..40ac42d47 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -36,7 +36,7 @@
 #define KVI_SCRIPT_SOCKET_STATUS_LISTENING 3
 #define KVI_SCRIPT_SOCKET_STATUS_CONNECTED 4
 
-class KviDns;
+class KviDnsResolver;
 class KviDataBuffer;
 #include "object_macros.h"
 
@@ -56,7 +56,7 @@ protected:
 	kvi_u32_t          m_uLocalPort;
 	unsigned int       m_uConnectTimeout;
 	QSocketNotifier  * m_pSn;
-	KviDns           * m_pDns;
+	KviDnsResolver           * m_pDns;
 	QTimer           * m_pDelayTimer;
 	char				* m_pInBuffer;
 	unsigned int       m_uInBufferLen;
@@ -103,7 +103,7 @@ protected:
 protected slots:
 	void doConnect();
 	void lookupRemoteIp();
-	void lookupDone(KviDns * pDns);
+	void lookupDone(KviDnsResolver * pDns);
 	void connectTimeoutSlot();
 	void writeNotifierFired(int);
 	void readNotifierFired(int);
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index b650d38b8..b572bbb08 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -26,8 +26,8 @@
 #include "class_toolbar.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-#include "kvi_tal_toolbar.h"
-#include "kvi_tal_mainwindow.h"
+#include "KviTalToolBar.h"
+#include "KviTalMainWindow.h"
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "class_mainwindow.h"
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 0de288057..4e44c8efa 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -29,7 +29,7 @@
 
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 /*
 	@doc:	toolbutton
 	@keyterms:
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index 5ac157775..dbf172b5a 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -29,7 +29,7 @@
 
 #include "class_vbox.h"
 
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 
 
 // Tables used in $setAlignment & $alignment
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h
index f2575793c..3debaef5d 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/class_widget.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 #include "object_macros.h"
 
 #ifdef COMPILE_WEBKIT_SUPPORT
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 5d7d5559e..b2b5b2127 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include <kvi_tal_wizard.h>
+#include <KviTalWizard.h>
 
 #include "class_wizard.h"
 #include "kvi_error.h"
diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/class_wizard.h
index 5b5ba6e63..1b71cd06e 100644
--- a/src/modules/objects/class_wizard.h
+++ b/src/modules/objects/class_wizard.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include <kvi_tal_wizard.h>
+#include <KviTalWizard.h>
 #include "class_widget.h"
 #include "object_macros.h"
 
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index d37e47f6b..5c4ea7e0d 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -28,7 +28,7 @@
 #include "KviLocale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 #include <QLayout>
 #include <QPushButton>
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 47081bc79..a83a2d66e 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -31,10 +31,10 @@
 #include "kvi_iconmanager.h"
 #include "kvi_module.h"
 #include "KviPointerHashTable.h"
-#include "kvi_tal_vbox.h"
-#include "kvi_tal_tooltip.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_groupbox.h"
+#include "KviTalVBox.h"
+#include "KviTalToolTip.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalGroupBox.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 03f96ef4f..7e2bc9d46 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -27,7 +27,7 @@
 #include "KviLocale.h"
 #include "kvi_selectors.h"
 #include "kvi_options.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index 6836601da..af86ea88d 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -32,7 +32,7 @@
 #include <QLabel>
 #include <QRadioButton>
 
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index a793660bc..120c7d545 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -35,10 +35,10 @@
 #include "kvi_filedialog.h"
 #include "kvi_fileextensions.h"
 #include "kvi_iconmanager.h"
-#include "kvi_http.h"
+#include "KviHttpRequest.h"
 #include "KviIdentityProfile.h"
-#include "kvi_tal_tooltip.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalToolTip.h"
+#include "KviTalHBox.h"
 #include <QTreeWidget>
 
 #include <QCheckBox>
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index bc532583c..1265a5bb7 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -28,7 +28,7 @@
 #include "kvi_options.h"
 #include "KviLocale.h"
 #include "kvi_app.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 21de881c1..5fcdbfd2b 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "kvi_options.h"
 #include "KviLocale.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 #include <QLayout>
 #include <QComboBox>
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 8619b22b9..8aaa893e3 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -27,7 +27,7 @@
 
 #include "kvi_options.h"
 #include "KviLocale.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 #include <QLayout>
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 2a4a631bf..114be5bf5 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -26,7 +26,7 @@
 
 #include "kvi_options.h"
 #include "KviLocale.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 8329a621d..8a4e794ea 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -34,7 +34,7 @@
 #include "KviMircCntrl.h"
 #include "KviConfigurationFile.h"
 #include "kvi_filedialog.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 
 #include <QLayout>
 #include <QPushButton>
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index e66556f67..90093a8d2 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -26,7 +26,7 @@
 
 #include "kvi_optionswidget.h"
 #include "KviMessageTypeSettings.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QTreeWidget>
 #include <QItemDelegate>
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 0cd0caa97..cd3e49a86 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -29,7 +29,7 @@
 #include "KviLocale.h"
 #include "KviNickServRuleSet.h"
 #include "KviIrcMask.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 #include <QTreeWidget>
 
 #include <QLayout>
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 5454f8140..79c9e1dfe 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -28,12 +28,12 @@
 #include "kvi_iconmanager.h"
 #include "KviProxyDataBase.h"
 #include "kvi_ipeditor.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_settings.h"
 #include "kvi_options.h"
-#include "kvi_tal_groupbox.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalGroupBox.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalToolTip.h"
 
 #include <QLabel>
 #include <QLineEdit>
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 1cb23f13c..e742cfa9d 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -34,7 +34,7 @@
 #include "kvi_iconmanager.h"
 #include "KviIrcServerDataBase.h"
 #include "kvi_ipeditor.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 #include "kvi_settings.h"
 #include "kvi_filedialog.h"
 #include "KviConfigurationFile.h"
@@ -52,8 +52,8 @@
 #include "KviProxyDataBase.h"
 #include "kvi_kvs_script.h"
 #include "KviPointerHashTable.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalToolTip.h"
 
 #include <QLineEdit>
 #include <QCursor>
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 54c49ae84..04632afcd 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -30,8 +30,8 @@
 #include "kvi_modulemanager.h"
 #include "KviPointerList.h"
 #include "KviCString.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalHBox.h"
+#include "KviTalToolTip.h"
 #include "kvi_app.h"
 
 #include <QLabel>
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 4bbae171a..d38e19ed4 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -29,7 +29,7 @@
 #include "KviLocale.h"
 #include "kvi_filedialog.h"
 #include "kvi_fileextensions.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QLayout>
 #include <QCursor>
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 611bc9aee..167975d7c 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -26,8 +26,8 @@
 
 #include "kvi_optionswidget.h"
 #include "kvi_texticonmanager.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalHBox.h"
 
 #include <QToolButton>
 #include <QTableWidget>
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 55a6e8854..40dc73a47 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -28,7 +28,7 @@
 #include "kvi_internalcmd.h"
 #include "kvi_options.h"
 #include "KviLocale.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 
 #include <QLayout>
 
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index c4a35c17b..31ff44e4c 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -39,7 +39,7 @@
 #include "kvi_kvs_popupmenu.h"
 #include "kvi_kvs_variantlist.h"
 #include "KviPointerHashTable.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalVBox.h"
 #include "kvi_fileextensions.h"
 
 #include <QMessageBox>
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 75a0d8fa3..37f29817e 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -27,7 +27,7 @@
 #include "kvi_window.h"
 #include "KviCString.h"
 #include <QTreeWidget>
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QWidget>
 #include <QLineEdit>
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index e6c3cc1c7..0b56d4ef9 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -39,8 +39,8 @@
 #include "KviCommandFormatter.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_kvs_eventhandler.h"
-#include "kvi_tal_vbox.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalVBox.h"
+#include "KviTalPopupMenu.h"
 
 #include <QMessageBox>
 #include <QSplitter>
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 4d2325d02..6df0a77fb 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -43,8 +43,8 @@
 #include "KviStringConversion.h"
 #include "kvi_options.h"
 #include "KviPointerHashTable.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalHBox.h"
+#include "KviTalVBox.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index 5e3cb8d47..e3eff6420 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -29,8 +29,8 @@
 #include "kvi_selectors.h"
 #include "KviPointerHashTable.h"
 #include <QTreeWidget>
-#include "kvi_tal_listwidget.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalListWidget.h"
+#include "KviTalPopupMenu.h"
 
 #include <QWidget>
 #include <QLineEdit>
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 633458046..d49c2404f 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -43,8 +43,8 @@
 #include "KviStringConversion.h"
 #include "kvi_options.h"
 #include "KviPointerHashTable.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalHBox.h"
+#include "KviTalVBox.h"
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index e453b9b84..aa5d6fece 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -29,8 +29,8 @@
 #include "kvi_selectors.h"
 #include "KviPointerHashTable.h"
 #include <QTreeWidget>
-#include "kvi_tal_popupmenu.h"
-#include <kvi_tal_tabdialog.h>
+#include "KviTalPopupMenu.h"
+#include <KviTalTabDialog.h>
 
 #include <QListWidget>
 #include <QWidget>
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index 27481475d..4b9b23afa 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -25,7 +25,7 @@
 //=============================================================================
 
 #include "KviCString.h"
-#include "kvi_tal_wizard.h"
+#include "KviTalWizard.h"
 
 #include <QCheckBox>
 
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 2a14b5291..df291feee 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -31,12 +31,12 @@ bool g_bFoundMirc;
 #include "KviFileUtils.h"
 #include "kvi_defaults.h"
 #include "kvi_msgbox.h"
-#include "kvi_tal_filedialog.h"
+#include "KviTalFileDialog.h"
 #include "KviQString.h"
 #include "KviEnvironment.h"
 #include "kvi_options.h"
 #include "KviConfigurationFile.h"
-#include "kvi_tal_hbox.h"
+#include "KviTalHBox.h"
 
 #include <QTextEdit>
 #include <QMessageBox>
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index f2d0fdd71..f7085cfc4 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -27,10 +27,10 @@
 #include "kvi_settings.h"
 #include "KviCString.h"
 #include "kvi_selectors.h"
-#include "kvi_tal_wizard.h"
-#include "kvi_tal_vbox.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_groupbox.h"
+#include "KviTalWizard.h"
+#include "KviTalVBox.h"
+#include "KviTalHBox.h"
+#include "KviTalGroupBox.h"
 
 #include <QLabel>
 #include <QPixmap>
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 6027be480..3ee9b76f8 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -35,8 +35,8 @@
 #include "kvi_themedlabel.h"
 #include "kvi_input.h"
 #include "kvi_filedialog.h"
-#include "kvi_tal_hbox.h"
-#include "kvi_tal_vbox.h"
+#include "KviTalHBox.h"
+#include "KviTalVBox.h"
 
 #include <QDateTimeEdit>
 #include <QLabel>
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 8696709b3..6f908dc68 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -40,7 +40,7 @@
 
 #if defined( COMPILE_SSL_SUPPORT ) && !defined( COMPILE_NO_EMBEDDED_CODE )
 	// The current implementation
-	#include <kvi_ssl.h>
+	#include <KviSSL.h>
 	#include <openssl/evp.h>
 	#include <openssl/pem.h>
 #elif defined(COMPILE_NO_EMBEDDED_CODE)
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index 4c2c076c3..d8ec94900 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -30,7 +30,7 @@
 	#include <QFrame>
 	#include <QLabel>
 	#include <QPushButton>
-	#include "kvi_tal_hbox.h"
+	#include "KviTalHBox.h"
 
 	#include "kparts/part.h"
 
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 49116bcc8..4d92276d6 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -41,8 +41,8 @@
 #include "kvi_dynamictooltip.h"
 #include "kvi_iconmanager.h"
 #include "kvi_msgbox.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_listwidget.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalListWidget.h"
 
 
 #include <QLayout>
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 3df640222..0b69960c0 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -27,9 +27,9 @@
 #include "kvi_optionswidget.h"
 #include "KviPointerList.h"
 #include "kvi_theme.h"
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_wizard.h"
-#include "kvi_tal_listwidget.h"
+#include "KviTalPopupMenu.h"
+#include "KviTalWizard.h"
+#include "KviTalListWidget.h"
 
 #include <QWidget>
 #include <QComboBox>
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 145ffdcbf..9d2140727 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 #include "KviPointerList.h"
 #include "kvi_theme.h"
-#include "kvi_tal_wizard.h"
+#include "KviTalWizard.h"
 
 #include <QDialog>
 
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index fdc61fc93..08a3c19dd 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -37,7 +37,7 @@
 #include "KviFileUtils.h"
 #include "kvi_filedialog.h"
 #include "kvi_kvs_useraction.h"
-#include "kvi_tal_tooltip.h"
+#include "KviTalToolTip.h"
 #include "kvi_fileextensions.h"
 
 #include <QPushButton>
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index c2ea870a4..c11d6bda8 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -41,7 +41,7 @@
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_options.h"
 #include "kvi_ircview.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 
 #include <QPixmap>
 #include <QPainter>
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 10a69864d..c3eacb17c 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -25,7 +25,7 @@
 #include "kvi_settings.h"
 #include "kvi_module.h"
 #include "KviCString.h"
-#include "kvi_netutils.h"
+#include "KviNetUtils.h"
 
 #include "manager.h"
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index abcb31819..3ad3d2ef6 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -36,7 +36,7 @@
 #include "kvi_windowlist.h"
 #include "KviPointerList.h"
 #include "kvi_kvs_eventmanager.h"
-#include "kvi_tal_popupmenu.h"
+#include "KviTalPopupMenu.h"
 #include "kvi_window.h"
 #include "kvi_options.h"
 #include "KviQString.h"
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index e180b2290..a5b1fbc53 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -28,7 +28,7 @@
 #include "KviConfigurationFile.h"
 #include "kvi_irctoolbar.h"
 #include "kvi_window.h"
-#include "kvi_tal_menubar.h"
+#include "KviTalMenuBar.h"
 #include "kvi_mextoolbar.h"
 #include "kvi_kvs_action.h"
 #include <QTreeWidget>